Skip to content

Export various fields and structures#662

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 4 commits into from
Aug 11, 2020
Merged

Export various fields and structures #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce0cecd
export "unsafe_revoked_tx_signing" feature
devrandom Jul 3, 2020
31b4d89
make SimpleManyChannelMonitor.monitors public
devrandom Jul 4, 2020
f600263
make LocalCommitmentTransaction constructor public
devrandom Jul 20, 2020
fd2db40
check the input shape in LocalCommitmentTransaction.new_missing_local…
devrandom Aug 11, 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
3 changes: 3 additions & 0 deletions lightning/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@ max_level_error = []
max_level_warn = []
max_level_info = []
max_level_debug = []
# Allow signing of local transactions that may have been revoked or will be revoked, for functional testing (e.g. justice tx handling).
# This is unsafe to use in production because it may result in the counterparty publishing taking our funds.
unsafe_revoked_tx_signing = []

[dependencies]
bitcoin = "0.23"
Expand Down
4 changes: 2 additions & 2 deletions lightning/src/chain/keysinterface.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -247,7 +247,7 @@ pub trait ChannelKeys : Send+Clone {
/// transactions which will be broadcasted later, after the channel has moved on to a newer
/// state. Thus, needs its own method as sign_local_commitment may enforce that we only ever
/// get called once.
#[cfg(test)]
#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

/// Create a signature for each HTLC transaction spending a local commitment transaction.
Expand DownExpand Up@@ -508,7 +508,7 @@ impl ChannelKeys for InMemoryChannelKeys {
Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx))
}

#[cfg(test)]
#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key);
let remote_channel_pubkeys = &self.accepted_channel_data.as_ref().expect("must accept before signing").remote_channel_pubkeys;
Expand Down
19 changes: 17 additions & 2 deletions lightning/src/ln/chan_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -599,11 +599,26 @@ impl LocalCommitmentTransaction {
}

/// Generate a new LocalCommitmentTransaction based on a raw commitment transaction,
/// remote signature and both parties keys
pub(crate) fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
/// remote signature and both parties keys.
///
/// The unsigned transaction outputs must be consistent with htlc_data. This function
/// only checks that the shape and amounts are consistent, but does not check the scriptPubkey.
pub fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
Comment thread
devrandom marked this conversation as resolved.
if unsigned_tx.input.len() != 1 { panic!("Tried to store a commitment transaction that had input count != 1!"); }
if unsigned_tx.input[0].witness.len() != 0 { panic!("Tried to store a signed commitment transaction?"); }

for htlc in &htlc_data {
if let Some(index) = htlc.0.transaction_output_index {
let out = &unsigned_tx.output[index as usize];
if out.value != htlc.0.amount_msat / 1000 {
panic!("HTLC at index {} has incorrect amount", index);
}
if !out.script_pubkey.is_v0_p2wsh() {
panic!("HTLC at index {} doesn't have p2wsh scriptPubkey", index);
}
}
}

