From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Mon, 2 Apr 2018 22:14:24 +0000 (-0400)
Subject: Merge pull request #17 from TheBlueMatt/2017-04-channel-close
X-Git-Tag: v0.0.12~415
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f7dd69240afcd3a0087f7796824a9e2697ed85cf;hp=2018782d119219d9dbde3b993e165b687c3ec268;p=rust-lightning

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

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

diff --git a/Cargo.toml b/Cargo.toml
index f5aa85db4..8e1946b1e 100644
--- a/Cargo.toml
+++ b/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"
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 6b45066e8..7ed7533a3 100644
--- a/fuzz/Cargo.toml
+++ b/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 }
diff --git a/fuzz/fuzz_targets/channel_target.rs b/fuzz/fuzz_targets/channel_target.rs
index ec82fbd65..d07b342da 100644
--- a/fuzz/fuzz_targets/channel_target.rs
+++ b/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,
 		}
 	}
diff --git a/fuzz/fuzz_targets/full_stack_target.rs b/fuzz/fuzz_targets/full_stack_target.rs
index 0264bbefd..c7ad6d49d 100644
--- a/fuzz/fuzz_targets/full_stack_target.rs
+++ b/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 {
diff --git a/src/ln/channel.rs b/src/ln/channel.rs
index fe1cfd24a..c9c9e4143 100644
--- a/src/ln/channel.rs
+++ b/src/ln/channel.rs
@@ -149,7 +149,20 @@ enum ChannelState {
 	/// later.
 	/// Flag is set on ChannelFunded.
 	AwaitingRemoteRevoke = (1 << 7),
+	/// Flag which is set on ChannelFunded or FundingSent after receiving a shutdown message from
+	/// the remote end. If set, they may not add any new HTLCs to the channel, and we are expected
+	/// to respond with our own shutdown message when possible.
+	RemoteShutdownSent = (1 << 8),
+	/// Flag which is set on ChannelFunded or FundingSent after sending a shutdown message. At this
+	/// point, we may not add any new HTLCs to the channel.
+	/// TODO: Investigate some kind of timeout mechanism by which point the remote end must provide
+	/// us their shutdown.
+	LocalShutdownSent = (1 << 9),
+	/// We've successfully negotiated a closing_signed dance. At this point ChannelManager is about
+	/// to drop us, but we store this anyway.
+	ShutdownComplete = (1 << 10),
 }
+const BOTH_SIDES_SHUTDOWN_MASK: u32 = (ChannelState::LocalShutdownSent as u32 | ChannelState::RemoteShutdownSent as u32);
 
 // TODO: We should refactor this to be an Inbound/OutboundChannel until initial setup handshaking
 // has been completed, and then turn into a Channel to get compiler-time enforcement of things like
@@ -177,6 +190,8 @@ pub struct Channel {
 	channel_update_count: u32,
 	feerate_per_kw: u64,
 
+	last_sent_closing_fee: Option<(u64, u64)>, // (feerate, fee)
+
 	/// The hash of the block in which the funding transaction reached our CONF_TARGET. We use this
 	/// to detect unconfirmation after a serialize-unserialize roudtrip where we may not see a full
 	/// series of block_connected/block_disconnected calls. Obviously this is not a guarantee as we
@@ -208,6 +223,8 @@ pub struct Channel {
 	their_cur_commitment_point: PublicKey,
 	their_node_id: PublicKey,
 
+	their_shutdown_scriptpubkey: Option<Script>,
+
 	channel_monitor: ChannelMonitor,
 }
 
@@ -310,6 +327,8 @@ impl Channel {
 			next_remote_htlc_id: 0,
 			channel_update_count: 0,
 
+			last_sent_closing_fee: None,
+
 			funding_tx_confirmed_in: Default::default(),
 			short_channel_id: None,
 			last_block_connected: Default::default(),
@@ -333,6 +352,8 @@ impl Channel {
 			their_cur_commitment_point: PublicKey::new(),
 			their_node_id: their_node_id,
 
+			their_shutdown_scriptpubkey: None,
+
 			channel_monitor: channel_monitor,
 		}
 	}
@@ -424,6 +445,8 @@ impl Channel {
 			next_remote_htlc_id: 0,
 			channel_update_count: 0,
 
+			last_sent_closing_fee: None,
+
 			funding_tx_confirmed_in: Default::default(),
 			short_channel_id: None,
 			last_block_connected: Default::default(),
@@ -448,6 +471,8 @@ impl Channel {
 			their_cur_commitment_point: msg.first_per_commitment_point,
 			their_node_id: their_node_id,
 
+			their_shutdown_scriptpubkey: None,
+
 			channel_monitor: channel_monitor,
 		};
 
@@ -511,12 +536,11 @@ impl Channel {
 				prev_hash: self.channel_monitor.get_funding_txo().unwrap().0,
 				prev_index: self.channel_monitor.get_funding_txo().unwrap().1 as u32,
 				script_sig: Script::new(),
-				sequence: ((0x80 as u32) << 8*3) | ((obscured_commitment_transaction_number >> 3*8) as u32)
+				sequence: ((0x80 as u32) << 8*3) | ((obscured_commitment_transaction_number >> 3*8) as u32),
+				witness: Vec::new(),
 			});
 			ins
 		};
-		let mut witness: Vec<Vec<Vec<u8>>> = Vec::new();
-		witness.push(Vec::new());
 
 		let mut txouts: Vec<(TxOut, Option<HTLCOutputInCommitment>)> = Vec::new();
 
@@ -596,10 +620,78 @@ impl Channel {
 			lock_time: ((0x20 as u32) << 8*3) | ((obscured_commitment_transaction_number & 0xffffffu64) as u32),
 			input: txins,
 			output: outputs,
-			witness: witness
 		}, htlcs_used))
 	}
 
+	#[inline]
+	fn get_closing_scriptpubkey(&self) -> Script {
+		let our_channel_close_key_hash = Hash160::from_data(&PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.channel_close_key).unwrap().serialize());
+		Builder::new().push_opcode(opcodes::All::OP_PUSHBYTES_0).push_slice(&our_channel_close_key_hash[..]).into_script()
+	}
+
+	#[inline]
+	fn get_closing_transaction_weight(a_scriptpubkey: &Script, b_scriptpubkey: &Script) -> u64 {
+		(4 + 1 + 36 + 4 + 1 + 1 + 2*(8+1) + 4 + a_scriptpubkey.len() as u64 + b_scriptpubkey.len() as u64)*4 + 2 + 1 + 1 + 2*(1 + 72)
+	}
+
+	#[inline]
+	fn build_closing_transaction(&self, proposed_total_fee_satoshis: u64, skip_remote_output: bool) -> (Transaction, u64) {
+		let txins = {
+			let mut ins: Vec<TxIn> = Vec::new();
+			ins.push(TxIn {
+				prev_hash: self.channel_monitor.get_funding_txo().unwrap().0,
+				prev_index: self.channel_monitor.get_funding_txo().unwrap().1 as u32,
+				script_sig: Script::new(),
+				sequence: 0xffffffff,
+				witness: Vec::new(),
+			});
+			ins
+		};
+
+		assert!(self.pending_htlcs.is_empty());
+		let mut txouts: Vec<(TxOut, ())> = Vec::new();
+
+		let mut total_fee_satoshis = proposed_total_fee_satoshis;
+		let value_to_self: i64 = (self.value_to_self_msat as i64) / 1000 - if self.channel_outbound { total_fee_satoshis as i64 } else { 0 };
+		let value_to_remote: i64 = ((self.channel_value_satoshis * 1000 - self.value_to_self_msat) as i64 / 1000) - if self.channel_outbound { 0 } else { total_fee_satoshis as i64 };
+
+		if value_to_self < 0 {
+			assert!(self.channel_outbound);
+			total_fee_satoshis += (-value_to_self) as u64;
+		} else if value_to_remote < 0 {
+			assert!(!self.channel_outbound);
+			total_fee_satoshis += (-value_to_remote) as u64;
+		}
+
+		if !skip_remote_output && value_to_remote as u64 > self.our_dust_limit_satoshis {
+			txouts.push((TxOut {
+				script_pubkey: self.their_shutdown_scriptpubkey.clone().unwrap(),
+				value: value_to_remote as u64
+			}, ()));
+		}
+
+		if value_to_self as u64 > self.our_dust_limit_satoshis {
+			txouts.push((TxOut {
+				script_pubkey: self.get_closing_scriptpubkey(),
+				value: value_to_self as u64
+			}, ()));
+		}
+
+		transaction_utils::sort_outputs(&mut txouts);
+
+		let mut outputs: Vec<TxOut> = Vec::new();
+		for out in txouts.drain(..) {
+			outputs.push(out.0);
+		}
+
+		(Transaction {
+			version: 2,
+			lock_time: 0,
+			input: txins,
+			output: outputs,
+		}, total_fee_satoshis)
+	}
+
 	#[inline]
 	/// Creates a set of keys for build_commitment_transaction to generate a transaction which our
 	/// counterparty will sign (ie DO NOT send signatures over a transaction created by this to
@@ -642,36 +734,36 @@ impl Channel {
 		}.push_opcode(opcodes::All::OP_PUSHNUM_2).push_opcode(opcodes::All::OP_CHECKMULTISIG).into_script()
 	}
 
