Move ChannelContext::funding_tx_confirmed_in to FundingScope

When processing confirmed transactions, if the funding transaction is
found then information about it in the ChannelContext is updated. In
preparation for splicing, move this data to FundingScope.

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1948,6 +1948,8 @@ pub(super) struct FundingScope {
 	/// The transaction which funds this channel. Note that for manually-funded channels (i.e.,
 	/// [`ChannelContext::is_manual_broadcast`] is true) this will be a dummy empty transaction.
 	funding_transaction: Option<Transaction>,
+	/// The hash of the block in which the funding transaction was included.
+	funding_tx_confirmed_in: Option<BlockHash>,
 }
 
 impl Writeable for FundingScope {
@@ -1958,6 +1960,7 @@ impl Writeable for FundingScope {
 			(5, self.holder_selected_channel_reserve_satoshis, required),
 			(7, self.channel_transaction_parameters, (required: ReadableArgs, None)),
 			(9, self.funding_transaction, option),
+			(11, self.funding_tx_confirmed_in, option),
 		});
 		Ok(())
 	}
@@ -1971,13 +1974,15 @@ impl Readable for FundingScope {
 		let mut holder_selected_channel_reserve_satoshis = RequiredWrapper(None);
 		let mut channel_transaction_parameters = RequiredWrapper(None);
 		let mut funding_transaction = None;
+		let mut funding_tx_confirmed_in = None;
 
 		read_tlv_fields!(reader, {
 			(1, value_to_self_msat, required),
 			(3, counterparty_selected_channel_reserve_satoshis, option),
 			(5, holder_selected_channel_reserve_satoshis, required),
 			(7, channel_transaction_parameters, (required: ReadableArgs, None)),
 			(9, funding_transaction, option),
+			(11, funding_tx_confirmed_in, option),
 		});
 
 		Ok(Self {
@@ -1990,6 +1995,7 @@ impl Readable for FundingScope {
 			counterparty_max_commitment_tx_output: Mutex::new((0, 0)),
 			channel_transaction_parameters: channel_transaction_parameters.0.unwrap(),
 			funding_transaction,
+			funding_tx_confirmed_in,
 			#[cfg(any(test, fuzzing))]
 			next_local_commitment_tx_fee_info_cached: Mutex::new(None),
 			#[cfg(any(test, fuzzing))]
@@ -2227,8 +2233,6 @@ where
 	/// milliseconds, so any accidental force-closes here should be exceedingly rare.
 	expecting_peer_commitment_signed: bool,
 
-	/// The hash of the block in which the funding transaction was included.
-	funding_tx_confirmed_in: Option<BlockHash>,
 	funding_tx_confirmation_height: u32,
 	short_channel_id: Option<u64>,
 	/// Either the height at which this channel was created or the height at which it was last
@@ -3072,6 +3076,7 @@ where
 				channel_value_satoshis,
 			},
 			funding_transaction: None,
+			funding_tx_confirmed_in: None,
 		};
 		let channel_context = ChannelContext {
 			user_id,
@@ -3135,7 +3140,6 @@ where
 			closing_fee_limits: None,
 			target_closing_feerate_sats_per_kw: None,
 
-			funding_tx_confirmed_in: None,
 			funding_tx_confirmation_height: 0,
 			short_channel_id: None,
 			channel_creation_height: current_chain_height,
@@ -3313,6 +3317,7 @@ where
 				channel_value_satoshis,
 			},
 			funding_transaction: None,
+			funding_tx_confirmed_in: None,
 		};
 		let channel_context = Self {
 			user_id,
@@ -3374,7 +3379,6 @@ where
 			closing_fee_limits: None,
 			target_closing_feerate_sats_per_kw: None,
 
-			funding_tx_confirmed_in: None,
 			funding_tx_confirmation_height: 0,
 			short_channel_id: None,
 			channel_creation_height: current_chain_height,
@@ -3784,11 +3788,6 @@ where
 		Ok(())
 	}
 
-	/// Returns the block hash in which our funding transaction was confirmed.
-	pub fn get_funding_tx_confirmed_in(&self) -> Option<BlockHash> {
-		self.funding_tx_confirmed_in
-	}
-
 	/// Returns the current number of confirmations on the funding transaction.
 	pub fn get_funding_tx_confirmations(&self, height: u32) -> u32 {
 		if self.funding_tx_confirmation_height == 0 {
@@ -8855,7 +8854,7 @@ where
 								}
 							}
 							self.context.funding_tx_confirmation_height = height;
-							self.context.funding_tx_confirmed_in = Some(*block_hash);
+							self.funding.funding_tx_confirmed_in = Some(*block_hash);
 							self.context.short_channel_id = match scid_from_parts(height as u64, index_in_block as u64, txo_idx as u64) {
 								Ok(scid) => Some(scid),
 								Err(_) => panic!("Block was bogus - either height was > 16 million, had > 16 million transactions, or had > 65k outputs"),
@@ -8967,12 +8966,12 @@ where
 			// 0-conf channel, but not doing so may lead to the
 			// `ChannelManager::short_to_chan_info` map  being inconsistent, so we currently have
 			// to.
-			if funding_tx_confirmations == 0 && self.context.funding_tx_confirmed_in.is_some() {
+			if funding_tx_confirmations == 0 && self.funding.funding_tx_confirmed_in.is_some() {
 				let err_reason = format!("Funding transaction was un-confirmed. Locked at {} confs, now have {} confs.",
 					self.context.minimum_depth.unwrap(), funding_tx_confirmations);
 				return Err(ClosureReason::ProcessingError { err: err_reason });
 			}
-		} else if !self.funding.is_outbound() && self.context.funding_tx_confirmed_in.is_none() &&
+		} else if !self.funding.is_outbound() && self.funding.funding_tx_confirmed_in.is_none() &&
 				height >= self.context.channel_creation_height + FUNDING_CONF_DEADLINE_BLOCKS {
 			log_info!(logger, "Closing channel {} due to funding timeout", &self.context.channel_id);
 			// If funding_tx_confirmed_in is unset, the channel must not be active
@@ -10154,6 +10153,11 @@ where
 			false
 		}
 	}
+
+	/// 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
+	}
 }
 
 /// A not-yet-funded outbound (from holder) channel using V1 channel establishment.
@@ -11448,7 +11452,7 @@ where
 		// consider the stale state on reload.
 		0u8.write(writer)?;
 
-		self.context.funding_tx_confirmed_in.write(writer)?;
+		self.funding.funding_tx_confirmed_in.write(writer)?;
 		self.context.funding_tx_confirmation_height.write(writer)?;
 		self.context.short_channel_id.write(writer)?;
 
@@ -12107,6 +12111,7 @@ where
 
 				channel_transaction_parameters: channel_parameters,
 				funding_transaction,
+				funding_tx_confirmed_in,
 			},
 			pending_funding: pending_funding.unwrap(),
 			context: ChannelContext {
@@ -12170,7 +12175,6 @@ where
 				closing_fee_limits: None,
 				target_closing_feerate_sats_per_kw,
 
-				funding_tx_confirmed_in,
 				funding_tx_confirmation_height,
 				short_channel_id,
 				channel_creation_height,

lightning/src/ln/channelmanager.rs

@@ -11938,7 +11938,7 @@ where
 			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.context.get_funding_tx_confirmation_height();
-				let hash_opt = chan.context.get_funding_tx_confirmed_in();
+				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)));
 				}