f Account for PeerStorage changes

Author: tnull

src/builder.rs

@@ -48,7 +48,7 @@ use lightning::routing::router::DefaultRouter;
 use lightning::routing::scoring::{
 	ProbabilisticScorer, ProbabilisticScoringDecayParameters, ProbabilisticScoringFeeParameters,
 };
-use lightning::sign::EntropySource;
+use lightning::sign::{EntropySource, NodeSigner};
 
 use lightning::util::persist::{
 	read_channel_monitors, CHANNEL_MANAGER_PERSISTENCE_KEY,
@@ -1278,15 +1278,6 @@ fn build_with_store_internal(
 		},
 	};
 
-	// Initialize the ChainMonitor
-	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
-		Some(Arc::clone(&chain_source)),
-		Arc::clone(&tx_broadcaster),
-		Arc::clone(&logger),
-		Arc::clone(&fee_estimator),
-		Arc::clone(&kv_store),
-	));
-
 	// Initialize the KeysManager
 	let cur_time = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).map_err(|e| {
 		log_error!(logger, "Failed to get current time: {}", e);
@@ -1302,6 +1293,19 @@ fn build_with_store_internal(
 		Arc::clone(&logger),
 	));
 
+	let peer_storage_key = keys_manager.get_peer_storage_key();
+
+	// Initialize the ChainMonitor
+	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
+		Some(Arc::clone(&chain_source)),
+		Arc::clone(&tx_broadcaster),
+		Arc::clone(&logger),
+		Arc::clone(&fee_estimator),
+		Arc::clone(&kv_store),
+		Arc::clone(&keys_manager),
+		peer_storage_key,
+	));
+
 	// Initialize the network graph, scorer, and router
 	let network_graph =
 		match io::utils::read_network_graph(Arc::clone(&kv_store), Arc::clone(&logger)) {
@@ -1552,13 +1556,15 @@ fn build_with_store_internal(
 				as Arc<dyn RoutingMessageHandler + Sync + Send>,
 			onion_message_handler: Arc::clone(&onion_messenger),
 			custom_message_handler,
+			send_only_message_handler: Arc::clone(&chain_monitor),
 		},
 		GossipSync::Rapid(_) => MessageHandler {
 			chan_handler: Arc::clone(&channel_manager),
 			route_handler: Arc::new(IgnoringMessageHandler {})
 				as Arc<dyn RoutingMessageHandler + Sync + Send>,
 			onion_message_handler: Arc::clone(&onion_messenger),
 			custom_message_handler,
+			send_only_message_handler: Arc::clone(&chain_monitor),
 		},
 		GossipSync::None => {
 			unreachable!("We must always have a gossip sync!");

src/types.rs

@@ -47,6 +47,7 @@ pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
 	Arc<OnchainFeeEstimator>,
 	Arc<Logger>,
 	Arc<DynStore>,
+	Arc<KeysManager>,
 >;
 
 pub(crate) type PeerManager = lightning::ln::peer_handler::PeerManager<
@@ -57,6 +58,7 @@ pub(crate) type PeerManager = lightning::ln::peer_handler::PeerManager<
 	Arc<Logger>,
 	Arc<NodeCustomMessageHandler<Arc<Logger>>>,
 	Arc<KeysManager>,
+	Arc<ChainMonitor>,
 >;
 
 pub(crate) type LiquidityManager =

src/wallet/mod.rs

@@ -27,7 +27,7 @@ use lightning::ln::msgs::UnsignedGossipMessage;
 use lightning::ln::script::ShutdownScript;
 use lightning::sign::{
 	ChangeDestinationSource, EntropySource, InMemorySigner, KeysManager, NodeSigner, OutputSpender,
-	Recipient, SignerProvider, SpendableOutputDescriptor,
+	PeerStorageKey, Recipient, SignerProvider, SpendableOutputDescriptor,
 };
 
 use lightning::util::message_signing;
@@ -806,6 +806,10 @@ impl NodeSigner for WalletKeysManager {
 		self.inner.get_inbound_payment_key()
 	}
 
+	fn get_peer_storage_key(&self) -> PeerStorageKey {
+		self.inner.get_peer_storage_key()
+	}
+
 	fn sign_invoice(
 		&self, invoice: &RawBolt11Invoice, recipient: Recipient,
 	) -> Result<RecoverableSignature, ()> {