multi: Remove bitcoind_wallet

MaxFangX · MaxFangX · commit 202f988e20e6 · 2023-01-10T20:35:00.000-06:00
diff --git a/lexe-ln/src/bitcoind/mod.rs b/lexe-ln/src/bitcoind/mod.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::str::FromStr;
 use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
@@ -8,7 +7,6 @@ use anyhow::{ensure, Context};
 use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::consensus::encode;
 use bitcoin::hash_types::{BlockHash, Txid};
-use bitcoin::util::address::Address;
 use common::cli::{BitcoindRpcInfo, Network};
 use common::shutdown::ShutdownChannel;
 use common::task::LxTask;
@@ -252,17 +250,6 @@ impl LexeBitcoind {
             .context("signrawtransactionwithwallet RPC call failed")
     }
 
-    pub async fn get_new_address(&self) -> anyhow::Result<Address> {
-        let addr_args = vec![serde_json::json!("LDK output address")];
-        let addr = self
-            .rpc_client
-            .call_method::<NewAddress>("getnewaddress", &addr_args)
-            .await
-            .context("getnewaddress RPC call failed")?;
-        Address::from_str(addr.0.as_str())
-            .context("Could not parse address from string")
-    }
-
     pub async fn get_blockchain_info(&self) -> anyhow::Result<BlockchainInfo> {
         self.rpc_client
             .call_method::<BlockchainInfo>("getblockchaininfo", &[])
diff --git a/lexe-ln/src/wallet/mod.rs b/lexe-ln/src/wallet/mod.rs
@@ -3,8 +3,9 @@ use std::sync::Arc;
 use anyhow::Context;
 use bdk::blockchain::EsploraBlockchain;
 use bdk::template::Bip84;
-use bdk::wallet::Wallet;
+use bdk::wallet::{AddressIndex, Wallet};
 use bdk::{KeychainKind, SyncOptions};
+use bitcoin::util::address::Address;
 use common::cli::Network;
 use common::constants::{
     IMPORTANT_PERSIST_RETRIES, SINGLETON_DIRECTORY, WALLET_DB_FILENAME,
@@ -91,6 +92,16 @@ impl LexeWallet {
             .await
             .context("bdk::Wallet::sync failed")
     }
+
+    /// Returns a new address derived using the external descriptor.
+    pub fn get_new_address(&self) -> anyhow::Result<Address> {
+        self.0
+            .try_lock()
+            .context("Wallet is busy; perhaps it is still syncing?")?
+            .get_address(AddressIndex::New)
+            .map(|info| info.address)
+            .context("Could not get new address")
+    }
 }
 
 /// Spawns a task that persists the current [`WalletDb`] state whenever it
diff --git a/node/src/event_handler.rs b/node/src/event_handler.rs
@@ -19,6 +19,7 @@ use lexe_ln::bitcoind::LexeBitcoind;
 use lexe_ln::invoice::{HTLCStatus, MillisatAmount, PaymentInfo};
 use lexe_ln::keys_manager::LexeKeysManager;
 use lexe_ln::test_event::{TestEvent, TestEventSender};
+use lexe_ln::wallet::LexeWallet;
 use lightning::chain::chaininterface::{
     BroadcasterInterface, ConfirmationTarget, FeeEstimator,
 };
@@ -28,49 +29,22 @@ use tracing::{debug, error, info};
 
 use crate::channel_manager::NodeChannelManager;
 
+// We pub(crate) all the fields to prevent having to specify each field two more
+// times in Self::new paramaters and in struct init syntax.
 pub struct NodeEventHandler {
-    network: Network,
-    lsp: ChannelPeer,
-    channel_manager: NodeChannelManager,
-    keys_manager: LexeKeysManager,
-    bitcoind: Arc<LexeBitcoind>,
-    network_graph: Arc<NetworkGraphType>,
-    inbound_payments: PaymentInfoStorageType,
-    outbound_payments: PaymentInfoStorageType,
-    test_event_tx: TestEventSender,
+    pub(crate) network: Network,
+    pub(crate) lsp: ChannelPeer,
+    pub(crate) wallet: LexeWallet,
+    pub(crate) channel_manager: NodeChannelManager,
+    pub(crate) keys_manager: LexeKeysManager,
+    pub(crate) bitcoind: Arc<LexeBitcoind>,
+    pub(crate) network_graph: Arc<NetworkGraphType>,
+    pub(crate) inbound_payments: PaymentInfoStorageType,
+    pub(crate) outbound_payments: PaymentInfoStorageType,
+    pub(crate) test_event_tx: TestEventSender,
     // XXX: remove when `EventHandler` is async
-    blocking_task_rt: BlockingTaskRt,
-    shutdown: ShutdownChannel,
-}
-
-impl NodeEventHandler {
-    #[allow(clippy::too_many_arguments)]
-    pub(crate) fn new(
-        network: Network,
-        lsp: ChannelPeer,
-        channel_manager: NodeChannelManager,
-        keys_manager: LexeKeysManager,
-        bitcoind: Arc<LexeBitcoind>,
-        network_graph: Arc<NetworkGraphType>,
-        inbound_payments: PaymentInfoStorageType,
-        outbound_payments: PaymentInfoStorageType,
-        test_event_tx: TestEventSender,
-        shutdown: ShutdownChannel,
-    ) -> Self {
-        Self {
-            network,
-            lsp,
-            channel_manager,
-            keys_manager,
-            bitcoind,
-            network_graph,
-            inbound_payments,
-            outbound_payments,
-            test_event_tx,
-            blocking_task_rt: BlockingTaskRt::new(),
-            shutdown,
-        }
-    }
+    pub(crate) blocking_task_rt: BlockingTaskRt,
+    pub(crate) shutdown: ShutdownChannel,
 }
 
 impl EventHandler for NodeEventHandler {
@@ -110,6 +84,7 @@ impl EventHandler for NodeEventHandler {
         // handlilng is supported
         let network = self.network;
         let lsp = self.lsp.clone();
+        let wallet = self.wallet.clone();
         let channel_manager = self.channel_manager.clone();
         let bitcoind = self.bitcoind.clone();
         let network_graph = self.network_graph.clone();
@@ -126,6 +101,7 @@ impl EventHandler for NodeEventHandler {
             handle_event(
                 network,
                 &lsp,
+                &wallet,
                 &channel_manager,
                 &bitcoind,
                 &network_graph,
@@ -146,6 +122,7 @@ impl EventHandler for NodeEventHandler {
 pub(crate) async fn handle_event(
     network: Network,
     lsp: &ChannelPeer,
+    wallet: &LexeWallet,
     channel_manager: &NodeChannelManager,
     bitcoind: &LexeBitcoind,
     network_graph: &NetworkGraphType,
@@ -159,6 +136,7 @@ pub(crate) async fn handle_event(
     let handle_event_res = handle_event_fallible(
         network,
         lsp,
+        wallet,
         channel_manager,
         bitcoind,
         network_graph,
@@ -180,6 +158,7 @@ pub(crate) async fn handle_event(
 async fn handle_event_fallible(
     network: Network,
     lsp: &ChannelPeer,
+    wallet: &LexeWallet,
     channel_manager: &NodeChannelManager,
     bitcoind: &LexeBitcoind,
     network_graph: &NetworkGraphType,
@@ -490,10 +469,7 @@ async fn handle_event_fallible(
             });
         }
         Event::SpendableOutputs { outputs } => {
-            let destination_address = bitcoind
-                .get_new_address()
-                .await
-                .context("Could not get new address")?;
+            let destination_address = wallet.get_new_address()?;
             let output_descriptors = &outputs.iter().collect::<Vec<_>>();
             let tx_feerate = bitcoind
                 .get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
diff --git a/node/src/run.rs b/node/src/run.rs
@@ -18,7 +18,7 @@ use common::enclave::{
 use common::rng::Crng;
 use common::root_seed::RootSeed;
 use common::shutdown::ShutdownChannel;
-use common::task::{joined_task_state_label, LxTask};
+use common::task::{joined_task_state_label, BlockingTaskRt, LxTask};
 use futures::future::TryFutureExt;
 use futures::stream::{FuturesUnordered, StreamExt};
 use lexe_ln::alias::{
@@ -78,7 +78,6 @@ pub struct UserNode {
     pub logger: LexeTracingLogger,
     pub persister: NodePersister,
     pub wallet: LexeWallet,
-    pub bitcoind_wallet: Arc<LexeBitcoind>, // TODO(max): Refactor this out
     block_source: Arc<BlockSourceType>,
     fee_estimator: Arc<FeeEstimatorType>,
     broadcaster: Arc<BroadcasterType>,
@@ -171,7 +170,6 @@ impl UserNode {
         // LexeBitcoind impls BlockSource, FeeEstimator and
         // BroadcasterInterface, and thus serves these functions.
         // A type alias is used for each as bitcoind is slowly refactored out
-        let bitcoind_wallet = bitcoind.clone();
         let block_source = bitcoind.clone();
         let fee_estimator = bitcoind.clone();
         let broadcaster = bitcoind.clone();
@@ -352,18 +350,20 @@ impl UserNode {
             Arc::new(Mutex::new(HashMap::new()));
         let outbound_payments: PaymentInfoStorageType =
             Arc::new(Mutex::new(HashMap::new()));
-        let event_handler = NodeEventHandler::new(
-            args.network,
-            args.lsp.clone(),
-            channel_manager.clone(),
-            keys_manager.clone(),
-            bitcoind.clone(),
-            network_graph.clone(),
-            inbound_payments.clone(),
-            outbound_payments.clone(),
-            test_event_tx.clone(),
-            shutdown.clone(),
-        );
+        let event_handler = NodeEventHandler {
+            network: args.network,
+            lsp: args.lsp.clone(),
+            wallet: wallet.clone(),
+            channel_manager: channel_manager.clone(),
+            keys_manager: keys_manager.clone(),
+            bitcoind: bitcoind.clone(),
+            network_graph: network_graph.clone(),
+            inbound_payments: inbound_payments.clone(),
+            outbound_payments: outbound_payments.clone(),
+            test_event_tx: test_event_tx.clone(),
+            blocking_task_rt: BlockingTaskRt::new(),
+            shutdown: shutdown.clone(),
+        };
 
         // Initialize InvoicePayer
         let router = DefaultRouter::new(
@@ -478,7 +478,6 @@ impl UserNode {
             logger,
             persister,
             wallet,
-            bitcoind_wallet,
             block_source,
             fee_estimator,
             broadcaster,
