Cleanup PackageTemplatea bit#3297

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 8 commits into from
Oct 18, 2024
Merged

Cleanup PackageTemplatea bit #3297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f549ee
Rename claim cleaning match bool for accuracy
TheBlueMatt Sep 5, 2024
a19edbc
Rename `PackageTemplate::timelock` `counteraprty_spendable_height`
TheBlueMatt Sep 6, 2024
8c4794d
Drop unused `PackageTemplate::height_original`
TheBlueMatt Sep 5, 2024
303a0c9
Stop passing current height to `PackageTemplate::build_package`
TheBlueMatt Sep 6, 2024
be91587
Clean up `PackageTemplate::get_height_timer` to consider type
TheBlueMatt Sep 18, 2024
d557334
Rename `soonest_conf_deadline` to `counterparty_spendable_height`
TheBlueMatt Sep 18, 2024
6ae33dc
Set correct `counterparty_spendable_height` for outb local HTLCs
TheBlueMatt Sep 18, 2024
20db790
Add a test for the fee-bump rate of timeout HTLC claims on cp txn
TheBlueMatt Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3018,7 +3018,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
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
self.best_block.height,
);
let mut claimable_outpoints = vec![commitment_package];
let event = MonitorEvent::HolderForceClosedWithInfo {
Expand All@@ -3041,7 +3041,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
// 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.
let (mut new_outpoints, _) = self.get_broadcasted_holder_claims(
&self.current_holder_commitment_tx, self.best_block.height
&self.current_holder_commitment_tx, self.best_block.height,
);
let unsigned_commitment_tx = self.onchain_tx_handler.get_unsigned_holder_commitment_tx();
let new_outputs = self.get_broadcasted_holder_watch_outputs(
Expand DownExpand Up@@ -3459,7 +3459,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
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.channel_type_features().supports_anchors_zero_fee_htlc_tx());
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);
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,
);
claimable_outpoints.push(justice_package);
to_counterparty_output_info =
Some((idx.try_into().expect("Txn can't have more than 2^32 outputs"), outp.value));
Expand All@@ -3476,7 +3480,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
return (claimable_outpoints, 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.channel_type_features);
let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
let justice_package = PackageTemplate::build_package(
commitment_txid,
transaction_output_index,
PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp),
htlc.cltv_expiry,

@wvanlintwvanlintSep 18, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?

@TheBlueMattTheBlueMattOct 3, 2024

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Yea, sorry, fought with this for a while and think we should do it in a separate PR, it causes a bunch of test changes.

@valentinewallacevalentinewallaceOct 15, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Would be good to track this feedback somewhere

@TheBlueMattTheBlueMattOct 16, 2024

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

#3372

);
claimable_outpoints.push(justice_package);
}
}
Expand DownExpand Up@@ -3598,7 +3607,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
self.counterparty_commitment_params.counterparty_htlc_base_key,
htlc.clone(), self.onchain_tx_handler.channel_type_features().clone()))
};
let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry);

@wvanlintwvanlintSep 18, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?

@TheBlueMattTheBlueMattSep 19, 2024

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Ideally yea, but passing the current height through to here is very annoying, and really it doesn't matter - if its a timeout claim our counterparty can claim it now, but we can't so having a counterparty_claimable_height of when we can both claim it is fine.

