Cut 0.2 #4254
Merged
Cut 0.2 #4254
+446
−216
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
If we complete a `ChannelMonitorUpdate` persistence but there are
blocked `ChannelMonitorUpdate`s in the channel, we'll skip all the
post-monitor-update logic entirely. While its correct that we can't
resume the channel (as it expected the monitor updates it generated
to complete, even if they ended up blocked), the post-update
actions are a `channelmanager.rs` concept - they cannot be tied to
blocked updates because `channelmanager.rs` doesn't even see
blocked updates.
This can lead to a channel getting stuck waiting on itself. In a
production environment, an LDK user saw a case where:
(a) an MPP payment was received over several channels, let's call
them A + B.
(b) channel B got into `AwaitingRAA` due to unrelated operations,
(c) the MPP payment was claimed, with async monitor updating,
(d) the `revoke_and_ack` we were waiting on was delivered, but the
resulting `ChannelMonitorUpdate` was blocked due to the
pending claim having inserted an RAA-blocking action,
(e) the preimage `ChannelMonitorUpdate` generated for channel B
completed persistence, which did nothing due to the blocked
`ChannelMonitorUpdate`.
(f) the `Event::PaymentClaimed` event was handled but it, too,
failed to unblock the channel.
Instead, here, we simply process post-update actions when an update
completes, even if there are pending blocked updates. We do not
fully unblock the channel, of course.
Backport of 8f4a4d2
Conflicts due to upstream macro rewrite resolved in:
* lightning/src/ln/channelmanager.rs
This aligns `handle_monitor_update_completion` closer with upstream after backporting 8f4a4d2, making potential future backports somewhat simpler.
Various fields in `ChannelDetails` refer to channel information which changes on splice, which we ensure is consistently documented here. Backport of c3cc331
|
👋 Thanks for assigning @wpaulino as a reviewer! |
This was referenced Dec 2, 2025
TheBlueMatt
force-pushed
the
2025-12-0.2-rel
branch
from
ae32294 to
d7ec833
Compare
Collaborator
Author
|
Included the 0.1.8 changelog from #4255 since we should list the bug fixes there |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 0.2 #4254 +/- ##
==========================================
+ Coverage 88.86% 88.88% +0.02%
==========================================
Files 180 180
Lines 138042 138117 +75
Branches 138042 138117 +75
==========================================
+ Hits 122667 122772 +105
+ Misses 12557 12528 -29
+ Partials 2818 2817 -1
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:
|
wpaulino
approved these changes
Dec 2, 2025
TheBlueMatt
force-pushed
the
2025-12-0.2-rel
branch
from
d7ec833 to
e276b44
Compare
Collaborator
Author
|
Oops, had to update the commit sha in the 0.1.8 changelog commit message after rebasing #4255, this should be good to go now. |
wpaulino
approved these changes
Dec 2, 2025
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.
Backport of #4236 and #4250 then cut 0.2 🎉