Move spendable output descriptors key behind signer interface#562

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
ariard wants to merge 10 commits into from
Closed

Move spendable output descriptors key behind signer interface #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3244e41
Cache remote basepoint and remote_csv in new OnchainTxHandler::Remote…
Mar 24, 2020
3caa38f
Cache remote HTLC inside OnchainTxHandler::RemoteTxCache
Mar 24, 2020
ea8df9d
Replace is_htlc in InputMaterial by InputDescriptor
Mar 24, 2020
b082827
Build witness_script for justice tx inside OnchainTxHandler
Mar 24, 2020
bb5b14c
Move justice transaction signature behind ChanSigner
Mar 24, 2020
d2a6a78
Build witness_script for remote htlc transactions inside
Mar 24, 2020
5a8f68f
Move remote htlc transaction signature behind ChanSigner
Mar 24, 2020
4fd727f
Add test-only ChannelMonitor::get_chan_signer to sign spendable output
Mar 24, 2020
13a6604
Remove SecretKey from DynamicOutputP2WSH descriptor
Mar 24, 2020
7a23c0c
Remove SecretKey from DynamicOuputP2WPKH descriptor
Mar 24, 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
91 changes: 81 additions & 10 deletions lightning/src/chain/keysinterface.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,12 @@
//! spendable on-chain outputs which the user owns and is responsible for using just as any other
//! on-chain output which is theirs.

use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut};
use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut, SigHashType};
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::network::constants::Network;
use bitcoin::util::bip32::{ExtendedPrivKey, ExtendedPubKey, ChildNumber};
use bitcoin::util::address::Address;
use bitcoin::util::bip143;

use bitcoin_hashes::{Hash, HashEngine};
Expand All@@ -26,6 +27,7 @@ use util::ser::{Writeable, Writer, Readable};
use ln::chan_utils;
use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, LocalCommitmentTransaction};
use ln::msgs;
use ln::channelmanager::PaymentPreimage;

use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
Expand DownExpand Up@@ -64,8 +66,8 @@ pub enum SpendableOutputDescriptor {
DynamicOutputP2WSH {
/// The outpoint which is spendable
outpoint: OutPoint,
/// The secret key which must be used to sign the spending transaction
key: SecretKey,
/// Per commitment point to derive delayed_payment_key by key holder
per_commitment_point: PublicKey,
/// The witness redeemScript which is hashed to create the script_pubkey in the given output
witness_script: Script,
/// The nSequence value which must be set in the spending input to satisfy the OP_CSV in
Expand All@@ -83,7 +85,7 @@ pub enum SpendableOutputDescriptor {
/// The outpoint which is spendable
outpoint: OutPoint,
/// The secret key which must be used to sign the spending transaction
key: SecretKey,
per_commitment_point: PublicKey,
/// The output which is reference by the given outpoint
output: TxOut,
}
Expand All@@ -97,18 +99,18 @@ impl Writeable for SpendableOutputDescriptor {
outpoint.write(writer)?;
output.write(writer)?;
},
&SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref key, ref witness_script, ref to_self_delay, ref output } => {
&SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref per_commitment_point, ref witness_script, ref to_self_delay, ref output } => {
1u8.write(writer)?;
outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
witness_script.write(writer)?;
to_self_delay.write(writer)?;
output.write(writer)?;
},
&SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref key, ref output } => {
&SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref per_commitment_point, ref output } => {
2u8.write(writer)?;
outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
output.write(writer)?;
},
}
Expand All@@ -125,14 +127,14 @@ impl Readable for SpendableOutputDescriptor {
}),
1u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WSH {
outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
witness_script: Readable::read(reader)?,
to_self_delay: Readable::read(reader)?,
output: Readable::read(reader)?,
}),
2u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WPKH {
outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
output: Readable::read(reader)?,
}),
_ => Err(DecodeError::InvalidValue),
Expand DownExpand Up@@ -245,12 +247,24 @@ pub trait ChannelKeys : Send+Clone {
/// return value must contain a signature.
fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()>;

/// Signs a justice transaction.
fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>);

/// Signs a remote htlc transaction.
fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>);

/// Create a signature for a (proposed) closing transaction.
///
/// Note that, due to rounding, there may be one "missing" satoshi, and either party may have
/// chosen to forgo their output as dust.
fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

/// Create a signature for a delayed transaction.
fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>);

/// Create a signture for a payment transaction spending a to_remote output on a remote commitment tx.
fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>);

/// Signs a channel announcement message with our funding key, proving it comes from one
/// of the channel participants.
///
Expand DownExpand Up@@ -393,6 +407,38 @@ impl ChannelKeys for InMemoryChannelKeys {
local_commitment_tx.get_htlc_sigs(&self.htlc_base_key, local_csv, secp_ctx)
}

fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>) {
if let Ok(revocation_key) = chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_key, &self.revocation_base_key) {
let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
let sig = secp_ctx.sign(&sighash, &revocation_key);
bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
if is_htlc {
bumped_tx.input[input].witness.push(revocation_pubkey.clone().serialize().to_vec());
} else {
bumped_tx.input[input].witness.push(vec!(1));
}
bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
}
}

fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>) {
if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.htlc_base_key) {
let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
let sig = secp_ctx.sign(&sighash, &htlc_key);
bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
if let &Some(preimage) = preimage {
bumped_tx.input[input].witness.push(preimage.0.to_vec());
} else {
bumped_tx.input[input].witness.push(vec![0]);
}
bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
}
}

fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
if closing_tx.input.len() != 1 { return Err(()); }
if closing_tx.input[0].witness.len() != 0 { return Err(()); }
Expand All@@ -407,6 +453,31 @@ impl ChannelKeys for InMemoryChannelKeys {
Ok(secp_ctx.sign(&sighash, &self.funding_key))
}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {

@devrandomdevrandomApr 8, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken

if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {

@devrandomdevrandomApr 8, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller

let sighash_parts = bip143::SighashComponents::new(&spend_tx);
let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], witness_script, amount)[..]);
let local_delaysig = secp_ctx.sign(&sighash, &htlc_key);
spend_tx.input[0].witness.push(local_delaysig.serialize_der().to_vec());
spend_tx.input[0].witness[0].push(SigHashType::All as u8);
spend_tx.input[0].witness.push(vec!(0));
spend_tx.input[0].witness.push(witness_script.clone().into_bytes());
}
}

fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {

@devrandomdevrandomApr 8, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction

if let Ok(payment_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.payment_base_key) {
let remotepubkey = PublicKey::from_secret_key(&secp_ctx, &payment_key);
let witness_script = Address::p2pkh(&::bitcoin::PublicKey{compressed: true, key: remotepubkey}, network).script_pubkey();
let sighash_parts = bip143::SighashComponents::new(&spend_tx);
let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], &witness_script, amount)[..]);
let remotesig = secp_ctx.sign(&sighash, &payment_key);
spend_tx.input[0].witness.push(remotesig.serialize_der().to_vec());
spend_tx.input[0].witness[0].push(SigHashType::All as u8);
spend_tx.input[0].witness.push(remotepubkey.serialize().to_vec());
}
}

fn sign_channel_announcement<T: secp256k1::Signing>(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
let msghash = hash_to_message!(&Sha256dHash::hash(&msg.encode()[..])[..]);
Ok(secp_ctx.sign(&msghash, &self.funding_key))
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/chan_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,7 @@ pub(super) fn derive_public_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>,
/// Derives a revocation key from its constituent parts.
/// Note that this is infallible iff we trust that at least one of the two input keys are randomly
/// generated (ie our own).
pub(super) fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
pub fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
let revocation_base_point = PublicKey::from_secret_key(&secp_ctx, &revocation_base_secret);
let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);

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

Skip to content
Move spendable output descriptors key behind signer interface#562

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

ariard
wants to merge
10
commits into

from

 Closed


Move spendable output descriptors key behind signer interface
#562
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3244e41

Cache remote basepoint and remote_csv in new OnchainTxHandler::Remote…

Mar 24, 2020
3caa38f

Cache remote HTLC inside OnchainTxHandler::RemoteTxCache

Mar 24, 2020
ea8df9d

Replace is_htlc in InputMaterial by InputDescriptor

Mar 24, 2020
b082827

Build witness_script for justice tx inside OnchainTxHandler

Mar 24, 2020
bb5b14c

Move justice transaction signature behind ChanSigner

Mar 24, 2020
d2a6a78

Build witness_script for remote htlc transactions inside

Mar 24, 2020
5a8f68f

Move remote htlc transaction signature behind ChanSigner

Mar 24, 2020
4fd727f

Add test-only ChannelMonitor::get_chan_signer to sign spendable output

Mar 24, 2020
13a6604

Remove SecretKey from DynamicOutputP2WSH descriptor

Mar 24, 2020
7a23c0c

Remove SecretKey from DynamicOuputP2WPKH descriptor

Mar 24, 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


91 changes: 81 additions & 10 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,12 @@
//! spendable on-chain outputs which the user owns and is responsible for using just as any other
//! on-chain output which is theirs.

use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut};
use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut, SigHashType};
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::network::constants::Network;
use bitcoin::util::bip32::{ExtendedPrivKey, ExtendedPubKey, ChildNumber};
use bitcoin::util::address::Address;
use bitcoin::util::bip143;

use bitcoin_hashes::{Hash, HashEngine};
Expand All@@ -26,6 +27,7 @@ use util::ser::{Writeable, Writer, Readable};
use ln::chan_utils;
use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, LocalCommitmentTransaction};
use ln::msgs;
use ln::channelmanager::PaymentPreimage;

use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
Expand DownExpand Up@@ -64,8 +66,8 @@ pub enum SpendableOutputDescriptor {
	DynamicOutputP2WSH {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
 /// Per commitment point to derive delayed_payment_key by key holder
per_commitment_point: PublicKey,
 /// The witness redeemScript which is hashed to create the script_pubkey in the given output
 witness_script: Script,
 /// The nSequence value which must be set in the spending input to satisfy the OP_CSV in
Expand All@@ -83,7 +85,7 @@ pub enum SpendableOutputDescriptor {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
per_commitment_point: PublicKey,
 /// The output which is reference by the given outpoint
 output: TxOut,
	}
Expand All@@ -97,18 +99,18 @@ impl Writeable for SpendableOutputDescriptor {
 outpoint.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref key, ref witness_script, ref to_self_delay, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref per_commitment_point, ref witness_script, ref to_self_delay, ref output } => {
 1u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 witness_script.write(writer)?;
 to_self_delay.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref key, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref per_commitment_point, ref output } => {
 2u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 output.write(writer)?;
 },
 }
Expand All@@ -125,14 +127,14 @@ impl Readable for SpendableOutputDescriptor {
 }),
 1u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WSH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 witness_script: Readable::read(reader)?,
 to_self_delay: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 2u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WPKH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 _ => Err(DecodeError::InvalidValue),
Expand DownExpand Up@@ -245,12 +247,24 @@ pub trait ChannelKeys : Send+Clone {
	/// return value must contain a signature.
	fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()>;

	/// Signs a justice transaction.
	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>);

	/// Signs a remote htlc transaction.
	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>);

	/// Create a signature for a (proposed) closing transaction.
	///
	/// Note that, due to rounding, there may be one "missing" satoshi, and either party may have
	/// chosen to forgo their output as dust.
	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for a delayed transaction.
	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>);

	/// Create a signture for a payment transaction spending a to_remote output on a remote commitment tx.
	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>);

	/// Signs a channel announcement message with our funding key, proving it comes from one
	/// of the channel participants.
	///
Expand DownExpand Up@@ -393,6 +407,38 @@ impl ChannelKeys for InMemoryChannelKeys {
 local_commitment_tx.get_htlc_sigs(&self.htlc_base_key, local_csv, secp_ctx)
	}

	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>) {
 if let Ok(revocation_key) = chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_key, &self.revocation_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &revocation_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if is_htlc {
 bumped_tx.input[input].witness.push(revocation_pubkey.clone().serialize().to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec!(1));
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>) {
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.htlc_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &htlc_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if let &Some(preimage) = preimage {
 bumped_tx.input[input].witness.push(preimage.0.to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec![0]);
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 if closing_tx.input.len() != 1 { return Err(()); }
 if closing_tx.input[0].witness.len() != 0 { return Err(()); }
Expand All@@ -407,6 +453,31 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(secp_ctx.sign(&sighash, &self.funding_key))
	}

	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], witness_script, amount)[..]);
 let local_delaysig = secp_ctx.sign(&sighash, &htlc_key);
 spend_tx.input[0].witness.push(local_delaysig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(vec!(0));
 spend_tx.input[0].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction
 if let Ok(payment_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.payment_base_key) {
 let remotepubkey = PublicKey::from_secret_key(&secp_ctx, &payment_key);
 let witness_script = Address::p2pkh(&::bitcoin::PublicKey{compressed: true, key: remotepubkey}, network).script_pubkey();
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], &witness_script, amount)[..]);
 let remotesig = secp_ctx.sign(&sighash, &payment_key);
 spend_tx.input[0].witness.push(remotesig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(remotepubkey.serialize().to_vec());
 }
	}

	fn sign_channel_announcement<T: secp256k1::Signing>(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let msghash = hash_to_message!(&Sha256dHash::hash(&msg.encode()[..])[..]);
 Ok(secp_ctx.sign(&msghash, &self.funding_key))
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,7 @@ pub(super) fn derive_public_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>,
/// Derives a revocation key from its constituent parts.
/// Note that this is infallible iff we trust that at least one of the two input keys are randomly
/// generated (ie our own).
pub(super) fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
pub fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
	let revocation_base_point = PublicKey::from_secret_key(&secp_ctx, &revocation_base_secret);
	let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);