claimable_outpoints.push(counterparty_package);
}
}
Expand DownExpand Up@@ -3642,7 +3651,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
);
let justice_package = PackageTemplate::build_package(
htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height
height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32,
);
claimable_outpoints.push(justice_package);
if outputs_to_watch.is_none() {
Expand All@@ -3665,11 +3674,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

for &(ref htlc, _, _) in holder_tx.htlc_outputs.iter() {
if let Some(transaction_output_index) = htlc.transaction_output_index {
let htlc_output = if htlc.offered {
let (htlc_output, counterparty_spendable_height) = if htlc.offered {
let htlc_output = HolderHTLCOutput::build_offered(
htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type_features().clone()
);
htlc_output
(htlc_output, conf_height)

@valentinewallacevalentinewallaceOct 16, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Missing test coverage for this change

@TheBlueMattTheBlueMattOct 16, 2024

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Right, several of the "fix the value we pass" commits don't have test coverage because we don't rely on the value being the new correct one (and can't, old monitors may still be around which don't have the corrected value).

} else {
let payment_preimage = if let Some(preimage) = self.payment_preimages.get(&htlc.payment_hash) {
preimage.clone()
Expand All@@ -3680,12 +3689,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
let htlc_output = HolderHTLCOutput::build_accepted(
payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type_features().clone()
);
htlc_output
(htlc_output, htlc.cltv_expiry)
};
let htlc_package = PackageTemplate::build_package(
holder_tx.txid, transaction_output_index,
PackageSolvingData::HolderHTLCOutput(htlc_output),
htlc.cltv_expiry, conf_height
counterparty_spendable_height,
);
claim_requests.push(htlc_package);
}
Expand Down
18 changes: 9 additions & 9 deletions lightning/src/chain/onchaintx.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -765,9 +765,8 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
continue;
}

log_trace!(logger, "Test if outpoint can be aggregated with expiration {} against {}", req.timelock(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
if req.timelock() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
// Don't aggregate if outpoint package timelock is soon or marked as non-aggregable
log_trace!(logger, "Test if outpoint which our counterparty can spend at {} can be aggregated based on aggregation limit {}", req.counterparty_spendable_height(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
if req.counterparty_spendable_height() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
preprocessed_requests.push(req);
} else if aggregated_request.is_none() {
aggregated_request = Some(req);
Expand DownExpand Up@@ -885,15 +884,16 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
if let Some((claim_id, _)) = self.claimable_outpoints.get(&inp.previous_output) {
// If outpoint has claim request pending on it...
if let Some(request) = self.pending_claim_requests.get_mut(claim_id) {
//... we need to verify equality between transaction outpoints and claim request
// outpoints to know if transaction is the original claim or a bumped one issued
// by us.
let mut are_sets_equal = true;
//... we need to check if the pending claim was for a subset of the outputs
// spent by the confirmed transaction. If so, we can drop the pending claim
// after ANTI_REORG_DELAY blocks, otherwise we need to split it and retry
// claiming the remaining outputs.
let mut is_claim_subset_of_tx = true;
let mut tx_inputs = tx.input.iter().map(|input| &input.previous_output).collect::<Vec<_>>();
tx_inputs.sort_unstable();
for request_input in request.outpoints() {
if tx_inputs.binary_search(&request_input).is_err() {
are_sets_equal = false;
is_claim_subset_of_tx = false;
break;
}
}
Expand All@@ -915,7 +915,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
// If this is our transaction (or our counterparty spent all the outputs
// before we could anyway with same inputs order than us), wait for
// ANTI_REORG_DELAY and clean the RBF tracking map.
if are_sets_equal {
if is_claim_subset_of_tx {
clean_claim_request_after_safety_delay!();
} else { // If false, generate new claim request with update outpoint set
let mut at_least_one_drop = false;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Cleanup PackageTemplatea bit#3297

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 8 commits into

from

Oct 18, 2024
 Merged


Cleanup PackageTemplatea bit
#3297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
2f549ee

Rename claim cleaning match bool for accuracy


TheBlueMatt Sep 5, 2024
a19edbc

Rename `PackageTemplate::timelock` `counteraprty_spendable_height`


TheBlueMatt Sep 6, 2024
8c4794d

Drop unused `PackageTemplate::height_original`


TheBlueMatt Sep 5, 2024
303a0c9

Stop passing current height to `PackageTemplate::build_package`


TheBlueMatt Sep 6, 2024
be91587

Clean up `PackageTemplate::get_height_timer` to consider type


TheBlueMatt Sep 18, 2024
d557334

Rename `soonest_conf_deadline` to `counterparty_spendable_height`


TheBlueMatt Sep 18, 2024
6ae33dc

Set correct `counterparty_spendable_height` for outb local HTLCs


TheBlueMatt Sep 18, 2024
20db790

Add a test for the fee-bump rate of timeout HTLC claims on cp txn


TheBlueMatt Oct 18, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 19 additions & 10 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3018,7 +3018,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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
 self.best_block.height,
 );
 let mut claimable_outpoints = vec![commitment_package];
 let event = MonitorEvent::HolderForceClosedWithInfo {
Expand All@@ -3041,7 +3041,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // 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.
 let (mut new_outpoints, _) = self.get_broadcasted_holder_claims(
 &self.current_holder_commitment_tx, self.best_block.height
 &self.current_holder_commitment_tx, self.best_block.height,
 );
 let unsigned_commitment_tx = self.onchain_tx_handler.get_unsigned_holder_commitment_tx();
 let new_outputs = self.get_broadcasted_holder_watch_outputs(
Expand DownExpand Up@@ -3459,7 +3459,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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.channel_type_features().supports_anchors_zero_fee_htlc_tx());
 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);
 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,
 );
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
 Some((idx.try_into().expect("Txn can't have more than 2^32 outputs"), outp.value));
Expand All@@ -3476,7 +3480,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, 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.channel_type_features);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 let justice_package = PackageTemplate::build_package(
 commitment_txid,
 transaction_output_index,
 PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp),
 htlc.cltv_expiry,
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattOct 3, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Yea, sorry, fought with this for a while and think we should do it in a separate PR, it causes a bunch of test changes.
@valentinewallacevalentinewallaceOct 15, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Would be good to track this feedback somewhere
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

#3372
 );
 claimable_outpoints.push(justice_package);
 }
 }
Expand DownExpand Up@@ -3598,7 +3607,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.channel_type_features().clone()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry);
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattSep 19, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Ideally yea, but passing the current height through to here is very annoying, and really it doesn't matter - if its a timeout claim our counterparty can claim it now, but we can't so having a counterparty_claimable_height of when we can both claim it is fine.
 claimable_outpoints.push(counterparty_package);
 }
 }
Expand DownExpand Up@@ -3642,7 +3651,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32,
 );
 claimable_outpoints.push(justice_package);
 if outputs_to_watch.is_none() {
Expand All@@ -3665,11 +3674,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 for &(ref htlc, _, _) in holder_tx.htlc_outputs.iter() {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let (htlc_output, counterparty_spendable_height) = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, conf_height)
@valentinewallacevalentinewallaceOct 16, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Missing test coverage for this change
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Right, several of the "fix the value we pass" commits don't have test coverage because we don't rely on the value being the new correct one (and can't, old monitors may still be around which don't have the corrected value).
 } else {
 let payment_preimage = if let Some(preimage) = self.payment_preimages.get(&htlc.payment_hash) {
 preimage.clone()
Expand All@@ -3680,12 +3689,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, htlc.cltv_expiry)
 };
 let htlc_package = PackageTemplate::build_package(
 holder_tx.txid, transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(htlc_output),
htlc.cltv_expiry, conf_height
counterparty_spendable_height,
 );
 claim_requests.push(htlc_package);
 }
Expand Down

