Skip to content

Remove direct calls to handle_monitor_update_completion! - #3947

Merged
tnull merged 1 commit into
lightningdevkit:mainfrom
TheBlueMatt:2025-07-simplify-mon-completion
Jul 23, 2025
Merged

Remove direct calls to handle_monitor_update_completion!#3947
tnull merged 1 commit into
lightningdevkit:mainfrom
TheBlueMatt:2025-07-simplify-mon-completion

Conversation

@TheBlueMatt

@TheBlueMattTheBlueMatt commented Jul 22, 2025

Copy link
Copy Markdown
Collaborator

handle_monitor_update_completion! (and
handle_monitor_update_completion_actions) are a pretty annoying API as they have several preconditions. Luckily, we already have channel_monitor_update which does the right work, handling both the open- and closed- channel cases and correctly checking the preconditions to handle_monitor_update_completion!, so here we convert calls to handle_monitor_update_completion! (aside from handle_new_monitor_update!) to just calling
channelMonitor_update.

@ldk-reviews-bot

ldk-reviews-bot commented Jul 22, 2025•
edited
Loading

Copy link
Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@TheBlueMattTheBlueMatt mentioned this pull request Jul 22, 2025
Merged
@TheBlueMattTheBlueMatt added this to the 0.2 milestone Jul 22, 2025
@TheBlueMatt

TheBlueMatt commented Jul 22, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Tagging 0.2 cause it technically fixes #3894 (comment)

wpaulino
wpaulino previously approved these changes Jul 22, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
@ldk-reviews-bot

ldk-reviews-bot commented Jul 22, 2025

Copy link
Copy Markdown

👋 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.

@TheBlueMatt
Remove direct calls to handle_monitor_update_completion!
8b9b078
`handle_monitor_update_completion!` (and
`handle_monitor_update_completion_actions`) are a pretty annoying
API as they have several preconditions. Luckily, we already have
`channel_monitor_update` which does the right work, handling both
the open- and closed- channel cases and correctly checking the
preconditions to `handle_monitor_update_completion!`, so here we
convert calls to `handle_monitor_update_completion!` (aside from
`handle_new_monitor_update!`) to just calling
`channelMonitor_update`.
@TheBlueMatt
TheBlueMattforce-pushed the 2025-07-simplify-mon-completion branch from 942cefc to 8b9b078CompareJuly 22, 2025 22:26
@TheBlueMatt

TheBlueMatt commented Jul 22, 2025

Copy link
Copy Markdown
CollaboratorAuthor
$ git diff-tree -U7 -b 942cefcd47 8b9b078586
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 51247c173f..c47eaec623 100644
--- a/lightning/src/ln/channelmanager.rs+++ b/lightning/src/ln/channelmanager.rs@@ -8641,30 +8641,28 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
if let Some(highest_applied_update_id) = highest_applied_update_id {
pending.retain(|upd| upd.update_id > highest_applied_update_id);
log_trace!(
logger,
"ChannelMonitor updated to {highest_applied_update_id}. {} pending in-flight updates.",
pending.len()
);
- } else {- if let Some(update) = pending.get(0) {+ } else if let Some(update) = pending.get(0) {
log_trace!(
logger,
"ChannelMonitor updated to {}. {} pending in-flight updates.",
update.update_id - 1,
pending.len()
);
} else {
log_trace!(
logger,
"ChannelMonitor updated. {} pending in-flight updates.",
pending.len()
);
}
- }
pending.len()
} else { 0 };
if remaining_in_flight != 0 {
return;
}

@codecov

codecovBot commented Jul 22, 2025•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 89.47368% with 2 lines in your changes missing coverage. Please review.

