[Key derivation V2] Attach a version byte to channel_keys_id#3887

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

Closed
tankyleo wants to merge 1 commit into from
Closed

[Key derivation V2] Attach a version byte to channel_keys_id#3887

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
25 changes: 18 additions & 7 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ use crate::ln::channelmanager::{HTLCSource, PaymentClaimDetails, SentHTLCId};
use crate::ln::msgs::DecodeError;
use crate::ln::types::ChannelId;
use crate::sign::{
ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, DelayedPaymentOutputDescriptor,
EntropySource, HTLCDescriptor, SignerProvider, SpendableOutputDescriptor,
StaticPaymentOutputDescriptor,
ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, ChannelKeysId,
DelayedPaymentOutputDescriptor, EntropySource, HTLCDescriptor, SignerProvider,
SpendableOutputDescriptor, StaticPaymentOutputDescriptor,
};
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
Expand DownExpand Up@@ -1036,7 +1036,7 @@ pub(crate) struct ChannelMonitorImpl<Signer: EcdsaChannelSigner> {
counterparty_payment_script: ScriptBuf,
shutdown_script: Option<ScriptBuf>,

channel_keys_id: [u8; 32],
channel_keys_id: ChannelKeysId,
holder_revocation_basepoint: RevocationBasepoint,
channel_id: ChannelId,
first_confirmed_funding_txo: OutPoint,
Expand DownExpand Up@@ -1297,7 +1297,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
None => ScriptBuf::new().write(writer)?,
}

self.channel_keys_id.write(writer)?;
self.channel_keys_id.id.write(writer)?;
self.holder_revocation_basepoint.write(writer)?;
let funding_outpoint = self.get_funding_txo();
writer.write_all(&funding_outpoint.txid[..])?;
Expand DownExpand Up@@ -1461,6 +1461,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
(15, self.counterparty_fulfilled_htlcs, required),
(17, self.initial_counterparty_commitment_info, option),
(19, self.channel_id, required),
(20, self.channel_keys_id.version, (no_write_default, 0)),
(21, self.balances_empty_height, option),
(23, self.holder_pays_commitment_tx_fee, option),
(25, self.payment_preimages, required),
Expand DownExpand Up@@ -5126,7 +5127,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
output: outp.clone(),
channel_keys_id: Some(self.channel_keys_id),
channel_keys_id: Some(self.channel_keys_id.id),
channel_keys_version: self.channel_keys_id.version,
});
}
if let Some(ref broadcasted_holder_revokable_script) = self.broadcasted_holder_revokable_script {
Expand DownExpand Up@@ -5156,7 +5158,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
output: outp.clone(),
channel_keys_id: Some(self.channel_keys_id),
channel_keys_id: Some(self.channel_keys_id.id),
channel_keys_version: self.channel_keys_id.version,
});
}
}
Expand DownExpand Up@@ -5438,6 +5441,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
let mut payment_preimages_with_info: Option<HashMap<_, _>> = None;
let mut first_confirmed_funding_txo = RequiredWrapper(None);
let mut channel_parameters = None;
let mut channel_keys_version = RequiredWrapper(None);
read_tlv_fields!(reader, {
(1, funding_spend_confirmed, option),
(3, htlcs_resolved_on_chain, optional_vec),
Expand All@@ -5449,13 +5453,20 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
(15, counterparty_fulfilled_htlcs, option),
(17, initial_counterparty_commitment_info, option),
(19, channel_id, option),
(20, channel_keys_version, (default_value, 0)),

@tnulltnullJun 24, 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.

Same here, needs to be odd.

(21, balances_empty_height, option),
(23, holder_pays_commitment_tx_fee, option),
(25, payment_preimages_with_info, option),
(27, first_confirmed_funding_txo, (default_value, outpoint)),
(29, initial_counterparty_commitment_tx, option),
(31, channel_parameters, (option: ReadableArgs, None)),
});

let channel_keys_id = ChannelKeysId {
id: channel_keys_id,
version: channel_keys_version.0.unwrap(),
};

if let Some(payment_preimages_with_info) = payment_preimages_with_info {
if payment_preimages_with_info.len() != payment_preimages.len() {
return Err(DecodeError::InvalidValue);
Expand Down
19 changes: 14 additions & 5 deletions lightning/src/chain/onchaintx.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use crate::ln::chan_utils::{
self, ChannelTransactionParameters, HTLCOutputInCommitment, HolderCommitmentTransaction,
};
use crate::ln::msgs::DecodeError;
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider};
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider, ChannelKeysId};
use crate::util::logger::Logger;
use crate::util::ser::{
MaybeReadable, Readable, ReadableArgs, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -222,7 +222,7 @@ pub(crate) enum FeerateStrategy {
#[derive(Clone)]
pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
channel_value_satoshis: u64, // Deprecated as of 0.2.
channel_keys_id: [u8; 32], // Deprecated as of 0.2.
channel_keys_id: ChannelKeysId, // Deprecated as of 0.2.
destination_script: ScriptBuf, // Deprecated as of 0.2.
holder_commitment: HolderCommitmentTransaction,
prev_holder_commitment: Option<HolderCommitmentTransaction>,
Expand DownExpand Up@@ -379,7 +379,6 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
bytes_read += bytes_to_read;
}

let signer = signer_provider.derive_channel_signer(channel_keys_id);

let pending_claim_requests_len: u64 = Readable::read(reader)?;
let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
Expand DownExpand Up@@ -416,8 +415,18 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
}
}

// FIXME: Bump some serialization for this, or read this field elsewhere
let channel_keys_version: u8 = Readable::read(reader)?;

read_tlv_fields!(reader, {});

let channel_keys_id = ChannelKeysId {
id: channel_keys_id,
version: channel_keys_version,
};

let signer = signer_provider.derive_channel_signer(channel_keys_id);

let mut secp_ctx = Secp256k1::new();
secp_ctx.seeded_randomize(&entropy_source.get_secure_random_bytes());

Expand All@@ -441,7 +450,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP

impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
pub(crate) fn new(
channel_value_satoshis: u64, channel_keys_id: [u8; 32], destination_script: ScriptBuf,
channel_value_satoshis: u64, channel_keys_id: ChannelKeysId, destination_script: ScriptBuf,
signer: ChannelSigner, channel_parameters: ChannelTransactionParameters,
holder_commitment: HolderCommitmentTransaction, secp_ctx: Secp256k1<secp256k1::All>,
) -> Self {
Expand DownExpand Up@@ -1222,7 +1231,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
}

// Deprecated as of 0.2, only use in cases where it was not previously available.
pub(crate) fn channel_keys_id(&self) -> [u8; 32] {
pub(crate) fn channel_keys_id(&self) -> ChannelKeysId {
self.channel_keys_id
}
}
Expand Down
20 changes: 15 additions & 5 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,9 @@ use crate::ln::script::{self, ShutdownScript};
use crate::ln::types::ChannelId;
use crate::routing::gossip::NodeId;
use crate::sign::ecdsa::EcdsaChannelSigner;
use crate::sign::{ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider};
use crate::sign::{
ChannelKeysId, ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider,
};
use crate::types::features::{ChannelTypeFeatures, InitFeatures};
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::config::{
Expand DownExpand Up@@ -2483,9 +2485,9 @@ where
/// The unique identifier used to re-derive the private key material for the channel through
/// [`SignerProvider::derive_channel_signer`].
#[cfg(not(any(test, feature = "_test_utils")))]
channel_keys_id: [u8; 32],
channel_keys_id: ChannelKeysId,
#[cfg(any(test, feature = "_test_utils"))]
pub channel_keys_id: [u8; 32],
pub channel_keys_id: ChannelKeysId,

/// If we can't release a [`ChannelMonitorUpdate`] until some external action completes, we
/// store it here and only release it to the `ChannelManager` once it asks for it.
Expand DownExpand Up@@ -3353,7 +3355,7 @@ where
outbound_scid_alias: u64,
temporary_channel_id_fn: Option<impl Fn(&ChannelPublicKeys) -> ChannelId>,
holder_selected_channel_reserve_satoshis: u64,
channel_keys_id: [u8; 32],
channel_keys_id: ChannelKeysId,
holder_signer: <SP::Target as SignerProvider>::EcdsaSigner,
_logger: L,
) -> Result<(FundingScope, ChannelContext<SP>), APIError>
Expand DownExpand Up@@ -12368,7 +12370,7 @@ where
(21, self.context.outbound_scid_alias, required),
(23, initial_channel_ready_event_emitted, option),
(25, user_id_high_opt, option),
(27, self.context.channel_keys_id, required),
(27, self.context.channel_keys_id.id, required),
(28, holder_max_accepted_htlcs, option),
(29, self.context.temporary_channel_id, option),
(31, channel_pending_event_emitted, option),
Expand All@@ -12389,6 +12391,7 @@ where
(58, self.interactive_tx_signing_session, option), // Added in 0.2
(59, self.funding.minimum_depth_override, option), // Added in 0.2
(60, self.context.historical_scids, optional_vec), // Added in 0.2
(62, self.context.channel_keys_id.version, (no_write_default, 0)), // Added in 0.2
});

Ok(())
Expand DownExpand Up@@ -12680,6 +12683,7 @@ where

