f set and clear next_funding_txid in channel.rs directly

Author: dunxen

lightning/src/ln/channel.rs

@@ -31,8 +31,9 @@ use crate::types::payment::{PaymentPreimage, PaymentHash};
 use crate::types::features::{ChannelTypeFeatures, InitFeatures};
 use crate::ln::interactivetxs::{
 	ConstructedTransaction, estimate_input_weight, get_output_weight,
-	HandleTxCompleteResult, InteractiveTxConstructor, InteractiveTxConstructorArgs,
-	InteractiveTxSigningSession, InteractiveTxMessageSendResult, TX_COMMON_FIELDS_WEIGHT,
+	HandleTxCompleteValue, HandleTxCompleteResult, InteractiveTxConstructor,
+	InteractiveTxConstructorArgs, InteractiveTxSigningSession, InteractiveTxMessageSendResult,
+	TX_COMMON_FIELDS_WEIGHT,
 };
 use crate::ln::msgs;
 use crate::ln::msgs::{ClosingSigned, ClosingSignedFeeRange, DecodeError};
@@ -1726,8 +1727,16 @@ pub(super) trait InteractivelyFunded<SP: Deref> where SP::Target: SignerProvider
 
 	fn tx_complete(&mut self, msg: &msgs::TxComplete) -> HandleTxCompleteResult {
 		HandleTxCompleteResult(match self.interactive_tx_constructor_mut() {
-			Some(ref mut tx_constructor) => tx_constructor.handle_tx_complete(msg).map_err(
-				|reason| reason.into_tx_abort_msg(self.context().channel_id())),
+			Some(ref mut tx_constructor) => tx_constructor.handle_tx_complete(msg)
+				// TODO: Change this to Result::inspect when MSRV >= 1.76
+				// See: https://doc.rust-lang.org/stable/std/result/enum.Result.html#method.inspect
+				.map(|tx_complete_value| {
+					if let HandleTxCompleteValue::SendTxComplete(_, ref signing_session) = tx_complete_value {
+						self.context_mut().next_funding_txid = Some(signing_session.unsigned_tx.txid());
+					}
+					tx_complete_value
+				})
+				.map_err(|reason| reason.into_tx_abort_msg(self.context().channel_id())),
 			None => Err(msgs::TxAbort {
 				channel_id: self.context().channel_id(),
 				data: b"No interactive transaction negotiation in progress".to_vec()
@@ -4672,14 +4681,6 @@ impl<SP: Deref> Channel<SP> where
 		self.context.channel_state.clear_waiting_for_batch();
 	}
 
-	pub fn set_next_funding_txid(&mut self, txid: &Txid) {
-		self.context.next_funding_txid = Some(*txid);
-	}
-
-	pub fn clear_next_funding_txid(&mut self) {
-		self.context.next_funding_txid = None;
-	}
-
 	/// Unsets the existing funding information.
 	///
 	/// This must only be used if the channel has not yet completed funding and has not been used.
@@ -5701,6 +5702,8 @@ impl<SP: Deref> Channel<SP> where
 			}
 			self.context.funding_transaction = funding_tx_opt.clone();
 
+			self.context.next_funding_txid = None;
+
 			// Clear out the signing session
 			self.interactive_tx_signing_session = None;
 

lightning/src/ln/channelmanager.rs

@@ -8279,7 +8279,6 @@ where
 					peer_state.pending_msg_events.push(msg_send_event);
 				};
 				if let Some(mut signing_session) = signing_session_opt {
-					let funding_txid = signing_session.unsigned_tx.txid();
 					let (commitment_signed, funding_ready_for_sig_event_opt) = match chan_phase_entry.get_mut() {
 						ChannelPhase::UnfundedOutboundV2(chan) => {
 							chan.funding_tx_constructed(&mut signing_session, &self.logger)
@@ -8292,7 +8291,7 @@ where
 							.into())),
 					}.map_err(|err| MsgHandleErrInternal::send_err_msg_no_close(format!("{}", err), msg.channel_id))?;
 					let (channel_id, channel_phase) = chan_phase_entry.remove_entry();
-					let mut channel = match channel_phase {
+					let channel = match channel_phase {
 						ChannelPhase::UnfundedOutboundV2(chan) => chan.into_channel(signing_session),
 						ChannelPhase::UnfundedInboundV2(chan) => chan.into_channel(signing_session),
 						_ => {
@@ -8302,7 +8301,6 @@ where
 									.into()))
 						},
 					}.map_err(|err| MsgHandleErrInternal::send_err_msg_no_close(format!("{}", err), msg.channel_id))?;
-					channel.set_next_funding_txid(&funding_txid);
 					peer_state.channel_by_id.insert(channel_id, ChannelPhase::Funded(channel));
 					if let Some(funding_ready_for_sig_event) = funding_ready_for_sig_event_opt {
 						let mut pending_events = self.pending_events.lock().unwrap();
@@ -8346,7 +8344,6 @@ where
 				match channel_phase {
 					ChannelPhase::Funded(chan) => {
 						let (tx_signatures_opt, funding_tx_opt) = try_chan_phase_entry!(self, chan.tx_signatures(msg), chan_phase_entry);
-						chan.clear_next_funding_txid();
 						if let Some(tx_signatures) = tx_signatures_opt {
 							peer_state.pending_msg_events.push(events::MessageSendEvent::SendTxSignatures {
 								node_id: *counterparty_node_id,