Project coverage is 89.00%. Comparing base (4e4f128) to head (8b9b078).
Report is 10 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channelmanager.rs89.47%2 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3947 +/- ##
==========================================
- Coverage 89.01% 89.00% -0.01% 
==========================================
Files 168 168 Lines 121784 121822 +38 Branches 121784 121822 +38 ==========================================
+ Hits 108411 108433 +22 - Misses 10966 10983 +17 + Partials 2407 2406 -1
FlagCoverage Δ
fuzzing22.72% <52.63%> (+0.03%)⬆️
tests88.83% <89.47%> (-0.01%)⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@tnull
tnull self-requested a review July 23, 2025 07:45
tnull
tnull approved these changes Jul 23, 2025
View reviewed changes

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tnull
tnull merged commit 20e51fe into lightningdevkit:mainJul 23, 2025
28 checks passed
@TheBlueMattTheBlueMatt mentioned this pull request Jun 11, 2026
Merged
@TheBlueMatt

TheBlueMatt commented Jun 11, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Backported to 0.1 in #4680.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

0.2

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@ldk-reviews-bot@tnull@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Remove direct calls to `handle_monitor_update_completion!` by TheBlueMatt · Pull Request #3947 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove direct calls to handle_monitor_update_completion! - #3947
Merged
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Jul 23, 2025
Merged
Remove direct calls to handle_monitor_update_completion!#3947
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

Collaborator
handle_monitor_update_completion! (and
handle_monitor_update_completion_actions) are a pretty annoying API as they have several preconditions. Luckily, we already have channel_monitor_update which does the right work, handling both the open- and closed- channel cases and correctly checking the preconditions to handle_monitor_update_completion!, so here we convert calls to handle_monitor_update_completion! (aside from handle_new_monitor_update!) to just calling
channelMonitor_update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@TheBlueMattTheBlueMatt
added this to the 0.2 milestone
Jul 22, 2025
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Tagging 0.2 cause it technically fixes #3894 (comment)
wpaulino
wpaulino
previously approved these changes
Jul 22, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025

Copy link


Copy Markdown

👋 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.
@TheBlueMatt
Remove direct calls to handle_monitor_update_completion!
8b9b078
`handle_monitor_update_completion!` (and
`handle_monitor_update_completion_actions`) are a pretty annoying
API as they have several preconditions. Luckily, we already have
`channel_monitor_update` which does the right work, handling both
the open- and closed- channel cases and correctly checking the
preconditions to `handle_monitor_update_completion!`, so here we
convert calls to `handle_monitor_update_completion!` (aside from
`handle_new_monitor_update!`) to just calling
`channelMonitor_update`.
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-07-simplify-mon-completion
branch
from
942cefc to
8b9b078CompareJuly 22, 2025 22:26
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
$ git diff-tree -U7 -b 942cefcd47 8b9b078586
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 51247c173f..c47eaec623 100644
--- a/lightning/src/ln/channelmanager.rs+++ b/lightning/src/ln/channelmanager.rs@@ -8641,30 +8641,28 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
if let Some(highest_applied_update_id) = highest_applied_update_id {
pending.retain(|upd| upd.update_id > highest_applied_update_id);
log_trace!(
logger,
"ChannelMonitor updated to {highest_applied_update_id}. {} pending in-flight updates.",
pending.len()
);
- } else {- if let Some(update) = pending.get(0) {+ } else if let Some(update) = pending.get(0) {
log_trace!(
logger,
"ChannelMonitor updated to {}. {} pending in-flight updates.",
update.update_id - 1,
pending.len()
);
} else {
log_trace!(
logger,
"ChannelMonitor updated. {} pending in-flight updates.",
pending.len()
);
}
- }
pending.len()
} else { 0 };
if remaining_in_flight != 0 {
return;
}
@codecov
codecovBot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 89.47368% with 2 lines in your changes missing coverage. Please review.
Project coverage is 89.00%. Comparing base (4e4f128) to head (8b9b078).

