From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Mon, 4 Apr 2022 20:09:44 +0000 (+0000)
Subject: Merge pull request #51 from jkczyz/2022-03-ldk-106
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=1f5243998796bcbd6a26eb93cef40bfd2e1bdf75;hp=-c;p=ldk-sample

Merge pull request #51 from jkczyz/2022-03-ldk-106

Update to LDK 0.0.106
---

1f5243998796bcbd6a26eb93cef40bfd2e1bdf75
diff --combined src/main.rs
index ad48efd,07afa66..f48a118
--- a/src/main.rs
+++ b/src/main.rs
@@@ -29,7 -29,7 +29,7 @@@ use lightning::routing::scoring::Probab
  use lightning::util::config::UserConfig;
  use lightning::util::events::{Event, PaymentPurpose};
  use lightning::util::ser::ReadableArgs;
- use lightning_background_processor::BackgroundProcessor;
+ use lightning_background_processor::{BackgroundProcessor, Persister};
  use lightning_block_sync::init;
  use lightning_block_sync::poll;
  use lightning_block_sync::SpvClient;
@@@ -48,7 -48,6 +48,7 @@@ use std::io
  use std::io::Write;
  use std::ops::Deref;
  use std::path::Path;
 +use std::sync::atomic::{AtomicBool, Ordering};
  use std::sync::{Arc, Mutex};
  use std::time::{Duration, SystemTime};
  
@@@ -109,6 -108,36 +109,36 @@@ pub(crate) type InvoicePayer<E> = payme
  
  type Router = DefaultRouter<Arc<NetworkGraph>, Arc<FilesystemLogger>>;
  
+ struct DataPersister {
+ 	data_dir: String,
+ }
+ 
+ impl
+ 	Persister<
+ 		InMemorySigner,
+ 		Arc<ChainMonitor>,
+ 		Arc<BitcoindClient>,
+ 		Arc<KeysManager>,
+ 		Arc<BitcoindClient>,
+ 		Arc<FilesystemLogger>,
+ 	> for DataPersister
+ {
+ 	fn persist_manager(&self, channel_manager: &ChannelManager) -> Result<(), std::io::Error> {
+ 		FilesystemPersister::persist_manager(self.data_dir.clone(), channel_manager)
+ 	}
+ 
+ 	fn persist_graph(&self, network_graph: &NetworkGraph) -> Result<(), std::io::Error> {
+ 		if FilesystemPersister::persist_network_graph(self.data_dir.clone(), network_graph).is_err()
+ 		{
+ 			// Persistence errors here are non-fatal as we can just fetch the routing graph
+ 			// again later, but they may indicate a disk error which could be fatal elsewhere.
+ 			eprintln!("Warning: Failed to persist network graph, check your disk and permissions");
+ 		}
+ 
+ 		Ok(())
+ 	}
+ }
+ 
  async fn handle_ldk_events(
  	channel_manager: Arc<ChannelManager>, bitcoind_client: Arc<BitcoindClient>,
  	keys_manager: Arc<KeysManager>, inbound_payments: PaymentInfoStorage,
@@@ -491,22 -520,6 +521,6 @@@ async fn start_ldk() 
  		None::<Arc<dyn chain::Access + Send + Sync>>,
  		logger.clone(),
  	));
- 	let network_graph_persist = Arc::clone(&network_graph);
- 	tokio::spawn(async move {
- 		let mut interval = tokio::time::interval(Duration::from_secs(600));
- 		loop {
- 			interval.tick().await;
- 			if disk::persist_network(Path::new(&network_graph_path), &network_graph_persist)
- 				.is_err()
- 			{
- 				// Persistence errors here are non-fatal as we can just fetch the routing graph
- 				// again later, but they may indicate a disk error which could be fatal elsewhere.
- 				eprintln!(
- 					"Warning: Failed to persist network graph, check your disk and permissions"
- 				);
- 			}
- 		}
- 	});
  
  	// Step 12: Initialize the PeerManager
  	let channel_manager: Arc<ChannelManager> = Arc::new(channel_manager);
@@@ -529,8 -542,6 +543,8 @@@
  
  	let peer_manager_connection_handler = peer_manager.clone();
  	let listening_port = args.ldk_peer_listening_port;
 +	let stop_listen = Arc::new(AtomicBool::new(false));
 +	let stop_listen_ref = Arc::clone(&stop_listen);
  	tokio::spawn(async move {
  		let listener = tokio::net::TcpListener::bind(format!("0.0.0.0:{}", listening_port))
  			.await
@@@ -538,9 -549,6 +552,9 @@@
  		loop {
  			let peer_mgr = peer_manager_connection_handler.clone();
  			let tcp_stream = listener.accept().await.unwrap().0;
 +			if stop_listen_ref.load(Ordering::Acquire) {
 +				return;
 +			}
  			tokio::spawn(async move {
  				lightning_net_tokio::setup_inbound(
  					peer_mgr.clone(),
@@@ -617,7 -625,11 +631,11 @@@
  	});
  
  	// Step 17: Create InvoicePayer
- 	let router = DefaultRouter::new(network_graph.clone(), logger.clone());
+ 	let router = DefaultRouter::new(
+ 		network_graph.clone(),
+ 		logger.clone(),
+ 		keys_manager.get_secure_random_bytes(),
+ 	);
  	let invoice_payer = Arc::new(InvoicePayer::new(
  		channel_manager.clone(),
  		router,
@@@ -627,14 -639,12 +645,12 @@@
  		payment::RetryAttempts(5),
  	));
  
- 	// Step 18: Persist ChannelManager
- 	let data_dir = ldk_data_dir.clone();
- 	let persist_channel_manager_callback =
- 		move |node: &ChannelManager| FilesystemPersister::persist_manager(data_dir.clone(), &*node);
+ 	// Step 18: Persist ChannelManager and NetworkGraph
+ 	let persister = DataPersister { data_dir: ldk_data_dir.clone() };
  
  	// Step 19: Background Processing
  	let background_processor = BackgroundProcessor::start(
- 		persist_channel_manager_callback,
+ 		persister,
  		invoice_payer.clone(),
  		chain_monitor.clone(),
  		channel_manager.clone(),
@@@ -699,11 -709,10 +715,11 @@@
  
  	// Start the CLI.
  	cli::poll_for_user_input(
 -		invoice_payer.clone(),
 -		peer_manager.clone(),
 -		channel_manager.clone(),
 -		keys_manager.clone(),
 +		Arc::clone(&invoice_payer),
 +		Arc::clone(&peer_manager),
 +		Arc::clone(&channel_manager),
 +		Arc::clone(&keys_manager),
 +		Arc::clone(&network_graph),
  		inbound_payments,
  		outbound_payments,
  		ldk_data_dir.clone(),
@@@ -711,11 -720,6 +727,11 @@@
  	)
  	.await;
  
 +	// Disconnect our peers and stop accepting new connections. This ensures we don't continue
 +	// updating our channel data after we've stopped the background processor.
 +	stop_listen.store(true, Ordering::Release);
 +	peer_manager.disconnect_all_peers();
 +
  	// Stop the background processor.
  	background_processor.stop().unwrap();
  }