Return Result<Signature> instead of modifying args in ChannelKeys

[rust-lightning] / lightning / src / util / enforcing_trait_impls.rs

diff --git a/lightning/src/util/enforcing_trait_impls.rs b/lightning/src/util/enforcing_trait_impls.rs
index daee724ae6ac837b282bcfd0445c3746c6ed88bc..989a16c3753758e7c749e79128e0d2de4dde73ea 100644 (file)
--- a/lightning/src/util/enforcing_trait_impls.rs
+++ b/lightning/src/util/enforcing_trait_impls.rs
@@ -1,28 +1,33 @@
-use ln::chan_utils::{HTLCOutputInCommitment, TxCreationKeys, ChannelPublicKeys};
+use ln::chan_utils::{HTLCOutputInCommitment, TxCreationKeys, ChannelPublicKeys, LocalCommitmentTransaction};
+use ln::channelmanager::PaymentPreimage;
 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 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>, u64)>,
+       commitment_number_obscure_and_last: Arc<Mutex<(Option<u64>, 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))),
                }
        }
 }
@@ -30,9 +35,9 @@ impl EnforcingChannelKeys {
 impl EnforcingChannelKeys {
        fn check_keys<T: secp256k1::Signing + secp256k1::Verification>(&self, secp_ctx: &Secp256k1<T>,
                                                                       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 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();
 
@@ -54,6 +59,7 @@ 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<T: secp256k1::Signing + secp256k1::Verification>(&self, feerate_per_kw: u64, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()> {
                if commitment_tx.input.len() != 1 { panic!("lightning commitment transactions have a single input"); }
@@ -73,6 +79,19 @@ impl ChannelKeys for EnforcingChannelKeys {
                Ok(self.inner.sign_remote_commitment(feerate_per_kw, commitment_tx, keys, htlcs, to_self_delay, secp_ctx).unwrap())
        }
 
+       fn sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
+               self.inner.sign_local_commitment(local_commitment_tx, secp_ctx)
+       }
+
+       #[cfg(test)]
+       fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
+               self.inner.unsafe_sign_local_commitment(local_commitment_tx, secp_ctx)
+       }
+
+       fn sign_htlc_transaction<T: secp256k1::Signing>(&self, local_commitment_tx: &mut LocalCommitmentTransaction, htlc_index: u32, preimage: Option<PaymentPreimage>, local_csv: u16, secp_ctx: &Secp256k1<T>) {
+               self.inner.sign_htlc_transaction(local_commitment_tx, htlc_index, preimage, local_csv, secp_ctx);
+       }
+
        fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
                Ok(self.inner.sign_closing_transaction(closing_tx, secp_ctx).unwrap())
        }
@@ -86,8 +105,23 @@ impl ChannelKeys for EnforcingChannelKeys {
        }
 }
 
+impl Writeable for EnforcingChannelKeys {
+       fn write<W: Writer>(&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<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
+               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))
+               })
+       }
+}