-	fn sign_commitment_transaction(&self, tx: &mut Transaction, their_sig: &Signature) -> Result<(), HandleError> {
+	fn sign_commitment_transaction(&self, tx: &mut Transaction, their_sig: &Signature) -> Signature {
 		if tx.input.len() != 1 {
 			panic!("Tried to sign commitment transaction that had input count != 1!");
 		}
-		if tx.witness.len() != 1 || tx.witness[0].len() != 0 {
+		if tx.input[0].witness.len() != 0 {
 			panic!("Tried to re-sign commitment transaction");
 		}
 
 		let funding_redeemscript = self.get_funding_redeemscript();
 
-		let sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&tx).sighash_all(&tx, 0, &funding_redeemscript, self.channel_value_satoshis)[..]));
-		let our_sig = secp_call!(self.secp_ctx.sign(&sighash, &self.local_keys.funding_key));
+		let sighash = Message::from_slice(&bip143::SighashComponents::new(&tx).sighash_all(&tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]).unwrap();
+		let our_sig = self.secp_ctx.sign(&sighash, &self.local_keys.funding_key).unwrap();
 
-		tx.witness[0].push(Vec::new()); // First is the multisig dummy
+		tx.input[0].witness.push(Vec::new()); // First is the multisig dummy
 
 		let our_funding_key = PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.funding_key).unwrap().serialize();
 		let their_funding_key = self.their_funding_pubkey.serialize();
 		if our_funding_key[..] < their_funding_key[..] {
-			tx.witness[0].push(our_sig.serialize_der(&self.secp_ctx).to_vec());
-			tx.witness[0].push(their_sig.serialize_der(&self.secp_ctx).to_vec());
+			tx.input[0].witness.push(our_sig.serialize_der(&self.secp_ctx).to_vec());
+			tx.input[0].witness.push(their_sig.serialize_der(&self.secp_ctx).to_vec());
 		} else {
-			tx.witness[0].push(their_sig.serialize_der(&self.secp_ctx).to_vec());
-			tx.witness[0].push(our_sig.serialize_der(&self.secp_ctx).to_vec());
+			tx.input[0].witness.push(their_sig.serialize_der(&self.secp_ctx).to_vec());
+			tx.input[0].witness.push(our_sig.serialize_der(&self.secp_ctx).to_vec());
 		}
-		tx.witness[0][1].push(SigHashType::All as u8);
-		tx.witness[0][2].push(SigHashType::All as u8);
+		tx.input[0].witness[1].push(SigHashType::All as u8);
+		tx.input[0].witness[2].push(SigHashType::All as u8);
 
-		tx.witness[0].push(funding_redeemscript.into_vec());
+		tx.input[0].witness.push(funding_redeemscript.into_vec());
 
-		Ok(())
+		our_sig
 	}
 
 	/// Builds the htlc-success or htlc-timeout transaction which spends a given HTLC output
@@ -683,12 +775,10 @@ impl Channel {
 			prev_hash: prev_hash.clone(),
 			prev_index: htlc.transaction_output_index,
 			script_sig: Script::new(),
-			sequence: 0
+			sequence: 0,
+			witness: Vec::new(),
 		});
 
-		let mut witnesses: Vec<Vec<Vec<u8>>> = Vec::new();
-		witnesses.push(Vec::new());
-
 		let total_fee = if htlc.offered {
 				self.feerate_per_kw * HTLC_TIMEOUT_TX_WEIGHT / 1000
 			} else {
@@ -708,7 +798,6 @@ impl Channel {
 			lock_time: if htlc.offered { htlc.cltv_expiry } else { 0 },
 			input: txins,
 			output: txouts,
-			witness: witnesses
 		})
 	}
 
@@ -718,37 +807,37 @@ impl Channel {
 		if tx.input.len() != 1 {
 			panic!("Tried to sign HTLC transaction that had input count != 1!");
 		}
-		if tx.witness.len() != 1 || tx.witness[0].len() != 0 {
+		if tx.input[0].witness.len() != 0 {
 			panic!("Tried to re-sign HTLC transaction");
 		}
 
 		let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &keys, htlc.offered);
 
 		let our_htlc_key = secp_call!(chan_utils::derive_private_key(&self.secp_ctx, &keys.per_commitment_point, &self.local_keys.htlc_base_key));
-		let sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&tx).sighash_all(&tx, 0, &htlc_redeemscript, htlc.amount_msat / 1000)[..]));
+		let sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&tx).sighash_all(&tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]));
 		let our_sig = secp_call!(self.secp_ctx.sign(&sighash, &our_htlc_key));
 
 		let local_tx = PublicKey::from_secret_key(&self.secp_ctx, &our_htlc_key).unwrap() == keys.a_htlc_key;
 
-		tx.witness[0].push(Vec::new()); // First is the multisig dummy
+		tx.input[0].witness.push(Vec::new()); // First is the multisig dummy
 
 		if local_tx { // b, then a
-			tx.witness[0].push(their_sig.serialize_der(&self.secp_ctx).to_vec());
-			tx.witness[0].push(our_sig.serialize_der(&self.secp_ctx).to_vec());
+			tx.input[0].witness.push(their_sig.serialize_der(&self.secp_ctx).to_vec());
+			tx.input[0].witness.push(our_sig.serialize_der(&self.secp_ctx).to_vec());
 		} else {
-			tx.witness[0].push(our_sig.serialize_der(&self.secp_ctx).to_vec());
-			tx.witness[0].push(their_sig.serialize_der(&self.secp_ctx).to_vec());
+			tx.input[0].witness.push(our_sig.serialize_der(&self.secp_ctx).to_vec());
+			tx.input[0].witness.push(their_sig.serialize_der(&self.secp_ctx).to_vec());
 		}
-		tx.witness[0][1].push(SigHashType::All as u8);
-		tx.witness[0][2].push(SigHashType::All as u8);
+		tx.input[0].witness[1].push(SigHashType::All as u8);
+		tx.input[0].witness[2].push(SigHashType::All as u8);
 
 		if htlc.offered {
-			tx.witness[0].push(Vec::new());
+			tx.input[0].witness.push(Vec::new());
 		} else {
-			tx.witness[0].push(preimage.unwrap().to_vec());
+			tx.input[0].witness.push(preimage.unwrap().to_vec());
 		}
 
-		tx.witness[0].push(htlc_redeemscript.into_vec());
+		tx.input[0].witness.push(htlc_redeemscript.into_vec());
 
 		Ok(())
 	}
@@ -757,6 +846,7 @@ impl Channel {
 		if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
 			return Err(HandleError{err: "Was asked to fulfill an HTLC when channel was not in an operational state", msg: None});
 		}
+		assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
 
 		let mut sha = Sha256::new();
 		sha.input(&payment_preimage);
@@ -794,6 +884,7 @@ impl Channel {
 		if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
 			return Err(HandleError{err: "Was asked to fail an HTLC when channel was not in an operational state", msg: None});
 		}
+		assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
 
 		let mut htlc_id = 0;
 		let mut htlc_amount_msat = 0;
@@ -880,11 +971,11 @@ impl Channel {
 
 		let remote_keys = self.build_remote_transaction_keys()?;
 		let remote_initial_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, false)?.0;
-		let remote_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&remote_initial_commitment_tx).sighash_all(&remote_initial_commitment_tx, 0, &funding_script, self.channel_value_satoshis)[..]));
+		let remote_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&remote_initial_commitment_tx).sighash_all(&remote_initial_commitment_tx.input[0], &funding_script, self.channel_value_satoshis)[..]));
 
 		let local_keys = self.build_local_transaction_keys(self.cur_local_commitment_transaction_number)?;
 		let local_initial_commitment_tx = self.build_commitment_transaction(self.cur_local_commitment_transaction_number, &local_keys, true, false)?.0;
-		let local_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&local_initial_commitment_tx).sighash_all(&local_initial_commitment_tx, 0, &funding_script, self.channel_value_satoshis)[..]));
+		let local_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&local_initial_commitment_tx).sighash_all(&local_initial_commitment_tx.input[0], &funding_script, self.channel_value_satoshis)[..]));
 
 		// They sign the "local" commitment transaction, allowing us to broadcast the tx if we wish.
 		secp_call!(self.secp_ctx.verify(&local_sighash, &sig, &self.their_funding_pubkey));
@@ -946,7 +1037,7 @@ impl Channel {
 
 		let local_keys = self.build_local_transaction_keys(self.cur_local_commitment_transaction_number)?;
 		let local_initial_commitment_tx = self.build_commitment_transaction(self.cur_local_commitment_transaction_number, &local_keys, true, false)?.0;
-		let local_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&local_initial_commitment_tx).sighash_all(&local_initial_commitment_tx, 0, &funding_script, self.channel_value_satoshis)[..]));
+		let local_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&local_initial_commitment_tx).sighash_all(&local_initial_commitment_tx.input[0], &funding_script, self.channel_value_satoshis)[..]));
 
 		// They sign the "local" commitment transaction, allowing us to broadcast the tx if we wish.
 		secp_call!(self.secp_ctx.verify(&local_sighash, &msg.signature, &self.their_funding_pubkey));
