f Reflect upstream changes

Author: tnull

src/lib.rs

@@ -263,9 +263,27 @@ impl Builder {
 			Arc::clone(&wallet),
 		));
 
+		// Step 12: Initialize the network graph, scorer, and router
+		let network_graph = Arc::new(
+			io_utils::read_network_graph(Arc::clone(&config), Arc::clone(&logger))
+				.expect("Failed to read the network graph"),
+		);
+		let scorer = Arc::new(Mutex::new(io_utils::read_scorer(
+			Arc::clone(&config),
+			Arc::clone(&network_graph),
+			Arc::clone(&logger),
+		)));
+
+		let router = Arc::new(DefaultRouter::new(
+			Arc::clone(&network_graph),
+			Arc::clone(&logger),
+			keys_manager.get_secure_random_bytes(),
+			Arc::clone(&scorer),
+		));
+
 		// Step 6: Read ChannelMonitor state from disk
 		let mut channel_monitors = persister
-			.read_channelmonitors(keys_manager.clone())
+			.read_channelmonitors(Arc::clone(&keys_manager), Arc::clone(&keys_manager))
 			.expect("Failed to read channel monitors from disk");
 
 		// Step 7: Initialize the ChannelManager
@@ -278,10 +296,13 @@ impl Builder {
 					channel_monitor_mut_references.push(channel_monitor);
 				}
 				let read_args = ChannelManagerReadArgs::new(
+					Arc::clone(&keys_manager),
+					Arc::clone(&keys_manager),
 					Arc::clone(&keys_manager),
 					Arc::clone(&wallet),
 					Arc::clone(&chain_monitor),
 					Arc::clone(&wallet),
+					Arc::clone(&router),
 					Arc::clone(&logger),
 					user_config,
 					channel_monitor_mut_references,
@@ -304,8 +325,11 @@ impl Builder {
 					Arc::clone(&wallet),
 					Arc::clone(&chain_monitor),
 					Arc::clone(&wallet),
+					Arc::clone(&router),
 					Arc::clone(&logger),
 					Arc::clone(&keys_manager),
+					Arc::clone(&keys_manager),
+					Arc::clone(&keys_manager),
 					user_config,
 					chain_params,
 				);
@@ -322,10 +346,6 @@ impl Builder {
 		}
 
 		// Step 10: Initialize the P2PGossipSync
-		let network_graph = Arc::new(
-			io_utils::read_network_graph(Arc::clone(&config), Arc::clone(&logger))
-				.expect("Failed to read the network graph"),
-		);
 		let gossip_sync = Arc::new(P2PGossipSync::new(
 			Arc::clone(&network_graph),
 			None::<Arc<dyn Access + Send + Sync>>,
@@ -334,6 +354,7 @@ impl Builder {
 
 		//// Step 11: Initialize the PeerManager
 		let onion_messenger: Arc<OnionMessenger> = Arc::new(OnionMessenger::new(
+			Arc::clone(&keys_manager),
 			Arc::clone(&keys_manager),
 			Arc::clone(&logger),
 			IgnoringMessageHandler {},
@@ -357,13 +378,6 @@ impl Builder {
 			IgnoringMessageHandler {},
 		));
 
-		// Step 12: Initialize routing ProbabilisticScorer
-		let scorer = Arc::new(Mutex::new(io_utils::read_scorer(
-			Arc::clone(&config),
-			Arc::clone(&network_graph),
-			Arc::clone(&logger),
-		)));
-
 		// Step 13: Init payment info storage
 		// TODO: persist payment info to disk
 		let inbound_payments = Arc::new(Mutex::new(HashMap::new()));
@@ -410,6 +424,7 @@ impl Builder {
 			gossip_sync,
 			persister,
 			logger,
+			router,
 			scorer,
 			inbound_payments,
 			outbound_payments,
@@ -447,6 +462,7 @@ pub struct Node {
 	persister: Arc<FilesystemPersister>,
 	logger: Arc<FilesystemLogger>,
 	scorer: Arc<Mutex<Scorer>>,
+	router: Arc<Router>,
 	inbound_payments: Arc<PaymentInfoStorage>,
 	outbound_payments: Arc<PaymentInfoStorage>,
 	peer_store: Arc<PeerInfoStorage<FilesystemPersister>>,
@@ -512,16 +528,9 @@ impl Node {
 			Arc::clone(&self.config),
 		));
 
-		let router = DefaultRouter::new(
-			Arc::clone(&self.network_graph),
-			Arc::clone(&self.logger),
-			self.keys_manager.get_secure_random_bytes(),
-			Arc::clone(&self.scorer),
-		);
-
 		let invoice_payer = Arc::new(InvoicePayer::new(
 			Arc::clone(&self.channel_manager),
-			router,
+			Arc::clone(&self.router),
 			Arc::clone(&self.logger),
 			Arc::clone(&event_handler),
 			payment::Retry::Timeout(LDK_PAYMENT_RETRY_TIMEOUT),
@@ -1081,13 +1090,17 @@ pub(crate) type ChannelManager = lightning::ln::channelmanager::ChannelManager<
 	Arc<ChainMonitor>,
 	Arc<Wallet<bdk::sled::Tree>>,
 	Arc<WalletKeysManager<bdk::sled::Tree>>,
+	Arc<WalletKeysManager<bdk::sled::Tree>>,
+	Arc<WalletKeysManager<bdk::sled::Tree>>,
 	Arc<Wallet<bdk::sled::Tree>>,
+	Arc<Router>,
 	Arc<FilesystemLogger>,
 >;
 
 pub(crate) type KeysManager = WalletKeysManager<bdk::sled::Tree>;
 
-type InvoicePayer<F> = payment::InvoicePayer<Arc<ChannelManager>, Router, Arc<FilesystemLogger>, F>;
+type InvoicePayer<F> =
+	payment::InvoicePayer<Arc<ChannelManager>, Arc<Router>, Arc<FilesystemLogger>, F>;
 
 type Router = DefaultRouter<Arc<NetworkGraph>, Arc<FilesystemLogger>, Arc<Mutex<Scorer>>>;
 type Scorer = ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>>;
@@ -1100,6 +1113,7 @@ pub(crate) type NetworkGraph = gossip::NetworkGraph<Arc<FilesystemLogger>>;
 pub(crate) type PaymentInfoStorage = Mutex<HashMap<PaymentHash, PaymentInfo>>;
 
 pub(crate) type OnionMessenger = lightning::onion_message::OnionMessenger<
+	Arc<WalletKeysManager<bdk::sled::Tree>>,
 	Arc<WalletKeysManager<bdk::sled::Tree>>,
 	Arc<FilesystemLogger>,
 	IgnoringMessageHandler,