Refactor some closing helper functions #3089
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We move functions that compute the confirmation target outside of `LocalCommitPublished` and `RemoteCommitPublished` to helper functions in the `Closing` object. We also slightly refactor `doPublish` functions to remove the pattern matching on the commitment format, which was actually unnecessary since we introduced the `redeemableHtlcTxs` function.
This is a trivial refactoring where we explicitly create a single anchor transaction instead of replacing an empty list. We also clean up comments and variable names in force-close helpers.
We stop relying on `LocalCommitPublished` and `RemoteCommitPublished` to identify when HTLCs should be failed upstream because they are either trimmed or their timeout transaction is confirmed. We instead rely on commitment data for local commitments, and re-create the commit outputs on-the-fly for remote commitments.
In case of a revoked close, we previously published 3rd-stage penalty txs as soon as we saw our peer's HTLC transactions in our mempool. This isn't necessary and may actually help them get confirmed since it is essentially a CPFP. We now instead wait for the revoked HTLC transaction to be confirmed before publishing a penalty transaction claiming its outputs.
sstone
reviewed
May 21, 2025
eclair-core/src/main/scala/fr/acinq/eclair/channel/fsm/ErrorHandlers.scala
Show resolved
Hide resolved
sstone
approved these changes
May 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains a collection of small, independent commits that refactor various force-close helper functions. This is a first step towards simplifying
LocalCommitPublishedandRemoteCommitPublishedin order to only store the outpoints of interest and not anyTransactionWithInputInfoinstances, which will simplify our codecs, be more consistent with RBF scenarios, and remove bugs like #3085.Each commit should be reviewed on its own: please read the commit message which should help understand the change! The only commit that isn't trivial is the 3rd one, where we start re-computing commit outputs in order to identify closing transactions. This is something we'll start doing more often as we get rid of our dependencies on
LocalCommitPublishedandRemoteCommitPublished.