@@ -957,12 +1048,13 @@ impl Channel {
 	}
 
 	pub fn funding_locked(&mut self, msg: &msgs::FundingLocked) -> Result<(), HandleError> {
-		if self.channel_state == ChannelState::FundingSent as u32 {
+		let non_shutdown_state = self.channel_state & (!BOTH_SIDES_SHUTDOWN_MASK);
+		if non_shutdown_state == ChannelState::FundingSent as u32 {
 			self.channel_state |= ChannelState::TheirFundingLocked as u32;
-		} else if self.channel_state == (ChannelState::FundingSent as u32 | ChannelState::OurFundingLocked as u32) {
-			self.channel_state = ChannelState::ChannelFunded as u32;
-		} else if self.channel_state < ChannelState::FundingSent as u32 {
-			return Err(HandleError{err: "Peer sent a funding_locked before we'd even been told the funding txid", msg: None});
+		} else if non_shutdown_state == (ChannelState::FundingSent as u32 | ChannelState::OurFundingLocked as u32) {
+			self.channel_state = ChannelState::ChannelFunded as u32 | (self.channel_state & BOTH_SIDES_SHUTDOWN_MASK);
+		} else {
+			return Err(HandleError{err: "Peer sent a funding_locked at a strange time", msg: None});
 		}
 
 		//TODO: Note that this must be a duplicate of the previous commitment point they sent us,
@@ -995,7 +1087,7 @@ impl Channel {
 	}
 
 	pub fn update_add_htlc(&mut self, msg: &msgs::UpdateAddHTLC, pending_forward_state: PendingForwardHTLCInfo) -> Result<(), HandleError> {
-		if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
+		if (self.channel_state & (ChannelState::ChannelFunded as u32 | ChannelState::RemoteShutdownSent as u32)) != (ChannelState::ChannelFunded as u32) {
 			return Err(HandleError{err: "Got add HTLC message when channel was not in an operational state", msg: None});
 		}
 		if msg.amount_msat > self.channel_value_satoshis * 1000 {
@@ -1167,7 +1259,8 @@ impl Channel {
 
 		let local_keys = self.build_local_transaction_keys(self.cur_local_commitment_transaction_number)?;
 		let local_commitment_tx = self.build_commitment_transaction(self.cur_local_commitment_transaction_number, &local_keys, true, false)?;
-		let local_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&local_commitment_tx.0).sighash_all(&local_commitment_tx.0, 0, &funding_script, self.channel_value_satoshis)[..]));
+		let local_commitment_txid = local_commitment_tx.0.txid();
+		let local_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&local_commitment_tx.0).sighash_all(&local_commitment_tx.0.input[0], &funding_script, self.channel_value_satoshis)[..]));
 		secp_call!(self.secp_ctx.verify(&local_sighash, &msg.signature, &self.their_funding_pubkey));
 
 		if msg.htlc_signatures.len() != local_commitment_tx.1.len() {
@@ -1175,9 +1268,9 @@ impl Channel {
 		}
 
 		for (idx, ref htlc) in local_commitment_tx.1.iter().enumerate() {
-			let htlc_tx = self.build_htlc_transaction(&local_commitment_tx.0.txid(), htlc, true, &local_keys)?;
+			let htlc_tx = self.build_htlc_transaction(&local_commitment_txid, htlc, true, &local_keys)?;
 			let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &local_keys, htlc.offered);
-			let htlc_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx, 0, &htlc_redeemscript, htlc.amount_msat / 1000)[..]));
+			let htlc_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]));
 			secp_call!(self.secp_ctx.verify(&htlc_sighash, &msg.htlc_signatures[idx], &local_keys.b_htlc_key));
 		}
 
@@ -1244,6 +1337,179 @@ impl Channel {
 		Ok(())
 	}
 
