Move funding_transaction to FundingScope

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1612,6 +1612,10 @@ pub(super) struct FundingScope {
 
 	/// The late-bound funding outpoint
 	funding_outpoint: Option<OutPoint>,
+
+	/// 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>,
 }
 
 impl FundingScope {
@@ -1833,9 +1837,6 @@ pub(super) struct ChannelContext<SP: Deref> where SP::Target: SignerProvider {
 	counterparty_forwarding_info: Option<CounterpartyForwardingInfo>,
 
 	pub(super) channel_transaction_parameters: ChannelTransactionParameters,
-	/// The transaction which funds this channel. Note that for manually-funded channels (i.e.,
-	/// is_manual_broadcast is true) this will be a dummy empty transaction.
-	funding_transaction: Option<Transaction>,
 	/// This flag indicates that it is the user's responsibility to validated and broadcast the
 	/// funding transaction.
 	is_manual_broadcast: bool,
@@ -2250,7 +2251,7 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 		let commitment_signed = self.context.get_initial_commitment_signed(&self.funding, logger);
 		let commitment_signed = match commitment_signed {
 			Ok(commitment_signed) => {
-				self.context.funding_transaction = Some(signing_session.unsigned_tx.build_unsigned_tx());
+				self.funding.funding_transaction = Some(signing_session.unsigned_tx.build_unsigned_tx());
 				commitment_signed
 			},
 			Err(err) => {
@@ -2524,6 +2525,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			next_remote_commitment_tx_fee_info_cached: Mutex::new(None),
 
 			funding_outpoint: None,
+			funding_transaction: None,
 		};
 		let channel_context = ChannelContext {
 			user_id,
@@ -2616,7 +2618,6 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 				funding_outpoint: None,
 				channel_type_features: channel_type.clone()
 			},
-			funding_transaction: None,
 			is_batch_funding: None,
 
 			counterparty_cur_commitment_point: Some(open_channel_fields.first_per_commitment_point),
@@ -2761,6 +2762,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			next_remote_commitment_tx_fee_info_cached: Mutex::new(None),
 
 			funding_outpoint: None,
+			funding_transaction: None,
 		};
 		let channel_context = Self {
 			user_id,
@@ -2850,7 +2852,6 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 				funding_outpoint: None,
 				channel_type_features: channel_type.clone()
 			},
-			funding_transaction: None,
 			is_batch_funding: None,
 
 			counterparty_cur_commitment_point: None,
@@ -4271,8 +4272,8 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	///
 	/// Note that if [`Self::is_manual_broadcast`] is true the transaction will be a dummy
 	/// transaction.
-	pub fn unbroadcasted_funding(&self) -> Option<Transaction> {
-		self.if_unbroadcasted_funding(|| self.funding_transaction.clone())
+	pub fn unbroadcasted_funding(&self, funding: &FundingScope) -> Option<Transaction> {
+		self.if_unbroadcasted_funding(|| funding.funding_transaction.clone())
 	}
 
 	/// Returns the transaction ID if there is a pending funding transaction that is yet to be
@@ -4337,7 +4338,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			} else { None }
 		} else { None };
 		let unbroadcasted_batch_funding_txid = self.unbroadcasted_batch_funding_txid(funding);
-		let unbroadcasted_funding_tx = self.unbroadcasted_funding();
+		let unbroadcasted_funding_tx = self.unbroadcasted_funding(funding);
 
 		self.channel_state = ChannelState::ShutdownComplete;
 		self.update_time_counter += 1;
@@ -6149,7 +6150,7 @@ impl<SP: Deref> FundedChannel<SP> where
 			if funding_tx_opt.is_some() {
 				self.context.channel_state = ChannelState::AwaitingChannelReady(AwaitingChannelReadyFlags::new());
 			}
-			self.context.funding_transaction = funding_tx_opt.clone();
+			self.funding.funding_transaction = funding_tx_opt.clone();
 
 			self.context.next_funding_txid = None;
 
@@ -6369,7 +6370,7 @@ impl<SP: Deref> FundedChannel<SP> where
 		// (re-)broadcast the funding transaction as we may have declined to broadcast it when we
 		// first received the funding_signed.
 		let mut funding_broadcastable = None;
-		if let Some(funding_transaction) = &self.context.funding_transaction {
+		if let Some(funding_transaction) = &self.funding.funding_transaction {
 			if self.context.is_outbound() &&
 				(matches!(self.context.channel_state, ChannelState::AwaitingChannelReady(flags) if !flags.is_set(AwaitingChannelReadyFlags::WAITING_FOR_BATCH)) ||
 				matches!(self.context.channel_state, ChannelState::ChannelReady(_)))
@@ -7223,7 +7224,7 @@ impl<SP: Deref> FundedChannel<SP> where
 			user_channel_id: self.context.user_id,
 			channel_capacity_satoshis: self.funding.channel_value_satoshis,
 			counterparty_node_id: self.context.counterparty_node_id,
-			unbroadcasted_funding_tx: self.context.unbroadcasted_funding(),
+			unbroadcasted_funding_tx: self.context.unbroadcasted_funding(&self.funding),
 			is_manual_broadcast: self.context.is_manual_broadcast,
 			channel_funding_txo: self.funding.get_funding_txo(),
 			last_local_balance_msat: self.funding.value_to_self_msat,
@@ -7647,7 +7648,7 @@ impl<SP: Deref> FundedChannel<SP> where
 			// Because deciding we're awaiting initial broadcast spuriously could result in
 			// funds-loss (as we don't have a monitor, but have the funding transaction confirmed),
 			// we hard-assert here, even in production builds.
-			if self.context.is_outbound() { assert!(self.context.funding_transaction.is_some()); }
+			if self.context.is_outbound() { assert!(self.funding.funding_transaction.is_some()); }
 			assert!(self.context.monitor_pending_channel_ready);
 			assert_eq!(self.context.latest_monitor_update_id, 0);
 			return true;
@@ -8817,8 +8818,8 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
 			self.context.minimum_depth = Some(COINBASE_MATURITY);
 		}
 
-		debug_assert!(self.context.funding_transaction.is_none());
-		self.context.funding_transaction = Some(funding_transaction);
+		debug_assert!(self.funding.funding_transaction.is_none());
+		self.funding.funding_transaction = Some(funding_transaction);
 		self.context.is_batch_funding = Some(()).filter(|_| is_batch_funding);
 
 		let funding_created = self.get_funding_created_msg(logger);
@@ -9898,7 +9899,7 @@ impl<SP: Deref> Writeable for FundedChannel<SP> where SP::Target: SignerProvider
 		}
 
 		self.context.channel_transaction_parameters.write(writer)?;
-		self.context.funding_transaction.write(writer)?;
+		self.funding.funding_transaction.write(writer)?;
 
 		self.context.counterparty_cur_commitment_point.write(writer)?;
 		self.context.counterparty_prev_commitment_point.write(writer)?;
@@ -10481,6 +10482,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 				next_remote_commitment_tx_fee_info_cached: Mutex::new(None),
 
 				funding_outpoint: channel_parameters.funding_outpoint,
+				funding_transaction,
 			},
 			context: ChannelContext {
 				user_id,
@@ -10560,7 +10562,6 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 				counterparty_forwarding_info,
 
 				channel_transaction_parameters: channel_parameters,
-				funding_transaction,
 				is_batch_funding,
 
 				counterparty_cur_commitment_point,

lightning/src/ln/channelmanager.rs

@@ -3251,7 +3251,7 @@ macro_rules! handle_monitor_update_completion {
 							.get_mut(&channel_id)
 							.and_then(Channel::as_funded_mut)
 						{
-							batch_funding_tx = batch_funding_tx.or_else(|| funded_chan.context.unbroadcasted_funding());
+							batch_funding_tx = batch_funding_tx.or_else(|| funded_chan.context.unbroadcasted_funding(&funded_chan.funding));
 							funded_chan.set_batch_ready();
 							let mut pending_events = $self.pending_events.lock().unwrap();
 							emit_channel_pending_event!(pending_events, funded_chan);