f call begin_interactive_funding_tx_construction in InboundChannelV2::new

Author: dunxen

lightning/src/ln/channel.rs

@@ -47,7 +47,7 @@ use crate::chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, Channel
 use crate::chain::transaction::{OutPoint, TransactionData};
 use crate::sign::ecdsa::EcdsaChannelSigner;
 use crate::sign::{EntropySource, ChannelSigner, SignerProvider, NodeSigner, Recipient};
-use crate::events::ClosureReason;
+use crate::events::{ClosureReason, MessageSendEvent};
 use crate::routing::gossip::NodeId;
 use crate::util::ser::{Readable, ReadableArgs, TransactionU16LenLimited, Writeable, Writer};
 use crate::util::logger::{Logger, Record, WithContext};
@@ -8390,7 +8390,7 @@ impl<SP: Deref> InboundV2Channel<SP> where SP::Target: SignerProvider {
 		their_features: &InitFeatures, msg: &msgs::OpenChannelV2,
 		funding_inputs: Vec<(TxIn, TransactionU16LenLimited)>, user_id: u128, config: &UserConfig,
 		current_chain_height: u32, logger: &L,
-	) -> Result<InboundV2Channel<SP>, ChannelError>
+	) -> Result<(InboundV2Channel<SP>, Option<MessageSendEvent>), ChannelError>
 		where ES::Target: EntropySource,
 			  F::Target: FeeEstimator,
 			  L::Target: Logger,
@@ -8451,7 +8451,7 @@ impl<SP: Deref> InboundV2Channel<SP> where SP::Target: SignerProvider {
 			&context.get_counterparty_pubkeys().revocation_basepoint);
 		context.channel_id = channel_id;
 
-		let chan = Self {
+		let mut channel = Self {
 			context,
 			unfunded_context: UnfundedChannelContext { unfunded_channel_age_ticks: 0 },
 			dual_funding_context: DualFundingChannelContext {
@@ -8464,7 +8464,34 @@ impl<SP: Deref> InboundV2Channel<SP> where SP::Target: SignerProvider {
 			interactive_tx_constructor: None,
 		};
 
-		Ok(chan)
+		let tx_msg_opt_res = channel.begin_interactive_funding_tx_construction(
+			entropy_source,
+		);
+		let pending_msg_send_event = match tx_msg_opt_res {
+			Ok(tx_msg_opt) => {
+				if let Some(tx_msg) = tx_msg_opt {
+					let msg_send_event = match tx_msg {
+						InteractiveTxMessageSend::TxAddInput(msg) => MessageSendEvent::SendTxAddInput {
+							node_id: channel.context.counterparty_node_id, msg },
+						InteractiveTxMessageSend::TxAddOutput(msg) => MessageSendEvent::SendTxAddOutput {
+							node_id: channel.context.counterparty_node_id, msg },
+						InteractiveTxMessageSend::TxComplete(msg) => MessageSendEvent::SendTxComplete {
+							node_id: channel.context.counterparty_node_id, msg },
+					};
+					Some(msg_send_event)
+				} else {
+					None
+				}
+			},
+			Err(_) => {
+				return Err(ChannelError::Close((
+					"V2 channel rejected due to sender error".into(),
+					ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) },
+				)));
+			}
+		};
+
+		Ok((channel, pending_msg_send_event))
 	}
 
 	/// Marks an inbound channel as accepted and generates a [`msgs::AcceptChannelV2`] message which

lightning/src/ln/channelmanager.rs

@@ -6793,31 +6793,11 @@ where
 							&open_channel_msg, funding_inputs, user_channel_id, &self.default_configuration, best_block_height,
 							&self.logger);
 						match channel_res {
-							Ok(mut channel) => {
-								let tx_msg_opt_res = channel.begin_interactive_funding_tx_construction(&self.entropy_source);
-								match tx_msg_opt_res {
-									Ok(tx_msg_opt) => {
-										if let Some(tx_msg) = tx_msg_opt {
-											let msg_send_event = match tx_msg {
-												InteractiveTxMessageSend::TxAddInput(msg) => events::MessageSendEvent::SendTxAddInput {
-													node_id: *counterparty_node_id, msg },
-												InteractiveTxMessageSend::TxAddOutput(msg) => events::MessageSendEvent::SendTxAddOutput {
-													node_id: *counterparty_node_id, msg },
-												InteractiveTxMessageSend::TxComplete(msg) => events::MessageSendEvent::SendTxComplete {
-													node_id: *counterparty_node_id, msg },
-											};
-											peer_state.pending_msg_events.push(msg_send_event);
-										}
-										Ok(ChannelPhase::UnfundedInboundV2(channel))
-									},
-									Err(_) => {
-										Err(MsgHandleErrInternal::from_chan_no_close(ChannelError::Close(
-											(
-												"V2 channel rejected due to sender error".into(),
-												ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) },
-											)), *temporary_channel_id))
-									}
+							Ok((channel, msg_send_event_opt)) => {
+								if let Some(msg_send_event) = msg_send_event_opt {
+									peer_state.pending_msg_events.push(msg_send_event);
 								}
+								Ok(ChannelPhase::UnfundedInboundV2(channel))
 							},
 							Err(_) => Err(MsgHandleErrInternal::from_chan_no_close(ChannelError::Close(
 								(
@@ -7114,7 +7094,7 @@ where
 				let mut random_bytes = [0u8; 16];
 				random_bytes.copy_from_slice(&self.entropy_source.get_secure_random_bytes()[..16]);
 				let user_channel_id = u128::from_be_bytes(random_bytes);
-				let mut channel = match InboundV2Channel::new(&self.fee_estimator, &self.entropy_source,
+				let (mut channel, _) = match InboundV2Channel::new(&self.fee_estimator, &self.entropy_source,
 					&self.signer_provider, counterparty_node_id.clone(), &self.channel_type_features(),
 					&peer_state.latest_features, &msg, vec![], user_channel_id, &self.default_configuration,
 					best_block_height, &self.logger)
@@ -7136,10 +7116,6 @@ where
 				let outbound_scid_alias = self.create_and_insert_outbound_scid_alias();
 				channel.context.set_outbound_scid_alias(outbound_scid_alias);
 
-				channel.begin_interactive_funding_tx_construction(&self.entropy_source)
-					.map_err(|_| MsgHandleErrInternal::send_err_msg_no_close(
-						"Failed to start interactive transaction construction".to_owned(), msg.common_fields.temporary_channel_id))?;
-
 				peer_state.pending_msg_events.push(events::MessageSendEvent::SendAcceptChannelV2 {
 					node_id: counterparty_node_id.clone(),
 					msg: channel.accept_inbound_dual_funded_channel(),