f thebluematt feedback

Author: dunxen

lightning/src/ln/channel.rs

@@ -1523,16 +1523,19 @@ trait InitialRemoteCommitmentReceiver<SP: Deref> where SP::Target: SignerProvide
 	}
 
 	fn initial_commitment_signed<L: Deref>(
-		&mut self, channel_id: ChannelId, counterparty_signature: Signature, counterparty_txid: Txid,
+		&mut self, channel_id: ChannelId, counterparty_signature: Signature,
 		counterparty_commitment_number: u64, best_block: BestBlock, signer_provider: &SP, logger: &L,
-	) -> Result<ChannelMonitor<<SP::Target as SignerProvider>::EcdsaSigner>, ChannelError>
+	) -> Result<(ChannelMonitor<<SP::Target as SignerProvider>::EcdsaSigner>, CommitmentTransaction), ChannelError>
 	where
 		L::Target: Logger
 	{
 		let initial_commitment_tx = match self.check_counterparty_commitment_signature(&counterparty_signature, logger) {
 			Ok(res) => res,
 			Err(ChannelError::Close(e)) => {
-				self.context_mut().channel_transaction_parameters.funding_outpoint = None;
+				// TODO(dual_funding): Update for V2 established channels.
+				if !self.context().is_outbound() {
+					self.context_mut().channel_transaction_parameters.funding_outpoint = None;
+				}
 				return Err(ChannelError::Close(e));
 			},
 			Err(e) => {
@@ -1596,15 +1599,15 @@ trait InitialRemoteCommitmentReceiver<SP: Deref> where SP::Target: SignerProvide
 		                                          obscure_factor,
 		                                          holder_commitment_tx, best_block, context.counterparty_node_id, context.channel_id());
 		channel_monitor.provide_initial_counterparty_commitment_tx(
-			counterparty_txid, Vec::new(),
+			counterparty_initial_bitcoin_tx.txid, Vec::new(),
 			counterparty_commitment_number,
 			context.counterparty_cur_commitment_point.unwrap(),
 			counterparty_initial_commitment_tx.feerate_per_kw(),
 			counterparty_initial_commitment_tx.to_broadcaster_value_sat(),
 			counterparty_initial_commitment_tx.to_countersignatory_value_sat(),
 			logger);
 
-		Ok(channel_monitor)
+		Ok((channel_monitor, counterparty_initial_commitment_tx))
 	}
 }
 
@@ -7998,24 +8001,20 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
 			panic!("Should not have advanced channel commitment tx numbers prior to funding_created");
 		}
 
-		let counterparty_keys = self.context.build_remote_transaction_keys();
-		let counterparty_initial_commitment_tx = self.context.build_commitment_transaction(self.context.cur_counterparty_commitment_transaction_number, &counterparty_keys, false, false, logger).tx;
-		let counterparty_trusted_tx = counterparty_initial_commitment_tx.trust();
-		let counterparty_initial_bitcoin_tx = counterparty_trusted_tx.built_transaction();
-
-		log_trace!(logger, "Initial counterparty tx for channel {} is: txid {} tx {}",
-			&self.context.channel_id(), counterparty_initial_bitcoin_tx.txid, encode::serialize_hex(&counterparty_initial_bitcoin_tx.transaction));
-
-		let channel_monitor = match self.initial_commitment_signed(
+		let (channel_monitor, counterparty_initial_commitment_tx) = match self.initial_commitment_signed(
 			self.context.channel_id(),
-			msg.signature, counterparty_initial_bitcoin_tx.txid,
-			self.context.cur_counterparty_commitment_transaction_number,
+			msg.signature, self.context.cur_counterparty_commitment_transaction_number,
 			best_block, signer_provider, logger
 		) {
 			Ok(channel_monitor) => channel_monitor,
 			Err(err) => return Err((self, err)),
 		};
 
+		let counterparty_trusted_tx = counterparty_initial_commitment_tx.trust();
+		let counterparty_initial_bitcoin_tx = counterparty_trusted_tx.built_transaction();
+		log_trace!(logger, "Initial counterparty tx for channel {} is: txid {} tx {}",
+			&self.context.channel_id(), counterparty_initial_bitcoin_tx.txid, encode::serialize_hex(&counterparty_initial_bitcoin_tx.transaction));
+
 		self.context.cur_counterparty_commitment_transaction_number -= 1;
 		log_info!(logger, "Received funding_signed from peer for channel {}", &self.context.channel_id());
 
@@ -8233,20 +8232,16 @@ impl<SP: Deref> InboundV1Channel<SP> where SP::Target: SignerProvider {
 		// check_funding_created_signature may fail.
 		self.context.holder_signer.as_mut().provide_channel_parameters(&self.context.channel_transaction_parameters);
 
-		self.context.cur_counterparty_commitment_transaction_number -= 1;
-		let counterparty_keys = self.context.build_remote_transaction_keys();
-		let counterparty_initial_commitment_tx = self.context.build_commitment_transaction(self.context.cur_counterparty_commitment_transaction_number + 1, &counterparty_keys, false, false, logger).tx;
-
-		let channel_monitor = match self.initial_commitment_signed(
+		let (channel_monitor, counterparty_initial_commitment_tx) = match self.initial_commitment_signed(
 			ChannelId::v1_from_funding_outpoint(funding_txo),
-			msg.signature, counterparty_initial_commitment_tx.trust().txid(),
-			self.context.cur_counterparty_commitment_transaction_number + 1,
+			msg.signature, self.context.cur_counterparty_commitment_transaction_number,
 			best_block, signer_provider, logger
 		) {
 			Ok(channel_monitor) => channel_monitor,
 			Err(err) => return Err((self, err)),
 		};
 
+		self.context.cur_counterparty_commitment_transaction_number -= 1;
 		let funding_signed = self.context.get_funding_signed_msg(logger, counterparty_initial_commitment_tx);
 
 		log_info!(logger, "{} funding_signed for peer for channel {}",