X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fenforcing_trait_impls.rs;h=26c3a07775fa37670d585507499d2d57deaa9aa3;hb=32ca8ec13e0928cbb4f7067a3fb6d41f39691d1c;hp=ee90fe7acf8ead65b3b7701f619d398db154f4fd;hpb=6200302dc790bc3aeb1095c783e039272393b445;p=rust-lightning diff --git a/lightning/src/util/enforcing_trait_impls.rs b/lightning/src/util/enforcing_trait_impls.rs index ee90fe7a..26c3a077 100644 --- a/lightning/src/util/enforcing_trait_impls.rs +++ b/lightning/src/util/enforcing_trait_impls.rs @@ -1,32 +1,56 @@ -use ln::chan_utils::{HTLCOutputInCommitment, TxCreationKeys}; +use ln::chan_utils::{HTLCOutputInCommitment, TxCreationKeys, ChannelPublicKeys}; use ln::msgs; use chain::keysinterface::{ChannelKeys, InMemoryChannelKeys}; use std::cmp; -use std::sync::Mutex; +use std::sync::{Mutex, Arc}; use bitcoin::blockdata::transaction::Transaction; -use bitcoin::blockdata::script::Script; use secp256k1; use secp256k1::key::{SecretKey, PublicKey}; use secp256k1::{Secp256k1, Signature}; +use util::ser::{Writeable, Writer, Readable}; +use std::io::Error; +use ln::msgs::DecodeError; /// Enforces some rules on ChannelKeys calls. Eventually we will probably want to expose a variant /// of this which would essentially be what you'd want to run on a hardware wallet. +#[derive(Clone)] pub struct EnforcingChannelKeys { pub inner: InMemoryChannelKeys, - commitment_number_obscure_and_last: Mutex<(Option, u64)>, + commitment_number_obscure_and_last: Arc, u64)>>, } impl EnforcingChannelKeys { pub fn new(inner: InMemoryChannelKeys) -> Self { Self { inner, - commitment_number_obscure_and_last: Mutex::new((None, 0)), + commitment_number_obscure_and_last: Arc::new(Mutex::new((None, 0))), } } } + +impl EnforcingChannelKeys { + fn check_keys(&self, secp_ctx: &Secp256k1, + keys: &TxCreationKeys) { + let revocation_base = PublicKey::from_secret_key(secp_ctx, &self.inner.revocation_base_key()); + let payment_base = PublicKey::from_secret_key(secp_ctx, &self.inner.payment_base_key()); + let htlc_base = PublicKey::from_secret_key(secp_ctx, &self.inner.htlc_base_key()); + + let remote_points = self.inner.remote_channel_pubkeys.as_ref().unwrap(); + + let keys_expected = TxCreationKeys::new(secp_ctx, + &keys.per_commitment_point, + &remote_points.delayed_payment_basepoint, + &remote_points.htlc_basepoint, + &revocation_base, + &payment_base, + &htlc_base).unwrap(); + if keys != &keys_expected { panic!("derived different per-tx keys") } + } +} + impl ChannelKeys for EnforcingChannelKeys { fn funding_key(&self) -> &SecretKey { self.inner.funding_key() } fn revocation_base_key(&self) -> &SecretKey { self.inner.revocation_base_key() } @@ -34,9 +58,11 @@ impl ChannelKeys for EnforcingChannelKeys { fn delayed_payment_base_key(&self) -> &SecretKey { self.inner.delayed_payment_base_key() } fn htlc_base_key(&self) -> &SecretKey { self.inner.htlc_base_key() } fn commitment_seed(&self) -> &[u8; 32] { self.inner.commitment_seed() } + fn pubkeys<'a>(&'a self) -> &'a ChannelPublicKeys { self.inner.pubkeys() } - fn sign_remote_commitment(&self, channel_value_satoshis: u64, 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 { panic!(); } + 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 { panic!("lightning commitment transactions have a single input"); } + 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); { @@ -49,23 +75,39 @@ impl ChannelKeys for EnforcingChannelKeys { commitment_data.1 = cmp::max(commitment_number, commitment_data.1) } - Ok(self.inner.sign_remote_commitment(channel_value_satoshis, 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, to_self_delay, secp_ctx).unwrap()) } - fn sign_closing_transaction(&self, channel_value_satoshis: u64, channel_funding_redeemscript: &Script, closing_tx: &Transaction, secp_ctx: &Secp256k1) -> Result { - Ok(self.inner.sign_closing_transaction(channel_value_satoshis, channel_funding_redeemscript, closing_tx, secp_ctx).unwrap()) + fn sign_closing_transaction(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1) -> Result { + Ok(self.inner.sign_closing_transaction(closing_tx, secp_ctx).unwrap()) } fn sign_channel_announcement(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1) -> Result { self.inner.sign_channel_announcement(msg, secp_ctx) } - fn set_remote_funding_pubkey(&mut self, key: &PublicKey) { - self.inner.set_remote_funding_pubkey(key) + fn set_remote_channel_pubkeys(&mut self, channel_pubkeys: &ChannelPublicKeys) { + self.inner.set_remote_channel_pubkeys(channel_pubkeys) + } +} + +impl Writeable for EnforcingChannelKeys { + fn write(&self, writer: &mut W) -> Result<(), Error> { + self.inner.write(writer)?; + let (obscure, last) = *self.commitment_number_obscure_and_last.lock().unwrap(); + obscure.write(writer)?; + last.write(writer)?; + Ok(()) } } -impl_writeable!(EnforcingChannelKeys, 0, { - inner, - commitment_number_obscure_and_last -}); +impl Readable for EnforcingChannelKeys { + fn read(reader: &mut R) -> Result { + let inner = Readable::read(reader)?; + let obscure_and_last = Readable::read(reader)?; + Ok(EnforcingChannelKeys { + inner: inner, + commitment_number_obscure_and_last: Arc::new(Mutex::new(obscure_and_last)) + }) + } +}