From: Matt Corallo <git@bluematt.me>
Date: Mon, 7 Jan 2019 22:17:36 +0000 (-0500)
Subject: Add a fuzz target to test monitor update failure handling
X-Git-Tag: v0.0.12~233^2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=49d63302c3dd269279489590ca1bb4a939fdece4;p=rust-lightning

Add a fuzz target to test monitor update failure handling

Sadly this requires reducing the honggfuzz iterations to fit within
Travis' runtime limits.
---

diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 53ff1cbd7..21f3bac22 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -44,6 +44,10 @@ path = "fuzz_targets/peer_crypt_target.rs"
 name = "full_stack_target"
 path = "fuzz_targets/full_stack_target.rs"
 
+[[bin]]
+name = "chanmon_fail_consistency"
+path = "fuzz_targets/chanmon_fail_consistency.rs"
+
 [[bin]]
 name = "router_target"
 path = "fuzz_targets/router_target.rs"
diff --git a/fuzz/fuzz_targets/chanmon_fail_consistency.rs b/fuzz/fuzz_targets/chanmon_fail_consistency.rs
new file mode 100644
index 000000000..4db158f28
--- /dev/null
+++ b/fuzz/fuzz_targets/chanmon_fail_consistency.rs
@@ -0,0 +1,553 @@
+//! Test that monitor update failures don't get our channel state out of sync.
+//! One of the biggest concern with the monitor update failure handling code is that messages
+//! resent after monitor updating is restored are delivered out-of-order, resulting in
+//! commitment_signed messages having "invalid signatures".
+//! To test this we stand up a network of three nodes and read bytes from the fuzz input to denote
+//! actions such as sending payments, handling events, or changing monitor update return values on
+//! a per-node basis. This should allow it to find any cases where the ordering of actions results
+//! in us getting out of sync with ourselves, and, assuming at least one of our recieve- or
+//! send-side handling is correct, other peers. We consider it a failure if any action results in a
+//! channel being force-closed.
+
+//Uncomment this for libfuzzer builds:
+//#![no_main]
+
+extern crate bitcoin;
+extern crate bitcoin_hashes;
+extern crate lightning;
+extern crate secp256k1;
+
+use bitcoin::BitcoinHash;
+use bitcoin::blockdata::block::BlockHeader;
+use bitcoin::blockdata::transaction::{Transaction, TxOut};
+use bitcoin::blockdata::script::{Builder, Script};
+use bitcoin::blockdata::opcodes;
+use bitcoin::network::constants::Network;
+
+use bitcoin_hashes::Hash as TraitImport;
+use bitcoin_hashes::hash160::Hash as Hash160;
+use bitcoin_hashes::sha256::Hash as Sha256;
+
+use lightning::chain::chaininterface;
+use lightning::chain::transaction::OutPoint;
+use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
+use lightning::chain::keysinterface::{ChannelKeys, KeysInterface};
+use lightning::ln::channelmonitor;
+use lightning::ln::channelmonitor::{ChannelMonitorUpdateErr, HTLCUpdate};
+use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage};
+use lightning::ln::router::{Route, RouteHop};
+use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, HandleError, UpdateAddHTLC};
+use lightning::util::{reset_rng_state, fill_bytes, events};
+use lightning::util::logger::Logger;
+use lightning::util::config::UserConfig;
+use lightning::util::events::{EventsProvider, MessageSendEventsProvider};
+use lightning::util::ser::{Readable, Writeable};
+
+mod utils;
+use utils::test_logger;
+
+use secp256k1::key::{PublicKey,SecretKey};
+use secp256k1::Secp256k1;
+
+use std::sync::{Arc,Mutex};
+use std::io::Cursor;
+
+struct FuzzEstimator {}
+impl FeeEstimator for FuzzEstimator {
+	fn get_est_sat_per_1000_weight(&self, _: ConfirmationTarget) -> u64 {
+		253
+	}
+}
+
+pub struct TestBroadcaster {}
+impl BroadcasterInterface for TestBroadcaster {
+	fn broadcast_transaction(&self, _tx: &Transaction) { }
+}
+
+pub struct TestChannelMonitor {
+	pub simple_monitor: Arc<channelmonitor::SimpleManyChannelMonitor<OutPoint>>,
+	pub update_ret: Mutex<Result<(), channelmonitor::ChannelMonitorUpdateErr>>,
+}
+impl TestChannelMonitor {
+	pub fn new(chain_monitor: Arc<chaininterface::ChainWatchInterface>, broadcaster: Arc<chaininterface::BroadcasterInterface>, logger: Arc<Logger>) -> Self {
+		Self {
+			simple_monitor: channelmonitor::SimpleManyChannelMonitor::new(chain_monitor, broadcaster, logger),
+			update_ret: Mutex::new(Ok(())),
+		}
+	}
+}
+impl channelmonitor::ManyChannelMonitor for TestChannelMonitor {
+	fn add_update_monitor(&self, funding_txo: OutPoint, monitor: channelmonitor::ChannelMonitor) -> Result<(), channelmonitor::ChannelMonitorUpdateErr> {
+		assert!(self.simple_monitor.add_update_monitor(funding_txo, monitor).is_ok());
+		self.update_ret.lock().unwrap().clone()
+	}
+
+	fn fetch_pending_htlc_updated(&self) -> Vec<HTLCUpdate> {
+		return self.simple_monitor.fetch_pending_htlc_updated();
+	}
+}
+
+struct KeyProvider {
+	node_id: u8,
+}
+impl KeysInterface for KeyProvider {
+	fn get_node_secret(&self) -> SecretKey {
+		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, 1, self.node_id]).unwrap()
+	}
+
+	fn get_destination_script(&self) -> Script {
+		let secp_ctx = Secp256k1::signing_only();
+		let channel_monitor_claim_key = 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, 2, self.node_id]).unwrap();
+		let our_channel_monitor_claim_key_hash = Hash160::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
+		Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
+	}
+
+	fn get_shutdown_pubkey(&self) -> PublicKey {
+		let secp_ctx = Secp256k1::signing_only();
+		PublicKey::from_secret_key(&secp_ctx, &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, 3, self.node_id]).unwrap())
+	}
+
+	fn get_channel_keys(&self, _inbound: bool) -> ChannelKeys {
+		ChannelKeys {
+			funding_key:               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, 4, self.node_id]).unwrap(),
+			revocation_base_key:       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, self.node_id]).unwrap(),
+			payment_base_key:          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, 6, self.node_id]).unwrap(),
+			delayed_payment_base_key:  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, 7, self.node_id]).unwrap(),
+			htlc_base_key:             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(),
+			commitment_seed: [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],
+		}
+	}
+
+	fn get_session_key(&self) -> SecretKey {
+		let mut session_key = [0; 32];
+		fill_bytes(&mut session_key);
+		SecretKey::from_slice(&session_key).unwrap()
+	}
+
+	fn get_channel_id(&self) -> [u8; 32] {
+		let mut channel_id = [0; 32];
+		fill_bytes(&mut channel_id);
+		channel_id
+	}
+}
+
+#[inline]
+pub fn do_test(data: &[u8]) {
+	reset_rng_state();
+
+	let fee_est = Arc::new(FuzzEstimator{});
+	let broadcast = Arc::new(TestBroadcaster{});
+
+	macro_rules! make_node {
+		($node_id: expr) => { {
+			let logger: Arc<Logger> = Arc::new(test_logger::TestLogger::new($node_id.to_string()));
+			let watch = Arc::new(ChainWatchInterfaceUtil::new(Network::Bitcoin, Arc::clone(&logger)));
+			let monitor = Arc::new(TestChannelMonitor::new(watch.clone(), broadcast.clone(), logger.clone()));
+
+			let keys_manager = Arc::new(KeyProvider { node_id: $node_id });
+			let mut config = UserConfig::new();
+			config.channel_options.fee_proportional_millionths = 0;
+			config.channel_options.announced_channel = true;
+			config.channel_limits.min_dust_limit_satoshis = 0;
+			(ChannelManager::new(Network::Bitcoin, fee_est.clone(), monitor.clone(), watch.clone(), broadcast.clone(), Arc::clone(&logger), keys_manager.clone(), config).unwrap(),
+			monitor)
+		} }
+	}
+
+	let mut channel_txn = Vec::new();
+	macro_rules! make_channel {
+		($source: expr, $dest: expr, $chan_id: expr) => { {
+			$source.create_channel($dest.get_our_node_id(), 10000000, 42, 0).unwrap();
+			let open_channel = {
+				let events = $source.get_and_clear_pending_msg_events();
+				assert_eq!(events.len(), 1);
+				if let events::MessageSendEvent::SendOpenChannel { ref msg, .. } = events[0] {
+					msg.clone()
+				} else { panic!("Wrong event type"); }
+			};
+
+			$dest.handle_open_channel(&$source.get_our_node_id(), &open_channel).unwrap();
+			let accept_channel = {
+				let events = $dest.get_and_clear_pending_msg_events();
+				assert_eq!(events.len(), 1);
+				if let events::MessageSendEvent::SendAcceptChannel { ref msg, .. } = events[0] {
+					msg.clone()
+				} else { panic!("Wrong event type"); }
+			};
+
+			$source.handle_accept_channel(&$dest.get_our_node_id(), &accept_channel).unwrap();
+			{
+				let events = $source.get_and_clear_pending_events();
+				assert_eq!(events.len(), 1);
+				if let events::Event::FundingGenerationReady { ref temporary_channel_id, ref channel_value_satoshis, ref output_script, .. } = events[0] {
+					let tx = Transaction { version: $chan_id, lock_time: 0, input: Vec::new(), output: vec![TxOut {
+						value: *channel_value_satoshis, script_pubkey: output_script.clone(),
+					}]};
+					let funding_output = OutPoint::new(tx.txid(), 0);
+					$source.funding_transaction_generated(&temporary_channel_id, funding_output);
+					channel_txn.push(tx);
+				} else { panic!("Wrong event type"); }
+			}
+
+			let funding_created = {
+				let events = $source.get_and_clear_pending_msg_events();
+				assert_eq!(events.len(), 1);
+				if let events::MessageSendEvent::SendFundingCreated { ref msg, .. } = events[0] {
+					msg.clone()
+				} else { panic!("Wrong event type"); }
+			};
+			$dest.handle_funding_created(&$source.get_our_node_id(), &funding_created).unwrap();
+
+			let funding_signed = {
+				let events = $dest.get_and_clear_pending_msg_events();
+				assert_eq!(events.len(), 1);
+				if let events::MessageSendEvent::SendFundingSigned { ref msg, .. } = events[0] {
+					msg.clone()
+				} else { panic!("Wrong event type"); }
+			};
+			$source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed).unwrap();
+
+			{
+				let events = $source.get_and_clear_pending_events();
+				assert_eq!(events.len(), 1);
+				if let events::Event::FundingBroadcastSafe { .. } = events[0] {
+				} else { panic!("Wrong event type"); }
+			}
+		} }
+	}
+
+	macro_rules! confirm_txn {
+		($node: expr) => { {
+			let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
+			let mut txn = Vec::with_capacity(channel_txn.len());
+			let mut posn = Vec::with_capacity(channel_txn.len());
+			for i in 0..channel_txn.len() {
+				txn.push(&channel_txn[i]);
+				posn.push(i as u32 + 1);
+			}
+			$node.block_connected(&header, 1, &txn, &posn);
+			for i in 2..100 {
+				header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
+				$node.block_connected(&header, i, &Vec::new(), &[0; 0]);
+			}
+		} }
+	}
+
+	macro_rules! lock_fundings {
+		($nodes: expr) => { {
+			let mut node_events = Vec::new();
+			for node in $nodes.iter() {
+				node_events.push(node.get_and_clear_pending_msg_events());
+			}
+			for (idx, node_event) in node_events.iter().enumerate() {
+				for event in node_event {
+					if let events::MessageSendEvent::SendFundingLocked { ref node_id, ref msg } = event {
+						for node in $nodes.iter() {
+							if node.get_our_node_id() == *node_id {
+								node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg).unwrap();
+							}
+						}
+					} else { panic!("Wrong event type"); }
+				}
+			}
+
+			for node in $nodes.iter() {
+				let events = node.get_and_clear_pending_msg_events();
+				for event in events {
+					if let events::MessageSendEvent::SendAnnouncementSignatures { .. } = event {
+					} else { panic!("Wrong event type"); }
+				}
+			}
+		} }
+	}
+
+	// 3 nodes is enough to hit all the possible cases, notably unknown-source-unknown-dest
+	// forwarding.
+	let (node_a, monitor_a) = make_node!(0);
+	let (node_b, monitor_b) = make_node!(1);
+	let (node_c, monitor_c) = make_node!(2);
+
+	let nodes = [node_a, node_b, node_c];
+
+	make_channel!(nodes[0], nodes[1], 0);
+	make_channel!(nodes[1], nodes[2], 1);
+
+	for node in nodes.iter() {
+		confirm_txn!(node);
+	}
+
+	lock_fundings!(nodes);
+
+	let chan_a = nodes[0].list_usable_channels()[0].short_channel_id.unwrap();
+	let chan_b = nodes[2].list_usable_channels()[0].short_channel_id.unwrap();
+
+	let mut payment_id = 0;
+
+	let mut chan_a_disconnected = false;
+	let mut chan_b_disconnected = false;
+	let mut chan_a_reconnecting = false;
+	let mut chan_b_reconnecting = false;
+
+	macro_rules! test_err {
+		($res: expr) => {
+			match $res {
+				Ok(()) => {},
+				Err(HandleError { action: Some(ErrorAction::IgnoreError), .. }) => { },
+				_ => { $res.unwrap() },
+			}
+		}
+	}
+
+	macro_rules! test_return {
+		() => { {
+			assert_eq!(nodes[0].list_channels().len(), 1);
+			assert_eq!(nodes[1].list_channels().len(), 2);
+			assert_eq!(nodes[2].list_channels().len(), 1);
+			return;
+		} }
+	}
+
+	let mut read_pos = 0;
+	macro_rules! get_slice {
+		($len: expr) => {
+			{
+				let slice_len = $len as usize;
+				if data.len() < read_pos + slice_len {
+					test_return!();
+				}
+				read_pos += slice_len;
+				&data[read_pos - slice_len..read_pos]
+			}
+		}
+	}
+
+	loop {
+		macro_rules! send_payment {
+			($source: expr, $dest: expr) => { {
+				let payment_hash = Sha256::hash(&[payment_id; 1]);
+				payment_id = payment_id.wrapping_add(1);
+				if let Err(_) = $source.send_payment(Route {
+					hops: vec![RouteHop {
+						pubkey: $dest.0.get_our_node_id(),
+						short_channel_id: $dest.1,
+						fee_msat: 5000000,
+						cltv_expiry_delta: 200,
+					}],
+				}, PaymentHash(payment_hash.into_inner())) {
+					// Probably ran out of funds
+					test_return!();
+				}
+			} };
+			($source: expr, $middle: expr, $dest: expr) => { {
+				let payment_hash = Sha256::hash(&[payment_id; 1]);
+				payment_id = payment_id.wrapping_add(1);
+				if let Err(_) = $source.send_payment(Route {
+					hops: vec![RouteHop {
+						pubkey: $middle.0.get_our_node_id(),
+						short_channel_id: $middle.1,
+						fee_msat: 50000,
+						cltv_expiry_delta: 100,
+					},RouteHop {
+						pubkey: $dest.0.get_our_node_id(),
+						short_channel_id: $dest.1,
+						fee_msat: 5000000,
+						cltv_expiry_delta: 200,
+					}],
+				}, PaymentHash(payment_hash.into_inner())) {
+					// Probably ran out of funds
+					test_return!();
+				}
+			} }
+		}
+
+		macro_rules! process_msg_events {
+			($node: expr, $corrupt_forward: expr) => { {
+				for event in nodes[$node].get_and_clear_pending_msg_events() {
+					match event {
+						events::MessageSendEvent::UpdateHTLCs { ref node_id, updates: CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, ref update_fee, ref commitment_signed } } => {
+							for (idx, dest) in nodes.iter().enumerate() {
+								if dest.get_our_node_id() == *node_id &&
+										(($node != 0 && idx != 0) || !chan_a_disconnected) &&
+										(($node != 2 && idx != 2) || !chan_b_disconnected) {
+									assert!(update_fee.is_none());
+									for update_add in update_add_htlcs {
+										if !$corrupt_forward {
+											test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add));
+										} else {
+											// Corrupt the update_add_htlc message so that its HMAC
+											// check will fail and we generate a
+											// update_fail_malformed_htlc instead of an
+											// update_fail_htlc as we do when we reject a payment.
+											let mut msg_ser = update_add.encode();
+											msg_ser[1000] ^= 0xff;
+											let new_msg = UpdateAddHTLC::read(&mut Cursor::new(&msg_ser)).unwrap();
+											test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg));
+										}
+									}
+									for update_fulfill in update_fulfill_htlcs {
+										test_err!(dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill));
+									}
+									for update_fail in update_fail_htlcs {
+										test_err!(dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail));
+									}
+									for update_fail_malformed in update_fail_malformed_htlcs {
+										test_err!(dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed));
+									}
+									test_err!(dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed));
+								}
+							}
+						},
+						events::MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
+							for (idx, dest) in nodes.iter().enumerate() {
+								if dest.get_our_node_id() == *node_id &&
+										(($node != 0 && idx != 0) || !chan_a_disconnected) &&
+										(($node != 2 && idx != 2) || !chan_b_disconnected) {
+									test_err!(dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg));
+								}
+							}
+						},
+						events::MessageSendEvent::SendChannelReestablish { ref node_id, ref msg } => {
+							for (idx, dest) in nodes.iter().enumerate() {
+								if dest.get_our_node_id() == *node_id {
+									test_err!(dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg));
+									if $node == 0 || idx == 0 {
+										chan_a_reconnecting = false;
+										chan_a_disconnected = false;
+									} else {
+										chan_b_reconnecting = false;
+										chan_b_disconnected = false;
+									}
+								}
+							}
+						},
+						events::MessageSendEvent::SendFundingLocked { .. } => {
+							// Can be generated as a reestablish response
+						},
+						events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {
+							// Can be generated due to a payment forward being rejected due to a
+							// channel having previously failed a monitor update
+						},
+						_ => panic!("Unhandled message event"),
+					}
+				}
+			} }
+		}
+
+		macro_rules! process_events {
+			($node: expr, $fail: expr) => { {
+				for event in nodes[$node].get_and_clear_pending_events() {
+					match event {
+						events::Event::PaymentReceived { payment_hash, .. } => {
+							if $fail {
+								assert!(nodes[$node].fail_htlc_backwards(&payment_hash, 0));
+							} else {
+								assert!(nodes[$node].claim_funds(PaymentPreimage(payment_hash.0)));
+							}
+						},
+						events::Event::PaymentSent { .. } => {},
+						events::Event::PaymentFailed { .. } => {},
+						events::Event::PendingHTLCsForwardable { .. } => {
+							nodes[$node].process_pending_htlc_forwards();
+						},
+						_ => panic!("Unhandled event"),
+					}
+				}
+			} }
+		}
+
+		match get_slice!(1)[0] {
+			0x00 => *monitor_a.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure),
+			0x01 => *monitor_b.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure),
+			0x02 => *monitor_c.update_ret.lock().unwrap() = Err(ChannelMonitorUpdateErr::TemporaryFailure),
+			0x03 => *monitor_a.update_ret.lock().unwrap() = Ok(()),
+			0x04 => *monitor_b.update_ret.lock().unwrap() = Ok(()),
+			0x05 => *monitor_c.update_ret.lock().unwrap() = Ok(()),
+			0x06 => nodes[0].test_restore_channel_monitor(),
+			0x07 => nodes[1].test_restore_channel_monitor(),
+			0x08 => nodes[2].test_restore_channel_monitor(),
+			0x09 => send_payment!(nodes[0], (&nodes[1], chan_a)),
+			0x0a => send_payment!(nodes[1], (&nodes[0], chan_a)),
+			0x0b => send_payment!(nodes[1], (&nodes[2], chan_b)),
+			0x0c => send_payment!(nodes[2], (&nodes[1], chan_b)),
+			0x0d => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b)),
+			0x0e => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a)),
+			0x0f => {
+				if !chan_a_disconnected {
+					nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
+					nodes[1].peer_disconnected(&nodes[0].get_our_node_id(), false);
+					chan_a_disconnected = true;
+				}
+			},
+			0x10 => {
+				if !chan_b_disconnected {
+					nodes[1].peer_disconnected(&nodes[2].get_our_node_id(), false);
+					nodes[2].peer_disconnected(&nodes[1].get_our_node_id(), false);
+					chan_b_disconnected = true;
+				}
+			},
+			0x11 => {
+				if chan_a_disconnected && !chan_a_reconnecting {
+					nodes[0].peer_connected(&nodes[1].get_our_node_id());
+					nodes[1].peer_connected(&nodes[0].get_our_node_id());
+					chan_a_reconnecting = true;
+				}
+			},
+			0x12 => {
+				if chan_b_disconnected && !chan_b_reconnecting {
+					nodes[1].peer_connected(&nodes[2].get_our_node_id());
+					nodes[2].peer_connected(&nodes[1].get_our_node_id());
+					chan_b_reconnecting = true;
+				}
+			},
+			0x13 => process_msg_events!(0, true),
+			0x14 => process_msg_events!(0, false),
+			0x15 => process_events!(0, true),
+			0x16 => process_events!(0, false),
+			0x17 => process_msg_events!(1, true),
+			0x18 => process_msg_events!(1, false),
+			0x19 => process_events!(1, true),
+			0x1a => process_events!(1, false),
+			0x1b => process_msg_events!(2, true),
+			0x1c => process_msg_events!(2, false),
+			0x1d => process_events!(2, true),
+			0x1e => process_events!(2, false),
+			_ => test_return!(),
+		}
+	}
+}
+
+#[cfg(feature = "afl")]
+#[macro_use] extern crate afl;
+#[cfg(feature = "afl")]
+fn main() {
+	fuzz!(|data| {
+		do_test(data);
+	});
+}
+
+#[cfg(feature = "honggfuzz")]
+#[macro_use] extern crate honggfuzz;
+#[cfg(feature = "honggfuzz")]
+fn main() {
+	loop {
+		fuzz!(|data| {
+			do_test(data);
+		});
+	}
+}
+
+#[cfg(feature = "libfuzzer_fuzz")]
+#[macro_use] extern crate libfuzzer_sys;
+#[cfg(feature = "libfuzzer_fuzz")]
+fuzz_target!(|data: &[u8]| {
+	do_test(data);
+});
+
+extern crate hex;
+#[cfg(test)]
+mod tests {
+	#[test]
+	fn duplicate_crash() {
+		super::do_test(&::hex::decode("00").unwrap());
+	}
+}
diff --git a/fuzz/travis-fuzz.sh b/fuzz/travis-fuzz.sh
index 86b57fa0b..e602e9518 100755
--- a/fuzz/travis-fuzz.sh
+++ b/fuzz/travis-fuzz.sh
@@ -11,7 +11,14 @@ cargo install --force honggfuzz
 for TARGET in fuzz_targets/*.rs fuzz_targets/msg_targets/*_target.rs; do
 	FILENAME=$(basename $TARGET)
 	FILE="${FILENAME%.*}"
-	HFUZZ_BUILD_ARGS="--features honggfuzz_fuzz" HFUZZ_RUN_ARGS="-N1000000 --exit_upon_crash -v" cargo hfuzz run $FILE
+	HFUZZ_RUN_ARGS="--exit_upon_crash -v -n2"
+	if [ "$FILE" = "chanmon_fail_consistency" ]; then
+		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -F 64 -N100000"
+	else
+		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -N1000000"
+	fi
+	export HFUZZ_RUN_ARGS
+	HFUZZ_BUILD_ARGS="--features honggfuzz_fuzz" cargo hfuzz run $FILE
 	if [ -f hfuzz_workspace/$FILE/HONGGFUZZ.REPORT.TXT ]; then
 		cat hfuzz_workspace/$FILE/HONGGFUZZ.REPORT.TXT
 		for CASE in hfuzz_workspace/$FILE/SIG*; do