don't serialize computable field in InMemoryChannelKeys

Author: devrandom

fuzz/src/chanmon_consistency.rs

@@ -161,6 +161,7 @@ impl KeysInterface for KeyProvider {
 			SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, self.node_id]).unwrap(),
 			[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 			channel_value_satoshis,
+			None,
 		))
 	}
 

fuzz/src/full_stack.rs

@@ -263,6 +263,7 @@ impl KeysInterface for KeyProvider {
 				SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, ctr]).unwrap(),
 				[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, ctr],
 				channel_value_satoshis,
+				None,
 			)
 		} else {
 			InMemoryChannelKeys::new(
@@ -274,6 +275,7 @@ impl KeysInterface for KeyProvider {
 				SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, ctr]).unwrap(),
 				[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, ctr],
 				channel_value_satoshis,
+				None,
 			)
 		})
 	}

lightning/src/chain/keysinterface.rs

@@ -21,14 +21,16 @@ use secp256k1;
 
 use util::byte_utils;
 use util::logger::Logger;
-use util::ser::Writeable;
+use util::ser::{Writeable, Writer, Readable};
 
 use ln::chan_utils;
 use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys};
 use ln::msgs;
 
 use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
+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
@@ -214,7 +216,8 @@ impl InMemoryChannelKeys {
 		delayed_payment_base_key: SecretKey,
 		htlc_base_key: SecretKey,
 		commitment_seed: [u8; 32],
-		channel_value_satoshis: u64) -> InMemoryChannelKeys {
+		channel_value_satoshis: u64,
+		remote_channel_pubkeys: Option<ChannelPublicKeys>) -> InMemoryChannelKeys {
 		let from_secret = |s: &SecretKey| PublicKey::from_secret_key(secp_ctx, s);
 		let local_keys = ChannelPublicKeys {
 			funding_pubkey: from_secret(&funding_key),
@@ -231,7 +234,7 @@ impl InMemoryChannelKeys {
 			htlc_base_key,
 			commitment_seed,
 			channel_value_satoshis,
-			remote_channel_pubkeys: None,
+			remote_channel_pubkeys,
 			local_channel_pubkeys: local_keys
 		}
 	}
@@ -301,17 +304,47 @@ impl ChannelKeys for InMemoryChannelKeys {
 	}
 }
 
-impl_writeable!(InMemoryChannelKeys, 0, {
-	funding_key,
-	revocation_base_key,
-	payment_base_key,
-	delayed_payment_base_key,
-	htlc_base_key,
-	commitment_seed,
-	local_channel_pubkeys,
-	remote_channel_pubkeys,
-	channel_value_satoshis
-});
+impl Writeable for InMemoryChannelKeys {
+	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
+		self.funding_key.write(writer)?;
+		self.revocation_base_key.write(writer)?;
+		self.payment_base_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<R: ::std::io::Read> Readable<R> for InMemoryChannelKeys {
+	fn read(reader: &mut R) -> Result<Self, DecodeError> {
+		let funding_key = Readable::read(reader)?;
+		let revocation_base_key = Readable::read(reader)?;
+		let payment_base_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();
+
+
+		Ok(InMemoryChannelKeys::new(
+			&secp_ctx,
+			funding_key,
+			revocation_base_key,
+			payment_base_key,
+			delayed_payment_base_key,
+			htlc_base_key,
+			commitment_seed,
+			channel_value_satoshis,
+			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.
@@ -461,6 +494,7 @@ impl KeysInterface for KeysManager {
 			htlc_base_key,
 			commitment_seed,
 			channel_value_satoshis,
+			None,
 		)
 	}
 

lightning/src/ln/channel.rs

@@ -4130,6 +4130,7 @@ mod tests {
 			// These aren't set in the test vectors:
 			[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff],
 			7000000000,
+			None,
 		);
 
 		assert_eq!(PublicKey::from_secret_key(&secp_ctx, chan_keys.funding_key()).serialize()[..],

lightning/src/ln/channelmonitor.rs

@@ -3327,6 +3327,7 @@ mod tests {
 			SecretKey::from_slice(&[41; 32]).unwrap(),
 			[41; 32],
 			0,
+			None,
 		);
 
 		{
@@ -3741,6 +3742,7 @@ mod tests {
 			SecretKey::from_slice(&[41; 32]).unwrap(),
 			[41; 32],
 			0,
+			None,
 		);
 
 		// Prune with one old state and a local commitment tx holding a few overlaps with the