Support scalar tweak to rotate holder funding key during splicing#3624

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

Merged
TheBlueMatt merged 1 commit into from
Mar 6, 2025
Merged

Support scalar tweak to rotate holder funding key during splicing #3624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1359,8 +1359,9 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
) -> ChannelMonitor<Signer> {

assert!(commitment_transaction_number_obscure_factor <= (1 << 48));
let holder_pubkeys = &channel_parameters.holder_pubkeys;
let counterparty_payment_script = chan_utils::get_counterparty_payment_script(
&channel_parameters.channel_type_features, &keys.pubkeys().payment_point
&channel_parameters.channel_type_features, &holder_pubkeys.payment_point
);

let counterparty_channel_parameters = channel_parameters.counterparty_parameters.as_ref().unwrap();
Expand All@@ -1369,7 +1370,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
let counterparty_commitment_params = CounterpartyCommitmentParameters { counterparty_delayed_payment_base_key, counterparty_htlc_base_key, on_counterparty_tx_csv };

let channel_keys_id = keys.channel_keys_id();
let holder_revocation_basepoint = keys.pubkeys().revocation_basepoint;
let holder_revocation_basepoint = holder_pubkeys.revocation_basepoint;

// block for Rust 1.34 compat
let (holder_commitment_tx, current_holder_commitment_number) = {
Expand DownExpand Up@@ -5417,6 +5418,7 @@ mod tests {
selected_contest_delay: 67,
}),
funding_outpoint: Some(funding_outpoint),
splice_parent_funding_txid: None,
channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
channel_value_satoshis: 0,
};
Expand DownExpand Up@@ -5669,6 +5671,7 @@ mod tests {
selected_contest_delay: 67,
}),
funding_outpoint: Some(funding_outpoint),
splice_parent_funding_txid: None,
channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
channel_value_satoshis: 0,
};
Expand Down
1 change: 1 addition & 0 deletions lightning/src/chain/onchaintx.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1352,6 +1352,7 @@ mod tests {
selected_contest_delay: 67,
}),
funding_outpoint: Some(funding_outpoint),
splice_parent_funding_txid: None,
channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
channel_value_satoshis: 0,
};
Expand Down
60 changes: 56 additions & 4 deletions lightning/src/chain/package.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -605,7 +605,20 @@ impl PackageSolvingData {
let channel_parameters = &onchain_handler.channel_transaction_parameters;
match self {
PackageSolvingData::RevokedOutput(ref outp) => {
let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
let directed_parameters =
&onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
debug_assert_eq!(
directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
outp.counterparty_delayed_payment_base_key,
);
debug_assert_eq!(
directed_parameters.broadcaster_pubkeys().htlc_basepoint,
outp.counterparty_htlc_base_key,
);
let chan_keys = TxCreationKeys::from_channel_static_keys(
&outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
);
let witness_script = chan_utils::get_revokeable_redeemscript(&chan_keys.revocation_key, outp.on_counterparty_tx_csv, &chan_keys.broadcaster_delayed_payment_key);
//TODO: should we panic on signer failure ?
if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_output(channel_parameters, &bumped_tx, i, outp.amount.to_sat(), &outp.per_commitment_key, &onchain_handler.secp_ctx) {
Expand All@@ -617,7 +630,20 @@ impl PackageSolvingData {
} else { return false; }
},
PackageSolvingData::RevokedHTLCOutput(ref outp) => {
let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
let directed_parameters =
&onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
debug_assert_eq!(
directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
outp.counterparty_delayed_payment_base_key,
);
debug_assert_eq!(
directed_parameters.broadcaster_pubkeys().htlc_basepoint,
outp.counterparty_htlc_base_key,
);
let chan_keys = TxCreationKeys::from_channel_static_keys(
&outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
);
let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);
//TODO: should we panic on signer failure ?
if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_htlc(channel_parameters, &bumped_tx, i, outp.amount, &outp.per_commitment_key, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -629,7 +655,20 @@ impl PackageSolvingData {
} else { return false; }
},
PackageSolvingData::CounterpartyOfferedHTLCOutput(ref outp) => {
let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
let directed_parameters =
&onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
debug_assert_eq!(
directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
outp.counterparty_delayed_payment_base_key,
);
debug_assert_eq!(
directed_parameters.broadcaster_pubkeys().htlc_basepoint,
outp.counterparty_htlc_base_key,
);
let chan_keys = TxCreationKeys::from_channel_static_keys(
&outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
);
let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -641,7 +680,20 @@ impl PackageSolvingData {
}
},
PackageSolvingData::CounterpartyReceivedHTLCOutput(ref outp) => {
let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
let directed_parameters =
&onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
debug_assert_eq!(
directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
outp.counterparty_delayed_payment_base_key,
);
debug_assert_eq!(
directed_parameters.broadcaster_pubkeys().htlc_basepoint,
outp.counterparty_htlc_base_key,
);
let chan_keys = TxCreationKeys::from_channel_static_keys(
&outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
);
let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand Down
30 changes: 25 additions & 5 deletions lightning/src/ln/chan_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -880,6 +880,17 @@ pub struct ChannelTransactionParameters {
pub counterparty_parameters: Option<CounterpartyChannelTransactionParameters>,
/// The late-bound funding outpoint
pub funding_outpoint: Option<chain::transaction::OutPoint>,
/// The parent funding txid for a channel that has been spliced.
///
/// If a channel was funded with transaction A, and later spliced with transaction B, this field
/// tracks the txid of transaction A.
///
/// See [`compute_funding_key_tweak`] and [`ChannelSigner::pubkeys`] for more context on how
/// this may be used.
///
/// [`compute_funding_key_tweak`]: crate::sign::compute_funding_key_tweak
/// [`ChannelSigner::pubkeys`]: crate::sign::ChannelSigner::pubkeys
pub splice_parent_funding_txid: Option<Txid>,
/// This channel's type, as negotiated during channel open. For old objects where this field
/// wasn't serialized, it will default to static_remote_key at deserialization.
pub channel_type_features: ChannelTypeFeatures,
Expand DownExpand Up@@ -963,6 +974,7 @@ impl ChannelTransactionParameters {
funding_outpoint: Some(chain::transaction::OutPoint {
txid: Txid::from_byte_array([42; 32]), index: 0
}),
splice_parent_funding_txid: None,
channel_type_features: ChannelTypeFeatures::empty(),
channel_value_satoshis,
}
Expand All@@ -985,6 +997,7 @@ impl Writeable for ChannelTransactionParameters {
(8, self.funding_outpoint, option),
(10, legacy_deserialization_prevention_marker, option),
(11, self.channel_type_features, required),
(12, self.splice_parent_funding_txid, option),

@tankyleotankyleoMar 4, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking myself: once a user has made a splice, we cannot downgrade to some release before this commit here - that's why we assign an even field ?

@wpaulinowpaulinoMar 4, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct

(13, self.channel_value_satoshis, required),
});
Ok(())
Expand All@@ -998,6 +1011,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
let mut is_outbound_from_holder = RequiredWrapper(None);
let mut counterparty_parameters = None;
let mut funding_outpoint = None;
let mut splice_parent_funding_txid = None;
let mut _legacy_deserialization_prevention_marker: Option<()> = None;
let mut channel_type_features = None;
let mut channel_value_satoshis = None;
Expand All@@ -1010,6 +1024,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
(8, funding_outpoint, option),
(10, _legacy_deserialization_prevention_marker, option),
(11, channel_type_features, option),
(12, splice_parent_funding_txid, option),
(13, channel_value_satoshis, option),
});

Expand All@@ -1028,6 +1043,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
is_outbound_from_holder: is_outbound_from_holder.0.unwrap(),
counterparty_parameters,
funding_outpoint,
splice_parent_funding_txid,
channel_type_features: channel_type_features.unwrap_or(ChannelTypeFeatures::only_static_remote_key()),
channel_value_satoshis,
})
Expand DownExpand Up@@ -1154,6 +1170,7 @@ impl HolderCommitmentTransaction {
is_outbound_from_holder: false,
counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: channel_pubkeys.clone(), selected_contest_delay: 0 }),
funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
splice_parent_funding_txid: None,
channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
channel_value_satoshis,
};
Expand DownExpand Up@@ -1953,22 +1970,25 @@ mod tests {
let keys_provider = test_utils::TestKeysInterface::new(&seed, network);
let signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(false, 0));
let counterparty_signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(true, 1));
let delayed_payment_base = &signer.pubkeys().delayed_payment_basepoint;
let per_commitment_secret = SecretKey::from_slice(&<Vec<u8>>::from_hex("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
let htlc_basepoint = &signer.pubkeys().htlc_basepoint;
let holder_pubkeys = signer.pubkeys();
let counterparty_pubkeys = counterparty_signer.pubkeys().clone();
let keys = TxCreationKeys::derive_new(&secp_ctx, &per_commitment_point, delayed_payment_base, htlc_basepoint, &counterparty_pubkeys.revocation_basepoint, &counterparty_pubkeys.htlc_basepoint);
let holder_pubkeys = signer.pubkeys(None, &secp_ctx);
let counterparty_pubkeys = counterparty_signer.pubkeys(None, &secp_ctx).clone();
let channel_parameters = ChannelTransactionParameters {
holder_pubkeys: holder_pubkeys.clone(),
holder_selected_contest_delay: 0,
is_outbound_from_holder: false,
counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: counterparty_pubkeys.clone(), selected_contest_delay: 0 }),
funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
splice_parent_funding_txid: None,
channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
channel_value_satoshis: 3000,
};
let directed_parameters = channel_parameters.as_holder_broadcastable();
let keys = TxCreationKeys::from_channel_static_keys(
&per_commitment_point, directed_parameters.broadcaster_pubkeys(),
directed_parameters.countersignatory_pubkeys(), &secp_ctx,
);
let htlcs_with_aux = Vec::new();