Expand Down
Loading

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

Skip to content
Move spendable output descriptors key behind signer interface#562

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

ariard
wants to merge
10
commits into

from

 Closed


Move spendable output descriptors key behind signer interface
#562
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3244e41

Cache remote basepoint and remote_csv in new OnchainTxHandler::Remote…

Mar 24, 2020
3caa38f

Cache remote HTLC inside OnchainTxHandler::RemoteTxCache

Mar 24, 2020
ea8df9d

Replace is_htlc in InputMaterial by InputDescriptor

Mar 24, 2020
b082827

Build witness_script for justice tx inside OnchainTxHandler

Mar 24, 2020
bb5b14c

Move justice transaction signature behind ChanSigner

Mar 24, 2020
d2a6a78

Build witness_script for remote htlc transactions inside

Mar 24, 2020
5a8f68f

Move remote htlc transaction signature behind ChanSigner

Mar 24, 2020
4fd727f

Add test-only ChannelMonitor::get_chan_signer to sign spendable output

Mar 24, 2020
13a6604

Remove SecretKey from DynamicOutputP2WSH descriptor

Mar 24, 2020
7a23c0c

Remove SecretKey from DynamicOuputP2WPKH descriptor

Mar 24, 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


91 changes: 81 additions & 10 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,12 @@
//! spendable on-chain outputs which the user owns and is responsible for using just as any other
//! on-chain output which is theirs.

use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut};
use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut, SigHashType};
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::network::constants::Network;
use bitcoin::util::bip32::{ExtendedPrivKey, ExtendedPubKey, ChildNumber};
use bitcoin::util::address::Address;
use bitcoin::util::bip143;

use bitcoin_hashes::{Hash, HashEngine};
Expand All@@ -26,6 +27,7 @@ use util::ser::{Writeable, Writer, Readable};
use ln::chan_utils;
use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, LocalCommitmentTransaction};
use ln::msgs;
use ln::channelmanager::PaymentPreimage;

use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
Expand DownExpand Up@@ -64,8 +66,8 @@ pub enum SpendableOutputDescriptor {
	DynamicOutputP2WSH {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
 /// Per commitment point to derive delayed_payment_key by key holder
per_commitment_point: PublicKey,
 /// The witness redeemScript which is hashed to create the script_pubkey in the given output
 witness_script: Script,
 /// The nSequence value which must be set in the spending input to satisfy the OP_CSV in
Expand All@@ -83,7 +85,7 @@ pub enum SpendableOutputDescriptor {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
per_commitment_point: PublicKey,
 /// The output which is reference by the given outpoint
 output: TxOut,
	}
Expand All@@ -97,18 +99,18 @@ impl Writeable for SpendableOutputDescriptor {
 outpoint.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref key, ref witness_script, ref to_self_delay, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref per_commitment_point, ref witness_script, ref to_self_delay, ref output } => {
 1u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 witness_script.write(writer)?;
 to_self_delay.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref key, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref per_commitment_point, ref output } => {
 2u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 output.write(writer)?;
 },
 }
Expand All@@ -125,14 +127,14 @@ impl Readable for SpendableOutputDescriptor {
 }),
 1u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WSH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 witness_script: Readable::read(reader)?,
 to_self_delay: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 2u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WPKH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 _ => Err(DecodeError::InvalidValue),
Expand DownExpand Up@@ -245,12 +247,24 @@ pub trait ChannelKeys : Send+Clone {
	/// return value must contain a signature.
	fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()>;

	/// Signs a justice transaction.
	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>);

	/// Signs a remote htlc transaction.
	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>);

	/// Create a signature for a (proposed) closing transaction.
	///
	/// Note that, due to rounding, there may be one "missing" satoshi, and either party may have
	/// chosen to forgo their output as dust.
	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for a delayed transaction.
	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>);

	/// Create a signture for a payment transaction spending a to_remote output on a remote commitment tx.
	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>);

	/// Signs a channel announcement message with our funding key, proving it comes from one
	/// of the channel participants.
	///
Expand DownExpand Up@@ -393,6 +407,38 @@ impl ChannelKeys for InMemoryChannelKeys {
 local_commitment_tx.get_htlc_sigs(&self.htlc_base_key, local_csv, secp_ctx)
	}

	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>) {
 if let Ok(revocation_key) = chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_key, &self.revocation_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &revocation_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if is_htlc {
 bumped_tx.input[input].witness.push(revocation_pubkey.clone().serialize().to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec!(1));
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>) {
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.htlc_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &htlc_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if let &Some(preimage) = preimage {
 bumped_tx.input[input].witness.push(preimage.0.to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec![0]);
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 if closing_tx.input.len() != 1 { return Err(()); }
 if closing_tx.input[0].witness.len() != 0 { return Err(()); }
Expand All@@ -407,6 +453,31 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(secp_ctx.sign(&sighash, &self.funding_key))
	}

	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], witness_script, amount)[..]);
 let local_delaysig = secp_ctx.sign(&sighash, &htlc_key);
 spend_tx.input[0].witness.push(local_delaysig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(vec!(0));
 spend_tx.input[0].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction
 if let Ok(payment_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.payment_base_key) {
 let remotepubkey = PublicKey::from_secret_key(&secp_ctx, &payment_key);
 let witness_script = Address::p2pkh(&::bitcoin::PublicKey{compressed: true, key: remotepubkey}, network).script_pubkey();
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], &witness_script, amount)[..]);
 let remotesig = secp_ctx.sign(&sighash, &payment_key);
 spend_tx.input[0].witness.push(remotesig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(remotepubkey.serialize().to_vec());
 }
	}

	fn sign_channel_announcement<T: secp256k1::Signing>(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let msghash = hash_to_message!(&Sha256dHash::hash(&msg.encode()[..])[..]);
 Ok(secp_ctx.sign(&msghash, &self.funding_key))
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,7 @@ pub(super) fn derive_public_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>,
/// Derives a revocation key from its constituent parts.
/// Note that this is infallible iff we trust that at least one of the two input keys are randomly
/// generated (ie our own).
pub(super) fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
pub fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
	let revocation_base_point = PublicKey::from_secret_key(&secp_ctx, &revocation_base_secret);
	let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);

Expand Down
Loading

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