let mut user_id_high_opt: Option<u64> = None;
let mut channel_keys_id = [0u8; 32];
let mut channel_keys_version = RequiredWrapper(None);
let mut temporary_channel_id: Option<ChannelId> = None;
let mut holder_max_accepted_htlcs: Option<u16> = None;

Expand DownExpand Up@@ -12753,8 +12757,14 @@ where
(58, interactive_tx_signing_session, option), // Added in 0.2
(59, minimum_depth_override, option), // Added in 0.2
(60, historical_scids, optional_vec), // Added in 0.2
(62, channel_keys_version, (default_value, 0)), // Added in 0.2
});

let channel_keys_id = ChannelKeysId {
id: channel_keys_id,
version: channel_keys_version.0.unwrap(),
};

let holder_signer = signer_provider.derive_channel_signer(channel_keys_id);

let mut iter = preimages.into_iter();
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
[Key derivation V2] Attach a version byte to channel_keys_id#3887

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

 Closed

tankyleo
wants to merge
1
commit into

from

 Closed


[Key derivation V2] Attach a version byte to channel_keys_id#3887
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


25 changes: 18 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ use crate::ln::channelmanager::{HTLCSource, PaymentClaimDetails, SentHTLCId};
use crate::ln::msgs::DecodeError;
use crate::ln::types::ChannelId;
use crate::sign::{
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, DelayedPaymentOutputDescriptor,
	EntropySource, HTLCDescriptor, SignerProvider, SpendableOutputDescriptor,
	StaticPaymentOutputDescriptor,
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, ChannelKeysId,
DelayedPaymentOutputDescriptor, EntropySource, HTLCDescriptor, SignerProvider,
SpendableOutputDescriptor, StaticPaymentOutputDescriptor,
};
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
Expand DownExpand Up@@ -1036,7 +1036,7 @@ pub(crate) struct ChannelMonitorImpl<Signer: EcdsaChannelSigner> {
	counterparty_payment_script: ScriptBuf,
	shutdown_script: Option<ScriptBuf>,

	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	holder_revocation_basepoint: RevocationBasepoint,
	channel_id: ChannelId,
	first_confirmed_funding_txo: OutPoint,
Expand DownExpand Up@@ -1297,7 +1297,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 None => ScriptBuf::new().write(writer)?,
 }

 self.channel_keys_id.write(writer)?;
 self.channel_keys_id.id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 let funding_outpoint = self.get_funding_txo();
 writer.write_all(&funding_outpoint.txid[..])?;
Expand DownExpand Up@@ -1461,6 +1461,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 (15, self.counterparty_fulfilled_htlcs, required),
 (17, self.initial_counterparty_commitment_info, option),
 (19, self.channel_id, required),
 (20, self.channel_keys_id.version, (no_write_default, 0)),
 (21, self.balances_empty_height, option),
 (23, self.holder_pays_commitment_tx_fee, option),
 (25, self.payment_preimages, required),
Expand DownExpand Up@@ -5126,7 +5127,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 if let Some(ref broadcasted_holder_revokable_script) = self.broadcasted_holder_revokable_script {
Expand DownExpand Up@@ -5156,7 +5158,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 }
Expand DownExpand Up@@ -5438,6 +5441,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut payment_preimages_with_info: Option<HashMap<_, _>> = None;
 let mut first_confirmed_funding_txo = RequiredWrapper(None);
 let mut channel_parameters = None;
 let mut channel_keys_version = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (1, funding_spend_confirmed, option),
 (3, htlcs_resolved_on_chain, optional_vec),
Expand All@@ -5449,13 +5453,20 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 (15, counterparty_fulfilled_htlcs, option),
 (17, initial_counterparty_commitment_info, option),
 (19, channel_id, option),
 (20, channel_keys_version, (default_value, 0)),
@tnulltnullJun 24, 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.

Same here, needs to be odd.
 (21, balances_empty_height, option),
 (23, holder_pays_commitment_tx_fee, option),
 (25, payment_preimages_with_info, option),
 (27, first_confirmed_funding_txo, (default_value, outpoint)),
 (29, initial_counterparty_commitment_tx, option),
 (31, channel_parameters, (option: ReadableArgs, None)),
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 if let Some(payment_preimages_with_info) = payment_preimages_with_info {
 if payment_preimages_with_info.len() != payment_preimages.len() {
 return Err(DecodeError::InvalidValue);
Expand Down

19 changes: 14 additions & 5 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use crate::ln::chan_utils::{
	self, ChannelTransactionParameters, HTLCOutputInCommitment, HolderCommitmentTransaction,
};
use crate::ln::msgs::DecodeError;
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider};
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider, ChannelKeysId};
use crate::util::logger::Logger;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -222,7 +222,7 @@ pub(crate) enum FeerateStrategy {
#[derive(Clone)]
pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	channel_value_satoshis: u64, // Deprecated as of 0.2.
	channel_keys_id: [u8; 32], // Deprecated as of 0.2.
	channel_keys_id: ChannelKeysId, // Deprecated as of 0.2.
	destination_script: ScriptBuf, // Deprecated as of 0.2.
	holder_commitment: HolderCommitmentTransaction,
	prev_holder_commitment: Option<HolderCommitmentTransaction>,
Expand DownExpand Up@@ -379,7 +379,6 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 bytes_read += bytes_to_read;
 }

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
Expand DownExpand Up@@ -416,8 +415,18 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }
 }

 // FIXME: Bump some serialization for this, or read this field elsewhere
 let channel_keys_version: u8 = Readable::read(reader)?;

 read_tlv_fields!(reader, {});

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version,
 };

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut secp_ctx = Secp256k1::new();
 secp_ctx.seeded_randomize(&entropy_source.get_secure_random_bytes());

Expand All@@ -441,7 +450,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP

impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	pub(crate) fn new(
 channel_value_satoshis: u64, channel_keys_id: [u8; 32], destination_script: ScriptBuf,
 channel_value_satoshis: u64, channel_keys_id: ChannelKeysId, destination_script: ScriptBuf,
 signer: ChannelSigner, channel_parameters: ChannelTransactionParameters,
 holder_commitment: HolderCommitmentTransaction, secp_ctx: Secp256k1<secp256k1::All>,
	) -> Self {
Expand DownExpand Up@@ -1222,7 +1231,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	}

	// Deprecated as of 0.2, only use in cases where it was not previously available.
	pub(crate) fn channel_keys_id(&self) -> [u8; 32] {
	pub(crate) fn channel_keys_id(&self) -> ChannelKeysId {
 self.channel_keys_id
	}
}
Expand Down

20 changes: 15 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,9 @@ use crate::ln::script::{self, ShutdownScript};
use crate::ln::types::ChannelId;
use crate::routing::gossip::NodeId;
use crate::sign::ecdsa::EcdsaChannelSigner;
use crate::sign::{ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider};
use crate::sign::{
	ChannelKeysId, ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider,
};
use crate::types::features::{ChannelTypeFeatures, InitFeatures};
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::config::{
Expand DownExpand Up@@ -2483,9 +2485,9 @@ where
	/// The unique identifier used to re-derive the private key material for the channel through
	/// [`SignerProvider::derive_channel_signer`].
	#[cfg(not(any(test, feature = "_test_utils")))]
	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	#[cfg(any(test, feature = "_test_utils"))]
	pub channel_keys_id: [u8; 32],
	pub channel_keys_id: ChannelKeysId,

	/// If we can't release a [`ChannelMonitorUpdate`] until some external action completes, we
	/// store it here and only release it to the `ChannelManager` once it asks for it.
Expand DownExpand Up@@ -3353,7 +3355,7 @@ where
 outbound_scid_alias: u64,
 temporary_channel_id_fn: Option<impl Fn(&ChannelPublicKeys) -> ChannelId>,
 holder_selected_channel_reserve_satoshis: u64,
 channel_keys_id: [u8; 32],
 channel_keys_id: ChannelKeysId,
 holder_signer: <SP::Target as SignerProvider>::EcdsaSigner,
 _logger: L,
	) -> Result<(FundingScope, ChannelContext<SP>), APIError>
Expand DownExpand Up@@ -12368,7 +12370,7 @@ where
 (21, self.context.outbound_scid_alias, required),
 (23, initial_channel_ready_event_emitted, option),
 (25, user_id_high_opt, option),
 (27, self.context.channel_keys_id, required),
 (27, self.context.channel_keys_id.id, required),
 (28, holder_max_accepted_htlcs, option),
 (29, self.context.temporary_channel_id, option),
 (31, channel_pending_event_emitted, option),
Expand All@@ -12389,6 +12391,7 @@ where
 (58, self.interactive_tx_signing_session, option), // Added in 0.2
 (59, self.funding.minimum_depth_override, option), // Added in 0.2
 (60, self.context.historical_scids, optional_vec), // Added in 0.2
 (62, self.context.channel_keys_id.version, (no_write_default, 0)), // Added in 0.2
 });

 Ok(())
Expand DownExpand Up@@ -12680,6 +12683,7 @@ where

 let mut user_id_high_opt: Option<u64> = None;
 let mut channel_keys_id = [0u8; 32];
 let mut channel_keys_version = RequiredWrapper(None);
 let mut temporary_channel_id: Option<ChannelId> = None;
 let mut holder_max_accepted_htlcs: Option<u16> = None;