Report is 10 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/channelmanager.rs89.47%2 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3947 +/- ##
==========================================
- Coverage 89.01% 89.00% -0.01% 
==========================================
Files 168 168 Lines 121784 121822 +38 Branches 121784 121822 +38 ==========================================
+ Hits 108411 108433 +22 - Misses 10966 10983 +17 + Partials 2407 2406 -1 
FlagCoverage Δ
fuzzing22.72% <52.63%> (+0.03%)⬆️
tests88.83% <89.47%> (-0.01%)⬇️
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
@tnull
tnull
self-requested a review
July 23, 2025 07:45
tnull
tnull
approved these changes
Jul 23, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
merged commit 20e51fe
into
lightningdevkit:mainJul 23, 2025

28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jun 11, 2026
 Merged

@TheBlueMatt
TheBlueMatt
commented
Jun 11, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Backported to 0.1 in #4680.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.2

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@ldk-reviews-bot@tnull@wpaulino

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Remove direct calls to `handle_monitor_update_completion!` by TheBlueMatt · Pull Request #3947 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove direct calls to handle_monitor_update_completion! - #3947
Merged
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Jul 23, 2025
Merged
Remove direct calls to handle_monitor_update_completion!#3947
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

Collaborator
handle_monitor_update_completion! (and
handle_monitor_update_completion_actions) are a pretty annoying API as they have several preconditions. Luckily, we already have channel_monitor_update which does the right work, handling both the open- and closed- channel cases and correctly checking the preconditions to handle_monitor_update_completion!, so here we convert calls to handle_monitor_update_completion! (aside from handle_new_monitor_update!) to just calling
channelMonitor_update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@TheBlueMattTheBlueMatt
added this to the 0.2 milestone
Jul 22, 2025
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Tagging 0.2 cause it technically fixes #3894 (comment)
wpaulino
wpaulino
previously approved these changes
Jul 22, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025

Copy link


Copy Markdown

👋 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.
@TheBlueMatt
Remove direct calls to handle_monitor_update_completion!
8b9b078
`handle_monitor_update_completion!` (and
`handle_monitor_update_completion_actions`) are a pretty annoying
API as they have several preconditions. Luckily, we already have
`channel_monitor_update` which does the right work, handling both
the open- and closed- channel cases and correctly checking the
preconditions to `handle_monitor_update_completion!`, so here we
convert calls to `handle_monitor_update_completion!` (aside from
`handle_new_monitor_update!`) to just calling
`channelMonitor_update`.
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-07-simplify-mon-completion
branch
from
942cefc to
8b9b078CompareJuly 22, 2025 22:26
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
$ git diff-tree -U7 -b 942cefcd47 8b9b078586
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 51247c173f..c47eaec623 100644
--- a/lightning/src/ln/channelmanager.rs+++ b/lightning/src/ln/channelmanager.rs@@ -8641,30 +8641,28 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
if let Some(highest_applied_update_id) = highest_applied_update_id {
pending.retain(|upd| upd.update_id > highest_applied_update_id);
log_trace!(
logger,
"ChannelMonitor updated to {highest_applied_update_id}. {} pending in-flight updates.",
pending.len()
);
- } else {- if let Some(update) = pending.get(0) {+ } else if let Some(update) = pending.get(0) {
log_trace!(
logger,
"ChannelMonitor updated to {}. {} pending in-flight updates.",
update.update_id - 1,
pending.len()
);
} else {
log_trace!(
logger,
"ChannelMonitor updated. {} pending in-flight updates.",
pending.len()
);
}
- }
pending.len()
} else { 0 };
if remaining_in_flight != 0 {
return;
}
@codecov
codecovBot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 89.47368% with 2 lines in your changes missing coverage. Please review.
Project coverage is 89.00%. Comparing base (4e4f128) to head (8b9b078).

Report is 10 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/channelmanager.rs89.47%2 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3947 +/- ##
==========================================
- Coverage 89.01% 89.00% -0.01% 
==========================================
Files 168 168 Lines 121784 121822 +38 Branches 121784 121822 +38 ==========================================
+ Hits 108411 108433 +22 - Misses 10966 10983 +17 + Partials 2407 2406 -1 
FlagCoverage Δ
fuzzing22.72% <52.63%> (+0.03%)⬆️
tests88.83% <89.47%> (-0.01%)⬇️
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
@tnull
tnull
self-requested a review
July 23, 2025 07:45
tnull
tnull
approved these changes
Jul 23, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
merged commit 20e51fe
into
lightningdevkit:mainJul 23, 2025

