Only mark all mon updates complete if there are no blocked updates #3907
+78
−17
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
|
I've assigned @wpaulino as a reviewer! |
TheBlueMatt
force-pushed
the
2025-06-no-mon-compl-with-blocked-updates
branch
2 times, most recently
from
6bfe0bd to
49ad15c
Compare
![graphite-app[bot]](https://avatars.githubusercontent.com/in/158384?s=60&v=4){kind=small}
lightning/src/ln/quiescence_tests.rs
Outdated
Comment on lines
264
to
267
| let (_, latest_update) = | ||
| chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id).unwrap().clone(); |
There was a problem hiding this comment.
There appears to be a syntax error in this line - the object reference before .chain_monitor is missing. The correct statement should be:
let (_, latest_update) = nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id).unwrap().clone();This ensures proper access to the chain monitor from the nodes[0] object.
Suggested change
| let (_, latest_update) = | |
| chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id).unwrap().clone(); | |
| let (_, latest_update) = | |
| nodes[0].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id).unwrap().clone(); |
Spotted by Diamond
Is this helpful? React 👍 or 👎 to let us know.
TheBlueMatt
force-pushed
the
2025-06-no-mon-compl-with-blocked-updates
branch
2 times, most recently
from
7759b4d to
95c0696
Compare
In `handle_new_monitor_update!`, we correctly check that the channel doesn't have any blocked monitor updates pending before calling `handle_monitor_update_completion!` (which calls `Channel::monitor_updating_restored`, which in turn assumes that all generated `ChannelMonitorUpdate`s, including blocked ones, have completed). We, however, did not do the same check at several other places where we called `handle_monitor_update_completion!`. Specifically, after a monitor update completes during reload (processed via a `BackgroundEvent` or when monitor update completes async, we didn't check if there were any blocked monitor updates before completing). Here we add the missing check, as well as an assertion in `Channel::monitor_updating_restored`.
| let chain_monitor = &nodes[0].chain_monitor; | ||
| let (_, new_latest_update) = | ||
| chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id).unwrap().clone(); | ||
| assert_eq!(new_latest_update, latest_update + 1); |
There was a problem hiding this comment.
There appears to be a typo in the variable name: lastest_update should be latest_update to match the variable defined earlier in the code.
Suggested change
| assert_eq!(new_latest_update, latest_update + 1); | |
| assert_eq!(new_latest_update, latest_update + 1); |
Spotted by Diamond
Is this helpful? React 👍 or 👎 to let us know.
TheBlueMatt
force-pushed
the
2025-06-no-mon-compl-with-blocked-updates
branch
from
95c0696 to
ab0dda7
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3907 +/- ##
==========================================
- Coverage 88.82% 88.80% -0.02%
==========================================
Files 165 165
Lines 119075 119123 +48
Branches 119075 119123 +48
==========================================
+ Hits 105769 105790 +21
- Misses 10986 11003 +17
- Partials 2320 2330 +10 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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.
In
handle_new_monitor_update!, we correctly check that the channel doesn't have any blocked monitor updates pending before callinghandle_monitor_update_completion!(which callsChannel::monitor_updating_restored, which in turn assumes that all generatedChannelMonitorUpdates, including blocked ones, have completed).We, however, did not do the same check at several other places where we called
handle_monitor_update_completion!. Specifically, after a monitor update completes during reload (processed via aBackgroundEventor when monitor update completes async, we didn't check if there were any blocked monitor updates before completing).Here we add the missing check, as well as an assertion in
Channel::monitor_updating_restored.