Expand DownExpand Up@@ -12753,8 +12757,14 @@ where
 (58, interactive_tx_signing_session, option), // Added in 0.2
 (59, minimum_depth_override, option), // Added in 0.2
 (60, historical_scids, optional_vec), // Added in 0.2
 (62, channel_keys_version, (default_value, 0)), // Added in 0.2
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 let holder_signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut iter = preimages.into_iter();
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
[Key derivation V2] Attach a version byte to channel_keys_id#3887

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

 Closed

tankyleo
wants to merge
1
commit into

from

 Closed


[Key derivation V2] Attach a version byte to channel_keys_id#3887
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


25 changes: 18 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ use crate::ln::channelmanager::{HTLCSource, PaymentClaimDetails, SentHTLCId};
use crate::ln::msgs::DecodeError;
use crate::ln::types::ChannelId;
use crate::sign::{
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, DelayedPaymentOutputDescriptor,
	EntropySource, HTLCDescriptor, SignerProvider, SpendableOutputDescriptor,
	StaticPaymentOutputDescriptor,
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, ChannelKeysId,
DelayedPaymentOutputDescriptor, EntropySource, HTLCDescriptor, SignerProvider,
SpendableOutputDescriptor, StaticPaymentOutputDescriptor,
};
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
Expand DownExpand Up@@ -1036,7 +1036,7 @@ pub(crate) struct ChannelMonitorImpl<Signer: EcdsaChannelSigner> {
	counterparty_payment_script: ScriptBuf,
	shutdown_script: Option<ScriptBuf>,

	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	holder_revocation_basepoint: RevocationBasepoint,
	channel_id: ChannelId,
	first_confirmed_funding_txo: OutPoint,
Expand DownExpand Up@@ -1297,7 +1297,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 None => ScriptBuf::new().write(writer)?,
 }

 self.channel_keys_id.write(writer)?;
 self.channel_keys_id.id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 let funding_outpoint = self.get_funding_txo();
 writer.write_all(&funding_outpoint.txid[..])?;
Expand DownExpand Up@@ -1461,6 +1461,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 (15, self.counterparty_fulfilled_htlcs, required),
 (17, self.initial_counterparty_commitment_info, option),
 (19, self.channel_id, required),
 (20, self.channel_keys_id.version, (no_write_default, 0)),
 (21, self.balances_empty_height, option),
 (23, self.holder_pays_commitment_tx_fee, option),
 (25, self.payment_preimages, required),
Expand DownExpand Up@@ -5126,7 +5127,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 if let Some(ref broadcasted_holder_revokable_script) = self.broadcasted_holder_revokable_script {
Expand DownExpand Up@@ -5156,7 +5158,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 }
Expand DownExpand Up@@ -5438,6 +5441,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut payment_preimages_with_info: Option<HashMap<_, _>> = None;
 let mut first_confirmed_funding_txo = RequiredWrapper(None);
 let mut channel_parameters = None;
 let mut channel_keys_version = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (1, funding_spend_confirmed, option),
 (3, htlcs_resolved_on_chain, optional_vec),
Expand All@@ -5449,13 +5453,20 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 (15, counterparty_fulfilled_htlcs, option),
 (17, initial_counterparty_commitment_info, option),
 (19, channel_id, option),
 (20, channel_keys_version, (default_value, 0)),
@tnulltnullJun 24, 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.

Same here, needs to be odd.
 (21, balances_empty_height, option),
 (23, holder_pays_commitment_tx_fee, option),
 (25, payment_preimages_with_info, option),
 (27, first_confirmed_funding_txo, (default_value, outpoint)),
 (29, initial_counterparty_commitment_tx, option),
 (31, channel_parameters, (option: ReadableArgs, None)),
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 if let Some(payment_preimages_with_info) = payment_preimages_with_info {
 if payment_preimages_with_info.len() != payment_preimages.len() {
 return Err(DecodeError::InvalidValue);
Expand Down

19 changes: 14 additions & 5 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use crate::ln::chan_utils::{
	self, ChannelTransactionParameters, HTLCOutputInCommitment, HolderCommitmentTransaction,
};
use crate::ln::msgs::DecodeError;
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider};
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider, ChannelKeysId};
use crate::util::logger::Logger;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -222,7 +222,7 @@ pub(crate) enum FeerateStrategy {
#[derive(Clone)]
pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	channel_value_satoshis: u64, // Deprecated as of 0.2.
	channel_keys_id: [u8; 32], // Deprecated as of 0.2.
	channel_keys_id: ChannelKeysId, // Deprecated as of 0.2.
	destination_script: ScriptBuf, // Deprecated as of 0.2.
	holder_commitment: HolderCommitmentTransaction,
	prev_holder_commitment: Option<HolderCommitmentTransaction>,
Expand DownExpand Up@@ -379,7 +379,6 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 bytes_read += bytes_to_read;
 }

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
Expand DownExpand Up@@ -416,8 +415,18 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }
 }

 // FIXME: Bump some serialization for this, or read this field elsewhere
 let channel_keys_version: u8 = Readable::read(reader)?;

 read_tlv_fields!(reader, {});

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version,
 };

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut secp_ctx = Secp256k1::new();
 secp_ctx.seeded_randomize(&entropy_source.get_secure_random_bytes());

Expand All@@ -441,7 +450,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP

impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	pub(crate) fn new(
 channel_value_satoshis: u64, channel_keys_id: [u8; 32], destination_script: ScriptBuf,
 channel_value_satoshis: u64, channel_keys_id: ChannelKeysId, destination_script: ScriptBuf,
 signer: ChannelSigner, channel_parameters: ChannelTransactionParameters,
 holder_commitment: HolderCommitmentTransaction, secp_ctx: Secp256k1<secp256k1::All>,
	) -> Self {
Expand DownExpand Up@@ -1222,7 +1231,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	}

	// Deprecated as of 0.2, only use in cases where it was not previously available.
	pub(crate) fn channel_keys_id(&self) -> [u8; 32] {
	pub(crate) fn channel_keys_id(&self) -> ChannelKeysId {
 self.channel_keys_id
	}
}
Expand Down

20 changes: 15 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,9 @@ use crate::ln::script::{self, ShutdownScript};
use crate::ln::types::ChannelId;
use crate::routing::gossip::NodeId;
use crate::sign::ecdsa::EcdsaChannelSigner;
use crate::sign::{ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider};
use crate::sign::{
	ChannelKeysId, ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider,
};
use crate::types::features::{ChannelTypeFeatures, InitFeatures};
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::config::{
Expand DownExpand Up@@ -2483,9 +2485,9 @@ where
	/// The unique identifier used to re-derive the private key material for the channel through
	/// [`SignerProvider::derive_channel_signer`].
	#[cfg(not(any(test, feature = "_test_utils")))]
	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	#[cfg(any(test, feature = "_test_utils"))]
	pub channel_keys_id: [u8; 32],
	pub channel_keys_id: ChannelKeysId,

	/// If we can't release a [`ChannelMonitorUpdate`] until some external action completes, we
	/// store it here and only release it to the `ChannelManager` once it asks for it.
Expand DownExpand Up@@ -3353,7 +3355,7 @@ where
 outbound_scid_alias: u64,
 temporary_channel_id_fn: Option<impl Fn(&ChannelPublicKeys) -> ChannelId>,
 holder_selected_channel_reserve_satoshis: u64,
 channel_keys_id: [u8; 32],
 channel_keys_id: ChannelKeysId,
 holder_signer: <SP::Target as SignerProvider>::EcdsaSigner,
 _logger: L,
	) -> Result<(FundingScope, ChannelContext<SP>), APIError>
Expand DownExpand Up@@ -12368,7 +12370,7 @@ where
 (21, self.context.outbound_scid_alias, required),
 (23, initial_channel_ready_event_emitted, option),
 (25, user_id_high_opt, option),
 (27, self.context.channel_keys_id, required),
 (27, self.context.channel_keys_id.id, required),
 (28, holder_max_accepted_htlcs, option),
 (29, self.context.temporary_channel_id, option),
 (31, channel_pending_event_emitted, option),
Expand All@@ -12389,6 +12391,7 @@ where
 (58, self.interactive_tx_signing_session, option), // Added in 0.2
 (59, self.funding.minimum_depth_override, option), // Added in 0.2
 (60, self.context.historical_scids, optional_vec), // Added in 0.2
 (62, self.context.channel_keys_id.version, (no_write_default, 0)), // Added in 0.2
 });

 Ok(())
Expand DownExpand Up@@ -12680,6 +12683,7 @@ where

 let mut user_id_high_opt: Option<u64> = None;
 let mut channel_keys_id = [0u8; 32];
 let mut channel_keys_version = RequiredWrapper(None);
 let mut temporary_channel_id: Option<ChannelId> = None;
 let mut holder_max_accepted_htlcs: Option<u16> = None;