Skip to content
Move spendable output descriptors key behind signer interface#562

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

ariard
wants to merge
10
commits into

from

 Closed


Move spendable output descriptors key behind signer interface
#562
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3244e41

Cache remote basepoint and remote_csv in new OnchainTxHandler::Remote…

Mar 24, 2020
3caa38f

Cache remote HTLC inside OnchainTxHandler::RemoteTxCache

Mar 24, 2020
ea8df9d

Replace is_htlc in InputMaterial by InputDescriptor

Mar 24, 2020
b082827

Build witness_script for justice tx inside OnchainTxHandler

Mar 24, 2020
bb5b14c

Move justice transaction signature behind ChanSigner

Mar 24, 2020
d2a6a78

Build witness_script for remote htlc transactions inside

Mar 24, 2020
5a8f68f

Move remote htlc transaction signature behind ChanSigner

Mar 24, 2020
4fd727f

Add test-only ChannelMonitor::get_chan_signer to sign spendable output

Mar 24, 2020
13a6604

Remove SecretKey from DynamicOutputP2WSH descriptor

Mar 24, 2020
7a23c0c

Remove SecretKey from DynamicOuputP2WPKH descriptor

Mar 24, 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


91 changes: 81 additions & 10 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,12 @@
//! spendable on-chain outputs which the user owns and is responsible for using just as any other
//! on-chain output which is theirs.

use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut};
use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut, SigHashType};
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::network::constants::Network;
use bitcoin::util::bip32::{ExtendedPrivKey, ExtendedPubKey, ChildNumber};
use bitcoin::util::address::Address;
use bitcoin::util::bip143;

use bitcoin_hashes::{Hash, HashEngine};
Expand All@@ -26,6 +27,7 @@ use util::ser::{Writeable, Writer, Readable};
use ln::chan_utils;
use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, LocalCommitmentTransaction};
use ln::msgs;
use ln::channelmanager::PaymentPreimage;

use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
Expand DownExpand Up@@ -64,8 +66,8 @@ pub enum SpendableOutputDescriptor {
	DynamicOutputP2WSH {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
 /// Per commitment point to derive delayed_payment_key by key holder
per_commitment_point: PublicKey,
 /// The witness redeemScript which is hashed to create the script_pubkey in the given output
 witness_script: Script,
 /// The nSequence value which must be set in the spending input to satisfy the OP_CSV in
Expand All@@ -83,7 +85,7 @@ pub enum SpendableOutputDescriptor {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
per_commitment_point: PublicKey,
 /// The output which is reference by the given outpoint
 output: TxOut,
	}
Expand All@@ -97,18 +99,18 @@ impl Writeable for SpendableOutputDescriptor {
 outpoint.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref key, ref witness_script, ref to_self_delay, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref per_commitment_point, ref witness_script, ref to_self_delay, ref output } => {
 1u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 witness_script.write(writer)?;
 to_self_delay.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref key, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref per_commitment_point, ref output } => {
 2u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 output.write(writer)?;
 },
 }
Expand All@@ -125,14 +127,14 @@ impl Readable for SpendableOutputDescriptor {
 }),
 1u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WSH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 witness_script: Readable::read(reader)?,
 to_self_delay: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 2u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WPKH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 _ => Err(DecodeError::InvalidValue),
Expand DownExpand Up@@ -245,12 +247,24 @@ pub trait ChannelKeys : Send+Clone {
	/// return value must contain a signature.
	fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()>;

	/// Signs a justice transaction.
	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>);

	/// Signs a remote htlc transaction.
	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>);

	/// Create a signature for a (proposed) closing transaction.
	///
	/// Note that, due to rounding, there may be one "missing" satoshi, and either party may have
	/// chosen to forgo their output as dust.
	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for a delayed transaction.
	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>);

	/// Create a signture for a payment transaction spending a to_remote output on a remote commitment tx.
	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>);

	/// Signs a channel announcement message with our funding key, proving it comes from one
	/// of the channel participants.
	///
Expand DownExpand Up@@ -393,6 +407,38 @@ impl ChannelKeys for InMemoryChannelKeys {
 local_commitment_tx.get_htlc_sigs(&self.htlc_base_key, local_csv, secp_ctx)
	}

	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>) {
 if let Ok(revocation_key) = chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_key, &self.revocation_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &revocation_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if is_htlc {
 bumped_tx.input[input].witness.push(revocation_pubkey.clone().serialize().to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec!(1));
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>) {
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.htlc_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &htlc_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if let &Some(preimage) = preimage {
 bumped_tx.input[input].witness.push(preimage.0.to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec![0]);
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 if closing_tx.input.len() != 1 { return Err(()); }
 if closing_tx.input[0].witness.len() != 0 { return Err(()); }
Expand All@@ -407,6 +453,31 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(secp_ctx.sign(&sighash, &self.funding_key))
	}

	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], witness_script, amount)[..]);
 let local_delaysig = secp_ctx.sign(&sighash, &htlc_key);
 spend_tx.input[0].witness.push(local_delaysig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(vec!(0));
 spend_tx.input[0].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction
 if let Ok(payment_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.payment_base_key) {
 let remotepubkey = PublicKey::from_secret_key(&secp_ctx, &payment_key);
 let witness_script = Address::p2pkh(&::bitcoin::PublicKey{compressed: true, key: remotepubkey}, network).script_pubkey();
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], &witness_script, amount)[..]);
 let remotesig = secp_ctx.sign(&sighash, &payment_key);
 spend_tx.input[0].witness.push(remotesig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(remotepubkey.serialize().to_vec());
 }
	}

	fn sign_channel_announcement<T: secp256k1::Signing>(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let msghash = hash_to_message!(&Sha256dHash::hash(&msg.encode()[..])[..]);
 Ok(secp_ctx.sign(&msghash, &self.funding_key))
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,7 @@ pub(super) fn derive_public_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>,
/// Derives a revocation key from its constituent parts.
/// Note that this is infallible iff we trust that at least one of the two input keys are randomly
/// generated (ie our own).
pub(super) fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
pub fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
	let revocation_base_point = PublicKey::from_secret_key(&secp_ctx, &revocation_base_secret);
	let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);

Expand Down
Loading

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

Skip to content
Move spendable output descriptors key behind signer interface#562

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

ariard
wants to merge
10
commits into

from

 Closed


Move spendable output descriptors key behind signer interface
#562
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3244e41

Cache remote basepoint and remote_csv in new OnchainTxHandler::Remote…

Mar 24, 2020
3caa38f

Cache remote HTLC inside OnchainTxHandler::RemoteTxCache

Mar 24, 2020
ea8df9d

Replace is_htlc in InputMaterial by InputDescriptor

Mar 24, 2020
b082827

