Skip to content

Remove direct calls to handle_monitor_update_completion!#3947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 1 commit into from
Jul 23, 2025
Merged

Remove direct calls to handle_monitor_update_completion!#3947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 41 additions & 71 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3339,8 +3339,22 @@ macro_rules! emit_initial_channel_ready_event {
};
}

/// Handles the completion steps for when a [`ChannelMonitorUpdate`] is applied to a live channel.
///
/// You should not add new direct calls to this, generally, rather rely on
/// `handle_new_monitor_update` or [`ChannelManager::channel_monitor_updated`] to call it for you.
///
/// Requires that `$chan.blocked_monitor_updates_pending() == 0` and the in-flight monitor update
/// set for this channel is empty!
macro_rules! handle_monitor_update_completion {
($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
#[cfg(debug_assertions)]
{
let in_flight_updates =
$peer_state.in_flight_monitor_updates.get(&$chan.context.channel_id());
assert!(in_flight_updates.map(|(_, updates)| updates.is_empty()).unwrap_or(true));
assert_eq!($chan.blocked_monitor_updates_pending(), 0);
}
let logger = WithChannelContext::from(&$self.logger, &$chan.context, None);
let mut updates = $chan.monitor_updating_restored(&&logger,
&$self.node_signer, $self.chain_hash, &$self.default_configuration,
Expand DownExpand Up@@ -4258,19 +4272,7 @@ where
// TODO: If we do the `in_flight_monitor_updates.is_empty()` check in
// `locked_close_channel` we can skip the locks here.
if shutdown_res.channel_funding_txo.is_some() {
let per_peer_state = self.per_peer_state.read().unwrap();
if let Some(peer_state_mtx) = per_peer_state.get(&shutdown_res.counterparty_node_id) {
let mut peer_state = peer_state_mtx.lock().unwrap();
if peer_state.in_flight_monitor_updates.get(&shutdown_res.channel_id).map(|(_, updates)| updates.is_empty()).unwrap_or(true) {
let update_actions = peer_state.monitor_update_blocked_actions
.remove(&shutdown_res.channel_id).unwrap_or(Vec::new());

mem::drop(peer_state);
mem::drop(per_peer_state);

self.handle_monitor_update_completion_actions(update_actions);
}
}
self.channel_monitor_updated(&shutdown_res.channel_id, None, &shutdown_res.counterparty_node_id);
Comment thread
wpaulino marked this conversation as resolved.
}
}
let mut shutdown_results: Vec<(Result<Infallible, _>, _)> = Vec::new();
Expand DownExpand Up@@ -7147,25 +7149,7 @@ where
self.apply_post_close_monitor_update(counterparty_node_id, channel_id, funding_txo, update);
},
BackgroundEvent::MonitorUpdatesComplete { counterparty_node_id, channel_id } => {
let per_peer_state = self.per_peer_state.read().unwrap();
if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
let peer_state = &mut *peer_state_lock;
if let Some(chan) = peer_state.channel_by_id
.get_mut(&channel_id)
.and_then(Channel::as_funded_mut)
{
if chan.blocked_monitor_updates_pending() == 0 {
handle_monitor_update_completion!(self, peer_state_lock, peer_state, per_peer_state, chan);
}
} else {
let update_actions = peer_state.monitor_update_blocked_actions
.remove(&channel_id).unwrap_or(Vec::new());
mem::drop(peer_state_lock);
mem::drop(per_peer_state);
self.handle_monitor_update_completion_actions(update_actions);
}
}
self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
},
}
}
Expand DownExpand Up@@ -8641,7 +8625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
}