+	pub fn shutdown(&mut self, fee_estimator: &FeeEstimator, msg: &msgs::Shutdown) -> Result<(Option<msgs::Shutdown>, Option<msgs::ClosingSigned>, Vec<[u8; 32]>), HandleError> {
+		if self.channel_state < ChannelState::FundingSent as u32 {
+			self.channel_state = ChannelState::ShutdownComplete as u32;
+			return Ok((None, None, Vec::new()));
+		}
+		for htlc in self.pending_htlcs.iter() {
+			if htlc.state == HTLCState::RemoteAnnounced {
+				return Err(HandleError{err: "Got shutdown with remote pending HTLCs", msg: None});
+			}
+		}
+		if (self.channel_state & ChannelState::RemoteShutdownSent as u32) == ChannelState::RemoteShutdownSent as u32 {
+			return Err(HandleError{err: "Remote peer sent duplicate shutdown message", msg: None});
+		}
+		assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
+
+		// BOLT 2 says we must only send a scriptpubkey of certain standard forms, which are up to
+		// 34 bytes in length, so dont let the remote peer feed us some super fee-heavy script.
+		if self.channel_outbound && msg.scriptpubkey.len() > 34 {
+			return Err(HandleError{err: "Got shutdown_scriptpubkey of absurd length from remote peer", msg: None});
+		}
+		//TODO: Check shutdown_scriptpubkey form as BOLT says we must? WHYYY
+
+		if self.their_shutdown_scriptpubkey.is_some() {
+			if Some(&msg.scriptpubkey) != self.their_shutdown_scriptpubkey.as_ref() {
+				return Err(HandleError{err: "Got shutdown request with a scriptpubkey which did not match their previous scriptpubkey", msg: None});
+			}
+		} else {
+			self.their_shutdown_scriptpubkey = Some(msg.scriptpubkey.clone());
+		}
+
+		let our_closing_script = self.get_closing_scriptpubkey();
+
+		let (proposed_feerate, proposed_fee, our_sig) = if self.channel_outbound && self.pending_htlcs.is_empty() {
+			let mut proposed_feerate = fee_estimator.get_est_sat_per_vbyte(ConfirmationTarget::Background);
+			if self.feerate_per_kw > proposed_feerate * 250 {
+				proposed_feerate = self.feerate_per_kw / 250;
+			}
+			let tx_weight = Self::get_closing_transaction_weight(&our_closing_script, &msg.scriptpubkey);
+			let proposed_total_fee_satoshis = proposed_feerate * tx_weight / 4;
+
+			let (closing_tx, total_fee_satoshis) = self.build_closing_transaction(proposed_total_fee_satoshis, false);
+			let funding_redeemscript = self.get_funding_redeemscript();
+			let sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&closing_tx).sighash_all(&closing_tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]));
+
+			(Some(proposed_feerate), Some(total_fee_satoshis), Some(secp_call!(self.secp_ctx.sign(&sighash, &self.local_keys.funding_key))))
+		} else { (None, None, None) };
+
+		// From here on out, we may not fail!
+
+		self.channel_state |= ChannelState::RemoteShutdownSent as u32;
+
+		// We can't send our shutdown until we've committed all of our pending HTLCs, but the
+		// remote side is unlikely to accept any new HTLCs, so we go ahead and "free" any holding
+		// cell HTLCs and return them to fail the payment.
+		let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlcs.len());
+		for htlc in self.holding_cell_htlcs.drain(..) {
+			dropped_outbound_htlcs.push(htlc.payment_hash);
+		}
+		for htlc in self.pending_htlcs.iter() {
+			if htlc.state == HTLCState::LocalAnnounced {
+				return Ok((None, None, dropped_outbound_htlcs));
+			}
+		}
+
+		let our_shutdown = if (self.channel_state & ChannelState::LocalShutdownSent as u32) == ChannelState::LocalShutdownSent as u32 {
+			None
+		} else {
+			Some(msgs::Shutdown {
+				channel_id: self.channel_id,
+				scriptpubkey: our_closing_script,
+			})
+		};
+
+		self.channel_state |= ChannelState::LocalShutdownSent as u32;
+		if self.pending_htlcs.is_empty() && self.channel_outbound {
+			// There are no more HTLCs and we're the funder, this means we start the closing_signed
+			// dance with an initial fee proposal!
+			self.last_sent_closing_fee = Some((proposed_feerate.unwrap(), proposed_fee.unwrap()));
+			Ok((our_shutdown, Some(msgs::ClosingSigned {
+				channel_id: self.channel_id,
+				fee_satoshis: proposed_fee.unwrap(),
+				signature: our_sig.unwrap(),
+			}), dropped_outbound_htlcs))
+		} else {
+			Ok((our_shutdown, None, dropped_outbound_htlcs))
+		}
+	}
+
+	pub fn closing_signed(&mut self, fee_estimator: &FeeEstimator, msg: &msgs::ClosingSigned) -> Result<(Option<msgs::ClosingSigned>, Option<Transaction>), HandleError> {
+		if self.channel_state & BOTH_SIDES_SHUTDOWN_MASK != BOTH_SIDES_SHUTDOWN_MASK {
+			return Err(HandleError{err: "Remote end sent us a closing_signed before both sides provided a shutdown", msg: None});
+		}
+		if !self.pending_htlcs.is_empty() {
+			return Err(HandleError{err: "Remote end sent us a closing_signed while there were still pending HTLCs", msg: None});
+		}
+		if msg.fee_satoshis > 21000000 * 10000000 {
+			return Err(HandleError{err: "Remote tried to send us a closing tx with > 21 million BTC fee", msg: None});
+		}
+
+		let funding_redeemscript = self.get_funding_redeemscript();
+		let (mut closing_tx, used_total_fee) = self.build_closing_transaction(msg.fee_satoshis, false);
+		if used_total_fee != msg.fee_satoshis {
+			return Err(HandleError{err: "Remote sent us a closing_signed with a fee greater than the value they can claim", msg: None});
+		}
+		let mut sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&closing_tx).sighash_all(&closing_tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]));
+
+		match self.secp_ctx.verify(&sighash, &msg.signature, &self.their_funding_pubkey) {
+			Ok(_) => {},
+			Err(_) => {
+				// The remote end may have decided to revoke their output due to inconsistent dust
+				// limits, so check for that case by re-checking the signature here.
+				closing_tx = self.build_closing_transaction(msg.fee_satoshis, true).0;
+				sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&closing_tx).sighash_all(&closing_tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]));
+				secp_call!(self.secp_ctx.verify(&sighash, &msg.signature, &self.their_funding_pubkey));
+			},
+		};
+
+		if let Some((_, last_fee)) = self.last_sent_closing_fee {
+			if last_fee == msg.fee_satoshis {
+				self.sign_commitment_transaction(&mut closing_tx, &msg.signature);
+				self.channel_state = ChannelState::ShutdownComplete as u32;
+				return Ok((None, Some(closing_tx)));
+			}
+		}
+
+		macro_rules! propose_new_feerate {
+			($new_feerate: expr) => {
+				let closing_tx_max_weight = Self::get_closing_transaction_weight(&self.get_closing_scriptpubkey(), self.their_shutdown_scriptpubkey.as_ref().unwrap());
+				let (closing_tx, used_total_fee) = self.build_closing_transaction($new_feerate * closing_tx_max_weight / 4, false);
+				sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&closing_tx).sighash_all(&closing_tx.input[0], &funding_redeemscript, self.channel_value_satoshis)[..]));
+				let our_sig = self.secp_ctx.sign(&sighash, &self.local_keys.funding_key).unwrap();
+				self.last_sent_closing_fee = Some(($new_feerate, used_total_fee));
+				return Ok((Some(msgs::ClosingSigned {
+					channel_id: self.channel_id,
+					fee_satoshis: used_total_fee,
+					signature: our_sig,
+				}), None))
+			}
+		}
+
+		let proposed_sat_per_vbyte = msg.fee_satoshis * 4 / closing_tx.get_weight();
+		if self.channel_outbound {
+			let our_max_feerate = fee_estimator.get_est_sat_per_vbyte(ConfirmationTarget::Normal);
+			if proposed_sat_per_vbyte > our_max_feerate {
+				if let Some((last_feerate, _)) = self.last_sent_closing_fee {
+					if our_max_feerate <= last_feerate {
+						return Err(HandleError{err: "Unable to come to consensus about closing feerate, remote wanted something higher than our Normal feerate", msg: None});
+					}
+				}
+				propose_new_feerate!(our_max_feerate);
+			}
+		} else {
+			let our_min_feerate = fee_estimator.get_est_sat_per_vbyte(ConfirmationTarget::Background);
+			if proposed_sat_per_vbyte < our_min_feerate {
+				if let Some((last_feerate, _)) = self.last_sent_closing_fee {
+					if our_min_feerate >= last_feerate {
+						return Err(HandleError{err: "Unable to come to consensus about closing feerate, remote wanted something lower than our Background feerate", msg: None});
+					}
+				}
+				propose_new_feerate!(our_min_feerate);
+			}
+		}
+
+		let our_sig = self.sign_commitment_transaction(&mut closing_tx, &msg.signature);
+		self.channel_state = ChannelState::ShutdownComplete as u32;
+
+		Ok((Some(msgs::ClosingSigned {
+			channel_id: self.channel_id,
+			fee_satoshis: msg.fee_satoshis,
+			signature: our_sig,
+		}), Some(closing_tx)))
+	}
+
 	// Public utilities:
 
 	pub fn channel_id(&self) -> Uint256 {
@@ -1313,7 +1579,8 @@ impl Channel {
 
 	/// Returns true if this channel is fully established and not known to be closing.
 	pub fn is_usable(&self) -> bool {
-		(self.channel_state & (ChannelState::ChannelFunded as u32)) == (ChannelState::ChannelFunded as u32)
+		let mask = ChannelState::ChannelFunded as u32 | BOTH_SIDES_SHUTDOWN_MASK;
+		(self.channel_state & mask) == (ChannelState::ChannelFunded as u32)
 	}
 
 	/// Returns true if this channel is currently available for use. This is a superset of
@@ -1322,19 +1589,30 @@ impl Channel {
 		self.is_usable()
 	}
 
+	/// Returns true if this channel is fully shut down. True here implies that no further actions
+	/// may/will be taken on this channel, and thus this object should be freed. Any future changes
+	/// will be handled appropriately by the chain monitor.
+	pub fn is_shutdown(&self) -> bool {
+		if (self.channel_state & ChannelState::ShutdownComplete as u32) == ChannelState::ShutdownComplete as u32  {
+			assert!(self.channel_state == ChannelState::ShutdownComplete as u32);
+			true
+		} else { false }
+	}
+
 	/// Called by channelmanager based on chain blocks being connected.
 	/// Note that we only need to use this to detect funding_signed, anything else is handled by
 	/// the channel_monitor.
 	pub fn block_connected(&mut self, header: &BlockHeader, height: u32, txn_matched: &[&Transaction], indexes_of_txn_matched: &[u32]) -> Option<msgs::FundingLocked> {
+		let non_shutdown_state = self.channel_state & (!BOTH_SIDES_SHUTDOWN_MASK);
 		if self.funding_tx_confirmations > 0 {
 			if header.bitcoin_hash() != self.last_block_connected {
 				self.last_block_connected = header.bitcoin_hash();
 				self.funding_tx_confirmations += 1;
 				if self.funding_tx_confirmations == CONF_TARGET as u64 {
-					if self.channel_state == ChannelState::FundingSent as u32 {
+					if non_shutdown_state == ChannelState::FundingSent as u32 {
 						self.channel_state |= ChannelState::OurFundingLocked as u32;
-					} else if self.channel_state == (ChannelState::FundingSent as u32 | ChannelState::TheirFundingLocked as u32) {
-						self.channel_state = ChannelState::ChannelFunded as u32;
+					} else if non_shutdown_state == (ChannelState::FundingSent as u32 | ChannelState::TheirFundingLocked as u32) {
+						self.channel_state = ChannelState::ChannelFunded as u32 | (self.channel_state & BOTH_SIDES_SHUTDOWN_MASK);
 						//TODO: Something about a state where we "lost confirmation"
 					} else if self.channel_state < ChannelState::ChannelFunded as u32 {
 						panic!("Started confirming a channel in a state pre-FundingSent?");
@@ -1358,7 +1636,7 @@ impl Channel {
 				}
 			}
 		}
-		if self.channel_state & !(ChannelState::TheirFundingLocked as u32) == ChannelState::FundingSent as u32 {
+		if non_shutdown_state & !(ChannelState::TheirFundingLocked as u32) == ChannelState::FundingSent as u32 {
 			for (ref tx, index_in_block) in txn_matched.iter().zip(indexes_of_txn_matched) {
 				if tx.txid() == self.channel_monitor.get_funding_txo().unwrap().0 {
 					self.funding_tx_confirmations = 1;
@@ -1464,7 +1742,7 @@ impl Channel {
 
 		let remote_keys = self.build_remote_transaction_keys()?;
 		let remote_initial_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, false)?.0;
-		let remote_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&remote_initial_commitment_tx).sighash_all(&remote_initial_commitment_tx, 0, &funding_script, self.channel_value_satoshis)[..]));
+		let remote_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&remote_initial_commitment_tx).sighash_all(&remote_initial_commitment_tx.input[0], &funding_script, self.channel_value_satoshis)[..]));
 
 		// We sign the "remote" commitment transaction, allowing them to broadcast the tx if they wish.
 		Ok(secp_call!(self.secp_ctx.sign(&remote_sighash, &self.local_keys.funding_key)))
@@ -1517,11 +1795,14 @@ impl Channel {
 	/// bitcoin_key, if available, for this channel. The channel must be publicly announceable and
 	/// available for use (have exchanged FundingLocked messages in both directions. Should be used
 	/// for both loose and in response to an AnnouncementSignatures message from the remote peer.
+	/// Note that you can get an announcement for a channel which is closing, though you should
+	/// likely not announce such a thing. In case its already been announced, a channel_update
+	/// message can mark the channel disabled.
 	pub fn get_channel_announcement(&self, our_node_id: PublicKey, chain_hash: Sha256dHash) -> Result<(msgs::UnsignedChannelAnnouncement, Signature), HandleError> {
 		if !self.announce_publicly {
 			return Err(HandleError{err: "Channel is not available for public announcements", msg: None});
 		}
-		if self.channel_state < ChannelState::ChannelFunded as u32 {
+		if self.channel_state & (ChannelState::ChannelFunded as u32) != (ChannelState::ChannelFunded as u32) {
 			return Err(HandleError{err: "Cannot get a ChannelAnnouncement until the channel funding has been locked", msg: None});
 		}
 
@@ -1553,8 +1834,8 @@ impl Channel {
 	/// waiting on the remote peer to send us a revoke_and_ack during which time we cannot add new
 	/// HTLCs on the wire or we wouldn't be able to determine what they actually ACK'ed.
 	pub fn send_htlc(&mut self, amount_msat: u64, payment_hash: [u8; 32], cltv_expiry: u32, onion_routing_packet: msgs::OnionPacket) -> Result<Option<msgs::UpdateAddHTLC>, HandleError> {
-		if (self.channel_state & (ChannelState::ChannelFunded as u32)) != (ChannelState::ChannelFunded as u32) {
-			return Err(HandleError{err: "Cannot send HTLC until channel is fully established", msg: None});
+		if (self.channel_state & (ChannelState::ChannelFunded as u32 | BOTH_SIDES_SHUTDOWN_MASK)) != (ChannelState::ChannelFunded as u32) {
+			return Err(HandleError{err: "Cannot send HTLC until channel is fully established and we haven't started shutting down", msg: None});
 		}
 
 		if amount_msat > self.channel_value_satoshis * 1000 {
@@ -1639,15 +1920,16 @@ impl Channel {
 
 		let remote_keys = self.build_remote_transaction_keys()?;
 		let remote_commitment_tx = self.build_commitment_transaction(self.cur_remote_commitment_transaction_number, &remote_keys, false, true)?;
-		let remote_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&remote_commitment_tx.0).sighash_all(&remote_commitment_tx.0, 0, &funding_script, self.channel_value_satoshis)[..]));
+		let remote_commitment_txid = remote_commitment_tx.0.txid();
+		let remote_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&remote_commitment_tx.0).sighash_all(&remote_commitment_tx.0.input[0], &funding_script, self.channel_value_satoshis)[..]));
 		let our_sig = secp_call!(self.secp_ctx.sign(&remote_sighash, &self.local_keys.funding_key));
 
 		let mut htlc_sigs = Vec::new();
 
 		for ref htlc in remote_commitment_tx.1.iter() {
-			let htlc_tx = self.build_htlc_transaction(&remote_commitment_tx.0.txid(), htlc, false, &remote_keys)?;
+			let htlc_tx = self.build_htlc_transaction(&remote_commitment_txid, htlc, false, &remote_keys)?;
 			let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &remote_keys, htlc.offered);
-			let htlc_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx, 0, &htlc_redeemscript, htlc.amount_msat / 1000)[..]));
+			let htlc_sighash = secp_call!(Message::from_slice(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]));
 			let our_htlc_key = secp_call!(chan_utils::derive_private_key(&self.secp_ctx, &remote_keys.per_commitment_point, &self.local_keys.htlc_base_key));
 			htlc_sigs.push(secp_call!(self.secp_ctx.sign(&htlc_sighash, &our_htlc_key)));
 		}
@@ -1673,6 +1955,42 @@ impl Channel {
 			None => Ok(None)
 		}
 	}
