Merge initial and retry stfu send paths#4432
Open
wpaulino wants to merge 2 commits intolightningdevkit:mainfrom
Open
Merge initial and retry stfu send paths#4432wpaulino wants to merge 2 commits intolightningdevkit:mainfrom
wpaulino wants to merge 2 commits intolightningdevkit:mainfrom
Conversation
In 15b04b5, we fixed a case in `FundedChannel::try_send_stfu` where we'd send `stfu` unnecessarily for a new splice while one is already pending. The same case also existed in `FundedChannel::send_stfu`, but was not fixed. There's no good reason for both of these methods to exist, so we merge them into one as `FundedChannel::try_send_stfu`. We also add a test that reproduces the `FundedChannel::send_stfu` issue to ensure it's fixed and does not regress.
With the introduction of `QuiescentAction`, the flag has essentially become duplicate state, so we opt to remove it in favor of just checking whether we have a pending `FundedChannel::quiescent_action`. Since the quiescent flags are never persisted, we can simply remove it and update the other flags, freeing up a bit for future use.
|
👋 Thanks for assigning @jkczyz as a reviewer! |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4432 +/- ##
==========================================
- Coverage 85.87% 85.84% -0.03%
==========================================
Files 157 157
Lines 103769 103719 -50
Branches 103769 103719 -50
==========================================
- Hits 89115 89041 -74
- Misses 12158 12184 +26
+ Partials 2496 2494 -2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
jkczyz
reviewed
Feb 23, 2026
lightning/src/ln/channel.rs
Outdated
| self.context.channel_state.clear_awaiting_quiescence(); | ||
| self.context.channel_state.clear_remote_stfu_sent(); | ||
| self.context.channel_state.set_quiescent(); | ||
| // We are sending an stfu in response to our couterparty's stfu, but had not yet sent |
Comment on lines
-10750
to
-10754
| if self.context.channel_state.is_awaiting_quiescence() { | ||
| // We haven't been able to send `stfu` yet, and there's no point in attempting | ||
| // quiescence anymore since the counterparty wishes to close the channel. | ||
| self.context.channel_state.clear_awaiting_quiescence(); | ||
| } |
Contributor
There was a problem hiding this comment.
If we have a QuiescenAction set, will we keep trying to send stfu?
Comment on lines
-11530
to
-11531
| // TODO(splicing): If we didn't win quiescence, then we can contribute as an acceptor | ||
| // instead of waiting for the splice to lock. |
Contributor
There was a problem hiding this comment.
Probably no need to worry since this is handled in #4416, but looks like this TODO wasn't moved.
lightning/src/ln/channel.rs
Outdated
Comment on lines
13573
to
13538
| if self.context.channel_state.is_local_stfu_sent() | ||
| || self.context.channel_state.is_quiescent() | ||
| { | ||
| if self.quiescent_action.is_none() && !self.context.channel_state.is_remote_stfu_sent() { | ||
| return None; | ||
| } | ||
| if !self.context.channel_state.is_awaiting_quiescence() | ||
| && !self.context.channel_state.is_remote_stfu_sent() | ||
| if self.context.channel_state.is_local_stfu_sent() | ||
| || self.context.channel_state.is_quiescent() |
Contributor
There was a problem hiding this comment.
nit: diff would be cleaner if the order of the if blocks wasn't flipped.
|
👋 The first review has been submitted! Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #4429.