mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-03-03 18:47:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #658 from lightning-signer/self-delay

Browse source 
ChannelKeys - provide to_self_delay alongside the remote channel pubkeys
This commit is contained in:
Matt Corallo 2020-07-29 12:08:13 -07:00 • committed by GitHub
commit 1d28a71c15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 98 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
lightning/src/chain/keysinterface.rs
View file

@ -69,7 +69,7 @@ pub enum SpendableOutputDescriptor {
/// ///
/// To derive the remote_revocation_pubkey provided here (which is used in the witness /// To derive the remote_revocation_pubkey provided here (which is used in the witness
/// script generation), you must pass the remote revocation_basepoint (which appears in the /// script generation), you must pass the remote revocation_basepoint (which appears in the
/// call to ChannelKeys::set_remote_channel_pubkeys) and the provided per_commitment point /// call to ChannelKeys::on_accept) and the provided per_commitment point
/// to chan_utils::derive_public_revocation_key. /// to chan_utils::derive_public_revocation_key.
/// ///
/// The witness script which is hashed and included in the output script_pubkey may be /// The witness script which is hashed and included in the output script_pubkey may be
@ -223,7 +223,7 @@ pub trait ChannelKeys : Send+Clone {
// TODO: Document the things someone using this interface should enforce before signing. // 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 // 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)! // making the callee generate it via some util function we expose)!
fn sign_remote_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, feerate_per_kw: u32, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()>; fn sign_remote_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, feerate_per_kw: u32, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()>;
/// Create a signature for a local commitment transaction. This will only ever be called with /// 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 /// the same local_commitment_tx (or a copy thereof), though there are currently no guarantees
@ -254,7 +254,7 @@ pub trait ChannelKeys : Send+Clone {
/// (implying they were considered dust at the time the commitment transaction was negotiated), /// (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 /// a corresponding None should be included in the return value. All other positions in the
/// return value must contain a signature. /// return value must contain a signature.
fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()>; fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()>;
/// Create a signature for the given input in a transaction spending an HTLC or commitment /// Create a signature for the given input in a transaction spending an HTLC or commitment
/// transaction output when our counterparty broadcasts an old state. /// transaction output when our counterparty broadcasts an old state.
@ -274,11 +274,7 @@ pub trait ChannelKeys : Send+Clone {
/// htlc holds HTLC elements (hash, timelock) if the output being spent is a HTLC output, thus /// htlc holds HTLC elements (hash, timelock) if the output being spent is a HTLC output, thus
/// changing the format of the witness script (which is committed to in the BIP 143 /// changing the format of the witness script (which is committed to in the BIP 143
/// signatures). /// signatures).
/// fn sign_justice_transaction<T: secp256k1::Signing + secp256k1::Verification>(&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey, htlc: &Option<HTLCOutputInCommitment>, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;
/// on_remote_tx_csv is the relative lock-time that that our counterparty would have to set on
/// their transaction were they to spend the same output. It is included in the witness script
/// and thus committed to in the BIP 143 signature.
fn sign_justice_transaction<T: secp256k1::Signing + secp256k1::Verification>(&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey, htlc: &Option<HTLCOutputInCommitment>, on_remote_tx_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;
/// Create a signature for a claiming transaction for a HTLC output on a remote commitment /// Create a signature for a claiming transaction for a HTLC output on a remote commitment
/// transaction, either offered or received. /// transaction, either offered or received.
@ -313,11 +309,13 @@ pub trait ChannelKeys : Send+Clone {
/// protocol. /// protocol.
fn sign_channel_announcement<T: secp256k1::Signing>(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>; fn sign_channel_announcement<T: secp256k1::Signing>(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;
/// Set the remote channel basepoints. This is done immediately on incoming channels /// Set the remote channel basepoints and remote/local to_self_delay.
/// and as soon as the channel is accepted on outgoing channels. /// This is done immediately on incoming channels and as soon as the channel is accepted on outgoing channels.
///
/// We bind local_to_self_delay late here for API convenience.
/// ///
/// Will be called before any signatures are applied. /// Will be called before any signatures are applied.
fn set_remote_channel_pubkeys(&mut self, channel_points: &ChannelPublicKeys); fn on_accept(&mut self, channel_points: &ChannelPublicKeys, remote_to_self_delay: u16, local_to_self_delay: u16);
} }
/// A trait to describe an object which can get user secrets and key material. /// A trait to describe an object which can get user secrets and key material.
@ -342,6 +340,25 @@ pub trait KeysInterface: Send + Sync {
fn get_channel_id(&self) -> [u8; 32]; fn get_channel_id(&self) -> [u8; 32];
} }
#[derive(Clone)]
/// Holds late-bound channel data.
/// This data is available after the channel is known to be accepted, either
/// when receiving an open_channel for an inbound channel or when
/// receiving accept_channel for an outbound channel.
struct AcceptedChannelData {
/// Remote public keys and base points
remote_channel_pubkeys: ChannelPublicKeys,
/// The to_self_delay value specified by our counterparty and applied on locally-broadcastable
/// transactions, ie the amount of time that we have to wait to recover our funds if we
/// broadcast a transaction. You'll likely want to pass this to the
/// ln::chan_utils::build*_transaction functions when signing local transactions.
remote_to_self_delay: u16,
/// The to_self_delay value specified by us and applied on transactions broadcastable
/// by our counterparty, ie the amount of time that they have to wait to recover their funds
/// if they broadcast a transaction.
local_to_self_delay: u16,
}
#[derive(Clone)] #[derive(Clone)]
/// A simple implementation of ChannelKeys that just keeps the private keys in memory. /// A simple implementation of ChannelKeys that just keeps the private keys in memory.
pub struct InMemoryChannelKeys { pub struct InMemoryChannelKeys {
@ -359,8 +376,8 @@ pub struct InMemoryChannelKeys {
pub commitment_seed: [u8; 32], pub commitment_seed: [u8; 32],
/// Local public keys and basepoints /// Local public keys and basepoints
pub(crate) local_channel_pubkeys: ChannelPublicKeys, pub(crate) local_channel_pubkeys: ChannelPublicKeys,
/// Remote public keys and base points /// Remote public keys and remote/local to_self_delay, populated on channel acceptance
pub(crate) remote_channel_pubkeys: Option<ChannelPublicKeys>, accepted_channel_data: Option<AcceptedChannelData>,
/// The total value of this channel /// The total value of this channel
channel_value_satoshis: u64, channel_value_satoshis: u64,
/// Key derivation parameters /// Key derivation parameters
@ -392,7 +409,7 @@ impl InMemoryChannelKeys {
commitment_seed, commitment_seed,
channel_value_satoshis, channel_value_satoshis,
local_channel_pubkeys, local_channel_pubkeys,
remote_channel_pubkeys: None, accepted_channel_data: None,
key_derivation_params, key_derivation_params,
} }
} }
@ -413,7 +430,22 @@ impl InMemoryChannelKeys {
} }
} }
fn remote_pubkeys<'a>(&'a self) -> &'a ChannelPublicKeys { self.remote_channel_pubkeys.as_ref().unwrap() } /// Remote pubkeys.
/// Will panic if on_accept wasn't called.
pub fn remote_pubkeys(&self) -> &ChannelPublicKeys { &self.accepted_channel_data.as_ref().unwrap().remote_channel_pubkeys }
/// The to_self_delay value specified by our counterparty and applied on locally-broadcastable
/// transactions, ie the amount of time that we have to wait to recover our funds if we
/// broadcast a transaction. You'll likely want to pass this to the
/// ln::chan_utils::build*_transaction functions when signing local transactions.
/// Will panic if on_accept wasn't called.
pub fn remote_to_self_delay(&self) -> u16 { self.accepted_channel_data.as_ref().unwrap().remote_to_self_delay }
/// The to_self_delay value specified by us and applied on transactions broadcastable
/// by our counterparty, ie the amount of time that they have to wait to recover their funds
/// if they broadcast a transaction.
/// Will panic if on_accept wasn't called.
pub fn local_to_self_delay(&self) -> u16 { self.accepted_channel_data.as_ref().unwrap().local_to_self_delay }
} }
impl ChannelKeys for InMemoryChannelKeys { impl ChannelKeys for InMemoryChannelKeys {
@ -429,12 +461,12 @@ impl ChannelKeys for InMemoryChannelKeys {
fn pubkeys(&self) -> &ChannelPublicKeys { &self.local_channel_pubkeys } fn pubkeys(&self) -> &ChannelPublicKeys { &self.local_channel_pubkeys }
fn key_derivation_params(&self) -> (u64, u64) { self.key_derivation_params } fn key_derivation_params(&self) -> (u64, u64) { self.key_derivation_params }
fn sign_remote_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, feerate_per_kw: u32, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()> { fn sign_remote_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, feerate_per_kw: u32, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()> {
if commitment_tx.input.len() != 1 { return Err(()); } if commitment_tx.input.len() != 1 { return Err(()); }
let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key); 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 accepted_data = self.accepted_channel_data.as_ref().expect("must accept before signing");
let channel_funding_redeemscript = make_funding_redeemscript(&funding_pubkey, &remote_channel_pubkeys.funding_pubkey); let channel_funding_redeemscript = make_funding_redeemscript(&funding_pubkey, &accepted_data.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_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_sig = secp_ctx.sign(&commitment_sighash, &self.funding_key);
@ -444,7 +476,7 @@ impl ChannelKeys for InMemoryChannelKeys {
let mut htlc_sigs = Vec::with_capacity(htlcs.len()); let mut htlc_sigs = Vec::with_capacity(htlcs.len());
for ref htlc in htlcs { for ref htlc in htlcs {
if let Some(_) = htlc.transaction_output_index { if let Some(_) = htlc.transaction_output_index {
let htlc_tx = chan_utils::build_htlc_transaction(&commitment_txid, feerate_per_kw, to_self_delay, htlc, &keys.a_delayed_payment_key, &keys.revocation_key); let htlc_tx = chan_utils::build_htlc_transaction(&commitment_txid, feerate_per_kw, accepted_data.local_to_self_delay, htlc, &keys.a_delayed_payment_key, &keys.revocation_key);
let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &keys); let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &keys);
let htlc_sighash = hash_to_message!(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]); let htlc_sighash = hash_to_message!(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]);
let our_htlc_key = match chan_utils::derive_private_key(&secp_ctx, &keys.per_commitment_point, &self.htlc_base_key) { let our_htlc_key = match chan_utils::derive_private_key(&secp_ctx, &keys.per_commitment_point, &self.htlc_base_key) {
@ -460,8 +492,8 @@ impl ChannelKeys for InMemoryChannelKeys {
fn sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> { fn sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key); 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 remote_channel_data = self.accepted_channel_data.as_ref().expect("must accept before signing");
let channel_funding_redeemscript = make_funding_redeemscript(&funding_pubkey, &remote_channel_pubkeys.funding_pubkey); let channel_funding_redeemscript = make_funding_redeemscript(&funding_pubkey, &remote_channel_data.remote_channel_pubkeys.funding_pubkey);
Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx)) Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx))
} }
@ -469,17 +501,18 @@ impl ChannelKeys for InMemoryChannelKeys {
#[cfg(test)] #[cfg(test)]
fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> { fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key); 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 remote_channel_pubkeys = &self.accepted_channel_data.as_ref().expect("must accept before signing").remote_channel_pubkeys;
let channel_funding_redeemscript = make_funding_redeemscript(&funding_pubkey, &remote_channel_pubkeys.funding_pubkey); 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)) 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<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()> { fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()> {
let local_csv = self.accepted_channel_data.as_ref().unwrap().remote_to_self_delay;
local_commitment_tx.get_htlc_sigs(&self.htlc_base_key, local_csv, secp_ctx) local_commitment_tx.get_htlc_sigs(&self.htlc_base_key, local_csv, secp_ctx)
} }
fn sign_justice_transaction<T: secp256k1::Signing + secp256k1::Verification>(&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey, htlc: &Option<HTLCOutputInCommitment>, on_remote_tx_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> { fn sign_justice_transaction<T: secp256k1::Signing + secp256k1::Verification>(&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey, htlc: &Option<HTLCOutputInCommitment>, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
let revocation_key = match chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_key, &self.revocation_base_key) { let revocation_key = match chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_key, &self.revocation_base_key) {
Ok(revocation_key) => revocation_key, Ok(revocation_key) => revocation_key,
Err(_) => return Err(()) Err(_) => return Err(())
@ -504,7 +537,7 @@ impl ChannelKeys for InMemoryChannelKeys {
Ok(remote_delayedpubkey) => remote_delayedpubkey, Ok(remote_delayedpubkey) => remote_delayedpubkey,
Err(_) => return Err(()) Err(_) => return Err(())
}; };
chan_utils::get_revokeable_redeemscript(&revocation_pubkey, on_remote_tx_csv, &remote_delayedpubkey) chan_utils::get_revokeable_redeemscript(&revocation_pubkey, self.local_to_self_delay(), &remote_delayedpubkey)
}; };
let sighash_parts = bip143::SighashComponents::new(&justice_tx); let sighash_parts = bip143::SighashComponents::new(&justice_tx);
let sighash = hash_to_message!(&sighash_parts.sighash_all(&justice_tx.input[input], &witness_script, amount)[..]); let sighash = hash_to_message!(&sighash_parts.sighash_all(&justice_tx.input[input], &witness_script, amount)[..]);
@ -532,9 +565,9 @@ impl ChannelKeys for InMemoryChannelKeys {
if closing_tx.input[0].witness.len() != 0 { return Err(()); } if closing_tx.input[0].witness.len() != 0 { return Err(()); }
if closing_tx.output.len() > 2 { 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 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 remote_channel_data = self.accepted_channel_data.as_ref().expect("must accept before signing");
let channel_funding_redeemscript = make_funding_redeemscript(&funding_pubkey, &remote_channel_data.remote_channel_pubkeys.funding_pubkey);
let sighash = hash_to_message!(&bip143::SighashComponents::new(closing_tx) let sighash = hash_to_message!(&bip143::SighashComponents::new(closing_tx)
.sighash_all(&closing_tx.input[0], &channel_funding_redeemscript, self.channel_value_satoshis)[..]); .sighash_all(&closing_tx.input[0], &channel_funding_redeemscript, self.channel_value_satoshis)[..]);
@ -546,12 +579,19 @@ impl ChannelKeys for InMemoryChannelKeys {
Ok(secp_ctx.sign(&msghash, &self.funding_key)) Ok(secp_ctx.sign(&msghash, &self.funding_key))
} }
fn set_remote_channel_pubkeys(&mut self, channel_pubkeys: &ChannelPublicKeys) { fn on_accept(&mut self, channel_pubkeys: &ChannelPublicKeys, remote_to_self_delay: u16, local_to_self_delay: u16) {
assert!(self.remote_channel_pubkeys.is_none(), "Already set remote channel pubkeys"); assert!(self.accepted_channel_data.is_none(), "Already accepted");
self.remote_channel_pubkeys = Some(channel_pubkeys.clone()); self.accepted_channel_data = Some(AcceptedChannelData {
remote_channel_pubkeys: channel_pubkeys.clone(),
remote_to_self_delay,
local_to_self_delay,
});
} }
} }
impl_writeable!(AcceptedChannelData, 0,
{ remote_channel_pubkeys, remote_to_self_delay, local_to_self_delay });
impl Writeable for InMemoryChannelKeys { impl Writeable for InMemoryChannelKeys {
fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> { fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
self.funding_key.write(writer)?; self.funding_key.write(writer)?;
@ -560,7 +600,7 @@ impl Writeable for InMemoryChannelKeys {
self.delayed_payment_base_key.write(writer)?; self.delayed_payment_base_key.write(writer)?;
self.htlc_base_key.write(writer)?; self.htlc_base_key.write(writer)?;
self.commitment_seed.write(writer)?; self.commitment_seed.write(writer)?;
self.remote_channel_pubkeys.write(writer)?; self.accepted_channel_data.write(writer)?;
self.channel_value_satoshis.write(writer)?; self.channel_value_satoshis.write(writer)?;
self.key_derivation_params.0.write(writer)?; self.key_derivation_params.0.write(writer)?;
self.key_derivation_params.1.write(writer)?; self.key_derivation_params.1.write(writer)?;
@ -577,7 +617,7 @@ impl Readable for InMemoryChannelKeys {
let delayed_payment_base_key = Readable::read(reader)?; let delayed_payment_base_key = Readable::read(reader)?;
let htlc_base_key = Readable::read(reader)?; let htlc_base_key = Readable::read(reader)?;
let commitment_seed = Readable::read(reader)?; let commitment_seed = Readable::read(reader)?;
let remote_channel_pubkeys = Readable::read(reader)?; let remote_channel_data = Readable::read(reader)?;
let channel_value_satoshis = Readable::read(reader)?; let channel_value_satoshis = Readable::read(reader)?;
let secp_ctx = Secp256k1::signing_only(); let secp_ctx = Secp256k1::signing_only();
let local_channel_pubkeys = let local_channel_pubkeys =
@ -596,7 +636,7 @@ impl Readable for InMemoryChannelKeys {
commitment_seed, commitment_seed,
channel_value_satoshis, channel_value_satoshis,
local_channel_pubkeys, local_channel_pubkeys,
remote_channel_pubkeys, accepted_channel_data: remote_channel_data,
key_derivation_params: (params_1, params_2), key_derivation_params: (params_1, params_2),
}) })
} }

21
lightning/src/ln/channel.rs
View file

@ -458,6 +458,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
where K::Target: KeysInterface<ChanKeySigner = ChanSigner>, where K::Target: KeysInterface<ChanKeySigner = ChanSigner>,
F::Target: FeeEstimator, F::Target: FeeEstimator,
{ {
let our_to_self_delay = config.own_channel_config.our_to_self_delay;
let chan_keys = keys_provider.get_channel_keys(false, channel_value_satoshis); let chan_keys = keys_provider.get_channel_keys(false, channel_value_satoshis);
if channel_value_satoshis >= MAX_FUNDING_SATOSHIS { if channel_value_satoshis >= MAX_FUNDING_SATOSHIS {
@ -467,8 +468,8 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
if push_msat > channel_value_msat { if push_msat > channel_value_msat {
return Err(APIError::APIMisuseError { err: format!("Push value ({}) was larger than channel_value ({})", push_msat, channel_value_msat) }); return Err(APIError::APIMisuseError { err: format!("Push value ({}) was larger than channel_value ({})", push_msat, channel_value_msat) });
} }
if config.own_channel_config.our_to_self_delay < BREAKDOWN_TIMEOUT { if our_to_self_delay < BREAKDOWN_TIMEOUT {
return Err(APIError::APIMisuseError {err: format!("Configured with an unreasonable our_to_self_delay ({}) putting user funds at risks", config.own_channel_config.our_to_self_delay)}); return Err(APIError::APIMisuseError {err: format!("Configured with an unreasonable our_to_self_delay ({}) putting user funds at risks", our_to_self_delay)});
} }
let background_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background); let background_feerate = fee_estimator.get_est_sat_per_1000_weight(ConfirmationTarget::Background);
if Channel::<ChanSigner>::get_remote_channel_reserve_satoshis(channel_value_satoshis) < Channel::<ChanSigner>::derive_our_dust_limit_satoshis(background_feerate) { if Channel::<ChanSigner>::get_remote_channel_reserve_satoshis(channel_value_satoshis) < Channel::<ChanSigner>::derive_our_dust_limit_satoshis(background_feerate) {
@ -535,7 +536,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
their_htlc_minimum_msat: 0, their_htlc_minimum_msat: 0,
our_htlc_minimum_msat: if config.own_channel_config.our_htlc_minimum_msat == 0 { 1 } else { config.own_channel_config.our_htlc_minimum_msat }, our_htlc_minimum_msat: if config.own_channel_config.our_htlc_minimum_msat == 0 { 1 } else { config.own_channel_config.our_htlc_minimum_msat },
their_to_self_delay: 0, their_to_self_delay: 0,
our_to_self_delay: config.own_channel_config.our_to_self_delay, our_to_self_delay,
their_max_accepted_htlcs: 0, their_max_accepted_htlcs: 0,
minimum_depth: 0, // Filled in in accept_channel minimum_depth: 0, // Filled in in accept_channel
@ -582,7 +583,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
delayed_payment_basepoint: msg.delayed_payment_basepoint, delayed_payment_basepoint: msg.delayed_payment_basepoint,
htlc_basepoint: msg.htlc_basepoint htlc_basepoint: msg.htlc_basepoint
}; };
chan_keys.set_remote_channel_pubkeys(&their_pubkeys); chan_keys.on_accept(&their_pubkeys, msg.to_self_delay, config.own_channel_config.our_to_self_delay);
let mut local_config = (*config).channel_options.clone(); let mut local_config = (*config).channel_options.clone();
if config.own_channel_config.our_to_self_delay < BREAKDOWN_TIMEOUT { if config.own_channel_config.our_to_self_delay < BREAKDOWN_TIMEOUT {
@ -1457,7 +1458,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
htlc_basepoint: msg.htlc_basepoint htlc_basepoint: msg.htlc_basepoint
}; };
self.local_keys.set_remote_channel_pubkeys(&their_pubkeys); self.local_keys.on_accept(&their_pubkeys, msg.to_self_delay, self.our_to_self_delay);
self.their_pubkeys = Some(their_pubkeys); self.their_pubkeys = Some(their_pubkeys);
self.their_cur_commitment_point = Some(msg.first_per_commitment_point); self.their_cur_commitment_point = Some(msg.first_per_commitment_point);
@ -1483,7 +1484,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
let remote_keys = self.build_remote_transaction_keys()?; let remote_keys = self.build_remote_transaction_keys()?;
let remote_initial_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, false, self.feerate_per_kw, logger).0; let remote_initial_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, false, self.feerate_per_kw, logger).0;
let remote_signature = self.local_keys.sign_remote_commitment(self.feerate_per_kw, &remote_initial_commitment_tx, &remote_keys, &Vec::new(), self.our_to_self_delay, &self.secp_ctx) let remote_signature = self.local_keys.sign_remote_commitment(self.feerate_per_kw, &remote_initial_commitment_tx, &remote_keys, &Vec::new(), &self.secp_ctx)
.map_err(|_| ChannelError::Close("Failed to get signatures for new commitment_signed".to_owned()))?.0; .map_err(|_| ChannelError::Close("Failed to get signatures for new commitment_signed".to_owned()))?.0;
// We sign the "remote" commitment transaction, allowing them to broadcast the tx if they wish. // We sign the "remote" commitment transaction, allowing them to broadcast the tx if they wish.
@ -3524,7 +3525,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
fn get_outbound_funding_created_signature<L: Deref>(&mut self, logger: &L) -> Result<Signature, ChannelError> where L::Target: Logger { fn get_outbound_funding_created_signature<L: Deref>(&mut self, logger: &L) -> Result<Signature, ChannelError> where L::Target: Logger {
let remote_keys = self.build_remote_transaction_keys()?; let remote_keys = self.build_remote_transaction_keys()?;
let remote_initial_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, false, self.feerate_per_kw, logger).0; let remote_initial_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, false, self.feerate_per_kw, logger).0;
Ok(self.local_keys.sign_remote_commitment(self.feerate_per_kw, &remote_initial_commitment_tx, &remote_keys, &Vec::new(), self.our_to_self_delay, &self.secp_ctx) Ok(self.local_keys.sign_remote_commitment(self.feerate_per_kw, &remote_initial_commitment_tx, &remote_keys, &Vec::new(), &self.secp_ctx)
.map_err(|_| ChannelError::Close("Failed to get signatures for new commitment_signed".to_owned()))?.0) .map_err(|_| ChannelError::Close("Failed to get signatures for new commitment_signed".to_owned()))?.0)
} }
@ -3877,7 +3878,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
htlcs.push(htlc); htlcs.push(htlc);
} }
let res = self.local_keys.sign_remote_commitment(feerate_per_kw, &remote_commitment_tx.0, &remote_keys, &htlcs, self.our_to_self_delay, &self.secp_ctx) let res = self.local_keys.sign_remote_commitment(feerate_per_kw, &remote_commitment_tx.0, &remote_keys, &htlcs, &self.secp_ctx)
.map_err(|_| ChannelError::Close("Failed to get signatures for new commitment_signed".to_owned()))?; .map_err(|_| ChannelError::Close("Failed to get signatures for new commitment_signed".to_owned()))?;
signature = res.0; signature = res.0;
htlc_signatures = res.1; htlc_signatures = res.1;
@ -4670,7 +4671,7 @@ mod tests {
delayed_payment_basepoint: public_from_secret_hex(&secp_ctx, "1552dfba4f6cf29a62a0af13c8d6981d36d0ef8d61ba10fb0fe90da7634d7e13"), delayed_payment_basepoint: public_from_secret_hex(&secp_ctx, "1552dfba4f6cf29a62a0af13c8d6981d36d0ef8d61ba10fb0fe90da7634d7e13"),
htlc_basepoint: public_from_secret_hex(&secp_ctx, "4444444444444444444444444444444444444444444444444444444444444444") htlc_basepoint: public_from_secret_hex(&secp_ctx, "4444444444444444444444444444444444444444444444444444444444444444")
}; };
chan_keys.set_remote_channel_pubkeys(&their_pubkeys); chan_keys.on_accept(&their_pubkeys, chan.their_to_self_delay, chan.our_to_self_delay);
assert_eq!(their_pubkeys.payment_point.serialize()[..], assert_eq!(their_pubkeys.payment_point.serialize()[..],
hex::decode("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991").unwrap()[..]); hex::decode("032c0b7cf95324a07d05398b240174dc0c2be444d96b159aa6c7f7b1e668680991").unwrap()[..]);
@ -4726,7 +4727,7 @@ mod tests {
assert_eq!(serialize(&localtx.add_local_sig(&redeemscript, local_sig))[..], assert_eq!(serialize(&localtx.add_local_sig(&redeemscript, local_sig))[..],
hex::decode($tx_hex).unwrap()[..]); hex::decode($tx_hex).unwrap()[..]);
let htlc_sigs = chan_keys.sign_local_commitment_htlc_transactions(&localtx, chan.their_to_self_delay, &chan.secp_ctx).unwrap(); let htlc_sigs = chan_keys.sign_local_commitment_htlc_transactions(&localtx, &chan.secp_ctx).unwrap();
let mut htlc_sig_iter = localtx.per_htlc.iter().zip(htlc_sigs.iter().enumerate()); let mut htlc_sig_iter = localtx.per_htlc.iter().zip(htlc_sigs.iter().enumerate());
$({ $({

3
lightning/src/ln/functional_tests.rs
View file

@ -1694,8 +1694,7 @@ fn test_fee_spike_violation_fails_htlc() {
let local_chan_lock = nodes[0].node.channel_state.lock().unwrap(); let local_chan_lock = nodes[0].node.channel_state.lock().unwrap();
let local_chan = local_chan_lock.by_id.get(&chan.2).unwrap(); let local_chan = local_chan_lock.by_id.get(&chan.2).unwrap();
let local_chan_keys = local_chan.get_local_keys(); let local_chan_keys = local_chan.get_local_keys();
local_chan_keys.sign_remote_commitment(feerate_per_kw, &commit_tx, &commit_tx_keys, &[&accepted_htlc_info], local_chan_keys.sign_remote_commitment(feerate_per_kw, &commit_tx, &commit_tx_keys, &[&accepted_htlc_info], &secp_ctx).unwrap()
BREAKDOWN_TIMEOUT, &secp_ctx).unwrap()
}; };
let commit_signed_msg = msgs::CommitmentSigned { let commit_signed_msg = msgs::CommitmentSigned {

6
lightning/src/ln/onchaintx.rs
View file

@ -582,7 +582,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
chan_utils::get_revokeable_redeemscript(&chan_keys.revocation_key, *on_remote_tx_csv, &chan_keys.a_delayed_payment_key) chan_utils::get_revokeable_redeemscript(&chan_keys.revocation_key, *on_remote_tx_csv, &chan_keys.a_delayed_payment_key)
}; };
if let Ok(sig) = self.key_storage.sign_justice_transaction(&bumped_tx, i, *amount, &per_commitment_key, htlc, *on_remote_tx_csv, &self.secp_ctx) { if let Ok(sig) = self.key_storage.sign_justice_transaction(&bumped_tx, i, *amount, &per_commitment_key, htlc, &self.secp_ctx) {
bumped_tx.input[i].witness.push(sig.serialize_der().to_vec()); bumped_tx.input[i].witness.push(sig.serialize_der().to_vec());
bumped_tx.input[i].witness[0].push(SigHashType::All as u8); bumped_tx.input[i].witness[0].push(SigHashType::All as u8);
if htlc.is_some() { if htlc.is_some() {
@ -884,7 +884,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
fn sign_latest_local_htlcs(&mut self) { fn sign_latest_local_htlcs(&mut self) {
if let Some(ref local_commitment) = self.local_commitment { if let Some(ref local_commitment) = self.local_commitment {
if let Ok(sigs) = self.key_storage.sign_local_commitment_htlc_transactions(local_commitment, self.on_local_tx_csv, &self.secp_ctx) { if let Ok(sigs) = self.key_storage.sign_local_commitment_htlc_transactions(local_commitment, &self.secp_ctx) {
self.local_htlc_sigs = Some(Vec::new()); self.local_htlc_sigs = Some(Vec::new());
let ret = self.local_htlc_sigs.as_mut().unwrap(); let ret = self.local_htlc_sigs.as_mut().unwrap();
for (htlc_idx, (local_sig, &(ref htlc, _))) in sigs.iter().zip(local_commitment.per_htlc.iter()).enumerate() { for (htlc_idx, (local_sig, &(ref htlc, _))) in sigs.iter().zip(local_commitment.per_htlc.iter()).enumerate() {
@ -900,7 +900,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
} }
fn sign_prev_local_htlcs(&mut self) { fn sign_prev_local_htlcs(&mut self) {
if let Some(ref local_commitment) = self.prev_local_commitment { if let Some(ref local_commitment) = self.prev_local_commitment {
if let Ok(sigs) = self.key_storage.sign_local_commitment_htlc_transactions(local_commitment, self.on_local_tx_csv, &self.secp_ctx) { if let Ok(sigs) = self.key_storage.sign_local_commitment_htlc_transactions(local_commitment, &self.secp_ctx) {
self.prev_local_htlc_sigs = Some(Vec::new()); self.prev_local_htlc_sigs = Some(Vec::new());
let ret = self.prev_local_htlc_sigs.as_mut().unwrap(); let ret = self.prev_local_htlc_sigs.as_mut().unwrap();
for (htlc_idx, (local_sig, &(ref htlc, _))) in sigs.iter().zip(local_commitment.per_htlc.iter()).enumerate() { for (htlc_idx, (local_sig, &(ref htlc, _))) in sigs.iter().zip(local_commitment.per_htlc.iter()).enumerate() {

19
lightning/src/util/enforcing_trait_impls.rs
View file

@ -35,7 +35,7 @@ impl EnforcingChannelKeys {
impl EnforcingChannelKeys { impl EnforcingChannelKeys {
fn check_keys<T: secp256k1::Signing + secp256k1::Verification>(&self, secp_ctx: &Secp256k1<T>, fn check_keys<T: secp256k1::Signing + secp256k1::Verification>(&self, secp_ctx: &Secp256k1<T>,
keys: &TxCreationKeys) { keys: &TxCreationKeys) {
let remote_points = self.inner.remote_channel_pubkeys.as_ref().unwrap(); let remote_points = self.inner.remote_pubkeys();
let keys_expected = TxCreationKeys::new(secp_ctx, let keys_expected = TxCreationKeys::new(secp_ctx,
&keys.per_commitment_point, &keys.per_commitment_point,
@ -60,7 +60,7 @@ impl ChannelKeys for EnforcingChannelKeys {
fn pubkeys(&self) -> &ChannelPublicKeys { self.inner.pubkeys() } fn pubkeys(&self) -> &ChannelPublicKeys { self.inner.pubkeys() }
fn key_derivation_params(&self) -> (u64, u64) { self.inner.key_derivation_params() } fn key_derivation_params(&self) -> (u64, u64) { self.inner.key_derivation_params() }
fn sign_remote_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, feerate_per_kw: u32, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()> { fn sign_remote_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, feerate_per_kw: u32, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()> {
if commitment_tx.input.len() != 1 { panic!("lightning commitment transactions have a single input"); } if commitment_tx.input.len() != 1 { panic!("lightning commitment transactions have a single input"); }
self.check_keys(secp_ctx, keys); self.check_keys(secp_ctx, keys);
let obscured_commitment_transaction_number = (commitment_tx.lock_time & 0xffffff) as u64 | ((commitment_tx.input[0].sequence as u64 & 0xffffff) << 3*8); let obscured_commitment_transaction_number = (commitment_tx.lock_time & 0xffffff) as u64 | ((commitment_tx.input[0].sequence as u64 & 0xffffff) << 3*8);
@ -75,7 +75,7 @@ impl ChannelKeys for EnforcingChannelKeys {
commitment_data.1 = cmp::max(commitment_number, commitment_data.1) commitment_data.1 = cmp::max(commitment_number, commitment_data.1)
} }
Ok(self.inner.sign_remote_commitment(feerate_per_kw, commitment_tx, keys, htlcs, to_self_delay, secp_ctx).unwrap()) Ok(self.inner.sign_remote_commitment(feerate_per_kw, commitment_tx, keys, htlcs, secp_ctx).unwrap())
} }
fn sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> { fn sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
@ -89,8 +89,9 @@ impl ChannelKeys for EnforcingChannelKeys {
Ok(self.inner.unsafe_sign_local_commitment(local_commitment_tx, secp_ctx).unwrap()) Ok(self.inner.unsafe_sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
} }
fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()> { fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()> {
let commitment_txid = local_commitment_tx.txid(); let commitment_txid = local_commitment_tx.txid();
let local_csv = self.inner.remote_to_self_delay();
for this_htlc in local_commitment_tx.per_htlc.iter() { for this_htlc in local_commitment_tx.per_htlc.iter() {
if this_htlc.0.transaction_output_index.is_some() { if this_htlc.0.transaction_output_index.is_some() {
@ -103,11 +104,11 @@ impl ChannelKeys for EnforcingChannelKeys {
} }
} }
Ok(self.inner.sign_local_commitment_htlc_transactions(local_commitment_tx, local_csv, secp_ctx).unwrap()) Ok(self.inner.sign_local_commitment_htlc_transactions(local_commitment_tx, secp_ctx).unwrap())
} }
fn sign_justice_transaction<T: secp256k1::Signing + secp256k1::Verification>(&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey, htlc: &Option<HTLCOutputInCommitment>, on_remote_tx_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> { fn sign_justice_transaction<T: secp256k1::Signing + secp256k1::Verification>(&self, justice_tx: &Transaction, input: usize, amount: u64, per_commitment_key: &SecretKey, htlc: &Option<HTLCOutputInCommitment>, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
Ok(self.inner.sign_justice_transaction(justice_tx, input, amount, per_commitment_key, htlc, on_remote_tx_csv, secp_ctx).unwrap()) Ok(self.inner.sign_justice_transaction(justice_tx, input, amount, per_commitment_key, htlc, secp_ctx).unwrap())
} }
fn sign_remote_htlc_transaction<T: secp256k1::Signing + secp256k1::Verification>(&self, htlc_tx: &Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, htlc: &HTLCOutputInCommitment, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> { fn sign_remote_htlc_transaction<T: secp256k1::Signing + secp256k1::Verification>(&self, htlc_tx: &Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, htlc: &HTLCOutputInCommitment, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
@ -122,8 +123,8 @@ impl ChannelKeys for EnforcingChannelKeys {
self.inner.sign_channel_announcement(msg, secp_ctx) self.inner.sign_channel_announcement(msg, secp_ctx)
} }
fn set_remote_channel_pubkeys(&mut self, channel_pubkeys: &ChannelPublicKeys) { fn on_accept(&mut self, channel_pubkeys: &ChannelPublicKeys, remote_to_self_delay: u16, local_to_self_delay: u16) {
self.inner.set_remote_channel_pubkeys(channel_pubkeys) self.inner.on_accept(channel_pubkeys, remote_to_self_delay, local_to_self_delay)
} }
} }