Skip to content

Fix off-by-one finalized transaction locktime #2212

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
merged 3 commits into from
Apr 22, 2023
Merged

Fix off-by-one finalized transaction locktime #2212

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69d0bfa
Use current height when generating claims on block_disconnected
wpaulino Apr 21, 2023
e904d68
Catch up test nodes to latest block height
wpaulino Apr 16, 2023
97e4344
Fix off-by-one finalized transaction locktime
wpaulino Apr 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lightning/src/chain/onchaintx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,8 +1036,10 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
}
}
for ((_package_id, _), ref mut request) in bump_candidates.iter_mut() {
// `height` is the height being disconnected, so our `current_height` is 1 lower.
Copy link

Choose a reason for hiding this comment

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

Trying to claim at next block connection works well, until a user calls invalidateblock and break this assumption, I think (though it’s a quite unorthodox uses of the consensus engine).

let current_height = height - 1;
if let Some((new_timer, new_feerate, bump_claim)) = self.generate_claim(
height, &request, true /* force_feerate_bump */, fee_estimator, &&*logger
current_height, &request, true /* force_feerate_bump */, fee_estimator, &&*logger
) {
request.set_timer(new_timer);
request.set_feerate(new_feerate);
Expand Down