Introduce InteractiveTxSigningSession for signing interactively constructed txs

Author: dunxen

lightning/src/ln/channel.rs

@@ -8563,7 +8563,7 @@ impl<SP: Deref> InboundV2Channel<SP> where SP::Target: SignerProvider {
 	/// Assumes chain_hash has already been checked and corresponds with what we expect!
 	pub fn new<ES: Deref, F: Deref, L: Deref>(
 		fee_estimator: &LowerBoundedFeeEstimator<F>, entropy_source: &ES, signer_provider: &SP,
-		counterparty_node_id: PublicKey, our_supported_features: &ChannelTypeFeatures,
+		holder_node_id: PublicKey, counterparty_node_id: PublicKey, our_supported_features: &ChannelTypeFeatures,
 		their_features: &InitFeatures, msg: &msgs::OpenChannelV2,
 		funding_inputs: Vec<(TxIn, TransactionU16LenLimited)>, user_id: u128, config: &UserConfig,
 		current_chain_height: u32, logger: &L,
@@ -8639,6 +8639,8 @@ impl<SP: Deref> InboundV2Channel<SP> where SP::Target: SignerProvider {
 		let interactive_tx_constructor = Some(InteractiveTxConstructor::new(
 			InteractiveTxConstructorArgs {
 				entropy_source,
+				holder_node_id,
+				counterparty_node_id,
 				channel_id: context.channel_id,
 				feerate_sat_per_kw: dual_funding_context.funding_feerate_sat_per_1000_weight,
 				funding_tx_locktime: dual_funding_context.funding_tx_locktime,

lightning/src/ln/channelmanager.rs

@@ -7638,7 +7638,7 @@ where
 					},
 					OpenChannelMessage::V2(open_channel_msg) => {
 						InboundV2Channel::new(&self.fee_estimator, &self.entropy_source, &self.signer_provider,
-							*counterparty_node_id, &self.channel_type_features(), &peer_state.latest_features,
+							self.get_our_node_id(), *counterparty_node_id, &self.channel_type_features(), &peer_state.latest_features,
 							&open_channel_msg, funding_inputs, user_channel_id, &self.default_configuration, best_block_height,
 							&self.logger
 						).map_err(|_| MsgHandleErrInternal::from_chan_no_close(
@@ -7910,7 +7910,7 @@ where
 			},
 			OpenChannelMessageRef::V2(msg) => {
 				let channel = InboundV2Channel::new(&self.fee_estimator, &self.entropy_source,
-					&self.signer_provider, *counterparty_node_id, &self.channel_type_features(),
+					&self.signer_provider, self.get_our_node_id(), *counterparty_node_id, &self.channel_type_features(),
 					&peer_state.latest_features, msg, vec![], user_channel_id, &self.default_configuration,
 					best_block_height, &self.logger
 				).map_err(|e| MsgHandleErrInternal::from_chan_no_close(e, msg.common_fields.temporary_channel_id))?;