+
+	/// Begins the shutdown process, getting a message for the remote peer and returning all
+	/// holding cell HTLCs for payment failure.
+	pub fn get_shutdown(&mut self) -> Result<(msgs::Shutdown, Vec<[u8; 32]>), HandleError> {
+		for htlc in self.pending_htlcs.iter() {
+			if htlc.state == HTLCState::LocalAnnounced {
+				return Err(HandleError{err: "Cannot begin shutdown with pending HTLCs, call send_commitment first", msg: None});
+			}
+		}
+		if self.channel_state & BOTH_SIDES_SHUTDOWN_MASK != 0 {
+			return Err(HandleError{err: "Shutdown already in progress", msg: None});
+		}
+		assert_eq!(self.channel_state & ChannelState::ShutdownComplete as u32, 0);
+
+		let our_closing_script = self.get_closing_scriptpubkey();
+
+		// From here on out, we may not fail!
+		if self.channel_state < ChannelState::FundingSent as u32 {
+			self.channel_state = ChannelState::ShutdownComplete as u32;
+		} else {
+			self.channel_state |= ChannelState::LocalShutdownSent as u32;
+		}
+
+		// We can't send our shutdown until we've committed all of our pending HTLCs, but the
+		// remote side is unlikely to accept any new HTLCs, so we go ahead and "free" any holding
+		// cell HTLCs and return them to fail the payment.
+		let mut dropped_outbound_htlcs = Vec::with_capacity(self.holding_cell_htlcs.len());
+		for htlc in self.holding_cell_htlcs.drain(..) {
+			dropped_outbound_htlcs.push(htlc.payment_hash);
+		}
+
+		Ok((msgs::Shutdown {
+			channel_id: self.channel_id,
+			scriptpubkey: our_closing_script,
+		}, dropped_outbound_htlcs))
+	}
 }
 
 #[cfg(test)]
