Use DeferredChainMonitor for all storage backends

Replace the ChainMonitor type alias to point to DeferredChainMonitor
instead of the regular ChainMonitor. This enables safe persistence
ordering (ChannelManager persisted before channel monitors) for all
backends, including VSS.

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

Author: joostjager

Cargo.toml

@@ -169,15 +169,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-deferred-writes" }
+lightning-types = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-deferred-writes" }
+lightning-invoice = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-deferred-writes" }
+lightning-net-tokio = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-deferred-writes" }
+lightning-persister = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-deferred-writes" }
+lightning-background-processor = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-deferred-writes" }
+lightning-rapid-gossip-sync = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-deferred-writes" }
+lightning-block-sync = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-deferred-writes" }
+lightning-transaction-sync = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-deferred-writes" }
+lightning-liquidity = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-deferred-writes" }
+lightning-macros = { git = "https://github.com/joostjager/rust-lightning", branch = "chain-mon-deferred-writes" }

src/builder.rs

@@ -20,7 +20,7 @@ use bitcoin::key::Secp256k1;
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::{BlockHash, Network};
 use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
-use lightning::chain::{chainmonitor, BestBlock};
+use lightning::chain::BestBlock;
 use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
 use lightning::ln::msgs::{RoutingMessageHandler, SocketAddress};
 use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
@@ -1334,7 +1334,7 @@ fn build_with_store_internal(
 	));
 
 	// Initialize the ChainMonitor
-	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
+	let chain_monitor: Arc<ChainMonitor> = Arc::new(ChainMonitor::new(
 		Some(Arc::clone(&chain_source)),
 		Arc::clone(&tx_broadcaster),
 		Arc::clone(&logger),
@@ -1511,7 +1511,7 @@ fn build_with_store_internal(
 	// Give ChannelMonitors to ChainMonitor
 	for (_blockhash, channel_monitor) in channel_monitors.into_iter() {
 		let channel_id = channel_monitor.channel_id();
-		chain_monitor.load_existing_monitor(channel_id, channel_monitor).map_err(|e| {
+		chain_monitor.inner().load_existing_monitor(channel_id, channel_monitor).map_err(|e| {
 			log_error!(logger, "Failed to load channel monitor: {:?}", e);
 			BuildError::InvalidChannelMonitor
 		})?;

src/chain/bitcoind.rs

@@ -168,9 +168,10 @@ impl BitcoindChainSource {
 			// network access during `start`. For now, we just make sure we get the worst known
 			// block hash and sychronize them via `ChainMonitor`.
 			if let Some(worst_channel_monitor_block_hash) = chain_monitor
+				.inner()
 				.list_monitors()
 				.iter()
-				.flat_map(|channel_id| chain_monitor.get_monitor(*channel_id))
+				.flat_map(|channel_id| chain_monitor.inner().get_monitor(*channel_id))
 				.map(|m| m.current_best_block())
 				.min_by_key(|b| b.height)
 				.map(|b| b.block_hash)

src/lib.rs

@@ -1622,8 +1622,8 @@ impl Node {
 
 		let mut total_lightning_balance_sats = 0;
 		let mut lightning_balances = Vec::new();
-		for channel_id in self.chain_monitor.list_monitors() {
-			match self.chain_monitor.get_monitor(channel_id) {
+		for channel_id in self.chain_monitor.inner().list_monitors() {
+			match self.chain_monitor.inner().get_monitor(channel_id) {
 				Ok(monitor) => {
 					let counterparty_node_id = monitor.get_counterparty_node_id();
 					for ldk_balance in monitor.get_claimable_balances() {

src/types.rs

@@ -13,7 +13,7 @@ use std::sync::{Arc, Mutex};
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::{OutPoint, ScriptBuf};
 use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
-use lightning::chain::chainmonitor;
+use lightning::chain::deferred;
 use lightning::impl_writeable_tlv_based;
 use lightning::ln::channel_state::ChannelDetails as LdkChannelDetails;
 use lightning::ln::msgs::{RoutingMessageHandler, SocketAddress};
@@ -206,7 +206,7 @@ pub type Persister = MonitorUpdatingPersister<
 	Arc<OnchainFeeEstimator>,
 >;
 
-pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
+pub(crate) type ChainMonitor = deferred::DeferredChainMonitor<
 	InMemorySigner,
 	Arc<ChainSource>,
 	Arc<Broadcaster>,