Add test_bump_claim_txn_on_claim_txn

Author: Antoine Riard

src/ln/channelmonitor.rs

@@ -2455,7 +2455,7 @@ impl ChannelMonitor {
 					}
 					bumped_tx.input[0].witness.push(script.clone().into_bytes());
 					assert!(predicted_weight >= bumped_tx.get_weight());
-					log_info!(self, "Going to broadcast bumped Claim Transaction {} claiming remote htlc output {} from {} with new feerate {}", bumped_tx.txid(), claimed_outpoint.vout, claimed_outpoint.txid, new_feerate);
+					log_trace!(self, "Going to broadcast bumped Claim Transaction {} claiming remote htlc output {} from {} with new feerate {}", bumped_tx.txid(), claimed_outpoint.vout, claimed_outpoint.txid, new_feerate);
 					return Some((new_timer, bumped_tx, new_feerate));
 				}
 			},

src/ln/functional_tests.rs

@@ -5964,3 +5964,51 @@ fn test_bump_penalty_txn_on_revoked_htlc() {
 		}
 	}
 }
+
+#[test]
+fn test_bump_claim_tx_on_htlc_outputs() {
+	// In case of claim txn with too low feerates for getting into mempools, RBF-bump them to be sure
+	// we're able to claim htlc outputs on commitment txn before timelock expiration
+
+	let nodes = create_network(2);
+
+	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000);
+	let payment_preimage = route_payment(&nodes[0], &vec!(&nodes[1])[..], 3000000).0;
+
+	let local_txn;
+	{
+		local_txn = nodes[0].node.channel_state.lock().unwrap().by_id.get(&chan.2).unwrap().last_local_commitment_txn.clone();
+		assert_eq!(local_txn[0].output.len(), 3);
+		assert_eq!(local_txn[0].input.len(), 1);
+		assert_eq!(local_txn[0].input[0].previous_output.txid, chan.3.txid());
+	}
+	let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
+	assert!(nodes[1].node.claim_funds(payment_preimage));
+	check_added_monitors!(nodes[1], 1);
+	nodes[1].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![local_txn[0].clone()] }, 1);
+	nodes[1].node.get_and_clear_pending_msg_events();
+
+	let mut fee: u64 = 0;
+	let mut txid = Default::default();
+	{
+		let mut node_txn = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap();
+		assert_eq!(node_txn.len(), 2);
+		assert_eq!(node_txn[0], node_txn[1]);
+		assert_eq!(node_txn[0].input[0].witness.last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT);
+		check_spends!(node_txn[0], local_txn[0].clone());
+		txid = node_txn[0].txid();
+		fee = local_txn[0].output[node_txn[0].input[0].previous_output.vout as usize].value - node_txn[0].output[0].value;
+		node_txn.clear();
+	}
+	assert_ne!(fee, 0);
+	connect_blocks(&nodes[1].chain_monitor, 3, 1, true, header.bitcoin_hash());
+	{
+		let node_txn = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap();
+		assert_eq!(node_txn.len(), 1);
+		check_spends!(node_txn[0], local_txn[0].clone());
+		assert_ne!(txid, node_txn[0].txid());
+		let new_fee = local_txn[0].output[node_txn[0].input[0].previous_output.vout as usize].value - node_txn[0].output[0].value;
+		assert!(new_fee > fee);
+	}
+	//TODO: timeout tx case (maybe need to change its broadcast height first)
+}