@@ -1749,10 +2067,10 @@ mod tests {
 			( $their_sig_hex: expr, $our_sig_hex: expr, $tx_hex: expr) => {
 				unsigned_tx = chan.build_commitment_transaction(42, &keys, true, false).unwrap();
 				let their_signature = Signature::from_der(&secp_ctx, &hex_bytes($their_sig_hex).unwrap()[..]).unwrap();
-				let sighash = Message::from_slice(&bip143::SighashComponents::new(&unsigned_tx.0).sighash_all(&unsigned_tx.0, 0, &chan.get_funding_redeemscript(), chan.channel_value_satoshis)[..]).unwrap();
+				let sighash = Message::from_slice(&bip143::SighashComponents::new(&unsigned_tx.0).sighash_all(&unsigned_tx.0.input[0], &chan.get_funding_redeemscript(), chan.channel_value_satoshis)[..]).unwrap();
 				secp_ctx.verify(&sighash, &their_signature, &chan.their_funding_pubkey).unwrap();
 
-				chan.sign_commitment_transaction(&mut unsigned_tx.0, &their_signature).unwrap();
+				chan.sign_commitment_transaction(&mut unsigned_tx.0, &their_signature);
 
 				assert_eq!(serialize(&unsigned_tx.0).unwrap()[..],
 						hex_bytes($tx_hex).unwrap()[..]);
@@ -1766,7 +2084,7 @@ mod tests {
 				let ref htlc = unsigned_tx.1[$htlc_idx];
 				let mut htlc_tx = chan.build_htlc_transaction(&unsigned_tx.0.txid(), &htlc, true, &keys).unwrap();
 				let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &keys, htlc.offered);
-				let htlc_sighash = Message::from_slice(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx, 0, &htlc_redeemscript, htlc.amount_msat / 1000)[..]).unwrap();
+				let htlc_sighash = Message::from_slice(&bip143::SighashComponents::new(&htlc_tx).sighash_all(&htlc_tx.input[0], &htlc_redeemscript, htlc.amount_msat / 1000)[..]).unwrap();
 				secp_ctx.verify(&htlc_sighash, &remote_signature, &keys.b_htlc_key).unwrap();
 
 				let mut preimage: Option<[u8; 32]> = None;
diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index ff6f924c6..ff78a27df 100644
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -11,7 +11,7 @@ use secp256k1::{Secp256k1,Message};
 use secp256k1::ecdh::SharedSecret;
 use secp256k1;
 
-use chain::chaininterface::{ChainListener,ChainWatchInterface,FeeEstimator};
+use chain::chaininterface::{BroadcasterInterface,ChainListener,ChainWatchInterface,FeeEstimator};
 use ln::channel::Channel;
 use ln::channelmonitor::ManyChannelMonitor;
 use ln::router::Route;
@@ -41,8 +41,8 @@ pub struct PendingForwardHTLCInfo {
 	amt_to_forward: u64,
 	outgoing_cltv_value: u32,
 }
-//TODO: This is public, and needed to call Channel::update_add_htlc, so there needs to be a way to
-//initialize it usefully...probably make it optional in Channel instead).
+
+#[cfg(feature = "fuzztarget")]
 impl PendingForwardHTLCInfo {
 	pub fn dummy() -> Self {
 		Self {
@@ -126,6 +126,7 @@ pub struct ChannelManager {
 	fee_estimator: Arc<FeeEstimator>,
 	monitor: Arc<ManyChannelMonitor>,
 	chain_monitor: Arc<ChainWatchInterface>,
+	tx_broadcaster: Arc<BroadcasterInterface>,
 
 	announce_channels_publicly: bool,
 	fee_proportional_millionths: u32,
@@ -159,24 +160,40 @@ struct OnionKeys {
 	mu: [u8; 32],
 }
 
+pub struct ChannelDetails {
+	/// The channel's ID (prior to funding transaction generation, this is a random 32 bytes,
+	/// thereafter this is the txid of the funding transaction xor the funding transaction output).
+	/// Note that this means this value is *not* persistent - it can change once during the
+	/// lifetime of the channel.
+	pub channel_id: Uint256,
+	/// The position of the funding transaction in the chain. None if the funding transaction has
+	/// not yet been confirmed and the channel fully opened.
+	pub short_channel_id: Option<u64>,
+	pub remote_network_id: PublicKey,
+	pub channel_value_satoshis: u64,
+	/// The user_id passed in to create_channel, or 0 if the channel was inbound.
+	pub user_id: u64,
+}
+
 impl ChannelManager {
 	/// Constructs a new ChannelManager to hold several channels and route between them. This is
 	/// the main "logic hub" for all channel-related actions, and implements ChannelMessageHandler.
 	/// fee_proportional_millionths is an optional fee to charge any payments routed through us.
 	/// Non-proportional fees are fixed according to our risk using the provided fee estimator.
 	/// panics if channel_value_satoshis is >= (1 << 24)!
-	pub fn new(our_network_key: SecretKey, fee_proportional_millionths: u32, announce_channels_publicly: bool, network: Network, feeest: Arc<FeeEstimator>, monitor: Arc<ManyChannelMonitor>, chain_monitor: Arc<ChainWatchInterface>) -> Result<Arc<ChannelManager>, secp256k1::Error> {
+	pub fn new(our_network_key: SecretKey, fee_proportional_millionths: u32, announce_channels_publicly: bool, network: Network, feeest: Arc<FeeEstimator>, monitor: Arc<ManyChannelMonitor>, chain_monitor: Arc<ChainWatchInterface>, tx_broadcaster: Arc<BroadcasterInterface>) -> Result<Arc<ChannelManager>, secp256k1::Error> {
 		let secp_ctx = Secp256k1::new();
 
 		let res = Arc::new(ChannelManager {
 			genesis_hash: genesis_block(network).header.bitcoin_hash(),
 			fee_estimator: feeest.clone(),
 			monitor: monitor.clone(),
-			chain_monitor: chain_monitor,
+			chain_monitor,
+			tx_broadcaster,
 
-			announce_channels_publicly: announce_channels_publicly,
-			fee_proportional_millionths: fee_proportional_millionths,
-			secp_ctx: secp_ctx,
+			announce_channels_publicly,
+			fee_proportional_millionths,
+			secp_ctx,
 
 			channel_state: Mutex::new(ChannelHolder{
 				by_id: HashMap::new(),
@@ -185,7 +202,7 @@ impl ChannelManager {
 				forward_htlcs: HashMap::new(),
 				claimable_htlcs: HashMap::new(),
 			}),
-			our_network_key: our_network_key,
+			our_network_key,
 
 			pending_events: Mutex::new(Vec::new()),
 		});
@@ -204,6 +221,47 @@ impl ChannelManager {
 		}
 	}
 
+	/// Gets the list of open channels, in random order. See ChannelDetail field documentation for
+	/// more information.
+	pub fn list_channels(&self) -> Vec<ChannelDetails> {
+		let channel_state = self.channel_state.lock().unwrap();
+		let mut res = Vec::with_capacity(channel_state.by_id.len());
+		for (channel_id, channel) in channel_state.by_id.iter() {
+			res.push(ChannelDetails {
+				channel_id: (*channel_id).clone(),
+				short_channel_id: channel.get_short_channel_id(),
+				remote_network_id: channel.get_their_node_id(),
+				channel_value_satoshis: channel.get_value_satoshis(),
+				user_id: channel.get_user_id(),
+			});
+		}
+		res
+	}
+
+	/// Begins the process of closing a channel. After this call (plus some timeout), no new HTLCs
+	/// will be accepted on the given channel, and after additional timeout/the closing of all
+	/// pending HTLCs, the channel will be closed on chain.
+	pub fn close_channel(&self, channel_id: &Uint256) -> Result<msgs::Shutdown, HandleError> {
+		let res = {
+			let mut channel_state = self.channel_state.lock().unwrap();
+			match channel_state.by_id.entry(channel_id.clone()) {
+				hash_map::Entry::Occupied(mut chan_entry) => {
+					let res = chan_entry.get_mut().get_shutdown()?;
+					if chan_entry.get().is_shutdown() {
+						chan_entry.remove_entry();
+					}
+					res
+				},
+				hash_map::Entry::Vacant(_) => return Err(HandleError{err: "No such channel", msg: None})
+			}
+		};
+		for payment_hash in res.1 {
+			// unknown_next_peer...I dunno who that is anymore....
+			self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), &payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 10, data: &[0; 0] });
+		}
+		Ok(res.0)
+	}
+
 	#[inline]
 	fn gen_rho_mu_from_shared_secret(shared_secret: &SharedSecret) -> ([u8; 32], [u8; 32]) {
 		({
@@ -577,7 +635,7 @@ impl ChannelManager {
 			let mut channel_state_lock = self.channel_state.lock().unwrap();
 			let channel_state = channel_state_lock.borrow_parts();
 
-			if Instant::now() < *channel_state.next_forward {
+			if cfg!(not(feature = "fuzztarget")) && Instant::now() < *channel_state.next_forward {
 				return;
 			}
 
@@ -978,12 +1036,57 @@ impl ChannelMessageHandler for ChannelManager {
 		};
 	}
 
-	fn handle_shutdown(&self, _their_node_id: &PublicKey, _msg: &msgs::Shutdown) -> Result<(), HandleError> {
-		unimplemented!()
+	fn handle_shutdown(&self, their_node_id: &PublicKey, msg: &msgs::Shutdown) -> Result<(Option<msgs::Shutdown>, Option<msgs::ClosingSigned>), HandleError> {
+		let res = {
+			let mut channel_state = self.channel_state.lock().unwrap();
+
+			match channel_state.by_id.entry(msg.channel_id.clone()) {
+				hash_map::Entry::Occupied(mut chan_entry) => {
+					if chan_entry.get().get_their_node_id() != *their_node_id {
+						return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None})
+					}
+					let res = chan_entry.get_mut().shutdown(&*self.fee_estimator, &msg)?;
+					if chan_entry.get().is_shutdown() {
+						chan_entry.remove_entry();
+					}
+					res
+				},
+				hash_map::Entry::Vacant(_) => return Err(HandleError{err: "Failed to find corresponding channel", msg: None})
+			}
+		};
+		for payment_hash in res.2 {
+			// unknown_next_peer...I dunno who that is anymore....
+			self.fail_htlc_backwards_internal(self.channel_state.lock().unwrap(), &payment_hash, HTLCFailReason::Reason { failure_code: 0x4000 | 10, data: &[0; 0] });
+		}
+		Ok((res.0, res.1))
 	}
 
-	fn handle_closing_signed(&self, _their_node_id: &PublicKey, _msg: &msgs::ClosingSigned) -> Result<(), HandleError> {
-		unimplemented!()
+	fn handle_closing_signed(&self, their_node_id: &PublicKey, msg: &msgs::ClosingSigned) -> Result<Option<msgs::ClosingSigned>, HandleError> {
+		let res = {
+			let mut channel_state = self.channel_state.lock().unwrap();
+			match channel_state.by_id.entry(msg.channel_id.clone()) {
+				hash_map::Entry::Occupied(mut chan_entry) => {
+					if chan_entry.get().get_their_node_id() != *their_node_id {
+						return Err(HandleError{err: "Got a message for a channel from the wrong node!", msg: None})
+					}
+					let res = chan_entry.get_mut().closing_signed(&*self.fee_estimator, &msg)?;
+					if res.1.is_some() {
+						// We're done with this channel, we've got a signed closing transaction and
+						// will send the closing_signed back to the remote peer upon return. This
+						// also implies there are no pending HTLCs left on the channel, so we can
+						// fully delete it from tracking (the channel monitor is still around to
+						// watch for old state broadcasts)!
+						chan_entry.remove_entry();
+					}
+					res
+				},
+				hash_map::Entry::Vacant(_) => return Err(HandleError{err: "Failed to find corresponding channel", msg: None})
+			}
+		};
+		if let Some(broadcast_tx) = res.1 {
+			self.tx_broadcaster.broadcast_transaction(&broadcast_tx);
+		}
+		Ok(res.0)
 	}
 
 	fn handle_update_add_htlc(&self, their_node_id: &PublicKey, msg: &msgs::UpdateAddHTLC) -> Result<(), msgs::HandleError> {
@@ -1391,6 +1494,7 @@ mod tests {
 
 	use bitcoin::util::misc::hex_bytes;
 	use bitcoin::util::hash::Sha256dHash;
+	use bitcoin::util::uint::Uint256;
 	use bitcoin::blockdata::block::BlockHeader;
 	use bitcoin::blockdata::transaction::Transaction;
 	use bitcoin::network::constants::Network;
@@ -1405,7 +1509,7 @@ mod tests {
 
 	use rand::{thread_rng,Rng};
 
-	use std::sync::Arc;
+	use std::sync::{Arc, Mutex};
 	use std::default::Default;
 	use std::time::Instant;
 
@@ -1570,13 +1674,13 @@ mod tests {
 		}
 	}
 
-	fn create_chan_between_nodes(node_a: &ChannelManager, chain_a: &chaininterface::ChainWatchInterfaceUtil, node_b: &ChannelManager, chain_b: &chaininterface::ChainWatchInterfaceUtil) -> (msgs::ChannelAnnouncement, msgs::ChannelUpdate, msgs::ChannelUpdate) {
+	fn create_chan_between_nodes(node_a: &ChannelManager, chain_a: &chaininterface::ChainWatchInterfaceUtil, node_b: &ChannelManager, chain_b: &chaininterface::ChainWatchInterfaceUtil) -> (msgs::ChannelAnnouncement, msgs::ChannelUpdate, msgs::ChannelUpdate, Uint256) {
 		let open_chan = node_a.create_channel(node_b.get_our_node_id(), 100000, 42).unwrap();
 		let accept_chan = node_b.handle_open_channel(&node_a.get_our_node_id(), &open_chan).unwrap();
 		node_a.handle_accept_channel(&node_b.get_our_node_id(), &accept_chan).unwrap();
 
 		let chan_id = unsafe { CHAN_COUNT };
-		let tx = Transaction { version: chan_id as u32, lock_time: 0, input: Vec::new(), output: Vec::new(), witness: Vec::new() };
+		let tx = Transaction { version: chan_id as u32, lock_time: 0, input: Vec::new(), output: Vec::new() };
 		let funding_output = (Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), chan_id);
 
 		let events_1 = node_a.get_and_clear_pending_events();
@@ -1627,12 +1731,15 @@ mod tests {
 			_ => panic!("Unexpected event"),
 		};
 
+		let channel_id;
+
 		confirm_transaction(&chain_b, &tx);
 		let events_5 = node_b.get_and_clear_pending_events();
 		assert_eq!(events_5.len(), 1);
 		let as_announcement_sigs = match events_5[0] {
 			Event::SendFundingLocked { ref node_id, ref msg, ref announcement_sigs } => {
 				assert_eq!(*node_id, node_a.get_our_node_id());
+				channel_id = msg.channel_id.clone();
 				let as_announcement_sigs = node_a.handle_funding_locked(&node_b.get_our_node_id(), msg).unwrap().unwrap();
 				node_a.handle_announcement_signatures(&node_b.get_our_node_id(), &(*announcement_sigs).clone().unwrap()).unwrap();
 				as_announcement_sigs
@@ -1664,7 +1771,42 @@ mod tests {
 			CHAN_COUNT += 1;
 		}
 
-		((*announcement).clone(), (*as_update).clone(), (*bs_update).clone())
+		((*announcement).clone(), (*as_update).clone(), (*bs_update).clone(), channel_id)
+	}
+
+	fn close_channel(outbound_node: &ChannelManager, outbound_broadcaster: &test_utils::TestBroadcaster, inbound_node: &ChannelManager, inbound_broadcaster: &test_utils::TestBroadcaster, channel_id: &Uint256, close_inbound_first: bool) {
+		let (node_a, broadcaster_a) = if close_inbound_first { (inbound_node, inbound_broadcaster) } else { (outbound_node, outbound_broadcaster) };
+		let (node_b, broadcaster_b) = if close_inbound_first { (outbound_node, outbound_broadcaster) } else { (inbound_node, inbound_broadcaster) };
+		let (tx_a, tx_b);
+
+		let shutdown_a = node_a.close_channel(channel_id).unwrap();
+		let (shutdown_b, mut closing_signed_b) = node_b.handle_shutdown(&node_a.get_our_node_id(), &shutdown_a).unwrap();
+		if !close_inbound_first {
+			assert!(closing_signed_b.is_none());
+		}
+		let (empty_a, mut closing_signed_a) = node_a.handle_shutdown(&node_b.get_our_node_id(), &shutdown_b.unwrap()).unwrap();
+		assert!(empty_a.is_none());
+		if close_inbound_first {
+			assert!(closing_signed_a.is_none());
+			closing_signed_a = node_a.handle_closing_signed(&node_b.get_our_node_id(), &closing_signed_b.unwrap()).unwrap();
+			assert_eq!(broadcaster_a.txn_broadcasted.lock().unwrap().len(), 1);
+			tx_a = broadcaster_a.txn_broadcasted.lock().unwrap().remove(0);
+
+			let empty_b = node_b.handle_closing_signed(&node_a.get_our_node_id(), &closing_signed_a.unwrap()).unwrap();
+			assert!(empty_b.is_none());
+			assert_eq!(broadcaster_b.txn_broadcasted.lock().unwrap().len(), 1);
+			tx_b = broadcaster_b.txn_broadcasted.lock().unwrap().remove(0);
+		} else {
+			closing_signed_b = node_b.handle_closing_signed(&node_a.get_our_node_id(), &closing_signed_a.unwrap()).unwrap();
+			assert_eq!(broadcaster_b.txn_broadcasted.lock().unwrap().len(), 1);
+			tx_b = broadcaster_b.txn_broadcasted.lock().unwrap().remove(0);
+
+			let empty_a2 = node_a.handle_closing_signed(&node_b.get_our_node_id(), &closing_signed_b.unwrap()).unwrap();
+			assert!(empty_a2.is_none());
+			assert_eq!(broadcaster_a.txn_broadcasted.lock().unwrap().len(), 1);
+			tx_a = broadcaster_a.txn_broadcasted.lock().unwrap().remove(0);
+		}
+		assert_eq!(tx_a, tx_b);
 	}
 
 	struct SendEvent {
@@ -1878,45 +2020,49 @@ mod tests {
 		let feeest_1 = Arc::new(test_utils::TestFeeEstimator { sat_per_vbyte: 1 });
 		let chain_monitor_1 = Arc::new(chaininterface::ChainWatchInterfaceUtil::new());
 		let chan_monitor_1 = Arc::new(test_utils::TestChannelMonitor{});
+		let tx_broadcaster_1 = Arc::new(test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new())});
 		let node_id_1 = {
 			let mut key_slice = [0; 32];
 			rng.fill_bytes(&mut key_slice);
 			SecretKey::from_slice(&secp_ctx, &key_slice).unwrap()
 		};
-		let node_1 = ChannelManager::new(node_id_1.clone(), 0, true, Network::Testnet, feeest_1.clone(), chan_monitor_1.clone(), chain_monitor_1.clone()).unwrap();
+		let node_1 = ChannelManager::new(node_id_1.clone(), 0, true, Network::Testnet, feeest_1.clone(), chan_monitor_1.clone(), chain_monitor_1.clone(), tx_broadcaster_1.clone()).unwrap();
 		let router_1 = Router::new(PublicKey::from_secret_key(&secp_ctx, &node_id_1).unwrap());
 
 		let feeest_2 = Arc::new(test_utils::TestFeeEstimator { sat_per_vbyte: 1 });
 		let chain_monitor_2 = Arc::new(chaininterface::ChainWatchInterfaceUtil::new());
 		let chan_monitor_2 = Arc::new(test_utils::TestChannelMonitor{});
+		let tx_broadcaster_2 = Arc::new(test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new())});
 		let node_id_2 = {
 			let mut key_slice = [0; 32];
 			rng.fill_bytes(&mut key_slice);
 			SecretKey::from_slice(&secp_ctx, &key_slice).unwrap()
 		};
-		let node_2 = ChannelManager::new(node_id_2.clone(), 0, true, Network::Testnet, feeest_2.clone(), chan_monitor_2.clone(), chain_monitor_2.clone()).unwrap();
+		let node_2 = ChannelManager::new(node_id_2.clone(), 0, true, Network::Testnet, feeest_2.clone(), chan_monitor_2.clone(), chain_monitor_2.clone(), tx_broadcaster_2.clone()).unwrap();
 		let router_2 = Router::new(PublicKey::from_secret_key(&secp_ctx, &node_id_2).unwrap());
 
 		let feeest_3 = Arc::new(test_utils::TestFeeEstimator { sat_per_vbyte: 1 });
 		let chain_monitor_3 = Arc::new(chaininterface::ChainWatchInterfaceUtil::new());
 		let chan_monitor_3 = Arc::new(test_utils::TestChannelMonitor{});
+		let tx_broadcaster_3 = Arc::new(test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new())});
 		let node_id_3 = {
 			let mut key_slice = [0; 32];
 			rng.fill_bytes(&mut key_slice);
 			SecretKey::from_slice(&secp_ctx, &key_slice).unwrap()
 		};
-		let node_3 = ChannelManager::new(node_id_3.clone(), 0, true, Network::Testnet, feeest_3.clone(), chan_monitor_3.clone(), chain_monitor_3.clone()).unwrap();
+		let node_3 = ChannelManager::new(node_id_3.clone(), 0, true, Network::Testnet, feeest_3.clone(), chan_monitor_3.clone(), chain_monitor_3.clone(), tx_broadcaster_3.clone()).unwrap();
 		let router_3 = Router::new(PublicKey::from_secret_key(&secp_ctx, &node_id_3).unwrap());
 
 		let feeest_4 = Arc::new(test_utils::TestFeeEstimator { sat_per_vbyte: 1 });
 		let chain_monitor_4 = Arc::new(chaininterface::ChainWatchInterfaceUtil::new());
 		let chan_monitor_4 = Arc::new(test_utils::TestChannelMonitor{});
+		let tx_broadcaster_4 = Arc::new(test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new())});
 		let node_id_4 = {
 			let mut key_slice = [0; 32];
 			rng.fill_bytes(&mut key_slice);
 			SecretKey::from_slice(&secp_ctx, &key_slice).unwrap()
 		};
-		let node_4 = ChannelManager::new(node_id_4.clone(), 0, true, Network::Testnet, feeest_4.clone(), chan_monitor_4.clone(), chain_monitor_4.clone()).unwrap();
+		let node_4 = ChannelManager::new(node_id_4.clone(), 0, true, Network::Testnet, feeest_4.clone(), chan_monitor_4.clone(), chain_monitor_4.clone(), tx_broadcaster_4.clone()).unwrap();
 		let router_4 = Router::new(PublicKey::from_secret_key(&secp_ctx, &node_id_4).unwrap());
 
 		// Create some initial channels
@@ -2042,6 +2188,12 @@ mod tests {
 		claim_payment(&node_1, &vec!(&*node_2, &*node_4)[..], payment_preimage_4);
 		claim_payment(&node_1, &vec!(&*node_2, &*node_4)[..], payment_preimage_5);
 
+		// Close down the channels...
+		close_channel(&node_1, &tx_broadcaster_1, &node_2, &tx_broadcaster_2, &chan_announcement_1.3, true);
+		close_channel(&node_2, &tx_broadcaster_2, &node_3, &tx_broadcaster_3, &chan_announcement_2.3, false);
+		close_channel(&node_3, &tx_broadcaster_3, &node_4, &tx_broadcaster_4, &chan_announcement_3.3, true);
+		close_channel(&node_2, &tx_broadcaster_2, &node_4, &tx_broadcaster_4, &chan_announcement_4.3, false);
+
 		// Check that we processed all pending events
 		for node in vec!(&node_1, &node_2, &node_3, &node_4) {
 			assert_eq!(node.get_and_clear_pending_events().len(), 0);
diff --git a/src/ln/channelmonitor.rs b/src/ln/channelmonitor.rs
index 5ac9a6b0a..53440f436 100644
--- a/src/ln/channelmonitor.rs
+++ b/src/ln/channelmonitor.rs
@@ -323,6 +323,7 @@ impl ChannelMonitor {
 						prev_index: per_commitment_data.revoked_output_index,
 						script_sig: Script::new(),
 						sequence: 0xffffffff,
+						witness: Vec::new(),
 					});
 					values.push(tx.output[per_commitment_data.revoked_output_index as usize].value);
 					total_value += tx.output[per_commitment_data.revoked_output_index as usize].value;
@@ -340,6 +341,7 @@ impl ChannelMonitor {
 								prev_index: htlc.transaction_output_index,
 								script_sig: Script::new(),
 								sequence: 0xffffffff,
+								witness: Vec::new(),
 							});
 							values.push(tx.output[htlc.transaction_output_index as usize].value);
 							total_value += htlc.amount_msat / 1000;
@@ -358,6 +360,7 @@ impl ChannelMonitor {
 								prev_index: idx as u32,
 								script_sig: Script::new(),
 								sequence: 0xffffffff,
+								witness: Vec::new(),
 							});
 							values.push(outp.value);
 							total_value += outp.value;
@@ -378,18 +381,16 @@ impl ChannelMonitor {
 				lock_time: 0,
 				input: inputs,
 				output: outputs,
-				witness: Vec::new(),
 			};
 
 			let mut values_drain = values.drain(..);
 
 			// First input is the generic revokeable_redeemscript
-			// TODO: Make one SighashComponents and use that throughout instead of re-building it
-			// each time.
+			let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 			{
 				let sig = match self.revocation_base_key {
 					RevocationStorage::PrivMode { ref revocation_base_key } => {
-						let sighash = ignore_error!(Message::from_slice(&bip143::SighashComponents::new(&spend_tx).sighash_all(&spend_tx, 0, &revokeable_redeemscript, values_drain.next().unwrap())[..]));
+						let sighash = ignore_error!(Message::from_slice(&sighash_parts.sighash_all(&spend_tx.input[0], &revokeable_redeemscript, values_drain.next().unwrap())[..]));
 						let revocation_key = ignore_error!(chan_utils::derive_private_revocation_key(&self.secp_ctx, &per_commitment_key, &revocation_base_key));
 						ignore_error!(self.secp_ctx.sign(&sighash, &revocation_key))
 					},
@@ -398,17 +399,16 @@ impl ChannelMonitor {
 					}
 				};
 
-				spend_tx.witness.push(Vec::new());
-				spend_tx.witness[0].push(sig.serialize_der(&self.secp_ctx).to_vec());
-				spend_tx.witness[0][0].push(SigHashType::All as u8);
-				spend_tx.witness[0].push(vec!(1)); // First if branch is revocation_key
+				spend_tx.input[0].witness.push(sig.serialize_der(&self.secp_ctx).to_vec());
+				spend_tx.input[0].witness[0].push(SigHashType::All as u8);
+				spend_tx.input[0].witness.push(vec!(1)); // First if branch is revocation_key
 			}
 
 			match self.claimable_outpoints.get(&commitment_txid) {
 				None => {},
 				Some(per_commitment_data) => {
 					let mut htlc_idx = 0;
-					for (idx, _) in spend_tx.input.iter().enumerate() {
+					for (idx, input) in spend_tx.input.iter_mut().enumerate() {
 						if idx == 0 { continue; } // We already signed the first input
 
 						let mut htlc;
@@ -421,7 +421,7 @@ impl ChannelMonitor {
 						let sig = match self.revocation_base_key {
 							RevocationStorage::PrivMode { ref revocation_base_key } => {
 								let htlc_redeemscript = chan_utils::get_htlc_redeemscript_with_explicit_keys(htlc, &a_htlc_key, &b_htlc_key, &revocation_pubkey, htlc.offered);
-								let sighash = ignore_error!(Message::from_slice(&bip143::SighashComponents::new(&spend_tx).sighash_all(&spend_tx, idx, &htlc_redeemscript, values_drain.next().unwrap())[..]));
+								let sighash = ignore_error!(Message::from_slice(&sighash_parts.sighash_all(&input, &htlc_redeemscript, values_drain.next().unwrap())[..]));
 
 								let revocation_key = ignore_error!(chan_utils::derive_private_revocation_key(&self.secp_ctx, &per_commitment_key, &revocation_base_key));
 								ignore_error!(self.secp_ctx.sign(&sighash, &revocation_key))
@@ -431,10 +431,9 @@ impl ChannelMonitor {
 							}
 						};
 
-						spend_tx.witness.push(Vec::new());
-						spend_tx.witness[0].push(revocation_pubkey.serialize().to_vec()); // First if branch is revocation_key
-						spend_tx.witness[0].push(sig.serialize_der(&self.secp_ctx).to_vec());
-						spend_tx.witness[0][0].push(SigHashType::All as u8);
+						input.witness.push(revocation_pubkey.serialize().to_vec()); // First if branch is revocation_key
+						input.witness.push(sig.serialize_der(&self.secp_ctx).to_vec());
+						input.witness[0].push(SigHashType::All as u8);
 					}
 				}
 			}
diff --git a/src/ln/mod.rs b/src/ln/mod.rs
index 1f5fa460a..7cd4272e1 100644
--- a/src/ln/mod.rs
+++ b/src/ln/mod.rs
@@ -1,9 +1,13 @@
 pub mod channelmanager;
-pub mod channel;
 pub mod channelmonitor;
 pub mod msgs;
 pub mod router;
 pub mod peer_channel_encryptor;
 pub mod peer_handler;
 
+#[cfg(feature = "fuzztarget")]
+pub mod channel;
+#[cfg(not(feature = "fuzztarget"))]
+pub(crate) mod channel;
+
 mod chan_utils;
diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs
index 6bb900967..c7310ac9d 100644
--- a/src/ln/msgs.rs
+++ b/src/ln/msgs.rs
@@ -366,8 +366,8 @@ pub trait ChannelMessageHandler : events::EventsProvider {
 	fn handle_funding_locked(&self, their_node_id: &PublicKey, msg: &FundingLocked) -> Result<Option<AnnouncementSignatures>, HandleError>;
 
 	// Channl close:
-	fn handle_shutdown(&self, their_node_id: &PublicKey, msg: &Shutdown) -> Result<(), HandleError>;
-	fn handle_closing_signed(&self, their_node_id: &PublicKey, msg: &ClosingSigned) -> Result<(), HandleError>;
+	fn handle_shutdown(&self, their_node_id: &PublicKey, msg: &Shutdown) -> Result<(Option<Shutdown>, Option<ClosingSigned>), HandleError>;
+	fn handle_closing_signed(&self, their_node_id: &PublicKey, msg: &ClosingSigned) -> Result<Option<ClosingSigned>, HandleError>;
 
 	// HTLC handling:
 	fn handle_update_add_htlc(&self, their_node_id: &PublicKey, msg: &UpdateAddHTLC) -> Result<(), HandleError>;
diff --git a/src/ln/peer_handler.rs b/src/ln/peer_handler.rs
index 9715ee965..a6992eae4 100644
--- a/src/ln/peer_handler.rs
+++ b/src/ln/peer_handler.rs
@@ -219,7 +219,6 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 	}
 
 	fn do_read_event(&self, peer_descriptor: &mut Descriptor, data: Vec<u8>) -> Result<bool, PeerHandleError> {
-		let mut upstream_events = Vec::new();
 		let pause_read = {
 			let mut peers = self.peers.lock().unwrap();
 			let (should_insert_node_id, pause_read) = match peers.peers.get_mut(peer_descriptor) {
@@ -357,11 +356,20 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 
 											38 => {
 												let msg = try_potential_decodeerror!(msgs::Shutdown::decode(&msg_data[2..]));
-												try_potential_handleerror!(self.message_handler.chan_handler.handle_shutdown(&peer.their_node_id.unwrap(), &msg));
+												let resp_options = try_potential_handleerror!(self.message_handler.chan_handler.handle_shutdown(&peer.their_node_id.unwrap(), &msg));
+												if let Some(resp) = resp_options.0 {
+													encode_and_send_msg!(resp, 38);
+												}
+												if let Some(resp) = resp_options.1 {
+													encode_and_send_msg!(resp, 39);
+												}
 											},
 											39 => {
 												let msg = try_potential_decodeerror!(msgs::ClosingSigned::decode(&msg_data[2..]));
-												try_potential_handleerror!(self.message_handler.chan_handler.handle_closing_signed(&peer.their_node_id.unwrap(), &msg));
+												let resp_option = try_potential_handleerror!(self.message_handler.chan_handler.handle_closing_signed(&peer.their_node_id.unwrap(), &msg));
+												if let Some(resp) = resp_option {
+													encode_and_send_msg!(resp, 39);
+												}
 											},
 
 											128 => {
@@ -454,11 +462,25 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 				None => {}
 			};
 
+			pause_read
+		};
+
+		self.process_events();
+
+		Ok(pause_read)
+	}
+
+	/// Checks for any events generated by our handlers and processes them. May be needed after eg
+	/// calls to ChannelManager::process_pending_htlc_forward.
+	pub fn process_events(&self) {
+		let mut upstream_events = Vec::new();
+		{
 			// TODO: There are some DoS attacks here where you can flood someone's outbound send
 			// buffer by doing things like announcing channels on another node. We should be willing to
 			// drop optional-ish messages when send buffers get full!
 
 			let mut events_generated = self.message_handler.chan_handler.get_and_clear_pending_events();
+			let mut peers = self.peers.lock().unwrap();
 			for event in events_generated.drain(..) {
 				macro_rules! get_peer_for_forwarding {
 					($node_id: expr, $handle_no_such_peer: block) => {
@@ -564,16 +586,12 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 
 				upstream_events.push(event);
 			}
-
-			pause_read
-		};
+		}
 
 		let mut pending_events = self.pending_events.lock().unwrap();
 		for event in upstream_events.drain(..) {
 			pending_events.push(event);
 		}
-
-		Ok(pause_read)
 	}
 
 	/// Indicates that the given socket descriptor's connection is now closed.
diff --git a/src/util/test_utils.rs b/src/util/test_utils.rs
index df13e1c90..5d657b13d 100644
--- a/src/util/test_utils.rs
+++ b/src/util/test_utils.rs
@@ -3,8 +3,11 @@ use chain::chaininterface::ConfirmationTarget;
 use ln::channelmonitor;
 use ln::msgs::HandleError;
 
+use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::util::hash::Sha256dHash;
 
+use std::sync::Mutex;
+
 pub struct TestFeeEstimator {
 	pub sat_per_vbyte: u64,
 }
@@ -23,3 +26,12 @@ impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
 		Ok(())
 	}
 }
+
+pub struct TestBroadcaster {
+	pub txn_broadcasted: Mutex<Vec<Transaction>>,
+}
+impl chaininterface::BroadcasterInterface for TestBroadcaster {
+	fn broadcast_transaction(&self, tx: &Transaction) {
+		self.txn_broadcasted.lock().unwrap().push(tx.clone());
+	}
+}