Check all FundingScopes in get_relevant_txids

Pending funding transactions for splices should be monitored for
appearance on chain. Include these in ChannelManager::get_relevant_txids
so that they can be watched.

Author: jkczyz

lightning/src/ln/channel.rs

@@ -9034,6 +9034,25 @@ impl<SP: Deref> FundedChannel<SP> where
 		Ok((None, timed_out_htlcs, announcement_sigs))
 	}
 
+	pub fn get_relevant_txids(&self) -> impl Iterator<Item=(Txid, u32, Option<BlockHash>)> + '_ {
+		core::iter::once(&self.funding)
+			.chain(self.pending_funding.iter())
+			.map(|funding|
+				(
+					funding.get_funding_txid(),
+					funding.get_funding_tx_confirmation_height(),
+					funding.funding_tx_confirmed_in,
+				)
+			)
+			.filter_map(|(txid_opt, height_opt, hash_opt)|
+				if let (Some(funding_txid), Some(conf_height), Some(block_hash)) = (txid_opt, height_opt, hash_opt) {
+					Some((funding_txid, conf_height, Some(block_hash)))
+				} else {
+					None
+				}
+			)
+	}
+
 	/// Checks if any funding transaction is no longer confirmed in the main chain. This may
 	/// force-close the channel, but may also indicate a harmless reorganization of a block or two
 	/// before the channel has reached channel_ready or splice_locked, and we can just wait for more
@@ -10194,11 +10213,6 @@ impl<SP: Deref> FundedChannel<SP> where
 		}
 	}
 
-	/// Returns the block hash in which our funding transaction was confirmed.
-	pub fn get_funding_tx_confirmed_in(&self) -> Option<BlockHash> {
-		self.funding.funding_tx_confirmed_in
-	}
-
 	pub fn has_pending_splice(&self) -> bool {
 		self.pending_splice.is_some()
 	}

lightning/src/ln/channelmanager.rs

@@ -11940,11 +11940,8 @@ where
 			let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 			let peer_state = &mut *peer_state_lock;
 			for chan in peer_state.channel_by_id.values().filter_map(Channel::as_funded) {
-				let txid_opt = chan.funding.get_funding_txo();
-				let height_opt = chan.funding.get_funding_tx_confirmation_height();
-				let hash_opt = chan.get_funding_tx_confirmed_in();
-				if let (Some(funding_txo), Some(conf_height), Some(block_hash)) = (txid_opt, height_opt, hash_opt) {
-					res.push((funding_txo.txid, conf_height, Some(block_hash)));
+				for (funding_txid, conf_height, block_hash) in chan.get_relevant_txids() {
+					res.push((funding_txid, conf_height, block_hash));
 				}
 			}
 		}