#[rustfmt::skip]
fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: u64, counterparty_node_id: &PublicKey) {
fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: Option<u64>, counterparty_node_id: &PublicKey) {
debug_assert!(self.total_consistency_lock.try_write().is_err()); // Caller holds read lock

let per_peer_state = self.per_peer_state.read().unwrap();
Expand All@@ -8651,16 +8635,33 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
let peer_state = &mut *peer_state_lock;

let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
let remaining_in_flight =
if let Some((_, pending)) = peer_state.in_flight_monitor_updates.get_mut(channel_id) {
pending.retain(|upd| upd.update_id > highest_applied_update_id);
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) {
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 };

let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
log_trace!(logger, "ChannelMonitor updated to {}. {} pending in-flight updates.",
highest_applied_update_id, remaining_in_flight);

if remaining_in_flight != 0 {
return;
}
Expand DownExpand Up@@ -10891,7 +10892,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
MonitorEvent::Completed { channel_id, monitor_update_id, .. } => {
self.channel_monitor_updated(
&channel_id,
monitor_update_id,
Some(monitor_update_id),
&counterparty_node_id,
);
},
Expand DownExpand Up@@ -13127,38 +13128,7 @@ where

#[cfg(splicing)]
for (counterparty_node_id, channel_id) in to_process_monitor_update_actions {
let per_peer_state = self.per_peer_state.read().unwrap();
if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
let peer_state = &mut *peer_state_lock;
let has_in_flight_updates = peer_state
.in_flight_monitor_updates
.get(&channel_id)
.map(|in_flight_updates| !in_flight_updates.1.is_empty())
.unwrap_or(false);
if let Some(chan) = peer_state.channel_by_id
.get_mut(&channel_id)
.and_then(Channel::as_funded_mut)
{
if !has_in_flight_updates && chan.blocked_monitor_updates_pending() == 0 {
handle_monitor_update_completion!(
self,
peer_state_lock,
peer_state,
per_peer_state,
chan
);
}
} else {
let update_actions = peer_state
.monitor_update_blocked_actions
.remove(&channel_id)
.unwrap_or(Vec::new());
mem::drop(peer_state_lock);
mem::drop(per_peer_state);
self.handle_monitor_update_completion_actions(update_actions);
}
}
self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
}

if let Some(height) = height_opt {
Expand Down
Loading
, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Jul 23, 2025
 Merged


Remove direct calls to handle_monitor_update_completion!#3947
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


112 changes: 41 additions & 71 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3339,8 +3339,22 @@ macro_rules! emit_initial_channel_ready_event {
	};
}

/// Handles the completion steps for when a [`ChannelMonitorUpdate`] is applied to a live channel.
///
/// You should not add new direct calls to this, generally, rather rely on
/// `handle_new_monitor_update` or [`ChannelManager::channel_monitor_updated`] to call it for you.
///
/// Requires that `$chan.blocked_monitor_updates_pending() == 0` and the in-flight monitor update
/// set for this channel is empty!
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 #[cfg(debug_assertions)]
 {
 let in_flight_updates =
 $peer_state.in_flight_monitor_updates.get(&$chan.context.channel_id());
 assert!(in_flight_updates.map(|(_, updates)| updates.is_empty()).unwrap_or(true));
 assert_eq!($chan.blocked_monitor_updates_pending(), 0);
 }
 let logger = WithChannelContext::from(&$self.logger, &$chan.context, None);
 let mut updates = $chan.monitor_updating_restored(&&logger,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
Expand DownExpand Up@@ -4258,19 +4272,7 @@ where
 // TODO: If we do the `in_flight_monitor_updates.is_empty()` check in
 // `locked_close_channel` we can skip the locks here.
 if shutdown_res.channel_funding_txo.is_some() {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mtx) = per_peer_state.get(&shutdown_res.counterparty_node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
 if peer_state.in_flight_monitor_updates.get(&shutdown_res.channel_id).map(|(_, updates)| updates.is_empty()).unwrap_or(true) {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&shutdown_res.channel_id).unwrap_or(Vec::new());

 mem::drop(peer_state);
 mem::drop(per_peer_state);

 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&shutdown_res.channel_id, None, &shutdown_res.counterparty_node_id);
Comment thread
wpaulino marked this conversation as resolved.

 }
 }
 let mut shutdown_results: Vec<(Result<Infallible, _>, _)> = Vec::new();
Expand DownExpand Up@@ -7147,25 +7149,7 @@ where
 self.apply_post_close_monitor_update(counterparty_node_id, channel_id, funding_txo, update);
 },
 BackgroundEvent::MonitorUpdatesComplete { counterparty_node_id, channel_id } => {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(self, peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&channel_id).unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 },
 }
 }