Build witness_script for justice tx inside OnchainTxHandler

Mar 24, 2020
bb5b14c

Move justice transaction signature behind ChanSigner

Mar 24, 2020
d2a6a78

Build witness_script for remote htlc transactions inside

Mar 24, 2020
5a8f68f

Move remote htlc transaction signature behind ChanSigner

Mar 24, 2020
4fd727f

Add test-only ChannelMonitor::get_chan_signer to sign spendable output

Mar 24, 2020
13a6604

Remove SecretKey from DynamicOutputP2WSH descriptor

Mar 24, 2020
7a23c0c

Remove SecretKey from DynamicOuputP2WPKH descriptor

Mar 24, 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


91 changes: 81 additions & 10 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,12 @@
//! spendable on-chain outputs which the user owns and is responsible for using just as any other
//! on-chain output which is theirs.

use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut};
use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut, SigHashType};
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::network::constants::Network;
use bitcoin::util::bip32::{ExtendedPrivKey, ExtendedPubKey, ChildNumber};
use bitcoin::util::address::Address;
use bitcoin::util::bip143;

use bitcoin_hashes::{Hash, HashEngine};
Expand All@@ -26,6 +27,7 @@ use util::ser::{Writeable, Writer, Readable};
use ln::chan_utils;
use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, LocalCommitmentTransaction};
use ln::msgs;
use ln::channelmanager::PaymentPreimage;

use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
Expand DownExpand Up@@ -64,8 +66,8 @@ pub enum SpendableOutputDescriptor {
	DynamicOutputP2WSH {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
 /// Per commitment point to derive delayed_payment_key by key holder
per_commitment_point: PublicKey,
 /// The witness redeemScript which is hashed to create the script_pubkey in the given output
 witness_script: Script,
 /// The nSequence value which must be set in the spending input to satisfy the OP_CSV in
Expand All@@ -83,7 +85,7 @@ pub enum SpendableOutputDescriptor {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
per_commitment_point: PublicKey,
 /// The output which is reference by the given outpoint
 output: TxOut,
	}
Expand All@@ -97,18 +99,18 @@ impl Writeable for SpendableOutputDescriptor {
 outpoint.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref key, ref witness_script, ref to_self_delay, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref per_commitment_point, ref witness_script, ref to_self_delay, ref output } => {
 1u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 witness_script.write(writer)?;
 to_self_delay.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref key, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref per_commitment_point, ref output } => {
 2u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 output.write(writer)?;
 },
 }
Expand All@@ -125,14 +127,14 @@ impl Readable for SpendableOutputDescriptor {
 }),
 1u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WSH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 witness_script: Readable::read(reader)?,
 to_self_delay: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 2u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WPKH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 _ => Err(DecodeError::InvalidValue),
Expand DownExpand Up@@ -245,12 +247,24 @@ pub trait ChannelKeys : Send+Clone {
	/// return value must contain a signature.
	fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()>;

	/// Signs a justice transaction.
	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>);

	/// Signs a remote htlc transaction.
	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>);

	/// Create a signature for a (proposed) closing transaction.
	///
	/// Note that, due to rounding, there may be one "missing" satoshi, and either party may have
	/// chosen to forgo their output as dust.
	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for a delayed transaction.
	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>);

	/// Create a signture for a payment transaction spending a to_remote output on a remote commitment tx.
	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>);

	/// Signs a channel announcement message with our funding key, proving it comes from one
	/// of the channel participants.
	///
Expand DownExpand Up@@ -393,6 +407,38 @@ impl ChannelKeys for InMemoryChannelKeys {
 local_commitment_tx.get_htlc_sigs(&self.htlc_base_key, local_csv, secp_ctx)
	}

	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>) {
 if let Ok(revocation_key) = chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_key, &self.revocation_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &revocation_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if is_htlc {
 bumped_tx.input[input].witness.push(revocation_pubkey.clone().serialize().to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec!(1));
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>) {
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.htlc_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &htlc_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if let &Some(preimage) = preimage {
 bumped_tx.input[input].witness.push(preimage.0.to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec![0]);
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 if closing_tx.input.len() != 1 { return Err(()); }
 if closing_tx.input[0].witness.len() != 0 { return Err(()); }
Expand All@@ -407,6 +453,31 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(secp_ctx.sign(&sighash, &self.funding_key))
	}

	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], witness_script, amount)[..]);
 let local_delaysig = secp_ctx.sign(&sighash, &htlc_key);
 spend_tx.input[0].witness.push(local_delaysig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(vec!(0));
 spend_tx.input[0].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction
 if let Ok(payment_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.payment_base_key) {
 let remotepubkey = PublicKey::from_secret_key(&secp_ctx, &payment_key);
 let witness_script = Address::p2pkh(&::bitcoin::PublicKey{compressed: true, key: remotepubkey}, network).script_pubkey();
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], &witness_script, amount)[..]);
 let remotesig = secp_ctx.sign(&sighash, &payment_key);
 spend_tx.input[0].witness.push(remotesig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(remotepubkey.serialize().to_vec());
 }
	}

	fn sign_channel_announcement<T: secp256k1::Signing>(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let msghash = hash_to_message!(&Sha256dHash::hash(&msg.encode()[..])[..]);
 Ok(secp_ctx.sign(&msghash, &self.funding_key))
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,7 @@ pub(super) fn derive_public_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>,
/// Derives a revocation key from its constituent parts.
/// Note that this is infallible iff we trust that at least one of the two input keys are randomly
/// generated (ie our own).
pub(super) fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
pub fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
	let revocation_base_point = PublicKey::from_secret_key(&secp_ctx, &revocation_base_secret);
	let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);

Expand Down
Loading

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

Skip to content
Move spendable output descriptors key behind signer interface#562

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

ariard
wants to merge
10
commits into

from

 Closed


Move spendable output descriptors key behind signer interface
#562
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3244e41

Cache remote basepoint and remote_csv in new OnchainTxHandler::Remote…

Mar 24, 2020
3caa38f

Cache remote HTLC inside OnchainTxHandler::RemoteTxCache

Mar 24, 2020
ea8df9d

Replace is_htlc in InputMaterial by InputDescriptor

Mar 24, 2020
b082827

Build witness_script for justice tx inside OnchainTxHandler

Mar 24, 2020
bb5b14c

Move justice transaction signature behind ChanSigner

Mar 24, 2020
d2a6a78

Build witness_script for remote htlc transactions inside

Mar 24, 2020
5a8f68f

Move remote htlc transaction signature behind ChanSigner

Mar 24, 2020
4fd727f

Add test-only ChannelMonitor::get_chan_signer to sign spendable output

Mar 24, 2020
13a6604

Remove SecretKey from DynamicOutputP2WSH descriptor

