Merge pull request #261 from nerdcash/taddr

Prepare for smarter t-addr downloads
nerdcash · Mar 4, 2024 · 78fbd5e · 78fbd5e
2 parents d7d810e + cc97978
commit 78fbd5e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/external/librustzcash b/external/librustzcash
diff --git a/src/nerdbank-zcash-rust/src/sync.rs b/src/nerdbank-zcash-rust/src/sync.rs
@@ -138,13 +138,14 @@ pub async fn sync<P: AsRef<Path>>(
 
         // Download all the transparent ops related to the wallet first.
         // We don't need batches for this as that would just multiply the number of LWD requests we have to make.
-        for (address, height) in db.data.get_transparent_addresses_and_sync_heights()? {
+        let taddrs_by_account = db.data.get_transparent_addresses_and_sync_heights()?;
+        for addr_info in taddrs_by_account {
             let txids = download_transparent_transactions(
                 &mut client,
                 &mut db,
                 &network,
-                &address,
-                height,
+                &addr_info.address,
+                addr_info.height,
                 tip_height,
                 cancellation_token.clone(),
             )
+12 −4		zcash_client_backend/src/data_api.rs
+3 −3		zcash_client_sqlite/src/lib.rs
+31 −8		zcash_client_sqlite/src/wallet.rs