Set funding_seen_onchain=true on filter_block if seen

Author: martinsaposnic

lightning/src/chain/channelmonitor.rs

@@ -5818,10 +5818,17 @@ 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>(&self, txdata: &TransactionData<'a>) -> Vec<&'a Transaction> {
+	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; }
@@ -5830,7 +5837,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 				}
 			}
 			if matches {
-				matched_txn.insert(tx.compute_txid());
+				matched_txn.insert(txid);
 			}
 			matches
 		}).map(|(_, tx)| *tx).collect()