Expand DownExpand Up@@ -12753,8 +12757,14 @@ where
 (58, interactive_tx_signing_session, option), // Added in 0.2
 (59, minimum_depth_override, option), // Added in 0.2
 (60, historical_scids, optional_vec), // Added in 0.2
 (62, channel_keys_version, (default_value, 0)), // Added in 0.2
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 let holder_signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut iter = preimages.into_iter();
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
[Key derivation V2] Attach a version byte to channel_keys_id#3887

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

 Closed

tankyleo
wants to merge
1
commit into

from

 Closed


[Key derivation V2] Attach a version byte to channel_keys_id#3887
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


25 changes: 18 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ use crate::ln::channelmanager::{HTLCSource, PaymentClaimDetails, SentHTLCId};
use crate::ln::msgs::DecodeError;
use crate::ln::types::ChannelId;
use crate::sign::{
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, DelayedPaymentOutputDescriptor,
	EntropySource, HTLCDescriptor, SignerProvider, SpendableOutputDescriptor,
	StaticPaymentOutputDescriptor,
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, ChannelKeysId,
DelayedPaymentOutputDescriptor, EntropySource, HTLCDescriptor, SignerProvider,
SpendableOutputDescriptor, StaticPaymentOutputDescriptor,
};
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
Expand DownExpand Up@@ -1036,7 +1036,7 @@ pub(crate) struct ChannelMonitorImpl<Signer: EcdsaChannelSigner> {
	counterparty_payment_script: ScriptBuf,
	shutdown_script: Option<ScriptBuf>,

	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	holder_revocation_basepoint: RevocationBasepoint,
	channel_id: ChannelId,
	first_confirmed_funding_txo: OutPoint,
Expand DownExpand Up@@ -1297,7 +1297,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 None => ScriptBuf::new().write(writer)?,
 }

 self.channel_keys_id.write(writer)?;
 self.channel_keys_id.id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 let funding_outpoint = self.get_funding_txo();
 writer.write_all(&funding_outpoint.txid[..])?;
Expand DownExpand Up@@ -1461,6 +1461,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 (15, self.counterparty_fulfilled_htlcs, required),
 (17, self.initial_counterparty_commitment_info, option),
 (19, self.channel_id, required),
 (20, self.channel_keys_id.version, (no_write_default, 0)),
 (21, self.balances_empty_height, option),
 (23, self.holder_pays_commitment_tx_fee, option),
 (25, self.payment_preimages, required),
Expand DownExpand Up@@ -5126,7 +5127,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 if let Some(ref broadcasted_holder_revokable_script) = self.broadcasted_holder_revokable_script {
Expand DownExpand Up@@ -5156,7 +5158,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 }
Expand DownExpand Up@@ -5438,6 +5441,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut payment_preimages_with_info: Option<HashMap<_, _>> = None;
 let mut first_confirmed_funding_txo = RequiredWrapper(None);
 let mut channel_parameters = None;
 let mut channel_keys_version = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (1, funding_spend_confirmed, option),
 (3, htlcs_resolved_on_chain, optional_vec),
Expand All@@ -5449,13 +5453,20 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 (15, counterparty_fulfilled_htlcs, option),
 (17, initial_counterparty_commitment_info, option),
 (19, channel_id, option),
 (20, channel_keys_version, (default_value, 0)),
@tnulltnullJun 24, 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.

Same here, needs to be odd.
 (21, balances_empty_height, option),
 (23, holder_pays_commitment_tx_fee, option),
 (25, payment_preimages_with_info, option),
 (27, first_confirmed_funding_txo, (default_value, outpoint)),
 (29, initial_counterparty_commitment_tx, option),
 (31, channel_parameters, (option: ReadableArgs, None)),
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 if let Some(payment_preimages_with_info) = payment_preimages_with_info {
 if payment_preimages_with_info.len() != payment_preimages.len() {
 return Err(DecodeError::InvalidValue);
Expand Down

19 changes: 14 additions & 5 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use crate::ln::chan_utils::{
	self, ChannelTransactionParameters, HTLCOutputInCommitment, HolderCommitmentTransaction,
};
use crate::ln::msgs::DecodeError;
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider};
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider, ChannelKeysId};
use crate::util::logger::Logger;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -222,7 +222,7 @@ pub(crate) enum FeerateStrategy {
#[derive(Clone)]
pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	channel_value_satoshis: u64, // Deprecated as of 0.2.
	channel_keys_id: [u8; 32], // Deprecated as of 0.2.
	channel_keys_id: ChannelKeysId, // Deprecated as of 0.2.
	destination_script: ScriptBuf, // Deprecated as of 0.2.
	holder_commitment: HolderCommitmentTransaction,
	prev_holder_commitment: Option<HolderCommitmentTransaction>,
Expand DownExpand Up@@ -379,7 +379,6 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 bytes_read += bytes_to_read;
 }

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
Expand DownExpand Up@@ -416,8 +415,18 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }
 }

 // FIXME: Bump some serialization for this, or read this field elsewhere
 let channel_keys_version: u8 = Readable::read(reader)?;

 read_tlv_fields!(reader, {});

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version,
 };

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut secp_ctx = Secp256k1::new();
 secp_ctx.seeded_randomize(&entropy_source.get_secure_random_bytes());

Expand All@@ -441,7 +450,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP

impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	pub(crate) fn new(
 channel_value_satoshis: u64, channel_keys_id: [u8; 32], destination_script: ScriptBuf,
 channel_value_satoshis: u64, channel_keys_id: ChannelKeysId, destination_script: ScriptBuf,
 signer: ChannelSigner, channel_parameters: ChannelTransactionParameters,
 holder_commitment: HolderCommitmentTransaction, secp_ctx: Secp256k1<secp256k1::All>,
	) -> Self {
Expand DownExpand Up@@ -1222,7 +1231,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	}

	// Deprecated as of 0.2, only use in cases where it was not previously available.
	pub(crate) fn channel_keys_id(&self) -> [u8; 32] {
	pub(crate) fn channel_keys_id(&self) -> ChannelKeysId {
 self.channel_keys_id
	}
}
Expand Down

20 changes: 15 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,9 @@ use crate::ln::script::{self, ShutdownScript};
use crate::ln::types::ChannelId;
use crate::routing::gossip::NodeId;
use crate::sign::ecdsa::EcdsaChannelSigner;
use crate::sign::{ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider};
use crate::sign::{
	ChannelKeysId, ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider,
};
use crate::types::features::{ChannelTypeFeatures, InitFeatures};
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::config::{
Expand DownExpand Up@@ -2483,9 +2485,9 @@ where
	/// The unique identifier used to re-derive the private key material for the channel through
	/// [`SignerProvider::derive_channel_signer`].
	#[cfg(not(any(test, feature = "_test_utils")))]
	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	#[cfg(any(test, feature = "_test_utils"))]
	pub channel_keys_id: [u8; 32],
	pub channel_keys_id: ChannelKeysId,

	/// If we can't release a [`ChannelMonitorUpdate`] until some external action completes, we
	/// store it here and only release it to the `ChannelManager` once it asks for it.
Expand DownExpand Up@@ -3353,7 +3355,7 @@ where
 outbound_scid_alias: u64,
 temporary_channel_id_fn: Option<impl Fn(&ChannelPublicKeys) -> ChannelId>,
 holder_selected_channel_reserve_satoshis: u64,
 channel_keys_id: [u8; 32],
 channel_keys_id: ChannelKeysId,
 holder_signer: <SP::Target as SignerProvider>::EcdsaSigner,
 _logger: L,
	) -> Result<(FundingScope, ChannelContext<SP>), APIError>
Expand DownExpand Up@@ -12368,7 +12370,7 @@ where
 (21, self.context.outbound_scid_alias, required),
 (23, initial_channel_ready_event_emitted, option),
 (25, user_id_high_opt, option),
 (27, self.context.channel_keys_id, required),
 (27, self.context.channel_keys_id.id, required),
 (28, holder_max_accepted_htlcs, option),
 (29, self.context.temporary_channel_id, option),
 (31, channel_pending_event_emitted, option),
Expand All@@ -12389,6 +12391,7 @@ where
 (58, self.interactive_tx_signing_session, option), // Added in 0.2
 (59, self.funding.minimum_depth_override, option), // Added in 0.2
 (60, self.context.historical_scids, optional_vec), // Added in 0.2
 (62, self.context.channel_keys_id.version, (no_write_default, 0)), // Added in 0.2
 });

 Ok(())
Expand DownExpand Up@@ -12680,6 +12683,7 @@ where

 let mut user_id_high_opt: Option<u64> = None;
 let mut channel_keys_id = [0u8; 32];
 let mut channel_keys_version = RequiredWrapper(None);
 let mut temporary_channel_id: Option<ChannelId> = None;
 let mut holder_max_accepted_htlcs: Option<u16> = None;

Expand DownExpand Up@@ -12753,8 +12757,14 @@ where
 (58, interactive_tx_signing_session, option), // Added in 0.2
 (59, minimum_depth_override, option), // Added in 0.2
 (60, historical_scids, optional_vec), // Added in 0.2
 (62, channel_keys_version, (default_value, 0)), // Added in 0.2
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 let holder_signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut iter = preimages.into_iter();
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
[Key derivation V2] Attach a version byte to channel_keys_id#3887

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

 Closed

tankyleo
wants to merge
1
commit into

