Remove spurious interactive-tx commit_sig retransmission
#2966
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
t-bast
force-pushed
the
avoid-spurious-commit-sig-retransmit-reconnect
branch
from
e3cf443 to
c713beb
Compare
t-bast
force-pushed
the
avoid-spurious-commit-sig-retransmit-reconnect
branch
from
c713beb to
8f586d5
Compare
We fully implement lightning/bolts#1214 to stop retransmitting `commit_sig` when our peer has already received it. We also correctly set `next_commitment_number` to let our peer know whether we have received their `commit_sig` or not. We also retransmit `tx_signatures` (and, if requested, `commit_sig`) after sending `channel_ready` in the 0-conf case. This was missing and was a bug.
t-bast
force-pushed
the
avoid-spurious-commit-sig-retransmit-reconnect
branch
from
8f586d5 to
9625a6e
Compare
pm47
previously approved these changes
Mar 5, 2025
| @@ -1082,6 +1082,11 @@ object InteractiveTxSigningSession { | |||
| liquidityPurchase_opt: Option[LiquidityAds.PurchaseBasicInfo]) extends InteractiveTxSigningSession { | |||
| val commitInput: InputInfo = localCommit.fold(_.commitTx.input, _.commitTxAndRemoteSig.commitTx.input) | |||
| val localCommitIndex: Long = localCommit.fold(_.index, _.index) | |||
| // This value tells our peer whether we need them to retransmit their commit_sig on reconnection or not. | |||
| val reconnectNextLocalCommitmentNumber: Long = localCommit match { | |||
| case Left(commit) => commit.index | |||
There was a problem hiding this comment.
Nit:
Suggested change
| case Left(commit) => commit.index | |
| case Left(unsignedCommit) => unsignedCommit.index |
| @@ -1082,6 +1082,11 @@ object InteractiveTxSigningSession { | |||
| liquidityPurchase_opt: Option[LiquidityAds.PurchaseBasicInfo]) extends InteractiveTxSigningSession { | |||
| val commitInput: InputInfo = localCommit.fold(_.commitTx.input, _.commitTxAndRemoteSig.commitTx.input) | |||
| val localCommitIndex: Long = localCommit.fold(_.index, _.index) | |||
| // This value tells our peer whether we need them to retransmit their commit_sig on reconnection or not. | |||
| val reconnectNextLocalCommitmentNumber: Long = localCommit match { | |||
There was a problem hiding this comment.
Nit: the meaning of this value is independent of the reconnection context
Suggested change
| val reconnectNextLocalCommitmentNumber: Long = localCommit match { | |
| val nextLocalCommitmentNumber: Long = localCommit match { |
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 fully implement lightning/bolts#1214 to stop retransmitting
commit_sigwhen our peer has already received it. We also correctly setnext_commitment_numberto let our peer know whether we have received theircommit_sigor not.Note that if our peer hasn't upgraded and always sends
next_commitment_number = current_commitment_number + 1even when they haven't received ourcommit_sig, this won't lead to a force-close: we will simply wait for them to send anerror, which will never happen. Their channel will be stuck until they upgrade and sendnext_commitment_number = current_commitment_number.This change must only be merged once:
remote_commitment_number#2965next_commitment_numberduring splice reconnect lightning-kmp#736 so that users can upgrade to avoid being stuck