Introduce a ChannelType enum in lieu of opt_anchors#2321

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
arik-so wants to merge 2 commits into from
Closed

Introduce a ChannelType enum in lieu of opt_anchors#2321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2824fe1
Introduce a `ChannelType` enum in lieu of `opt_anchors`
arik-so May 27, 2023
1e5e711
Minor fixups
arik-so May 27, 2023
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
45 changes: 23 additions & 22 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1566,7 +1566,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
debug_assert!(htlc_input_idx_opt.is_some());
BitcoinOutPoint::new(*txid, htlc_input_idx_opt.unwrap_or(0))
} else {
debug_assert!(!self.onchain_tx_handler.opt_anchors());
debug_assert!(!self.onchain_tx_handler.channel_type().supports_anchors());
BitcoinOutPoint::new(*txid, 0)
}
} else {
Expand DownExpand Up@@ -2425,10 +2425,10 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
// If the channel supports anchor outputs, we'll need to emit an external
// event to be consumed such that a child transaction is broadcast with a
// high enough feerate for the parent commitment transaction to confirm.
if self.onchain_tx_handler.opt_anchors() {
if self.onchain_tx_handler.channel_type().supports_anchors() {
let funding_output = HolderFundingOutput::build(
self.funding_redeemscript.clone(), self.channel_value_satoshis,
self.onchain_tx_handler.opt_anchors(),
self.onchain_tx_handler.channel_type(),
);
let best_block_height = self.best_block.height();
let commitment_package = PackageTemplate::build_package(
Expand DownExpand Up@@ -2617,7 +2617,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
// First, process non-htlc outputs (to_holder & to_counterparty)
for (idx, outp) in tx.output.iter().enumerate() {
if outp.script_pubkey == revokeable_p2wsh {
let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.opt_anchors());
let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.channel_type().supports_anchors());
let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height);
claimable_outpoints.push(justice_package);
to_counterparty_output_info =
Expand All@@ -2635,7 +2635,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
return (claimable_outpoints, (commitment_txid, watch_outputs),
to_counterparty_output_info);
}
let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), self.onchain_tx_handler.channel_transaction_parameters.opt_anchors.is_some());
let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), &self.onchain_tx_handler.channel_transaction_parameters.channel_type);
let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
claimable_outpoints.push(justice_package);
}
Expand DownExpand Up@@ -2753,13 +2753,13 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
CounterpartyOfferedHTLCOutput::build(*per_commitment_point,
self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
self.counterparty_commitment_params.counterparty_htlc_base_key,
preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.opt_anchors()))
preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.channel_type()))
} else {
PackageSolvingData::CounterpartyReceivedHTLCOutput(
CounterpartyReceivedHTLCOutput::build(*per_commitment_point,
self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
self.counterparty_commitment_params.counterparty_htlc_base_key,
htlc.clone(), self.onchain_tx_handler.opt_anchors()))
htlc.clone(), self.onchain_tx_handler.channel_type()))
};
let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
claimable_outpoints.push(counterparty_package);
Expand DownExpand Up@@ -2830,7 +2830,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
if let Some(transaction_output_index) = htlc.transaction_output_index {
let htlc_output = if htlc.offered {
let htlc_output = HolderHTLCOutput::build_offered(
htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.opt_anchors()
htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type()
);
htlc_output
} else {
Expand All@@ -2841,7 +2841,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
continue;
};
let htlc_output = HolderHTLCOutput::build_accepted(
payment_preimage, htlc.amount_msat, self.onchain_tx_handler.opt_anchors()
payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type()
);
htlc_output
};
Expand DownExpand Up@@ -2925,7 +2925,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
let mut holder_transactions = vec![commitment_tx];
// When anchor outputs are present, the HTLC transactions are only valid once the commitment
// transaction confirms.
if self.onchain_tx_handler.opt_anchors() {
if self.onchain_tx_handler.channel_type().supports_anchors() {
return holder_transactions;
}
for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -2963,7 +2963,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
let mut holder_transactions = vec![commitment_tx];
// When anchor outputs are present, the HTLC transactions are only final once the commitment
// transaction confirms due to the CSV 1 encumberance.
if self.onchain_tx_handler.opt_anchors() {
if self.onchain_tx_handler.channel_type().supports_anchors() {
return holder_transactions;
}
for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -3187,7 +3187,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {

let should_broadcast = self.should_broadcast_holder_commitment_txn(logger);
if should_broadcast {
let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.opt_anchors());
let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.channel_type());
let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), self.best_block.height());
claimable_outpoints.push(commitment_package);
self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
Expand All@@ -3196,7 +3196,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
// We can't broadcast our HTLC transactions while the commitment transaction is
// unconfirmed. We'll delay doing so until we detect the confirmed commitment in
// `transactions_confirmed`.
if !self.onchain_tx_handler.opt_anchors() {
if !self.onchain_tx_handler.channel_type().supports_anchors() {
// Because we're broadcasting a commitment transaction, we should construct the package
// assuming it gets confirmed in the next block. Sadly, we have code which considers
// "not yet confirmed" things as discardable, so we cannot do that here.
Expand DownExpand Up@@ -4124,6 +4124,7 @@ mod tests {
use crate::sync::{Arc, Mutex};
use crate::io;
use bitcoin::{PackedLockTime, Sequence, Witness};
use crate::ln::channel::ChannelType;
use crate::prelude::*;

fn do_test_funding_spend_refuses_updates(use_local_txn: bool) {
Expand DownExpand Up@@ -4297,7 +4298,7 @@ mod tests {
selected_contest_delay: 67,
}),
funding_outpoint: Some(funding_outpoint),
opt_anchors: None,
channel_type: ChannelType::Legacy,
opt_non_zero_fee_anchors: None,
};
// Prune with one old state and a holder commitment tx holding a few overlaps with the
Expand DownExpand Up@@ -4414,7 +4415,7 @@ mod tests {
let txid = Txid::from_hex("56944c5d3f98413ef45cf54545538103cc9f298e0575820ad3591376e2e0f65d").unwrap();

// Justice tx with 1 to_holder, 2 revoked offered HTLCs, 1 revoked received HTLCs
for &opt_anchors in [false, true].iter() {
for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
let mut sum_actual_sigs = 0;
for i in 0..4 {
Expand All@@ -4433,20 +4434,20 @@ mod tests {
value: 0,
});
let base_weight = claim_tx.weight();
let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(opt_anchors), weight_revoked_offered_htlc(opt_anchors), weight_revoked_received_htlc(opt_anchors)];
let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(&channel_type), weight_revoked_offered_htlc(&channel_type), weight_revoked_received_htlc(&channel_type)];
let mut inputs_total_weight = 2; // count segwit flags
{
let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
for (idx, inp) in inputs_weight.iter().enumerate() {
sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
inputs_total_weight += inp;
}
}
assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
}

// Claim tx with 1 offered HTLCs, 3 received HTLCs
for &opt_anchors in [false, true].iter() {
for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
let mut sum_actual_sigs = 0;
for i in 0..4 {
Expand All@@ -4465,20 +4466,20 @@ mod tests {
value: 0,
});
let base_weight = claim_tx.weight();
let inputs_weight = vec![weight_offered_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors)];
let inputs_weight = vec![weight_offered_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type)];
let mut inputs_total_weight = 2; // count segwit flags
{
let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
for (idx, inp) in inputs_weight.iter().enumerate() {
sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
inputs_total_weight += inp;
}
}
assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
}