28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jun 11, 2026
 Merged

@TheBlueMatt
TheBlueMatt
commented
Jun 11, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Backported to 0.1 in #4680.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.2

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@ldk-reviews-bot@tnull@wpaulino

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Remove direct calls to `handle_monitor_update_completion!` by TheBlueMatt · Pull Request #3947 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove direct calls to handle_monitor_update_completion! - #3947
Merged
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Jul 23, 2025
Merged
Remove direct calls to handle_monitor_update_completion!#3947
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

Collaborator
handle_monitor_update_completion! (and
handle_monitor_update_completion_actions) are a pretty annoying API as they have several preconditions. Luckily, we already have channel_monitor_update which does the right work, handling both the open- and closed- channel cases and correctly checking the preconditions to handle_monitor_update_completion!, so here we convert calls to handle_monitor_update_completion! (aside from handle_new_monitor_update!) to just calling
channelMonitor_update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@TheBlueMattTheBlueMatt
added this to the 0.2 milestone
Jul 22, 2025
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Tagging 0.2 cause it technically fixes #3894 (comment)
wpaulino
wpaulino
previously approved these changes
Jul 22, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025

Copy link


Copy Markdown

👋 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.
@TheBlueMatt
Remove direct calls to handle_monitor_update_completion!
8b9b078
`handle_monitor_update_completion!` (and
`handle_monitor_update_completion_actions`) are a pretty annoying
API as they have several preconditions. Luckily, we already have
`channel_monitor_update` which does the right work, handling both
the open- and closed- channel cases and correctly checking the
preconditions to `handle_monitor_update_completion!`, so here we
convert calls to `handle_monitor_update_completion!` (aside from
`handle_new_monitor_update!`) to just calling
`channelMonitor_update`.
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-07-simplify-mon-completion
branch
from
942cefc to
8b9b078CompareJuly 22, 2025 22:26
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
$ git diff-tree -U7 -b 942cefcd47 8b9b078586
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 51247c173f..c47eaec623 100644
--- a/lightning/src/ln/channelmanager.rs+++ b/lightning/src/ln/channelmanager.rs@@ -8641,30 +8641,28 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
if let Some(highest_applied_update_id) = highest_applied_update_id {
pending.retain(|upd| upd.update_id > highest_applied_update_id);
log_trace!(
logger,
"ChannelMonitor updated to {highest_applied_update_id}. {} pending in-flight updates.",
pending.len()
);
- } else {- if let Some(update) = pending.get(0) {+ } else if let Some(update) = pending.get(0) {
log_trace!(
logger,
"ChannelMonitor updated to {}. {} pending in-flight updates.",
update.update_id - 1,
pending.len()
);
} else {
log_trace!(
logger,
"ChannelMonitor updated. {} pending in-flight updates.",
pending.len()
);
}
- }
pending.len()
} else { 0 };
if remaining_in_flight != 0 {
return;
}
@codecov
codecovBot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 89.47368% with 2 lines in your changes missing coverage. Please review.
Project coverage is 89.00%. Comparing base (4e4f128) to head (8b9b078).

Report is 10 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/channelmanager.rs89.47%2 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3947 +/- ##
==========================================
- Coverage 89.01% 89.00% -0.01% 
==========================================
Files 168 168 Lines 121784 121822 +38 Branches 121784 121822 +38 ==========================================
+ Hits 108411 108433 +22 - Misses 10966 10983 +17 + Partials 2407 2406 -1 
FlagCoverage Δ
fuzzing22.72% <52.63%> (+0.03%)⬆️
tests88.83% <89.47%> (-0.01%)⬇️
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
@tnull
tnull
self-requested a review
July 23, 2025 07:45
tnull
tnull
approved these changes
Jul 23, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
merged commit 20e51fe
into
lightningdevkit:mainJul 23, 2025