Self {
unsigned_tx,
their_sig,
Expand Down
6 changes: 2 additions & 4 deletions lightning/src/ln/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -175,10 +175,8 @@ pub struct SimpleManyChannelMonitor<Key, ChanSigner: ChannelKeys, T: Deref, F: D
L::Target: Logger,
C::Target: ChainWatchInterface,
{
#[cfg(test)] // Used in ChannelManager tests to manipulate channels directly
/// The monitors
pub monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
#[cfg(not(test))]
monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
chain_monitor: C,
broadcaster: T,
logger: L,
Expand DownExpand Up@@ -1849,7 +1847,7 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
/// Unsafe test-only version of get_latest_local_commitment_txn used by our test framework
/// to bypass LocalCommitmentTransaction state update lockdown after signature and generate
/// revoked commitment transaction.
#[cfg(test)]
#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
pub fn unsafe_get_latest_local_commitment_txn<L: Deref>(&mut self, logger: &L) -> Vec<Transaction> where L::Target: Logger {
log_trace!(logger, "Getting signed copy of latest local commitment transaction!");
if let Some(commitment_tx) = self.onchain_tx_handler.get_fully_signed_copy_local_tx(&self.funding_redeemscript) {
Expand Down
4 changes: 2 additions & 2 deletions lightning/src/ln/onchaintx.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -939,7 +939,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
}
}

#[cfg(test)]
#[cfg(any(test, feature="unsafe_revoked_tx_signing"))]
pub(super) fn get_fully_signed_copy_local_tx(&mut self, funding_redeemscript: &Script) -> Option<Transaction> {
if let Some(ref mut local_commitment) = self.local_commitment {
let local_commitment = local_commitment.clone();
Expand DownExpand Up@@ -979,7 +979,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
htlc_tx
}

#[cfg(test)]
#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
pub(super) fn unsafe_get_fully_signed_htlc_tx(&mut self, outp: &::bitcoin::OutPoint, preimage: &Option<PaymentPreimage>) -> Option<Transaction> {
let latest_had_sigs = self.local_htlc_sigs.is_some();
let prev_had_sigs = self.prev_local_htlc_sigs.is_some();
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/util/enforcing_trait_impls.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl ChannelKeys for EnforcingChannelKeys {
Ok(self.inner.sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
}

#[cfg(test)]
#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
Ok(self.inner.unsafe_sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Export various fields and structures by devrandom · Pull Request #662 · lightningdevkit/rust-lightning · GitHub
Skip to content
Export various fields and structures#662

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Aug 11, 2020
 Merged


Export various fields and structures
#662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ce0cecd

export "unsafe_revoked_tx_signing" feature


devrandom Jul 3, 2020
31b4d89

make SimpleManyChannelMonitor.monitors public


devrandom Jul 4, 2020
f600263

make LocalCommitmentTransaction constructor public


devrandom Jul 20, 2020
fd2db40

check the input shape in LocalCommitmentTransaction.new_missing_local…


devrandom Aug 11, 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


3 changes: 3 additions & 0 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@ max_level_error = []
max_level_warn = []
max_level_info = []
max_level_debug = []
# Allow signing of local transactions that may have been revoked or will be revoked, for functional testing (e.g. justice tx handling).
# This is unsafe to use in production because it may result in the counterparty publishing taking our funds.
unsafe_revoked_tx_signing = []

[dependencies]
bitcoin = "0.23"
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,7 +247,7 @@ pub trait ChannelKeys : Send+Clone {
	/// transactions which will be broadcasted later, after the channel has moved on to a newer
	/// state. Thus, needs its own method as sign_local_commitment may enforce that we only ever
	/// get called once.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for each HTLC transaction spending a local commitment transaction.
Expand DownExpand Up@@ -508,7 +508,7 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx))
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key);
 let remote_channel_pubkeys = &self.accepted_channel_data.as_ref().expect("must accept before signing").remote_channel_pubkeys;
Expand Down

19 changes: 17 additions & 2 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -599,11 +599,26 @@ impl LocalCommitmentTransaction {
	}

	/// Generate a new LocalCommitmentTransaction based on a raw commitment transaction,
	/// remote signature and both parties keys
	pub(crate) fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
	/// remote signature and both parties keys.
	///
	/// The unsigned transaction outputs must be consistent with htlc_data. This function
	/// only checks that the shape and amounts are consistent, but does not check the scriptPubkey.
	pub fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
Comment thread
devrandom marked this conversation as resolved.

 if unsigned_tx.input.len() != 1 { panic!("Tried to store a commitment transaction that had input count != 1!"); }
 if unsigned_tx.input[0].witness.len() != 0 { panic!("Tried to store a signed commitment transaction?"); }

 for htlc in &htlc_data {
 if let Some(index) = htlc.0.transaction_output_index {
 let out = &unsigned_tx.output[index as usize];
 if out.value != htlc.0.amount_msat / 1000 {
 panic!("HTLC at index {} has incorrect amount", index);
 }
 if !out.script_pubkey.is_v0_p2wsh() {
 panic!("HTLC at index {} doesn't have p2wsh scriptPubkey", index);
 }
 }
 }

 Self {
 unsigned_tx,
 their_sig,
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,10 +175,8 @@ pub struct SimpleManyChannelMonitor<Key, ChanSigner: ChannelKeys, T: Deref, F: D
 L::Target: Logger,
 C::Target: ChainWatchInterface,
{
#[cfg(test)] // Used in ChannelManager tests to manipulate channels directly
/// The monitors
	pub monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	#[cfg(not(test))]
	monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	chain_monitor: C,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -1849,7 +1847,7 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
	/// Unsafe test-only version of get_latest_local_commitment_txn used by our test framework
	/// to bypass LocalCommitmentTransaction state update lockdown after signature and generate
	/// revoked commitment transaction.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub fn unsafe_get_latest_local_commitment_txn<L: Deref>(&mut self, logger: &L) -> Vec<Transaction> where L::Target: Logger {
 log_trace!(logger, "Getting signed copy of latest local commitment transaction!");
 if let Some(commitment_tx) = self.onchain_tx_handler.get_fully_signed_copy_local_tx(&self.funding_redeemscript) {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -939,7 +939,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 }
	}

	#[cfg(test)]
	#[cfg(any(test, feature="unsafe_revoked_tx_signing"))]
	pub(super) fn get_fully_signed_copy_local_tx(&mut self, funding_redeemscript: &Script) -> Option<Transaction> {
 if let Some(ref mut local_commitment) = self.local_commitment {
 let local_commitment = local_commitment.clone();
Expand DownExpand Up@@ -979,7 +979,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 htlc_tx
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub(super) fn unsafe_get_fully_signed_htlc_tx(&mut self, outp: &::bitcoin::OutPoint, preimage: &Option<PaymentPreimage>) -> Option<Transaction> {
 let latest_had_sigs = self.local_htlc_sigs.is_some();
 let prev_had_sigs = self.prev_local_htlc_sigs.is_some();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/enforcing_trait_impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl ChannelKeys for EnforcingChannelKeys {
 Ok(self.inner.sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 Ok(self.inner.unsafe_sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Aug 11, 2020
 Merged


Export various fields and structures
#662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ce0cecd

export "unsafe_revoked_tx_signing" feature


devrandom Jul 3, 2020
31b4d89

make SimpleManyChannelMonitor.monitors public


devrandom Jul 4, 2020
f600263

make LocalCommitmentTransaction constructor public


devrandom Jul 20, 2020
fd2db40

check the input shape in LocalCommitmentTransaction.new_missing_local…


devrandom Aug 11, 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


3 changes: 3 additions & 0 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@ max_level_error = []
max_level_warn = []
max_level_info = []
max_level_debug = []
# Allow signing of local transactions that may have been revoked or will be revoked, for functional testing (e.g. justice tx handling).
# This is unsafe to use in production because it may result in the counterparty publishing taking our funds.
unsafe_revoked_tx_signing = []

[dependencies]
bitcoin = "0.23"
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,7 +247,7 @@ pub trait ChannelKeys : Send+Clone {
	/// transactions which will be broadcasted later, after the channel has moved on to a newer
	/// state. Thus, needs its own method as sign_local_commitment may enforce that we only ever
	/// get called once.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for each HTLC transaction spending a local commitment transaction.
Expand DownExpand Up@@ -508,7 +508,7 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx))
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key);
 let remote_channel_pubkeys = &self.accepted_channel_data.as_ref().expect("must accept before signing").remote_channel_pubkeys;
Expand Down

19 changes: 17 additions & 2 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -599,11 +599,26 @@ impl LocalCommitmentTransaction {
	}

	/// Generate a new LocalCommitmentTransaction based on a raw commitment transaction,
	/// remote signature and both parties keys
	pub(crate) fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
	/// remote signature and both parties keys.
	///
	/// The unsigned transaction outputs must be consistent with htlc_data. This function
	/// only checks that the shape and amounts are consistent, but does not check the scriptPubkey.
	pub fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
Comment thread
devrandom marked this conversation as resolved.

 if unsigned_tx.input.len() != 1 { panic!("Tried to store a commitment transaction that had input count != 1!"); }
 if unsigned_tx.input[0].witness.len() != 0 { panic!("Tried to store a signed commitment transaction?"); }

 for htlc in &htlc_data {
 if let Some(index) = htlc.0.transaction_output_index {
 let out = &unsigned_tx.output[index as usize];
 if out.value != htlc.0.amount_msat / 1000 {
 panic!("HTLC at index {} has incorrect amount", index);
 }
 if !out.script_pubkey.is_v0_p2wsh() {
 panic!("HTLC at index {} doesn't have p2wsh scriptPubkey", index);
 }
 }
 }

 Self {
 unsigned_tx,
 their_sig,
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,10 +175,8 @@ pub struct SimpleManyChannelMonitor<Key, ChanSigner: ChannelKeys, T: Deref, F: D
 L::Target: Logger,
 C::Target: ChainWatchInterface,
{
#[cfg(test)] // Used in ChannelManager tests to manipulate channels directly
/// The monitors
	pub monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	#[cfg(not(test))]
	monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	chain_monitor: C,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -1849,7 +1847,7 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
	/// Unsafe test-only version of get_latest_local_commitment_txn used by our test framework
	/// to bypass LocalCommitmentTransaction state update lockdown after signature and generate
	/// revoked commitment transaction.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub fn unsafe_get_latest_local_commitment_txn<L: Deref>(&mut self, logger: &L) -> Vec<Transaction> where L::Target: Logger {
 log_trace!(logger, "Getting signed copy of latest local commitment transaction!");
 if let Some(commitment_tx) = self.onchain_tx_handler.get_fully_signed_copy_local_tx(&self.funding_redeemscript) {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -939,7 +939,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 }
	}

	#[cfg(test)]
	#[cfg(any(test, feature="unsafe_revoked_tx_signing"))]
	pub(super) fn get_fully_signed_copy_local_tx(&mut self, funding_redeemscript: &Script) -> Option<Transaction> {
 if let Some(ref mut local_commitment) = self.local_commitment {
 let local_commitment = local_commitment.clone();
Expand DownExpand Up@@ -979,7 +979,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 htlc_tx
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub(super) fn unsafe_get_fully_signed_htlc_tx(&mut self, outp: &::bitcoin::OutPoint, preimage: &Option<PaymentPreimage>) -> Option<Transaction> {
 let latest_had_sigs = self.local_htlc_sigs.is_some();
 let prev_had_sigs = self.prev_local_htlc_sigs.is_some();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/enforcing_trait_impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl ChannelKeys for EnforcingChannelKeys {
 Ok(self.inner.sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 Ok(self.inner.unsafe_sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Aug 11, 2020
 Merged


Export various fields and structures
#662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ce0cecd

export "unsafe_revoked_tx_signing" feature


devrandom Jul 3, 2020
31b4d89

make SimpleManyChannelMonitor.monitors public


devrandom Jul 4, 2020
f600263

make LocalCommitmentTransaction constructor public


devrandom Jul 20, 2020
fd2db40

check the input shape in LocalCommitmentTransaction.new_missing_local…


devrandom Aug 11, 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


3 changes: 3 additions & 0 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@ max_level_error = []
max_level_warn = []
max_level_info = []
max_level_debug = []
# Allow signing of local transactions that may have been revoked or will be revoked, for functional testing (e.g. justice tx handling).
# This is unsafe to use in production because it may result in the counterparty publishing taking our funds.
unsafe_revoked_tx_signing = []

[dependencies]
bitcoin = "0.23"
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,7 +247,7 @@ pub trait ChannelKeys : Send+Clone {
	/// transactions which will be broadcasted later, after the channel has moved on to a newer
	/// state. Thus, needs its own method as sign_local_commitment may enforce that we only ever
	/// get called once.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for each HTLC transaction spending a local commitment transaction.
Expand DownExpand Up@@ -508,7 +508,7 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx))
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key);
 let remote_channel_pubkeys = &self.accepted_channel_data.as_ref().expect("must accept before signing").remote_channel_pubkeys;
Expand Down

19 changes: 17 additions & 2 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -599,11 +599,26 @@ impl LocalCommitmentTransaction {
	}

	/// Generate a new LocalCommitmentTransaction based on a raw commitment transaction,
	/// remote signature and both parties keys
	pub(crate) fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
	/// remote signature and both parties keys.
	///
	/// The unsigned transaction outputs must be consistent with htlc_data. This function
	/// only checks that the shape and amounts are consistent, but does not check the scriptPubkey.
	pub fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
Comment thread
devrandom marked this conversation as resolved.

 if unsigned_tx.input.len() != 1 { panic!("Tried to store a commitment transaction that had input count != 1!"); }
 if unsigned_tx.input[0].witness.len() != 0 { panic!("Tried to store a signed commitment transaction?"); }

 for htlc in &htlc_data {
 if let Some(index) = htlc.0.transaction_output_index {
 let out = &unsigned_tx.output[index as usize];
 if out.value != htlc.0.amount_msat / 1000 {
 panic!("HTLC at index {} has incorrect amount", index);
 }
 if !out.script_pubkey.is_v0_p2wsh() {
 panic!("HTLC at index {} doesn't have p2wsh scriptPubkey", index);
 }
 }
 }

 Self {
 unsigned_tx,
 their_sig,
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,10 +175,8 @@ pub struct SimpleManyChannelMonitor<Key, ChanSigner: ChannelKeys, T: Deref, F: D
 L::Target: Logger,
 C::Target: ChainWatchInterface,
{
#[cfg(test)] // Used in ChannelManager tests to manipulate channels directly
/// The monitors
	pub monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	#[cfg(not(test))]
	monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	chain_monitor: C,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -1849,7 +1847,7 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
	/// Unsafe test-only version of get_latest_local_commitment_txn used by our test framework
	/// to bypass LocalCommitmentTransaction state update lockdown after signature and generate
	/// revoked commitment transaction.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub fn unsafe_get_latest_local_commitment_txn<L: Deref>(&mut self, logger: &L) -> Vec<Transaction> where L::Target: Logger {
 log_trace!(logger, "Getting signed copy of latest local commitment transaction!");
 if let Some(commitment_tx) = self.onchain_tx_handler.get_fully_signed_copy_local_tx(&self.funding_redeemscript) {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -939,7 +939,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 }
	}

	#[cfg(test)]
	#[cfg(any(test, feature="unsafe_revoked_tx_signing"))]
	pub(super) fn get_fully_signed_copy_local_tx(&mut self, funding_redeemscript: &Script) -> Option<Transaction> {
 if let Some(ref mut local_commitment) = self.local_commitment {
 let local_commitment = local_commitment.clone();
Expand DownExpand Up@@ -979,7 +979,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 htlc_tx
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub(super) fn unsafe_get_fully_signed_htlc_tx(&mut self, outp: &::bitcoin::OutPoint, preimage: &Option<PaymentPreimage>) -> Option<Transaction> {
 let latest_had_sigs = self.local_htlc_sigs.is_some();
 let prev_had_sigs = self.prev_local_htlc_sigs.is_some();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/enforcing_trait_impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl ChannelKeys for EnforcingChannelKeys {
 Ok(self.inner.sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 Ok(self.inner.unsafe_sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Aug 11, 2020
 Merged


Export various fields and structures
#662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ce0cecd

export "unsafe_revoked_tx_signing" feature


devrandom Jul 3, 2020
31b4d89

make SimpleManyChannelMonitor.monitors public


devrandom Jul 4, 2020
f600263

make LocalCommitmentTransaction constructor public


devrandom Jul 20, 2020
fd2db40

check the input shape in LocalCommitmentTransaction.new_missing_local…


devrandom Aug 11, 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


3 changes: 3 additions & 0 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@ max_level_error = []
max_level_warn = []
max_level_info = []
max_level_debug = []
# Allow signing of local transactions that may have been revoked or will be revoked, for functional testing (e.g. justice tx handling).
# This is unsafe to use in production because it may result in the counterparty publishing taking our funds.
unsafe_revoked_tx_signing = []

[dependencies]
bitcoin = "0.23"
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,7 +247,7 @@ pub trait ChannelKeys : Send+Clone {
	/// transactions which will be broadcasted later, after the channel has moved on to a newer
	/// state. Thus, needs its own method as sign_local_commitment may enforce that we only ever
	/// get called once.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for each HTLC transaction spending a local commitment transaction.
Expand DownExpand Up@@ -508,7 +508,7 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx))
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key);
 let remote_channel_pubkeys = &self.accepted_channel_data.as_ref().expect("must accept before signing").remote_channel_pubkeys;
Expand Down

19 changes: 17 additions & 2 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -599,11 +599,26 @@ impl LocalCommitmentTransaction {
	}

	/// Generate a new LocalCommitmentTransaction based on a raw commitment transaction,
	/// remote signature and both parties keys
	pub(crate) fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
	/// remote signature and both parties keys.
	///
	/// The unsigned transaction outputs must be consistent with htlc_data. This function
	/// only checks that the shape and amounts are consistent, but does not check the scriptPubkey.
	pub fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
Comment thread
devrandom marked this conversation as resolved.

 if unsigned_tx.input.len() != 1 { panic!("Tried to store a commitment transaction that had input count != 1!"); }
 if unsigned_tx.input[0].witness.len() != 0 { panic!("Tried to store a signed commitment transaction?"); }

 for htlc in &htlc_data {
 if let Some(index) = htlc.0.transaction_output_index {
 let out = &unsigned_tx.output[index as usize];
 if out.value != htlc.0.amount_msat / 1000 {
 panic!("HTLC at index {} has incorrect amount", index);
 }
 if !out.script_pubkey.is_v0_p2wsh() {
 panic!("HTLC at index {} doesn't have p2wsh scriptPubkey", index);
 }
 }
 }

 Self {
 unsigned_tx,
 their_sig,
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,10 +175,8 @@ pub struct SimpleManyChannelMonitor<Key, ChanSigner: ChannelKeys, T: Deref, F: D
 L::Target: Logger,
 C::Target: ChainWatchInterface,
{
#[cfg(test)] // Used in ChannelManager tests to manipulate channels directly
/// The monitors
	pub monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	#[cfg(not(test))]
	monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	chain_monitor: C,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -1849,7 +1847,7 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
	/// Unsafe test-only version of get_latest_local_commitment_txn used by our test framework
	/// to bypass LocalCommitmentTransaction state update lockdown after signature and generate
	/// revoked commitment transaction.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub fn unsafe_get_latest_local_commitment_txn<L: Deref>(&mut self, logger: &L) -> Vec<Transaction> where L::Target: Logger {
 log_trace!(logger, "Getting signed copy of latest local commitment transaction!");
 if let Some(commitment_tx) = self.onchain_tx_handler.get_fully_signed_copy_local_tx(&self.funding_redeemscript) {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -939,7 +939,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 }
	}

	#[cfg(test)]
	#[cfg(any(test, feature="unsafe_revoked_tx_signing"))]
	pub(super) fn get_fully_signed_copy_local_tx(&mut self, funding_redeemscript: &Script) -> Option<Transaction> {
 if let Some(ref mut local_commitment) = self.local_commitment {
 let local_commitment = local_commitment.clone();
Expand DownExpand Up@@ -979,7 +979,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 htlc_tx
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub(super) fn unsafe_get_fully_signed_htlc_tx(&mut self, outp: &::bitcoin::OutPoint, preimage: &Option<PaymentPreimage>) -> Option<Transaction> {
 let latest_had_sigs = self.local_htlc_sigs.is_some();
 let prev_had_sigs = self.prev_local_htlc_sigs.is_some();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/enforcing_trait_impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl ChannelKeys for EnforcingChannelKeys {
 Ok(self.inner.sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 Ok(self.inner.unsafe_sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Aug 11, 2020
 Merged


Export various fields and structures
#662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ce0cecd

export "unsafe_revoked_tx_signing" feature


devrandom Jul 3, 2020
31b4d89

make SimpleManyChannelMonitor.monitors public


devrandom Jul 4, 2020
f600263

make LocalCommitmentTransaction constructor public


devrandom Jul 20, 2020
fd2db40

check the input shape in LocalCommitmentTransaction.new_missing_local…


devrandom Aug 11, 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


3 changes: 3 additions & 0 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@ max_level_error = []
max_level_warn = []
max_level_info = []
max_level_debug = []
# Allow signing of local transactions that may have been revoked or will be revoked, for functional testing (e.g. justice tx handling).
# This is unsafe to use in production because it may result in the counterparty publishing taking our funds.
unsafe_revoked_tx_signing = []

[dependencies]
bitcoin = "0.23"
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,7 +247,7 @@ pub trait ChannelKeys : Send+Clone {
	/// transactions which will be broadcasted later, after the channel has moved on to a newer
	/// state. Thus, needs its own method as sign_local_commitment may enforce that we only ever
	/// get called once.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for each HTLC transaction spending a local commitment transaction.
Expand DownExpand Up@@ -508,7 +508,7 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx))
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key);
 let remote_channel_pubkeys = &self.accepted_channel_data.as_ref().expect("must accept before signing").remote_channel_pubkeys;
Expand Down

19 changes: 17 additions & 2 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -599,11 +599,26 @@ impl LocalCommitmentTransaction {
	}

	/// Generate a new LocalCommitmentTransaction based on a raw commitment transaction,
	/// remote signature and both parties keys
	pub(crate) fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
	/// remote signature and both parties keys.
	///
	/// The unsigned transaction outputs must be consistent with htlc_data. This function
	/// only checks that the shape and amounts are consistent, but does not check the scriptPubkey.
	pub fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
Comment thread
devrandom marked this conversation as resolved.

 if unsigned_tx.input.len() != 1 { panic!("Tried to store a commitment transaction that had input count != 1!"); }
 if unsigned_tx.input[0].witness.len() != 0 { panic!("Tried to store a signed commitment transaction?"); }

 for htlc in &htlc_data {
 if let Some(index) = htlc.0.transaction_output_index {
 let out = &unsigned_tx.output[index as usize];
 if out.value != htlc.0.amount_msat / 1000 {
 panic!("HTLC at index {} has incorrect amount", index);
 }
 if !out.script_pubkey.is_v0_p2wsh() {
 panic!("HTLC at index {} doesn't have p2wsh scriptPubkey", index);
 }
 }
 }

 Self {
 unsigned_tx,
 their_sig,
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,10 +175,8 @@ pub struct SimpleManyChannelMonitor<Key, ChanSigner: ChannelKeys, T: Deref, F: D
 L::Target: Logger,
 C::Target: ChainWatchInterface,
{
#[cfg(test)] // Used in ChannelManager tests to manipulate channels directly
/// The monitors
	pub monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	#[cfg(not(test))]
	monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	chain_monitor: C,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -1849,7 +1847,7 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
	/// Unsafe test-only version of get_latest_local_commitment_txn used by our test framework
	/// to bypass LocalCommitmentTransaction state update lockdown after signature and generate
	/// revoked commitment transaction.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub fn unsafe_get_latest_local_commitment_txn<L: Deref>(&mut self, logger: &L) -> Vec<Transaction> where L::Target: Logger {
 log_trace!(logger, "Getting signed copy of latest local commitment transaction!");
 if let Some(commitment_tx) = self.onchain_tx_handler.get_fully_signed_copy_local_tx(&self.funding_redeemscript) {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -939,7 +939,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 }
	}

	#[cfg(test)]
	#[cfg(any(test, feature="unsafe_revoked_tx_signing"))]
	pub(super) fn get_fully_signed_copy_local_tx(&mut self, funding_redeemscript: &Script) -> Option<Transaction> {
 if let Some(ref mut local_commitment) = self.local_commitment {
 let local_commitment = local_commitment.clone();
Expand DownExpand Up@@ -979,7 +979,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 htlc_tx
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub(super) fn unsafe_get_fully_signed_htlc_tx(&mut self, outp: &::bitcoin::OutPoint, preimage: &Option<PaymentPreimage>) -> Option<Transaction> {
 let latest_had_sigs = self.local_htlc_sigs.is_some();
 let prev_had_sigs = self.prev_local_htlc_sigs.is_some();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/enforcing_trait_impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl ChannelKeys for EnforcingChannelKeys {
 Ok(self.inner.sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 Ok(self.inner.unsafe_sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Aug 11, 2020
 Merged


Export various fields and structures
#662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ce0cecd

export "unsafe_revoked_tx_signing" feature


devrandom Jul 3, 2020
31b4d89

make SimpleManyChannelMonitor.monitors public


devrandom Jul 4, 2020
f600263

make LocalCommitmentTransaction constructor public


devrandom Jul 20, 2020
fd2db40

check the input shape in LocalCommitmentTransaction.new_missing_local…


devrandom Aug 11, 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


3 changes: 3 additions & 0 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@ max_level_error = []
max_level_warn = []
max_level_info = []
max_level_debug = []
# Allow signing of local transactions that may have been revoked or will be revoked, for functional testing (e.g. justice tx handling).
# This is unsafe to use in production because it may result in the counterparty publishing taking our funds.
unsafe_revoked_tx_signing = []

[dependencies]
bitcoin = "0.23"
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,7 +247,7 @@ pub trait ChannelKeys : Send+Clone {
	/// transactions which will be broadcasted later, after the channel has moved on to a newer
	/// state. Thus, needs its own method as sign_local_commitment may enforce that we only ever
	/// get called once.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for each HTLC transaction spending a local commitment transaction.
Expand DownExpand Up@@ -508,7 +508,7 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx))
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key);
 let remote_channel_pubkeys = &self.accepted_channel_data.as_ref().expect("must accept before signing").remote_channel_pubkeys;
Expand Down

19 changes: 17 additions & 2 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -599,11 +599,26 @@ impl LocalCommitmentTransaction {
	}

	/// Generate a new LocalCommitmentTransaction based on a raw commitment transaction,
	/// remote signature and both parties keys
	pub(crate) fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
	/// remote signature and both parties keys.
	///
	/// The unsigned transaction outputs must be consistent with htlc_data. This function
	/// only checks that the shape and amounts are consistent, but does not check the scriptPubkey.
	pub fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
Comment thread
devrandom marked this conversation as resolved.

 if unsigned_tx.input.len() != 1 { panic!("Tried to store a commitment transaction that had input count != 1!"); }
 if unsigned_tx.input[0].witness.len() != 0 { panic!("Tried to store a signed commitment transaction?"); }

 for htlc in &htlc_data {
 if let Some(index) = htlc.0.transaction_output_index {
 let out = &unsigned_tx.output[index as usize];
 if out.value != htlc.0.amount_msat / 1000 {
 panic!("HTLC at index {} has incorrect amount", index);
 }
 if !out.script_pubkey.is_v0_p2wsh() {
 panic!("HTLC at index {} doesn't have p2wsh scriptPubkey", index);
 }
 }
 }

 Self {
 unsigned_tx,
 their_sig,
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,10 +175,8 @@ pub struct SimpleManyChannelMonitor<Key, ChanSigner: ChannelKeys, T: Deref, F: D
 L::Target: Logger,
 C::Target: ChainWatchInterface,
{
#[cfg(test)] // Used in ChannelManager tests to manipulate channels directly
/// The monitors
	pub monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	#[cfg(not(test))]
	monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	chain_monitor: C,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -1849,7 +1847,7 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
	/// Unsafe test-only version of get_latest_local_commitment_txn used by our test framework
	/// to bypass LocalCommitmentTransaction state update lockdown after signature and generate
	/// revoked commitment transaction.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub fn unsafe_get_latest_local_commitment_txn<L: Deref>(&mut self, logger: &L) -> Vec<Transaction> where L::Target: Logger {
 log_trace!(logger, "Getting signed copy of latest local commitment transaction!");
 if let Some(commitment_tx) = self.onchain_tx_handler.get_fully_signed_copy_local_tx(&self.funding_redeemscript) {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -939,7 +939,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 }
	}

	#[cfg(test)]
	#[cfg(any(test, feature="unsafe_revoked_tx_signing"))]
	pub(super) fn get_fully_signed_copy_local_tx(&mut self, funding_redeemscript: &Script) -> Option<Transaction> {
 if let Some(ref mut local_commitment) = self.local_commitment {
 let local_commitment = local_commitment.clone();
Expand DownExpand Up@@ -979,7 +979,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 htlc_tx
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub(super) fn unsafe_get_fully_signed_htlc_tx(&mut self, outp: &::bitcoin::OutPoint, preimage: &Option<PaymentPreimage>) -> Option<Transaction> {
 let latest_had_sigs = self.local_htlc_sigs.is_some();
 let prev_had_sigs = self.prev_local_htlc_sigs.is_some();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/enforcing_trait_impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl ChannelKeys for EnforcingChannelKeys {
 Ok(self.inner.sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 Ok(self.inner.unsafe_sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 4 commits into

from

Aug 11, 2020
 Merged


Export various fields and structures
#662
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ce0cecd

export "unsafe_revoked_tx_signing" feature


devrandom Jul 3, 2020
31b4d89

make SimpleManyChannelMonitor.monitors public


devrandom Jul 4, 2020
f600263

make LocalCommitmentTransaction constructor public


devrandom Jul 20, 2020
fd2db40

check the input shape in LocalCommitmentTransaction.new_missing_local…


devrandom Aug 11, 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


3 changes: 3 additions & 0 deletions
lightning/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@ max_level_error = []
max_level_warn = []
max_level_info = []
max_level_debug = []
# Allow signing of local transactions that may have been revoked or will be revoked, for functional testing (e.g. justice tx handling).
# This is unsafe to use in production because it may result in the counterparty publishing taking our funds.
unsafe_revoked_tx_signing = []

[dependencies]
bitcoin = "0.23"
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/chain/keysinterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,7 +247,7 @@ pub trait ChannelKeys : Send+Clone {
	/// transactions which will be broadcasted later, after the channel has moved on to a newer
	/// state. Thus, needs its own method as sign_local_commitment may enforce that we only ever
	/// get called once.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()>;

	/// Create a signature for each HTLC transaction spending a local commitment transaction.
Expand DownExpand Up@@ -508,7 +508,7 @@ impl ChannelKeys for InMemoryChannelKeys {
 Ok(local_commitment_tx.get_local_sig(&self.funding_key, &channel_funding_redeemscript, self.channel_value_satoshis, secp_ctx))
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key);
 let remote_channel_pubkeys = &self.accepted_channel_data.as_ref().expect("must accept before signing").remote_channel_pubkeys;
Expand Down

19 changes: 17 additions & 2 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -599,11 +599,26 @@ impl LocalCommitmentTransaction {
	}

	/// Generate a new LocalCommitmentTransaction based on a raw commitment transaction,
	/// remote signature and both parties keys
	pub(crate) fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
	/// remote signature and both parties keys.
	///
	/// The unsigned transaction outputs must be consistent with htlc_data. This function
	/// only checks that the shape and amounts are consistent, but does not check the scriptPubkey.
	pub fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
Comment thread
devrandom marked this conversation as resolved.

 if unsigned_tx.input.len() != 1 { panic!("Tried to store a commitment transaction that had input count != 1!"); }
 if unsigned_tx.input[0].witness.len() != 0 { panic!("Tried to store a signed commitment transaction?"); }

 for htlc in &htlc_data {
 if let Some(index) = htlc.0.transaction_output_index {
 let out = &unsigned_tx.output[index as usize];
 if out.value != htlc.0.amount_msat / 1000 {
 panic!("HTLC at index {} has incorrect amount", index);
 }
 if !out.script_pubkey.is_v0_p2wsh() {
 panic!("HTLC at index {} doesn't have p2wsh scriptPubkey", index);
 }
 }
 }

 Self {
 unsigned_tx,
 their_sig,
Expand Down

6 changes: 2 additions & 4 deletions
lightning/src/ln/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,10 +175,8 @@ pub struct SimpleManyChannelMonitor<Key, ChanSigner: ChannelKeys, T: Deref, F: D
 L::Target: Logger,
 C::Target: ChainWatchInterface,
{
#[cfg(test)] // Used in ChannelManager tests to manipulate channels directly
/// The monitors
	pub monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	#[cfg(not(test))]
	monitors: Mutex<HashMap<Key, ChannelMonitor<ChanSigner>>>,
	chain_monitor: C,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -1849,7 +1847,7 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
	/// Unsafe test-only version of get_latest_local_commitment_txn used by our test framework
	/// to bypass LocalCommitmentTransaction state update lockdown after signature and generate
	/// revoked commitment transaction.
	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub fn unsafe_get_latest_local_commitment_txn<L: Deref>(&mut self, logger: &L) -> Vec<Transaction> where L::Target: Logger {
 log_trace!(logger, "Getting signed copy of latest local commitment transaction!");
 if let Some(commitment_tx) = self.onchain_tx_handler.get_fully_signed_copy_local_tx(&self.funding_redeemscript) {
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -939,7 +939,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 }
	}

	#[cfg(test)]
	#[cfg(any(test, feature="unsafe_revoked_tx_signing"))]
	pub(super) fn get_fully_signed_copy_local_tx(&mut self, funding_redeemscript: &Script) -> Option<Transaction> {
 if let Some(ref mut local_commitment) = self.local_commitment {
 let local_commitment = local_commitment.clone();
Expand DownExpand Up@@ -979,7 +979,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 htlc_tx
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	pub(super) fn unsafe_get_fully_signed_htlc_tx(&mut self, outp: &::bitcoin::OutPoint, preimage: &Option<PaymentPreimage>) -> Option<Transaction> {
 let latest_had_sigs = self.local_htlc_sigs.is_some();
 let prev_had_sigs = self.prev_local_htlc_sigs.is_some();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/enforcing_trait_impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl ChannelKeys for EnforcingChannelKeys {
 Ok(self.inner.sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}

	#[cfg(test)]
	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
	fn unsafe_sign_local_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, local_commitment_tx: &LocalCommitmentTransaction, secp_ctx: &Secp256k1<T>) -> Result<Signature, ()> {
 Ok(self.inner.unsafe_sign_local_commitment(local_commitment_tx, secp_ctx).unwrap())
	}
Expand Down