Expand DownExpand Up@@ -8641,7 +8625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
	}

	#[rustfmt::skip]
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: u64, counterparty_node_id: &PublicKey) {
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: Option<u64>, counterparty_node_id: &PublicKey) {
 debug_assert!(self.total_consistency_lock.try_write().is_err()); // Caller holds read lock

 let per_peer_state = self.per_peer_state.read().unwrap();
Expand All@@ -8651,16 +8635,33 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 let remaining_in_flight =
 if let Some((_, pending)) = peer_state.in_flight_monitor_updates.get_mut(channel_id) {
 pending.retain(|upd| upd.update_id > highest_applied_update_id);
 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) {
 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 };

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 log_trace!(logger, "ChannelMonitor updated to {}. {} pending in-flight updates.",
 highest_applied_update_id, remaining_in_flight);

 if remaining_in_flight != 0 {
 return;
 }
Expand DownExpand Up@@ -10891,7 +10892,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 MonitorEvent::Completed { channel_id, monitor_update_id, .. } => {
 self.channel_monitor_updated(
 &channel_id,
 monitor_update_id,
Some(monitor_update_id),
 &counterparty_node_id,
 );
 },
Expand DownExpand Up@@ -13127,38 +13128,7 @@ where

 #[cfg(splicing)]
 for (counterparty_node_id, channel_id) in to_process_monitor_update_actions {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let has_in_flight_updates = peer_state
 .in_flight_monitor_updates
 .get(&channel_id)
 .map(|in_flight_updates| !in_flight_updates.1.is_empty())
 .unwrap_or(false);
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if !has_in_flight_updates && chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(
 self,
 peer_state_lock,
 peer_state,
 per_peer_state,
 chan
 );
 }
 } else {
 let update_actions = peer_state
 .monitor_update_blocked_actions
 .remove(&channel_id)
 .unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 }

 if let Some(height) = height_opt {
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Jul 23, 2025
 Merged


Remove direct calls to handle_monitor_update_completion!#3947
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


112 changes: 41 additions & 71 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3339,8 +3339,22 @@ macro_rules! emit_initial_channel_ready_event {
	};
}

/// Handles the completion steps for when a [`ChannelMonitorUpdate`] is applied to a live channel.
///
/// You should not add new direct calls to this, generally, rather rely on
/// `handle_new_monitor_update` or [`ChannelManager::channel_monitor_updated`] to call it for you.
///
/// Requires that `$chan.blocked_monitor_updates_pending() == 0` and the in-flight monitor update
/// set for this channel is empty!
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 #[cfg(debug_assertions)]
 {
 let in_flight_updates =
 $peer_state.in_flight_monitor_updates.get(&$chan.context.channel_id());
 assert!(in_flight_updates.map(|(_, updates)| updates.is_empty()).unwrap_or(true));
 assert_eq!($chan.blocked_monitor_updates_pending(), 0);
 }
 let logger = WithChannelContext::from(&$self.logger, &$chan.context, None);
 let mut updates = $chan.monitor_updating_restored(&&logger,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
Expand DownExpand Up@@ -4258,19 +4272,7 @@ where
 // TODO: If we do the `in_flight_monitor_updates.is_empty()` check in
 // `locked_close_channel` we can skip the locks here.
 if shutdown_res.channel_funding_txo.is_some() {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mtx) = per_peer_state.get(&shutdown_res.counterparty_node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
 if peer_state.in_flight_monitor_updates.get(&shutdown_res.channel_id).map(|(_, updates)| updates.is_empty()).unwrap_or(true) {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&shutdown_res.channel_id).unwrap_or(Vec::new());

 mem::drop(peer_state);
 mem::drop(per_peer_state);

 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&shutdown_res.channel_id, None, &shutdown_res.counterparty_node_id);
Comment thread
wpaulino marked this conversation as resolved.

 }
 }
 let mut shutdown_results: Vec<(Result<Infallible, _>, _)> = Vec::new();
Expand DownExpand Up@@ -7147,25 +7149,7 @@ where
 self.apply_post_close_monitor_update(counterparty_node_id, channel_id, funding_txo, update);
 },
 BackgroundEvent::MonitorUpdatesComplete { counterparty_node_id, channel_id } => {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(self, peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&channel_id).unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 },
 }
 }
Expand DownExpand Up@@ -8641,7 +8625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
	}

	#[rustfmt::skip]
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: u64, counterparty_node_id: &PublicKey) {
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: Option<u64>, counterparty_node_id: &PublicKey) {
 debug_assert!(self.total_consistency_lock.try_write().is_err()); // Caller holds read lock

 let per_peer_state = self.per_peer_state.read().unwrap();
Expand All@@ -8651,16 +8635,33 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 let remaining_in_flight =
 if let Some((_, pending)) = peer_state.in_flight_monitor_updates.get_mut(channel_id) {
 pending.retain(|upd| upd.update_id > highest_applied_update_id);
 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) {
 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 };

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 log_trace!(logger, "ChannelMonitor updated to {}. {} pending in-flight updates.",
 highest_applied_update_id, remaining_in_flight);

 if remaining_in_flight != 0 {
 return;
 }
Expand DownExpand Up@@ -10891,7 +10892,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 MonitorEvent::Completed { channel_id, monitor_update_id, .. } => {
 self.channel_monitor_updated(
 &channel_id,
 monitor_update_id,
Some(monitor_update_id),
 &counterparty_node_id,
 );
 },
Expand DownExpand Up@@ -13127,38 +13128,7 @@ where

 #[cfg(splicing)]
 for (counterparty_node_id, channel_id) in to_process_monitor_update_actions {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let has_in_flight_updates = peer_state
 .in_flight_monitor_updates
 .get(&channel_id)
 .map(|in_flight_updates| !in_flight_updates.1.is_empty())
 .unwrap_or(false);
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if !has_in_flight_updates && chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(
 self,
 peer_state_lock,
 peer_state,
 per_peer_state,
 chan
 );
 }
 } else {
 let update_actions = peer_state
 .monitor_update_blocked_actions
 .remove(&channel_id)
 .unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 }

 if let Some(height) = height_opt {
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Jul 23, 2025
 Merged


Remove direct calls to handle_monitor_update_completion!#3947
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


112 changes: 41 additions & 71 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3339,8 +3339,22 @@ macro_rules! emit_initial_channel_ready_event {
	};
}