// Justice tx with 1 revoked HTLC-Success tx output
for &opt_anchors in [false, true].iter() {
for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
let mut sum_actual_sigs = 0;
claim_tx.input.push(TxIn {
Expand All@@ -4500,7 +4501,7 @@ mod tests {
{
let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
for (idx, inp) in inputs_weight.iter().enumerate() {
sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
inputs_total_weight += inp;
}
}
Expand Down
5 changes: 3 additions & 2 deletions lightning/src/chain/onchaintx.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ use core::mem::replace;
#[cfg(anchors)]
use core::mem::swap;
use bitcoin::hashes::Hash;
use crate::ln::channel::ChannelType;

const MAX_ALLOC_SIZE: usize = 64*1024;

Expand DownExpand Up@@ -1209,8 +1210,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
.or_else(|| self.prev_holder_commitment.as_ref().map(|c| find_htlc(c)).flatten())
}

pub(crate) fn opt_anchors(&self) -> bool {
self.channel_transaction_parameters.opt_anchors.is_some()
pub(crate) fn channel_type(&self) -> ChannelType {
self.channel_transaction_parameters.channel_type.clone()
}

#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
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
Introduce a ChannelType enum in lieu of opt_anchors#2321

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

arik-so
wants to merge
2
commits into

from

 Closed


Introduce a ChannelType enum in lieu of opt_anchors#2321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2824fe1

Introduce a `ChannelType` enum in lieu of `opt_anchors`


arik-so May 27, 2023
1e5e711

Minor fixups


arik-so May 27, 2023

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


45 changes: 23 additions & 22 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1566,7 +1566,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 debug_assert!(htlc_input_idx_opt.is_some());
 BitcoinOutPoint::new(*txid, htlc_input_idx_opt.unwrap_or(0))
 } else {
 debug_assert!(!self.onchain_tx_handler.opt_anchors());
 debug_assert!(!self.onchain_tx_handler.channel_type().supports_anchors());
 BitcoinOutPoint::new(*txid, 0)
 }
 } else {
Expand DownExpand Up@@ -2425,10 +2425,10 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // If the channel supports anchor outputs, we'll need to emit an external
 // event to be consumed such that a child transaction is broadcast with a
 // high enough feerate for the parent commitment transaction to confirm.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 let funding_output = HolderFundingOutput::build(
 self.funding_redeemscript.clone(), self.channel_value_satoshis,
 self.onchain_tx_handler.opt_anchors(),
 self.onchain_tx_handler.channel_type(),
 );
 let best_block_height = self.best_block.height();
 let commitment_package = PackageTemplate::build_package(
Expand DownExpand Up@@ -2617,7 +2617,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // First, process non-htlc outputs (to_holder & to_counterparty)
 for (idx, outp) in tx.output.iter().enumerate() {
 if outp.script_pubkey == revokeable_p2wsh {
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.opt_anchors());
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.channel_type().supports_anchors());
 let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height);
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
Expand All@@ -2635,7 +2635,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, (commitment_txid, watch_outputs),
 to_counterparty_output_info);
 }
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), self.onchain_tx_handler.channel_transaction_parameters.opt_anchors.is_some());
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), &self.onchain_tx_handler.channel_transaction_parameters.channel_type);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 claimable_outpoints.push(justice_package);
 }