Self {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Support scalar tweak to rotate holder funding key during splicing#3624

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

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 6, 2025
 Merged


Support scalar tweak to rotate holder funding key during splicing
#3624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1359,8 +1359,9 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
	) -> ChannelMonitor<Signer> {

 assert!(commitment_transaction_number_obscure_factor <= (1 << 48));
 let holder_pubkeys = &channel_parameters.holder_pubkeys;
 let counterparty_payment_script = chan_utils::get_counterparty_payment_script(
 &channel_parameters.channel_type_features, &keys.pubkeys().payment_point
 &channel_parameters.channel_type_features, &holder_pubkeys.payment_point
 );

 let counterparty_channel_parameters = channel_parameters.counterparty_parameters.as_ref().unwrap();
Expand All@@ -1369,7 +1370,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 let counterparty_commitment_params = CounterpartyCommitmentParameters { counterparty_delayed_payment_base_key, counterparty_htlc_base_key, on_counterparty_tx_csv };

 let channel_keys_id = keys.channel_keys_id();
 let holder_revocation_basepoint = keys.pubkeys().revocation_basepoint;
 let holder_revocation_basepoint = holder_pubkeys.revocation_basepoint;

 // block for Rust 1.34 compat
 let (holder_commitment_tx, current_holder_commitment_number) = {
Expand DownExpand Up@@ -5417,6 +5418,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand DownExpand Up@@ -5669,6 +5671,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1352,6 +1352,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

60 changes: 56 additions & 4 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -605,7 +605,20 @@ impl PackageSolvingData {
 let channel_parameters = &onchain_handler.channel_transaction_parameters;
 match self {
 PackageSolvingData::RevokedOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_revokeable_redeemscript(&chan_keys.revocation_key, outp.on_counterparty_tx_csv, &chan_keys.broadcaster_delayed_payment_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_output(channel_parameters, &bumped_tx, i, outp.amount.to_sat(), &outp.per_commitment_key, &onchain_handler.secp_ctx) {
Expand All@@ -617,7 +630,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::RevokedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_htlc(channel_parameters, &bumped_tx, i, outp.amount, &outp.per_commitment_key, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -629,7 +655,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::CounterpartyOfferedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -641,7 +680,20 @@ impl PackageSolvingData {
 }
 },
 PackageSolvingData::CounterpartyReceivedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand Down

30 changes: 25 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -880,6 +880,17 @@ pub struct ChannelTransactionParameters {
	pub counterparty_parameters: Option<CounterpartyChannelTransactionParameters>,
	/// The late-bound funding outpoint
	pub funding_outpoint: Option<chain::transaction::OutPoint>,
	/// The parent funding txid for a channel that has been spliced.
	///
	/// If a channel was funded with transaction A, and later spliced with transaction B, this field
	/// tracks the txid of transaction A.
	///
	/// See [`compute_funding_key_tweak`] and [`ChannelSigner::pubkeys`] for more context on how
	/// this may be used.
	///
	/// [`compute_funding_key_tweak`]: crate::sign::compute_funding_key_tweak
	/// [`ChannelSigner::pubkeys`]: crate::sign::ChannelSigner::pubkeys
	pub splice_parent_funding_txid: Option<Txid>,
	/// This channel's type, as negotiated during channel open. For old objects where this field
	/// wasn't serialized, it will default to static_remote_key at deserialization.
	pub channel_type_features: ChannelTypeFeatures,
Expand DownExpand Up@@ -963,6 +974,7 @@ impl ChannelTransactionParameters {
 funding_outpoint: Some(chain::transaction::OutPoint {
 txid: Txid::from_byte_array([42; 32]), index: 0
 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::empty(),
 channel_value_satoshis,
 }
Expand All@@ -985,6 +997,7 @@ impl Writeable for ChannelTransactionParameters {
 (8, self.funding_outpoint, option),
 (10, legacy_deserialization_prevention_marker, option),
 (11, self.channel_type_features, required),
 (12, self.splice_parent_funding_txid, option),
@tankyleotankyleoMar 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking myself: once a user has made a splice, we cannot downgrade to some release before this commit here - that's why we assign an even field ?
@wpaulinowpaulinoMar 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct
 (13, self.channel_value_satoshis, required),
 });
 Ok(())
Expand All@@ -998,6 +1011,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 let mut is_outbound_from_holder = RequiredWrapper(None);
 let mut counterparty_parameters = None;
 let mut funding_outpoint = None;
 let mut splice_parent_funding_txid = None;
 let mut _legacy_deserialization_prevention_marker: Option<()> = None;
 let mut channel_type_features = None;
 let mut channel_value_satoshis = None;
Expand All@@ -1010,6 +1024,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 (8, funding_outpoint, option),
 (10, _legacy_deserialization_prevention_marker, option),
 (11, channel_type_features, option),
 (12, splice_parent_funding_txid, option),
 (13, channel_value_satoshis, option),
 });

Expand All@@ -1028,6 +1043,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 is_outbound_from_holder: is_outbound_from_holder.0.unwrap(),
 counterparty_parameters,
 funding_outpoint,
 splice_parent_funding_txid,
 channel_type_features: channel_type_features.unwrap_or(ChannelTypeFeatures::only_static_remote_key()),
 channel_value_satoshis,
 })
Expand DownExpand Up@@ -1154,6 +1170,7 @@ impl HolderCommitmentTransaction {
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: channel_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis,
 };
Expand DownExpand Up@@ -1953,22 +1970,25 @@ mod tests {
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);
 let signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(false, 0));
 let counterparty_signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(true, 1));
 let delayed_payment_base = &signer.pubkeys().delayed_payment_basepoint;
 let per_commitment_secret = SecretKey::from_slice(&<Vec<u8>>::from_hex("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
 let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
 let htlc_basepoint = &signer.pubkeys().htlc_basepoint;
 let holder_pubkeys = signer.pubkeys();
 let counterparty_pubkeys = counterparty_signer.pubkeys().clone();
 let keys = TxCreationKeys::derive_new(&secp_ctx, &per_commitment_point, delayed_payment_base, htlc_basepoint, &counterparty_pubkeys.revocation_basepoint, &counterparty_pubkeys.htlc_basepoint);
 let holder_pubkeys = signer.pubkeys(None, &secp_ctx);
 let counterparty_pubkeys = counterparty_signer.pubkeys(None, &secp_ctx).clone();
 let channel_parameters = ChannelTransactionParameters {
 holder_pubkeys: holder_pubkeys.clone(),
 holder_selected_contest_delay: 0,
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: counterparty_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 3000,
 };
 let directed_parameters = channel_parameters.as_holder_broadcastable();
 let keys = TxCreationKeys::from_channel_static_keys(
 &per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &secp_ctx,
 );
 let htlcs_with_aux = Vec::new();

 Self {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support scalar tweak to rotate holder funding key during splicing#3624

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

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 6, 2025
 Merged


Support scalar tweak to rotate holder funding key during splicing
#3624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1359,8 +1359,9 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
	) -> ChannelMonitor<Signer> {

 assert!(commitment_transaction_number_obscure_factor <= (1 << 48));
 let holder_pubkeys = &channel_parameters.holder_pubkeys;
 let counterparty_payment_script = chan_utils::get_counterparty_payment_script(
 &channel_parameters.channel_type_features, &keys.pubkeys().payment_point
 &channel_parameters.channel_type_features, &holder_pubkeys.payment_point
 );

 let counterparty_channel_parameters = channel_parameters.counterparty_parameters.as_ref().unwrap();
Expand All@@ -1369,7 +1370,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 let counterparty_commitment_params = CounterpartyCommitmentParameters { counterparty_delayed_payment_base_key, counterparty_htlc_base_key, on_counterparty_tx_csv };

 let channel_keys_id = keys.channel_keys_id();
 let holder_revocation_basepoint = keys.pubkeys().revocation_basepoint;
 let holder_revocation_basepoint = holder_pubkeys.revocation_basepoint;

 // block for Rust 1.34 compat
 let (holder_commitment_tx, current_holder_commitment_number) = {
Expand DownExpand Up@@ -5417,6 +5418,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand DownExpand Up@@ -5669,6 +5671,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1352,6 +1352,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

60 changes: 56 additions & 4 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -605,7 +605,20 @@ impl PackageSolvingData {
 let channel_parameters = &onchain_handler.channel_transaction_parameters;
 match self {
 PackageSolvingData::RevokedOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_revokeable_redeemscript(&chan_keys.revocation_key, outp.on_counterparty_tx_csv, &chan_keys.broadcaster_delayed_payment_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_output(channel_parameters, &bumped_tx, i, outp.amount.to_sat(), &outp.per_commitment_key, &onchain_handler.secp_ctx) {
Expand All@@ -617,7 +630,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::RevokedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_htlc(channel_parameters, &bumped_tx, i, outp.amount, &outp.per_commitment_key, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -629,7 +655,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::CounterpartyOfferedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -641,7 +680,20 @@ impl PackageSolvingData {
 }
 },
 PackageSolvingData::CounterpartyReceivedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand Down

30 changes: 25 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -880,6 +880,17 @@ pub struct ChannelTransactionParameters {
	pub counterparty_parameters: Option<CounterpartyChannelTransactionParameters>,
	/// The late-bound funding outpoint
	pub funding_outpoint: Option<chain::transaction::OutPoint>,
	/// The parent funding txid for a channel that has been spliced.
	///
	/// If a channel was funded with transaction A, and later spliced with transaction B, this field
	/// tracks the txid of transaction A.
	///
	/// See [`compute_funding_key_tweak`] and [`ChannelSigner::pubkeys`] for more context on how
	/// this may be used.
	///
	/// [`compute_funding_key_tweak`]: crate::sign::compute_funding_key_tweak
	/// [`ChannelSigner::pubkeys`]: crate::sign::ChannelSigner::pubkeys
	pub splice_parent_funding_txid: Option<Txid>,
	/// This channel's type, as negotiated during channel open. For old objects where this field
	/// wasn't serialized, it will default to static_remote_key at deserialization.
	pub channel_type_features: ChannelTypeFeatures,
Expand DownExpand Up@@ -963,6 +974,7 @@ impl ChannelTransactionParameters {
 funding_outpoint: Some(chain::transaction::OutPoint {
 txid: Txid::from_byte_array([42; 32]), index: 0
 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::empty(),
 channel_value_satoshis,
 }
Expand All@@ -985,6 +997,7 @@ impl Writeable for ChannelTransactionParameters {
 (8, self.funding_outpoint, option),
 (10, legacy_deserialization_prevention_marker, option),
 (11, self.channel_type_features, required),
 (12, self.splice_parent_funding_txid, option),
@tankyleotankyleoMar 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking myself: once a user has made a splice, we cannot downgrade to some release before this commit here - that's why we assign an even field ?
@wpaulinowpaulinoMar 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct
 (13, self.channel_value_satoshis, required),
 });
 Ok(())
Expand All@@ -998,6 +1011,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 let mut is_outbound_from_holder = RequiredWrapper(None);
 let mut counterparty_parameters = None;
 let mut funding_outpoint = None;
 let mut splice_parent_funding_txid = None;
 let mut _legacy_deserialization_prevention_marker: Option<()> = None;
 let mut channel_type_features = None;
 let mut channel_value_satoshis = None;
Expand All@@ -1010,6 +1024,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 (8, funding_outpoint, option),
 (10, _legacy_deserialization_prevention_marker, option),
 (11, channel_type_features, option),
 (12, splice_parent_funding_txid, option),
 (13, channel_value_satoshis, option),
 });

Expand All@@ -1028,6 +1043,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 is_outbound_from_holder: is_outbound_from_holder.0.unwrap(),
 counterparty_parameters,
 funding_outpoint,
 splice_parent_funding_txid,
 channel_type_features: channel_type_features.unwrap_or(ChannelTypeFeatures::only_static_remote_key()),
 channel_value_satoshis,
 })
Expand DownExpand Up@@ -1154,6 +1170,7 @@ impl HolderCommitmentTransaction {
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: channel_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis,
 };
Expand DownExpand Up@@ -1953,22 +1970,25 @@ mod tests {
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);
 let signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(false, 0));
 let counterparty_signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(true, 1));
 let delayed_payment_base = &signer.pubkeys().delayed_payment_basepoint;
 let per_commitment_secret = SecretKey::from_slice(&<Vec<u8>>::from_hex("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
 let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
 let htlc_basepoint = &signer.pubkeys().htlc_basepoint;
 let holder_pubkeys = signer.pubkeys();
 let counterparty_pubkeys = counterparty_signer.pubkeys().clone();
 let keys = TxCreationKeys::derive_new(&secp_ctx, &per_commitment_point, delayed_payment_base, htlc_basepoint, &counterparty_pubkeys.revocation_basepoint, &counterparty_pubkeys.htlc_basepoint);
 let holder_pubkeys = signer.pubkeys(None, &secp_ctx);
 let counterparty_pubkeys = counterparty_signer.pubkeys(None, &secp_ctx).clone();
 let channel_parameters = ChannelTransactionParameters {
 holder_pubkeys: holder_pubkeys.clone(),
 holder_selected_contest_delay: 0,
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: counterparty_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 3000,
 };
 let directed_parameters = channel_parameters.as_holder_broadcastable();
 let keys = TxCreationKeys::from_channel_static_keys(
 &per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &secp_ctx,
 );
 let htlcs_with_aux = Vec::new();

 Self {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support scalar tweak to rotate holder funding key during splicing#3624

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

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 6, 2025
 Merged


Support scalar tweak to rotate holder funding key during splicing
#3624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1359,8 +1359,9 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
	) -> ChannelMonitor<Signer> {

 assert!(commitment_transaction_number_obscure_factor <= (1 << 48));
 let holder_pubkeys = &channel_parameters.holder_pubkeys;
 let counterparty_payment_script = chan_utils::get_counterparty_payment_script(
 &channel_parameters.channel_type_features, &keys.pubkeys().payment_point
 &channel_parameters.channel_type_features, &holder_pubkeys.payment_point
 );

 let counterparty_channel_parameters = channel_parameters.counterparty_parameters.as_ref().unwrap();
Expand All@@ -1369,7 +1370,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 let counterparty_commitment_params = CounterpartyCommitmentParameters { counterparty_delayed_payment_base_key, counterparty_htlc_base_key, on_counterparty_tx_csv };

 let channel_keys_id = keys.channel_keys_id();
 let holder_revocation_basepoint = keys.pubkeys().revocation_basepoint;
 let holder_revocation_basepoint = holder_pubkeys.revocation_basepoint;

 // block for Rust 1.34 compat
 let (holder_commitment_tx, current_holder_commitment_number) = {
Expand DownExpand Up@@ -5417,6 +5418,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand DownExpand Up@@ -5669,6 +5671,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1352,6 +1352,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

60 changes: 56 additions & 4 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -605,7 +605,20 @@ impl PackageSolvingData {
 let channel_parameters = &onchain_handler.channel_transaction_parameters;
 match self {
 PackageSolvingData::RevokedOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_revokeable_redeemscript(&chan_keys.revocation_key, outp.on_counterparty_tx_csv, &chan_keys.broadcaster_delayed_payment_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_output(channel_parameters, &bumped_tx, i, outp.amount.to_sat(), &outp.per_commitment_key, &onchain_handler.secp_ctx) {
Expand All@@ -617,7 +630,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::RevokedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_htlc(channel_parameters, &bumped_tx, i, outp.amount, &outp.per_commitment_key, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -629,7 +655,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::CounterpartyOfferedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -641,7 +680,20 @@ impl PackageSolvingData {
 }
 },
 PackageSolvingData::CounterpartyReceivedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand Down

30 changes: 25 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -880,6 +880,17 @@ pub struct ChannelTransactionParameters {
	pub counterparty_parameters: Option<CounterpartyChannelTransactionParameters>,
	/// The late-bound funding outpoint
	pub funding_outpoint: Option<chain::transaction::OutPoint>,
	/// The parent funding txid for a channel that has been spliced.
	///
	/// If a channel was funded with transaction A, and later spliced with transaction B, this field
	/// tracks the txid of transaction A.
	///
	/// See [`compute_funding_key_tweak`] and [`ChannelSigner::pubkeys`] for more context on how
	/// this may be used.
	///
	/// [`compute_funding_key_tweak`]: crate::sign::compute_funding_key_tweak
	/// [`ChannelSigner::pubkeys`]: crate::sign::ChannelSigner::pubkeys
	pub splice_parent_funding_txid: Option<Txid>,
	/// This channel's type, as negotiated during channel open. For old objects where this field
	/// wasn't serialized, it will default to static_remote_key at deserialization.
	pub channel_type_features: ChannelTypeFeatures,
Expand DownExpand Up@@ -963,6 +974,7 @@ impl ChannelTransactionParameters {
 funding_outpoint: Some(chain::transaction::OutPoint {
 txid: Txid::from_byte_array([42; 32]), index: 0
 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::empty(),
 channel_value_satoshis,
 }
Expand All@@ -985,6 +997,7 @@ impl Writeable for ChannelTransactionParameters {
 (8, self.funding_outpoint, option),
 (10, legacy_deserialization_prevention_marker, option),
 (11, self.channel_type_features, required),
 (12, self.splice_parent_funding_txid, option),
@tankyleotankyleoMar 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking myself: once a user has made a splice, we cannot downgrade to some release before this commit here - that's why we assign an even field ?
@wpaulinowpaulinoMar 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct
 (13, self.channel_value_satoshis, required),
 });
 Ok(())
Expand All@@ -998,6 +1011,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 let mut is_outbound_from_holder = RequiredWrapper(None);
 let mut counterparty_parameters = None;
 let mut funding_outpoint = None;
 let mut splice_parent_funding_txid = None;
 let mut _legacy_deserialization_prevention_marker: Option<()> = None;
 let mut channel_type_features = None;
 let mut channel_value_satoshis = None;
Expand All@@ -1010,6 +1024,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 (8, funding_outpoint, option),
 (10, _legacy_deserialization_prevention_marker, option),
 (11, channel_type_features, option),
 (12, splice_parent_funding_txid, option),
 (13, channel_value_satoshis, option),
 });

Expand All@@ -1028,6 +1043,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 is_outbound_from_holder: is_outbound_from_holder.0.unwrap(),
 counterparty_parameters,
 funding_outpoint,
 splice_parent_funding_txid,
 channel_type_features: channel_type_features.unwrap_or(ChannelTypeFeatures::only_static_remote_key()),
 channel_value_satoshis,
 })
Expand DownExpand Up@@ -1154,6 +1170,7 @@ impl HolderCommitmentTransaction {
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: channel_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis,
 };
Expand DownExpand Up@@ -1953,22 +1970,25 @@ mod tests {
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);
 let signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(false, 0));
 let counterparty_signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(true, 1));
 let delayed_payment_base = &signer.pubkeys().delayed_payment_basepoint;
 let per_commitment_secret = SecretKey::from_slice(&<Vec<u8>>::from_hex("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
 let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
 let htlc_basepoint = &signer.pubkeys().htlc_basepoint;
 let holder_pubkeys = signer.pubkeys();
 let counterparty_pubkeys = counterparty_signer.pubkeys().clone();
 let keys = TxCreationKeys::derive_new(&secp_ctx, &per_commitment_point, delayed_payment_base, htlc_basepoint, &counterparty_pubkeys.revocation_basepoint, &counterparty_pubkeys.htlc_basepoint);
 let holder_pubkeys = signer.pubkeys(None, &secp_ctx);
 let counterparty_pubkeys = counterparty_signer.pubkeys(None, &secp_ctx).clone();
 let channel_parameters = ChannelTransactionParameters {
 holder_pubkeys: holder_pubkeys.clone(),
 holder_selected_contest_delay: 0,
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: counterparty_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 3000,
 };
 let directed_parameters = channel_parameters.as_holder_broadcastable();
 let keys = TxCreationKeys::from_channel_static_keys(
 &per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &secp_ctx,
 );
 let htlcs_with_aux = Vec::new();

 Self {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Support scalar tweak to rotate holder funding key during splicing#3624

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

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 6, 2025
 Merged


Support scalar tweak to rotate holder funding key during splicing
#3624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1359,8 +1359,9 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
	) -> ChannelMonitor<Signer> {

 assert!(commitment_transaction_number_obscure_factor <= (1 << 48));
 let holder_pubkeys = &channel_parameters.holder_pubkeys;
 let counterparty_payment_script = chan_utils::get_counterparty_payment_script(
 &channel_parameters.channel_type_features, &keys.pubkeys().payment_point
 &channel_parameters.channel_type_features, &holder_pubkeys.payment_point
 );

 let counterparty_channel_parameters = channel_parameters.counterparty_parameters.as_ref().unwrap();
Expand All@@ -1369,7 +1370,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 let counterparty_commitment_params = CounterpartyCommitmentParameters { counterparty_delayed_payment_base_key, counterparty_htlc_base_key, on_counterparty_tx_csv };

 let channel_keys_id = keys.channel_keys_id();
 let holder_revocation_basepoint = keys.pubkeys().revocation_basepoint;
 let holder_revocation_basepoint = holder_pubkeys.revocation_basepoint;

 // block for Rust 1.34 compat
 let (holder_commitment_tx, current_holder_commitment_number) = {
Expand DownExpand Up@@ -5417,6 +5418,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand DownExpand Up@@ -5669,6 +5671,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1352,6 +1352,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

60 changes: 56 additions & 4 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -605,7 +605,20 @@ impl PackageSolvingData {
 let channel_parameters = &onchain_handler.channel_transaction_parameters;
 match self {
 PackageSolvingData::RevokedOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_revokeable_redeemscript(&chan_keys.revocation_key, outp.on_counterparty_tx_csv, &chan_keys.broadcaster_delayed_payment_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_output(channel_parameters, &bumped_tx, i, outp.amount.to_sat(), &outp.per_commitment_key, &onchain_handler.secp_ctx) {
Expand All@@ -617,7 +630,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::RevokedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_htlc(channel_parameters, &bumped_tx, i, outp.amount, &outp.per_commitment_key, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -629,7 +655,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::CounterpartyOfferedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -641,7 +680,20 @@ impl PackageSolvingData {
 }
 },
 PackageSolvingData::CounterpartyReceivedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand Down

30 changes: 25 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -880,6 +880,17 @@ pub struct ChannelTransactionParameters {
	pub counterparty_parameters: Option<CounterpartyChannelTransactionParameters>,
	/// The late-bound funding outpoint
	pub funding_outpoint: Option<chain::transaction::OutPoint>,
	/// The parent funding txid for a channel that has been spliced.
	///
	/// If a channel was funded with transaction A, and later spliced with transaction B, this field
	/// tracks the txid of transaction A.
	///
	/// See [`compute_funding_key_tweak`] and [`ChannelSigner::pubkeys`] for more context on how
	/// this may be used.
	///
	/// [`compute_funding_key_tweak`]: crate::sign::compute_funding_key_tweak
	/// [`ChannelSigner::pubkeys`]: crate::sign::ChannelSigner::pubkeys
	pub splice_parent_funding_txid: Option<Txid>,
	/// This channel's type, as negotiated during channel open. For old objects where this field
	/// wasn't serialized, it will default to static_remote_key at deserialization.
	pub channel_type_features: ChannelTypeFeatures,
Expand DownExpand Up@@ -963,6 +974,7 @@ impl ChannelTransactionParameters {
 funding_outpoint: Some(chain::transaction::OutPoint {
 txid: Txid::from_byte_array([42; 32]), index: 0
 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::empty(),
 channel_value_satoshis,
 }
Expand All@@ -985,6 +997,7 @@ impl Writeable for ChannelTransactionParameters {
 (8, self.funding_outpoint, option),
 (10, legacy_deserialization_prevention_marker, option),
 (11, self.channel_type_features, required),
 (12, self.splice_parent_funding_txid, option),
@tankyleotankyleoMar 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking myself: once a user has made a splice, we cannot downgrade to some release before this commit here - that's why we assign an even field ?
@wpaulinowpaulinoMar 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct
 (13, self.channel_value_satoshis, required),
 });
 Ok(())
Expand All@@ -998,6 +1011,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 let mut is_outbound_from_holder = RequiredWrapper(None);
 let mut counterparty_parameters = None;
 let mut funding_outpoint = None;
 let mut splice_parent_funding_txid = None;
 let mut _legacy_deserialization_prevention_marker: Option<()> = None;
 let mut channel_type_features = None;
 let mut channel_value_satoshis = None;
Expand All@@ -1010,6 +1024,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 (8, funding_outpoint, option),
 (10, _legacy_deserialization_prevention_marker, option),
 (11, channel_type_features, option),
 (12, splice_parent_funding_txid, option),
 (13, channel_value_satoshis, option),
 });

Expand All@@ -1028,6 +1043,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 is_outbound_from_holder: is_outbound_from_holder.0.unwrap(),
 counterparty_parameters,
 funding_outpoint,
 splice_parent_funding_txid,
 channel_type_features: channel_type_features.unwrap_or(ChannelTypeFeatures::only_static_remote_key()),
 channel_value_satoshis,
 })
Expand DownExpand Up@@ -1154,6 +1170,7 @@ impl HolderCommitmentTransaction {
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: channel_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis,
 };
Expand DownExpand Up@@ -1953,22 +1970,25 @@ mod tests {
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);
 let signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(false, 0));
 let counterparty_signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(true, 1));
 let delayed_payment_base = &signer.pubkeys().delayed_payment_basepoint;
 let per_commitment_secret = SecretKey::from_slice(&<Vec<u8>>::from_hex("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
 let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
 let htlc_basepoint = &signer.pubkeys().htlc_basepoint;
 let holder_pubkeys = signer.pubkeys();
 let counterparty_pubkeys = counterparty_signer.pubkeys().clone();
 let keys = TxCreationKeys::derive_new(&secp_ctx, &per_commitment_point, delayed_payment_base, htlc_basepoint, &counterparty_pubkeys.revocation_basepoint, &counterparty_pubkeys.htlc_basepoint);
 let holder_pubkeys = signer.pubkeys(None, &secp_ctx);
 let counterparty_pubkeys = counterparty_signer.pubkeys(None, &secp_ctx).clone();
 let channel_parameters = ChannelTransactionParameters {
 holder_pubkeys: holder_pubkeys.clone(),
 holder_selected_contest_delay: 0,
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: counterparty_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 3000,
 };
 let directed_parameters = channel_parameters.as_holder_broadcastable();
 let keys = TxCreationKeys::from_channel_static_keys(
 &per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &secp_ctx,
 );
 let htlcs_with_aux = Vec::new();

 Self {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support scalar tweak to rotate holder funding key during splicing#3624

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

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 6, 2025
 Merged


Support scalar tweak to rotate holder funding key during splicing
#3624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1359,8 +1359,9 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
	) -> ChannelMonitor<Signer> {

 assert!(commitment_transaction_number_obscure_factor <= (1 << 48));
 let holder_pubkeys = &channel_parameters.holder_pubkeys;
 let counterparty_payment_script = chan_utils::get_counterparty_payment_script(
 &channel_parameters.channel_type_features, &keys.pubkeys().payment_point
 &channel_parameters.channel_type_features, &holder_pubkeys.payment_point
 );

 let counterparty_channel_parameters = channel_parameters.counterparty_parameters.as_ref().unwrap();
Expand All@@ -1369,7 +1370,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 let counterparty_commitment_params = CounterpartyCommitmentParameters { counterparty_delayed_payment_base_key, counterparty_htlc_base_key, on_counterparty_tx_csv };

 let channel_keys_id = keys.channel_keys_id();
 let holder_revocation_basepoint = keys.pubkeys().revocation_basepoint;
 let holder_revocation_basepoint = holder_pubkeys.revocation_basepoint;

 // block for Rust 1.34 compat
 let (holder_commitment_tx, current_holder_commitment_number) = {
Expand DownExpand Up@@ -5417,6 +5418,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand DownExpand Up@@ -5669,6 +5671,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1352,6 +1352,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

60 changes: 56 additions & 4 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -605,7 +605,20 @@ impl PackageSolvingData {
 let channel_parameters = &onchain_handler.channel_transaction_parameters;
 match self {
 PackageSolvingData::RevokedOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_revokeable_redeemscript(&chan_keys.revocation_key, outp.on_counterparty_tx_csv, &chan_keys.broadcaster_delayed_payment_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_output(channel_parameters, &bumped_tx, i, outp.amount.to_sat(), &outp.per_commitment_key, &onchain_handler.secp_ctx) {
Expand All@@ -617,7 +630,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::RevokedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_htlc(channel_parameters, &bumped_tx, i, outp.amount, &outp.per_commitment_key, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -629,7 +655,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::CounterpartyOfferedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -641,7 +680,20 @@ impl PackageSolvingData {
 }
 },
 PackageSolvingData::CounterpartyReceivedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand Down

30 changes: 25 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -880,6 +880,17 @@ pub struct ChannelTransactionParameters {
	pub counterparty_parameters: Option<CounterpartyChannelTransactionParameters>,
	/// The late-bound funding outpoint
	pub funding_outpoint: Option<chain::transaction::OutPoint>,
	/// The parent funding txid for a channel that has been spliced.
	///
	/// If a channel was funded with transaction A, and later spliced with transaction B, this field
	/// tracks the txid of transaction A.
	///
	/// See [`compute_funding_key_tweak`] and [`ChannelSigner::pubkeys`] for more context on how
	/// this may be used.
	///
	/// [`compute_funding_key_tweak`]: crate::sign::compute_funding_key_tweak
	/// [`ChannelSigner::pubkeys`]: crate::sign::ChannelSigner::pubkeys
	pub splice_parent_funding_txid: Option<Txid>,
	/// This channel's type, as negotiated during channel open. For old objects where this field
	/// wasn't serialized, it will default to static_remote_key at deserialization.
	pub channel_type_features: ChannelTypeFeatures,
Expand DownExpand Up@@ -963,6 +974,7 @@ impl ChannelTransactionParameters {
 funding_outpoint: Some(chain::transaction::OutPoint {
 txid: Txid::from_byte_array([42; 32]), index: 0
 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::empty(),
 channel_value_satoshis,
 }
Expand All@@ -985,6 +997,7 @@ impl Writeable for ChannelTransactionParameters {
 (8, self.funding_outpoint, option),
 (10, legacy_deserialization_prevention_marker, option),
 (11, self.channel_type_features, required),
 (12, self.splice_parent_funding_txid, option),
@tankyleotankyleoMar 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking myself: once a user has made a splice, we cannot downgrade to some release before this commit here - that's why we assign an even field ?
@wpaulinowpaulinoMar 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct
 (13, self.channel_value_satoshis, required),
 });
 Ok(())
Expand All@@ -998,6 +1011,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 let mut is_outbound_from_holder = RequiredWrapper(None);
 let mut counterparty_parameters = None;
 let mut funding_outpoint = None;
 let mut splice_parent_funding_txid = None;
 let mut _legacy_deserialization_prevention_marker: Option<()> = None;
 let mut channel_type_features = None;
 let mut channel_value_satoshis = None;
Expand All@@ -1010,6 +1024,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 (8, funding_outpoint, option),
 (10, _legacy_deserialization_prevention_marker, option),
 (11, channel_type_features, option),
 (12, splice_parent_funding_txid, option),
 (13, channel_value_satoshis, option),
 });

Expand All@@ -1028,6 +1043,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 is_outbound_from_holder: is_outbound_from_holder.0.unwrap(),
 counterparty_parameters,
 funding_outpoint,
 splice_parent_funding_txid,
 channel_type_features: channel_type_features.unwrap_or(ChannelTypeFeatures::only_static_remote_key()),
 channel_value_satoshis,
 })
Expand DownExpand Up@@ -1154,6 +1170,7 @@ impl HolderCommitmentTransaction {
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: channel_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis,
 };
Expand DownExpand Up@@ -1953,22 +1970,25 @@ mod tests {
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);
 let signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(false, 0));
 let counterparty_signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(true, 1));
 let delayed_payment_base = &signer.pubkeys().delayed_payment_basepoint;
 let per_commitment_secret = SecretKey::from_slice(&<Vec<u8>>::from_hex("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
 let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
 let htlc_basepoint = &signer.pubkeys().htlc_basepoint;
 let holder_pubkeys = signer.pubkeys();
 let counterparty_pubkeys = counterparty_signer.pubkeys().clone();
 let keys = TxCreationKeys::derive_new(&secp_ctx, &per_commitment_point, delayed_payment_base, htlc_basepoint, &counterparty_pubkeys.revocation_basepoint, &counterparty_pubkeys.htlc_basepoint);
 let holder_pubkeys = signer.pubkeys(None, &secp_ctx);
 let counterparty_pubkeys = counterparty_signer.pubkeys(None, &secp_ctx).clone();
 let channel_parameters = ChannelTransactionParameters {
 holder_pubkeys: holder_pubkeys.clone(),
 holder_selected_contest_delay: 0,
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: counterparty_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 3000,
 };
 let directed_parameters = channel_parameters.as_holder_broadcastable();
 let keys = TxCreationKeys::from_channel_static_keys(
 &per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &secp_ctx,
 );
 let htlcs_with_aux = Vec::new();

 Self {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support scalar tweak to rotate holder funding key during splicing#3624

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

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 6, 2025
 Merged


Support scalar tweak to rotate holder funding key during splicing
#3624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1359,8 +1359,9 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
	) -> ChannelMonitor<Signer> {

 assert!(commitment_transaction_number_obscure_factor <= (1 << 48));
 let holder_pubkeys = &channel_parameters.holder_pubkeys;
 let counterparty_payment_script = chan_utils::get_counterparty_payment_script(
 &channel_parameters.channel_type_features, &keys.pubkeys().payment_point
 &channel_parameters.channel_type_features, &holder_pubkeys.payment_point
 );

 let counterparty_channel_parameters = channel_parameters.counterparty_parameters.as_ref().unwrap();
Expand All@@ -1369,7 +1370,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 let counterparty_commitment_params = CounterpartyCommitmentParameters { counterparty_delayed_payment_base_key, counterparty_htlc_base_key, on_counterparty_tx_csv };

 let channel_keys_id = keys.channel_keys_id();
 let holder_revocation_basepoint = keys.pubkeys().revocation_basepoint;
 let holder_revocation_basepoint = holder_pubkeys.revocation_basepoint;

 // block for Rust 1.34 compat
 let (holder_commitment_tx, current_holder_commitment_number) = {
Expand DownExpand Up@@ -5417,6 +5418,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand DownExpand Up@@ -5669,6 +5671,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1352,6 +1352,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

60 changes: 56 additions & 4 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -605,7 +605,20 @@ impl PackageSolvingData {
 let channel_parameters = &onchain_handler.channel_transaction_parameters;
 match self {
 PackageSolvingData::RevokedOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_revokeable_redeemscript(&chan_keys.revocation_key, outp.on_counterparty_tx_csv, &chan_keys.broadcaster_delayed_payment_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_output(channel_parameters, &bumped_tx, i, outp.amount.to_sat(), &outp.per_commitment_key, &onchain_handler.secp_ctx) {
Expand All@@ -617,7 +630,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::RevokedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_htlc(channel_parameters, &bumped_tx, i, outp.amount, &outp.per_commitment_key, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -629,7 +655,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::CounterpartyOfferedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -641,7 +680,20 @@ impl PackageSolvingData {
 }
 },
 PackageSolvingData::CounterpartyReceivedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand Down

30 changes: 25 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -880,6 +880,17 @@ pub struct ChannelTransactionParameters {
	pub counterparty_parameters: Option<CounterpartyChannelTransactionParameters>,
	/// The late-bound funding outpoint
	pub funding_outpoint: Option<chain::transaction::OutPoint>,
	/// The parent funding txid for a channel that has been spliced.
	///
	/// If a channel was funded with transaction A, and later spliced with transaction B, this field
	/// tracks the txid of transaction A.
	///
	/// See [`compute_funding_key_tweak`] and [`ChannelSigner::pubkeys`] for more context on how
	/// this may be used.
	///
	/// [`compute_funding_key_tweak`]: crate::sign::compute_funding_key_tweak
	/// [`ChannelSigner::pubkeys`]: crate::sign::ChannelSigner::pubkeys
	pub splice_parent_funding_txid: Option<Txid>,
	/// This channel's type, as negotiated during channel open. For old objects where this field
	/// wasn't serialized, it will default to static_remote_key at deserialization.
	pub channel_type_features: ChannelTypeFeatures,
Expand DownExpand Up@@ -963,6 +974,7 @@ impl ChannelTransactionParameters {
 funding_outpoint: Some(chain::transaction::OutPoint {
 txid: Txid::from_byte_array([42; 32]), index: 0
 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::empty(),
 channel_value_satoshis,
 }
Expand All@@ -985,6 +997,7 @@ impl Writeable for ChannelTransactionParameters {
 (8, self.funding_outpoint, option),
 (10, legacy_deserialization_prevention_marker, option),
 (11, self.channel_type_features, required),
 (12, self.splice_parent_funding_txid, option),
@tankyleotankyleoMar 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking myself: once a user has made a splice, we cannot downgrade to some release before this commit here - that's why we assign an even field ?
@wpaulinowpaulinoMar 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct
 (13, self.channel_value_satoshis, required),
 });
 Ok(())
Expand All@@ -998,6 +1011,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 let mut is_outbound_from_holder = RequiredWrapper(None);
 let mut counterparty_parameters = None;
 let mut funding_outpoint = None;
 let mut splice_parent_funding_txid = None;
 let mut _legacy_deserialization_prevention_marker: Option<()> = None;
 let mut channel_type_features = None;
 let mut channel_value_satoshis = None;
Expand All@@ -1010,6 +1024,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 (8, funding_outpoint, option),
 (10, _legacy_deserialization_prevention_marker, option),
 (11, channel_type_features, option),
 (12, splice_parent_funding_txid, option),
 (13, channel_value_satoshis, option),
 });

Expand All@@ -1028,6 +1043,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 is_outbound_from_holder: is_outbound_from_holder.0.unwrap(),
 counterparty_parameters,
 funding_outpoint,
 splice_parent_funding_txid,
 channel_type_features: channel_type_features.unwrap_or(ChannelTypeFeatures::only_static_remote_key()),
 channel_value_satoshis,
 })
Expand DownExpand Up@@ -1154,6 +1170,7 @@ impl HolderCommitmentTransaction {
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: channel_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis,
 };
Expand DownExpand Up@@ -1953,22 +1970,25 @@ mod tests {
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);
 let signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(false, 0));
 let counterparty_signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(true, 1));
 let delayed_payment_base = &signer.pubkeys().delayed_payment_basepoint;
 let per_commitment_secret = SecretKey::from_slice(&<Vec<u8>>::from_hex("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
 let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
 let htlc_basepoint = &signer.pubkeys().htlc_basepoint;
 let holder_pubkeys = signer.pubkeys();
 let counterparty_pubkeys = counterparty_signer.pubkeys().clone();
 let keys = TxCreationKeys::derive_new(&secp_ctx, &per_commitment_point, delayed_payment_base, htlc_basepoint, &counterparty_pubkeys.revocation_basepoint, &counterparty_pubkeys.htlc_basepoint);
 let holder_pubkeys = signer.pubkeys(None, &secp_ctx);
 let counterparty_pubkeys = counterparty_signer.pubkeys(None, &secp_ctx).clone();
 let channel_parameters = ChannelTransactionParameters {
 holder_pubkeys: holder_pubkeys.clone(),
 holder_selected_contest_delay: 0,
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: counterparty_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 3000,
 };
 let directed_parameters = channel_parameters.as_holder_broadcastable();
 let keys = TxCreationKeys::from_channel_static_keys(
 &per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &secp_ctx,
 );
 let htlcs_with_aux = Vec::new();

 Self {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Support scalar tweak to rotate holder funding key during splicing#3624

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

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 6, 2025
 Merged


Support scalar tweak to rotate holder funding key during splicing
#3624
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1359,8 +1359,9 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
	) -> ChannelMonitor<Signer> {

 assert!(commitment_transaction_number_obscure_factor <= (1 << 48));
 let holder_pubkeys = &channel_parameters.holder_pubkeys;
 let counterparty_payment_script = chan_utils::get_counterparty_payment_script(
 &channel_parameters.channel_type_features, &keys.pubkeys().payment_point
 &channel_parameters.channel_type_features, &holder_pubkeys.payment_point
 );

 let counterparty_channel_parameters = channel_parameters.counterparty_parameters.as_ref().unwrap();
Expand All@@ -1369,7 +1370,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 let counterparty_commitment_params = CounterpartyCommitmentParameters { counterparty_delayed_payment_base_key, counterparty_htlc_base_key, on_counterparty_tx_csv };

 let channel_keys_id = keys.channel_keys_id();
 let holder_revocation_basepoint = keys.pubkeys().revocation_basepoint;
 let holder_revocation_basepoint = holder_pubkeys.revocation_basepoint;

 // block for Rust 1.34 compat
 let (holder_commitment_tx, current_holder_commitment_number) = {
Expand DownExpand Up@@ -5417,6 +5418,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand DownExpand Up@@ -5669,6 +5671,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

1 change: 1 addition & 0 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1352,6 +1352,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 0,
 };
Expand Down

60 changes: 56 additions & 4 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -605,7 +605,20 @@ impl PackageSolvingData {
 let channel_parameters = &onchain_handler.channel_transaction_parameters;
 match self {
 PackageSolvingData::RevokedOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_revokeable_redeemscript(&chan_keys.revocation_key, outp.on_counterparty_tx_csv, &chan_keys.broadcaster_delayed_payment_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_output(channel_parameters, &bumped_tx, i, outp.amount.to_sat(), &outp.per_commitment_key, &onchain_handler.secp_ctx) {
Expand All@@ -617,7 +630,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::RevokedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);
 //TODO: should we panic on signer failure ?
 if let Ok(sig) = onchain_handler.signer.sign_justice_revoked_htlc(channel_parameters, &bumped_tx, i, outp.amount, &outp.per_commitment_key, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -629,7 +655,20 @@ impl PackageSolvingData {
 } else { return false; }
 },
 PackageSolvingData::CounterpartyOfferedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand All@@ -641,7 +680,20 @@ impl PackageSolvingData {
 }
 },
 PackageSolvingData::CounterpartyReceivedHTLCOutput(ref outp) => {
 let chan_keys = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint);
 let directed_parameters =
 &onchain_handler.channel_transaction_parameters.as_counterparty_broadcastable();
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().delayed_payment_basepoint,
 outp.counterparty_delayed_payment_base_key,
 );
 debug_assert_eq!(
 directed_parameters.broadcaster_pubkeys().htlc_basepoint,
 outp.counterparty_htlc_base_key,
 );
 let chan_keys = TxCreationKeys::from_channel_static_keys(
 &outp.per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &onchain_handler.secp_ctx,
 );
 let witness_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&outp.htlc, &onchain_handler.channel_type_features(), &chan_keys.broadcaster_htlc_key, &chan_keys.countersignatory_htlc_key, &chan_keys.revocation_key);

 if let Ok(sig) = onchain_handler.signer.sign_counterparty_htlc_transaction(channel_parameters, &bumped_tx, i, &outp.htlc.amount_msat / 1000, &outp.per_commitment_point, &outp.htlc, &onchain_handler.secp_ctx) {
Expand Down

30 changes: 25 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -880,6 +880,17 @@ pub struct ChannelTransactionParameters {
	pub counterparty_parameters: Option<CounterpartyChannelTransactionParameters>,
	/// The late-bound funding outpoint
	pub funding_outpoint: Option<chain::transaction::OutPoint>,
	/// The parent funding txid for a channel that has been spliced.
	///
	/// If a channel was funded with transaction A, and later spliced with transaction B, this field
	/// tracks the txid of transaction A.
	///
	/// See [`compute_funding_key_tweak`] and [`ChannelSigner::pubkeys`] for more context on how
	/// this may be used.
	///
	/// [`compute_funding_key_tweak`]: crate::sign::compute_funding_key_tweak
	/// [`ChannelSigner::pubkeys`]: crate::sign::ChannelSigner::pubkeys
	pub splice_parent_funding_txid: Option<Txid>,
	/// This channel's type, as negotiated during channel open. For old objects where this field
	/// wasn't serialized, it will default to static_remote_key at deserialization.
	pub channel_type_features: ChannelTypeFeatures,
Expand DownExpand Up@@ -963,6 +974,7 @@ impl ChannelTransactionParameters {
 funding_outpoint: Some(chain::transaction::OutPoint {
 txid: Txid::from_byte_array([42; 32]), index: 0
 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::empty(),
 channel_value_satoshis,
 }
Expand All@@ -985,6 +997,7 @@ impl Writeable for ChannelTransactionParameters {
 (8, self.funding_outpoint, option),
 (10, legacy_deserialization_prevention_marker, option),
 (11, self.channel_type_features, required),
 (12, self.splice_parent_funding_txid, option),
@tankyleotankyleoMar 4, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking myself: once a user has made a splice, we cannot downgrade to some release before this commit here - that's why we assign an even field ?
@wpaulinowpaulinoMar 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct
 (13, self.channel_value_satoshis, required),
 });
 Ok(())
Expand All@@ -998,6 +1011,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 let mut is_outbound_from_holder = RequiredWrapper(None);
 let mut counterparty_parameters = None;
 let mut funding_outpoint = None;
 let mut splice_parent_funding_txid = None;
 let mut _legacy_deserialization_prevention_marker: Option<()> = None;
 let mut channel_type_features = None;
 let mut channel_value_satoshis = None;
Expand All@@ -1010,6 +1024,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 (8, funding_outpoint, option),
 (10, _legacy_deserialization_prevention_marker, option),
 (11, channel_type_features, option),
 (12, splice_parent_funding_txid, option),
 (13, channel_value_satoshis, option),
 });

Expand All@@ -1028,6 +1043,7 @@ impl ReadableArgs<u64> for ChannelTransactionParameters {
 is_outbound_from_holder: is_outbound_from_holder.0.unwrap(),
 counterparty_parameters,
 funding_outpoint,
 splice_parent_funding_txid,
 channel_type_features: channel_type_features.unwrap_or(ChannelTypeFeatures::only_static_remote_key()),
 channel_value_satoshis,
 })
Expand DownExpand Up@@ -1154,6 +1170,7 @@ impl HolderCommitmentTransaction {
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: channel_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis,
 };
Expand DownExpand Up@@ -1953,22 +1970,25 @@ mod tests {
 let keys_provider = test_utils::TestKeysInterface::new(&seed, network);
 let signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(false, 0));
 let counterparty_signer = keys_provider.derive_channel_signer(keys_provider.generate_channel_keys_id(true, 1));
 let delayed_payment_base = &signer.pubkeys().delayed_payment_basepoint;
 let per_commitment_secret = SecretKey::from_slice(&<Vec<u8>>::from_hex("1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100").unwrap()[..]).unwrap();
 let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);
 let htlc_basepoint = &signer.pubkeys().htlc_basepoint;
 let holder_pubkeys = signer.pubkeys();
 let counterparty_pubkeys = counterparty_signer.pubkeys().clone();
 let keys = TxCreationKeys::derive_new(&secp_ctx, &per_commitment_point, delayed_payment_base, htlc_basepoint, &counterparty_pubkeys.revocation_basepoint, &counterparty_pubkeys.htlc_basepoint);
 let holder_pubkeys = signer.pubkeys(None, &secp_ctx);
 let counterparty_pubkeys = counterparty_signer.pubkeys(None, &secp_ctx).clone();
 let channel_parameters = ChannelTransactionParameters {
 holder_pubkeys: holder_pubkeys.clone(),
 holder_selected_contest_delay: 0,
 is_outbound_from_holder: false,
 counterparty_parameters: Some(CounterpartyChannelTransactionParameters { pubkeys: counterparty_pubkeys.clone(), selected_contest_delay: 0 }),
 funding_outpoint: Some(chain::transaction::OutPoint { txid: Txid::all_zeros(), index: 0 }),
 splice_parent_funding_txid: None,
 channel_type_features: ChannelTypeFeatures::only_static_remote_key(),
 channel_value_satoshis: 3000,
 };
 let directed_parameters = channel_parameters.as_holder_broadcastable();
 let keys = TxCreationKeys::from_channel_static_keys(
 &per_commitment_point, directed_parameters.broadcaster_pubkeys(),
 directed_parameters.countersignatory_pubkeys(), &secp_ctx,
 );
 let htlcs_with_aux = Vec::new();

 Self {
Expand Down
Loading