/// Handles the completion steps for when a [`ChannelMonitorUpdate`] is applied to a live channel.
///
/// You should not add new direct calls to this, generally, rather rely on
/// `handle_new_monitor_update` or [`ChannelManager::channel_monitor_updated`] to call it for you.
///
/// Requires that `$chan.blocked_monitor_updates_pending() == 0` and the in-flight monitor update
/// set for this channel is empty!
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 #[cfg(debug_assertions)]
 {
 let in_flight_updates =
 $peer_state.in_flight_monitor_updates.get(&$chan.context.channel_id());
 assert!(in_flight_updates.map(|(_, updates)| updates.is_empty()).unwrap_or(true));
 assert_eq!($chan.blocked_monitor_updates_pending(), 0);
 }
 let logger = WithChannelContext::from(&$self.logger, &$chan.context, None);
 let mut updates = $chan.monitor_updating_restored(&&logger,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
Expand DownExpand Up@@ -4258,19 +4272,7 @@ where
 // TODO: If we do the `in_flight_monitor_updates.is_empty()` check in
 // `locked_close_channel` we can skip the locks here.
 if shutdown_res.channel_funding_txo.is_some() {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mtx) = per_peer_state.get(&shutdown_res.counterparty_node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
 if peer_state.in_flight_monitor_updates.get(&shutdown_res.channel_id).map(|(_, updates)| updates.is_empty()).unwrap_or(true) {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&shutdown_res.channel_id).unwrap_or(Vec::new());

 mem::drop(peer_state);
 mem::drop(per_peer_state);

 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&shutdown_res.channel_id, None, &shutdown_res.counterparty_node_id);
Comment thread
wpaulino marked this conversation as resolved.

 }
 }
 let mut shutdown_results: Vec<(Result<Infallible, _>, _)> = Vec::new();
Expand DownExpand Up@@ -7147,25 +7149,7 @@ where
 self.apply_post_close_monitor_update(counterparty_node_id, channel_id, funding_txo, update);
 },
 BackgroundEvent::MonitorUpdatesComplete { counterparty_node_id, channel_id } => {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(self, peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&channel_id).unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 },
 }
 }
Expand DownExpand Up@@ -8641,7 +8625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
	}

	#[rustfmt::skip]
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: u64, counterparty_node_id: &PublicKey) {
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: Option<u64>, counterparty_node_id: &PublicKey) {
 debug_assert!(self.total_consistency_lock.try_write().is_err()); // Caller holds read lock

 let per_peer_state = self.per_peer_state.read().unwrap();
Expand All@@ -8651,16 +8635,33 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 let remaining_in_flight =
 if let Some((_, pending)) = peer_state.in_flight_monitor_updates.get_mut(channel_id) {
 pending.retain(|upd| upd.update_id > highest_applied_update_id);
 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) {
 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 };

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 log_trace!(logger, "ChannelMonitor updated to {}. {} pending in-flight updates.",
 highest_applied_update_id, remaining_in_flight);

 if remaining_in_flight != 0 {
 return;
 }
Expand DownExpand Up@@ -10891,7 +10892,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 MonitorEvent::Completed { channel_id, monitor_update_id, .. } => {
 self.channel_monitor_updated(
 &channel_id,
 monitor_update_id,
Some(monitor_update_id),
 &counterparty_node_id,
 );
 },
Expand DownExpand Up@@ -13127,38 +13128,7 @@ where

 #[cfg(splicing)]
 for (counterparty_node_id, channel_id) in to_process_monitor_update_actions {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let has_in_flight_updates = peer_state
 .in_flight_monitor_updates
 .get(&channel_id)
 .map(|in_flight_updates| !in_flight_updates.1.is_empty())
 .unwrap_or(false);
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if !has_in_flight_updates && chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(
 self,
 peer_state_lock,
 peer_state,
 per_peer_state,
 chan
 );
 }
 } else {
 let update_actions = peer_state
 .monitor_update_blocked_actions
 .remove(&channel_id)
 .unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 }

 if let Some(height) = height_opt {
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Jul 23, 2025
 Merged


Remove direct calls to handle_monitor_update_completion!#3947
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


112 changes: 41 additions & 71 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3339,8 +3339,22 @@ macro_rules! emit_initial_channel_ready_event {
	};
}