Mar 24, 2020
7a23c0c

Remove SecretKey from DynamicOuputP2WPKH descriptor

Mar 24, 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


91 changes: 81 additions & 10 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,12 @@
//! spendable on-chain outputs which the user owns and is responsible for using just as any other
//! on-chain output which is theirs.

use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut};
use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut, SigHashType};
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::network::constants::Network;
use bitcoin::util::bip32::{ExtendedPrivKey, ExtendedPubKey, ChildNumber};
use bitcoin::util::address::Address;
use bitcoin::util::bip143;

use bitcoin_hashes::{Hash, HashEngine};
Expand All@@ -26,6 +27,7 @@ use util::ser::{Writeable, Writer, Readable};
use ln::chan_utils;
use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, LocalCommitmentTransaction};
use ln::msgs;
use ln::channelmanager::PaymentPreimage;

use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
Expand DownExpand Up@@ -64,8 +66,8 @@ pub enum SpendableOutputDescriptor {
	DynamicOutputP2WSH {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
 /// Per commitment point to derive delayed_payment_key by key holder
per_commitment_point: PublicKey,
 /// The witness redeemScript which is hashed to create the script_pubkey in the given output
 witness_script: Script,
 /// The nSequence value which must be set in the spending input to satisfy the OP_CSV in
Expand All@@ -83,7 +85,7 @@ pub enum SpendableOutputDescriptor {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
per_commitment_point: PublicKey,
 /// The output which is reference by the given outpoint
 output: TxOut,
	}
Expand All@@ -97,18 +99,18 @@ impl Writeable for SpendableOutputDescriptor {
 outpoint.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref key, ref witness_script, ref to_self_delay, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref per_commitment_point, ref witness_script, ref to_self_delay, ref output } => {
 1u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 witness_script.write(writer)?;
 to_self_delay.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref key, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref per_commitment_point, ref output } => {
 2u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 output.write(writer)?;
 },
 }
Expand All@@ -125,14 +127,14 @@ impl Readable for SpendableOutputDescriptor {
 }),
 1u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WSH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 witness_script: Readable::read(reader)?,
 to_self_delay: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 2u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WPKH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 _ => Err(DecodeError::InvalidValue),
Expand DownExpand Up@@ -245,12 +247,24 @@ pub trait ChannelKeys : Send+Clone {
	/// return value must contain a signature.
	fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()>;

	/// Signs a justice transaction.
	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>);

	/// Signs a remote htlc transaction.
	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>);

	/// Create a signature for a (proposed) closing transaction.
	///
	/// Note that, due to rounding, there may be one "missing" satoshi, and either party may have
	/// chosen to forgo their output as dust.
	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for a delayed transaction.
	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>);

	/// Create a signture for a payment transaction spending a to_remote output on a remote commitment tx.
	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>);

	/// Signs a channel announcement message with our funding key, proving it comes from one
	/// of the channel participants.
	///
Expand DownExpand Up@@ -393,6 +407,38 @@ impl ChannelKeys for InMemoryChannelKeys {
 local_commitment_tx.get_htlc_sigs(&self.htlc_base_key, local_csv, secp_ctx)
	}

	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>) {
 if let Ok(revocation_key) = chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_key, &self.revocation_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &revocation_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if is_htlc {
 bumped_tx.input[input].witness.push(revocation_pubkey.clone().serialize().to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec!(1));
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>) {
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.htlc_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &htlc_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if let &Some(preimage) = preimage {
 bumped_tx.input[input].witness.push(preimage.0.to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec![0]);
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 if closing_tx.input.len() != 1 { return Err(()); }
 if closing_tx.input[0].witness.len() != 0 { return Err(()); }
Expand All@@ -407,6 +453,31 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(secp_ctx.sign(&sighash, &self.funding_key))
	}

	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], witness_script, amount)[..]);
 let local_delaysig = secp_ctx.sign(&sighash, &htlc_key);
 spend_tx.input[0].witness.push(local_delaysig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(vec!(0));
 spend_tx.input[0].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction
 if let Ok(payment_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.payment_base_key) {
 let remotepubkey = PublicKey::from_secret_key(&secp_ctx, &payment_key);
 let witness_script = Address::p2pkh(&::bitcoin::PublicKey{compressed: true, key: remotepubkey}, network).script_pubkey();
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], &witness_script, amount)[..]);
 let remotesig = secp_ctx.sign(&sighash, &payment_key);
 spend_tx.input[0].witness.push(remotesig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(remotepubkey.serialize().to_vec());
 }
	}

	fn sign_channel_announcement<T: secp256k1::Signing>(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let msghash = hash_to_message!(&Sha256dHash::hash(&msg.encode()[..])[..]);
 Ok(secp_ctx.sign(&msghash, &self.funding_key))
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,7 @@ pub(super) fn derive_public_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>,
/// Derives a revocation key from its constituent parts.
/// Note that this is infallible iff we trust that at least one of the two input keys are randomly
/// generated (ie our own).
pub(super) fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
pub fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
	let revocation_base_point = PublicKey::from_secret_key(&secp_ctx, &revocation_base_secret);
	let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);

Expand Down
Loading

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

Skip to content
Move spendable output descriptors key behind signer interface#562

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

ariard
wants to merge
10
commits into

from

 Closed


Move spendable output descriptors key behind signer interface
#562
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3244e41

Cache remote basepoint and remote_csv in new OnchainTxHandler::Remote…

Mar 24, 2020
3caa38f

Cache remote HTLC inside OnchainTxHandler::RemoteTxCache

Mar 24, 2020
ea8df9d

Replace is_htlc in InputMaterial by InputDescriptor

Mar 24, 2020
b082827

Build witness_script for justice tx inside OnchainTxHandler

Mar 24, 2020
bb5b14c

Move justice transaction signature behind ChanSigner

Mar 24, 2020
d2a6a78

Build witness_script for remote htlc transactions inside

Mar 24, 2020
5a8f68f

Move remote htlc transaction signature behind ChanSigner

Mar 24, 2020
4fd727f

Add test-only ChannelMonitor::get_chan_signer to sign spendable output

Mar 24, 2020
13a6604

Remove SecretKey from DynamicOutputP2WSH descriptor

Mar 24, 2020
7a23c0c

Remove SecretKey from DynamicOuputP2WPKH descriptor

Mar 24, 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


91 changes: 81 additions & 10 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,12 @@
//! spendable on-chain outputs which the user owns and is responsible for using just as any other
//! on-chain output which is theirs.

use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut};
use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut, SigHashType};
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::network::constants::Network;
use bitcoin::util::bip32::{ExtendedPrivKey, ExtendedPubKey, ChildNumber};
use bitcoin::util::address::Address;
use bitcoin::util::bip143;