from

 Closed


[Key derivation V2] Attach a version byte to channel_keys_id#3887
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


25 changes: 18 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ use crate::ln::channelmanager::{HTLCSource, PaymentClaimDetails, SentHTLCId};
use crate::ln::msgs::DecodeError;
use crate::ln::types::ChannelId;
use crate::sign::{
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, DelayedPaymentOutputDescriptor,
	EntropySource, HTLCDescriptor, SignerProvider, SpendableOutputDescriptor,
	StaticPaymentOutputDescriptor,
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, ChannelKeysId,
DelayedPaymentOutputDescriptor, EntropySource, HTLCDescriptor, SignerProvider,
SpendableOutputDescriptor, StaticPaymentOutputDescriptor,
};
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
Expand DownExpand Up@@ -1036,7 +1036,7 @@ pub(crate) struct ChannelMonitorImpl<Signer: EcdsaChannelSigner> {
	counterparty_payment_script: ScriptBuf,
	shutdown_script: Option<ScriptBuf>,

	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	holder_revocation_basepoint: RevocationBasepoint,
	channel_id: ChannelId,
	first_confirmed_funding_txo: OutPoint,
Expand DownExpand Up@@ -1297,7 +1297,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 None => ScriptBuf::new().write(writer)?,
 }

 self.channel_keys_id.write(writer)?;
 self.channel_keys_id.id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 let funding_outpoint = self.get_funding_txo();
 writer.write_all(&funding_outpoint.txid[..])?;
Expand DownExpand Up@@ -1461,6 +1461,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 (15, self.counterparty_fulfilled_htlcs, required),
 (17, self.initial_counterparty_commitment_info, option),
 (19, self.channel_id, required),
 (20, self.channel_keys_id.version, (no_write_default, 0)),
 (21, self.balances_empty_height, option),
 (23, self.holder_pays_commitment_tx_fee, option),
 (25, self.payment_preimages, required),
Expand DownExpand Up@@ -5126,7 +5127,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 if let Some(ref broadcasted_holder_revokable_script) = self.broadcasted_holder_revokable_script {
Expand DownExpand Up@@ -5156,7 +5158,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 }
Expand DownExpand Up@@ -5438,6 +5441,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut payment_preimages_with_info: Option<HashMap<_, _>> = None;
 let mut first_confirmed_funding_txo = RequiredWrapper(None);
 let mut channel_parameters = None;
 let mut channel_keys_version = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (1, funding_spend_confirmed, option),
 (3, htlcs_resolved_on_chain, optional_vec),
Expand All@@ -5449,13 +5453,20 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 (15, counterparty_fulfilled_htlcs, option),
 (17, initial_counterparty_commitment_info, option),
 (19, channel_id, option),
 (20, channel_keys_version, (default_value, 0)),
@tnulltnullJun 24, 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.

Same here, needs to be odd.
 (21, balances_empty_height, option),
 (23, holder_pays_commitment_tx_fee, option),
 (25, payment_preimages_with_info, option),
 (27, first_confirmed_funding_txo, (default_value, outpoint)),
 (29, initial_counterparty_commitment_tx, option),
 (31, channel_parameters, (option: ReadableArgs, None)),
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 if let Some(payment_preimages_with_info) = payment_preimages_with_info {
 if payment_preimages_with_info.len() != payment_preimages.len() {
 return Err(DecodeError::InvalidValue);
Expand Down

19 changes: 14 additions & 5 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use crate::ln::chan_utils::{
	self, ChannelTransactionParameters, HTLCOutputInCommitment, HolderCommitmentTransaction,
};
use crate::ln::msgs::DecodeError;
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider};
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider, ChannelKeysId};
use crate::util::logger::Logger;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -222,7 +222,7 @@ pub(crate) enum FeerateStrategy {
#[derive(Clone)]
pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	channel_value_satoshis: u64, // Deprecated as of 0.2.
	channel_keys_id: [u8; 32], // Deprecated as of 0.2.
	channel_keys_id: ChannelKeysId, // Deprecated as of 0.2.
	destination_script: ScriptBuf, // Deprecated as of 0.2.
	holder_commitment: HolderCommitmentTransaction,
	prev_holder_commitment: Option<HolderCommitmentTransaction>,
Expand DownExpand Up@@ -379,7 +379,6 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 bytes_read += bytes_to_read;
 }

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
Expand DownExpand Up@@ -416,8 +415,18 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }
 }

 // FIXME: Bump some serialization for this, or read this field elsewhere
 let channel_keys_version: u8 = Readable::read(reader)?;

 read_tlv_fields!(reader, {});

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version,
 };

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut secp_ctx = Secp256k1::new();
 secp_ctx.seeded_randomize(&entropy_source.get_secure_random_bytes());

Expand All@@ -441,7 +450,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP

impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	pub(crate) fn new(
 channel_value_satoshis: u64, channel_keys_id: [u8; 32], destination_script: ScriptBuf,
 channel_value_satoshis: u64, channel_keys_id: ChannelKeysId, destination_script: ScriptBuf,
 signer: ChannelSigner, channel_parameters: ChannelTransactionParameters,
 holder_commitment: HolderCommitmentTransaction, secp_ctx: Secp256k1<secp256k1::All>,
	) -> Self {
Expand DownExpand Up@@ -1222,7 +1231,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	}

	// Deprecated as of 0.2, only use in cases where it was not previously available.
	pub(crate) fn channel_keys_id(&self) -> [u8; 32] {
	pub(crate) fn channel_keys_id(&self) -> ChannelKeysId {
 self.channel_keys_id
	}
}
Expand Down

20 changes: 15 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,9 @@ use crate::ln::script::{self, ShutdownScript};
use crate::ln::types::ChannelId;
use crate::routing::gossip::NodeId;
use crate::sign::ecdsa::EcdsaChannelSigner;
use crate::sign::{ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider};
use crate::sign::{
	ChannelKeysId, ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider,
};
use crate::types::features::{ChannelTypeFeatures, InitFeatures};
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::config::{
Expand DownExpand Up@@ -2483,9 +2485,9 @@ where
	/// The unique identifier used to re-derive the private key material for the channel through
	/// [`SignerProvider::derive_channel_signer`].
	#[cfg(not(any(test, feature = "_test_utils")))]
	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	#[cfg(any(test, feature = "_test_utils"))]
	pub channel_keys_id: [u8; 32],
	pub channel_keys_id: ChannelKeysId,

	/// If we can't release a [`ChannelMonitorUpdate`] until some external action completes, we
	/// store it here and only release it to the `ChannelManager` once it asks for it.
Expand DownExpand Up@@ -3353,7 +3355,7 @@ where
 outbound_scid_alias: u64,
 temporary_channel_id_fn: Option<impl Fn(&ChannelPublicKeys) -> ChannelId>,
 holder_selected_channel_reserve_satoshis: u64,
 channel_keys_id: [u8; 32],
 channel_keys_id: ChannelKeysId,
 holder_signer: <SP::Target as SignerProvider>::EcdsaSigner,
 _logger: L,
	) -> Result<(FundingScope, ChannelContext<SP>), APIError>
Expand DownExpand Up@@ -12368,7 +12370,7 @@ where
 (21, self.context.outbound_scid_alias, required),
 (23, initial_channel_ready_event_emitted, option),
 (25, user_id_high_opt, option),
 (27, self.context.channel_keys_id, required),
 (27, self.context.channel_keys_id.id, required),
 (28, holder_max_accepted_htlcs, option),
 (29, self.context.temporary_channel_id, option),
 (31, channel_pending_event_emitted, option),
Expand All@@ -12389,6 +12391,7 @@ where
 (58, self.interactive_tx_signing_session, option), // Added in 0.2
 (59, self.funding.minimum_depth_override, option), // Added in 0.2
 (60, self.context.historical_scids, optional_vec), // Added in 0.2
 (62, self.context.channel_keys_id.version, (no_write_default, 0)), // Added in 0.2
 });

 Ok(())
Expand DownExpand Up@@ -12680,6 +12683,7 @@ where

 let mut user_id_high_opt: Option<u64> = None;
 let mut channel_keys_id = [0u8; 32];
 let mut channel_keys_version = RequiredWrapper(None);
 let mut temporary_channel_id: Option<ChannelId> = None;
 let mut holder_max_accepted_htlcs: Option<u16> = None;

Expand DownExpand Up@@ -12753,8 +12757,14 @@ where
 (58, interactive_tx_signing_session, option), // Added in 0.2
 (59, minimum_depth_override, option), // Added in 0.2
 (60, historical_scids, optional_vec), // Added in 0.2
 (62, channel_keys_version, (default_value, 0)), // Added in 0.2
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 let holder_signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut iter = preimages.into_iter();
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
[Key derivation V2] Attach a version byte to channel_keys_id#3887

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

 Closed

tankyleo
wants to merge
1
commit into

from

 Closed


[Key derivation V2] Attach a version byte to channel_keys_id#3887
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


