fixup: move funding_seen_onchain tracking to transactions_confirmed

Author: martinsaposnic

lightning/src/chain/channelmonitor.rs

@@ -5346,6 +5346,19 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 	{
 		let funding_seen_before = self.funding_seen_onchain;
 		let txn_matched = self.filter_block(txdata);
+
+		if !self.funding_seen_onchain {
+			for &(_, tx) in txdata.iter() {
+				let txid = tx.compute_txid();
+				if txid == self.funding.funding_txid() ||
+					self.pending_funding.iter().any(|f| f.funding_txid() == txid)
+				{
+					self.funding_seen_onchain = true;
+					break;
+				}
+			}
+		}
+
 		for tx in &txn_matched {
 			let mut output_val = Amount::ZERO;
 			for out in tx.output.iter() {
@@ -5940,17 +5953,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 
 	/// Filters a block's `txdata` for transactions spending watched outputs or for any child
 	/// transactions thereof.
-	/// While iterating, this also tracks whether we observed the funding transaction.
 	#[rustfmt::skip]
 	fn filter_block<'a>(&mut self, txdata: &TransactionData<'a>) -> Vec<&'a Transaction> {
 		let mut matched_txn = new_hash_set();
 		txdata.iter().filter(|&&(_, tx)| {
-			let txid = tx.compute_txid();
-			if !self.funding_seen_onchain && (txid == self.funding.funding_txid() ||
-				self.pending_funding.iter().any(|f| f.funding_txid() == txid))
-			{
-				self.funding_seen_onchain = true;
-			}
 			let mut matches = self.spends_watched_output(tx);
 			for input in tx.input.iter() {
 				if matches { break; }
@@ -5959,7 +5965,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 				}
 			}
 			if matches {
-				matched_txn.insert(txid);
+				matched_txn.insert(tx.compute_txid());
 			}
 			matches
 		}).map(|(_, tx)| *tx).collect()