Skip to content

Enforce ChannelTransactionParameters completeness #4464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jkczyz wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Enforce ChannelTransactionParameters completeness #4464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da68f2c
Add PendingV1 channel phase between UnfundedOutboundV1 and Funded
jkczyz Mar 5, 2026
717c854
Rename PendingV2Channel to UnfundedV2Channel
jkczyz Mar 2, 2026
c6c28f7
Add PendingV2 channel phase between UnfundedV2 and Funded
jkczyz Mar 5, 2026
59f2ede
Enforce ChannelTransactionParameters completeness at the type level
jkczyz Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ use crate::chain::{BestBlock, WatchedOutput};
use crate::events::bump_transaction::{AnchorDescriptor, BumpTransactionEvent};
use crate::events::{ClosureReason, Event, EventHandler, ReplayEvent};
use crate::ln::chan_utils::{
self, ChannelTransactionParameters, CommitmentTransaction, CounterpartyCommitmentSecrets,
HTLCClaim, HTLCOutputInCommitment, HolderCommitmentTransaction,
self, ChannelTransactionParameters, ChannelTransactionParametersAccess, CommitmentTransaction,
CounterpartyCommitmentSecrets, HTLCClaim, HTLCOutputInCommitment, HolderCommitmentTransaction,
};
use crate::ln::channel::INITIAL_COMMITMENT_NUMBER;
use crate::ln::channel_keys::{
Expand Down Expand Up @@ -118,9 +118,7 @@ impl ChannelMonitorUpdate {
) -> impl Iterator<Item = (OutPoint, ScriptBuf)> + '_ {
self.updates.iter().filter_map(|update| match update {
ChannelMonitorUpdateStep::RenegotiatedFunding { channel_parameters, .. } => {
let funding_outpoint = channel_parameters
.funding_outpoint
.expect("Renegotiated funding must always have known outpoint");
let funding_outpoint = channel_parameters.funding_outpoint;
let funding_script = channel_parameters.make_funding_redeemscript().to_p2wsh();
Some((funding_outpoint, funding_script))
},
Expand Down Expand Up @@ -1170,8 +1168,7 @@ struct FundingScope {

impl FundingScope {
fn funding_outpoint(&self) -> OutPoint {
let funding_outpoint = self.channel_parameters.funding_outpoint.as_ref();
*funding_outpoint.expect("Funding outpoint must be set for active monitor")
self.channel_parameters.funding_outpoint
}

fn funding_txid(&self) -> Txid {
Expand Down Expand Up @@ -1868,7 +1865,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
&channel_parameters.channel_type_features, &holder_pubkeys.payment_point
);

let counterparty_channel_parameters = channel_parameters.counterparty_parameters.as_ref().unwrap();
let counterparty_channel_parameters = &channel_parameters.counterparty_parameters;
let counterparty_delayed_payment_base_key = counterparty_channel_parameters.pubkeys.delayed_payment_basepoint;
let counterparty_htlc_base_key = counterparty_channel_parameters.pubkeys.htlc_basepoint;
let counterparty_commitment_params = CounterpartyCommitmentParameters { counterparty_delayed_payment_base_key, counterparty_htlc_base_key, on_counterparty_tx_csv };
Expand All @@ -1885,8 +1882,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
initial_holder_commitment_tx.clone(), secp_ctx,
);

let funding_outpoint = channel_parameters.funding_outpoint
.expect("Funding outpoint must be known during initialization");
let funding_outpoint = channel_parameters.funding_outpoint;
let funding_redeem_script = channel_parameters.make_funding_redeemscript();
let funding_script = funding_redeem_script.to_p2wsh();
let mut outputs_to_watch = new_hash_map();
Expand Down Expand Up @@ -4231,7 +4227,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
channel_parameters, holder_commitment_tx, counterparty_commitment_tx,
} => {
log_trace!(logger, "Updating ChannelMonitor with alternative holder and counterparty commitment transactions for funding txid {}",
channel_parameters.funding_outpoint.unwrap().txid);
channel_parameters.funding_outpoint.txid);
if let Err(_) = self.renegotiated_funding(
logger, channel_parameters, holder_commitment_tx, counterparty_commitment_tx,
) {
Expand Down Expand Up @@ -4345,7 +4341,6 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
#[rustfmt::skip]
fn get_funding_txo(&self) -> OutPoint {
self.funding.channel_parameters.funding_outpoint
.expect("Funding outpoint must be set for active monitor")
}

/// Returns the P2WSH script we are currently monitoring the chain for spends. This will change
Expand Down Expand Up @@ -6981,11 +6976,11 @@ mod tests {
holder_pubkeys: keys.pubkeys(&secp_ctx),
holder_selected_contest_delay: 66,
is_outbound_from_holder: true,
counterparty_parameters: Some(CounterpartyChannelTransactionParameters {
counterparty_parameters: CounterpartyChannelTransactionParameters {
pubkeys: counterparty_pubkeys,
selected_contest_delay: 67,
}),
funding_outpoint: Some(funding_outpoint),
},
funding_outpoint,
splice_parent_funding_txid: None,
channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
channel_value_satoshis: 0,
Expand Down Expand Up @@ -7244,11 +7239,11 @@ mod tests {
holder_pubkeys: keys.pubkeys(&secp_ctx),
holder_selected_contest_delay: 66,
is_outbound_from_holder: true,
counterparty_parameters: Some(CounterpartyChannelTransactionParameters {
counterparty_parameters: CounterpartyChannelTransactionParameters {
pubkeys: counterparty_pubkeys,
selected_contest_delay: 67,
}),
funding_outpoint: Some(funding_outpoint),
},
funding_outpoint,
splice_parent_funding_txid: None,
channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
channel_value_satoshis: 0,
Expand Down
6 changes: 3 additions & 3 deletions lightning/src/chain/onchaintx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,11 +1354,11 @@ mod tests {
holder_pubkeys: signer.pubkeys(&secp_ctx),
holder_selected_contest_delay: 66,
is_outbound_from_holder: true,
counterparty_parameters: Some(CounterpartyChannelTransactionParameters {
counterparty_parameters: CounterpartyChannelTransactionParameters {
pubkeys: counterparty_pubkeys,
selected_contest_delay: 67,
}),
funding_outpoint: Some(funding_outpoint),
},
funding_outpoint,
splice_parent_funding_txid: None,
channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
channel_value_satoshis: 0,
Expand Down
10 changes: 5 additions & 5 deletions lightning/src/chain/package.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ use crate::chain::channelmonitor::COUNTERPARTY_CLAIMABLE_WITHIN_BLOCKS_PINNABLE;
use crate::chain::onchaintx::{FeerateStrategy, OnchainTxHandler};
use crate::chain::transaction::MaybeSignedTransaction;
use crate::ln::chan_utils::{
self, ChannelTransactionParameters, HTLCOutputInCommitment, HolderCommitmentTransaction,
TxCreationKeys,
self, ChannelTransactionParameters, ChannelTransactionParametersAccess, HTLCOutputInCommitment,
HolderCommitmentTransaction, TxCreationKeys,
};
use crate::ln::channel_keys::{DelayedPaymentBasepoint, HtlcBasepoint};
use crate::ln::channelmanager::MIN_CLTV_EXPIRY_DELTA;
Expand Down Expand Up @@ -1892,7 +1892,7 @@ mod tests {
payment_hash: PaymentHash::from(preimage),
transaction_output_index: None,
};
let funding_outpoint = channel_parameters.funding_outpoint.unwrap();
let funding_outpoint = channel_parameters.funding_outpoint;
let commitment_tx = HolderCommitmentTransaction::dummy(0, funding_outpoint, vec![htlc.clone()]);
let trusted_tx = commitment_tx.trust();
PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
Expand Down Expand Up @@ -1929,7 +1929,7 @@ mod tests {
payment_hash: PaymentHash::from(PaymentPreimage([2;32])),
transaction_output_index: None,
};
let funding_outpoint = channel_parameters.funding_outpoint.unwrap();
let funding_outpoint = channel_parameters.funding_outpoint;
let commitment_tx = HolderCommitmentTransaction::dummy(0, funding_outpoint, vec![htlc.clone()]);
let trusted_tx = commitment_tx.trust();
PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
Expand Down Expand Up @@ -1957,7 +1957,7 @@ mod tests {
macro_rules! dumb_funding_output {
() => {{
let mut channel_parameters = ChannelTransactionParameters::test_dummy(0);
let funding_outpoint = channel_parameters.funding_outpoint.unwrap();
let funding_outpoint = channel_parameters.funding_outpoint;
let commitment_tx = HolderCommitmentTransaction::dummy(0, funding_outpoint, Vec::new());
channel_parameters.channel_type_features = ChannelTypeFeatures::only_static_remote_key();
PackageSolvingData::HolderFundingOutput(HolderFundingOutput::build(
Expand Down
7 changes: 3 additions & 4 deletions lightning/src/ln/async_signer_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1244,12 +1244,11 @@ fn do_test_closing_signed(extra_closing_signed: bool, reconnect: bool) {
let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
let mut chan_lock = per_peer_state.get(&node_a_id).unwrap().lock().unwrap();
let channel = chan_lock.channel_by_id.get_mut(&chan_id).unwrap();
let (funding, context) = channel.funding_and_context_mut();

let signer = context.get_mut_signer().as_mut_ecdsa().unwrap();
let funded = channel.as_funded_mut().unwrap();
let signer = funded.context.get_mut_signer().as_mut_ecdsa().unwrap();
let signature = signer
.sign_closing_transaction(
&funding.channel_transaction_parameters,
&funded.funding.channel_transaction_parameters,
&closing_tx_2,
&Secp256k1::new(),
)
Expand Down
Loading
Loading