temp: taking a look at not passing the wallet to the builder

Author: thunderbiscuit

examples/example.rs

@@ -63,8 +63,12 @@ async fn main() -> anyhow::Result<()> {
         mut update_subscriber,
         node,
     } = Builder::new(NETWORK)
-        .build_with_wallet(&wallet, scan_type)
-        .unwrap();
+        .build_with_wallet(
+            wallet.spk_index().clone(),
+            wallet.latest_checkpoint(),
+            wallet.network(),
+            scan_type
+        )?;
 
     tokio::task::spawn(async move { node.run().await });
     tokio::task::spawn(async move { traces(info_subscriber, warning_subscriber).await });

src/builder.rs

@@ -52,10 +52,9 @@
 
 use std::fmt::Display;
 
-use bdk_wallet::{
-    chain::{CheckPoint, IndexedTxGraph},
-    Wallet,
-};
+use bdk_wallet::{chain::{CheckPoint, IndexedTxGraph}, KeychainKind};
+use bdk_wallet::bitcoin::Network;
+use bdk_wallet::chain::keychain_txout::KeychainTxOutIndex;
 pub use bip157::Builder;
 use bip157::{chain::ChainState, HeaderCheckpoint};
 
@@ -68,24 +67,27 @@ pub trait BuilderExt {
     /// Attempt to build the node with scripts from a [`Wallet`] and following a [`ScanType`].
     fn build_with_wallet(
         self,
-        wallet: &Wallet,
+        txout_index: KeychainTxOutIndex<KeychainKind>,
+        chain_tip: CheckPoint,
+        network: Network,
         scan_type: ScanType,
     ) -> Result<LightClient, BuilderError>;
 }
 
 impl BuilderExt for Builder {
     fn build_with_wallet(
         mut self,
-        wallet: &Wallet,
+        txout_index: KeychainTxOutIndex<KeychainKind>,
+        chain_tip: CheckPoint,
+        network: Network,
         scan_type: ScanType,
     ) -> Result<LightClient, BuilderError> {
-        let network = wallet.network();
         if self.network().ne(&network) {
             return Err(BuilderError::NetworkMismatch);
         }
         match scan_type {
             ScanType::Sync => {
-                let current_cp = wallet.latest_checkpoint();
+                let current_cp = chain_tip.clone();
                 let sync_start = walk_back_max_reorg(current_cp);
                 self = self.chain_state(ChainState::Checkpoint(sync_start));
             }
@@ -101,12 +103,12 @@ impl BuilderExt for Builder {
             warn_rx,
             event_rx,
         } = client;
-        let indexed_graph = IndexedTxGraph::new(wallet.spk_index().clone());
+        let indexed_graph = IndexedTxGraph::new(txout_index);
         let update_subscriber = UpdateSubscriber::new(
             requester.clone(),
             scan_type,
             event_rx,
-            wallet.latest_checkpoint(),
+            chain_tip,
             indexed_graph,
         );
         Ok(LightClient {

tests/client.rs

@@ -52,7 +52,13 @@ fn init_node(
         .add_peer(peer)
         .data_dir(tempdir)
         .required_peers(1)
-        .build_with_wallet(wallet, ScanType::Sync)?)
+        .build_with_wallet(
+            wallet.spk_index().clone(),
+            wallet.latest_checkpoint(),
+            wallet.network(),
+            ScanType::Sync
+        )?
+    )
 }
 
 #[tokio::test]