18 changes: 9 additions & 9 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -765,9 +765,8 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 continue;
 }

 log_trace!(logger, "Test if outpoint can be aggregated with expiration {} against {}", req.timelock(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.timelock() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 // Don't aggregate if outpoint package timelock is soon or marked as non-aggregable
 log_trace!(logger, "Test if outpoint which our counterparty can spend at {} can be aggregated based on aggregation limit {}", req.counterparty_spendable_height(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.counterparty_spendable_height() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 preprocessed_requests.push(req);
 } else if aggregated_request.is_none() {
 aggregated_request = Some(req);
Expand DownExpand Up@@ -885,15 +884,16 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 if let Some((claim_id, _)) = self.claimable_outpoints.get(&inp.previous_output) {
 // If outpoint has claim request pending on it...
 if let Some(request) = self.pending_claim_requests.get_mut(claim_id) {
 //... we need to verify equality between transaction outpoints and claim request
 // outpoints to know if transaction is the original claim or a bumped one issued
 // by us.
 let mut are_sets_equal = true;
 //... we need to check if the pending claim was for a subset of the outputs
 // spent by the confirmed transaction. If so, we can drop the pending claim
 // after ANTI_REORG_DELAY blocks, otherwise we need to split it and retry
 // claiming the remaining outputs.
 let mut is_claim_subset_of_tx = true;
 let mut tx_inputs = tx.input.iter().map(|input| &input.previous_output).collect::<Vec<_>>();
 tx_inputs.sort_unstable();
 for request_input in request.outpoints() {
 if tx_inputs.binary_search(&request_input).is_err() {
are_sets_equal = false;
is_claim_subset_of_tx = false;
 break;
 }
 }
Expand All@@ -915,7 +915,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // If this is our transaction (or our counterparty spent all the outputs
 // before we could anyway with same inputs order than us), wait for
 // ANTI_REORG_DELAY and clean the RBF tracking map.
 if are_sets_equal {
 if is_claim_subset_of_tx {
 clean_claim_request_after_safety_delay!();
 } else { // If false, generate new claim request with update outpoint set
 let mut at_least_one_drop = false;
Expand Down
Loading

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

Skip to content
Cleanup PackageTemplatea bit#3297

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 8 commits into

from

Oct 18, 2024
 Merged


Cleanup PackageTemplatea bit
#3297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
2f549ee

Rename claim cleaning match bool for accuracy


TheBlueMatt Sep 5, 2024
a19edbc

Rename `PackageTemplate::timelock` `counteraprty_spendable_height`


TheBlueMatt Sep 6, 2024
8c4794d

Drop unused `PackageTemplate::height_original`


TheBlueMatt Sep 5, 2024
303a0c9

Stop passing current height to `PackageTemplate::build_package`


TheBlueMatt Sep 6, 2024
be91587

Clean up `PackageTemplate::get_height_timer` to consider type


TheBlueMatt Sep 18, 2024
d557334

Rename `soonest_conf_deadline` to `counterparty_spendable_height`


TheBlueMatt Sep 18, 2024
6ae33dc

Set correct `counterparty_spendable_height` for outb local HTLCs


TheBlueMatt Sep 18, 2024
20db790

Add a test for the fee-bump rate of timeout HTLC claims on cp txn


TheBlueMatt Oct 18, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 19 additions & 10 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3018,7 +3018,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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
 self.best_block.height,
 );
 let mut claimable_outpoints = vec![commitment_package];
 let event = MonitorEvent::HolderForceClosedWithInfo {
Expand All@@ -3041,7 +3041,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // 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.
 let (mut new_outpoints, _) = self.get_broadcasted_holder_claims(
 &self.current_holder_commitment_tx, self.best_block.height
 &self.current_holder_commitment_tx, self.best_block.height,
 );
 let unsigned_commitment_tx = self.onchain_tx_handler.get_unsigned_holder_commitment_tx();
 let new_outputs = self.get_broadcasted_holder_watch_outputs(
Expand DownExpand Up@@ -3459,7 +3459,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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.channel_type_features().supports_anchors_zero_fee_htlc_tx());
 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);
 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,
 );
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
 Some((idx.try_into().expect("Txn can't have more than 2^32 outputs"), outp.value));
Expand All@@ -3476,7 +3480,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, 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.channel_type_features);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 let justice_package = PackageTemplate::build_package(
 commitment_txid,
 transaction_output_index,
 PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp),
 htlc.cltv_expiry,
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattOct 3, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Yea, sorry, fought with this for a while and think we should do it in a separate PR, it causes a bunch of test changes.
@valentinewallacevalentinewallaceOct 15, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Would be good to track this feedback somewhere
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

#3372
 );
 claimable_outpoints.push(justice_package);
 }
 }
Expand DownExpand Up@@ -3598,7 +3607,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.channel_type_features().clone()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry);
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattSep 19, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Ideally yea, but passing the current height through to here is very annoying, and really it doesn't matter - if its a timeout claim our counterparty can claim it now, but we can't so having a counterparty_claimable_height of when we can both claim it is fine.
 claimable_outpoints.push(counterparty_package);
 }
 }
Expand DownExpand Up@@ -3642,7 +3651,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32,
 );
 claimable_outpoints.push(justice_package);
 if outputs_to_watch.is_none() {
Expand All@@ -3665,11 +3674,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 for &(ref htlc, _, _) in holder_tx.htlc_outputs.iter() {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let (htlc_output, counterparty_spendable_height) = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, conf_height)
@valentinewallacevalentinewallaceOct 16, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Missing test coverage for this change
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Right, several of the "fix the value we pass" commits don't have test coverage because we don't rely on the value being the new correct one (and can't, old monitors may still be around which don't have the corrected value).
 } else {
 let payment_preimage = if let Some(preimage) = self.payment_preimages.get(&htlc.payment_hash) {
 preimage.clone()
Expand All@@ -3680,12 +3689,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, htlc.cltv_expiry)
 };
 let htlc_package = PackageTemplate::build_package(
 holder_tx.txid, transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(htlc_output),
htlc.cltv_expiry, conf_height
counterparty_spendable_height,
 );
 claim_requests.push(htlc_package);
 }
Expand Down