/// Handles the completion steps for when a [`ChannelMonitorUpdate`] is applied to a live channel.
///
/// You should not add new direct calls to this, generally, rather rely on
/// `handle_new_monitor_update` or [`ChannelManager::channel_monitor_updated`] to call it for you.
///
/// Requires that `$chan.blocked_monitor_updates_pending() == 0` and the in-flight monitor update
/// set for this channel is empty!
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 #[cfg(debug_assertions)]
 {
 let in_flight_updates =
 $peer_state.in_flight_monitor_updates.get(&$chan.context.channel_id());
 assert!(in_flight_updates.map(|(_, updates)| updates.is_empty()).unwrap_or(true));
 assert_eq!($chan.blocked_monitor_updates_pending(), 0);
 }
 let logger = WithChannelContext::from(&$self.logger, &$chan.context, None);
 let mut updates = $chan.monitor_updating_restored(&&logger,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
Expand DownExpand Up@@ -4258,19 +4272,7 @@ where
 // TODO: If we do the `in_flight_monitor_updates.is_empty()` check in
 // `locked_close_channel` we can skip the locks here.
 if shutdown_res.channel_funding_txo.is_some() {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mtx) = per_peer_state.get(&shutdown_res.counterparty_node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
 if peer_state.in_flight_monitor_updates.get(&shutdown_res.channel_id).map(|(_, updates)| updates.is_empty()).unwrap_or(true) {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&shutdown_res.channel_id).unwrap_or(Vec::new());

 mem::drop(peer_state);
 mem::drop(per_peer_state);

 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&shutdown_res.channel_id, None, &shutdown_res.counterparty_node_id);
Comment thread
wpaulino marked this conversation as resolved.

 }
 }
 let mut shutdown_results: Vec<(Result<Infallible, _>, _)> = Vec::new();
Expand DownExpand Up@@ -7147,25 +7149,7 @@ where
 self.apply_post_close_monitor_update(counterparty_node_id, channel_id, funding_txo, update);
 },
 BackgroundEvent::MonitorUpdatesComplete { counterparty_node_id, channel_id } => {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(self, peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&channel_id).unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 },
 }
 }
Expand DownExpand Up@@ -8641,7 +8625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
	}

	#[rustfmt::skip]
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: u64, counterparty_node_id: &PublicKey) {
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: Option<u64>, counterparty_node_id: &PublicKey) {
 debug_assert!(self.total_consistency_lock.try_write().is_err()); // Caller holds read lock

 let per_peer_state = self.per_peer_state.read().unwrap();
Expand All@@ -8651,16 +8635,33 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 let remaining_in_flight =
 if let Some((_, pending)) = peer_state.in_flight_monitor_updates.get_mut(channel_id) {
 pending.retain(|upd| upd.update_id > highest_applied_update_id);
 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) {
 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 };

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 log_trace!(logger, "ChannelMonitor updated to {}. {} pending in-flight updates.",
 highest_applied_update_id, remaining_in_flight);

 if remaining_in_flight != 0 {
 return;
 }
Expand DownExpand Up@@ -10891,7 +10892,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 MonitorEvent::Completed { channel_id, monitor_update_id, .. } => {
 self.channel_monitor_updated(
 &channel_id,
 monitor_update_id,
Some(monitor_update_id),
 &counterparty_node_id,
 );
 },
Expand DownExpand Up@@ -13127,38 +13128,7 @@ where

 #[cfg(splicing)]
 for (counterparty_node_id, channel_id) in to_process_monitor_update_actions {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let has_in_flight_updates = peer_state
 .in_flight_monitor_updates
 .get(&channel_id)
 .map(|in_flight_updates| !in_flight_updates.1.is_empty())
 .unwrap_or(false);
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if !has_in_flight_updates && chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(
 self,
 peer_state_lock,
 peer_state,
 per_peer_state,
 chan
 );
 }
 } else {
 let update_actions = peer_state
 .monitor_update_blocked_actions
 .remove(&channel_id)
 .unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 }

 if let Some(height) = height_opt {
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Jul 23, 2025
 Merged


Remove direct calls to handle_monitor_update_completion!#3947
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


112 changes: 41 additions & 71 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3339,8 +3339,22 @@ macro_rules! emit_initial_channel_ready_event {
	};
}

