X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fln%2Fchannelmanager.rs;h=a650c89bb44668149cb305a4c0f4b35d307ad279;hb=3c44d6beca2d5c3c50a8454d072ef54f735d5000;hp=4808bd832a66d4ea85af8f38f0e9b78a8bfa271a;hpb=182affc03b0c86f1e3d09d9fdea612481d374ce6;p=rust-lightning

diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index 4808bd83..a650c89b 100644
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -2194,8 +2194,8 @@ impl ChannelManager {
 					//TODO: here and below MsgHandleErrInternal, #153 case
 					return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!", msg.channel_id));
 				}
-				if (msg.failure_code & 0x8000) != 0 {
-					return Err(MsgHandleErrInternal::send_err_msg_close_chan("Got update_fail_malformed_htlc with BADONION set", msg.channel_id));
+				if (msg.failure_code & 0x8000) == 0 {
+					return Err(MsgHandleErrInternal::send_err_msg_close_chan("Got update_fail_malformed_htlc with BADONION not set", msg.channel_id));
 				}
 				chan.update_fail_malformed_htlc(&msg, HTLCFailReason::Reason { failure_code: msg.failure_code, data: Vec::new() })
 					.map_err(|e| MsgHandleErrInternal::from_chan_maybe_close(e, msg.channel_id))?;
@@ -2733,6 +2733,7 @@ impl ChannelMessageHandler for ChannelManager {
 			let short_to_id = channel_state.short_to_id;
 			let pending_msg_events = channel_state.pending_msg_events;
 			if no_connection_possible {
+				log_debug!(self, "Failing all channels with {} due to no_connection_possible", log_pubkey!(their_node_id));
 				channel_state.by_id.retain(|_, chan| {
 					if chan.get_their_node_id() == *their_node_id {
 						if let Some(short_id) = chan.get_short_channel_id() {
@@ -2750,6 +2751,7 @@ impl ChannelMessageHandler for ChannelManager {
 					}
 				});
 			} else {
+				log_debug!(self, "Marking channels with {} disconnected and generating channel_updates", log_pubkey!(their_node_id));
 				channel_state.by_id.retain(|_, chan| {
 					if chan.get_their_node_id() == *their_node_id {
 						//TODO: mark channel disabled (and maybe announce such after a timeout).
@@ -2780,6 +2782,8 @@ impl ChannelMessageHandler for ChannelManager {
 	}
 
 	fn peer_connected(&self, their_node_id: &PublicKey) {
+		log_debug!(self, "Generating channel_reestablish events for {}", log_pubkey!(their_node_id));
+
 		let _ = self.total_consistency_lock.read().unwrap();
 		let mut channel_state_lock = self.channel_state.lock().unwrap();
 		let channel_state = channel_state_lock.borrow_parts();
@@ -5704,7 +5708,13 @@ mod tests {
 		get_announce_close_broadcast_events(&nodes, 3, 4);
 		assert_eq!(nodes[3].node.list_channels().len(), 0);
 		assert_eq!(nodes[4].node.list_channels().len(), 0);
+	}
+
+	#[test]
+	fn test_justice_tx() {
+		// Test justice txn built on revoked HTLC-Success tx, against both sides
 
+		let nodes = create_network(2);
 		// Create some new channels:
 		let chan_5 = create_announced_chan_between_nodes(&nodes, 0, 1);
 
@@ -5743,6 +5753,45 @@ mod tests {
 			test_revoked_htlc_claim_txn_broadcast(&nodes[1], node_txn[1].clone());
 		}
 		get_announce_close_broadcast_events(&nodes, 0, 1);
+
+		assert_eq!(nodes[0].node.list_channels().len(), 0);
+		assert_eq!(nodes[1].node.list_channels().len(), 0);
+
+		// We test justice_tx build by A on B's revoked HTLC-Success tx
+		// Create some new channels:
+		let chan_6 = create_announced_chan_between_nodes(&nodes, 0, 1);
+
+		// A pending HTLC which will be revoked:
+		let payment_preimage_4 = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
+		// Get the will-be-revoked local txn from B
+		let revoked_local_txn = nodes[1].node.channel_state.lock().unwrap().by_id.iter().next().unwrap().1.last_local_commitment_txn.clone();
+		assert_eq!(revoked_local_txn.len(), 1); // Only commitment tx
+		assert_eq!(revoked_local_txn[0].input.len(), 1);
+		assert_eq!(revoked_local_txn[0].input[0].previous_output.txid, chan_6.3.txid());
+		assert_eq!(revoked_local_txn[0].output.len(), 2); // Only HTLC and output back to A are present
+		// Revoke the old state
+		claim_payment(&nodes[0], &vec!(&nodes[1])[..], payment_preimage_4);
+		{
+			let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
+			nodes[0].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 1);
+			{
+				let mut node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
+				assert_eq!(node_txn.len(), 3);
+				assert_eq!(node_txn.pop().unwrap(), node_txn[0]); // An outpoint registration will result in a 2nd block_connected
+				assert_eq!(node_txn[0].input.len(), 1); // We claim the received HTLC output
+
+				check_spends!(node_txn[0], revoked_local_txn[0].clone());
+				node_txn.swap_remove(0);
+			}
+			test_txn_broadcast(&nodes[0], &chan_6, None, HTLCType::NONE);
+
+			nodes[1].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 1);
+			let node_txn = test_txn_broadcast(&nodes[1], &chan_6, Some(revoked_local_txn[0].clone()), HTLCType::SUCCESS);
+			header = BlockHeader { version: 0x20000000, prev_blockhash: header.bitcoin_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
+			nodes[0].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![node_txn[1].clone()] }, 1);
+			test_revoked_htlc_claim_txn_broadcast(&nodes[0], node_txn[1].clone());
+		}
+		get_announce_close_broadcast_events(&nodes, 0, 1);
 		assert_eq!(nodes[0].node.list_channels().len(), 0);
 		assert_eq!(nodes[1].node.list_channels().len(), 0);
 	}