18 changes: 9 additions & 9 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -765,9 +765,8 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 continue;
 }

 log_trace!(logger, "Test if outpoint can be aggregated with expiration {} against {}", req.timelock(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.timelock() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 // Don't aggregate if outpoint package timelock is soon or marked as non-aggregable
 log_trace!(logger, "Test if outpoint which our counterparty can spend at {} can be aggregated based on aggregation limit {}", req.counterparty_spendable_height(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.counterparty_spendable_height() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 preprocessed_requests.push(req);
 } else if aggregated_request.is_none() {
 aggregated_request = Some(req);
Expand DownExpand Up@@ -885,15 +884,16 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 if let Some((claim_id, _)) = self.claimable_outpoints.get(&inp.previous_output) {
 // If outpoint has claim request pending on it...
 if let Some(request) = self.pending_claim_requests.get_mut(claim_id) {
 //... we need to verify equality between transaction outpoints and claim request
 // outpoints to know if transaction is the original claim or a bumped one issued
 // by us.
 let mut are_sets_equal = true;
 //... we need to check if the pending claim was for a subset of the outputs
 // spent by the confirmed transaction. If so, we can drop the pending claim
 // after ANTI_REORG_DELAY blocks, otherwise we need to split it and retry
 // claiming the remaining outputs.
 let mut is_claim_subset_of_tx = true;
 let mut tx_inputs = tx.input.iter().map(|input| &input.previous_output).collect::<Vec<_>>();
 tx_inputs.sort_unstable();
 for request_input in request.outpoints() {
 if tx_inputs.binary_search(&request_input).is_err() {
are_sets_equal = false;
is_claim_subset_of_tx = false;
 break;
 }
 }
Expand All@@ -915,7 +915,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // If this is our transaction (or our counterparty spent all the outputs
 // before we could anyway with same inputs order than us), wait for
 // ANTI_REORG_DELAY and clean the RBF tracking map.
 if are_sets_equal {
 if is_claim_subset_of_tx {
 clean_claim_request_after_safety_delay!();
 } else { // If false, generate new claim request with update outpoint set
 let mut at_least_one_drop = false;
Expand Down
Loading

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

Skip to content
Cleanup PackageTemplatea bit#3297

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 8 commits into

from

Oct 18, 2024
 Merged


Cleanup PackageTemplatea bit
#3297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
2f549ee

Rename claim cleaning match bool for accuracy


TheBlueMatt Sep 5, 2024
a19edbc

Rename `PackageTemplate::timelock` `counteraprty_spendable_height`


TheBlueMatt Sep 6, 2024
8c4794d

Drop unused `PackageTemplate::height_original`


TheBlueMatt Sep 5, 2024
303a0c9

Stop passing current height to `PackageTemplate::build_package`


TheBlueMatt Sep 6, 2024
be91587

Clean up `PackageTemplate::get_height_timer` to consider type


TheBlueMatt Sep 18, 2024
d557334

Rename `soonest_conf_deadline` to `counterparty_spendable_height`


TheBlueMatt Sep 18, 2024
6ae33dc

Set correct `counterparty_spendable_height` for outb local HTLCs


TheBlueMatt Sep 18, 2024
20db790

Add a test for the fee-bump rate of timeout HTLC claims on cp txn


TheBlueMatt Oct 18, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 19 additions & 10 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3018,7 +3018,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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
 self.best_block.height,
 );
 let mut claimable_outpoints = vec![commitment_package];
 let event = MonitorEvent::HolderForceClosedWithInfo {
Expand All@@ -3041,7 +3041,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // 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.
 let (mut new_outpoints, _) = self.get_broadcasted_holder_claims(
 &self.current_holder_commitment_tx, self.best_block.height
 &self.current_holder_commitment_tx, self.best_block.height,
 );
 let unsigned_commitment_tx = self.onchain_tx_handler.get_unsigned_holder_commitment_tx();
 let new_outputs = self.get_broadcasted_holder_watch_outputs(
Expand DownExpand Up@@ -3459,7 +3459,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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.channel_type_features().supports_anchors_zero_fee_htlc_tx());
 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);
 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,
 );
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
 Some((idx.try_into().expect("Txn can't have more than 2^32 outputs"), outp.value));
Expand All@@ -3476,7 +3480,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, 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.channel_type_features);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 let justice_package = PackageTemplate::build_package(
 commitment_txid,
 transaction_output_index,
 PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp),
 htlc.cltv_expiry,
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattOct 3, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Yea, sorry, fought with this for a while and think we should do it in a separate PR, it causes a bunch of test changes.
@valentinewallacevalentinewallaceOct 15, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Would be good to track this feedback somewhere
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

#3372
 );
 claimable_outpoints.push(justice_package);
 }
 }
Expand DownExpand Up@@ -3598,7 +3607,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.channel_type_features().clone()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry);
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattSep 19, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Ideally yea, but passing the current height through to here is very annoying, and really it doesn't matter - if its a timeout claim our counterparty can claim it now, but we can't so having a counterparty_claimable_height of when we can both claim it is fine.
 claimable_outpoints.push(counterparty_package);
 }
 }
Expand DownExpand Up@@ -3642,7 +3651,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32,
 );
 claimable_outpoints.push(justice_package);
 if outputs_to_watch.is_none() {
Expand All@@ -3665,11 +3674,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 for &(ref htlc, _, _) in holder_tx.htlc_outputs.iter() {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let (htlc_output, counterparty_spendable_height) = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, conf_height)
@valentinewallacevalentinewallaceOct 16, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Missing test coverage for this change
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Right, several of the "fix the value we pass" commits don't have test coverage because we don't rely on the value being the new correct one (and can't, old monitors may still be around which don't have the corrected value).
 } else {
 let payment_preimage = if let Some(preimage) = self.payment_preimages.get(&htlc.payment_hash) {
 preimage.clone()
Expand All@@ -3680,12 +3689,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, htlc.cltv_expiry)
 };
 let htlc_package = PackageTemplate::build_package(
 holder_tx.txid, transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(htlc_output),
htlc.cltv_expiry, conf_height
counterparty_spendable_height,
 );
 claim_requests.push(htlc_package);
 }
Expand Down

