Use channel_reestablish tlv when sending channel_ready #3025
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
When the remote node supports the 'your_last_funding_locked' tlv we do not need to always resend channel_ready when there are no channel updates. The tlv removes the ambiguity about whether our last channel_ready was received.
|
I refactored the reestablish logic a bit so that sending I added two tests for the legacy (pre-splice) behavior and updated any other tests that expected the old behavior. |
t-bast
reviewed
Mar 4, 2025
eclair-core/src/main/scala/fr/acinq/eclair/channel/fsm/Channel.scala
Outdated
Show resolved
Hide resolved
eclair-core/src/main/scala/fr/acinq/eclair/channel/fsm/Channel.scala
Outdated
Show resolved
Hide resolved
eclair-core/src/test/scala/fr/acinq/eclair/channel/states/ChannelStateTestsHelperMethods.scala
Outdated
Show resolved
Hide resolved
eclair-core/src/test/scala/fr/acinq/eclair/channel/states/ChannelStateTestsHelperMethods.scala
Outdated
Show resolved
Hide resolved
...-core/src/test/scala/fr/acinq/eclair/channel/states/c/WaitForDualFundingReadyStateSpec.scala
Outdated
Show resolved
Hide resolved
...-core/src/test/scala/fr/acinq/eclair/channel/states/c/WaitForDualFundingReadyStateSpec.scala
Show resolved
Hide resolved
eclair-core/src/test/scala/fr/acinq/eclair/channel/states/e/OfflineStateSpec.scala
Outdated
Show resolved
Hide resolved
eclair-core/src/test/scala/fr/acinq/eclair/channel/states/e/OfflineStateSpec.scala
Outdated
Show resolved
Hide resolved
eclair-core/src/test/scala/fr/acinq/eclair/channel/states/e/OfflineStateSpec.scala
Outdated
Show resolved
Hide resolved
For consistency, "re-sending" log messages should use the spec name, not the internal type.
|
Thanks for the feedback! I think it should all good now. |
t-bast
reviewed
Mar 5, 2025
Comment on lines
916
to
925
| val aliceInit = Init(alice.stateData match { | ||
| case d: ChannelDataWithoutCommitments => d.channelParams.localParams.initFeatures | ||
| case d: ChannelDataWithCommitments => d.commitments.params.localParams.initFeatures | ||
| case _ => Alice.nodeParams.initFeaturesFor(Bob.nodeParams.nodeId) | ||
| }) | ||
| val bobInit = Init(bob.stateData match { | ||
| case d: ChannelDataWithoutCommitments => d.channelParams.localParams.initFeatures | ||
| case d: ChannelDataWithCommitments => d.commitments.params.localParams.initFeatures | ||
| case _ => Bob.nodeParams.initFeaturesFor(Alice.nodeParams.nodeId) | ||
| }) |
There was a problem hiding this comment.
Why do you need this pattern matching? Can't you simply do:
Suggested change
| val aliceInit = Init(alice.stateData match { | |
| case d: ChannelDataWithoutCommitments => d.channelParams.localParams.initFeatures | |
| case d: ChannelDataWithCommitments => d.commitments.params.localParams.initFeatures | |
| case _ => Alice.nodeParams.initFeaturesFor(Bob.nodeParams.nodeId) | |
| }) | |
| val bobInit = Init(bob.stateData match { | |
| case d: ChannelDataWithoutCommitments => d.channelParams.localParams.initFeatures | |
| case d: ChannelDataWithCommitments => d.commitments.params.localParams.initFeatures | |
| case _ => Bob.nodeParams.initFeaturesFor(Alice.nodeParams.nodeId) | |
| }) | |
| val aliceInit = Init(alice.nodeParams.initFeaturesFor(bob.nodeParams.nodeId)) | |
| val bobInit = Init(bob.nodeParams.initFeaturesFor(alice.nodeParams.nodeId)) |
There was a problem hiding this comment.
It turns out that NodeParams used by init to create alice and bob was not using the computed init features. This should be fixed in 317d875.
The `nodeParams` used when creating `alice` and `bob` during `init` did not use the init features set by `computeFeatures`.
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.
When the remote node supports the
your_last_funding_lockedtlv we do not need to always resendchannel_readywhen there are no channel updates. The tlv removes the ambiguity about whether our lastchannel_readywas received.