28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jun 11, 2026
 Merged

@TheBlueMatt
TheBlueMatt
commented
Jun 11, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Backported to 0.1 in #4680.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.2

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@ldk-reviews-bot@tnull@wpaulino

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Remove direct calls to `handle_monitor_update_completion!` by TheBlueMatt · Pull Request #3947 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove direct calls to handle_monitor_update_completion! - #3947
Merged
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Jul 23, 2025
Merged
Remove direct calls to handle_monitor_update_completion!#3947
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

Collaborator
handle_monitor_update_completion! (and
handle_monitor_update_completion_actions) are a pretty annoying API as they have several preconditions. Luckily, we already have channel_monitor_update which does the right work, handling both the open- and closed- channel cases and correctly checking the preconditions to handle_monitor_update_completion!, so here we convert calls to handle_monitor_update_completion! (aside from handle_new_monitor_update!) to just calling
channelMonitor_update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@TheBlueMattTheBlueMatt
added this to the 0.2 milestone
Jul 22, 2025
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Tagging 0.2 cause it technically fixes #3894 (comment)
wpaulino
wpaulino
previously approved these changes
Jul 22, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025

Copy link


Copy Markdown

👋 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.
@TheBlueMatt
Remove direct calls to handle_monitor_update_completion!
8b9b078
`handle_monitor_update_completion!` (and
`handle_monitor_update_completion_actions`) are a pretty annoying
API as they have several preconditions. Luckily, we already have
`channel_monitor_update` which does the right work, handling both
the open- and closed- channel cases and correctly checking the
preconditions to `handle_monitor_update_completion!`, so here we
convert calls to `handle_monitor_update_completion!` (aside from
`handle_new_monitor_update!`) to just calling
`channelMonitor_update`.
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-07-simplify-mon-completion
branch
from
942cefc to
8b9b078CompareJuly 22, 2025 22:26
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
$ git diff-tree -U7 -b 942cefcd47 8b9b078586
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 51247c173f..c47eaec623 100644
--- a/lightning/src/ln/channelmanager.rs+++ b/lightning/src/ln/channelmanager.rs@@ -8641,30 +8641,28 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
if let Some(highest_applied_update_id) = highest_applied_update_id {
pending.retain(|upd| upd.update_id > highest_applied_update_id);
log_trace!(
logger,
"ChannelMonitor updated to {highest_applied_update_id}. {} pending in-flight updates.",
pending.len()
);
- } else {- if let Some(update) = pending.get(0) {+ } else if let Some(update) = pending.get(0) {
log_trace!(
logger,
"ChannelMonitor updated to {}. {} pending in-flight updates.",
update.update_id - 1,
pending.len()
);
} else {
log_trace!(
logger,
"ChannelMonitor updated. {} pending in-flight updates.",
pending.len()
);
}
- }
pending.len()
} else { 0 };
if remaining_in_flight != 0 {
return;
}
@codecov
codecovBot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 89.47368% with 2 lines in your changes missing coverage. Please review.
Project coverage is 89.00%. Comparing base (4e4f128) to head (8b9b078).

Report is 10 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/channelmanager.rs89.47%2 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3947 +/- ##
==========================================
- Coverage 89.01% 89.00% -0.01% 
==========================================
Files 168 168 Lines 121784 121822 +38 Branches 121784 121822 +38 ==========================================
+ Hits 108411 108433 +22 - Misses 10966 10983 +17 + Partials 2407 2406 -1 
FlagCoverage Δ
fuzzing22.72% <52.63%> (+0.03%)⬆️
tests88.83% <89.47%> (-0.01%)⬇️
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
@tnull
tnull
self-requested a review
July 23, 2025 07:45
tnull
tnull
approved these changes
Jul 23, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
merged commit 20e51fe
into
lightningdevkit:mainJul 23, 2025

28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jun 11, 2026
 Merged

