X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fkeysinterface.rs;h=9ed28e12fe8e983dc40f3a2abb7d00a36a018763;hb=07db23d102738d1e84e3d2cb36101cef92e1761d;hp=58624d219c475fa9dc4de448e6fbc2f08f3faadf;hpb=35814b653f6e098a90400eb63c23acb55f2984f4;p=rust-lightning diff --git a/lightning/src/chain/keysinterface.rs b/lightning/src/chain/keysinterface.rs index 58624d21..9ed28e12 100644 --- a/lightning/src/chain/keysinterface.rs +++ b/lightning/src/chain/keysinterface.rs @@ -9,67 +9,139 @@ use bitcoin::network::constants::Network; use bitcoin::util::bip32::{ExtendedPrivKey, ExtendedPubKey, ChildNumber}; use bitcoin::util::bip143; -use bitcoin_hashes::{Hash, HashEngine}; -use bitcoin_hashes::sha256::HashEngine as Sha256State; -use bitcoin_hashes::sha256::Hash as Sha256; -use bitcoin_hashes::hash160::Hash as Hash160; +use bitcoin::hashes::{Hash, HashEngine}; +use bitcoin::hashes::sha256::HashEngine as Sha256State; +use bitcoin::hashes::sha256::Hash as Sha256; +use bitcoin::hashes::sha256d::Hash as Sha256dHash; +use bitcoin::hash_types::WPubkeyHash; -use secp256k1::key::{SecretKey, PublicKey}; -use secp256k1::{Secp256k1, Signature}; -use secp256k1; +use bitcoin::secp256k1::key::{SecretKey, PublicKey}; +use bitcoin::secp256k1::{Secp256k1, Signature, Signing}; +use bitcoin::secp256k1; use util::byte_utils; use util::logger::Logger; +use util::ser::{Writeable, Writer, Readable}; use ln::chan_utils; -use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment}; +use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, LocalCommitmentTransaction}; +use ln::msgs; use std::sync::Arc; use std::sync::atomic::{AtomicUsize, Ordering}; - -/// When on-chain outputs are created by rust-lightning an event is generated which informs the -/// user thereof. This enum describes the format of the output and provides the OutPoint. +use std::io::Error; +use ln::msgs::DecodeError; + +/// When on-chain outputs are created by rust-lightning (which our counterparty is not able to +/// claim at any point in the future) an event is generated which you must track and be able to +/// spend on-chain. The information needed to do this is provided in this enum, including the +/// outpoint describing which txid and output index is available, the full output which exists at +/// that txid/index, and any keys or other information required to sign. +#[derive(Clone, PartialEq)] pub enum SpendableOutputDescriptor { - /// Outpoint with an output to a script which was provided via KeysInterface, thus you should - /// have stored somewhere how to spend script_pubkey! - /// Outputs from a justice tx, claim tx or preimage tx + /// An output to a script which was provided via KeysInterface, thus you should already know + /// how to spend it. No keys are provided as rust-lightning was never given any keys - only the + /// script_pubkey as it appears in the output. + /// These may include outputs from a transaction punishing our counterparty or claiming an HTLC + /// on-chain using the payment preimage or after it has timed out. StaticOutput { - /// The outpoint spendable by user wallet + /// The outpoint which is spendable outpoint: OutPoint, - /// The output which is referenced by the given outpoint + /// The output which is referenced by the given outpoint. output: TxOut, }, - /// Outpoint commits to a P2WSH - /// P2WSH should be spend by the following witness : - /// 0 - /// With input nSequence set to_self_delay. - /// Outputs from a HTLC-Success/Timeout tx/commitment tx + /// An output to a P2WSH script which can be spent with a single signature after a CSV delay. + /// The private key which should be used to sign the transaction is provided, as well as the + /// full witness redeemScript which is hashed in the output script_pubkey. + /// The witness in the spending input should be: + /// (MINIMALIF standard rule) + /// + /// Note that the nSequence field in the input must be set to_self_delay (which corresponds to + /// the transaction not being broadcastable until at least to_self_delay blocks after the input + /// confirms). + /// These are generally the result of a "revocable" output to us, spendable only by us unless + /// it is an output from us having broadcast an old state (which should never happen). DynamicOutputP2WSH { - /// Outpoint spendable by user wallet + /// The outpoint which is spendable outpoint: OutPoint, - /// local_delayedkey = delayed_payment_basepoint_secret + SHA256(per_commitment_point || delayed_payment_basepoint) OR + /// The secret key which must be used to sign the spending transaction key: SecretKey, - /// witness redeemScript encumbering output. + /// The witness redeemScript which is hashed to create the script_pubkey in the given output witness_script: Script, - /// nSequence input must commit to self_delay to satisfy script's OP_CSV + /// The nSequence value which must be set in the spending input to satisfy the OP_CSV in + /// the witness_script. to_self_delay: u16, /// The output which is referenced by the given outpoint output: TxOut, }, - /// Outpoint commits to a P2WPKH - /// P2WPKH should be spend by the following witness : - /// - /// Outputs to_remote from a commitment tx + // TODO: Note that because key is now static and exactly what is provided by us, we should drop + // this in favor of StaticOutput: + /// An output to a P2WPKH, spendable exclusively by the given private key. + /// The witness in the spending input, is, thus, simply: + /// + /// These are generally the result of our counterparty having broadcast the current state, + /// allowing us to claim the non-HTLC-encumbered outputs immediately. DynamicOutputP2WPKH { - /// Outpoint spendable by user wallet + /// The outpoint which is spendable outpoint: OutPoint, - /// localkey = payment_basepoint_secret + SHA256(per_commitment_point || payment_basepoint + /// The secret key which must be used to sign the spending transaction key: SecretKey, /// The output which is reference by the given outpoint output: TxOut, } } +impl Writeable for SpendableOutputDescriptor { + fn write(&self, writer: &mut W) -> Result<(), ::std::io::Error> { + match self { + &SpendableOutputDescriptor::StaticOutput { ref outpoint, ref output } => { + 0u8.write(writer)?; + outpoint.write(writer)?; + output.write(writer)?; + }, + &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref key, ref witness_script, ref to_self_delay, ref output } => { + 1u8.write(writer)?; + outpoint.write(writer)?; + key.write(writer)?; + witness_script.write(writer)?; + to_self_delay.write(writer)?; + output.write(writer)?; + }, + &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref key, ref output } => { + 2u8.write(writer)?; + outpoint.write(writer)?; + key.write(writer)?; + output.write(writer)?; + }, + } + Ok(()) + } +} + +impl Readable for SpendableOutputDescriptor { + fn read(reader: &mut R) -> Result { + match Readable::read(reader)? { + 0u8 => Ok(SpendableOutputDescriptor::StaticOutput { + outpoint: Readable::read(reader)?, + output: Readable::read(reader)?, + }), + 1u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WSH { + outpoint: Readable::read(reader)?, + key: Readable::read(reader)?, + witness_script: Readable::read(reader)?, + to_self_delay: Readable::read(reader)?, + output: Readable::read(reader)?, + }), + 2u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WPKH { + outpoint: Readable::read(reader)?, + key: Readable::read(reader)?, + output: Readable::read(reader)?, + }), + _ => Err(DecodeError::InvalidValue), + } + } +} + /// A trait to describe an object which can get user secrets and key material. pub trait KeysInterface: Send + Sync { /// A type which implements ChannelKeys which will be returned by get_channel_keys. @@ -83,7 +155,7 @@ pub trait KeysInterface: Send + Sync { fn get_shutdown_pubkey(&self) -> PublicKey; /// Get a new set of ChannelKeys for per-channel secrets. These MUST be unique even if you /// restarted with some stale data! - fn get_channel_keys(&self, inbound: bool) -> Self::ChanKeySigner; + fn get_channel_keys(&self, inbound: bool, channel_value_satoshis: u64) -> Self::ChanKeySigner; /// Get a secret and PRNG seed for construting an onion packet fn get_onion_rand(&self) -> (SecretKey, [u8; 32]); /// Get a unique temporary channel id. Channels will be referred to by this until the funding @@ -114,63 +186,174 @@ pub trait KeysInterface: Send + Sync { /// Readable/Writable to serialize out a unique reference to this set of keys so /// that you can serialize the full ChannelManager object. /// -/// (TODO: We shouldn't require that, and should have an API to get them at deser time, due mostly -/// to the possibility of reentrancy issues by calling the user's code during our deserialization -/// routine). -pub trait ChannelKeys : Send { +// (TODO: We shouldn't require that, and should have an API to get them at deser time, due mostly +// to the possibility of reentrancy issues by calling the user's code during our deserialization +// routine). +// TODO: We should remove Clone by instead requesting a new ChannelKeys copy when we create +// ChannelMonitors instead of expecting to clone the one out of the Channel into the monitors. +pub trait ChannelKeys : Send+Clone { /// Gets the private key for the anchor tx fn funding_key<'a>(&'a self) -> &'a SecretKey; /// Gets the local secret key for blinded revocation pubkey fn revocation_base_key<'a>(&'a self) -> &'a SecretKey; - /// Gets the local secret key used in to_remote output of remote commitment tx - /// (and also as part of obscured commitment number) - fn payment_base_key<'a>(&'a self) -> &'a SecretKey; + /// Gets the local secret key used in the to_remote output of remote commitment tx (ie the + /// output to us in transactions our counterparty broadcasts). + /// Also as part of obscured commitment number. + fn payment_key<'a>(&'a self) -> &'a SecretKey; /// Gets the local secret key used in HTLC-Success/HTLC-Timeout txn and to_local output fn delayed_payment_base_key<'a>(&'a self) -> &'a SecretKey; /// Gets the local htlc secret key used in commitment tx htlc outputs fn htlc_base_key<'a>(&'a self) -> &'a SecretKey; /// Gets the commitment seed fn commitment_seed<'a>(&'a self) -> &'a [u8; 32]; + /// Gets the local channel public keys and basepoints + fn pubkeys<'a>(&'a self) -> &'a ChannelPublicKeys; /// Create a signature for a remote commitment transaction and associated HTLC transactions. /// /// Note that if signing fails or is rejected, the channel will be force-closed. + // + // TODO: Document the things someone using this interface should enforce before signing. + // TODO: Add more input vars to enable better checking (preferably removing commitment_tx and + // making the callee generate it via some util function we expose)! + fn sign_remote_commitment(&self, feerate_per_kw: u64, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1) -> Result<(Signature, Vec), ()>; + + /// Create a signature for a local commitment transaction. This will only ever be called with + /// the same local_commitment_tx (or a copy thereof), though there are currently no guarantees + /// that it will not be called multiple times. + // + // TODO: Document the things someone using this interface should enforce before signing. + // TODO: Add more input vars to enable better checking (preferably removing commitment_tx and + fn sign_local_commitment(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1) -> Result; + + /// Same as sign_local_commitment, but exists only for tests to get access to local commitment + /// transactions which will be broadcasted later, after the channel has moved on to a newer + /// state. Thus, needs its own method as sign_local_commitment may enforce that we only ever + /// get called once. + #[cfg(test)] + fn unsafe_sign_local_commitment(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1) -> Result; + + /// Create a signature for each HTLC transaction spending a local commitment transaction. + /// + /// Unlike sign_local_commitment, this may be called multiple times with *different* + /// local_commitment_tx values. While this will never be called with a revoked + /// local_commitment_tx, it is possible that it is called with the second-latest + /// local_commitment_tx (only if we haven't yet revoked it) if some watchtower/secondary + /// ChannelMonitor decided to broadcast before it had been updated to the latest. + /// + /// Either an Err should be returned, or a Vec with one entry for each HTLC which exists in + /// local_commitment_tx. For those HTLCs which have transaction_output_index set to None + /// (implying they were considered dust at the time the commitment transaction was negotiated), + /// a corresponding None should be included in the return value. All other positions in the + /// return value must contain a signature. + fn sign_local_commitment_htlc_transactions(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1) -> Result>, ()>; + + /// Create a signature for a (proposed) closing transaction. + /// + /// Note that, due to rounding, there may be one "missing" satoshi, and either party may have + /// chosen to forgo their output as dust. + fn sign_closing_transaction(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1) -> Result; + + /// Signs a channel announcement message with our funding key, proving it comes from one + /// of the channel participants. /// - /// TODO: Document the things someone using this interface should enforce before signing. - /// TODO: Add more input vars to enable better checking (preferably removing commitment_tx and - /// making the callee generate it via some util function we expose)! - fn sign_remote_commitment(&self, channel_value_satoshis: u64, channel_funding_script: &Script, feerate_per_kw: u64, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1) -> Result<(Signature, Vec), ()>; + /// Note that if this fails or is rejected, the channel will not be publicly announced and + /// our counterparty may (though likely will not) close the channel on us for violating the + /// protocol. + fn sign_channel_announcement(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1) -> Result; + + /// Set the remote channel basepoints. This is done immediately on incoming channels + /// and as soon as the channel is accepted on outgoing channels. + /// + /// Will be called before any signatures are applied. + fn set_remote_channel_pubkeys(&mut self, channel_points: &ChannelPublicKeys); } #[derive(Clone)] /// A simple implementation of ChannelKeys that just keeps the private keys in memory. pub struct InMemoryChannelKeys { /// Private key of anchor tx - pub funding_key: SecretKey, + funding_key: SecretKey, /// Local secret key for blinded revocation pubkey - pub revocation_base_key: SecretKey, - /// Local secret key used in commitment tx htlc outputs - pub payment_base_key: SecretKey, + revocation_base_key: SecretKey, + /// Local secret key used for our balance in remote-broadcasted commitment transactions + payment_key: SecretKey, /// Local secret key used in HTLC tx - pub delayed_payment_base_key: SecretKey, + delayed_payment_base_key: SecretKey, /// Local htlc secret key used in commitment tx htlc outputs - pub htlc_base_key: SecretKey, + htlc_base_key: SecretKey, /// Commitment seed - pub commitment_seed: [u8; 32], + commitment_seed: [u8; 32], + /// Local public keys and basepoints + pub(crate) local_channel_pubkeys: ChannelPublicKeys, + /// Remote public keys and base points + pub(crate) remote_channel_pubkeys: Option, + /// The total value of this channel + channel_value_satoshis: u64, +} + +impl InMemoryChannelKeys { + /// Create a new InMemoryChannelKeys + pub fn new( + secp_ctx: &Secp256k1, + funding_key: SecretKey, + revocation_base_key: SecretKey, + payment_key: SecretKey, + delayed_payment_base_key: SecretKey, + htlc_base_key: SecretKey, + commitment_seed: [u8; 32], + channel_value_satoshis: u64) -> InMemoryChannelKeys { + let local_channel_pubkeys = + InMemoryChannelKeys::make_local_keys(secp_ctx, &funding_key, &revocation_base_key, + &payment_key, &delayed_payment_base_key, + &htlc_base_key); + InMemoryChannelKeys { + funding_key, + revocation_base_key, + payment_key, + delayed_payment_base_key, + htlc_base_key, + commitment_seed, + channel_value_satoshis, + local_channel_pubkeys, + remote_channel_pubkeys: None, + } + } + + fn make_local_keys(secp_ctx: &Secp256k1, + funding_key: &SecretKey, + revocation_base_key: &SecretKey, + payment_key: &SecretKey, + delayed_payment_base_key: &SecretKey, + htlc_base_key: &SecretKey) -> ChannelPublicKeys { + let from_secret = |s: &SecretKey| PublicKey::from_secret_key(secp_ctx, s); + ChannelPublicKeys { + funding_pubkey: from_secret(&funding_key), + revocation_basepoint: from_secret(&revocation_base_key), + payment_point: from_secret(&payment_key), + delayed_payment_basepoint: from_secret(&delayed_payment_base_key), + htlc_basepoint: from_secret(&htlc_base_key), + } + } } impl ChannelKeys for InMemoryChannelKeys { fn funding_key(&self) -> &SecretKey { &self.funding_key } fn revocation_base_key(&self) -> &SecretKey { &self.revocation_base_key } - fn payment_base_key(&self) -> &SecretKey { &self.payment_base_key } + fn payment_key(&self) -> &SecretKey { &self.payment_key } fn delayed_payment_base_key(&self) -> &SecretKey { &self.delayed_payment_base_key } fn htlc_base_key(&self) -> &SecretKey { &self.htlc_base_key } fn commitment_seed(&self) -> &[u8; 32] { &self.commitment_seed } + fn pubkeys<'a>(&'a self) -> &'a ChannelPublicKeys { &self.local_channel_pubkeys } - - fn sign_remote_commitment(&self, channel_value_satoshis: u64, channel_funding_script: &Script, feerate_per_kw: u64, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1) -> Result<(Signature, Vec), ()> { + fn sign_remote_commitment(&self, feerate_per_kw: u64, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1) -> Result<(Signature, Vec), ()> { if commitment_tx.input.len() != 1 { return Err(()); } - let commitment_sighash = hash_to_message!(&bip143::SighashComponents::new(&commitment_tx).sighash_all(&commitment_tx.input[0], &channel_funding_script, channel_value_satoshis)[..]); + + let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key); + let remote_channel_pubkeys = self.remote_channel_pubkeys.as_ref().expect("must set remote channel pubkeys before signing"); + let channel_funding_redeemscript = make_funding_redeemscript(&funding_pubkey, &remote_channel_pubkeys.funding_pubkey); + + let commitment_sighash = hash_to_message!(&bip143::SighashComponents::new(&commitment_tx).sighash_all(&commitment_tx.input[0], &channel_funding_redeemscript, self.channel_value_satoshis)[..]); let commitment_sig = secp_ctx.sign(&commitment_sighash, &self.funding_key); let commitment_txid = commitment_tx.txid(); @@ -191,16 +374,97 @@ impl ChannelKeys for InMemoryChannelKeys { Ok((commitment_sig, htlc_sigs)) } + + fn sign_local_commitment(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1) -> Result { + let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key); + let remote_channel_pubkeys = self.remote_channel_pubkeys.as_ref().expect("must set remote channel pubkeys before signing"); + let channel_funding_redeemscript = make_funding_redeemscript(&funding_pubkey, &remote_channel_pubkeys.funding_pubkey); + + Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx)) + } + + #[cfg(test)] + fn unsafe_sign_local_commitment(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1) -> Result { + let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key); + let remote_channel_pubkeys = self.remote_channel_pubkeys.as_ref().expect("must set remote channel pubkeys before signing"); + let channel_funding_redeemscript = make_funding_redeemscript(&funding_pubkey, &remote_channel_pubkeys.funding_pubkey); + + Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx)) + } + + fn sign_local_commitment_htlc_transactions(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1) -> Result>, ()> { + local_commitment_tx.get_htlc_sigs(&self.htlc_base_key, local_csv, secp_ctx) + } + + fn sign_closing_transaction(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1) -> Result { + if closing_tx.input.len() != 1 { return Err(()); } + if closing_tx.input[0].witness.len() != 0 { return Err(()); } + if closing_tx.output.len() > 2 { return Err(()); } + + let remote_channel_pubkeys = self.remote_channel_pubkeys.as_ref().expect("must set remote channel pubkeys before signing"); + let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key); + let channel_funding_redeemscript = make_funding_redeemscript(&funding_pubkey, &remote_channel_pubkeys.funding_pubkey); + + let sighash = hash_to_message!(&bip143::SighashComponents::new(closing_tx) + .sighash_all(&closing_tx.input[0], &channel_funding_redeemscript, self.channel_value_satoshis)[..]); + Ok(secp_ctx.sign(&sighash, &self.funding_key)) + } + + fn sign_channel_announcement(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1) -> Result { + let msghash = hash_to_message!(&Sha256dHash::hash(&msg.encode()[..])[..]); + Ok(secp_ctx.sign(&msghash, &self.funding_key)) + } + + fn set_remote_channel_pubkeys(&mut self, channel_pubkeys: &ChannelPublicKeys) { + assert!(self.remote_channel_pubkeys.is_none(), "Already set remote channel pubkeys"); + self.remote_channel_pubkeys = Some(channel_pubkeys.clone()); + } +} + +impl Writeable for InMemoryChannelKeys { + fn write(&self, writer: &mut W) -> Result<(), Error> { + self.funding_key.write(writer)?; + self.revocation_base_key.write(writer)?; + self.payment_key.write(writer)?; + self.delayed_payment_base_key.write(writer)?; + self.htlc_base_key.write(writer)?; + self.commitment_seed.write(writer)?; + self.remote_channel_pubkeys.write(writer)?; + self.channel_value_satoshis.write(writer)?; + + Ok(()) + } } -impl_writeable!(InMemoryChannelKeys, 0, { - funding_key, - revocation_base_key, - payment_base_key, - delayed_payment_base_key, - htlc_base_key, - commitment_seed -}); +impl Readable for InMemoryChannelKeys { + fn read(reader: &mut R) -> Result { + let funding_key = Readable::read(reader)?; + let revocation_base_key = Readable::read(reader)?; + let payment_key = Readable::read(reader)?; + let delayed_payment_base_key = Readable::read(reader)?; + let htlc_base_key = Readable::read(reader)?; + let commitment_seed = Readable::read(reader)?; + let remote_channel_pubkeys = Readable::read(reader)?; + let channel_value_satoshis = Readable::read(reader)?; + let secp_ctx = Secp256k1::signing_only(); + let local_channel_pubkeys = + InMemoryChannelKeys::make_local_keys(&secp_ctx, &funding_key, &revocation_base_key, + &payment_key, &delayed_payment_base_key, + &htlc_base_key); + + Ok(InMemoryChannelKeys { + funding_key, + revocation_base_key, + payment_key, + delayed_payment_base_key, + htlc_base_key, + commitment_seed, + channel_value_satoshis, + local_channel_pubkeys, + remote_channel_pubkeys + }) + } +} /// Simple KeysInterface implementor that takes a 32-byte seed for use as a BIP 32 extended key /// and derives keys from that. @@ -252,9 +516,9 @@ impl KeysManager { let node_secret = master_key.ckd_priv(&secp_ctx, ChildNumber::from_hardened_idx(0).unwrap()).expect("Your RNG is busted").private_key.key; let destination_script = match master_key.ckd_priv(&secp_ctx, ChildNumber::from_hardened_idx(1).unwrap()) { Ok(destination_key) => { - let pubkey_hash160 = Hash160::hash(&ExtendedPubKey::from_private(&secp_ctx, &destination_key).public_key.key.serialize()[..]); + let wpubkey_hash = WPubkeyHash::hash(&ExtendedPubKey::from_private(&secp_ctx, &destination_key).public_key.to_bytes()); Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0) - .push_slice(&pubkey_hash160.into_inner()) + .push_slice(&wpubkey_hash.into_inner()) .into_script() }, Err(_) => panic!("Your RNG is busted"), @@ -308,7 +572,7 @@ impl KeysInterface for KeysManager { self.shutdown_pubkey.clone() } - fn get_channel_keys(&self, _inbound: bool) -> InMemoryChannelKeys { + fn get_channel_keys(&self, _inbound: bool, channel_value_satoshis: u64) -> InMemoryChannelKeys { // We only seriously intend to rely on the channel_master_key for true secure // entropy, everything else just ensures uniqueness. We rely on the unique_start (ie // starting_time provided in the constructor) to be unique. @@ -337,18 +601,20 @@ 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_base_key = key_step!(b"payment base key", revocation_base_key); - let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_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); - InMemoryChannelKeys { + InMemoryChannelKeys::new( + &self.secp_ctx, funding_key, revocation_base_key, - payment_base_key, + payment_key, delayed_payment_base_key, htlc_base_key, commitment_seed, - } + channel_value_satoshis + ) } fn get_onion_rand(&self) -> (SecretKey, [u8; 32]) { @@ -374,6 +640,6 @@ impl KeysInterface for KeysManager { let child_privkey = self.channel_id_master_key.ckd_priv(&self.secp_ctx, ChildNumber::from_hardened_idx(child_ix as u32).expect("key space exhausted")).expect("Your RNG is busted"); sha.input(&child_privkey.private_key.key[..]); - (Sha256::from_engine(sha).into_inner()) + Sha256::from_engine(sha).into_inner() } }