18 changes: 9 additions & 9 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -765,9 +765,8 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 continue;
 }

 log_trace!(logger, "Test if outpoint can be aggregated with expiration {} against {}", req.timelock(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.timelock() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 // Don't aggregate if outpoint package timelock is soon or marked as non-aggregable
 log_trace!(logger, "Test if outpoint which our counterparty can spend at {} can be aggregated based on aggregation limit {}", req.counterparty_spendable_height(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.counterparty_spendable_height() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 preprocessed_requests.push(req);
 } else if aggregated_request.is_none() {
 aggregated_request = Some(req);
Expand DownExpand Up@@ -885,15 +884,16 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 if let Some((claim_id, _)) = self.claimable_outpoints.get(&inp.previous_output) {
 // If outpoint has claim request pending on it...
 if let Some(request) = self.pending_claim_requests.get_mut(claim_id) {
 //... we need to verify equality between transaction outpoints and claim request
 // outpoints to know if transaction is the original claim or a bumped one issued
 // by us.
 let mut are_sets_equal = true;
 //... we need to check if the pending claim was for a subset of the outputs
 // spent by the confirmed transaction. If so, we can drop the pending claim
 // after ANTI_REORG_DELAY blocks, otherwise we need to split it and retry
 // claiming the remaining outputs.
 let mut is_claim_subset_of_tx = true;
 let mut tx_inputs = tx.input.iter().map(|input| &input.previous_output).collect::<Vec<_>>();
 tx_inputs.sort_unstable();
 for request_input in request.outpoints() {
 if tx_inputs.binary_search(&request_input).is_err() {
are_sets_equal = false;
is_claim_subset_of_tx = false;
 break;
 }
 }
Expand All@@ -915,7 +915,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // If this is our transaction (or our counterparty spent all the outputs
 // before we could anyway with same inputs order than us), wait for
 // ANTI_REORG_DELAY and clean the RBF tracking map.
 if are_sets_equal {
 if is_claim_subset_of_tx {
 clean_claim_request_after_safety_delay!();
 } else { // If false, generate new claim request with update outpoint set
 let mut at_least_one_drop = false;
Expand Down
Loading

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

Skip to content
Cleanup PackageTemplatea bit#3297

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 8 commits into

from

Oct 18, 2024
 Merged


Cleanup PackageTemplatea bit
#3297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
2f549ee

Rename claim cleaning match bool for accuracy


TheBlueMatt Sep 5, 2024
a19edbc

Rename `PackageTemplate::timelock` `counteraprty_spendable_height`


TheBlueMatt Sep 6, 2024
8c4794d

Drop unused `PackageTemplate::height_original`


TheBlueMatt Sep 5, 2024
303a0c9

Stop passing current height to `PackageTemplate::build_package`


TheBlueMatt Sep 6, 2024
be91587

Clean up `PackageTemplate::get_height_timer` to consider type


TheBlueMatt Sep 18, 2024
d557334

Rename `soonest_conf_deadline` to `counterparty_spendable_height`


TheBlueMatt Sep 18, 2024
6ae33dc

Set correct `counterparty_spendable_height` for outb local HTLCs


TheBlueMatt Sep 18, 2024
20db790

Add a test for the fee-bump rate of timeout HTLC claims on cp txn


TheBlueMatt Oct 18, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 19 additions & 10 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3018,7 +3018,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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
 self.best_block.height,
 );
 let mut claimable_outpoints = vec![commitment_package];
 let event = MonitorEvent::HolderForceClosedWithInfo {
Expand All@@ -3041,7 +3041,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // 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.
 let (mut new_outpoints, _) = self.get_broadcasted_holder_claims(
 &self.current_holder_commitment_tx, self.best_block.height
 &self.current_holder_commitment_tx, self.best_block.height,
 );
 let unsigned_commitment_tx = self.onchain_tx_handler.get_unsigned_holder_commitment_tx();
 let new_outputs = self.get_broadcasted_holder_watch_outputs(
Expand DownExpand Up@@ -3459,7 +3459,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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.channel_type_features().supports_anchors_zero_fee_htlc_tx());
 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);
 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,
 );
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
 Some((idx.try_into().expect("Txn can't have more than 2^32 outputs"), outp.value));
Expand All@@ -3476,7 +3480,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, 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.channel_type_features);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 let justice_package = PackageTemplate::build_package(
 commitment_txid,
 transaction_output_index,
 PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp),
 htlc.cltv_expiry,
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattOct 3, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Yea, sorry, fought with this for a while and think we should do it in a separate PR, it causes a bunch of test changes.
@valentinewallacevalentinewallaceOct 15, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Would be good to track this feedback somewhere
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

#3372
 );
 claimable_outpoints.push(justice_package);
 }
 }
Expand DownExpand Up@@ -3598,7 +3607,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.channel_type_features().clone()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry);
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattSep 19, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Ideally yea, but passing the current height through to here is very annoying, and really it doesn't matter - if its a timeout claim our counterparty can claim it now, but we can't so having a counterparty_claimable_height of when we can both claim it is fine.
 claimable_outpoints.push(counterparty_package);
 }
 }
Expand DownExpand Up@@ -3642,7 +3651,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32,
 );
 claimable_outpoints.push(justice_package);
 if outputs_to_watch.is_none() {
Expand All@@ -3665,11 +3674,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 for &(ref htlc, _, _) in holder_tx.htlc_outputs.iter() {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let (htlc_output, counterparty_spendable_height) = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, conf_height)
@valentinewallacevalentinewallaceOct 16, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Missing test coverage for this change
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Right, several of the "fix the value we pass" commits don't have test coverage because we don't rely on the value being the new correct one (and can't, old monitors may still be around which don't have the corrected value).
 } else {
 let payment_preimage = if let Some(preimage) = self.payment_preimages.get(&htlc.payment_hash) {
 preimage.clone()
Expand All@@ -3680,12 +3689,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, htlc.cltv_expiry)
 };
 let htlc_package = PackageTemplate::build_package(
 holder_tx.txid, transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(htlc_output),
htlc.cltv_expiry, conf_height
counterparty_spendable_height,
 );
 claim_requests.push(htlc_package);
 }
Expand Down

18 changes: 9 additions & 9 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -765,9 +765,8 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 continue;
 }

 log_trace!(logger, "Test if outpoint can be aggregated with expiration {} against {}", req.timelock(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.timelock() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 // Don't aggregate if outpoint package timelock is soon or marked as non-aggregable
 log_trace!(logger, "Test if outpoint which our counterparty can spend at {} can be aggregated based on aggregation limit {}", req.counterparty_spendable_height(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.counterparty_spendable_height() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 preprocessed_requests.push(req);
 } else if aggregated_request.is_none() {
 aggregated_request = Some(req);
Expand DownExpand Up@@ -885,15 +884,16 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 if let Some((claim_id, _)) = self.claimable_outpoints.get(&inp.previous_output) {
 // If outpoint has claim request pending on it...
 if let Some(request) = self.pending_claim_requests.get_mut(claim_id) {
 //... we need to verify equality between transaction outpoints and claim request
 // outpoints to know if transaction is the original claim or a bumped one issued
 // by us.
 let mut are_sets_equal = true;
 //... we need to check if the pending claim was for a subset of the outputs
 // spent by the confirmed transaction. If so, we can drop the pending claim
 // after ANTI_REORG_DELAY blocks, otherwise we need to split it and retry
 // claiming the remaining outputs.
 let mut is_claim_subset_of_tx = true;
 let mut tx_inputs = tx.input.iter().map(|input| &input.previous_output).collect::<Vec<_>>();
 tx_inputs.sort_unstable();
 for request_input in request.outpoints() {
 if tx_inputs.binary_search(&request_input).is_err() {
are_sets_equal = false;
is_claim_subset_of_tx = false;
 break;
 }
 }
Expand All@@ -915,7 +915,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // If this is our transaction (or our counterparty spent all the outputs
 // before we could anyway with same inputs order than us), wait for
 // ANTI_REORG_DELAY and clean the RBF tracking map.
 if are_sets_equal {
 if is_claim_subset_of_tx {
 clean_claim_request_after_safety_delay!();
 } else { // If false, generate new claim request with update outpoint set
 let mut at_least_one_drop = false;
Expand Down
Loading

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

Skip to content
Cleanup PackageTemplatea bit#3297

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 8 commits into

from

Oct 18, 2024
 Merged


Cleanup PackageTemplatea bit
#3297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
2f549ee

Rename claim cleaning match bool for accuracy


TheBlueMatt Sep 5, 2024
a19edbc

Rename `PackageTemplate::timelock` `counteraprty_spendable_height`


TheBlueMatt Sep 6, 2024
8c4794d

Drop unused `PackageTemplate::height_original`


TheBlueMatt Sep 5, 2024
303a0c9

Stop passing current height to `PackageTemplate::build_package`


TheBlueMatt Sep 6, 2024
be91587

Clean up `PackageTemplate::get_height_timer` to consider type


TheBlueMatt Sep 18, 2024
d557334

Rename `soonest_conf_deadline` to `counterparty_spendable_height`


TheBlueMatt Sep 18, 2024
6ae33dc

Set correct `counterparty_spendable_height` for outb local HTLCs


TheBlueMatt Sep 18, 2024
20db790

Add a test for the fee-bump rate of timeout HTLC claims on cp txn


TheBlueMatt Oct 18, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 19 additions & 10 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3018,7 +3018,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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
 self.best_block.height,
 );
 let mut claimable_outpoints = vec![commitment_package];
 let event = MonitorEvent::HolderForceClosedWithInfo {
Expand All@@ -3041,7 +3041,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // 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.
 let (mut new_outpoints, _) = self.get_broadcasted_holder_claims(
 &self.current_holder_commitment_tx, self.best_block.height
 &self.current_holder_commitment_tx, self.best_block.height,
 );
 let unsigned_commitment_tx = self.onchain_tx_handler.get_unsigned_holder_commitment_tx();
 let new_outputs = self.get_broadcasted_holder_watch_outputs(
Expand DownExpand Up@@ -3459,7 +3459,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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.channel_type_features().supports_anchors_zero_fee_htlc_tx());
 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);
 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,
 );
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
 Some((idx.try_into().expect("Txn can't have more than 2^32 outputs"), outp.value));
Expand All@@ -3476,7 +3480,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, 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.channel_type_features);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 let justice_package = PackageTemplate::build_package(
 commitment_txid,
 transaction_output_index,
 PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp),
 htlc.cltv_expiry,
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattOct 3, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Yea, sorry, fought with this for a while and think we should do it in a separate PR, it causes a bunch of test changes.
@valentinewallacevalentinewallaceOct 15, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Would be good to track this feedback somewhere
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

#3372
 );
 claimable_outpoints.push(justice_package);
 }
 }
Expand DownExpand Up@@ -3598,7 +3607,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.channel_type_features().clone()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry);
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattSep 19, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Ideally yea, but passing the current height through to here is very annoying, and really it doesn't matter - if its a timeout claim our counterparty can claim it now, but we can't so having a counterparty_claimable_height of when we can both claim it is fine.
 claimable_outpoints.push(counterparty_package);
 }
 }