@TheBlueMatt
TheBlueMatt
commented
Jun 11, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Backported to 0.1 in #4680.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.2

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@ldk-reviews-bot@tnull@wpaulino

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Remove direct calls to `handle_monitor_update_completion!` by TheBlueMatt · Pull Request #3947 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove direct calls to handle_monitor_update_completion! - #3947
Merged
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Jul 23, 2025
Merged
Remove direct calls to handle_monitor_update_completion!#3947
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

Collaborator
handle_monitor_update_completion! (and
handle_monitor_update_completion_actions) are a pretty annoying API as they have several preconditions. Luckily, we already have channel_monitor_update which does the right work, handling both the open- and closed- channel cases and correctly checking the preconditions to handle_monitor_update_completion!, so here we convert calls to handle_monitor_update_completion! (aside from handle_new_monitor_update!) to just calling
channelMonitor_update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@TheBlueMattTheBlueMatt
added this to the 0.2 milestone
Jul 22, 2025
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Tagging 0.2 cause it technically fixes #3894 (comment)
wpaulino
wpaulino
previously approved these changes
Jul 22, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025

Copy link


Copy Markdown

👋 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.
@TheBlueMatt
Remove direct calls to handle_monitor_update_completion!
8b9b078
`handle_monitor_update_completion!` (and
`handle_monitor_update_completion_actions`) are a pretty annoying
API as they have several preconditions. Luckily, we already have
`channel_monitor_update` which does the right work, handling both
the open- and closed- channel cases and correctly checking the
preconditions to `handle_monitor_update_completion!`, so here we
convert calls to `handle_monitor_update_completion!` (aside from
`handle_new_monitor_update!`) to just calling
`channelMonitor_update`.
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-07-simplify-mon-completion
branch
from
942cefc to
8b9b078CompareJuly 22, 2025 22:26
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
$ git diff-tree -U7 -b 942cefcd47 8b9b078586
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 51247c173f..c47eaec623 100644
--- a/lightning/src/ln/channelmanager.rs+++ b/lightning/src/ln/channelmanager.rs@@ -8641,30 +8641,28 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
if let Some(highest_applied_update_id) = highest_applied_update_id {
pending.retain(|upd| upd.update_id > highest_applied_update_id);
log_trace!(
logger,
"ChannelMonitor updated to {highest_applied_update_id}. {} pending in-flight updates.",
pending.len()
);
- } else {- if let Some(update) = pending.get(0) {+ } else if let Some(update) = pending.get(0) {
log_trace!(
logger,
"ChannelMonitor updated to {}. {} pending in-flight updates.",
update.update_id - 1,
pending.len()
);
} else {
log_trace!(
logger,
"ChannelMonitor updated. {} pending in-flight updates.",
pending.len()
);
}
- }
pending.len()
} else { 0 };
if remaining_in_flight != 0 {
return;
}
@codecov
codecovBot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 89.47368% with 2 lines in your changes missing coverage. Please review.
Project coverage is 89.00%. Comparing base (4e4f128) to head (8b9b078).

Report is 10 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/channelmanager.rs89.47%2 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3947 +/- ##
==========================================
- Coverage 89.01% 89.00% -0.01% 
==========================================
Files 168 168 Lines 121784 121822 +38 Branches 121784 121822 +38 ==========================================
+ Hits 108411 108433 +22 - Misses 10966 10983 +17 + Partials 2407 2406 -1 
FlagCoverage Δ
fuzzing22.72% <52.63%> (+0.03%)⬆️
tests88.83% <89.47%> (-0.01%)⬇️
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
@tnull
tnull
self-requested a review
July 23, 2025 07:45
tnull
tnull
approved these changes
Jul 23, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
merged commit 20e51fe
into
lightningdevkit:mainJul 23, 2025

28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jun 11, 2026
 Merged

