Skip to content

Make payment_key derivation deterministic #3391

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
wants to merge 10 commits into from
Closed

Make payment_key derivation deterministic #3391

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6dfe913
Drop `InMemorySigner` `Writeable` impl
tnull Sep 23, 2024
75c2b0a
Rename `payment_key` to `payment_basepoint` in `chan_utils`
tnull Sep 25, 2024
611c1a3
Rename `params` to `channel_keys_id` and take it by value
tnull Sep 25, 2024
6be731e
Rename `keys_id` to `channel_keys_id`
tnull Sep 28, 2024
ed2d63e
Rename `payment_point` to `payment_basepoint`
tnull Oct 31, 2024
aea8e5e
Make `payment_key` derivation deterministic
tnull Nov 6, 2024
a781d23
f Adjust test cases to accommodate new derivation scheme
tnull Oct 31, 2024
bf14ec8
f Allow legacy keys derivation for `test_restored_packages_retry`
tnull Nov 6, 2024
c70f7ec
Have `SignerProvider::get_shutdown_scriptpubkey` take `channel_keys_id`
tnull Nov 6, 2024
8991d74
Drop outdated comment
tnull Nov 11, 2024
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
6 changes: 3 additions & 3 deletions lightning/src/ln/chan_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,11 +550,11 @@ pub fn get_revokeable_redeemscript(revocation_key: &RevocationKey, contest_delay

/// Returns the script for the counterparty's output on a holder's commitment transaction based on
/// the channel type.
pub fn get_counterparty_payment_script(channel_type_features: &ChannelTypeFeatures, payment_key: &PublicKey) -> ScriptBuf {
pub fn get_counterparty_payment_script(channel_type_features: &ChannelTypeFeatures, payment_basepoint: &PublicKey) -> ScriptBuf {
if channel_type_features.supports_anchors_zero_fee_htlc_tx() {
get_to_countersignatory_with_anchors_redeemscript(payment_key).to_p2wsh()
get_to_countersignatory_with_anchors_redeemscript(payment_basepoint).to_p2wsh()
} else {
ScriptBuf::new_p2wpkh(&WPubkeyHash::hash(&payment_key.serialize()))
ScriptBuf::new_p2wpkh(&WPubkeyHash::hash(&payment_basepoint.serialize()))
Copy link
Collaborator

@TheBlueMatt TheBlueMatt Nov 25, 2024

Choose a reason for hiding this comment

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

I'm quite confused by this. The point of calling it a "key" and not a "basepoint" is that the script is paid directly to the key (in this case as a P2WPKH) rather than incorporating the per_commitment_secret/per_commitment_point when building t the output.

}
}

Expand Down