Expand DownExpand Up@@ -3642,7 +3651,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32,
 );
 claimable_outpoints.push(justice_package);
 if outputs_to_watch.is_none() {
Expand All@@ -3665,11 +3674,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 for &(ref htlc, _, _) in holder_tx.htlc_outputs.iter() {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let (htlc_output, counterparty_spendable_height) = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, conf_height)
@valentinewallacevalentinewallaceOct 16, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Missing test coverage for this change
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Right, several of the "fix the value we pass" commits don't have test coverage because we don't rely on the value being the new correct one (and can't, old monitors may still be around which don't have the corrected value).
 } else {
 let payment_preimage = if let Some(preimage) = self.payment_preimages.get(&htlc.payment_hash) {
 preimage.clone()
Expand All@@ -3680,12 +3689,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, htlc.cltv_expiry)
 };
 let htlc_package = PackageTemplate::build_package(
 holder_tx.txid, transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(htlc_output),
htlc.cltv_expiry, conf_height
counterparty_spendable_height,
 );
 claim_requests.push(htlc_package);
 }
Expand Down

18 changes: 9 additions & 9 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -765,9 +765,8 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 continue;
 }

 log_trace!(logger, "Test if outpoint can be aggregated with expiration {} against {}", req.timelock(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.timelock() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 // Don't aggregate if outpoint package timelock is soon or marked as non-aggregable
 log_trace!(logger, "Test if outpoint which our counterparty can spend at {} can be aggregated based on aggregation limit {}", req.counterparty_spendable_height(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.counterparty_spendable_height() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 preprocessed_requests.push(req);
 } else if aggregated_request.is_none() {
 aggregated_request = Some(req);
Expand DownExpand Up@@ -885,15 +884,16 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 if let Some((claim_id, _)) = self.claimable_outpoints.get(&inp.previous_output) {
 // If outpoint has claim request pending on it...
 if let Some(request) = self.pending_claim_requests.get_mut(claim_id) {
 //... we need to verify equality between transaction outpoints and claim request
 // outpoints to know if transaction is the original claim or a bumped one issued
 // by us.
 let mut are_sets_equal = true;
 //... we need to check if the pending claim was for a subset of the outputs
 // spent by the confirmed transaction. If so, we can drop the pending claim
 // after ANTI_REORG_DELAY blocks, otherwise we need to split it and retry
 // claiming the remaining outputs.
 let mut is_claim_subset_of_tx = true;
 let mut tx_inputs = tx.input.iter().map(|input| &input.previous_output).collect::<Vec<_>>();
 tx_inputs.sort_unstable();
 for request_input in request.outpoints() {
 if tx_inputs.binary_search(&request_input).is_err() {
are_sets_equal = false;
is_claim_subset_of_tx = false;
 break;
 }
 }
Expand All@@ -915,7 +915,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // If this is our transaction (or our counterparty spent all the outputs
 // before we could anyway with same inputs order than us), wait for
 // ANTI_REORG_DELAY and clean the RBF tracking map.
 if are_sets_equal {
 if is_claim_subset_of_tx {
 clean_claim_request_after_safety_delay!();
 } else { // If false, generate new claim request with update outpoint set
 let mut at_least_one_drop = false;
Expand Down
Loading

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

Skip to content
Cleanup PackageTemplatea bit#3297

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 8 commits into

from

Oct 18, 2024
 Merged


Cleanup PackageTemplatea bit
#3297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
2f549ee

Rename claim cleaning match bool for accuracy


TheBlueMatt Sep 5, 2024
a19edbc

Rename `PackageTemplate::timelock` `counteraprty_spendable_height`


TheBlueMatt Sep 6, 2024
8c4794d

Drop unused `PackageTemplate::height_original`


TheBlueMatt Sep 5, 2024
303a0c9

Stop passing current height to `PackageTemplate::build_package`


TheBlueMatt Sep 6, 2024
be91587

Clean up `PackageTemplate::get_height_timer` to consider type


TheBlueMatt Sep 18, 2024
d557334

Rename `soonest_conf_deadline` to `counterparty_spendable_height`


TheBlueMatt Sep 18, 2024
6ae33dc

Set correct `counterparty_spendable_height` for outb local HTLCs


TheBlueMatt Sep 18, 2024
20db790

Add a test for the fee-bump rate of timeout HTLC claims on cp txn


TheBlueMatt Oct 18, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 19 additions & 10 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3018,7 +3018,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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
 self.best_block.height,
 );
 let mut claimable_outpoints = vec![commitment_package];
 let event = MonitorEvent::HolderForceClosedWithInfo {
Expand All@@ -3041,7 +3041,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // 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.
 let (mut new_outpoints, _) = self.get_broadcasted_holder_claims(
 &self.current_holder_commitment_tx, self.best_block.height
 &self.current_holder_commitment_tx, self.best_block.height,
 );
 let unsigned_commitment_tx = self.onchain_tx_handler.get_unsigned_holder_commitment_tx();
 let new_outputs = self.get_broadcasted_holder_watch_outputs(
Expand DownExpand Up@@ -3459,7 +3459,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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.channel_type_features().supports_anchors_zero_fee_htlc_tx());
 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);
 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,
 );
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
 Some((idx.try_into().expect("Txn can't have more than 2^32 outputs"), outp.value));
Expand All@@ -3476,7 +3480,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, 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.channel_type_features);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 let justice_package = PackageTemplate::build_package(
 commitment_txid,
 transaction_output_index,
 PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp),
 htlc.cltv_expiry,
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattOct 3, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Yea, sorry, fought with this for a while and think we should do it in a separate PR, it causes a bunch of test changes.
@valentinewallacevalentinewallaceOct 15, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Would be good to track this feedback somewhere
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

#3372
 );
 claimable_outpoints.push(justice_package);
 }
 }
Expand DownExpand Up@@ -3598,7 +3607,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.channel_type_features().clone()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry);
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattSep 19, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Ideally yea, but passing the current height through to here is very annoying, and really it doesn't matter - if its a timeout claim our counterparty can claim it now, but we can't so having a counterparty_claimable_height of when we can both claim it is fine.
 claimable_outpoints.push(counterparty_package);
 }
 }