use bitcoin_hashes::{Hash, HashEngine};
Expand All@@ -26,6 +27,7 @@ use util::ser::{Writeable, Writer, Readable};
use ln::chan_utils;
use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, LocalCommitmentTransaction};
use ln::msgs;
use ln::channelmanager::PaymentPreimage;

use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
Expand DownExpand Up@@ -64,8 +66,8 @@ pub enum SpendableOutputDescriptor {
	DynamicOutputP2WSH {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
 /// Per commitment point to derive delayed_payment_key by key holder
per_commitment_point: PublicKey,
 /// The witness redeemScript which is hashed to create the script_pubkey in the given output
 witness_script: Script,
 /// The nSequence value which must be set in the spending input to satisfy the OP_CSV in
Expand All@@ -83,7 +85,7 @@ pub enum SpendableOutputDescriptor {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
per_commitment_point: PublicKey,
 /// The output which is reference by the given outpoint
 output: TxOut,
	}
Expand All@@ -97,18 +99,18 @@ impl Writeable for SpendableOutputDescriptor {
 outpoint.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref key, ref witness_script, ref to_self_delay, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref per_commitment_point, ref witness_script, ref to_self_delay, ref output } => {
 1u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 witness_script.write(writer)?;
 to_self_delay.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref key, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref per_commitment_point, ref output } => {
 2u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 output.write(writer)?;
 },
 }
Expand All@@ -125,14 +127,14 @@ impl Readable for SpendableOutputDescriptor {
 }),
 1u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WSH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 witness_script: Readable::read(reader)?,
 to_self_delay: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 2u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WPKH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 _ => Err(DecodeError::InvalidValue),
Expand DownExpand Up@@ -245,12 +247,24 @@ pub trait ChannelKeys : Send+Clone {
	/// return value must contain a signature.
	fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()>;

	/// Signs a justice transaction.
	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>);

	/// Signs a remote htlc transaction.
	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>);

	/// Create a signature for a (proposed) closing transaction.
	///
	/// Note that, due to rounding, there may be one "missing" satoshi, and either party may have
	/// chosen to forgo their output as dust.
	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for a delayed transaction.
	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>);

	/// Create a signture for a payment transaction spending a to_remote output on a remote commitment tx.
	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>);

	/// Signs a channel announcement message with our funding key, proving it comes from one
	/// of the channel participants.
	///
Expand DownExpand Up@@ -393,6 +407,38 @@ impl ChannelKeys for InMemoryChannelKeys {
 local_commitment_tx.get_htlc_sigs(&self.htlc_base_key, local_csv, secp_ctx)
	}

	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>) {
 if let Ok(revocation_key) = chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_key, &self.revocation_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &revocation_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if is_htlc {
 bumped_tx.input[input].witness.push(revocation_pubkey.clone().serialize().to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec!(1));
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>) {
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.htlc_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &htlc_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if let &Some(preimage) = preimage {
 bumped_tx.input[input].witness.push(preimage.0.to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec![0]);
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 if closing_tx.input.len() != 1 { return Err(()); }
 if closing_tx.input[0].witness.len() != 0 { return Err(()); }
Expand All@@ -407,6 +453,31 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(secp_ctx.sign(&sighash, &self.funding_key))
	}

	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], witness_script, amount)[..]);
 let local_delaysig = secp_ctx.sign(&sighash, &htlc_key);
 spend_tx.input[0].witness.push(local_delaysig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(vec!(0));
 spend_tx.input[0].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction
 if let Ok(payment_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.payment_base_key) {
 let remotepubkey = PublicKey::from_secret_key(&secp_ctx, &payment_key);
 let witness_script = Address::p2pkh(&::bitcoin::PublicKey{compressed: true, key: remotepubkey}, network).script_pubkey();
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], &witness_script, amount)[..]);
 let remotesig = secp_ctx.sign(&sighash, &payment_key);
 spend_tx.input[0].witness.push(remotesig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(remotepubkey.serialize().to_vec());
 }
	}

	fn sign_channel_announcement<T: secp256k1::Signing>(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let msghash = hash_to_message!(&Sha256dHash::hash(&msg.encode()[..])[..]);
 Ok(secp_ctx.sign(&msghash, &self.funding_key))
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,7 @@ pub(super) fn derive_public_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>,
/// Derives a revocation key from its constituent parts.
/// Note that this is infallible iff we trust that at least one of the two input keys are randomly
/// generated (ie our own).
pub(super) fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
pub fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
	let revocation_base_point = PublicKey::from_secret_key(&secp_ctx, &revocation_base_secret);
	let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);

Expand Down
Loading

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

Skip to content
Move spendable output descriptors key behind signer interface#562

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

ariard
wants to merge
10
commits into

from

 Closed


Move spendable output descriptors key behind signer interface
#562
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3244e41

Cache remote basepoint and remote_csv in new OnchainTxHandler::Remote…

Mar 24, 2020
3caa38f

Cache remote HTLC inside OnchainTxHandler::RemoteTxCache

Mar 24, 2020
ea8df9d

Replace is_htlc in InputMaterial by InputDescriptor

Mar 24, 2020
b082827

Build witness_script for justice tx inside OnchainTxHandler

Mar 24, 2020
bb5b14c

Move justice transaction signature behind ChanSigner

Mar 24, 2020
d2a6a78

Build witness_script for remote htlc transactions inside

Mar 24, 2020
5a8f68f

Move remote htlc transaction signature behind ChanSigner

Mar 24, 2020
4fd727f

Add test-only ChannelMonitor::get_chan_signer to sign spendable output

Mar 24, 2020
13a6604

Remove SecretKey from DynamicOutputP2WSH descriptor

Mar 24, 2020
7a23c0c

Remove SecretKey from DynamicOuputP2WPKH descriptor

Mar 24, 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


91 changes: 81 additions & 10 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,12 @@
//! spendable on-chain outputs which the user owns and is responsible for using just as any other
//! on-chain output which is theirs.

use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut};
use bitcoin::blockdata::transaction::{Transaction, OutPoint, TxOut, SigHashType};
use bitcoin::blockdata::script::{Script, Builder};
use bitcoin::blockdata::opcodes;
use bitcoin::network::constants::Network;
use bitcoin::util::bip32::{ExtendedPrivKey, ExtendedPubKey, ChildNumber};
use bitcoin::util::address::Address;
use bitcoin::util::bip143;

use bitcoin_hashes::{Hash, HashEngine};
Expand All@@ -26,6 +27,7 @@ use util::ser::{Writeable, Writer, Readable};
use ln::chan_utils;
use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment, make_funding_redeemscript, ChannelPublicKeys, LocalCommitmentTransaction};
use ln::msgs;
use ln::channelmanager::PaymentPreimage;