Expand DownExpand Up@@ -2753,13 +2753,13 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 CounterpartyOfferedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.channel_type()))
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 htlc.clone(), self.onchain_tx_handler.channel_type()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 claimable_outpoints.push(counterparty_package);
Expand DownExpand Up@@ -2830,7 +2830,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.opt_anchors()
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 } else {
Expand All@@ -2841,7 +2841,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 continue;
 };
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.opt_anchors()
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 };
Expand DownExpand Up@@ -2925,7 +2925,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only valid once the commitment
 // transaction confirms.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -2963,7 +2963,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only final once the commitment
 // transaction confirms due to the CSV 1 encumberance.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -3187,7 +3187,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 let should_broadcast = self.should_broadcast_holder_commitment_txn(logger);
 if should_broadcast {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.opt_anchors());
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.channel_type());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
Expand All@@ -3196,7 +3196,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // We can't broadcast our HTLC transactions while the commitment transaction is
 // unconfirmed. We'll delay doing so until we detect the confirmed commitment in
 // `transactions_confirmed`.
 if !self.onchain_tx_handler.opt_anchors() {
 if !self.onchain_tx_handler.channel_type().supports_anchors() {
 // Because we're broadcasting a commitment transaction, we should construct the package
 // assuming it gets confirmed in the next block. Sadly, we have code which considers
 // "not yet confirmed" things as discardable, so we cannot do that here.
Expand DownExpand Up@@ -4124,6 +4124,7 @@ mod tests {
	use crate::sync::{Arc, Mutex};
	use crate::io;
	use bitcoin::{PackedLockTime, Sequence, Witness};
	use crate::ln::channel::ChannelType;
	use crate::prelude::*;

	fn do_test_funding_spend_refuses_updates(use_local_txn: bool) {
Expand DownExpand Up@@ -4297,7 +4298,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
opt_anchors: None,
channel_type: ChannelType::Legacy,
 opt_non_zero_fee_anchors: None,
 };
 // Prune with one old state and a holder commitment tx holding a few overlaps with the
Expand DownExpand Up@@ -4414,7 +4415,7 @@ mod tests {
 let txid = Txid::from_hex("56944c5d3f98413ef45cf54545538103cc9f298e0575820ad3591376e2e0f65d").unwrap();

 // Justice tx with 1 to_holder, 2 revoked offered HTLCs, 1 revoked received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4433,20 +4434,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(opt_anchors), weight_revoked_offered_htlc(opt_anchors), weight_revoked_received_htlc(opt_anchors)];
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(&channel_type), weight_revoked_offered_htlc(&channel_type), weight_revoked_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Claim tx with 1 offered HTLCs, 3 received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4465,20 +4466,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![weight_offered_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors)];
 let inputs_weight = vec![weight_offered_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Justice tx with 1 revoked HTLC-Success tx output
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 claim_tx.input.push(TxIn {
Expand All@@ -4500,7 +4501,7 @@ mod tests {
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
Expand Down

5 changes: 3 additions & 2 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ use core::mem::replace;
#[cfg(anchors)]
use core::mem::swap;
use bitcoin::hashes::Hash;
use crate::ln::channel::ChannelType;

const MAX_ALLOC_SIZE: usize = 64*1024;

Expand DownExpand Up@@ -1209,8 +1210,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 .or_else(|| self.prev_holder_commitment.as_ref().map(|c| find_htlc(c)).flatten())
	}

	pub(crate) fn opt_anchors(&self) -> bool {
 self.channel_transaction_parameters.opt_anchors.is_some()
	pub(crate) fn channel_type(&self) -> ChannelType {
 self.channel_transaction_parameters.channel_type.clone()
	}

	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
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
Introduce a ChannelType enum in lieu of opt_anchors#2321

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

arik-so
wants to merge
2
commits into

from

 Closed


Introduce a ChannelType enum in lieu of opt_anchors#2321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2824fe1

Introduce a `ChannelType` enum in lieu of `opt_anchors`


arik-so May 27, 2023
1e5e711

Minor fixups


arik-so May 27, 2023

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


45 changes: 23 additions & 22 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1566,7 +1566,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 debug_assert!(htlc_input_idx_opt.is_some());
 BitcoinOutPoint::new(*txid, htlc_input_idx_opt.unwrap_or(0))
 } else {
 debug_assert!(!self.onchain_tx_handler.opt_anchors());
 debug_assert!(!self.onchain_tx_handler.channel_type().supports_anchors());
 BitcoinOutPoint::new(*txid, 0)
 }
 } else {
Expand DownExpand Up@@ -2425,10 +2425,10 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // If the channel supports anchor outputs, we'll need to emit an external
 // event to be consumed such that a child transaction is broadcast with a
 // high enough feerate for the parent commitment transaction to confirm.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 let funding_output = HolderFundingOutput::build(
 self.funding_redeemscript.clone(), self.channel_value_satoshis,
 self.onchain_tx_handler.opt_anchors(),
 self.onchain_tx_handler.channel_type(),
 );
 let best_block_height = self.best_block.height();
 let commitment_package = PackageTemplate::build_package(
Expand DownExpand Up@@ -2617,7 +2617,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // First, process non-htlc outputs (to_holder & to_counterparty)
 for (idx, outp) in tx.output.iter().enumerate() {
 if outp.script_pubkey == revokeable_p2wsh {
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.opt_anchors());
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.channel_type().supports_anchors());
 let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height);
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
Expand All@@ -2635,7 +2635,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, (commitment_txid, watch_outputs),
 to_counterparty_output_info);
 }
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), self.onchain_tx_handler.channel_transaction_parameters.opt_anchors.is_some());
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), &self.onchain_tx_handler.channel_transaction_parameters.channel_type);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 claimable_outpoints.push(justice_package);
 }
Expand DownExpand Up@@ -2753,13 +2753,13 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 CounterpartyOfferedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.channel_type()))
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 htlc.clone(), self.onchain_tx_handler.channel_type()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 claimable_outpoints.push(counterparty_package);
Expand DownExpand Up@@ -2830,7 +2830,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.opt_anchors()
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 } else {
Expand All@@ -2841,7 +2841,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 continue;
 };
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.opt_anchors()
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 };
Expand DownExpand Up@@ -2925,7 +2925,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only valid once the commitment
 // transaction confirms.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -2963,7 +2963,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only final once the commitment
 // transaction confirms due to the CSV 1 encumberance.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -3187,7 +3187,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 let should_broadcast = self.should_broadcast_holder_commitment_txn(logger);
 if should_broadcast {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.opt_anchors());
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.channel_type());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
Expand All@@ -3196,7 +3196,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // We can't broadcast our HTLC transactions while the commitment transaction is
 // unconfirmed. We'll delay doing so until we detect the confirmed commitment in
 // `transactions_confirmed`.
 if !self.onchain_tx_handler.opt_anchors() {
 if !self.onchain_tx_handler.channel_type().supports_anchors() {
 // Because we're broadcasting a commitment transaction, we should construct the package
 // assuming it gets confirmed in the next block. Sadly, we have code which considers
 // "not yet confirmed" things as discardable, so we cannot do that here.
Expand DownExpand Up@@ -4124,6 +4124,7 @@ mod tests {
	use crate::sync::{Arc, Mutex};
	use crate::io;
	use bitcoin::{PackedLockTime, Sequence, Witness};
	use crate::ln::channel::ChannelType;
	use crate::prelude::*;

	fn do_test_funding_spend_refuses_updates(use_local_txn: bool) {
Expand DownExpand Up@@ -4297,7 +4298,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
opt_anchors: None,
channel_type: ChannelType::Legacy,
 opt_non_zero_fee_anchors: None,
 };
 // Prune with one old state and a holder commitment tx holding a few overlaps with the
Expand DownExpand Up@@ -4414,7 +4415,7 @@ mod tests {
 let txid = Txid::from_hex("56944c5d3f98413ef45cf54545538103cc9f298e0575820ad3591376e2e0f65d").unwrap();

 // Justice tx with 1 to_holder, 2 revoked offered HTLCs, 1 revoked received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4433,20 +4434,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(opt_anchors), weight_revoked_offered_htlc(opt_anchors), weight_revoked_received_htlc(opt_anchors)];
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(&channel_type), weight_revoked_offered_htlc(&channel_type), weight_revoked_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Claim tx with 1 offered HTLCs, 3 received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4465,20 +4466,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![weight_offered_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors)];
 let inputs_weight = vec![weight_offered_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Justice tx with 1 revoked HTLC-Success tx output
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 claim_tx.input.push(TxIn {
Expand All@@ -4500,7 +4501,7 @@ mod tests {
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
Expand Down

5 changes: 3 additions & 2 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ use core::mem::replace;
#[cfg(anchors)]
use core::mem::swap;
use bitcoin::hashes::Hash;
use crate::ln::channel::ChannelType;

const MAX_ALLOC_SIZE: usize = 64*1024;

Expand DownExpand Up@@ -1209,8 +1210,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 .or_else(|| self.prev_holder_commitment.as_ref().map(|c| find_htlc(c)).flatten())
	}

	pub(crate) fn opt_anchors(&self) -> bool {
 self.channel_transaction_parameters.opt_anchors.is_some()
	pub(crate) fn channel_type(&self) -> ChannelType {
 self.channel_transaction_parameters.channel_type.clone()
	}

	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
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
Introduce a ChannelType enum in lieu of opt_anchors#2321

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

arik-so
wants to merge
2
commits into

from

 Closed


Introduce a ChannelType enum in lieu of opt_anchors#2321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2824fe1

Introduce a `ChannelType` enum in lieu of `opt_anchors`


arik-so May 27, 2023
1e5e711

Minor fixups


arik-so May 27, 2023

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


45 changes: 23 additions & 22 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1566,7 +1566,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 debug_assert!(htlc_input_idx_opt.is_some());
 BitcoinOutPoint::new(*txid, htlc_input_idx_opt.unwrap_or(0))
 } else {
 debug_assert!(!self.onchain_tx_handler.opt_anchors());
 debug_assert!(!self.onchain_tx_handler.channel_type().supports_anchors());
 BitcoinOutPoint::new(*txid, 0)
 }
 } else {
Expand DownExpand Up@@ -2425,10 +2425,10 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // If the channel supports anchor outputs, we'll need to emit an external
 // event to be consumed such that a child transaction is broadcast with a
 // high enough feerate for the parent commitment transaction to confirm.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 let funding_output = HolderFundingOutput::build(
 self.funding_redeemscript.clone(), self.channel_value_satoshis,
 self.onchain_tx_handler.opt_anchors(),
 self.onchain_tx_handler.channel_type(),
 );
 let best_block_height = self.best_block.height();
 let commitment_package = PackageTemplate::build_package(
Expand DownExpand Up@@ -2617,7 +2617,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // First, process non-htlc outputs (to_holder & to_counterparty)
 for (idx, outp) in tx.output.iter().enumerate() {
 if outp.script_pubkey == revokeable_p2wsh {
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.opt_anchors());
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.channel_type().supports_anchors());
 let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height);
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
Expand All@@ -2635,7 +2635,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, (commitment_txid, watch_outputs),
 to_counterparty_output_info);
 }
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), self.onchain_tx_handler.channel_transaction_parameters.opt_anchors.is_some());
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), &self.onchain_tx_handler.channel_transaction_parameters.channel_type);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 claimable_outpoints.push(justice_package);
 }