Expand DownExpand Up@@ -3642,7 +3651,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32,
 );
 claimable_outpoints.push(justice_package);
 if outputs_to_watch.is_none() {
Expand All@@ -3665,11 +3674,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 for &(ref htlc, _, _) in holder_tx.htlc_outputs.iter() {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let (htlc_output, counterparty_spendable_height) = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, conf_height)
@valentinewallacevalentinewallaceOct 16, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Missing test coverage for this change
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Right, several of the "fix the value we pass" commits don't have test coverage because we don't rely on the value being the new correct one (and can't, old monitors may still be around which don't have the corrected value).
 } else {
 let payment_preimage = if let Some(preimage) = self.payment_preimages.get(&htlc.payment_hash) {
 preimage.clone()
Expand All@@ -3680,12 +3689,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, htlc.cltv_expiry)
 };
 let htlc_package = PackageTemplate::build_package(
 holder_tx.txid, transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(htlc_output),
htlc.cltv_expiry, conf_height
counterparty_spendable_height,
 );
 claim_requests.push(htlc_package);
 }
Expand Down

18 changes: 9 additions & 9 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -765,9 +765,8 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 continue;
 }

 log_trace!(logger, "Test if outpoint can be aggregated with expiration {} against {}", req.timelock(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.timelock() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 // Don't aggregate if outpoint package timelock is soon or marked as non-aggregable
 log_trace!(logger, "Test if outpoint which our counterparty can spend at {} can be aggregated based on aggregation limit {}", req.counterparty_spendable_height(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.counterparty_spendable_height() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 preprocessed_requests.push(req);
 } else if aggregated_request.is_none() {
 aggregated_request = Some(req);
Expand DownExpand Up@@ -885,15 +884,16 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 if let Some((claim_id, _)) = self.claimable_outpoints.get(&inp.previous_output) {
 // If outpoint has claim request pending on it...
 if let Some(request) = self.pending_claim_requests.get_mut(claim_id) {
 //... we need to verify equality between transaction outpoints and claim request
 // outpoints to know if transaction is the original claim or a bumped one issued
 // by us.
 let mut are_sets_equal = true;
 //... we need to check if the pending claim was for a subset of the outputs
 // spent by the confirmed transaction. If so, we can drop the pending claim
 // after ANTI_REORG_DELAY blocks, otherwise we need to split it and retry
 // claiming the remaining outputs.
 let mut is_claim_subset_of_tx = true;
 let mut tx_inputs = tx.input.iter().map(|input| &input.previous_output).collect::<Vec<_>>();
 tx_inputs.sort_unstable();
 for request_input in request.outpoints() {
 if tx_inputs.binary_search(&request_input).is_err() {
are_sets_equal = false;
is_claim_subset_of_tx = false;
 break;
 }
 }
Expand All@@ -915,7 +915,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // If this is our transaction (or our counterparty spent all the outputs
 // before we could anyway with same inputs order than us), wait for
 // ANTI_REORG_DELAY and clean the RBF tracking map.
 if are_sets_equal {
 if is_claim_subset_of_tx {
 clean_claim_request_after_safety_delay!();
 } else { // If false, generate new claim request with update outpoint set
 let mut at_least_one_drop = false;
Expand Down
Loading

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

Skip to content
Cleanup PackageTemplatea bit#3297

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 8 commits into

from

Oct 18, 2024
 Merged


Cleanup PackageTemplatea bit
#3297
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
2f549ee

Rename claim cleaning match bool for accuracy


TheBlueMatt Sep 5, 2024
a19edbc

Rename `PackageTemplate::timelock` `counteraprty_spendable_height`


TheBlueMatt Sep 6, 2024
8c4794d

Drop unused `PackageTemplate::height_original`


TheBlueMatt Sep 5, 2024
303a0c9

Stop passing current height to `PackageTemplate::build_package`


TheBlueMatt Sep 6, 2024
be91587

Clean up `PackageTemplate::get_height_timer` to consider type


TheBlueMatt Sep 18, 2024
d557334

Rename `soonest_conf_deadline` to `counterparty_spendable_height`


TheBlueMatt Sep 18, 2024
6ae33dc

Set correct `counterparty_spendable_height` for outb local HTLCs


TheBlueMatt Sep 18, 2024
20db790

Add a test for the fee-bump rate of timeout HTLC claims on cp txn


TheBlueMatt Oct 18, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 19 additions & 10 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3018,7 +3018,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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
 self.best_block.height,
 );
 let mut claimable_outpoints = vec![commitment_package];
 let event = MonitorEvent::HolderForceClosedWithInfo {
Expand All@@ -3041,7 +3041,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 // 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.
 let (mut new_outpoints, _) = self.get_broadcasted_holder_claims(
 &self.current_holder_commitment_tx, self.best_block.height
 &self.current_holder_commitment_tx, self.best_block.height,
 );
 let unsigned_commitment_tx = self.onchain_tx_handler.get_unsigned_holder_commitment_tx();
 let new_outputs = self.get_broadcasted_holder_watch_outputs(
Expand DownExpand Up@@ -3459,7 +3459,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 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.channel_type_features().supports_anchors_zero_fee_htlc_tx());
 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);
 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,
 );
 claimable_outpoints.push(justice_package);
 to_counterparty_output_info =
 Some((idx.try_into().expect("Txn can't have more than 2^32 outputs"), outp.value));
Expand All@@ -3476,7 +3480,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 return (claimable_outpoints, 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.channel_type_features);
 let justice_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp), htlc.cltv_expiry, height);
 let justice_package = PackageTemplate::build_package(
 commitment_txid,
 transaction_output_index,
 PackageSolvingData::RevokedHTLCOutput(revk_htlc_outp),
 htlc.cltv_expiry,
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattOct 3, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Yea, sorry, fought with this for a while and think we should do it in a separate PR, it causes a bunch of test changes.
@valentinewallacevalentinewallaceOct 15, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Would be good to track this feedback somewhere
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

#3372
 );
 claimable_outpoints.push(justice_package);
 }
 }
Expand DownExpand Up@@ -3598,7 +3607,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 self.counterparty_commitment_params.counterparty_htlc_base_key,
 htlc.clone(), self.onchain_tx_handler.channel_type_features().clone()))
 };
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry, 0);
 let counterparty_package = PackageTemplate::build_package(commitment_txid, transaction_output_index, counterparty_htlc_outp, htlc.cltv_expiry);
