Skip to content

Require static_remotekey#539

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 5 commits into from
May 6, 2020
Merged

Require static_remotekey #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fb482a
Add additional trace logging in channel signature validation
TheBlueMatt Apr 28, 2020
18981a0
Check local signtures explicitly in channel tx-generation tests
TheBlueMatt Mar 9, 2020
22dded7
Add detection of feature_static_remotekey support and print
TheBlueMatt Mar 3, 2020
babf0af
Require option_static_remotekey in channel/channelmonitor.
TheBlueMatt May 3, 2020
07db23d
Rename payment_basepoint/key to simply payment_point/key.
TheBlueMatt Mar 9, 2020
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
30 changes: 15 additions & 15 deletions fuzz/src/full_stack.rs
View file
Open in desktop

Large diffs are not rendered by default.

39 changes: 21 additions & 18 deletions lightning/src/chain/keysinterface.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,8 @@ pub enum SpendableOutputDescriptor {
/// The output which is referenced by the given outpoint
output: TxOut,
},
// TODO: Note that because key is now static and exactly what is provided by us, we should drop
// this in favor of StaticOutput:
/// An output to a P2WPKH, spendable exclusively by the given private key.
/// The witness in the spending input, is, thus, simply:
/// <BIP 143 signature generated with the given key> <public key derived from the given key>
Expand DownExpand Up@@ -194,9 +196,10 @@ pub trait ChannelKeys : Send+Clone {
fn funding_key<'a>(&'a self) -> &'a SecretKey;
/// Gets the local secret key for blinded revocation pubkey
fn revocation_base_key<'a>(&'a self) -> &'a SecretKey;
/// Gets the local secret key used in to_remote output of remote commitment tx
/// (and also as part of obscured commitment number)
fn payment_base_key<'a>(&'a self) -> &'a SecretKey;
/// Gets the local secret key used in the to_remote output of remote commitment tx (ie the
/// output to us in transactions our counterparty broadcasts).
/// Also as part of obscured commitment number.
fn payment_key<'a>(&'a self) -> &'a SecretKey;
/// Gets the local secret key used in HTLC-Success/HTLC-Timeout txn and to_local output
fn delayed_payment_base_key<'a>(&'a self) -> &'a SecretKey;
/// Gets the local htlc secret key used in commitment tx htlc outputs
Expand DownExpand Up@@ -273,8 +276,8 @@ pub struct InMemoryChannelKeys {
funding_key: SecretKey,
/// Local secret key for blinded revocation pubkey
revocation_base_key: SecretKey,
/// Local secret key used in commitment tx htlc outputs
payment_base_key: SecretKey,
/// Local secret key used for our balance in remote-broadcasted commitment transactions
payment_key: SecretKey,
/// Local secret key used in HTLC tx
delayed_payment_base_key: SecretKey,
/// Local htlc secret key used in commitment tx htlc outputs
Expand All@@ -295,19 +298,19 @@ impl InMemoryChannelKeys {
secp_ctx: &Secp256k1<C>,
funding_key: SecretKey,
revocation_base_key: SecretKey,
payment_base_key: SecretKey,
payment_key: SecretKey,
delayed_payment_base_key: SecretKey,
htlc_base_key: SecretKey,
commitment_seed: [u8; 32],
channel_value_satoshis: u64) -> InMemoryChannelKeys {
let local_channel_pubkeys =
InMemoryChannelKeys::make_local_keys(secp_ctx, &funding_key, &revocation_base_key,
&payment_base_key, &delayed_payment_base_key,
&payment_key, &delayed_payment_base_key,
&htlc_base_key);
InMemoryChannelKeys {
funding_key,
revocation_base_key,
payment_base_key,
payment_key,
delayed_payment_base_key,
htlc_base_key,
commitment_seed,
Expand All@@ -320,14 +323,14 @@ impl InMemoryChannelKeys {
fn make_local_keys<C: Signing>(secp_ctx: &Secp256k1<C>,
funding_key: &SecretKey,
revocation_base_key: &SecretKey,
payment_base_key: &SecretKey,
payment_key: &SecretKey,
delayed_payment_base_key: &SecretKey,
htlc_base_key: &SecretKey) -> ChannelPublicKeys {
let from_secret = |s: &SecretKey| PublicKey::from_secret_key(secp_ctx, s);
ChannelPublicKeys {
funding_pubkey: from_secret(&funding_key),
revocation_basepoint: from_secret(&revocation_base_key),
payment_basepoint: from_secret(&payment_base_key),
payment_point: from_secret(&payment_key),
delayed_payment_basepoint: from_secret(&delayed_payment_base_key),
htlc_basepoint: from_secret(&htlc_base_key),
}
Expand All@@ -337,7 +340,7 @@ impl InMemoryChannelKeys {
impl ChannelKeys for InMemoryChannelKeys {
fn funding_key(&self) -> &SecretKey { &self.funding_key }
fn revocation_base_key(&self) -> &SecretKey { &self.revocation_base_key }
fn payment_base_key(&self) -> &SecretKey { &self.payment_base_key }
fn payment_key(&self) -> &SecretKey { &self.payment_key }
fn delayed_payment_base_key(&self) -> &SecretKey { &self.delayed_payment_base_key }
fn htlc_base_key(&self) -> &SecretKey { &self.htlc_base_key }
fn commitment_seed(&self) -> &[u8; 32] { &self.commitment_seed }
Expand DownExpand Up@@ -422,7 +425,7 @@ impl Writeable for InMemoryChannelKeys {
fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
self.funding_key.write(writer)?;
self.revocation_base_key.write(writer)?;
self.payment_base_key.write(writer)?;
self.payment_key.write(writer)?;
self.delayed_payment_base_key.write(writer)?;
self.htlc_base_key.write(writer)?;
self.commitment_seed.write(writer)?;
Expand All@@ -437,7 +440,7 @@ impl Readable for InMemoryChannelKeys {
fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
let funding_key = Readable::read(reader)?;
let revocation_base_key = Readable::read(reader)?;
let payment_base_key = Readable::read(reader)?;
let payment_key = Readable::read(reader)?;
let delayed_payment_base_key = Readable::read(reader)?;
let htlc_base_key = Readable::read(reader)?;
let commitment_seed = Readable::read(reader)?;
Expand All@@ -446,13 +449,13 @@ impl Readable for InMemoryChannelKeys {
let secp_ctx = Secp256k1::signing_only();
let local_channel_pubkeys =
InMemoryChannelKeys::make_local_keys(&secp_ctx, &funding_key, &revocation_base_key,
&payment_base_key, &delayed_payment_base_key,
&payment_key, &delayed_payment_base_key,
&htlc_base_key);

Ok(InMemoryChannelKeys {
funding_key,
revocation_base_key,
payment_base_key,
payment_key,
delayed_payment_base_key,
htlc_base_key,
commitment_seed,
Expand DownExpand Up@@ -598,15 +601,15 @@ impl KeysInterface for KeysManager {
}
let funding_key = key_step!(b"funding key", commitment_seed);
let revocation_base_key = key_step!(b"revocation base key", funding_key);
let payment_base_key = key_step!(b"payment base key", revocation_base_key);
let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_base_key);
let payment_key = key_step!(b"payment key", revocation_base_key);
let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_key);
let htlc_base_key = key_step!(b"HTLC base key", delayed_payment_base_key);

InMemoryChannelKeys::new(
&self.secp_ctx,
funding_key,
revocation_base_key,
payment_base_key,
payment_key,
delayed_payment_base_key,
htlc_base_key,
commitment_seed,
Expand Down
17 changes: 7 additions & 10 deletions lightning/src/ln/chan_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -262,11 +262,9 @@ pub struct TxCreationKeys {
pub(crate) b_htlc_key: PublicKey,
/// A's Payment Key (which isn't allowed to be spent from for some delay)
pub(crate) a_delayed_payment_key: PublicKey,
/// B's Payment Key
pub(crate) b_payment_key: PublicKey,
}
impl_writeable!(TxCreationKeys, 33*6,
{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key, b_payment_key });
{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key });

/// One counterparty's public keys which do not change over the life of a channel.
#[derive(Clone, PartialEq)]
Expand All@@ -279,9 +277,10 @@ pub struct ChannelPublicKeys {
/// a commitment transaction so that their counterparty can claim all available funds if they
/// broadcast an old state.
pub revocation_basepoint: PublicKey,
/// The base point which is used (with derive_public_key) to derive a per-commitment payment
/// public key which receives immediately-spendable non-HTLC-encumbered funds.
pub payment_basepoint: PublicKey,
/// The public key which receives our immediately spendable primary channel balance in
/// remote-broadcasted commitment transactions. This key is static across every commitment
/// transaction.
pub payment_point: PublicKey,
/// The base point which is used (with derive_public_key) to derive a per-commitment payment
/// public key which receives non-HTLC-encumbered funds which are only available for spending
/// after some delay (or can be claimed via the revocation path).
Expand All@@ -294,21 +293,20 @@ pub struct ChannelPublicKeys {
impl_writeable!(ChannelPublicKeys, 33*5, {
funding_pubkey,
revocation_basepoint,
payment_basepoint,
payment_point,
delayed_payment_basepoint,
htlc_basepoint
});


impl TxCreationKeys {
pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_payment_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
Ok(TxCreationKeys {
per_commitment_point: per_commitment_point.clone(),
revocation_key: derive_public_revocation_key(&secp_ctx, &per_commitment_point, &b_revocation_base)?,
a_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_htlc_base)?,
b_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_htlc_base)?,
a_delayed_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_delayed_payment_base)?,
b_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_payment_base)?,
})
}
}
Expand DownExpand Up@@ -537,7 +535,6 @@ impl LocalCommitmentTransaction {
a_htlc_key: dummy_key.clone(),
b_htlc_key: dummy_key.clone(),
a_delayed_payment_key: dummy_key.clone(),
b_payment_key: dummy_key.clone(),
},
feerate_per_kw: 0,
per_htlc: Vec::new()
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Require static_remotekey by TheBlueMatt · Pull Request #539 · lightningdevkit/rust-lightning · GitHub
Skip to content
Require static_remotekey#539

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

May 6, 2020
 Merged


Require static_remotekey
#539
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
3fb482a

Add additional trace logging in channel signature validation


TheBlueMatt Apr 28, 2020
18981a0

Check local signtures explicitly in channel tx-generation tests


TheBlueMatt Mar 9, 2020
22dded7

Add detection of feature_static_remotekey support and print


TheBlueMatt Mar 3, 2020
babf0af

Require option_static_remotekey in channel/channelmonitor.


TheBlueMatt May 3, 2020
07db23d

Rename payment_basepoint/key to simply payment_point/key.


TheBlueMatt Mar 9, 2020

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


30 changes: 15 additions & 15 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


39 changes: 21 additions & 18 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,8 @@ pub enum SpendableOutputDescriptor {
 /// The output which is referenced by the given outpoint
 output: TxOut,
	},
	// TODO: Note that because key is now static and exactly what is provided by us, we should drop
	// this in favor of StaticOutput:
	/// An output to a P2WPKH, spendable exclusively by the given private key.
	/// The witness in the spending input, is, thus, simply:
	/// <BIP 143 signature generated with the given key> <public key derived from the given key>
Expand DownExpand Up@@ -194,9 +196,10 @@ pub trait ChannelKeys : Send+Clone {
	fn funding_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key for blinded revocation pubkey
	fn revocation_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in to_remote output of remote commitment tx
	/// (and also as part of obscured commitment number)
	fn payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in the to_remote output of remote commitment tx (ie the
	/// output to us in transactions our counterparty broadcasts).
	/// Also as part of obscured commitment number.
	fn payment_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in HTLC-Success/HTLC-Timeout txn and to_local output
	fn delayed_payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local htlc secret key used in commitment tx htlc outputs
Expand DownExpand Up@@ -273,8 +276,8 @@ pub struct InMemoryChannelKeys {
	funding_key: SecretKey,
	/// Local secret key for blinded revocation pubkey
	revocation_base_key: SecretKey,
	/// Local secret key used in commitment tx htlc outputs
payment_base_key: SecretKey,
	/// Local secret key used for our balance in remote-broadcasted commitment transactions
payment_key: SecretKey,
	/// Local secret key used in HTLC tx
	delayed_payment_base_key: SecretKey,
	/// Local htlc secret key used in commitment tx htlc outputs
Expand All@@ -295,19 +298,19 @@ impl InMemoryChannelKeys {
 secp_ctx: &Secp256k1<C>,
 funding_key: SecretKey,
 revocation_base_key: SecretKey,
payment_base_key: SecretKey,
payment_key: SecretKey,
 delayed_payment_base_key: SecretKey,
 htlc_base_key: SecretKey,
 commitment_seed: [u8; 32],
 channel_value_satoshis: u64) -> InMemoryChannelKeys {
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);
 InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand All@@ -320,14 +323,14 @@ impl InMemoryChannelKeys {
	fn make_local_keys<C: Signing>(secp_ctx: &Secp256k1<C>,
 funding_key: &SecretKey,
 revocation_base_key: &SecretKey,
payment_base_key: &SecretKey,
payment_key: &SecretKey,
 delayed_payment_base_key: &SecretKey,
 htlc_base_key: &SecretKey) -> ChannelPublicKeys {
 let from_secret = |s: &SecretKey| PublicKey::from_secret_key(secp_ctx, s);
 ChannelPublicKeys {
 funding_pubkey: from_secret(&funding_key),
 revocation_basepoint: from_secret(&revocation_base_key),
payment_basepoint: from_secret(&payment_base_key),
payment_point: from_secret(&payment_key),
 delayed_payment_basepoint: from_secret(&delayed_payment_base_key),
 htlc_basepoint: from_secret(&htlc_base_key),
 }
Expand All@@ -337,7 +340,7 @@ impl InMemoryChannelKeys {
impl ChannelKeys for InMemoryChannelKeys {
	fn funding_key(&self) -> &SecretKey { &self.funding_key }
	fn revocation_base_key(&self) -> &SecretKey { &self.revocation_base_key }
	fn payment_base_key(&self) -> &SecretKey { &self.payment_base_key }
	fn payment_key(&self) -> &SecretKey { &self.payment_key }
	fn delayed_payment_base_key(&self) -> &SecretKey { &self.delayed_payment_base_key }
	fn htlc_base_key(&self) -> &SecretKey { &self.htlc_base_key }
	fn commitment_seed(&self) -> &[u8; 32] { &self.commitment_seed }
Expand DownExpand Up@@ -422,7 +425,7 @@ impl Writeable for InMemoryChannelKeys {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
 self.funding_key.write(writer)?;
 self.revocation_base_key.write(writer)?;
 self.payment_base_key.write(writer)?;
 self.payment_key.write(writer)?;
 self.delayed_payment_base_key.write(writer)?;
 self.htlc_base_key.write(writer)?;
 self.commitment_seed.write(writer)?;
Expand All@@ -437,7 +440,7 @@ impl Readable for InMemoryChannelKeys {
	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 let funding_key = Readable::read(reader)?;
 let revocation_base_key = Readable::read(reader)?;
 let payment_base_key = Readable::read(reader)?;
 let payment_key = Readable::read(reader)?;
 let delayed_payment_base_key = Readable::read(reader)?;
 let htlc_base_key = Readable::read(reader)?;
 let commitment_seed = Readable::read(reader)?;
Expand All@@ -446,13 +449,13 @@ impl Readable for InMemoryChannelKeys {
 let secp_ctx = Secp256k1::signing_only();
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(&secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);

 Ok(InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand DownExpand Up@@ -598,15 +601,15 @@ impl KeysInterface for KeysManager {
 }
 let funding_key = key_step!(b"funding key", commitment_seed);
 let revocation_base_key = key_step!(b"revocation base key", funding_key);
 let payment_base_key = key_step!(b"payment base key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_base_key);
 let payment_key = key_step!(b"payment key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_key);
 let htlc_base_key = key_step!(b"HTLC base key", delayed_payment_base_key);

 InMemoryChannelKeys::new(
 &self.secp_ctx,
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand Down

17 changes: 7 additions & 10 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,11 +262,9 @@ pub struct TxCreationKeys {
	pub(crate) b_htlc_key: PublicKey,
	/// A's Payment Key (which isn't allowed to be spent from for some delay)
	pub(crate) a_delayed_payment_key: PublicKey,
	/// B's Payment Key
	pub(crate) b_payment_key: PublicKey,
}
impl_writeable!(TxCreationKeys, 33*6,
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key, b_payment_key });
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key });

/// One counterparty's public keys which do not change over the life of a channel.
#[derive(Clone, PartialEq)]
Expand All@@ -279,9 +277,10 @@ pub struct ChannelPublicKeys {
	/// a commitment transaction so that their counterparty can claim all available funds if they
	/// broadcast an old state.
	pub revocation_basepoint: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives immediately-spendable non-HTLC-encumbered funds.
	pub payment_basepoint: PublicKey,
	/// The public key which receives our immediately spendable primary channel balance in
	/// remote-broadcasted commitment transactions. This key is static across every commitment
	/// transaction.
	pub payment_point: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives non-HTLC-encumbered funds which are only available for spending
	/// after some delay (or can be claimed via the revocation path).
Expand All@@ -294,21 +293,20 @@ pub struct ChannelPublicKeys {
impl_writeable!(ChannelPublicKeys, 33*5, {
	funding_pubkey,
	revocation_basepoint,
payment_basepoint,
payment_point,
	delayed_payment_basepoint,
	htlc_basepoint
});


impl TxCreationKeys {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_payment_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
 Ok(TxCreationKeys {
 per_commitment_point: per_commitment_point.clone(),
 revocation_key: derive_public_revocation_key(&secp_ctx, &per_commitment_point, &b_revocation_base)?,
 a_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_htlc_base)?,
 b_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_htlc_base)?,
 a_delayed_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_delayed_payment_base)?,
 b_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_payment_base)?,
 })
	}
}
Expand DownExpand Up@@ -537,7 +535,6 @@ impl LocalCommitmentTransaction {
 a_htlc_key: dummy_key.clone(),
 b_htlc_key: dummy_key.clone(),
 a_delayed_payment_key: dummy_key.clone(),
 b_payment_key: dummy_key.clone(),
 },
 feerate_per_kw: 0,
 per_htlc: Vec::new()
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

May 6, 2020
 Merged


Require static_remotekey
#539
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
3fb482a

Add additional trace logging in channel signature validation


TheBlueMatt Apr 28, 2020
18981a0

Check local signtures explicitly in channel tx-generation tests


TheBlueMatt Mar 9, 2020
22dded7

Add detection of feature_static_remotekey support and print


TheBlueMatt Mar 3, 2020
babf0af

Require option_static_remotekey in channel/channelmonitor.


TheBlueMatt May 3, 2020
07db23d

Rename payment_basepoint/key to simply payment_point/key.


TheBlueMatt Mar 9, 2020

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


30 changes: 15 additions & 15 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


39 changes: 21 additions & 18 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,8 @@ pub enum SpendableOutputDescriptor {
 /// The output which is referenced by the given outpoint
 output: TxOut,
	},
	// TODO: Note that because key is now static and exactly what is provided by us, we should drop
	// this in favor of StaticOutput:
	/// An output to a P2WPKH, spendable exclusively by the given private key.
	/// The witness in the spending input, is, thus, simply:
	/// <BIP 143 signature generated with the given key> <public key derived from the given key>
Expand DownExpand Up@@ -194,9 +196,10 @@ pub trait ChannelKeys : Send+Clone {
	fn funding_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key for blinded revocation pubkey
	fn revocation_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in to_remote output of remote commitment tx
	/// (and also as part of obscured commitment number)
	fn payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in the to_remote output of remote commitment tx (ie the
	/// output to us in transactions our counterparty broadcasts).
	/// Also as part of obscured commitment number.
	fn payment_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in HTLC-Success/HTLC-Timeout txn and to_local output
	fn delayed_payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local htlc secret key used in commitment tx htlc outputs
Expand DownExpand Up@@ -273,8 +276,8 @@ pub struct InMemoryChannelKeys {
	funding_key: SecretKey,
	/// Local secret key for blinded revocation pubkey
	revocation_base_key: SecretKey,
	/// Local secret key used in commitment tx htlc outputs
payment_base_key: SecretKey,
	/// Local secret key used for our balance in remote-broadcasted commitment transactions
payment_key: SecretKey,
	/// Local secret key used in HTLC tx
	delayed_payment_base_key: SecretKey,
	/// Local htlc secret key used in commitment tx htlc outputs
Expand All@@ -295,19 +298,19 @@ impl InMemoryChannelKeys {
 secp_ctx: &Secp256k1<C>,
 funding_key: SecretKey,
 revocation_base_key: SecretKey,
payment_base_key: SecretKey,
payment_key: SecretKey,
 delayed_payment_base_key: SecretKey,
 htlc_base_key: SecretKey,
 commitment_seed: [u8; 32],
 channel_value_satoshis: u64) -> InMemoryChannelKeys {
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);
 InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand All@@ -320,14 +323,14 @@ impl InMemoryChannelKeys {
	fn make_local_keys<C: Signing>(secp_ctx: &Secp256k1<C>,
 funding_key: &SecretKey,
 revocation_base_key: &SecretKey,
payment_base_key: &SecretKey,
payment_key: &SecretKey,
 delayed_payment_base_key: &SecretKey,
 htlc_base_key: &SecretKey) -> ChannelPublicKeys {
 let from_secret = |s: &SecretKey| PublicKey::from_secret_key(secp_ctx, s);
 ChannelPublicKeys {
 funding_pubkey: from_secret(&funding_key),
 revocation_basepoint: from_secret(&revocation_base_key),
payment_basepoint: from_secret(&payment_base_key),
payment_point: from_secret(&payment_key),
 delayed_payment_basepoint: from_secret(&delayed_payment_base_key),
 htlc_basepoint: from_secret(&htlc_base_key),
 }
Expand All@@ -337,7 +340,7 @@ impl InMemoryChannelKeys {
impl ChannelKeys for InMemoryChannelKeys {
	fn funding_key(&self) -> &SecretKey { &self.funding_key }
	fn revocation_base_key(&self) -> &SecretKey { &self.revocation_base_key }
	fn payment_base_key(&self) -> &SecretKey { &self.payment_base_key }
	fn payment_key(&self) -> &SecretKey { &self.payment_key }
	fn delayed_payment_base_key(&self) -> &SecretKey { &self.delayed_payment_base_key }
	fn htlc_base_key(&self) -> &SecretKey { &self.htlc_base_key }
	fn commitment_seed(&self) -> &[u8; 32] { &self.commitment_seed }
Expand DownExpand Up@@ -422,7 +425,7 @@ impl Writeable for InMemoryChannelKeys {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
 self.funding_key.write(writer)?;
 self.revocation_base_key.write(writer)?;
 self.payment_base_key.write(writer)?;
 self.payment_key.write(writer)?;
 self.delayed_payment_base_key.write(writer)?;
 self.htlc_base_key.write(writer)?;
 self.commitment_seed.write(writer)?;
Expand All@@ -437,7 +440,7 @@ impl Readable for InMemoryChannelKeys {
	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 let funding_key = Readable::read(reader)?;
 let revocation_base_key = Readable::read(reader)?;
 let payment_base_key = Readable::read(reader)?;
 let payment_key = Readable::read(reader)?;
 let delayed_payment_base_key = Readable::read(reader)?;
 let htlc_base_key = Readable::read(reader)?;
 let commitment_seed = Readable::read(reader)?;
Expand All@@ -446,13 +449,13 @@ impl Readable for InMemoryChannelKeys {
 let secp_ctx = Secp256k1::signing_only();
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(&secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);

 Ok(InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand DownExpand Up@@ -598,15 +601,15 @@ impl KeysInterface for KeysManager {
 }
 let funding_key = key_step!(b"funding key", commitment_seed);
 let revocation_base_key = key_step!(b"revocation base key", funding_key);
 let payment_base_key = key_step!(b"payment base key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_base_key);
 let payment_key = key_step!(b"payment key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_key);
 let htlc_base_key = key_step!(b"HTLC base key", delayed_payment_base_key);

 InMemoryChannelKeys::new(
 &self.secp_ctx,
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand Down

17 changes: 7 additions & 10 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,11 +262,9 @@ pub struct TxCreationKeys {
	pub(crate) b_htlc_key: PublicKey,
	/// A's Payment Key (which isn't allowed to be spent from for some delay)
	pub(crate) a_delayed_payment_key: PublicKey,
	/// B's Payment Key
	pub(crate) b_payment_key: PublicKey,
}
impl_writeable!(TxCreationKeys, 33*6,
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key, b_payment_key });
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key });

/// One counterparty's public keys which do not change over the life of a channel.
#[derive(Clone, PartialEq)]
Expand All@@ -279,9 +277,10 @@ pub struct ChannelPublicKeys {
	/// a commitment transaction so that their counterparty can claim all available funds if they
	/// broadcast an old state.
	pub revocation_basepoint: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives immediately-spendable non-HTLC-encumbered funds.
	pub payment_basepoint: PublicKey,
	/// The public key which receives our immediately spendable primary channel balance in
	/// remote-broadcasted commitment transactions. This key is static across every commitment
	/// transaction.
	pub payment_point: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives non-HTLC-encumbered funds which are only available for spending
	/// after some delay (or can be claimed via the revocation path).
Expand All@@ -294,21 +293,20 @@ pub struct ChannelPublicKeys {
impl_writeable!(ChannelPublicKeys, 33*5, {
	funding_pubkey,
	revocation_basepoint,
payment_basepoint,
payment_point,
	delayed_payment_basepoint,
	htlc_basepoint
});


impl TxCreationKeys {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_payment_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
 Ok(TxCreationKeys {
 per_commitment_point: per_commitment_point.clone(),
 revocation_key: derive_public_revocation_key(&secp_ctx, &per_commitment_point, &b_revocation_base)?,
 a_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_htlc_base)?,
 b_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_htlc_base)?,
 a_delayed_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_delayed_payment_base)?,
 b_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_payment_base)?,
 })
	}
}
Expand DownExpand Up@@ -537,7 +535,6 @@ impl LocalCommitmentTransaction {
 a_htlc_key: dummy_key.clone(),
 b_htlc_key: dummy_key.clone(),
 a_delayed_payment_key: dummy_key.clone(),
 b_payment_key: dummy_key.clone(),
 },
 feerate_per_kw: 0,
 per_htlc: Vec::new()
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

May 6, 2020
 Merged


Require static_remotekey
#539
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
3fb482a

Add additional trace logging in channel signature validation


TheBlueMatt Apr 28, 2020
18981a0

Check local signtures explicitly in channel tx-generation tests


TheBlueMatt Mar 9, 2020
22dded7

Add detection of feature_static_remotekey support and print


TheBlueMatt Mar 3, 2020
babf0af

Require option_static_remotekey in channel/channelmonitor.


TheBlueMatt May 3, 2020
07db23d

Rename payment_basepoint/key to simply payment_point/key.


TheBlueMatt Mar 9, 2020

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


30 changes: 15 additions & 15 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


39 changes: 21 additions & 18 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,8 @@ pub enum SpendableOutputDescriptor {
 /// The output which is referenced by the given outpoint
 output: TxOut,
	},
	// TODO: Note that because key is now static and exactly what is provided by us, we should drop
	// this in favor of StaticOutput:
	/// An output to a P2WPKH, spendable exclusively by the given private key.
	/// The witness in the spending input, is, thus, simply:
	/// <BIP 143 signature generated with the given key> <public key derived from the given key>
Expand DownExpand Up@@ -194,9 +196,10 @@ pub trait ChannelKeys : Send+Clone {
	fn funding_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key for blinded revocation pubkey
	fn revocation_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in to_remote output of remote commitment tx
	/// (and also as part of obscured commitment number)
	fn payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in the to_remote output of remote commitment tx (ie the
	/// output to us in transactions our counterparty broadcasts).
	/// Also as part of obscured commitment number.
	fn payment_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in HTLC-Success/HTLC-Timeout txn and to_local output
	fn delayed_payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local htlc secret key used in commitment tx htlc outputs
Expand DownExpand Up@@ -273,8 +276,8 @@ pub struct InMemoryChannelKeys {
	funding_key: SecretKey,
	/// Local secret key for blinded revocation pubkey
	revocation_base_key: SecretKey,
	/// Local secret key used in commitment tx htlc outputs
payment_base_key: SecretKey,
	/// Local secret key used for our balance in remote-broadcasted commitment transactions
payment_key: SecretKey,
	/// Local secret key used in HTLC tx
	delayed_payment_base_key: SecretKey,
	/// Local htlc secret key used in commitment tx htlc outputs
Expand All@@ -295,19 +298,19 @@ impl InMemoryChannelKeys {
 secp_ctx: &Secp256k1<C>,
 funding_key: SecretKey,
 revocation_base_key: SecretKey,
payment_base_key: SecretKey,
payment_key: SecretKey,
 delayed_payment_base_key: SecretKey,
 htlc_base_key: SecretKey,
 commitment_seed: [u8; 32],
 channel_value_satoshis: u64) -> InMemoryChannelKeys {
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);
 InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand All@@ -320,14 +323,14 @@ impl InMemoryChannelKeys {
	fn make_local_keys<C: Signing>(secp_ctx: &Secp256k1<C>,
 funding_key: &SecretKey,
 revocation_base_key: &SecretKey,
payment_base_key: &SecretKey,
payment_key: &SecretKey,
 delayed_payment_base_key: &SecretKey,
 htlc_base_key: &SecretKey) -> ChannelPublicKeys {
 let from_secret = |s: &SecretKey| PublicKey::from_secret_key(secp_ctx, s);
 ChannelPublicKeys {
 funding_pubkey: from_secret(&funding_key),
 revocation_basepoint: from_secret(&revocation_base_key),
payment_basepoint: from_secret(&payment_base_key),
payment_point: from_secret(&payment_key),
 delayed_payment_basepoint: from_secret(&delayed_payment_base_key),
 htlc_basepoint: from_secret(&htlc_base_key),
 }
Expand All@@ -337,7 +340,7 @@ impl InMemoryChannelKeys {
impl ChannelKeys for InMemoryChannelKeys {
	fn funding_key(&self) -> &SecretKey { &self.funding_key }
	fn revocation_base_key(&self) -> &SecretKey { &self.revocation_base_key }
	fn payment_base_key(&self) -> &SecretKey { &self.payment_base_key }
	fn payment_key(&self) -> &SecretKey { &self.payment_key }
	fn delayed_payment_base_key(&self) -> &SecretKey { &self.delayed_payment_base_key }
	fn htlc_base_key(&self) -> &SecretKey { &self.htlc_base_key }
	fn commitment_seed(&self) -> &[u8; 32] { &self.commitment_seed }
Expand DownExpand Up@@ -422,7 +425,7 @@ impl Writeable for InMemoryChannelKeys {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
 self.funding_key.write(writer)?;
 self.revocation_base_key.write(writer)?;
 self.payment_base_key.write(writer)?;
 self.payment_key.write(writer)?;
 self.delayed_payment_base_key.write(writer)?;
 self.htlc_base_key.write(writer)?;
 self.commitment_seed.write(writer)?;
Expand All@@ -437,7 +440,7 @@ impl Readable for InMemoryChannelKeys {
	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 let funding_key = Readable::read(reader)?;
 let revocation_base_key = Readable::read(reader)?;
 let payment_base_key = Readable::read(reader)?;
 let payment_key = Readable::read(reader)?;
 let delayed_payment_base_key = Readable::read(reader)?;
 let htlc_base_key = Readable::read(reader)?;
 let commitment_seed = Readable::read(reader)?;
Expand All@@ -446,13 +449,13 @@ impl Readable for InMemoryChannelKeys {
 let secp_ctx = Secp256k1::signing_only();
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(&secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);

 Ok(InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand DownExpand Up@@ -598,15 +601,15 @@ impl KeysInterface for KeysManager {
 }
 let funding_key = key_step!(b"funding key", commitment_seed);
 let revocation_base_key = key_step!(b"revocation base key", funding_key);
 let payment_base_key = key_step!(b"payment base key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_base_key);
 let payment_key = key_step!(b"payment key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_key);
 let htlc_base_key = key_step!(b"HTLC base key", delayed_payment_base_key);

 InMemoryChannelKeys::new(
 &self.secp_ctx,
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand Down

17 changes: 7 additions & 10 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,11 +262,9 @@ pub struct TxCreationKeys {
	pub(crate) b_htlc_key: PublicKey,
	/// A's Payment Key (which isn't allowed to be spent from for some delay)
	pub(crate) a_delayed_payment_key: PublicKey,
	/// B's Payment Key
	pub(crate) b_payment_key: PublicKey,
}
impl_writeable!(TxCreationKeys, 33*6,
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key, b_payment_key });
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key });

/// One counterparty's public keys which do not change over the life of a channel.
#[derive(Clone, PartialEq)]
Expand All@@ -279,9 +277,10 @@ pub struct ChannelPublicKeys {
	/// a commitment transaction so that their counterparty can claim all available funds if they
	/// broadcast an old state.
	pub revocation_basepoint: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives immediately-spendable non-HTLC-encumbered funds.
	pub payment_basepoint: PublicKey,
	/// The public key which receives our immediately spendable primary channel balance in
	/// remote-broadcasted commitment transactions. This key is static across every commitment
	/// transaction.
	pub payment_point: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives non-HTLC-encumbered funds which are only available for spending
	/// after some delay (or can be claimed via the revocation path).
Expand All@@ -294,21 +293,20 @@ pub struct ChannelPublicKeys {
impl_writeable!(ChannelPublicKeys, 33*5, {
	funding_pubkey,
	revocation_basepoint,
payment_basepoint,
payment_point,
	delayed_payment_basepoint,
	htlc_basepoint
});


impl TxCreationKeys {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_payment_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
 Ok(TxCreationKeys {
 per_commitment_point: per_commitment_point.clone(),
 revocation_key: derive_public_revocation_key(&secp_ctx, &per_commitment_point, &b_revocation_base)?,
 a_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_htlc_base)?,
 b_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_htlc_base)?,
 a_delayed_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_delayed_payment_base)?,
 b_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_payment_base)?,
 })
	}
}
Expand DownExpand Up@@ -537,7 +535,6 @@ impl LocalCommitmentTransaction {
 a_htlc_key: dummy_key.clone(),
 b_htlc_key: dummy_key.clone(),
 a_delayed_payment_key: dummy_key.clone(),
 b_payment_key: dummy_key.clone(),
 },
 feerate_per_kw: 0,
 per_htlc: Vec::new()
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

May 6, 2020
 Merged


Require static_remotekey
#539
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
3fb482a

Add additional trace logging in channel signature validation


TheBlueMatt Apr 28, 2020
18981a0

Check local signtures explicitly in channel tx-generation tests


TheBlueMatt Mar 9, 2020
22dded7

Add detection of feature_static_remotekey support and print


TheBlueMatt Mar 3, 2020
babf0af

Require option_static_remotekey in channel/channelmonitor.


TheBlueMatt May 3, 2020
07db23d

Rename payment_basepoint/key to simply payment_point/key.


TheBlueMatt Mar 9, 2020

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


30 changes: 15 additions & 15 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


39 changes: 21 additions & 18 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,8 @@ pub enum SpendableOutputDescriptor {
 /// The output which is referenced by the given outpoint
 output: TxOut,
	},
	// TODO: Note that because key is now static and exactly what is provided by us, we should drop
	// this in favor of StaticOutput:
	/// An output to a P2WPKH, spendable exclusively by the given private key.
	/// The witness in the spending input, is, thus, simply:
	/// <BIP 143 signature generated with the given key> <public key derived from the given key>
Expand DownExpand Up@@ -194,9 +196,10 @@ pub trait ChannelKeys : Send+Clone {
	fn funding_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key for blinded revocation pubkey
	fn revocation_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in to_remote output of remote commitment tx
	/// (and also as part of obscured commitment number)
	fn payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in the to_remote output of remote commitment tx (ie the
	/// output to us in transactions our counterparty broadcasts).
	/// Also as part of obscured commitment number.
	fn payment_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in HTLC-Success/HTLC-Timeout txn and to_local output
	fn delayed_payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local htlc secret key used in commitment tx htlc outputs
Expand DownExpand Up@@ -273,8 +276,8 @@ pub struct InMemoryChannelKeys {
	funding_key: SecretKey,
	/// Local secret key for blinded revocation pubkey
	revocation_base_key: SecretKey,
	/// Local secret key used in commitment tx htlc outputs
payment_base_key: SecretKey,
	/// Local secret key used for our balance in remote-broadcasted commitment transactions
payment_key: SecretKey,
	/// Local secret key used in HTLC tx
	delayed_payment_base_key: SecretKey,
	/// Local htlc secret key used in commitment tx htlc outputs
Expand All@@ -295,19 +298,19 @@ impl InMemoryChannelKeys {
 secp_ctx: &Secp256k1<C>,
 funding_key: SecretKey,
 revocation_base_key: SecretKey,
payment_base_key: SecretKey,
payment_key: SecretKey,
 delayed_payment_base_key: SecretKey,
 htlc_base_key: SecretKey,
 commitment_seed: [u8; 32],
 channel_value_satoshis: u64) -> InMemoryChannelKeys {
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);
 InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand All@@ -320,14 +323,14 @@ impl InMemoryChannelKeys {
	fn make_local_keys<C: Signing>(secp_ctx: &Secp256k1<C>,
 funding_key: &SecretKey,
 revocation_base_key: &SecretKey,
payment_base_key: &SecretKey,
payment_key: &SecretKey,
 delayed_payment_base_key: &SecretKey,
 htlc_base_key: &SecretKey) -> ChannelPublicKeys {
 let from_secret = |s: &SecretKey| PublicKey::from_secret_key(secp_ctx, s);
 ChannelPublicKeys {
 funding_pubkey: from_secret(&funding_key),
 revocation_basepoint: from_secret(&revocation_base_key),
payment_basepoint: from_secret(&payment_base_key),
payment_point: from_secret(&payment_key),
 delayed_payment_basepoint: from_secret(&delayed_payment_base_key),
 htlc_basepoint: from_secret(&htlc_base_key),
 }
Expand All@@ -337,7 +340,7 @@ impl InMemoryChannelKeys {
impl ChannelKeys for InMemoryChannelKeys {
	fn funding_key(&self) -> &SecretKey { &self.funding_key }
	fn revocation_base_key(&self) -> &SecretKey { &self.revocation_base_key }
	fn payment_base_key(&self) -> &SecretKey { &self.payment_base_key }
	fn payment_key(&self) -> &SecretKey { &self.payment_key }
	fn delayed_payment_base_key(&self) -> &SecretKey { &self.delayed_payment_base_key }
	fn htlc_base_key(&self) -> &SecretKey { &self.htlc_base_key }
	fn commitment_seed(&self) -> &[u8; 32] { &self.commitment_seed }
Expand DownExpand Up@@ -422,7 +425,7 @@ impl Writeable for InMemoryChannelKeys {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
 self.funding_key.write(writer)?;
 self.revocation_base_key.write(writer)?;
 self.payment_base_key.write(writer)?;
 self.payment_key.write(writer)?;
 self.delayed_payment_base_key.write(writer)?;
 self.htlc_base_key.write(writer)?;
 self.commitment_seed.write(writer)?;
Expand All@@ -437,7 +440,7 @@ impl Readable for InMemoryChannelKeys {
	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 let funding_key = Readable::read(reader)?;
 let revocation_base_key = Readable::read(reader)?;
 let payment_base_key = Readable::read(reader)?;
 let payment_key = Readable::read(reader)?;
 let delayed_payment_base_key = Readable::read(reader)?;
 let htlc_base_key = Readable::read(reader)?;
 let commitment_seed = Readable::read(reader)?;
Expand All@@ -446,13 +449,13 @@ impl Readable for InMemoryChannelKeys {
 let secp_ctx = Secp256k1::signing_only();
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(&secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);

 Ok(InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand DownExpand Up@@ -598,15 +601,15 @@ impl KeysInterface for KeysManager {
 }
 let funding_key = key_step!(b"funding key", commitment_seed);
 let revocation_base_key = key_step!(b"revocation base key", funding_key);
 let payment_base_key = key_step!(b"payment base key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_base_key);
 let payment_key = key_step!(b"payment key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_key);
 let htlc_base_key = key_step!(b"HTLC base key", delayed_payment_base_key);

 InMemoryChannelKeys::new(
 &self.secp_ctx,
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand Down

17 changes: 7 additions & 10 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,11 +262,9 @@ pub struct TxCreationKeys {
	pub(crate) b_htlc_key: PublicKey,
	/// A's Payment Key (which isn't allowed to be spent from for some delay)
	pub(crate) a_delayed_payment_key: PublicKey,
	/// B's Payment Key
	pub(crate) b_payment_key: PublicKey,
}
impl_writeable!(TxCreationKeys, 33*6,
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key, b_payment_key });
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key });

/// One counterparty's public keys which do not change over the life of a channel.
#[derive(Clone, PartialEq)]
Expand All@@ -279,9 +277,10 @@ pub struct ChannelPublicKeys {
	/// a commitment transaction so that their counterparty can claim all available funds if they
	/// broadcast an old state.
	pub revocation_basepoint: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives immediately-spendable non-HTLC-encumbered funds.
	pub payment_basepoint: PublicKey,
	/// The public key which receives our immediately spendable primary channel balance in
	/// remote-broadcasted commitment transactions. This key is static across every commitment
	/// transaction.
	pub payment_point: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives non-HTLC-encumbered funds which are only available for spending
	/// after some delay (or can be claimed via the revocation path).
Expand All@@ -294,21 +293,20 @@ pub struct ChannelPublicKeys {
impl_writeable!(ChannelPublicKeys, 33*5, {
	funding_pubkey,
	revocation_basepoint,
payment_basepoint,
payment_point,
	delayed_payment_basepoint,
	htlc_basepoint
});


impl TxCreationKeys {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_payment_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
 Ok(TxCreationKeys {
 per_commitment_point: per_commitment_point.clone(),
 revocation_key: derive_public_revocation_key(&secp_ctx, &per_commitment_point, &b_revocation_base)?,
 a_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_htlc_base)?,
 b_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_htlc_base)?,
 a_delayed_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_delayed_payment_base)?,
 b_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_payment_base)?,
 })
	}
}
Expand DownExpand Up@@ -537,7 +535,6 @@ impl LocalCommitmentTransaction {
 a_htlc_key: dummy_key.clone(),
 b_htlc_key: dummy_key.clone(),
 a_delayed_payment_key: dummy_key.clone(),
 b_payment_key: dummy_key.clone(),
 },
 feerate_per_kw: 0,
 per_htlc: Vec::new()
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

May 6, 2020
 Merged


Require static_remotekey
#539
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
3fb482a

Add additional trace logging in channel signature validation


TheBlueMatt Apr 28, 2020
18981a0

Check local signtures explicitly in channel tx-generation tests


TheBlueMatt Mar 9, 2020
22dded7

Add detection of feature_static_remotekey support and print


TheBlueMatt Mar 3, 2020
babf0af

Require option_static_remotekey in channel/channelmonitor.


TheBlueMatt May 3, 2020
07db23d

Rename payment_basepoint/key to simply payment_point/key.


TheBlueMatt Mar 9, 2020

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


30 changes: 15 additions & 15 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


39 changes: 21 additions & 18 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,8 @@ pub enum SpendableOutputDescriptor {
 /// The output which is referenced by the given outpoint
 output: TxOut,
	},
	// TODO: Note that because key is now static and exactly what is provided by us, we should drop
	// this in favor of StaticOutput:
	/// An output to a P2WPKH, spendable exclusively by the given private key.
	/// The witness in the spending input, is, thus, simply:
	/// <BIP 143 signature generated with the given key> <public key derived from the given key>
Expand DownExpand Up@@ -194,9 +196,10 @@ pub trait ChannelKeys : Send+Clone {
	fn funding_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key for blinded revocation pubkey
	fn revocation_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in to_remote output of remote commitment tx
	/// (and also as part of obscured commitment number)
	fn payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in the to_remote output of remote commitment tx (ie the
	/// output to us in transactions our counterparty broadcasts).
	/// Also as part of obscured commitment number.
	fn payment_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in HTLC-Success/HTLC-Timeout txn and to_local output
	fn delayed_payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local htlc secret key used in commitment tx htlc outputs
Expand DownExpand Up@@ -273,8 +276,8 @@ pub struct InMemoryChannelKeys {
	funding_key: SecretKey,
	/// Local secret key for blinded revocation pubkey
	revocation_base_key: SecretKey,
	/// Local secret key used in commitment tx htlc outputs
payment_base_key: SecretKey,
	/// Local secret key used for our balance in remote-broadcasted commitment transactions
payment_key: SecretKey,
	/// Local secret key used in HTLC tx
	delayed_payment_base_key: SecretKey,
	/// Local htlc secret key used in commitment tx htlc outputs
Expand All@@ -295,19 +298,19 @@ impl InMemoryChannelKeys {
 secp_ctx: &Secp256k1<C>,
 funding_key: SecretKey,
 revocation_base_key: SecretKey,
payment_base_key: SecretKey,
payment_key: SecretKey,
 delayed_payment_base_key: SecretKey,
 htlc_base_key: SecretKey,
 commitment_seed: [u8; 32],
 channel_value_satoshis: u64) -> InMemoryChannelKeys {
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);
 InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand All@@ -320,14 +323,14 @@ impl InMemoryChannelKeys {
	fn make_local_keys<C: Signing>(secp_ctx: &Secp256k1<C>,
 funding_key: &SecretKey,
 revocation_base_key: &SecretKey,
payment_base_key: &SecretKey,
payment_key: &SecretKey,
 delayed_payment_base_key: &SecretKey,
 htlc_base_key: &SecretKey) -> ChannelPublicKeys {
 let from_secret = |s: &SecretKey| PublicKey::from_secret_key(secp_ctx, s);
 ChannelPublicKeys {
 funding_pubkey: from_secret(&funding_key),
 revocation_basepoint: from_secret(&revocation_base_key),
payment_basepoint: from_secret(&payment_base_key),
payment_point: from_secret(&payment_key),
 delayed_payment_basepoint: from_secret(&delayed_payment_base_key),
 htlc_basepoint: from_secret(&htlc_base_key),
 }
Expand All@@ -337,7 +340,7 @@ impl InMemoryChannelKeys {
impl ChannelKeys for InMemoryChannelKeys {
	fn funding_key(&self) -> &SecretKey { &self.funding_key }
	fn revocation_base_key(&self) -> &SecretKey { &self.revocation_base_key }
	fn payment_base_key(&self) -> &SecretKey { &self.payment_base_key }
	fn payment_key(&self) -> &SecretKey { &self.payment_key }
	fn delayed_payment_base_key(&self) -> &SecretKey { &self.delayed_payment_base_key }
	fn htlc_base_key(&self) -> &SecretKey { &self.htlc_base_key }
	fn commitment_seed(&self) -> &[u8; 32] { &self.commitment_seed }
Expand DownExpand Up@@ -422,7 +425,7 @@ impl Writeable for InMemoryChannelKeys {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
 self.funding_key.write(writer)?;
 self.revocation_base_key.write(writer)?;
 self.payment_base_key.write(writer)?;
 self.payment_key.write(writer)?;
 self.delayed_payment_base_key.write(writer)?;
 self.htlc_base_key.write(writer)?;
 self.commitment_seed.write(writer)?;
Expand All@@ -437,7 +440,7 @@ impl Readable for InMemoryChannelKeys {
	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 let funding_key = Readable::read(reader)?;
 let revocation_base_key = Readable::read(reader)?;
 let payment_base_key = Readable::read(reader)?;
 let payment_key = Readable::read(reader)?;
 let delayed_payment_base_key = Readable::read(reader)?;
 let htlc_base_key = Readable::read(reader)?;
 let commitment_seed = Readable::read(reader)?;
Expand All@@ -446,13 +449,13 @@ impl Readable for InMemoryChannelKeys {
 let secp_ctx = Secp256k1::signing_only();
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(&secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);

 Ok(InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand DownExpand Up@@ -598,15 +601,15 @@ impl KeysInterface for KeysManager {
 }
 let funding_key = key_step!(b"funding key", commitment_seed);
 let revocation_base_key = key_step!(b"revocation base key", funding_key);
 let payment_base_key = key_step!(b"payment base key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_base_key);
 let payment_key = key_step!(b"payment key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_key);
 let htlc_base_key = key_step!(b"HTLC base key", delayed_payment_base_key);

 InMemoryChannelKeys::new(
 &self.secp_ctx,
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand Down

17 changes: 7 additions & 10 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,11 +262,9 @@ pub struct TxCreationKeys {
	pub(crate) b_htlc_key: PublicKey,
	/// A's Payment Key (which isn't allowed to be spent from for some delay)
	pub(crate) a_delayed_payment_key: PublicKey,
	/// B's Payment Key
	pub(crate) b_payment_key: PublicKey,
}
impl_writeable!(TxCreationKeys, 33*6,
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key, b_payment_key });
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key });

/// One counterparty's public keys which do not change over the life of a channel.
#[derive(Clone, PartialEq)]
Expand All@@ -279,9 +277,10 @@ pub struct ChannelPublicKeys {
	/// a commitment transaction so that their counterparty can claim all available funds if they
	/// broadcast an old state.
	pub revocation_basepoint: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives immediately-spendable non-HTLC-encumbered funds.
	pub payment_basepoint: PublicKey,
	/// The public key which receives our immediately spendable primary channel balance in
	/// remote-broadcasted commitment transactions. This key is static across every commitment
	/// transaction.
	pub payment_point: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives non-HTLC-encumbered funds which are only available for spending
	/// after some delay (or can be claimed via the revocation path).
Expand All@@ -294,21 +293,20 @@ pub struct ChannelPublicKeys {
impl_writeable!(ChannelPublicKeys, 33*5, {
	funding_pubkey,
	revocation_basepoint,
payment_basepoint,
payment_point,
	delayed_payment_basepoint,
	htlc_basepoint
});


impl TxCreationKeys {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_payment_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
 Ok(TxCreationKeys {
 per_commitment_point: per_commitment_point.clone(),
 revocation_key: derive_public_revocation_key(&secp_ctx, &per_commitment_point, &b_revocation_base)?,
 a_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_htlc_base)?,
 b_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_htlc_base)?,
 a_delayed_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_delayed_payment_base)?,
 b_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_payment_base)?,
 })
	}
}
Expand DownExpand Up@@ -537,7 +535,6 @@ impl LocalCommitmentTransaction {
 a_htlc_key: dummy_key.clone(),
 b_htlc_key: dummy_key.clone(),
 a_delayed_payment_key: dummy_key.clone(),
 b_payment_key: dummy_key.clone(),
 },
 feerate_per_kw: 0,
 per_htlc: Vec::new()
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

May 6, 2020
 Merged


Require static_remotekey
#539
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
3fb482a

Add additional trace logging in channel signature validation


TheBlueMatt Apr 28, 2020
18981a0

Check local signtures explicitly in channel tx-generation tests


TheBlueMatt Mar 9, 2020
22dded7

Add detection of feature_static_remotekey support and print


TheBlueMatt Mar 3, 2020
babf0af

Require option_static_remotekey in channel/channelmonitor.


TheBlueMatt May 3, 2020
07db23d

Rename payment_basepoint/key to simply payment_point/key.


TheBlueMatt Mar 9, 2020

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


30 changes: 15 additions & 15 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


39 changes: 21 additions & 18 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,8 @@ pub enum SpendableOutputDescriptor {
 /// The output which is referenced by the given outpoint
 output: TxOut,
	},
	// TODO: Note that because key is now static and exactly what is provided by us, we should drop
	// this in favor of StaticOutput:
	/// An output to a P2WPKH, spendable exclusively by the given private key.
	/// The witness in the spending input, is, thus, simply:
	/// <BIP 143 signature generated with the given key> <public key derived from the given key>
Expand DownExpand Up@@ -194,9 +196,10 @@ pub trait ChannelKeys : Send+Clone {
	fn funding_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key for blinded revocation pubkey
	fn revocation_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in to_remote output of remote commitment tx
	/// (and also as part of obscured commitment number)
	fn payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in the to_remote output of remote commitment tx (ie the
	/// output to us in transactions our counterparty broadcasts).
	/// Also as part of obscured commitment number.
	fn payment_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in HTLC-Success/HTLC-Timeout txn and to_local output
	fn delayed_payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local htlc secret key used in commitment tx htlc outputs
Expand DownExpand Up@@ -273,8 +276,8 @@ pub struct InMemoryChannelKeys {
	funding_key: SecretKey,
	/// Local secret key for blinded revocation pubkey
	revocation_base_key: SecretKey,
	/// Local secret key used in commitment tx htlc outputs
payment_base_key: SecretKey,
	/// Local secret key used for our balance in remote-broadcasted commitment transactions
payment_key: SecretKey,
	/// Local secret key used in HTLC tx
	delayed_payment_base_key: SecretKey,
	/// Local htlc secret key used in commitment tx htlc outputs
Expand All@@ -295,19 +298,19 @@ impl InMemoryChannelKeys {
 secp_ctx: &Secp256k1<C>,
 funding_key: SecretKey,
 revocation_base_key: SecretKey,
payment_base_key: SecretKey,
payment_key: SecretKey,
 delayed_payment_base_key: SecretKey,
 htlc_base_key: SecretKey,
 commitment_seed: [u8; 32],
 channel_value_satoshis: u64) -> InMemoryChannelKeys {
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);
 InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand All@@ -320,14 +323,14 @@ impl InMemoryChannelKeys {
	fn make_local_keys<C: Signing>(secp_ctx: &Secp256k1<C>,
 funding_key: &SecretKey,
 revocation_base_key: &SecretKey,
payment_base_key: &SecretKey,
payment_key: &SecretKey,
 delayed_payment_base_key: &SecretKey,
 htlc_base_key: &SecretKey) -> ChannelPublicKeys {
 let from_secret = |s: &SecretKey| PublicKey::from_secret_key(secp_ctx, s);
 ChannelPublicKeys {
 funding_pubkey: from_secret(&funding_key),
 revocation_basepoint: from_secret(&revocation_base_key),
payment_basepoint: from_secret(&payment_base_key),
payment_point: from_secret(&payment_key),
 delayed_payment_basepoint: from_secret(&delayed_payment_base_key),
 htlc_basepoint: from_secret(&htlc_base_key),
 }
Expand All@@ -337,7 +340,7 @@ impl InMemoryChannelKeys {
impl ChannelKeys for InMemoryChannelKeys {
	fn funding_key(&self) -> &SecretKey { &self.funding_key }
	fn revocation_base_key(&self) -> &SecretKey { &self.revocation_base_key }
	fn payment_base_key(&self) -> &SecretKey { &self.payment_base_key }
	fn payment_key(&self) -> &SecretKey { &self.payment_key }
	fn delayed_payment_base_key(&self) -> &SecretKey { &self.delayed_payment_base_key }
	fn htlc_base_key(&self) -> &SecretKey { &self.htlc_base_key }
	fn commitment_seed(&self) -> &[u8; 32] { &self.commitment_seed }
Expand DownExpand Up@@ -422,7 +425,7 @@ impl Writeable for InMemoryChannelKeys {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
 self.funding_key.write(writer)?;
 self.revocation_base_key.write(writer)?;
 self.payment_base_key.write(writer)?;
 self.payment_key.write(writer)?;
 self.delayed_payment_base_key.write(writer)?;
 self.htlc_base_key.write(writer)?;
 self.commitment_seed.write(writer)?;
Expand All@@ -437,7 +440,7 @@ impl Readable for InMemoryChannelKeys {
	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 let funding_key = Readable::read(reader)?;
 let revocation_base_key = Readable::read(reader)?;
 let payment_base_key = Readable::read(reader)?;
 let payment_key = Readable::read(reader)?;
 let delayed_payment_base_key = Readable::read(reader)?;
 let htlc_base_key = Readable::read(reader)?;
 let commitment_seed = Readable::read(reader)?;
Expand All@@ -446,13 +449,13 @@ impl Readable for InMemoryChannelKeys {
 let secp_ctx = Secp256k1::signing_only();
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(&secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);

 Ok(InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand DownExpand Up@@ -598,15 +601,15 @@ impl KeysInterface for KeysManager {
 }
 let funding_key = key_step!(b"funding key", commitment_seed);
 let revocation_base_key = key_step!(b"revocation base key", funding_key);
 let payment_base_key = key_step!(b"payment base key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_base_key);
 let payment_key = key_step!(b"payment key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_key);
 let htlc_base_key = key_step!(b"HTLC base key", delayed_payment_base_key);

 InMemoryChannelKeys::new(
 &self.secp_ctx,
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand Down

17 changes: 7 additions & 10 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,11 +262,9 @@ pub struct TxCreationKeys {
	pub(crate) b_htlc_key: PublicKey,
	/// A's Payment Key (which isn't allowed to be spent from for some delay)
	pub(crate) a_delayed_payment_key: PublicKey,
	/// B's Payment Key
	pub(crate) b_payment_key: PublicKey,
}
impl_writeable!(TxCreationKeys, 33*6,
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key, b_payment_key });
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key });

/// One counterparty's public keys which do not change over the life of a channel.
#[derive(Clone, PartialEq)]
Expand All@@ -279,9 +277,10 @@ pub struct ChannelPublicKeys {
	/// a commitment transaction so that their counterparty can claim all available funds if they
	/// broadcast an old state.
	pub revocation_basepoint: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives immediately-spendable non-HTLC-encumbered funds.
	pub payment_basepoint: PublicKey,
	/// The public key which receives our immediately spendable primary channel balance in
	/// remote-broadcasted commitment transactions. This key is static across every commitment
	/// transaction.
	pub payment_point: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives non-HTLC-encumbered funds which are only available for spending
	/// after some delay (or can be claimed via the revocation path).
Expand All@@ -294,21 +293,20 @@ pub struct ChannelPublicKeys {
impl_writeable!(ChannelPublicKeys, 33*5, {
	funding_pubkey,
	revocation_basepoint,
payment_basepoint,
payment_point,
	delayed_payment_basepoint,
	htlc_basepoint
});


impl TxCreationKeys {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_payment_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
 Ok(TxCreationKeys {
 per_commitment_point: per_commitment_point.clone(),
 revocation_key: derive_public_revocation_key(&secp_ctx, &per_commitment_point, &b_revocation_base)?,
 a_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_htlc_base)?,
 b_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_htlc_base)?,
 a_delayed_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_delayed_payment_base)?,
 b_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_payment_base)?,
 })
	}
}
Expand DownExpand Up@@ -537,7 +535,6 @@ impl LocalCommitmentTransaction {
 a_htlc_key: dummy_key.clone(),
 b_htlc_key: dummy_key.clone(),
 a_delayed_payment_key: dummy_key.clone(),
 b_payment_key: dummy_key.clone(),
 },
 feerate_per_kw: 0,
 per_htlc: Vec::new()
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

May 6, 2020
 Merged


Require static_remotekey
#539
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
3fb482a

Add additional trace logging in channel signature validation


TheBlueMatt Apr 28, 2020
18981a0

Check local signtures explicitly in channel tx-generation tests


TheBlueMatt Mar 9, 2020
22dded7

Add detection of feature_static_remotekey support and print


TheBlueMatt Mar 3, 2020
babf0af

Require option_static_remotekey in channel/channelmonitor.


TheBlueMatt May 3, 2020
07db23d

Rename payment_basepoint/key to simply payment_point/key.


TheBlueMatt Mar 9, 2020

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


30 changes: 15 additions & 15 deletions
fuzz/src/full_stack.rs

View file


Open in desktop


Large diffs are not rendered by default.


39 changes: 21 additions & 18 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,8 @@ pub enum SpendableOutputDescriptor {
 /// The output which is referenced by the given outpoint
 output: TxOut,
	},
	// TODO: Note that because key is now static and exactly what is provided by us, we should drop
	// this in favor of StaticOutput:
	/// An output to a P2WPKH, spendable exclusively by the given private key.
	/// The witness in the spending input, is, thus, simply:
	/// <BIP 143 signature generated with the given key> <public key derived from the given key>
Expand DownExpand Up@@ -194,9 +196,10 @@ pub trait ChannelKeys : Send+Clone {
	fn funding_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key for blinded revocation pubkey
	fn revocation_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in to_remote output of remote commitment tx
	/// (and also as part of obscured commitment number)
	fn payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in the to_remote output of remote commitment tx (ie the
	/// output to us in transactions our counterparty broadcasts).
	/// Also as part of obscured commitment number.
	fn payment_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local secret key used in HTLC-Success/HTLC-Timeout txn and to_local output
	fn delayed_payment_base_key<'a>(&'a self) -> &'a SecretKey;
	/// Gets the local htlc secret key used in commitment tx htlc outputs
Expand DownExpand Up@@ -273,8 +276,8 @@ pub struct InMemoryChannelKeys {
	funding_key: SecretKey,
	/// Local secret key for blinded revocation pubkey
	revocation_base_key: SecretKey,
	/// Local secret key used in commitment tx htlc outputs
payment_base_key: SecretKey,
	/// Local secret key used for our balance in remote-broadcasted commitment transactions
payment_key: SecretKey,
	/// Local secret key used in HTLC tx
	delayed_payment_base_key: SecretKey,
	/// Local htlc secret key used in commitment tx htlc outputs
Expand All@@ -295,19 +298,19 @@ impl InMemoryChannelKeys {
 secp_ctx: &Secp256k1<C>,
 funding_key: SecretKey,
 revocation_base_key: SecretKey,
payment_base_key: SecretKey,
payment_key: SecretKey,
 delayed_payment_base_key: SecretKey,
 htlc_base_key: SecretKey,
 commitment_seed: [u8; 32],
 channel_value_satoshis: u64) -> InMemoryChannelKeys {
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);
 InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand All@@ -320,14 +323,14 @@ impl InMemoryChannelKeys {
	fn make_local_keys<C: Signing>(secp_ctx: &Secp256k1<C>,
 funding_key: &SecretKey,
 revocation_base_key: &SecretKey,
payment_base_key: &SecretKey,
payment_key: &SecretKey,
 delayed_payment_base_key: &SecretKey,
 htlc_base_key: &SecretKey) -> ChannelPublicKeys {
 let from_secret = |s: &SecretKey| PublicKey::from_secret_key(secp_ctx, s);
 ChannelPublicKeys {
 funding_pubkey: from_secret(&funding_key),
 revocation_basepoint: from_secret(&revocation_base_key),
payment_basepoint: from_secret(&payment_base_key),
payment_point: from_secret(&payment_key),
 delayed_payment_basepoint: from_secret(&delayed_payment_base_key),
 htlc_basepoint: from_secret(&htlc_base_key),
 }
Expand All@@ -337,7 +340,7 @@ impl InMemoryChannelKeys {
impl ChannelKeys for InMemoryChannelKeys {
	fn funding_key(&self) -> &SecretKey { &self.funding_key }
	fn revocation_base_key(&self) -> &SecretKey { &self.revocation_base_key }
	fn payment_base_key(&self) -> &SecretKey { &self.payment_base_key }
	fn payment_key(&self) -> &SecretKey { &self.payment_key }
	fn delayed_payment_base_key(&self) -> &SecretKey { &self.delayed_payment_base_key }
	fn htlc_base_key(&self) -> &SecretKey { &self.htlc_base_key }
	fn commitment_seed(&self) -> &[u8; 32] { &self.commitment_seed }
Expand DownExpand Up@@ -422,7 +425,7 @@ impl Writeable for InMemoryChannelKeys {
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
 self.funding_key.write(writer)?;
 self.revocation_base_key.write(writer)?;
 self.payment_base_key.write(writer)?;
 self.payment_key.write(writer)?;
 self.delayed_payment_base_key.write(writer)?;
 self.htlc_base_key.write(writer)?;
 self.commitment_seed.write(writer)?;
Expand All@@ -437,7 +440,7 @@ impl Readable for InMemoryChannelKeys {
	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 let funding_key = Readable::read(reader)?;
 let revocation_base_key = Readable::read(reader)?;
 let payment_base_key = Readable::read(reader)?;
 let payment_key = Readable::read(reader)?;
 let delayed_payment_base_key = Readable::read(reader)?;
 let htlc_base_key = Readable::read(reader)?;
 let commitment_seed = Readable::read(reader)?;
Expand All@@ -446,13 +449,13 @@ impl Readable for InMemoryChannelKeys {
 let secp_ctx = Secp256k1::signing_only();
 let local_channel_pubkeys =
 InMemoryChannelKeys::make_local_keys(&secp_ctx, &funding_key, &revocation_base_key,
 &payment_base_key, &delayed_payment_base_key,
 &payment_key, &delayed_payment_base_key,
 &htlc_base_key);

 Ok(InMemoryChannelKeys {
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand DownExpand Up@@ -598,15 +601,15 @@ impl KeysInterface for KeysManager {
 }
 let funding_key = key_step!(b"funding key", commitment_seed);
 let revocation_base_key = key_step!(b"revocation base key", funding_key);
 let payment_base_key = key_step!(b"payment base key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_base_key);
 let payment_key = key_step!(b"payment key", revocation_base_key);
 let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_key);
 let htlc_base_key = key_step!(b"HTLC base key", delayed_payment_base_key);

 InMemoryChannelKeys::new(
 &self.secp_ctx,
 funding_key,
 revocation_base_key,
payment_base_key,
payment_key,
 delayed_payment_base_key,
 htlc_base_key,
 commitment_seed,
Expand Down

17 changes: 7 additions & 10 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -262,11 +262,9 @@ pub struct TxCreationKeys {
	pub(crate) b_htlc_key: PublicKey,
	/// A's Payment Key (which isn't allowed to be spent from for some delay)
	pub(crate) a_delayed_payment_key: PublicKey,
	/// B's Payment Key
	pub(crate) b_payment_key: PublicKey,
}
impl_writeable!(TxCreationKeys, 33*6,
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key, b_payment_key });
	{ per_commitment_point, revocation_key, a_htlc_key, b_htlc_key, a_delayed_payment_key });

/// One counterparty's public keys which do not change over the life of a channel.
#[derive(Clone, PartialEq)]
Expand All@@ -279,9 +277,10 @@ pub struct ChannelPublicKeys {
	/// a commitment transaction so that their counterparty can claim all available funds if they
	/// broadcast an old state.
	pub revocation_basepoint: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives immediately-spendable non-HTLC-encumbered funds.
	pub payment_basepoint: PublicKey,
	/// The public key which receives our immediately spendable primary channel balance in
	/// remote-broadcasted commitment transactions. This key is static across every commitment
	/// transaction.
	pub payment_point: PublicKey,
	/// The base point which is used (with derive_public_key) to derive a per-commitment payment
	/// public key which receives non-HTLC-encumbered funds which are only available for spending
	/// after some delay (or can be claimed via the revocation path).
Expand All@@ -294,21 +293,20 @@ pub struct ChannelPublicKeys {
impl_writeable!(ChannelPublicKeys, 33*5, {
	funding_pubkey,
	revocation_basepoint,
payment_basepoint,
payment_point,
	delayed_payment_basepoint,
	htlc_basepoint
});


impl TxCreationKeys {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_payment_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
	pub(crate) fn new<T: secp256k1::Signing + secp256k1::Verification>(secp_ctx: &Secp256k1<T>, per_commitment_point: &PublicKey, a_delayed_payment_base: &PublicKey, a_htlc_base: &PublicKey, b_revocation_base: &PublicKey, b_htlc_base: &PublicKey) -> Result<TxCreationKeys, secp256k1::Error> {
 Ok(TxCreationKeys {
 per_commitment_point: per_commitment_point.clone(),
 revocation_key: derive_public_revocation_key(&secp_ctx, &per_commitment_point, &b_revocation_base)?,
 a_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_htlc_base)?,
 b_htlc_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_htlc_base)?,
 a_delayed_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &a_delayed_payment_base)?,
 b_payment_key: derive_public_key(&secp_ctx, &per_commitment_point, &b_payment_base)?,
 })
	}
}
Expand DownExpand Up@@ -537,7 +535,6 @@ impl LocalCommitmentTransaction {
 a_htlc_key: dummy_key.clone(),
 b_htlc_key: dummy_key.clone(),
 a_delayed_payment_key: dummy_key.clone(),
 b_payment_key: dummy_key.clone(),
 },
 feerate_per_kw: 0,
 per_htlc: Vec::new()
Expand Down
Loading