Expand DownExpand Up@@ -2753,13 +2753,13 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 CounterpartyOfferedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.channel_type()))
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 htlc.clone(), self.onchain_tx_handler.channel_type()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 claimable_outpoints.push(counterparty_package);
Expand DownExpand Up@@ -2830,7 +2830,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.opt_anchors()
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 } else {
Expand All@@ -2841,7 +2841,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 continue;
 };
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.opt_anchors()
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 };
Expand DownExpand Up@@ -2925,7 +2925,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only valid once the commitment
 // transaction confirms.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -2963,7 +2963,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only final once the commitment
 // transaction confirms due to the CSV 1 encumberance.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -3187,7 +3187,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 let should_broadcast = self.should_broadcast_holder_commitment_txn(logger);
 if should_broadcast {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.opt_anchors());
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.channel_type());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
Expand All@@ -3196,7 +3196,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // We can't broadcast our HTLC transactions while the commitment transaction is
 // unconfirmed. We'll delay doing so until we detect the confirmed commitment in
 // `transactions_confirmed`.
 if !self.onchain_tx_handler.opt_anchors() {
 if !self.onchain_tx_handler.channel_type().supports_anchors() {
 // Because we're broadcasting a commitment transaction, we should construct the package
 // assuming it gets confirmed in the next block. Sadly, we have code which considers
 // "not yet confirmed" things as discardable, so we cannot do that here.
Expand DownExpand Up@@ -4124,6 +4124,7 @@ mod tests {
	use crate::sync::{Arc, Mutex};
	use crate::io;
	use bitcoin::{PackedLockTime, Sequence, Witness};
	use crate::ln::channel::ChannelType;
	use crate::prelude::*;

	fn do_test_funding_spend_refuses_updates(use_local_txn: bool) {
Expand DownExpand Up@@ -4297,7 +4298,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
opt_anchors: None,
channel_type: ChannelType::Legacy,
 opt_non_zero_fee_anchors: None,
 };
 // Prune with one old state and a holder commitment tx holding a few overlaps with the
Expand DownExpand Up@@ -4414,7 +4415,7 @@ mod tests {
 let txid = Txid::from_hex("56944c5d3f98413ef45cf54545538103cc9f298e0575820ad3591376e2e0f65d").unwrap();

 // Justice tx with 1 to_holder, 2 revoked offered HTLCs, 1 revoked received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4433,20 +4434,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(opt_anchors), weight_revoked_offered_htlc(opt_anchors), weight_revoked_received_htlc(opt_anchors)];
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(&channel_type), weight_revoked_offered_htlc(&channel_type), weight_revoked_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Claim tx with 1 offered HTLCs, 3 received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4465,20 +4466,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![weight_offered_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors)];
 let inputs_weight = vec![weight_offered_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Justice tx with 1 revoked HTLC-Success tx output
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 claim_tx.input.push(TxIn {
Expand All@@ -4500,7 +4501,7 @@ mod tests {
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
Expand Down

5 changes: 3 additions & 2 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ use core::mem::replace;
#[cfg(anchors)]
use core::mem::swap;
use bitcoin::hashes::Hash;
use crate::ln::channel::ChannelType;

const MAX_ALLOC_SIZE: usize = 64*1024;

Expand DownExpand Up@@ -1209,8 +1210,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 .or_else(|| self.prev_holder_commitment.as_ref().map(|c| find_htlc(c)).flatten())
	}

	pub(crate) fn opt_anchors(&self) -> bool {
 self.channel_transaction_parameters.opt_anchors.is_some()
	pub(crate) fn channel_type(&self) -> ChannelType {
 self.channel_transaction_parameters.channel_type.clone()
	}

	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
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
Introduce a ChannelType enum in lieu of opt_anchors#2321

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

arik-so
wants to merge
2
commits into

from

 Closed


Introduce a ChannelType enum in lieu of opt_anchors#2321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2824fe1

Introduce a `ChannelType` enum in lieu of `opt_anchors`


arik-so May 27, 2023
1e5e711

Minor fixups


arik-so May 27, 2023

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


45 changes: 23 additions & 22 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1566,7 +1566,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 debug_assert!(htlc_input_idx_opt.is_some());
 BitcoinOutPoint::new(*txid, htlc_input_idx_opt.unwrap_or(0))
 } else {
 debug_assert!(!self.onchain_tx_handler.opt_anchors());
 debug_assert!(!self.onchain_tx_handler.channel_type().supports_anchors());
 BitcoinOutPoint::new(*txid, 0)
 }
 } else {
Expand DownExpand Up@@ -2425,10 +2425,10 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // If the channel supports anchor outputs, we'll need to emit an external
 // event to be consumed such that a child transaction is broadcast with a
 // high enough feerate for the parent commitment transaction to confirm.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 let funding_output = HolderFundingOutput::build(
 self.funding_redeemscript.clone(), self.channel_value_satoshis,
 self.onchain_tx_handler.opt_anchors(),
 self.onchain_tx_handler.channel_type(),
 );
 let best_block_height = self.best_block.height();
 let commitment_package = PackageTemplate::build_package(
Expand DownExpand Up@@ -2617,7 +2617,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // First, process non-htlc outputs (to_holder & to_counterparty)
 for (idx, outp) in tx.output.iter().enumerate() {
 if outp.script_pubkey == revokeable_p2wsh {
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.opt_anchors());
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.channel_type().supports_anchors());
 let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height);
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
Expand All@@ -2635,7 +2635,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, (commitment_txid, watch_outputs),
 to_counterparty_output_info);
 }
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), self.onchain_tx_handler.channel_transaction_parameters.opt_anchors.is_some());
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), &self.onchain_tx_handler.channel_transaction_parameters.channel_type);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 claimable_outpoints.push(justice_package);
 }