@wvanlintwvanlintSep 18, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Should the counterparty_spendable_height be adjusted here as well based on whether the htlc is offered or not?
@TheBlueMattTheBlueMattSep 19, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Ideally yea, but passing the current height through to here is very annoying, and really it doesn't matter - if its a timeout claim our counterparty can claim it now, but we can't so having a counterparty_claimable_height of when we can both claim it is fine.
 claimable_outpoints.push(counterparty_package);
 }
 }
Expand DownExpand Up@@ -3642,7 +3651,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32, height
 height + self.counterparty_commitment_params.on_counterparty_tx_csv as u32,
 );
 claimable_outpoints.push(justice_package);
 if outputs_to_watch.is_none() {
Expand All@@ -3665,11 +3674,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 for &(ref htlc, _, _) in holder_tx.htlc_outputs.iter() {
 if let Some(transaction_output_index) = htlc.transaction_output_index {
 let htlc_output = if htlc.offered {
 let (htlc_output, counterparty_spendable_height) = if htlc.offered {
 let htlc_output = HolderHTLCOutput::build_offered(
 htlc.amount_msat, htlc.cltv_expiry, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, conf_height)
@valentinewallacevalentinewallaceOct 16, 2024

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Missing test coverage for this change
@TheBlueMattTheBlueMattOct 16, 2024

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

Right, several of the "fix the value we pass" commits don't have test coverage because we don't rely on the value being the new correct one (and can't, old monitors may still be around which don't have the corrected value).
 } else {
 let payment_preimage = if let Some(preimage) = self.payment_preimages.get(&htlc.payment_hash) {
 preimage.clone()
Expand All@@ -3680,12 +3689,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let htlc_output = HolderHTLCOutput::build_accepted(
 payment_preimage, htlc.amount_msat, self.onchain_tx_handler.channel_type_features().clone()
 );
 htlc_output
(htlc_output, htlc.cltv_expiry)
 };
 let htlc_package = PackageTemplate::build_package(
 holder_tx.txid, transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(htlc_output),
htlc.cltv_expiry, conf_height
counterparty_spendable_height,
 );
 claim_requests.push(htlc_package);
 }
Expand Down

18 changes: 9 additions & 9 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -765,9 +765,8 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 continue;
 }

 log_trace!(logger, "Test if outpoint can be aggregated with expiration {} against {}", req.timelock(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.timelock() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 // Don't aggregate if outpoint package timelock is soon or marked as non-aggregable
 log_trace!(logger, "Test if outpoint which our counterparty can spend at {} can be aggregated based on aggregation limit {}", req.counterparty_spendable_height(), cur_height + CLTV_SHARED_CLAIM_BUFFER);
 if req.counterparty_spendable_height() <= cur_height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregable() {
 preprocessed_requests.push(req);
 } else if aggregated_request.is_none() {
 aggregated_request = Some(req);
Expand DownExpand Up@@ -885,15 +884,16 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 if let Some((claim_id, _)) = self.claimable_outpoints.get(&inp.previous_output) {
 // If outpoint has claim request pending on it...
 if let Some(request) = self.pending_claim_requests.get_mut(claim_id) {
 //... we need to verify equality between transaction outpoints and claim request
 // outpoints to know if transaction is the original claim or a bumped one issued
 // by us.
 let mut are_sets_equal = true;
 //... we need to check if the pending claim was for a subset of the outputs
 // spent by the confirmed transaction. If so, we can drop the pending claim
 // after ANTI_REORG_DELAY blocks, otherwise we need to split it and retry
 // claiming the remaining outputs.
 let mut is_claim_subset_of_tx = true;
 let mut tx_inputs = tx.input.iter().map(|input| &input.previous_output).collect::<Vec<_>>();
 tx_inputs.sort_unstable();
 for request_input in request.outpoints() {
 if tx_inputs.binary_search(&request_input).is_err() {
are_sets_equal = false;
is_claim_subset_of_tx = false;
 break;
 }
 }
Expand All@@ -915,7 +915,7 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // If this is our transaction (or our counterparty spent all the outputs
 // before we could anyway with same inputs order than us), wait for
 // ANTI_REORG_DELAY and clean the RBF tracking map.
 if are_sets_equal {
 if is_claim_subset_of_tx {
 clean_claim_request_after_safety_delay!();
 } else { // If false, generate new claim request with update outpoint set
 let mut at_least_one_drop = false;
Expand Down
Loading