From 514b7c3dfbb0b6f5f0b1b00c2baf699af09f5479 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git+claude@bluematt.me>
Date: Sun, 29 Mar 2026 16:23:35 +0000
Subject: [PATCH] Attempt to unblock blocked monitor updates on startup

When we make an MPP claim we push RAA blockers for each chanel to
ensure we don't allow any single channel to make too much progress
until all channels have the preimage durably on disk. We don't have
to store those RAA blockers on disk in the ChannelManager as
there's no point - if the ChannelManager gets to disk with the RAA
blockers it also brought with it the pending ChannelMonitorUpdates
that contain the preimages and will now be replayed, ensuring the
preimage makes it to all ChannelMonitors.

However, just because those RAA blockers dissapear on reload
doesn't mean the implications of them does too - if a later
ChannelMonitorUpdate was blocked in the channel we don't have logic
to unblock it on startup.

Here we add such logic, simply attempting to unblock all blocked
`ChannelMonitorUpdate`s that existed on startup.

Code written by Claude.

Fixes #4518
---
 lightning/src/ln/channelmanager.rs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 08cbb6f6bf7..6fee055d72b 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -1315,6 +1315,11 @@ enum BackgroundEvent {
 		channel_id: ChannelId,
 		highest_update_id_completed: u64,
 	},
+	/// A channel had blocked monitor updates waiting on startup. If the updates were blocked on
+	/// an MPP claim blocker not written to disk, we may be able to unblock them now.
+	///
+	/// This event is never written to disk.
+	AttemptUnblockMonitorUpdates { counterparty_node_id: PublicKey, channel_id: ChannelId },
 }
 
 /// A pointer to a channel that is unblocked when an event is surfaced
@@ -8310,6 +8315,12 @@ impl<
 						&counterparty_node_id,
 					);
 				},
+				BackgroundEvent::AttemptUnblockMonitorUpdates {
+					counterparty_node_id,
+					channel_id,
+				} => {
+					self.handle_monitor_update_release(counterparty_node_id, channel_id, None);
+				},
 			}
 		}
 		NotifyOption::DoPersist
@@ -9598,6 +9609,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 												channel_id, ..
 											} =>
 												*channel_id == prev_channel_id,
+											BackgroundEvent::AttemptUnblockMonitorUpdates { .. } => false,
 										}
 									});
 								assert!(
@@ -18664,6 +18676,14 @@ impl<
 						log_error!(logger, " Please ensure the chain::Watch API requirements are met and file a bug report at https://github.com/lightningdevkit/rust-lightning");
 						return Err(DecodeError::DangerousValue);
 					}
+					if funded_chan.blocked_monitor_updates_pending() > 0 {
+						pending_background_events.push(
+							BackgroundEvent::AttemptUnblockMonitorUpdates {
+								counterparty_node_id: *counterparty_id,
+								channel_id: *chan_id,
+							},
+						);
+					}
 				} else {
 					// We shouldn't have persisted (or read) any unfunded channel types so none should have been
 					// created in this `channel_by_id` map.