f! consensus verify anchor_tx and htlc_tx

Author: wpaulino

lightning/src/ln/monitor_tests.rs

@@ -26,19 +26,27 @@ use crate::ln::msgs::ChannelMessageHandler;
 #[cfg(anchors)]
 use crate::util::config::UserConfig;
 #[cfg(anchors)]
+use crate::util::crypto::sign;
+#[cfg(anchors)]
 use crate::util::events::BumpTransactionEvent;
 use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
 #[cfg(anchors)]
 use crate::util::ser::Writeable;
 #[cfg(anchors)]
 use crate::util::test_utils;
 
+#[cfg(anchors)]
+use bitcoin::blockdata::transaction::EcdsaSighashType;
 use bitcoin::blockdata::script::Builder;
 use bitcoin::blockdata::opcodes;
 use bitcoin::secp256k1::Secp256k1;
 #[cfg(anchors)]
-use bitcoin::{Amount, Script, TxIn, TxOut, PackedLockTime};
+use bitcoin::secp256k1::SecretKey;
+#[cfg(anchors)]
+use bitcoin::{Amount, PublicKey, Script, TxIn, TxOut, PackedLockTime, Witness};
 use bitcoin::Transaction;
+#[cfg(anchors)]
+use bitcoin::util::sighash::SighashCache;
 
 use crate::prelude::*;
 
