HolderCommitmentTransactionInfo

Author: devrandom

lightning/src/ln/chan_utils.rs

@@ -554,8 +554,25 @@ pub fn build_htlc_transaction(prev_hash: &Txid, feerate_per_kw: u32, contest_del
 	}
 }
 
+/// This class tracks the information needed to build a holder's commitment transaction and to actually
+/// build and sign.  It is used for holder transactions that we sign only when needed.
+pub struct HolderCommitmentTransactionInfo {
+	/// The non-party-specific transaction information
+	pub info: CommitmentTransactionInfo,
+	/// Our counterparty's signature for the transaction
+	pub counterparty_sig: Signature,
+	/// All HTLCs (including dust ones) with an optional counterparty signature
+	pub htlcs_with_sig: Vec<(HTLCOutputInCommitment, Option<Signature>)>,
+}
+
+impl HolderCommitmentTransactionInfo {
+	pub(crate) fn to_holder_commitment_tx<T: secp256k1::Signing + secp256k1::Verification>(&self, holder_pubkeys: &ChannelPublicKeys, counterparty_pubkeys: &ChannelPublicKeys, funding_outpoint: &OutPoint, contest_delay: u16, is_outbound: bool, secp_ctx: &Secp256k1<T>) -> HolderCommitmentTransaction {
+		self.info.to_holder_commitment_tx(self.counterparty_sig, self.htlcs_with_sig.clone(), holder_pubkeys, counterparty_pubkeys, funding_outpoint, contest_delay, is_outbound, secp_ctx)
+	}
+}
+
 #[derive(Clone)]
-/// We use this class to track the information needed to build a commitment transaction and to actually
+/// This class tracks the information needed to build a commitment transaction and to actually
 /// build and sign.  It is used for holder transactions that we sign only when needed
 /// and for transactions we sign for the counterparty.
 ///

lightning/src/ln/channel.rs

@@ -26,7 +26,7 @@ use ln::features::{ChannelFeatures, InitFeatures};
 use ln::msgs;
 use ln::msgs::{DecodeError, OptionalField, DataLossProtect};
 use ln::channelmanager::{PendingHTLCStatus, HTLCSource, HTLCFailReason, HTLCFailureMsg, PendingHTLCInfo, RAACommitmentOrder, PaymentPreimage, PaymentHash, BREAKDOWN_TIMEOUT, MAX_LOCAL_BREAKDOWN_TIMEOUT};
-use ln::chan_utils::{CounterpartyCommitmentSecrets, HolderCommitmentTransaction, TxCreationKeys, HTLCOutputInCommitment, HTLC_SUCCESS_TX_WEIGHT, HTLC_TIMEOUT_TX_WEIGHT, make_funding_redeemscript, ChannelPublicKeys, PreCalculatedTxCreationKeys, CommitmentTransactionInfo};
+use ln::chan_utils::{CounterpartyCommitmentSecrets, HolderCommitmentTransaction, TxCreationKeys, HTLCOutputInCommitment, HTLC_SUCCESS_TX_WEIGHT, HTLC_TIMEOUT_TX_WEIGHT, make_funding_redeemscript, ChannelPublicKeys, PreCalculatedTxCreationKeys, CommitmentTransactionInfo, HolderCommitmentTransactionInfo};
 use ln::chan_utils;
 use chain::chaininterface::{FeeEstimator,ConfirmationTarget};
 use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitorUpdateStep, HTLC_FAIL_BACK_BUFFER};
@@ -1509,15 +1509,19 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 			}
 		};
 
+		let holder_info = HolderCommitmentTransactionInfo {
+			info: initial_commitment_info,
+			counterparty_sig: msg.signature,
+			htlcs_with_sig: Vec::new(),
+		};
+
 		// TODO some of the needed fields are already passed into ChannelMonitor, but some still need
 		// to be passed in if we are to replace HolderCommitmentTransaction with CommitmentTransactionInfo
-		let initial_commitment_tx = initial_commitment_info.to_holder_commitment_tx(
-			msg.signature, // provide in a wrapper named HolderCommitmentTransactionInfo?
-			Vec::new(),  // provide in a wrapper named HolderCommitmentTransactionInfo?
-			&self.holder_keys.pubkeys(), // DONE
-			self.counterparty_pubkeys.as_ref().unwrap(), // partially
-			&self.funding_txo.unwrap().into_bitcoin_outpoint(), // DONE
-			self.counterparty_selected_contest_delay, // DONE
+		let initial_commitment_tx = holder_info.to_holder_commitment_tx(
+			&self.holder_keys.pubkeys(), // self.holder_keys already provided
+			self.counterparty_pubkeys.as_ref().unwrap(), // partially provided
+			&self.funding_txo.unwrap().into_bitcoin_outpoint(), // self.funding_txo already provided
+			self.counterparty_selected_contest_delay, // already provided
 			self.is_outbound(), // provide
 			&self.secp_ctx, // not needed
 		);