f - fix test_funding_and_commitment_tx_confirm_same_block

Author: jkczyz

lightning/src/ln/channel.rs

@@ -4953,7 +4953,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 		return true;
 	}
 
-	fn check_for_funding_tx<L: Deref>(
+	fn check_for_funding_tx_confirmed<L: Deref>(
 		&mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
 		index_in_block: usize, tx: &mut ConfirmedTransaction, logger: &L,
 	) -> Result<bool, ClosureReason>
@@ -4968,7 +4968,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			},
 		};
 
-		let mut is_confirmed_funding_tx = false;
+		let mut is_funding_tx_confirmed = false;
 
 		// Check if the transaction is the expected funding transaction, and if it is,
 		// check that it pays the right amount to the right script.
@@ -5019,17 +5019,39 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 					};
 				}
 
-				is_confirmed_funding_tx = true;
+				is_funding_tx_confirmed = true;
 			}
 		}
-		for inp in tx.tx().input.iter() {
-			if inp.previous_output == funding_txo.into_bitcoin_outpoint() {
-				log_info!(logger, "Detected channel-closing tx {} spending {}:{}, closing channel {}", tx.txid(), inp.previous_output.txid, inp.previous_output.vout, &self.channel_id());
+
+		Ok(is_funding_tx_confirmed)
+	}
+
+	fn check_for_funding_tx_spent<L: Deref>(
+		&mut self, funding: &FundingScope, tx: &Transaction, logger: &L,
+	) -> Result<(), ClosureReason>
+	where
+		L::Target: Logger
+	{
+		let funding_txo = match funding.get_funding_txo() {
+			Some(funding_txo) => funding_txo,
+			None => {
+				debug_assert!(false);
+				return Ok(());
+			},
+		};
+
+		for input in tx.input.iter() {
+			if input.previous_output == funding_txo.into_bitcoin_outpoint() {
+				log_info!(
+					logger, "Detected channel-closing tx {} spending {}:{}, closing channel {}",
+					tx.compute_txid(), input.previous_output.txid, input.previous_output.vout,
+					&self.channel_id(),
+				);
 				return Err(ClosureReason::CommitmentTxConfirmed);
 			}
 		}
 
-		Ok(is_confirmed_funding_tx)
+		Ok(())
 	}
 }
 
@@ -8357,11 +8379,15 @@ impl<SP: Deref> FundedChannel<SP> where
 			// If we allow 1-conf funding, we may need to check for channel_ready or splice_locked here
 			// and send it immediately instead of waiting for a best_block_updated call (which may have
 			// already happened for this block).
-			let is_confirmed_funding_tx = self.context.check_for_funding_tx(
+			let is_funding_tx_confirmed = self.context.check_for_funding_tx_confirmed(
 				&mut self.funding, block_hash, height, index_in_block, &mut confirmed_tx, logger,
 			)?;
 
-			if is_confirmed_funding_tx {
+			if is_funding_tx_confirmed {
+				for &(_, tx) in txdata.iter() {
+					self.context.check_for_funding_tx_spent(&self.funding, tx, logger)?;
+				}
+
 				if let Some(channel_ready) = self.check_get_channel_ready(height, logger) {
 					log_info!(logger, "Sending a channel_ready to our peer for channel {}", &self.context.channel_id);
 					let announcement_sigs = self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger);
@@ -8373,7 +8399,9 @@ impl<SP: Deref> FundedChannel<SP> where
 			let mut confirmed_funding = None;
 			#[cfg(splicing)]
 			for funding in self.pending_funding.iter_mut() {
-				if self.context.check_for_funding_tx(funding, block_hash, height, index_in_block, &mut confirmed_tx, logger)? {
+				if self.context.check_for_funding_tx_confirmed(
+					funding, block_hash, height, index_in_block, &mut confirmed_tx, logger,
+				)? {
 					if confirmed_funding.is_some() {
 						let err_reason = "splice tx of another pending funding already confirmed";
 						return Err(ClosureReason::ProcessingError { err: err_reason.to_owned() });
@@ -8395,6 +8423,10 @@ impl<SP: Deref> FundedChannel<SP> where
 					},
 				};
 
+				for &(_, tx) in txdata.iter() {
+					self.context.check_for_funding_tx_spent(funding, tx, logger)?;
+				}
+
 				if let Some(splice_locked) = self.context.check_get_splice_locked(pending_splice, funding, height, logger) {
 					log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);
 
@@ -8409,6 +8441,9 @@ impl<SP: Deref> FundedChannel<SP> where
 					return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), None));
 				}
 			}
+
+			self.context.check_for_funding_tx_spent(&self.funding, tx, logger)?;
+
 		}
 
 		Ok((None, None))