/// Handles the completion steps for when a [`ChannelMonitorUpdate`] is applied to a live channel.
///
/// You should not add new direct calls to this, generally, rather rely on
/// `handle_new_monitor_update` or [`ChannelManager::channel_monitor_updated`] to call it for you.
///
/// Requires that `$chan.blocked_monitor_updates_pending() == 0` and the in-flight monitor update
/// set for this channel is empty!
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 #[cfg(debug_assertions)]
 {
 let in_flight_updates =
 $peer_state.in_flight_monitor_updates.get(&$chan.context.channel_id());
 assert!(in_flight_updates.map(|(_, updates)| updates.is_empty()).unwrap_or(true));
 assert_eq!($chan.blocked_monitor_updates_pending(), 0);
 }
 let logger = WithChannelContext::from(&$self.logger, &$chan.context, None);
 let mut updates = $chan.monitor_updating_restored(&&logger,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
Expand DownExpand Up@@ -4258,19 +4272,7 @@ where
 // TODO: If we do the `in_flight_monitor_updates.is_empty()` check in
 // `locked_close_channel` we can skip the locks here.
 if shutdown_res.channel_funding_txo.is_some() {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mtx) = per_peer_state.get(&shutdown_res.counterparty_node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
 if peer_state.in_flight_monitor_updates.get(&shutdown_res.channel_id).map(|(_, updates)| updates.is_empty()).unwrap_or(true) {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&shutdown_res.channel_id).unwrap_or(Vec::new());

 mem::drop(peer_state);
 mem::drop(per_peer_state);

 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&shutdown_res.channel_id, None, &shutdown_res.counterparty_node_id);
Comment thread
wpaulino marked this conversation as resolved.

 }
 }
 let mut shutdown_results: Vec<(Result<Infallible, _>, _)> = Vec::new();
Expand DownExpand Up@@ -7147,25 +7149,7 @@ where
 self.apply_post_close_monitor_update(counterparty_node_id, channel_id, funding_txo, update);
 },
 BackgroundEvent::MonitorUpdatesComplete { counterparty_node_id, channel_id } => {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(self, peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&channel_id).unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 },
 }
 }
Expand DownExpand Up@@ -8641,7 +8625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
	}

	#[rustfmt::skip]
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: u64, counterparty_node_id: &PublicKey) {
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: Option<u64>, counterparty_node_id: &PublicKey) {
 debug_assert!(self.total_consistency_lock.try_write().is_err()); // Caller holds read lock

 let per_peer_state = self.per_peer_state.read().unwrap();
Expand All@@ -8651,16 +8635,33 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 let remaining_in_flight =
 if let Some((_, pending)) = peer_state.in_flight_monitor_updates.get_mut(channel_id) {
 pending.retain(|upd| upd.update_id > highest_applied_update_id);
 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) {
 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 };

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 log_trace!(logger, "ChannelMonitor updated to {}. {} pending in-flight updates.",
 highest_applied_update_id, remaining_in_flight);

 if remaining_in_flight != 0 {
 return;
 }
Expand DownExpand Up@@ -10891,7 +10892,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 MonitorEvent::Completed { channel_id, monitor_update_id, .. } => {
 self.channel_monitor_updated(
 &channel_id,
 monitor_update_id,
Some(monitor_update_id),
 &counterparty_node_id,
 );
 },
Expand DownExpand Up@@ -13127,38 +13128,7 @@ where

 #[cfg(splicing)]
 for (counterparty_node_id, channel_id) in to_process_monitor_update_actions {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let has_in_flight_updates = peer_state
 .in_flight_monitor_updates
 .get(&channel_id)
 .map(|in_flight_updates| !in_flight_updates.1.is_empty())
 .unwrap_or(false);
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if !has_in_flight_updates && chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(
 self,
 peer_state_lock,
 peer_state,
 per_peer_state,
 chan
 );
 }
 } else {
 let update_actions = peer_state
 .monitor_update_blocked_actions
 .remove(&channel_id)
 .unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 }

 if let Some(height) = height_opt {
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Jul 23, 2025
 Merged


Remove direct calls to handle_monitor_update_completion!#3947
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


112 changes: 41 additions & 71 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3339,8 +3339,22 @@ macro_rules! emit_initial_channel_ready_event {
	};
}