25 changes: 18 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ use crate::ln::channelmanager::{HTLCSource, PaymentClaimDetails, SentHTLCId};
use crate::ln::msgs::DecodeError;
use crate::ln::types::ChannelId;
use crate::sign::{
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, DelayedPaymentOutputDescriptor,
	EntropySource, HTLCDescriptor, SignerProvider, SpendableOutputDescriptor,
	StaticPaymentOutputDescriptor,
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, ChannelKeysId,
DelayedPaymentOutputDescriptor, EntropySource, HTLCDescriptor, SignerProvider,
SpendableOutputDescriptor, StaticPaymentOutputDescriptor,
};
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
Expand DownExpand Up@@ -1036,7 +1036,7 @@ pub(crate) struct ChannelMonitorImpl<Signer: EcdsaChannelSigner> {
	counterparty_payment_script: ScriptBuf,
	shutdown_script: Option<ScriptBuf>,

	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	holder_revocation_basepoint: RevocationBasepoint,
	channel_id: ChannelId,
	first_confirmed_funding_txo: OutPoint,
Expand DownExpand Up@@ -1297,7 +1297,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 None => ScriptBuf::new().write(writer)?,
 }

 self.channel_keys_id.write(writer)?;
 self.channel_keys_id.id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 let funding_outpoint = self.get_funding_txo();
 writer.write_all(&funding_outpoint.txid[..])?;
Expand DownExpand Up@@ -1461,6 +1461,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 (15, self.counterparty_fulfilled_htlcs, required),
 (17, self.initial_counterparty_commitment_info, option),
 (19, self.channel_id, required),
 (20, self.channel_keys_id.version, (no_write_default, 0)),
 (21, self.balances_empty_height, option),
 (23, self.holder_pays_commitment_tx_fee, option),
 (25, self.payment_preimages, required),
Expand DownExpand Up@@ -5126,7 +5127,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 if let Some(ref broadcasted_holder_revokable_script) = self.broadcasted_holder_revokable_script {
Expand DownExpand Up@@ -5156,7 +5158,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 }
Expand DownExpand Up@@ -5438,6 +5441,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut payment_preimages_with_info: Option<HashMap<_, _>> = None;
 let mut first_confirmed_funding_txo = RequiredWrapper(None);
 let mut channel_parameters = None;
 let mut channel_keys_version = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (1, funding_spend_confirmed, option),
 (3, htlcs_resolved_on_chain, optional_vec),
Expand All@@ -5449,13 +5453,20 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 (15, counterparty_fulfilled_htlcs, option),
 (17, initial_counterparty_commitment_info, option),
 (19, channel_id, option),
 (20, channel_keys_version, (default_value, 0)),
@tnulltnullJun 24, 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.

Same here, needs to be odd.
 (21, balances_empty_height, option),
 (23, holder_pays_commitment_tx_fee, option),
 (25, payment_preimages_with_info, option),
 (27, first_confirmed_funding_txo, (default_value, outpoint)),
 (29, initial_counterparty_commitment_tx, option),
 (31, channel_parameters, (option: ReadableArgs, None)),
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 if let Some(payment_preimages_with_info) = payment_preimages_with_info {
 if payment_preimages_with_info.len() != payment_preimages.len() {
 return Err(DecodeError::InvalidValue);
Expand Down

19 changes: 14 additions & 5 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use crate::ln::chan_utils::{
	self, ChannelTransactionParameters, HTLCOutputInCommitment, HolderCommitmentTransaction,
};
use crate::ln::msgs::DecodeError;
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider};
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider, ChannelKeysId};
use crate::util::logger::Logger;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -222,7 +222,7 @@ pub(crate) enum FeerateStrategy {
#[derive(Clone)]
pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	channel_value_satoshis: u64, // Deprecated as of 0.2.
	channel_keys_id: [u8; 32], // Deprecated as of 0.2.
	channel_keys_id: ChannelKeysId, // Deprecated as of 0.2.
	destination_script: ScriptBuf, // Deprecated as of 0.2.
	holder_commitment: HolderCommitmentTransaction,
	prev_holder_commitment: Option<HolderCommitmentTransaction>,
Expand DownExpand Up@@ -379,7 +379,6 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 bytes_read += bytes_to_read;
 }

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
Expand DownExpand Up@@ -416,8 +415,18 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }
 }

 // FIXME: Bump some serialization for this, or read this field elsewhere
 let channel_keys_version: u8 = Readable::read(reader)?;

 read_tlv_fields!(reader, {});

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version,
 };

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut secp_ctx = Secp256k1::new();
 secp_ctx.seeded_randomize(&entropy_source.get_secure_random_bytes());

Expand All@@ -441,7 +450,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP

impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	pub(crate) fn new(
 channel_value_satoshis: u64, channel_keys_id: [u8; 32], destination_script: ScriptBuf,
 channel_value_satoshis: u64, channel_keys_id: ChannelKeysId, destination_script: ScriptBuf,
 signer: ChannelSigner, channel_parameters: ChannelTransactionParameters,
 holder_commitment: HolderCommitmentTransaction, secp_ctx: Secp256k1<secp256k1::All>,
	) -> Self {
Expand DownExpand Up@@ -1222,7 +1231,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	}

	// Deprecated as of 0.2, only use in cases where it was not previously available.
	pub(crate) fn channel_keys_id(&self) -> [u8; 32] {
	pub(crate) fn channel_keys_id(&self) -> ChannelKeysId {
 self.channel_keys_id
	}
}
Expand Down

20 changes: 15 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,9 @@ use crate::ln::script::{self, ShutdownScript};
use crate::ln::types::ChannelId;
use crate::routing::gossip::NodeId;
use crate::sign::ecdsa::EcdsaChannelSigner;
use crate::sign::{ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider};
use crate::sign::{
	ChannelKeysId, ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider,
};
use crate::types::features::{ChannelTypeFeatures, InitFeatures};
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::config::{
Expand DownExpand Up@@ -2483,9 +2485,9 @@ where
	/// The unique identifier used to re-derive the private key material for the channel through
	/// [`SignerProvider::derive_channel_signer`].
	#[cfg(not(any(test, feature = "_test_utils")))]
	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	#[cfg(any(test, feature = "_test_utils"))]
	pub channel_keys_id: [u8; 32],
	pub channel_keys_id: ChannelKeysId,

	/// If we can't release a [`ChannelMonitorUpdate`] until some external action completes, we
	/// store it here and only release it to the `ChannelManager` once it asks for it.
Expand DownExpand Up@@ -3353,7 +3355,7 @@ where
 outbound_scid_alias: u64,
 temporary_channel_id_fn: Option<impl Fn(&ChannelPublicKeys) -> ChannelId>,
 holder_selected_channel_reserve_satoshis: u64,
 channel_keys_id: [u8; 32],
 channel_keys_id: ChannelKeysId,
 holder_signer: <SP::Target as SignerProvider>::EcdsaSigner,
 _logger: L,
	) -> Result<(FundingScope, ChannelContext<SP>), APIError>
Expand DownExpand Up@@ -12368,7 +12370,7 @@ where
 (21, self.context.outbound_scid_alias, required),
 (23, initial_channel_ready_event_emitted, option),
 (25, user_id_high_opt, option),
 (27, self.context.channel_keys_id, required),
 (27, self.context.channel_keys_id.id, required),
 (28, holder_max_accepted_htlcs, option),
 (29, self.context.temporary_channel_id, option),
 (31, channel_pending_event_emitted, option),
Expand All@@ -12389,6 +12391,7 @@ where
 (58, self.interactive_tx_signing_session, option), // Added in 0.2
 (59, self.funding.minimum_depth_override, option), // Added in 0.2
 (60, self.context.historical_scids, optional_vec), // Added in 0.2
 (62, self.context.channel_keys_id.version, (no_write_default, 0)), // Added in 0.2
 });

 Ok(())
Expand DownExpand Up@@ -12680,6 +12683,7 @@ where

 let mut user_id_high_opt: Option<u64> = None;
 let mut channel_keys_id = [0u8; 32];
 let mut channel_keys_version = RequiredWrapper(None);
 let mut temporary_channel_id: Option<ChannelId> = None;
 let mut holder_max_accepted_htlcs: Option<u16> = None;

Expand DownExpand Up@@ -12753,8 +12757,14 @@ where
 (58, interactive_tx_signing_session, option), // Added in 0.2
 (59, minimum_depth_override, option), // Added in 0.2
 (60, historical_scids, optional_vec), // Added in 0.2
 (62, channel_keys_version, (default_value, 0)), // Added in 0.2
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 let holder_signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut iter = preimages.into_iter();
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
[Key derivation V2] Attach a version byte to channel_keys_id#3887

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

 Closed

tankyleo
wants to merge
1
commit into

from

 Closed


[Key derivation V2] Attach a version byte to channel_keys_id#3887
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