@TheBlueMatt
TheBlueMatt
commented
Jun 11, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Backported to 0.1 in #4680.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.2

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@ldk-reviews-bot@tnull@wpaulino

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Remove direct calls to `handle_monitor_update_completion!` by TheBlueMatt · Pull Request #3947 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove direct calls to handle_monitor_update_completion! - #3947
Merged
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Jul 23, 2025
Merged
Remove direct calls to handle_monitor_update_completion!#3947
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

Collaborator
handle_monitor_update_completion! (and
handle_monitor_update_completion_actions) are a pretty annoying API as they have several preconditions. Luckily, we already have channel_monitor_update which does the right work, handling both the open- and closed- channel cases and correctly checking the preconditions to handle_monitor_update_completion!, so here we convert calls to handle_monitor_update_completion! (aside from handle_new_monitor_update!) to just calling
channelMonitor_update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@TheBlueMattTheBlueMatt
added this to the 0.2 milestone
Jul 22, 2025
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Tagging 0.2 cause it technically fixes #3894 (comment)
wpaulino
wpaulino
previously approved these changes
Jul 22, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025

Copy link


Copy Markdown

👋 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.
@TheBlueMatt
Remove direct calls to handle_monitor_update_completion!
8b9b078
`handle_monitor_update_completion!` (and
`handle_monitor_update_completion_actions`) are a pretty annoying
API as they have several preconditions. Luckily, we already have
`channel_monitor_update` which does the right work, handling both
the open- and closed- channel cases and correctly checking the
preconditions to `handle_monitor_update_completion!`, so here we
convert calls to `handle_monitor_update_completion!` (aside from
`handle_new_monitor_update!`) to just calling
`channelMonitor_update`.
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-07-simplify-mon-completion
branch
from
942cefc to
8b9b078CompareJuly 22, 2025 22:26
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
$ git diff-tree -U7 -b 942cefcd47 8b9b078586
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 51247c173f..c47eaec623 100644
--- a/lightning/src/ln/channelmanager.rs+++ b/lightning/src/ln/channelmanager.rs@@ -8641,30 +8641,28 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
if let Some(highest_applied_update_id) = highest_applied_update_id {
pending.retain(|upd| upd.update_id > highest_applied_update_id);
log_trace!(
logger,
"ChannelMonitor updated to {highest_applied_update_id}. {} pending in-flight updates.",
pending.len()
);
- } else {- if let Some(update) = pending.get(0) {+ } else if let Some(update) = pending.get(0) {
log_trace!(
logger,
"ChannelMonitor updated to {}. {} pending in-flight updates.",
update.update_id - 1,
pending.len()
);
} else {
log_trace!(
logger,
"ChannelMonitor updated. {} pending in-flight updates.",
pending.len()
);
}
- }
pending.len()
} else { 0 };
if remaining_in_flight != 0 {
return;
}
@codecov
codecovBot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 89.47368% with 2 lines in your changes missing coverage. Please review.
Project coverage is 89.00%. Comparing base (4e4f128) to head (8b9b078).

Report is 10 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/channelmanager.rs89.47%2 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3947 +/- ##
==========================================
- Coverage 89.01% 89.00% -0.01% 
==========================================
Files 168 168 Lines 121784 121822 +38 Branches 121784 121822 +38 ==========================================
+ Hits 108411 108433 +22 - Misses 10966 10983 +17 + Partials 2407 2406 -1 
FlagCoverage Δ
fuzzing22.72% <52.63%> (+0.03%)⬆️
tests88.83% <89.47%> (-0.01%)⬇️
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
@tnull
tnull
self-requested a review
July 23, 2025 07:45
tnull
tnull
approved these changes
Jul 23, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
merged commit 20e51fe
into
lightningdevkit:mainJul 23, 2025

28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jun 11, 2026
 Merged

@TheBlueMatt
TheBlueMatt
commented
Jun 11, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Backported to 0.1 in #4680.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.2

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@ldk-reviews-bot@tnull@wpaulino

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Remove direct calls to `handle_monitor_update_completion!` by TheBlueMatt · Pull Request #3947 · lightningdevkit/rust-lightning · GitHub
Skip to content
Remove direct calls to handle_monitor_update_completion! - #3947
Merged
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Jul 23, 2025
Merged
Remove direct calls to handle_monitor_update_completion!#3947
tnull merged 1 commit into
lightningdevkit:mainfrom 
TheBlueMatt:2025-07-simplify-mon-completion
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

