Have Wallet take Deref Logger

Which we'll be using in the next commit.

Author: tnull

src/event.rs

@@ -223,7 +223,7 @@ pub(crate) struct EventHandler<K: KVStore + Sync + Send, L: Deref>
 where
 	L::Target: Logger,
 {
-	wallet: Arc<Wallet<bdk::database::SqliteDatabase>>,
+	wallet: Arc<Wallet<bdk::database::SqliteDatabase, L>>,
 	event_queue: Arc<EventQueue<K, L>>,
 	channel_manager: Arc<ChannelManager<K>>,
 	network_graph: Arc<NetworkGraph>,
@@ -239,7 +239,7 @@ where
 	L::Target: Logger,
 {
 	pub fn new(
-		wallet: Arc<Wallet<bdk::database::SqliteDatabase>>, event_queue: Arc<EventQueue<K, L>>,
+		wallet: Arc<Wallet<bdk::database::SqliteDatabase, L>>, event_queue: Arc<EventQueue<K, L>>,
 		channel_manager: Arc<ChannelManager<K>>, network_graph: Arc<NetworkGraph>,
 		keys_manager: Arc<KeysManager>, payment_store: Arc<PaymentStore<K, L>>,
 		runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>, logger: L, config: Arc<Config>,

src/lib.rs

@@ -273,7 +273,7 @@ pub struct Node<K: KVStore + Sync + Send + 'static> {
 	stop_sender: tokio::sync::watch::Sender<()>,
 	stop_receiver: tokio::sync::watch::Receiver<()>,
 	config: Arc<Config>,
-	wallet: Arc<Wallet<bdk::database::SqliteDatabase>>,
+	wallet: Arc<Wallet<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
 	tx_sync: Arc<EsploraSyncClient<Arc<FilesystemLogger>>>,
 	event_queue: Arc<EventQueue<K, Arc<FilesystemLogger>>>,
 	channel_manager: Arc<ChannelManager<K>>,

src/types.rs

@@ -26,8 +26,8 @@ use std::sync::{Arc, Mutex};
 pub(crate) type ChainMonitor<K> = chainmonitor::ChainMonitor<
 	InMemorySigner,
 	Arc<EsploraSyncClient<Arc<FilesystemLogger>>>,
-	Arc<Wallet<bdk::database::SqliteDatabase>>,
-	Arc<Wallet<bdk::database::SqliteDatabase>>,
+	Arc<Wallet<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
+	Arc<Wallet<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
 	Arc<FilesystemLogger>,
 	Arc<K>,
 >;
@@ -39,21 +39,22 @@ pub(crate) type PeerManager<K> = lightning::ln::peer_handler::PeerManager<
 	Arc<OnionMessenger>,
 	Arc<FilesystemLogger>,
 	IgnoringMessageHandler,
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
 >;
 
 pub(crate) type ChannelManager<K> = lightning::ln::channelmanager::ChannelManager<
 	Arc<ChainMonitor<K>>,
-	Arc<Wallet<bdk::database::SqliteDatabase>>,
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
-	Arc<Wallet<bdk::database::SqliteDatabase>>,
+	Arc<Wallet<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
+	Arc<Wallet<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
 	Arc<Router>,
 	Arc<FilesystemLogger>,
 >;
 
-pub(crate) type KeysManager = WalletKeysManager<bdk::database::SqliteDatabase>;
+pub(crate) type KeysManager =
+	WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>;
 
 pub(crate) type Router =
 	DefaultRouter<Arc<NetworkGraph>, Arc<FilesystemLogger>, Arc<Mutex<Scorer>>>;
@@ -80,8 +81,8 @@ pub(crate) type GossipSync = lightning_background_processor::GossipSync<
 >;
 
 pub(crate) type OnionMessenger = lightning::onion_message::OnionMessenger<
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
 	Arc<FilesystemLogger>,
 	IgnoringMessageHandler,
 >;

src/wallet.rs

@@ -1,4 +1,4 @@
-use crate::logger::{log_error, log_info, log_trace, FilesystemLogger, Logger};
+use crate::logger::{log_error, log_info, log_trace, Logger};
 
 use crate::Error;
 
@@ -27,12 +27,14 @@ use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, Signing};
 use bitcoin::{Script, Transaction, TxOut, Txid};
 
 use std::collections::HashMap;
+use std::ops::Deref;
 use std::sync::{Arc, Condvar, Mutex, RwLock};
 use std::time::Duration;
 
-pub struct Wallet<D>
+pub struct Wallet<D, L: Deref>
 where
 	D: BatchDatabase,
+	L::Target: Logger,
 {
 	// A BDK blockchain used for wallet sync.
 	blockchain: EsploraBlockchain,
@@ -42,16 +44,17 @@ where
 	fee_rate_cache: RwLock<HashMap<ConfirmationTarget, FeeRate>>,
 	runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>,
 	sync_lock: (Mutex<()>, Condvar),
-	logger: Arc<FilesystemLogger>,
+	logger: L,
 }
 
-impl<D> Wallet<D>
+impl<D, L: Deref> Wallet<D, L>
 where
 	D: BatchDatabase,
+	L::Target: Logger,
 {
 	pub(crate) fn new(
 		blockchain: EsploraBlockchain, wallet: bdk::Wallet<D>,
-		runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>, logger: Arc<FilesystemLogger>,
+		runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>, logger: L,
 	) -> Self {
 		let inner = Mutex::new(wallet);
 		let fee_rate_cache = RwLock::new(HashMap::new());
@@ -286,19 +289,21 @@ where
 	}
 }
 
-impl<D> FeeEstimator for Wallet<D>
+impl<D, L: Deref> FeeEstimator for Wallet<D, L>
 where
 	D: BatchDatabase,
+	L::Target: Logger,
 {
 	fn get_est_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
 		(self.estimate_fee_rate(confirmation_target).fee_wu(1000) as u32)
 			.max(FEERATE_FLOOR_SATS_PER_KW)
 	}
 }
 
-impl<D> BroadcasterInterface for Wallet<D>
+impl<D, L: Deref> BroadcasterInterface for Wallet<D, L>
 where
 	D: BatchDatabase,
+	L::Target: Logger,
 {
 	fn broadcast_transaction(&self, tx: &Transaction) {
 		let locked_runtime = self.runtime.read().unwrap();
@@ -325,24 +330,27 @@ where
 
 /// Similar to [`KeysManager`], but overrides the destination and shutdown scripts so they are
 /// directly spendable by the BDK wallet.
-pub struct WalletKeysManager<D>
+pub struct WalletKeysManager<D, L: Deref>
 where
 	D: BatchDatabase,
+	L::Target: Logger,
 {
 	inner: KeysManager,
-	wallet: Arc<Wallet<D>>,
+	wallet: Arc<Wallet<D, L>>,
 }
 
-impl<D> WalletKeysManager<D>
+impl<D, L: Deref> WalletKeysManager<D, L>
 where
 	D: BatchDatabase,
+	L::Target: Logger,
 {
 	/// Constructs a `WalletKeysManager` that overrides the destination and shutdown scripts.
 	///
 	/// See [`KeysManager::new`] for more information on `seed`, `starting_time_secs`, and
 	/// `starting_time_nanos`.
 	pub fn new(
-		seed: &[u8; 32], starting_time_secs: u64, starting_time_nanos: u32, wallet: Arc<Wallet<D>>,
+		seed: &[u8; 32], starting_time_secs: u64, starting_time_nanos: u32,
+		wallet: Arc<Wallet<D, L>>,
 	) -> Self {
 		let inner = KeysManager::new(seed, starting_time_secs, starting_time_nanos);
 		Self { inner, wallet }
@@ -378,9 +386,10 @@ where
 	}
 }
 
-impl<D> NodeSigner for WalletKeysManager<D>
+impl<D, L: Deref> NodeSigner for WalletKeysManager<D, L>
 where
 	D: BatchDatabase,
+	L::Target: Logger,
 {
 	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 		self.inner.get_node_id(recipient)
@@ -407,18 +416,20 @@ where
 	}
 }
 
-impl<D> EntropySource for WalletKeysManager<D>
+impl<D, L: Deref> EntropySource for WalletKeysManager<D, L>
 where
 	D: BatchDatabase,
+	L::Target: Logger,
 {
 	fn get_secure_random_bytes(&self) -> [u8; 32] {
 		self.inner.get_secure_random_bytes()
 	}
 }
 
-impl<D> SignerProvider for WalletKeysManager<D>
+impl<D, L: Deref> SignerProvider for WalletKeysManager<D, L>
 where
 	D: BatchDatabase,
+	L::Target: Logger,
 {
 	type Signer = InMemorySigner;