Expand DownExpand Up@@ -2753,13 +2753,13 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 CounterpartyOfferedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.channel_type()))
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 htlc.clone(), self.onchain_tx_handler.channel_type()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 claimable_outpoints.push(counterparty_package);
Expand DownExpand Up@@ -2830,7 +2830,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.opt_anchors()
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 } else {
Expand All@@ -2841,7 +2841,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 continue;
 };
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.opt_anchors()
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 };
Expand DownExpand Up@@ -2925,7 +2925,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only valid once the commitment
 // transaction confirms.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -2963,7 +2963,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only final once the commitment
 // transaction confirms due to the CSV 1 encumberance.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -3187,7 +3187,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 let should_broadcast = self.should_broadcast_holder_commitment_txn(logger);
 if should_broadcast {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.opt_anchors());
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.channel_type());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
Expand All@@ -3196,7 +3196,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // We can't broadcast our HTLC transactions while the commitment transaction is
 // unconfirmed. We'll delay doing so until we detect the confirmed commitment in
 // `transactions_confirmed`.
 if !self.onchain_tx_handler.opt_anchors() {
 if !self.onchain_tx_handler.channel_type().supports_anchors() {
 // Because we're broadcasting a commitment transaction, we should construct the package
 // assuming it gets confirmed in the next block. Sadly, we have code which considers
 // "not yet confirmed" things as discardable, so we cannot do that here.
Expand DownExpand Up@@ -4124,6 +4124,7 @@ mod tests {
	use crate::sync::{Arc, Mutex};
	use crate::io;
	use bitcoin::{PackedLockTime, Sequence, Witness};
	use crate::ln::channel::ChannelType;
	use crate::prelude::*;

	fn do_test_funding_spend_refuses_updates(use_local_txn: bool) {
Expand DownExpand Up@@ -4297,7 +4298,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
opt_anchors: None,
channel_type: ChannelType::Legacy,
 opt_non_zero_fee_anchors: None,
 };
 // Prune with one old state and a holder commitment tx holding a few overlaps with the
Expand DownExpand Up@@ -4414,7 +4415,7 @@ mod tests {
 let txid = Txid::from_hex("56944c5d3f98413ef45cf54545538103cc9f298e0575820ad3591376e2e0f65d").unwrap();

 // Justice tx with 1 to_holder, 2 revoked offered HTLCs, 1 revoked received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4433,20 +4434,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(opt_anchors), weight_revoked_offered_htlc(opt_anchors), weight_revoked_received_htlc(opt_anchors)];
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(&channel_type), weight_revoked_offered_htlc(&channel_type), weight_revoked_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Claim tx with 1 offered HTLCs, 3 received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4465,20 +4466,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![weight_offered_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors)];
 let inputs_weight = vec![weight_offered_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Justice tx with 1 revoked HTLC-Success tx output
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 claim_tx.input.push(TxIn {
Expand All@@ -4500,7 +4501,7 @@ mod tests {
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
Expand Down

5 changes: 3 additions & 2 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ use core::mem::replace;
#[cfg(anchors)]
use core::mem::swap;
use bitcoin::hashes::Hash;
use crate::ln::channel::ChannelType;

const MAX_ALLOC_SIZE: usize = 64*1024;

Expand DownExpand Up@@ -1209,8 +1210,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 .or_else(|| self.prev_holder_commitment.as_ref().map(|c| find_htlc(c)).flatten())
	}

	pub(crate) fn opt_anchors(&self) -> bool {
 self.channel_transaction_parameters.opt_anchors.is_some()
	pub(crate) fn channel_type(&self) -> ChannelType {
 self.channel_transaction_parameters.channel_type.clone()
	}

	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
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
Introduce a ChannelType enum in lieu of opt_anchors#2321

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

arik-so
wants to merge
2
commits into

from

 Closed


Introduce a ChannelType enum in lieu of opt_anchors#2321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2824fe1

Introduce a `ChannelType` enum in lieu of `opt_anchors`


arik-so May 27, 2023
1e5e711

Minor fixups


arik-so May 27, 2023

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


45 changes: 23 additions & 22 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1566,7 +1566,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 debug_assert!(htlc_input_idx_opt.is_some());
 BitcoinOutPoint::new(*txid, htlc_input_idx_opt.unwrap_or(0))
 } else {
 debug_assert!(!self.onchain_tx_handler.opt_anchors());
 debug_assert!(!self.onchain_tx_handler.channel_type().supports_anchors());
 BitcoinOutPoint::new(*txid, 0)
 }
 } else {
Expand DownExpand Up@@ -2425,10 +2425,10 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // If the channel supports anchor outputs, we'll need to emit an external
 // event to be consumed such that a child transaction is broadcast with a
 // high enough feerate for the parent commitment transaction to confirm.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 let funding_output = HolderFundingOutput::build(
 self.funding_redeemscript.clone(), self.channel_value_satoshis,
 self.onchain_tx_handler.opt_anchors(),
 self.onchain_tx_handler.channel_type(),
 );
 let best_block_height = self.best_block.height();
 let commitment_package = PackageTemplate::build_package(
Expand DownExpand Up@@ -2617,7 +2617,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // First, process non-htlc outputs (to_holder & to_counterparty)
 for (idx, outp) in tx.output.iter().enumerate() {
 if outp.script_pubkey == revokeable_p2wsh {
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.opt_anchors());
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.channel_type().supports_anchors());
 let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height);
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
Expand All@@ -2635,7 +2635,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, (commitment_txid, watch_outputs),
 to_counterparty_output_info);
 }
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), self.onchain_tx_handler.channel_transaction_parameters.opt_anchors.is_some());
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), &self.onchain_tx_handler.channel_transaction_parameters.channel_type);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 claimable_outpoints.push(justice_package);
 }