Collaborator
handle_monitor_update_completion! (and
handle_monitor_update_completion_actions) are a pretty annoying API as they have several preconditions. Luckily, we already have channel_monitor_update which does the right work, handling both the open- and closed- channel cases and correctly checking the preconditions to handle_monitor_update_completion!, so here we convert calls to handle_monitor_update_completion! (aside from handle_new_monitor_update!) to just calling
channelMonitor_update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@TheBlueMattTheBlueMatt
added this to the 0.2 milestone
Jul 22, 2025
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Tagging 0.2 cause it technically fixes #3894 (comment)
wpaulino
wpaulino
previously approved these changes
Jul 22, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 22, 2025

Copy link


Copy Markdown

👋 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.
@TheBlueMatt
Remove direct calls to handle_monitor_update_completion!
8b9b078
`handle_monitor_update_completion!` (and
`handle_monitor_update_completion_actions`) are a pretty annoying
API as they have several preconditions. Luckily, we already have
`channel_monitor_update` which does the right work, handling both
the open- and closed- channel cases and correctly checking the
preconditions to `handle_monitor_update_completion!`, so here we
convert calls to `handle_monitor_update_completion!` (aside from
`handle_new_monitor_update!`) to just calling
`channelMonitor_update`.
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-07-simplify-mon-completion
branch
from
942cefc to
8b9b078CompareJuly 22, 2025 22:26
@TheBlueMatt
TheBlueMatt
commented
Jul 22, 2025

Copy link


Copy Markdown

CollaboratorAuthor
$ git diff-tree -U7 -b 942cefcd47 8b9b078586
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 51247c173f..c47eaec623 100644
--- a/lightning/src/ln/channelmanager.rs+++ b/lightning/src/ln/channelmanager.rs@@ -8641,30 +8641,28 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
if let Some(highest_applied_update_id) = highest_applied_update_id {
pending.retain(|upd| upd.update_id > highest_applied_update_id);
log_trace!(
logger,
"ChannelMonitor updated to {highest_applied_update_id}. {} pending in-flight updates.",
pending.len()
);
- } else {- if let Some(update) = pending.get(0) {+ } else if let Some(update) = pending.get(0) {
log_trace!(
logger,
"ChannelMonitor updated to {}. {} pending in-flight updates.",
update.update_id - 1,
pending.len()
);
} else {
log_trace!(
logger,
"ChannelMonitor updated. {} pending in-flight updates.",
pending.len()
);
}
- }
pending.len()
} else { 0 };
if remaining_in_flight != 0 {
return;
}
@codecov
codecovBot
commented
Jul 22, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 89.47368% with 2 lines in your changes missing coverage. Please review.
Project coverage is 89.00%. Comparing base (4e4f128) to head (8b9b078).

Report is 10 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/channelmanager.rs89.47%2 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3947 +/- ##
==========================================
- Coverage 89.01% 89.00% -0.01% 
==========================================
Files 168 168 Lines 121784 121822 +38 Branches 121784 121822 +38 ==========================================
+ Hits 108411 108433 +22 - Misses 10966 10983 +17 + Partials 2407 2406 -1 
FlagCoverage Δ
fuzzing22.72% <52.63%> (+0.03%)⬆️
tests88.83% <89.47%> (-0.01%)⬇️
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
@tnull
tnull
self-requested a review
July 23, 2025 07:45
tnull
tnull
approved these changes
Jul 23, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
merged commit 20e51fe
into
lightningdevkit:mainJul 23, 2025

28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jun 11, 2026
 Merged

@TheBlueMatt
TheBlueMatt
commented
Jun 11, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Backported to 0.1 in #4680.
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone

0.2

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@ldk-reviews-bot@tnull@wpaulino