Log wallet sync

Author: tnull

src/access.rs

@@ -1,4 +1,10 @@
 use crate::error::LdkLiteError as Error;
+#[allow(unused_imports)]
+use crate::logger::{
+	log_error, log_given_level, log_info, log_internal, log_trace, log_warn, FilesystemLogger,
+	Logger,
+};
+
 
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
 use lightning::chain::WatchedOutput;
@@ -11,7 +17,8 @@ use bdk::{SignOptions, SyncOptions};
 
 use bitcoin::{BlockHash, Script, Transaction, Txid};
 
-use std::sync::Mutex;
+use std::sync::{Mutex, Arc};
+use std::time::Instant;
 
 pub struct LdkLiteChainAccess<D>
 where
@@ -24,13 +31,14 @@ where
 	queued_outputs: Mutex<Vec<WatchedOutput>>,
 	watched_outputs: Mutex<Vec<WatchedOutput>>,
 	last_sync_height: Mutex<Option<u32>>,
+	logger: Arc<FilesystemLogger>,
 }
 
 impl<D> LdkLiteChainAccess<D>
 where
 	D: BatchDatabase,
 {
-	pub fn new(blockchain: EsploraBlockchain, wallet: bdk::Wallet<D>) -> Self {
+	pub(crate) fn new(blockchain: EsploraBlockchain, wallet: bdk::Wallet<D>, logger: Arc<FilesystemLogger>) -> Self {
 		let wallet = Mutex::new(wallet);
 		let watched_transactions = Mutex::new(Vec::new());
 		let queued_transactions = Mutex::new(Vec::new());
@@ -45,21 +53,26 @@ where
 			queued_outputs,
 			watched_outputs,
 			last_sync_height,
+			logger,
 		}
 	}
 
-	pub fn sync_wallet(&self) -> Result<(), Error> {
+	pub(crate) fn sync_wallet(&self) -> Result<(), Error> {
 		let sync_options = SyncOptions { progress: None };
 
+		let now = Instant::now();
 		self.wallet
 			.lock()
 			.unwrap()
 			.sync(&self.blockchain, sync_options)
 			.map_err(|e| Error::Bdk(e))?;
+
+		log_info!(self.logger, "On-chain wallet sync finished in {} seconds.", now.elapsed().as_secs());
+
 		Ok(())
 	}
 
-	pub fn sync(&self, confirmables: Vec<&dyn Confirm>) -> Result<(), Error> {
+	pub(crate) fn sync(&self, confirmables: Vec<&dyn Confirm>) -> Result<(), Error> {
 		let client = &*self.blockchain;
 
 		let cur_height = client.get_height()?;
@@ -209,7 +222,7 @@ where
 		Ok(())
 	}
 
-	pub fn create_funding_transaction(
+	pub(crate) fn create_funding_transaction(
 		&self, output_script: &Script, value_sats: u64, confirmation_target: ConfirmationTarget,
 	) -> Result<Transaction, Error> {
 		let num_blocks = num_blocks_from_conf_target(confirmation_target);
@@ -238,7 +251,7 @@ where
 		Ok(psbt.extract_tx())
 	}
 
-	pub fn get_new_address(&self) -> Result<bitcoin::Address, Error> {
+	pub(crate) fn get_new_address(&self) -> Result<bitcoin::Address, Error> {
 		let address_info = self.wallet.lock().unwrap().get_address(AddressIndex::New)?;
 		Ok(address_info.address)
 	}

src/lib.rs

@@ -220,7 +220,7 @@ impl LdkLiteBuilder {
 		let blockchain = EsploraBlockchain::new(&config.esplora_server_url, BDK_CLIENT_STOP_GAP)
 			.with_concurrency(BDK_CLIENT_CONCURRENCY);
 
-		let chain_access = Arc::new(LdkLiteChainAccess::new(blockchain, bdk_wallet));
+		let chain_access = Arc::new(LdkLiteChainAccess::new(blockchain, bdk_wallet, Arc::clone(&logger)));
 
 		// Step 3: Initialize Persist
 		let persister = Arc::new(FilesystemPersister::new(ldk_data_dir.clone()));