@@ -1892,15 +1900,33 @@ fn test_anchors_aggregated_revoked_htlc_tx() {
 	assert_eq!(events.len(), 1);
 	let (revoked_commitment, anchor_tx) = match &events[0] {
 		Event::BumpTransaction(BumpTransactionEvent::ChannelClose { commitment_tx, anchor_descriptor, .. })  => {
+			let secret_key = SecretKey::from_slice(&[1; 32]).unwrap();
+			let public_key = PublicKey::new(secret_key.public_key(&secp));
+			let fee_utxo_script = Script::new_v0_p2wpkh(&public_key.wpubkey_hash().unwrap());
+			let coinbase_tx = Transaction {
+				version: 2,
+				lock_time: PackedLockTime::ZERO,
+				input: vec![TxIn { ..Default::default() }],
+				output: vec![TxOut { // UTXO to attach fees to `anchor_tx`
+					value: Amount::ONE_BTC.to_sat(),
+					script_pubkey: fee_utxo_script.clone(),
+				}],
+			};
 			let mut anchor_tx = Transaction {
 				version: 2,
 				lock_time: PackedLockTime::ZERO,
 				input: vec![
-					TxIn { previous_output: anchor_descriptor.outpoint, ..Default::default() },
-					TxIn { ..Default::default() },
+					TxIn { // Anchor input
+						previous_output: anchor_descriptor.outpoint,
+						..Default::default()
+					},
+					TxIn { // Fee input
+						previous_output: bitcoin::OutPoint { txid: coinbase_tx.txid(), vout: 0 },
+						..Default::default()
+					},
 				],
-				output: vec![TxOut {
-					value: Amount::ONE_BTC.to_sat(),
+				output: vec![TxOut { // Fee input change
+					value: coinbase_tx.output[0].value / 2 ,
 					script_pubkey: Script::new_op_return(&[]),
 				}],
 			};
@@ -1911,6 +1937,21 @@ fn test_anchors_aggregated_revoked_htlc_tx() {
 			anchor_tx.input[0].witness = chan_utils::build_anchor_input_witness(
 				&signer.pubkeys().funding_pubkey, &funding_sig
 			);
+			anchor_tx.input[0].witness = chan_utils::build_anchor_input_witness(
+				&signer.pubkeys().funding_pubkey, &funding_sig
+			);
+			let fee_utxo_sig = {
+				let witness_script = Script::new_p2pkh(&public_key.pubkey_hash());
+				let sighash = hash_to_message!(&SighashCache::new(&anchor_tx).segwit_signature_hash(
+					1, &witness_script, coinbase_tx.output[0].value, EcdsaSighashType::All
+				).unwrap()[..]);
+				let sig = sign(&secp, &sighash, &secret_key);
+				let mut sig = sig.serialize_der().to_vec();
+				sig.push(EcdsaSighashType::All as u8);
+				sig
+			};
+			anchor_tx.input[1].witness = Witness::from_vec(vec![fee_utxo_sig, public_key.to_bytes()]);
+			check_spends!(anchor_tx, commitment_tx, coinbase_tx);
 			(commitment_tx, anchor_tx)
 		},
 		_ => panic!("Unexpected event"),
@@ -1951,17 +1992,32 @@ fn test_anchors_aggregated_revoked_htlc_tx() {
 		},
 		_ => assert_eq!(events.len(), 1),
 	};
-	let mut htlc_tx = Transaction {
-		version: 2,
-		lock_time: PackedLockTime::ZERO,
-		input: vec![TxIn { ..Default::default() }], // Fee input
-		output: vec![TxOut { // Fee input change
-			value: Amount::ONE_BTC.to_sat(),
-			script_pubkey: Script::new_op_return(&[]),
-		}]
-	};
-	match &events[0] {
-		Event::BumpTransaction(BumpTransactionEvent::HTLCResolution { htlc_descriptors, .. }) => {
+	let htlc_tx = {
+		let secret_key = SecretKey::from_slice(&[1; 32]).unwrap();
+		let public_key = PublicKey::new(secret_key.public_key(&secp));
+		let fee_utxo_script = Script::new_v0_p2wpkh(&public_key.wpubkey_hash().unwrap());
+		let coinbase_tx = Transaction {
+			version: 2,
+			lock_time: PackedLockTime::ZERO,
+			input: vec![TxIn { ..Default::default() }],
+			output: vec![TxOut { // UTXO to attach fees to `htlc_tx`
+				value: Amount::ONE_BTC.to_sat(),
+				script_pubkey: fee_utxo_script.clone(),
+			}],
+		};
+		let mut htlc_tx = Transaction {
+			version: 2,
+			lock_time: PackedLockTime::ZERO,
+			input: vec![TxIn { // Fee input
+				previous_output: bitcoin::OutPoint { txid: coinbase_tx.txid(), vout: 0 },
+				..Default::default()
+			}],
+			output: vec![TxOut { // Fee input change
+				value: coinbase_tx.output[0].value / 2 ,
+				script_pubkey: Script::new_op_return(&[]),
+			}],
+		};
+		if let Event::BumpTransaction(BumpTransactionEvent::HTLCResolution { htlc_descriptors, .. }) = &events[0] {
 			assert_eq!(htlc_descriptors.len(), 2);
 			for htlc_descriptor in htlc_descriptors {
 				assert!(!htlc_descriptor.htlc.offered);
@@ -1982,9 +2038,23 @@ fn test_anchors_aggregated_revoked_htlc_tx() {
 				let witness_script = htlc_descriptor.witness_script(&per_commitment_point, &secp);
 				htlc_tx.input[htlc_input_idx].witness = htlc_descriptor.tx_input_witness(&our_sig, &witness_script);
 			}
-		},
-		_ => panic!("Unexpected event"),
-	}
+		} else {
+			panic!("Unexpected event");
+		}
+		let fee_utxo_sig = {
+			let witness_script = Script::new_p2pkh(&public_key.pubkey_hash());
+			let sighash = hash_to_message!(&SighashCache::new(&htlc_tx).segwit_signature_hash(
+				0, &witness_script, coinbase_tx.output[0].value, EcdsaSighashType::All
+			).unwrap()[..]);
+			let sig = sign(&secp, &sighash, &secret_key);
+			let mut sig = sig.serialize_der().to_vec();
+			sig.push(EcdsaSighashType::All as u8);
+			sig
+		};
+		htlc_tx.input[0].witness = Witness::from_vec(vec![fee_utxo_sig, public_key.to_bytes()]);
+		check_spends!(htlc_tx, coinbase_tx, revoked_commitment);
+		htlc_tx
+	};
 
 	for node in &nodes {
 		mine_transaction(node, &htlc_tx);