Merge pull request #223 from TheBlueMatt/2018-10-chanmanager-serialize

Implement and document Channel/ChannelManager (de)serialization

Author: TheBlueMatt

fuzz/fuzz_targets/chanmon_deser_target.rs

@@ -1,13 +1,20 @@
 // This file is auto-generated by gen_target.sh based on msg_target_template.txt
 // To modify it, modify msg_target_template.txt and run gen_target.sh instead.
 
+extern crate bitcoin;
 extern crate lightning;
 
+use bitcoin::util::hash::Sha256dHash;
+
 use lightning::ln::channelmonitor;
 use lightning::util::reset_rng_state;
-use lightning::util::ser::{Readable, Writer};
+use lightning::util::ser::{ReadableArgs, Writer};
+
+mod utils;
+use utils::test_logger;
 
 use std::io::Cursor;
+use std::sync::Arc;
 
 struct VecWriter(Vec<u8>);
 impl Writer for VecWriter {
@@ -23,10 +30,13 @@ impl Writer for VecWriter {
 #[inline]
 pub fn do_test(data: &[u8]) {
 	reset_rng_state();
-	if let Ok(monitor) = channelmonitor::ChannelMonitor::read(&mut Cursor::new(data)) {
+	let logger = Arc::new(test_logger::TestLogger{});
+	if let Ok((latest_block_hash, monitor)) = <(Sha256dHash, channelmonitor::ChannelMonitor)>::read(&mut Cursor::new(data), logger.clone()) {
 		let mut w = VecWriter(Vec::new());
 		monitor.write_for_disk(&mut w).unwrap();
-		assert!(channelmonitor::ChannelMonitor::read(&mut Cursor::new(&w.0)).unwrap() == monitor);
+		let deserialized_copy = <(Sha256dHash, channelmonitor::ChannelMonitor)>::read(&mut Cursor::new(&w.0), logger.clone()).unwrap();
+		assert!(latest_block_hash == deserialized_copy.0);
+		assert!(monitor == deserialized_copy.1);
 		w.0.clear();
 		monitor.write_for_watchtower(&mut w).unwrap();
 	}

src/chain/keysinterface.rs

@@ -78,6 +78,15 @@ pub struct ChannelKeys {
 	pub commitment_seed: [u8; 32],
 }
 
+impl_writeable!(ChannelKeys, 0, {
+	funding_key,
+	revocation_base_key,
+	payment_base_key,
+	delayed_payment_base_key,
+	htlc_base_key,
+	commitment_seed
+});
+
 impl ChannelKeys {
 	/// Generate a set of lightning keys needed to operate a channel by HKDF-expanding a given
 	/// random 32-byte seed