Merge pull request #17 from TheBlueMatt/2017-04-channel-close

 Add support for channel closure (based on new upstream rust-bitcoin)

Author: TheBlueMatt

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lightning"
-version = "0.0.1"
+version = "0.0.2"
 authors = ["Matt Corallo"]
 license = "Apache-2.0"
 repository = "https://github.com/TheBlueMatt/rust-lightning/"
@@ -15,7 +15,7 @@ non_bitcoin_chain_hash_routing = []
 fuzztarget = ["secp256k1/fuzztarget", "bitcoin/fuzztarget"]
 
 [dependencies]
-bitcoin = "0.12"
+bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin" }
 rust-crypto = "0.2"
 rand = "0.4"
 secp256k1 = "0.9"

fuzz/Cargo.toml

@@ -13,7 +13,7 @@ honggfuzz_fuzz = ["honggfuzz"]
 
 [dependencies]
 lightning = { path = "..", features = ["fuzztarget"] }
-bitcoin = { version = "0.12", features = ["fuzztarget"] }
+bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", features = ["fuzztarget"] }
 secp256k1 = { version = "0.9", features = ["fuzztarget"] }
 honggfuzz = { version = "0.5", optional = true }
 afl = { version = "0.3", optional = true }

fuzz/fuzz_targets/channel_target.rs

@@ -163,7 +163,7 @@ pub fn do_test(data: &[u8]) {
 
 	let their_pubkey = get_pubkey!();
 
-	let tx = Transaction { version: 0, lock_time: 0, input: Vec::new(), output: Vec::new(), witness: Vec::new() };
+	let tx = Transaction { version: 0, lock_time: 0, input: Vec::new(), output: Vec::new() };
 	let funding_output = (Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
 
 	let mut channel = if get_slice!(1)[0] != 0 {
@@ -248,6 +248,14 @@ pub fn do_test(data: &[u8]) {
 				let update_fee = decode_msg!(msgs::UpdateFee, 32+4);
 				return_err!(channel.update_fee(&fee_est, &update_fee));
 			},
+			9 => {
+				let shutdown = decode_msg_with_len16!(msgs::Shutdown, 32, 1);
+				return_err!(channel.shutdown(&fee_est, &shutdown));
+			},
+			10 => {
+				let closing_signed = decode_msg!(msgs::ClosingSigned, 32+8+64);
+				return_err!(channel.closing_signed(&fee_est, &closing_signed));
+			},
 			_ => return,
 		}
 	}

fuzz/fuzz_targets/full_stack_target.rs

@@ -2,10 +2,11 @@ extern crate bitcoin;
 extern crate lightning;
 extern crate secp256k1;
 
+use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::network::constants::Network;
 use bitcoin::util::hash::Sha256dHash;
 
-use lightning::chain::chaininterface::{ConfirmationTarget,FeeEstimator,ChainWatchInterfaceUtil};
+use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,FeeEstimator,ChainWatchInterfaceUtil};
 use lightning::ln::{channelmonitor,msgs};
 use lightning::ln::channelmanager::ChannelManager;
 use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
@@ -73,6 +74,11 @@ impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
 	}
 }
 
+struct TestBroadcaster {}
+impl BroadcasterInterface for TestBroadcaster {
+	fn broadcast_transaction(&self, _tx: &Transaction) {}
+}
+
 #[derive(Clone, PartialEq, Eq, Hash)]
 struct Peer {
 	id: u8,
@@ -120,8 +126,9 @@ pub fn do_test(data: &[u8]) {
 
 	let monitor = Arc::new(TestChannelMonitor{});
 	let watch = Arc::new(ChainWatchInterfaceUtil::new());
+	let broadcast = Arc::new(TestBroadcaster{});
 
-	let channelmanager = ChannelManager::new(our_network_key, slice_to_be32(get_slice!(4)), get_slice!(1)[0] != 0, Network::Bitcoin, fee_est.clone(), monitor.clone(), watch.clone()).unwrap();
+	let channelmanager = ChannelManager::new(our_network_key, slice_to_be32(get_slice!(4)), get_slice!(1)[0] != 0, Network::Bitcoin, fee_est.clone(), monitor.clone(), watch.clone(), broadcast.clone()).unwrap();
 	let router = Arc::new(Router::new(PublicKey::from_secret_key(&secp_ctx, &our_network_key).unwrap()));
 
 	let handler = PeerManager::new(MessageHandler {