/// Handles the completion steps for when a [`ChannelMonitorUpdate`] is applied to a live channel.
///
/// You should not add new direct calls to this, generally, rather rely on
/// `handle_new_monitor_update` or [`ChannelManager::channel_monitor_updated`] to call it for you.
///
/// Requires that `$chan.blocked_monitor_updates_pending() == 0` and the in-flight monitor update
/// set for this channel is empty!
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 #[cfg(debug_assertions)]
 {
 let in_flight_updates =
 $peer_state.in_flight_monitor_updates.get(&$chan.context.channel_id());
 assert!(in_flight_updates.map(|(_, updates)| updates.is_empty()).unwrap_or(true));
 assert_eq!($chan.blocked_monitor_updates_pending(), 0);
 }
 let logger = WithChannelContext::from(&$self.logger, &$chan.context, None);
 let mut updates = $chan.monitor_updating_restored(&&logger,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
Expand DownExpand Up@@ -4258,19 +4272,7 @@ where
 // TODO: If we do the `in_flight_monitor_updates.is_empty()` check in
 // `locked_close_channel` we can skip the locks here.
 if shutdown_res.channel_funding_txo.is_some() {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mtx) = per_peer_state.get(&shutdown_res.counterparty_node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
 if peer_state.in_flight_monitor_updates.get(&shutdown_res.channel_id).map(|(_, updates)| updates.is_empty()).unwrap_or(true) {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&shutdown_res.channel_id).unwrap_or(Vec::new());

 mem::drop(peer_state);
 mem::drop(per_peer_state);

 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&shutdown_res.channel_id, None, &shutdown_res.counterparty_node_id);
Comment thread
wpaulino marked this conversation as resolved.

 }
 }
 let mut shutdown_results: Vec<(Result<Infallible, _>, _)> = Vec::new();
Expand DownExpand Up@@ -7147,25 +7149,7 @@ where
 self.apply_post_close_monitor_update(counterparty_node_id, channel_id, funding_txo, update);
 },
 BackgroundEvent::MonitorUpdatesComplete { counterparty_node_id, channel_id } => {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(self, peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&channel_id).unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 },
 }
 }
Expand DownExpand Up@@ -8641,7 +8625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
	}

	#[rustfmt::skip]
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: u64, counterparty_node_id: &PublicKey) {
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: Option<u64>, counterparty_node_id: &PublicKey) {
 debug_assert!(self.total_consistency_lock.try_write().is_err()); // Caller holds read lock

 let per_peer_state = self.per_peer_state.read().unwrap();
Expand All@@ -8651,16 +8635,33 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 let remaining_in_flight =
 if let Some((_, pending)) = peer_state.in_flight_monitor_updates.get_mut(channel_id) {
 pending.retain(|upd| upd.update_id > highest_applied_update_id);
 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) {
 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 };

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 log_trace!(logger, "ChannelMonitor updated to {}. {} pending in-flight updates.",
 highest_applied_update_id, remaining_in_flight);

 if remaining_in_flight != 0 {
 return;
 }
Expand DownExpand Up@@ -10891,7 +10892,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 MonitorEvent::Completed { channel_id, monitor_update_id, .. } => {
 self.channel_monitor_updated(
 &channel_id,
 monitor_update_id,
Some(monitor_update_id),
 &counterparty_node_id,
 );
 },
Expand DownExpand Up@@ -13127,38 +13128,7 @@ where

 #[cfg(splicing)]
 for (counterparty_node_id, channel_id) in to_process_monitor_update_actions {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let has_in_flight_updates = peer_state
 .in_flight_monitor_updates
 .get(&channel_id)
 .map(|in_flight_updates| !in_flight_updates.1.is_empty())
 .unwrap_or(false);
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if !has_in_flight_updates && chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(
 self,
 peer_state_lock,
 peer_state,
 per_peer_state,
 chan
 );
 }
 } else {
 let update_actions = peer_state
 .monitor_update_blocked_actions
 .remove(&channel_id)
 .unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 }

 if let Some(height) = height_opt {
Expand Down
Loading

, '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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Jul 23, 2025
 Merged


Remove direct calls to handle_monitor_update_completion!#3947
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


112 changes: 41 additions & 71 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3339,8 +3339,22 @@ macro_rules! emit_initial_channel_ready_event {
	};
}