Expand DownExpand Up@@ -2753,13 +2753,13 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 CounterpartyOfferedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.channel_type()))
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 htlc.clone(), self.onchain_tx_handler.channel_type()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 claimable_outpoints.push(counterparty_package);
Expand DownExpand Up@@ -2830,7 +2830,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.opt_anchors()
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 } else {
Expand All@@ -2841,7 +2841,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 continue;
 };
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.opt_anchors()
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 };
Expand DownExpand Up@@ -2925,7 +2925,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only valid once the commitment
 // transaction confirms.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -2963,7 +2963,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only final once the commitment
 // transaction confirms due to the CSV 1 encumberance.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -3187,7 +3187,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 let should_broadcast = self.should_broadcast_holder_commitment_txn(logger);
 if should_broadcast {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.opt_anchors());
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.channel_type());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
Expand All@@ -3196,7 +3196,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // We can't broadcast our HTLC transactions while the commitment transaction is
 // unconfirmed. We'll delay doing so until we detect the confirmed commitment in
 // `transactions_confirmed`.
 if !self.onchain_tx_handler.opt_anchors() {
 if !self.onchain_tx_handler.channel_type().supports_anchors() {
 // Because we're broadcasting a commitment transaction, we should construct the package
 // assuming it gets confirmed in the next block. Sadly, we have code which considers
 // "not yet confirmed" things as discardable, so we cannot do that here.
Expand DownExpand Up@@ -4124,6 +4124,7 @@ mod tests {
	use crate::sync::{Arc, Mutex};
	use crate::io;
	use bitcoin::{PackedLockTime, Sequence, Witness};
	use crate::ln::channel::ChannelType;
	use crate::prelude::*;

	fn do_test_funding_spend_refuses_updates(use_local_txn: bool) {
Expand DownExpand Up@@ -4297,7 +4298,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
opt_anchors: None,
channel_type: ChannelType::Legacy,
 opt_non_zero_fee_anchors: None,
 };
 // Prune with one old state and a holder commitment tx holding a few overlaps with the
Expand DownExpand Up@@ -4414,7 +4415,7 @@ mod tests {
 let txid = Txid::from_hex("56944c5d3f98413ef45cf54545538103cc9f298e0575820ad3591376e2e0f65d").unwrap();

 // Justice tx with 1 to_holder, 2 revoked offered HTLCs, 1 revoked received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4433,20 +4434,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(opt_anchors), weight_revoked_offered_htlc(opt_anchors), weight_revoked_received_htlc(opt_anchors)];
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(&channel_type), weight_revoked_offered_htlc(&channel_type), weight_revoked_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Claim tx with 1 offered HTLCs, 3 received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4465,20 +4466,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![weight_offered_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors)];
 let inputs_weight = vec![weight_offered_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Justice tx with 1 revoked HTLC-Success tx output
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 claim_tx.input.push(TxIn {
Expand All@@ -4500,7 +4501,7 @@ mod tests {
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
Expand Down

5 changes: 3 additions & 2 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ use core::mem::replace;
#[cfg(anchors)]
use core::mem::swap;
use bitcoin::hashes::Hash;
use crate::ln::channel::ChannelType;

const MAX_ALLOC_SIZE: usize = 64*1024;

Expand DownExpand Up@@ -1209,8 +1210,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 .or_else(|| self.prev_holder_commitment.as_ref().map(|c| find_htlc(c)).flatten())
	}

	pub(crate) fn opt_anchors(&self) -> bool {
 self.channel_transaction_parameters.opt_anchors.is_some()
	pub(crate) fn channel_type(&self) -> ChannelType {
 self.channel_transaction_parameters.channel_type.clone()
	}

	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
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
Introduce a ChannelType enum in lieu of opt_anchors#2321

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

arik-so
wants to merge
2
commits into

from

 Closed


Introduce a ChannelType enum in lieu of opt_anchors#2321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2824fe1

Introduce a `ChannelType` enum in lieu of `opt_anchors`


arik-so May 27, 2023
1e5e711

Minor fixups


arik-so May 27, 2023

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


45 changes: 23 additions & 22 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1566,7 +1566,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 debug_assert!(htlc_input_idx_opt.is_some());
 BitcoinOutPoint::new(*txid, htlc_input_idx_opt.unwrap_or(0))
 } else {
 debug_assert!(!self.onchain_tx_handler.opt_anchors());
 debug_assert!(!self.onchain_tx_handler.channel_type().supports_anchors());
 BitcoinOutPoint::new(*txid, 0)
 }
 } else {
Expand DownExpand Up@@ -2425,10 +2425,10 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // If the channel supports anchor outputs, we'll need to emit an external
 // event to be consumed such that a child transaction is broadcast with a
 // high enough feerate for the parent commitment transaction to confirm.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 let funding_output = HolderFundingOutput::build(
 self.funding_redeemscript.clone(), self.channel_value_satoshis,
 self.onchain_tx_handler.opt_anchors(),
 self.onchain_tx_handler.channel_type(),
 );
 let best_block_height = self.best_block.height();
 let commitment_package = PackageTemplate::build_package(
Expand DownExpand Up@@ -2617,7 +2617,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // First, process non-htlc outputs (to_holder & to_counterparty)
 for (idx, outp) in tx.output.iter().enumerate() {
 if outp.script_pubkey == revokeable_p2wsh {
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.opt_anchors());
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.channel_type().supports_anchors());
 let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height);
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
Expand All@@ -2635,7 +2635,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, (commitment_txid, watch_outputs),
 to_counterparty_output_info);
 }
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), self.onchain_tx_handler.channel_transaction_parameters.opt_anchors.is_some());
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), &self.onchain_tx_handler.channel_transaction_parameters.channel_type);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 claimable_outpoints.push(justice_package);
 }