25 changes: 18 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ use crate::ln::channelmanager::{HTLCSource, PaymentClaimDetails, SentHTLCId};
use crate::ln::msgs::DecodeError;
use crate::ln::types::ChannelId;
use crate::sign::{
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, DelayedPaymentOutputDescriptor,
	EntropySource, HTLCDescriptor, SignerProvider, SpendableOutputDescriptor,
	StaticPaymentOutputDescriptor,
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, ChannelKeysId,
DelayedPaymentOutputDescriptor, EntropySource, HTLCDescriptor, SignerProvider,
SpendableOutputDescriptor, StaticPaymentOutputDescriptor,
};
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
Expand DownExpand Up@@ -1036,7 +1036,7 @@ pub(crate) struct ChannelMonitorImpl<Signer: EcdsaChannelSigner> {
	counterparty_payment_script: ScriptBuf,
	shutdown_script: Option<ScriptBuf>,

	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	holder_revocation_basepoint: RevocationBasepoint,
	channel_id: ChannelId,
	first_confirmed_funding_txo: OutPoint,
Expand DownExpand Up@@ -1297,7 +1297,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 None => ScriptBuf::new().write(writer)?,
 }

 self.channel_keys_id.write(writer)?;
 self.channel_keys_id.id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 let funding_outpoint = self.get_funding_txo();
 writer.write_all(&funding_outpoint.txid[..])?;
Expand DownExpand Up@@ -1461,6 +1461,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 (15, self.counterparty_fulfilled_htlcs, required),
 (17, self.initial_counterparty_commitment_info, option),
 (19, self.channel_id, required),
 (20, self.channel_keys_id.version, (no_write_default, 0)),
 (21, self.balances_empty_height, option),
 (23, self.holder_pays_commitment_tx_fee, option),
 (25, self.payment_preimages, required),
Expand DownExpand Up@@ -5126,7 +5127,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 if let Some(ref broadcasted_holder_revokable_script) = self.broadcasted_holder_revokable_script {
Expand DownExpand Up@@ -5156,7 +5158,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 }
Expand DownExpand Up@@ -5438,6 +5441,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut payment_preimages_with_info: Option<HashMap<_, _>> = None;
 let mut first_confirmed_funding_txo = RequiredWrapper(None);
 let mut channel_parameters = None;
 let mut channel_keys_version = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (1, funding_spend_confirmed, option),
 (3, htlcs_resolved_on_chain, optional_vec),
Expand All@@ -5449,13 +5453,20 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 (15, counterparty_fulfilled_htlcs, option),
 (17, initial_counterparty_commitment_info, option),
 (19, channel_id, option),
 (20, channel_keys_version, (default_value, 0)),
@tnulltnullJun 24, 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.

Same here, needs to be odd.
 (21, balances_empty_height, option),
 (23, holder_pays_commitment_tx_fee, option),
 (25, payment_preimages_with_info, option),
 (27, first_confirmed_funding_txo, (default_value, outpoint)),
 (29, initial_counterparty_commitment_tx, option),
 (31, channel_parameters, (option: ReadableArgs, None)),
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 if let Some(payment_preimages_with_info) = payment_preimages_with_info {
 if payment_preimages_with_info.len() != payment_preimages.len() {
 return Err(DecodeError::InvalidValue);
Expand Down

19 changes: 14 additions & 5 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use crate::ln::chan_utils::{
	self, ChannelTransactionParameters, HTLCOutputInCommitment, HolderCommitmentTransaction,
};
use crate::ln::msgs::DecodeError;
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider};
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider, ChannelKeysId};
use crate::util::logger::Logger;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -222,7 +222,7 @@ pub(crate) enum FeerateStrategy {
#[derive(Clone)]
pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	channel_value_satoshis: u64, // Deprecated as of 0.2.
	channel_keys_id: [u8; 32], // Deprecated as of 0.2.
	channel_keys_id: ChannelKeysId, // Deprecated as of 0.2.
	destination_script: ScriptBuf, // Deprecated as of 0.2.
	holder_commitment: HolderCommitmentTransaction,
	prev_holder_commitment: Option<HolderCommitmentTransaction>,
Expand DownExpand Up@@ -379,7 +379,6 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 bytes_read += bytes_to_read;
 }

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
Expand DownExpand Up@@ -416,8 +415,18 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }
 }

 // FIXME: Bump some serialization for this, or read this field elsewhere
 let channel_keys_version: u8 = Readable::read(reader)?;

 read_tlv_fields!(reader, {});

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version,
 };

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut secp_ctx = Secp256k1::new();
 secp_ctx.seeded_randomize(&entropy_source.get_secure_random_bytes());

Expand All@@ -441,7 +450,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP

impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	pub(crate) fn new(
 channel_value_satoshis: u64, channel_keys_id: [u8; 32], destination_script: ScriptBuf,
 channel_value_satoshis: u64, channel_keys_id: ChannelKeysId, destination_script: ScriptBuf,
 signer: ChannelSigner, channel_parameters: ChannelTransactionParameters,
 holder_commitment: HolderCommitmentTransaction, secp_ctx: Secp256k1<secp256k1::All>,
	) -> Self {
Expand DownExpand Up@@ -1222,7 +1231,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	}

	// Deprecated as of 0.2, only use in cases where it was not previously available.
	pub(crate) fn channel_keys_id(&self) -> [u8; 32] {
	pub(crate) fn channel_keys_id(&self) -> ChannelKeysId {
 self.channel_keys_id
	}
}
Expand Down

20 changes: 15 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,9 @@ use crate::ln::script::{self, ShutdownScript};
use crate::ln::types::ChannelId;
use crate::routing::gossip::NodeId;
use crate::sign::ecdsa::EcdsaChannelSigner;
use crate::sign::{ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider};
use crate::sign::{
	ChannelKeysId, ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider,
};
use crate::types::features::{ChannelTypeFeatures, InitFeatures};
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::config::{
Expand DownExpand Up@@ -2483,9 +2485,9 @@ where
	/// The unique identifier used to re-derive the private key material for the channel through
	/// [`SignerProvider::derive_channel_signer`].
	#[cfg(not(any(test, feature = "_test_utils")))]
	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	#[cfg(any(test, feature = "_test_utils"))]
	pub channel_keys_id: [u8; 32],
	pub channel_keys_id: ChannelKeysId,

	/// If we can't release a [`ChannelMonitorUpdate`] until some external action completes, we
	/// store it here and only release it to the `ChannelManager` once it asks for it.
Expand DownExpand Up@@ -3353,7 +3355,7 @@ where
 outbound_scid_alias: u64,
 temporary_channel_id_fn: Option<impl Fn(&ChannelPublicKeys) -> ChannelId>,
 holder_selected_channel_reserve_satoshis: u64,
 channel_keys_id: [u8; 32],
 channel_keys_id: ChannelKeysId,
 holder_signer: <SP::Target as SignerProvider>::EcdsaSigner,
 _logger: L,
	) -> Result<(FundingScope, ChannelContext<SP>), APIError>
Expand DownExpand Up@@ -12368,7 +12370,7 @@ where
 (21, self.context.outbound_scid_alias, required),
 (23, initial_channel_ready_event_emitted, option),
 (25, user_id_high_opt, option),
 (27, self.context.channel_keys_id, required),
 (27, self.context.channel_keys_id.id, required),
 (28, holder_max_accepted_htlcs, option),
 (29, self.context.temporary_channel_id, option),
 (31, channel_pending_event_emitted, option),
Expand All@@ -12389,6 +12391,7 @@ where
 (58, self.interactive_tx_signing_session, option), // Added in 0.2
 (59, self.funding.minimum_depth_override, option), // Added in 0.2
 (60, self.context.historical_scids, optional_vec), // Added in 0.2
 (62, self.context.channel_keys_id.version, (no_write_default, 0)), // Added in 0.2
 });

 Ok(())
Expand DownExpand Up@@ -12680,6 +12683,7 @@ where

 let mut user_id_high_opt: Option<u64> = None;
 let mut channel_keys_id = [0u8; 32];
 let mut channel_keys_version = RequiredWrapper(None);
 let mut temporary_channel_id: Option<ChannelId> = None;
 let mut holder_max_accepted_htlcs: Option<u16> = None;

Expand DownExpand Up@@ -12753,8 +12757,14 @@ where
 (58, interactive_tx_signing_session, option), // Added in 0.2
 (59, minimum_depth_override, option), // Added in 0.2
 (60, historical_scids, optional_vec), // Added in 0.2
 (62, channel_keys_version, (default_value, 0)), // Added in 0.2
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 let holder_signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut iter = preimages.into_iter();
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
[Key derivation V2] Attach a version byte to channel_keys_id#3887

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

 Closed

tankyleo
wants to merge
1
commit into

from

 Closed


[Key derivation V2] Attach a version byte to channel_keys_id#3887
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


25 changes: 18 additions & 7 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,9 @@ use crate::ln::channelmanager::{HTLCSource, PaymentClaimDetails, SentHTLCId};
use crate::ln::msgs::DecodeError;
use crate::ln::types::ChannelId;
use crate::sign::{
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, DelayedPaymentOutputDescriptor,
	EntropySource, HTLCDescriptor, SignerProvider, SpendableOutputDescriptor,
	StaticPaymentOutputDescriptor,
	ecdsa::EcdsaChannelSigner, ChannelDerivationParameters, ChannelKeysId,
DelayedPaymentOutputDescriptor, EntropySource, HTLCDescriptor, SignerProvider,
SpendableOutputDescriptor, StaticPaymentOutputDescriptor,
};
use crate::types::features::ChannelTypeFeatures;
use crate::types::payment::{PaymentHash, PaymentPreimage};
Expand DownExpand Up@@ -1036,7 +1036,7 @@ pub(crate) struct ChannelMonitorImpl<Signer: EcdsaChannelSigner> {
	counterparty_payment_script: ScriptBuf,
	shutdown_script: Option<ScriptBuf>,

	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	holder_revocation_basepoint: RevocationBasepoint,
	channel_id: ChannelId,
	first_confirmed_funding_txo: OutPoint,
Expand DownExpand Up@@ -1297,7 +1297,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 None => ScriptBuf::new().write(writer)?,
 }

 self.channel_keys_id.write(writer)?;
 self.channel_keys_id.id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 let funding_outpoint = self.get_funding_txo();
 writer.write_all(&funding_outpoint.txid[..])?;