/// Handles the completion steps for when a [`ChannelMonitorUpdate`] is applied to a live channel.
///
/// You should not add new direct calls to this, generally, rather rely on
/// `handle_new_monitor_update` or [`ChannelManager::channel_monitor_updated`] to call it for you.
///
/// Requires that `$chan.blocked_monitor_updates_pending() == 0` and the in-flight monitor update
/// set for this channel is empty!
macro_rules! handle_monitor_update_completion {
	($self: ident, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => { {
 #[cfg(debug_assertions)]
 {
 let in_flight_updates =
 $peer_state.in_flight_monitor_updates.get(&$chan.context.channel_id());
 assert!(in_flight_updates.map(|(_, updates)| updates.is_empty()).unwrap_or(true));
 assert_eq!($chan.blocked_monitor_updates_pending(), 0);
 }
 let logger = WithChannelContext::from(&$self.logger, &$chan.context, None);
 let mut updates = $chan.monitor_updating_restored(&&logger,
 &$self.node_signer, $self.chain_hash, &$self.default_configuration,
Expand DownExpand Up@@ -4258,19 +4272,7 @@ where
 // TODO: If we do the `in_flight_monitor_updates.is_empty()` check in
 // `locked_close_channel` we can skip the locks here.
 if shutdown_res.channel_funding_txo.is_some() {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mtx) = per_peer_state.get(&shutdown_res.counterparty_node_id) {
 let mut peer_state = peer_state_mtx.lock().unwrap();
 if peer_state.in_flight_monitor_updates.get(&shutdown_res.channel_id).map(|(_, updates)| updates.is_empty()).unwrap_or(true) {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&shutdown_res.channel_id).unwrap_or(Vec::new());

 mem::drop(peer_state);
 mem::drop(per_peer_state);

 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&shutdown_res.channel_id, None, &shutdown_res.counterparty_node_id);
Comment thread
wpaulino marked this conversation as resolved.

 }
 }
 let mut shutdown_results: Vec<(Result<Infallible, _>, _)> = Vec::new();
Expand DownExpand Up@@ -7147,25 +7149,7 @@ where
 self.apply_post_close_monitor_update(counterparty_node_id, channel_id, funding_txo, update);
 },
 BackgroundEvent::MonitorUpdatesComplete { counterparty_node_id, channel_id } => {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(self, peer_state_lock, peer_state, per_peer_state, chan);
 }
 } else {
 let update_actions = peer_state.monitor_update_blocked_actions
 .remove(&channel_id).unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 },
 }
 }
Expand DownExpand Up@@ -8641,7 +8625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
	}

	#[rustfmt::skip]
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: u64, counterparty_node_id: &PublicKey) {
	fn channel_monitor_updated(&self, channel_id: &ChannelId, highest_applied_update_id: Option<u64>, counterparty_node_id: &PublicKey) {
 debug_assert!(self.total_consistency_lock.try_write().is_err()); // Caller holds read lock

 let per_peer_state = self.per_peer_state.read().unwrap();
Expand All@@ -8651,16 +8635,33 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 peer_state_lock = peer_state_mutex_opt.unwrap().lock().unwrap();
 let peer_state = &mut *peer_state_lock;

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 let remaining_in_flight =
 if let Some((_, pending)) = peer_state.in_flight_monitor_updates.get_mut(channel_id) {
 pending.retain(|upd| upd.update_id > highest_applied_update_id);
 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) {
 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 };

 let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(*channel_id), None);
 log_trace!(logger, "ChannelMonitor updated to {}. {} pending in-flight updates.",
 highest_applied_update_id, remaining_in_flight);

 if remaining_in_flight != 0 {
 return;
 }
Expand DownExpand Up@@ -10891,7 +10892,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 MonitorEvent::Completed { channel_id, monitor_update_id, .. } => {
 self.channel_monitor_updated(
 &channel_id,
 monitor_update_id,
Some(monitor_update_id),
 &counterparty_node_id,
 );
 },
Expand DownExpand Up@@ -13127,38 +13128,7 @@ where

 #[cfg(splicing)]
 for (counterparty_node_id, channel_id) in to_process_monitor_update_actions {
 let per_peer_state = self.per_peer_state.read().unwrap();
 if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 let peer_state = &mut *peer_state_lock;
 let has_in_flight_updates = peer_state
 .in_flight_monitor_updates
 .get(&channel_id)
 .map(|in_flight_updates| !in_flight_updates.1.is_empty())
 .unwrap_or(false);
 if let Some(chan) = peer_state.channel_by_id
 .get_mut(&channel_id)
 .and_then(Channel::as_funded_mut)
 {
 if !has_in_flight_updates && chan.blocked_monitor_updates_pending() == 0 {
 handle_monitor_update_completion!(
 self,
 peer_state_lock,
 peer_state,
 per_peer_state,
 chan
 );
 }
 } else {
 let update_actions = peer_state
 .monitor_update_blocked_actions
 .remove(&channel_id)
 .unwrap_or(Vec::new());
 mem::drop(peer_state_lock);
 mem::drop(per_peer_state);
 self.handle_monitor_update_completion_actions(update_actions);
 }
 }
 self.channel_monitor_updated(&channel_id, None, &counterparty_node_id);
 }

 if let Some(height) = height_opt {
Expand Down
Loading