Switch to chain monitor deferred writes mode

Patch LDK dependencies to use the chain-mon-internal-deferred-writes
branch and enable deferred writes by passing `true` to the
ChainMonitor constructor.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: joostjager

Cargo.toml

@@ -170,15 +170,15 @@ harness = false
 #vss-client-ng = { path = "../vss-client" }
 #vss-client-ng = { git = "https://github.com/lightningdevkit/vss-client", branch = "main" }
 #
-#[patch."https://github.com/lightningdevkit/rust-lightning"]
-#lightning = { path = "../rust-lightning/lightning" }
-#lightning-types = { path = "../rust-lightning/lightning-types" }
-#lightning-invoice = { path = "../rust-lightning/lightning-invoice" }
-#lightning-net-tokio = { path = "../rust-lightning/lightning-net-tokio" }
-#lightning-persister = { path = "../rust-lightning/lightning-persister" }
-#lightning-background-processor = { path = "../rust-lightning/lightning-background-processor" }
-#lightning-rapid-gossip-sync = { path = "../rust-lightning/lightning-rapid-gossip-sync" }
-#lightning-block-sync = { path = "../rust-lightning/lightning-block-sync" }
-#lightning-transaction-sync = { path = "../rust-lightning/lightning-transaction-sync" }
-#lightning-liquidity = { path = "../rust-lightning/lightning-liquidity" }
-#lightning-macros = { path = "../rust-lightning/lightning-macros" }
+[patch."https://github.com/lightningdevkit/rust-lightning"]
+lightning = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-internal-deferred-writes-ldk-node-based" }
+lightning-types = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-internal-deferred-writes-ldk-node-based" }
+lightning-invoice = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-internal-deferred-writes-ldk-node-based" }
+lightning-net-tokio = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-internal-deferred-writes-ldk-node-based" }
+lightning-persister = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-internal-deferred-writes-ldk-node-based" }
+lightning-background-processor = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-internal-deferred-writes-ldk-node-based" }
+lightning-rapid-gossip-sync = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-internal-deferred-writes-ldk-node-based" }
+lightning-block-sync = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-internal-deferred-writes-ldk-node-based" }
+lightning-transaction-sync = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-internal-deferred-writes-ldk-node-based" }
+lightning-liquidity = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-internal-deferred-writes-ldk-node-based" }
+lightning-macros = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-internal-deferred-writes-ldk-node-based" }

src/builder.rs

@@ -1370,6 +1370,7 @@ fn build_with_store_internal(
 		Arc::clone(&persister),
 		Arc::clone(&keys_manager),
 		peer_storage_key,
+		true,
 	));
 
 	// Initialize the network graph, scorer, and router

src/lib.rs

@@ -761,6 +761,12 @@ impl Node {
 		}
 	}
 
+	/// Returns the number of pending deferred chain monitor operations that have not
+	/// been flushed yet by the background processor.
+	pub fn pending_monitor_operation_count(&self) -> usize {
+		self.chain_monitor.pending_operation_count()
+	}
+
 	/// Returns the config with which the [`Node`] was initialized.
 	pub fn config(&self) -> Config {
 		self.config.as_ref().clone()

tests/common/mod.rs

@@ -1211,8 +1211,15 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
 	);
 
 	println!("\nB close_channel (force: {})", force_close);
+	// Wait for the background processor to flush deferred monitor writes so that
+	// the channel state no longer has monitor_update_in_progress set.
+	exponential_backoff_poll(|| {
+		(node_a.pending_monitor_operation_count() == 0
+			&& node_b.pending_monitor_operation_count() == 0)
+			.then_some(())
+	})
+	.await;
 	if force_close {
-		tokio::time::sleep(Duration::from_secs(1)).await;
 		node_a.force_close_channel(&user_channel_id_a, node_b.node_id(), None).unwrap();
 	} else {
 		node_a.close_channel(&user_channel_id_a, node_b.node_id()).unwrap();