use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
Expand DownExpand Up@@ -64,8 +66,8 @@ pub enum SpendableOutputDescriptor {
	DynamicOutputP2WSH {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
 /// Per commitment point to derive delayed_payment_key by key holder
per_commitment_point: PublicKey,
 /// The witness redeemScript which is hashed to create the script_pubkey in the given output
 witness_script: Script,
 /// The nSequence value which must be set in the spending input to satisfy the OP_CSV in
Expand All@@ -83,7 +85,7 @@ pub enum SpendableOutputDescriptor {
 /// The outpoint which is spendable
 outpoint: OutPoint,
 /// The secret key which must be used to sign the spending transaction
key: SecretKey,
per_commitment_point: PublicKey,
 /// The output which is reference by the given outpoint
 output: TxOut,
	}
Expand All@@ -97,18 +99,18 @@ impl Writeable for SpendableOutputDescriptor {
 outpoint.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref key, ref witness_script, ref to_self_delay, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, ref per_commitment_point, ref witness_script, ref to_self_delay, ref output } => {
 1u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 witness_script.write(writer)?;
 to_self_delay.write(writer)?;
 output.write(writer)?;
 },
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref key, ref output } => {
 &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, ref per_commitment_point, ref output } => {
 2u8.write(writer)?;
 outpoint.write(writer)?;
key.write(writer)?;
per_commitment_point.write(writer)?;
 output.write(writer)?;
 },
 }
Expand All@@ -125,14 +127,14 @@ impl Readable for SpendableOutputDescriptor {
 }),
 1u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WSH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 witness_script: Readable::read(reader)?,
 to_self_delay: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 2u8 => Ok(SpendableOutputDescriptor::DynamicOutputP2WPKH {
 outpoint: Readable::read(reader)?,
key: Readable::read(reader)?,
per_commitment_point: Readable::read(reader)?,
 output: Readable::read(reader)?,
 }),
 _ => Err(DecodeError::InvalidValue),
Expand DownExpand Up@@ -245,12 +247,24 @@ pub trait ChannelKeys : Send+Clone {
	/// return value must contain a signature.
	fn sign_local_commitment_htlc_transactions<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, local_csv: u16, secp_ctx: &Secp256k1<T>) -> Result<Vec<Option<Signature>>, ()>;

	/// Signs a justice transaction.
	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>);

	/// Signs a remote htlc transaction.
	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>);

	/// Create a signature for a (proposed) closing transaction.
	///
	/// Note that, due to rounding, there may be one "missing" satoshi, and either party may have
	/// chosen to forgo their output as dust.
	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for a delayed transaction.
	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>);

	/// Create a signture for a payment transaction spending a to_remote output on a remote commitment tx.
	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>);

	/// Signs a channel announcement message with our funding key, proving it comes from one
	/// of the channel participants.
	///
Expand DownExpand Up@@ -393,6 +407,38 @@ impl ChannelKeys for InMemoryChannelKeys {
 local_commitment_tx.get_htlc_sigs(&self.htlc_base_key, local_csv, secp_ctx)
	}

	fn sign_justice_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_key: &SecretKey, revocation_pubkey: &PublicKey, is_htlc: bool, secp_ctx: &Secp256k1<T>) {
 if let Ok(revocation_key) = chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_key, &self.revocation_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &revocation_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if is_htlc {
 bumped_tx.input[input].witness.push(revocation_pubkey.clone().serialize().to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec!(1));
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_remote_htlc_transaction<T: secp256k1::Signing>(&self, bumped_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, preimage: &Option<PaymentPreimage>, secp_ctx: &Secp256k1<T>) {
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.htlc_base_key) {
 let sighash_parts = bip143::SighashComponents::new(&bumped_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&bumped_tx.input[input], &witness_script, amount)[..]);
 let sig = secp_ctx.sign(&sighash, &htlc_key);
 bumped_tx.input[input].witness.push(sig.serialize_der().to_vec());
 bumped_tx.input[input].witness[0].push(SigHashType::All as u8);
 if let &Some(preimage) = preimage {
 bumped_tx.input[input].witness.push(preimage.0.to_vec());
 } else {
 bumped_tx.input[input].witness.push(vec![0]);
 }
 bumped_tx.input[input].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_closing_transaction<T: secp256k1::Signing>(&self, closing_tx: &Transaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 if closing_tx.input.len() != 1 { return Err(()); }
 if closing_tx.input[0].witness.len() != 0 { return Err(()); }
Expand All@@ -407,6 +453,31 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(secp_ctx.sign(&sighash, &self.funding_key))
	}

	fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken
 if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], witness_script, amount)[..]);
 let local_delaysig = secp_ctx.sign(&sighash, &htlc_key);
 spend_tx.input[0].witness.push(local_delaysig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(vec!(0));
 spend_tx.input[0].witness.push(witness_script.clone().into_bytes());
 }
	}

	fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {
@devrandomdevrandomApr 8, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction
 if let Ok(payment_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.payment_base_key) {
 let remotepubkey = PublicKey::from_secret_key(&secp_ctx, &payment_key);
 let witness_script = Address::p2pkh(&::bitcoin::PublicKey{compressed: true, key: remotepubkey}, network).script_pubkey();
 let sighash_parts = bip143::SighashComponents::new(&spend_tx);
 let sighash = hash_to_message!(&sighash_parts.sighash_all(&spend_tx.input[input], &witness_script, amount)[..]);
 let remotesig = secp_ctx.sign(&sighash, &payment_key);
 spend_tx.input[0].witness.push(remotesig.serialize_der().to_vec());
 spend_tx.input[0].witness[0].push(SigHashType::All as u8);
 spend_tx.input[0].witness.push(remotepubkey.serialize().to_vec());
 }
	}

	fn sign_channel_announcement<T: secp256k1::Signing>(&self, msg: &msgs::UnsignedChannelAnnouncement, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let msghash = hash_to_message!(&Sha256dHash::hash(&msg.encode()[..])[..]);
 Ok(secp_ctx.sign(&msghash, &self.funding_key))
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,7 +198,7 @@ pub(super) fn derive_public_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>,
/// Derives a revocation key from its constituent parts.
/// Note that this is infallible iff we trust that at least one of the two input keys are randomly
/// generated (ie our own).
pub(super) fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
pub fn derive_private_revocation_key<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, per_commitment_secret: &SecretKey, revocation_base_secret: &SecretKey) -> Result<SecretKey, secp256k1::Error> {
	let revocation_base_point = PublicKey::from_secret_key(&secp_ctx, &revocation_base_secret);
	let per_commitment_point = PublicKey::from_secret_key(&secp_ctx, &per_commitment_secret);

Expand Down
Loading