Expand DownExpand Up@@ -2753,13 +2753,13 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 CounterpartyOfferedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.channel_type()))
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 htlc.clone(), self.onchain_tx_handler.channel_type()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 claimable_outpoints.push(counterparty_package);
Expand DownExpand Up@@ -2830,7 +2830,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.opt_anchors()
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 } else {
Expand All@@ -2841,7 +2841,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 continue;
 };
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.opt_anchors()
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 };
Expand DownExpand Up@@ -2925,7 +2925,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only valid once the commitment
 // transaction confirms.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -2963,7 +2963,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only final once the commitment
 // transaction confirms due to the CSV 1 encumberance.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -3187,7 +3187,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 let should_broadcast = self.should_broadcast_holder_commitment_txn(logger);
 if should_broadcast {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.opt_anchors());
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.channel_type());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
Expand All@@ -3196,7 +3196,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // We can't broadcast our HTLC transactions while the commitment transaction is
 // unconfirmed. We'll delay doing so until we detect the confirmed commitment in
 // `transactions_confirmed`.
 if !self.onchain_tx_handler.opt_anchors() {
 if !self.onchain_tx_handler.channel_type().supports_anchors() {
 // Because we're broadcasting a commitment transaction, we should construct the package
 // assuming it gets confirmed in the next block. Sadly, we have code which considers
 // "not yet confirmed" things as discardable, so we cannot do that here.
Expand DownExpand Up@@ -4124,6 +4124,7 @@ mod tests {
	use crate::sync::{Arc, Mutex};
	use crate::io;
	use bitcoin::{PackedLockTime, Sequence, Witness};
	use crate::ln::channel::ChannelType;
	use crate::prelude::*;

	fn do_test_funding_spend_refuses_updates(use_local_txn: bool) {
Expand DownExpand Up@@ -4297,7 +4298,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
opt_anchors: None,
channel_type: ChannelType::Legacy,
 opt_non_zero_fee_anchors: None,
 };
 // Prune with one old state and a holder commitment tx holding a few overlaps with the
Expand DownExpand Up@@ -4414,7 +4415,7 @@ mod tests {
 let txid = Txid::from_hex("56944c5d3f98413ef45cf54545538103cc9f298e0575820ad3591376e2e0f65d").unwrap();

 // Justice tx with 1 to_holder, 2 revoked offered HTLCs, 1 revoked received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4433,20 +4434,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(opt_anchors), weight_revoked_offered_htlc(opt_anchors), weight_revoked_received_htlc(opt_anchors)];
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(&channel_type), weight_revoked_offered_htlc(&channel_type), weight_revoked_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Claim tx with 1 offered HTLCs, 3 received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4465,20 +4466,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![weight_offered_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors)];
 let inputs_weight = vec![weight_offered_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Justice tx with 1 revoked HTLC-Success tx output
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 claim_tx.input.push(TxIn {
Expand All@@ -4500,7 +4501,7 @@ mod tests {
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
Expand Down

5 changes: 3 additions & 2 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ use core::mem::replace;
#[cfg(anchors)]
use core::mem::swap;
use bitcoin::hashes::Hash;
use crate::ln::channel::ChannelType;

const MAX_ALLOC_SIZE: usize = 64*1024;

Expand DownExpand Up@@ -1209,8 +1210,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 .or_else(|| self.prev_holder_commitment.as_ref().map(|c| find_htlc(c)).flatten())
	}

	pub(crate) fn opt_anchors(&self) -> bool {
 self.channel_transaction_parameters.opt_anchors.is_some()
	pub(crate) fn channel_type(&self) -> ChannelType {
 self.channel_transaction_parameters.channel_type.clone()
	}

	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
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
Introduce a ChannelType enum in lieu of opt_anchors#2321

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

arik-so
wants to merge
2
commits into

from

 Closed


Introduce a ChannelType enum in lieu of opt_anchors#2321
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
2824fe1

Introduce a `ChannelType` enum in lieu of `opt_anchors`


arik-so May 27, 2023
1e5e711

Minor fixups


arik-so May 27, 2023

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


45 changes: 23 additions & 22 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1566,7 +1566,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 debug_assert!(htlc_input_idx_opt.is_some());
 BitcoinOutPoint::new(*txid, htlc_input_idx_opt.unwrap_or(0))
 } else {
 debug_assert!(!self.onchain_tx_handler.opt_anchors());
 debug_assert!(!self.onchain_tx_handler.channel_type().supports_anchors());
 BitcoinOutPoint::new(*txid, 0)
 }
 } else {
Expand DownExpand Up@@ -2425,10 +2425,10 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // If the channel supports anchor outputs, we'll need to emit an external
 // event to be consumed such that a child transaction is broadcast with a
 // high enough feerate for the parent commitment transaction to confirm.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 let funding_output = HolderFundingOutput::build(
 self.funding_redeemscript.clone(), self.channel_value_satoshis,
 self.onchain_tx_handler.opt_anchors(),
 self.onchain_tx_handler.channel_type(),
 );
 let best_block_height = self.best_block.height();
 let commitment_package = PackageTemplate::build_package(
Expand DownExpand Up@@ -2617,7 +2617,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // First, process non-htlc outputs (to_holder & to_counterparty)
 for (idx, outp) in tx.output.iter().enumerate() {
 if outp.script_pubkey == revokeable_p2wsh {
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.opt_anchors());
 let revk_outp = RevokedOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, outp.value, self.counterparty_commitment_params.on_counterparty_tx_csv, self.onchain_tx_handler.channel_type().supports_anchors());
 let justice_package = PackageTemplate::build_package(commitment_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp), height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height);
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
Expand All@@ -2635,7 +2635,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, (commitment_txid, watch_outputs),
 to_counterparty_output_info);
 }
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), self.onchain_tx_handler.channel_transaction_parameters.opt_anchors.is_some());
 let revk_htlc_outp = RevokedHTLCOutput::build(per_commitment_point, self.counterparty_commitment_params.counterparty_delayed_payment_base_key, self.counterparty_commitment_params.counterparty_htlc_base_key, per_commitment_key, htlc.amount_msat / 1000, htlc.clone(), &self.onchain_tx_handler.channel_transaction_parameters.channel_type);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 claimable_outpoints.push(justice_package);
 }
