Merge pull request #1998 from tnull/2023-01-no-none-in-channel-relevant-txids

Only return previously confirmed Txids from CM's `get_relevant_txids()`

Author: TheBlueMatt

lightning/src/chain/mod.rs

@@ -176,6 +176,9 @@ pub trait Confirm {
 	/// Returns transactions that must be monitored for reorganization out of the chain along
 	/// with the hash of the block as part of which it had been previously confirmed.
 	///
+	/// Note that the returned `Option<BlockHash>` might be `None` for channels created with LDK
+	/// 0.0.112 and prior, in which case you need to manually track previous confirmations.
+	///
 	/// Will include any transactions passed to [`transactions_confirmed`] that have insufficient
 	/// confirmations to be safe from a chain reorganization. Will not include any transactions
 	/// passed to [`transaction_unconfirmed`], unless later reconfirmed.

lightning/src/ln/channelmanager.rs

@@ -5786,8 +5786,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() {
-				if let (Some(funding_txo), block_hash) = (chan.get_funding_txo(), chan.get_funding_tx_confirmed_in()) {
-					res.push((funding_txo.txid, block_hash));
+				if let (Some(funding_txo), Some(block_hash)) = (chan.get_funding_txo(), chan.get_funding_tx_confirmed_in()) {
+					res.push((funding_txo.txid, Some(block_hash)));
 				}
 			}
 		}