From: Matt Corallo Date: Sun, 3 May 2020 02:12:15 +0000 (-0400) Subject: f fix a few missing payment_base -> payment key things Jeff caught X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=8bd08b51cb5123d421264d3cad6c1e123eec162a;p=rust-lightning f fix a few missing payment_base -> payment key things Jeff caught --- diff --git a/lightning/src/chain/keysinterface.rs b/lightning/src/chain/keysinterface.rs index 72a378e28..a5d7a4c28 100644 --- a/lightning/src/chain/keysinterface.rs +++ b/lightning/src/chain/keysinterface.rs @@ -601,7 +601,7 @@ impl KeysInterface for KeysManager { } let funding_key = key_step!(b"funding key", commitment_seed); let revocation_base_key = key_step!(b"revocation base key", funding_key); - let payment_key = key_step!(b"payment base key", revocation_base_key); + let payment_key = key_step!(b"payment key", revocation_base_key); let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_key); let htlc_base_key = key_step!(b"HTLC base key", delayed_payment_base_key); diff --git a/lightning/src/ln/chan_utils.rs b/lightning/src/ln/chan_utils.rs index 944d92a82..842d9619b 100644 --- a/lightning/src/ln/chan_utils.rs +++ b/lightning/src/ln/chan_utils.rs @@ -277,8 +277,8 @@ pub struct ChannelPublicKeys { /// a commitment transaction so that their counterparty can claim all available funds if they /// broadcast an old state. pub revocation_basepoint: PublicKey, - /// The base point which is used (with derive_public_key) to derive a per-commitment payment - /// public key which receives immediately-spendable non-HTLC-encumbered funds. + /// The public key which receives immediately-spendable non-HTLC-encumbered funds. This key is + /// static across every commitment transaction. pub payment_point: PublicKey, /// The base point which is used (with derive_public_key) to derive a per-commitment payment /// public key which receives non-HTLC-encumbered funds which are only available for spending