Expand DownExpand Up@@ -2753,13 +2753,13 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 CounterpartyOfferedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 preimage.unwrap(), htlc.clone(), self.onchain_tx_handler.channel_type()))
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(*per_commitment_point,
 self.counterparty_commitment_params.counterparty_delayed_payment_base_key,
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.opt_anchors()))
 htlc.clone(), self.onchain_tx_handler.channel_type()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 claimable_outpoints.push(counterparty_package);
Expand DownExpand Up@@ -2830,7 +2830,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.opt_anchors()
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 } else {
Expand All@@ -2841,7 +2841,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 continue;
 };
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.opt_anchors()
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type()
 );
 htlc_output
 };
Expand DownExpand Up@@ -2925,7 +2925,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only valid once the commitment
 // transaction confirms.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -2963,7 +2963,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let mut holder_transactions = vec![commitment_tx];
 // When anchor outputs are present, the HTLC transactions are only final once the commitment
 // transaction confirms due to the CSV 1 encumberance.
 if self.onchain_tx_handler.opt_anchors() {
 if self.onchain_tx_handler.channel_type().supports_anchors() {
 return holder_transactions;
 }
 for htlc in self.current_holder_commitment_tx.htlc_outputs.iter() {
Expand DownExpand Up@@ -3187,7 +3187,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 let should_broadcast = self.should_broadcast_holder_commitment_txn(logger);
 if should_broadcast {
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.opt_anchors());
 let funding_outp = HolderFundingOutput::build(self.funding_redeemscript.clone(), self.channel_value_satoshis, self.onchain_tx_handler.channel_type());
 let commitment_package = PackageTemplate::build_package(self.funding_info.0.txid.clone(), self.funding_info.0.index as u32, PackageSolvingData::HolderFundingOutput(funding_outp), self.best_block.height(), self.best_block.height());
 claimable_outpoints.push(commitment_package);
 self.pending_monitor_events.push(MonitorEvent::CommitmentTxConfirmed(self.funding_info.0));
Expand All@@ -3196,7 +3196,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // We can't broadcast our HTLC transactions while the commitment transaction is
 // unconfirmed. We'll delay doing so until we detect the confirmed commitment in
 // `transactions_confirmed`.
 if !self.onchain_tx_handler.opt_anchors() {
 if !self.onchain_tx_handler.channel_type().supports_anchors() {
 // Because we're broadcasting a commitment transaction, we should construct the package
 // assuming it gets confirmed in the next block. Sadly, we have code which considers
 // "not yet confirmed" things as discardable, so we cannot do that here.
Expand DownExpand Up@@ -4124,6 +4124,7 @@ mod tests {
	use crate::sync::{Arc, Mutex};
	use crate::io;
	use bitcoin::{PackedLockTime, Sequence, Witness};
	use crate::ln::channel::ChannelType;
	use crate::prelude::*;

	fn do_test_funding_spend_refuses_updates(use_local_txn: bool) {
Expand DownExpand Up@@ -4297,7 +4298,7 @@ mod tests {
 selected_contest_delay: 67,
 }),
 funding_outpoint: Some(funding_outpoint),
opt_anchors: None,
channel_type: ChannelType::Legacy,
 opt_non_zero_fee_anchors: None,
 };
 // Prune with one old state and a holder commitment tx holding a few overlaps with the
Expand DownExpand Up@@ -4414,7 +4415,7 @@ mod tests {
 let txid = Txid::from_hex("56944c5d3f98413ef45cf54545538103cc9f298e0575820ad3591376e2e0f65d").unwrap();

 // Justice tx with 1 to_holder, 2 revoked offered HTLCs, 1 revoked received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4433,20 +4434,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(opt_anchors), weight_revoked_offered_htlc(opt_anchors), weight_revoked_received_htlc(opt_anchors)];
 let inputs_weight = vec![WEIGHT_REVOKED_OUTPUT, weight_revoked_offered_htlc(&channel_type), weight_revoked_offered_htlc(&channel_type), weight_revoked_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Claim tx with 1 offered HTLCs, 3 received HTLCs
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 for i in 0..4 {
Expand All@@ -4465,20 +4466,20 @@ mod tests {
 value: 0,
 });
 let base_weight = claim_tx.weight();
 let inputs_weight = vec![weight_offered_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors), weight_received_htlc(opt_anchors)];
 let inputs_weight = vec![weight_offered_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type), weight_received_htlc(&channel_type)];
 let mut inputs_total_weight = 2; // count segwit flags
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
 assert_eq!(base_weight + inputs_total_weight as usize, claim_tx.weight() + /* max_length_sig */ (73 * inputs_weight.len() - sum_actual_sigs));
 }

 // Justice tx with 1 revoked HTLC-Success tx output
 for &opt_anchors in [false, true].iter() {
 for channel_type in [ChannelType::Legacy, ChannelType::Anchors].iter() {
 let mut claim_tx = Transaction { version: 0, lock_time: PackedLockTime::ZERO, input: Vec::new(), output: Vec::new() };
 let mut sum_actual_sigs = 0;
 claim_tx.input.push(TxIn {
Expand All@@ -4500,7 +4501,7 @@ mod tests {
 {
 let mut sighash_parts = sighash::SighashCache::new(&mut claim_tx);
 for (idx, inp) in inputs_weight.iter().enumerate() {
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, opt_anchors);
 sign_input!(sighash_parts, idx, 0, inp, sum_actual_sigs, &channel_type);
 inputs_total_weight += inp;
 }
 }
Expand Down

5 changes: 3 additions & 2 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,7 @@ use core::mem::replace;
#[cfg(anchors)]
use core::mem::swap;
use bitcoin::hashes::Hash;
use crate::ln::channel::ChannelType;

const MAX_ALLOC_SIZE: usize = 64*1024;

Expand DownExpand Up@@ -1209,8 +1210,8 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
 .or_else(|| self.prev_holder_commitment.as_ref().map(|c| find_htlc(c)).flatten())
	}

	pub(crate) fn opt_anchors(&self) -> bool {
 self.channel_transaction_parameters.opt_anchors.is_some()
	pub(crate) fn channel_type(&self) -> ChannelType {
 self.channel_transaction_parameters.channel_type.clone()
	}

	#[cfg(any(test,feature = "unsafe_revoked_tx_signing"))]
Expand Down
Loading