use deferred cmon

Author: joostjager

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};
@@ -1313,8 +1313,8 @@ fn build_with_store_internal(
 		Arc::clone(&fee_estimator),
 	));
 
-	// Initialize the ChainMonitor
-	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
+	// Initialize the ChainMonitor wrapped with DeferredChainMonitor for safe persistence ordering
+	let chain_monitor: Arc<ChainMonitor> = Arc::new(ChainMonitor::new(
 		Some(Arc::clone(&chain_source)),
 		Arc::clone(&tx_broadcaster),
 		Arc::clone(&logger),

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::DeferredChainMonitor as LdkDeferredChainMonitor;
 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 = LdkDeferredChainMonitor<
 	InMemorySigner,
 	Arc<ChainSource>,
 	Arc<Broadcaster>,