From cc97978ee3b8f3be6d20fd42a99d9d9fbcfdd1ba Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Tue, 27 Feb 2024 21:27:18 -0700 Subject: [PATCH] Prepare for smarter t-addr downloads It is necessary to know zip-32 address indexes so we can fulfill the gap limit for automatic funds discovery. --- external/librustzcash | 2 +- src/nerdbank-zcash-rust/src/sync.rs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/external/librustzcash b/external/librustzcash index 01bb6c70..2423bc35 160000 --- a/external/librustzcash +++ b/external/librustzcash @@ -1 +1 @@ -Subproject commit 01bb6c709cb1a0e9957b70e8eb803ccbdc31bf7e +Subproject commit 2423bc35c9a4235504bff4cf3e8f172f355a61c2 diff --git a/src/nerdbank-zcash-rust/src/sync.rs b/src/nerdbank-zcash-rust/src/sync.rs index 6e022c38..28334173 100644 --- a/src/nerdbank-zcash-rust/src/sync.rs +++ b/src/nerdbank-zcash-rust/src/sync.rs @@ -138,13 +138,14 @@ pub async fn sync>( // 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(), )