Keep track on which side initiated a mutual close #3042
Merged
+105
−51
Conversation
This file contains 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
pm47
commented
Mar 20, 2025
This change is a little bit more involved, but is also cleaner and easier to understand for the reader, as the initiator status is explicit. We also solve an ambiguity where we would bump the fee of a pending mutual close that we didn't initiate.
pm47
commented
Mar 20, 2025
eclair-core/src/main/scala/fr/acinq/eclair/wire/internal/channel/version3/ChannelCodecs3.scala
Show resolved
Hide resolved
eclair-core/src/main/scala/fr/acinq/eclair/wire/internal/channel/version3/ChannelCodecs3.scala
Show resolved
Hide resolved
t-bast
reviewed
Mar 21, 2025
eclair-core/src/main/scala/fr/acinq/eclair/wire/internal/channel/version3/ChannelCodecs3.scala
Show resolved
Hide resolved
eclair-core/src/main/scala/fr/acinq/eclair/wire/internal/channel/version4/ChannelTypes4.scala
Outdated
Show resolved
Hide resolved
pm47
commented
Mar 21, 2025
eclair-core/src/main/scala/fr/acinq/eclair/wire/internal/channel/version4/ChannelTypes4.scala
Outdated
Show resolved
Hide resolved
t-bast
approved these changes
Mar 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.
We currently lose this information once we transition to
SHUTDOWN(inNORMAL, we can compute it based on whichshutdownis present).I tried two approaches in two successive commits:
Option[ClosingFeerates]byOption[CloseInitiated](which itself stores anOption[ClosingFeerates]. This approach is very close to what we have currently, but ambiguous in the non-initiator case (there is no difference between "no close in progress" and "a close as non-initiator"). This ambiguity makes the backward compat code simpler.CloseStatus. This approach is a bit more involved, but also unambiguous and probably easier for the reader. TheCloseStatusis optional inNORMALstate, mandatory inSHUTDOWNstate.