Expand DownExpand Up@@ -1461,6 +1461,7 @@ impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 (15, self.counterparty_fulfilled_htlcs, required),
 (17, self.initial_counterparty_commitment_info, option),
 (19, self.channel_id, required),
 (20, self.channel_keys_id.version, (no_write_default, 0)),
 (21, self.balances_empty_height, option),
 (23, self.holder_pays_commitment_tx_fee, option),
 (25, self.payment_preimages, required),
Expand DownExpand Up@@ -5126,7 +5127,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 if let Some(ref broadcasted_holder_revokable_script) = self.broadcasted_holder_revokable_script {
Expand DownExpand Up@@ -5156,7 +5158,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 spendable_outputs.push(SpendableOutputDescriptor::StaticOutput {
 outpoint: OutPoint { txid: tx.compute_txid(), index: i as u16 },
 output: outp.clone(),
 channel_keys_id: Some(self.channel_keys_id),
 channel_keys_id: Some(self.channel_keys_id.id),
 channel_keys_version: self.channel_keys_id.version,
 });
 }
 }
Expand DownExpand Up@@ -5438,6 +5441,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 let mut payment_preimages_with_info: Option<HashMap<_, _>> = None;
 let mut first_confirmed_funding_txo = RequiredWrapper(None);
 let mut channel_parameters = None;
 let mut channel_keys_version = RequiredWrapper(None);
 read_tlv_fields!(reader, {
 (1, funding_spend_confirmed, option),
 (3, htlcs_resolved_on_chain, optional_vec),
Expand All@@ -5449,13 +5453,20 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 (15, counterparty_fulfilled_htlcs, option),
 (17, initial_counterparty_commitment_info, option),
 (19, channel_id, option),
 (20, channel_keys_version, (default_value, 0)),
@tnulltnullJun 24, 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.

Same here, needs to be odd.
 (21, balances_empty_height, option),
 (23, holder_pays_commitment_tx_fee, option),
 (25, payment_preimages_with_info, option),
 (27, first_confirmed_funding_txo, (default_value, outpoint)),
 (29, initial_counterparty_commitment_tx, option),
 (31, channel_parameters, (option: ReadableArgs, None)),
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 if let Some(payment_preimages_with_info) = payment_preimages_with_info {
 if payment_preimages_with_info.len() != payment_preimages.len() {
 return Err(DecodeError::InvalidValue);
Expand Down

19 changes: 14 additions & 5 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use crate::ln::chan_utils::{
	self, ChannelTransactionParameters, HTLCOutputInCommitment, HolderCommitmentTransaction,
};
use crate::ln::msgs::DecodeError;
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider};
use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, HTLCDescriptor, SignerProvider, ChannelKeysId};
use crate::util::logger::Logger;
use crate::util::ser::{
	MaybeReadable, Readable, ReadableArgs, UpgradableRequired, Writeable, Writer,
Expand DownExpand Up@@ -222,7 +222,7 @@ pub(crate) enum FeerateStrategy {
#[derive(Clone)]
pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	channel_value_satoshis: u64, // Deprecated as of 0.2.
	channel_keys_id: [u8; 32], // Deprecated as of 0.2.
	channel_keys_id: ChannelKeysId, // Deprecated as of 0.2.
	destination_script: ScriptBuf, // Deprecated as of 0.2.
	holder_commitment: HolderCommitmentTransaction,
	prev_holder_commitment: Option<HolderCommitmentTransaction>,
Expand DownExpand Up@@ -379,7 +379,6 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 bytes_read += bytes_to_read;
 }

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let pending_claim_requests_len: u64 = Readable::read(reader)?;
 let mut pending_claim_requests = hash_map_with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));
Expand DownExpand Up@@ -416,8 +415,18 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 }
 }

 // FIXME: Bump some serialization for this, or read this field elsewhere
 let channel_keys_version: u8 = Readable::read(reader)?;

 read_tlv_fields!(reader, {});

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version,
 };

 let signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut secp_ctx = Secp256k1::new();
 secp_ctx.seeded_randomize(&entropy_source.get_secure_random_bytes());

Expand All@@ -441,7 +450,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP

impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	pub(crate) fn new(
 channel_value_satoshis: u64, channel_keys_id: [u8; 32], destination_script: ScriptBuf,
 channel_value_satoshis: u64, channel_keys_id: ChannelKeysId, destination_script: ScriptBuf,
 signer: ChannelSigner, channel_parameters: ChannelTransactionParameters,
 holder_commitment: HolderCommitmentTransaction, secp_ctx: Secp256k1<secp256k1::All>,
	) -> Self {
Expand DownExpand Up@@ -1222,7 +1231,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
	}

	// Deprecated as of 0.2, only use in cases where it was not previously available.
	pub(crate) fn channel_keys_id(&self) -> [u8; 32] {
	pub(crate) fn channel_keys_id(&self) -> ChannelKeysId {
 self.channel_keys_id
	}
}
Expand Down

20 changes: 15 additions & 5 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,9 @@ use crate::ln::script::{self, ShutdownScript};
use crate::ln::types::ChannelId;
use crate::routing::gossip::NodeId;
use crate::sign::ecdsa::EcdsaChannelSigner;
use crate::sign::{ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider};
use crate::sign::{
	ChannelKeysId, ChannelSigner, EntropySource, NodeSigner, Recipient, SignerProvider,
};
use crate::types::features::{ChannelTypeFeatures, InitFeatures};
use crate::types::payment::{PaymentHash, PaymentPreimage};
use crate::util::config::{
Expand DownExpand Up@@ -2483,9 +2485,9 @@ where
	/// The unique identifier used to re-derive the private key material for the channel through
	/// [`SignerProvider::derive_channel_signer`].
	#[cfg(not(any(test, feature = "_test_utils")))]
	channel_keys_id: [u8; 32],
	channel_keys_id: ChannelKeysId,
	#[cfg(any(test, feature = "_test_utils"))]
	pub channel_keys_id: [u8; 32],
	pub channel_keys_id: ChannelKeysId,

	/// If we can't release a [`ChannelMonitorUpdate`] until some external action completes, we
	/// store it here and only release it to the `ChannelManager` once it asks for it.
Expand DownExpand Up@@ -3353,7 +3355,7 @@ where
 outbound_scid_alias: u64,
 temporary_channel_id_fn: Option<impl Fn(&ChannelPublicKeys) -> ChannelId>,
 holder_selected_channel_reserve_satoshis: u64,
 channel_keys_id: [u8; 32],
 channel_keys_id: ChannelKeysId,
 holder_signer: <SP::Target as SignerProvider>::EcdsaSigner,
 _logger: L,
	) -> Result<(FundingScope, ChannelContext<SP>), APIError>
Expand DownExpand Up@@ -12368,7 +12370,7 @@ where
 (21, self.context.outbound_scid_alias, required),
 (23, initial_channel_ready_event_emitted, option),
 (25, user_id_high_opt, option),
 (27, self.context.channel_keys_id, required),
 (27, self.context.channel_keys_id.id, required),
 (28, holder_max_accepted_htlcs, option),
 (29, self.context.temporary_channel_id, option),
 (31, channel_pending_event_emitted, option),
Expand All@@ -12389,6 +12391,7 @@ where
 (58, self.interactive_tx_signing_session, option), // Added in 0.2
 (59, self.funding.minimum_depth_override, option), // Added in 0.2
 (60, self.context.historical_scids, optional_vec), // Added in 0.2
 (62, self.context.channel_keys_id.version, (no_write_default, 0)), // Added in 0.2
 });

 Ok(())
Expand DownExpand Up@@ -12680,6 +12683,7 @@ where

 let mut user_id_high_opt: Option<u64> = None;
 let mut channel_keys_id = [0u8; 32];
 let mut channel_keys_version = RequiredWrapper(None);
 let mut temporary_channel_id: Option<ChannelId> = None;
 let mut holder_max_accepted_htlcs: Option<u16> = None;

Expand DownExpand Up@@ -12753,8 +12757,14 @@ where
 (58, interactive_tx_signing_session, option), // Added in 0.2
 (59, minimum_depth_override, option), // Added in 0.2
 (60, historical_scids, optional_vec), // Added in 0.2
 (62, channel_keys_version, (default_value, 0)), // Added in 0.2
 });

 let channel_keys_id = ChannelKeysId {
 id: channel_keys_id,
 version: channel_keys_version.0.unwrap(),
 };

 let holder_signer = signer_provider.derive_channel_signer(channel_keys_id);

 let mut iter = preimages.into_iter();
Expand Down
Loading