Update to latest patch revision of librustzcash crates.

Cargo.toml

@@ -95,3 +95,17 @@ tui = [
     "dep:tokio-util",
     "dep:tui-logger",
 ]
+
+[patch.crates-io]
+equihash = { git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }
+pczt = { git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }
+transparent = { package = "zcash_transparent", git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }
+zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }
+zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }
+zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }
+zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }
+zcash_keys = { git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }
+zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }
+zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }
+zcash_protocol = { git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }
+zip321 = { git = "https://github.com/zcash/librustzcash.git", rev = "f615a73a673aec8acbcdebea668aff9f4bf4a154" }

src/commands/inspect/keys.rs

@@ -12,7 +12,7 @@ use zcash_address::{
     unified::{self, Encoding},
     ToAddress, ZcashAddress,
 };
-use zcash_keys::keys::UnifiedFullViewingKey;
+use zcash_keys::keys::{UnifiedAddressRequest, UnifiedFullViewingKey};
 use zcash_protocol::{
     consensus::{Network, NetworkConstants, NetworkType},
     local_consensus::LocalNetwork,
@@ -201,7 +201,9 @@ pub(crate) fn inspect_sapling_extsk(data: Vec<u8>, network: NetworkType) {
                 };
                 eprintln!("- UFVK: {encoded_ufvk}");
 
-                let (default_ua, _) = ufvk.default_address(None).expect("should exist");
+                let (default_ua, _) = ufvk
+                    .default_address(UnifiedAddressRequest::AllAvailableKeys)
+                    .expect("should exist");
                 let encoded_ua = match network {
                     NetworkType::Main => default_ua.encode(&Network::MainNetwork),
                     NetworkType::Test => default_ua.encode(&Network::TestNetwork),

src/commands/inspect/keys/view.rs

@@ -1,6 +1,6 @@
 use bech32::{Bech32, Hrp};
 use zcash_address::unified::{self, Container, Encoding};
-use zcash_keys::keys::UnifiedFullViewingKey;
+use zcash_keys::keys::{UnifiedAddressRequest, UnifiedFullViewingKey};
 use zcash_protocol::{
     consensus::{Network, NetworkConstants, NetworkType},
     local_consensus::LocalNetwork,
@@ -123,7 +123,9 @@ pub(crate) fn inspect_sapling_extfvk(data: Vec<u8>, network: NetworkType) {
                 };
                 eprintln!("- Equivalent UFVK: {encoded_ufvk}");
 
-                let (default_ua, _) = ufvk.default_address(None).expect("should exist");
+                let (default_ua, _) = ufvk
+                    .default_address(UnifiedAddressRequest::AllAvailableKeys)
+                    .expect("should exist");
                 let encoded_ua = match network {
                     NetworkType::Main => default_ua.encode(&Network::MainNetwork),
                     NetworkType::Test => default_ua.encode(&Network::TestNetwork),

src/commands/keystone.rs

@@ -7,7 +7,7 @@ use qrcode::{render::unicode, QrCode};
 use tokio::io::{stdout, AsyncWriteExt};
 use uuid::Uuid;
 use zcash_client_backend::data_api::Account;
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{util::SystemClock, WalletDb};
 
 use crate::{config::WalletConfig, data::get_db_paths, ShutdownListener};
 
@@ -44,7 +44,7 @@ impl Enroll {
         let params = config.network();
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
-        let db_data = WalletDb::for_path(db_data, params)?;
+        let db_data = WalletDb::for_path(db_data, params, SystemClock)?;
         let account = select_account(&db_data, self.account_id)?;
 
         let key_derivation = account

src/commands/pczt/create.rs

@@ -17,7 +17,7 @@ use zcash_client_backend::{
     fees::{standard::MultiOutputChangeStrategy, DustOutputPolicy, SplitPolicy, StandardFeeRule},
     wallet::OvkPolicy,
 };
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{util::SystemClock, WalletDb};
 use zcash_protocol::{
     memo::{Memo, MemoBytes},
     value::Zatoshis,
@@ -64,7 +64,7 @@ impl Command {
         let params = config.network();
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
-        let mut db_data = WalletDb::for_path(db_data, params)?;
+        let mut db_data = WalletDb::for_path(db_data, params, SystemClock)?;
         let account = select_account(&db_data, self.account_id)?;
 
         // Create the PCZT.

src/commands/pczt/send.rs

@@ -6,7 +6,7 @@ use zcash_client_backend::{
     data_api::{wallet::extract_and_store_transaction_from_pczt, WalletRead},
     proto::service,
 };
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{util::SystemClock, WalletDb};
 use zcash_proofs::prover::LocalTxProver;
 
 use crate::{
@@ -35,7 +35,7 @@ impl Command {
         let params = config.network();
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
-        let mut db_data = WalletDb::for_path(db_data, params)?;
+        let mut db_data = WalletDb::for_path(db_data, params, SystemClock)?;
 
         let server = self.server.pick(params)?;
         let mut client = if self.disable_tor {
@@ -56,9 +56,8 @@ impl Command {
         let txid = extract_and_store_transaction_from_pczt::<_, ()>(
             &mut db_data,
             pczt,
-            &spend_vk,
-            &output_vk,
-            &orchard::circuit::VerifyingKey::build(),
+            Some((&spend_vk, &output_vk)),
+            Some(&orchard::circuit::VerifyingKey::build()),
         )
         .map_err(|e| anyhow!("Failed to extract and store transaction from PCZT: {:?}", e))?;
 

src/commands/pczt/shield.rs

@@ -14,7 +14,7 @@ use zcash_client_backend::{
     fees::{standard::MultiOutputChangeStrategy, DustOutputPolicy, SplitPolicy, StandardFeeRule},
     wallet::OvkPolicy,
 };
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{util::SystemClock, WalletDb};
 use zcash_protocol::{value::Zatoshis, ShieldedProtocol};
 
 use crate::{commands::select_account, config::WalletConfig, data::get_db_paths, error};
@@ -42,7 +42,7 @@ impl Command {
         let params = config.network();
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
-        let mut db_data = WalletDb::for_path(db_data, params)?;
+        let mut db_data = WalletDb::for_path(db_data, params, SystemClock)?;
         let account = select_account(&db_data, self.account_id)?;
 
         // Create the PCZT.

src/commands/wallet/balance.rs

@@ -9,6 +9,7 @@ use zcash_client_backend::{
     tor,
 };
 use zcash_client_sqlite::WalletDb;
+use zcash_keys::keys::UnifiedAddressRequest;
 use zcash_protocol::value::{Zatoshis, COIN};
 
 use crate::{
@@ -33,11 +34,14 @@ impl Command {
         let params = get_wallet_network(wallet_dir.as_ref())?;
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
-        let db_data = WalletDb::for_path(db_data, params)?;
+        let db_data = WalletDb::for_path(db_data, params, ())?;
         let account = select_account(&db_data, self.account_id)?;
 
         let address = db_data
-            .get_current_address(account.id())?
+            .get_last_generated_address_matching(
+                account.id(),
+                UnifiedAddressRequest::AllAvailableKeys,
+            )?
             .ok_or(error::Error::InvalidRecipient)?;
 
         let printer = if let Some(currency) = self.convert {

src/commands/wallet/enhance.rs

@@ -14,7 +14,7 @@ use zcash_client_backend::{
         self, compact_tx_streamer_client::CompactTxStreamerClient, BlockRange, RawTransaction,
     },
 };
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{util::SystemClock, WalletDb};
 use zcash_keys::encoding::AddressCodec;
 use zcash_primitives::transaction::{Transaction, TxId};
 use zcash_protocol::consensus::{BlockHeight, BranchId, Network};
@@ -87,7 +87,7 @@ impl Command {
         let params = get_wallet_network(wallet_dir.as_ref())?;
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
 
-        let mut db_data = WalletDb::for_path(db_data, params)?;
+        let mut db_data = WalletDb::for_path(db_data, params, SystemClock)?;
         let chain_tip = db_data.chain_height()?.ok_or_else(|| {
             anyhow!("Chain height must be available to perform transaction enhancement.")
         })?;

src/commands/wallet/import_ufvk.rs

@@ -6,7 +6,7 @@ use zcash_client_backend::{
     data_api::{AccountBirthday, AccountPurpose, WalletWrite, Zip32Derivation},
     proto::service,
 };
-use zcash_client_sqlite::WalletDb;
+use zcash_client_sqlite::{util::SystemClock, WalletDb};
 use zcash_keys::keys::UnifiedFullViewingKey;
 use zcash_protocol::consensus;
 use zip32::fingerprint::SeedFingerprint;
@@ -63,7 +63,7 @@ impl Command {
         }?;
 
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
-        let mut db_data = WalletDb::for_path(db_data, params)?;
+        let mut db_data = WalletDb::for_path(db_data, params, SystemClock)?;
 
         // Construct an `AccountBirthday` for the account's birthday.
         let birthday = {

src/commands/wallet/list_accounts.rs

@@ -12,7 +12,7 @@ impl Command {
     pub(crate) fn run(self, wallet_dir: Option<String>) -> anyhow::Result<()> {
         let params = get_wallet_network(wallet_dir.as_ref())?;
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
-        let db_data = WalletDb::for_path(db_data, params)?;
+        let db_data = WalletDb::for_path(db_data, params, ())?;
 
         for account_id in db_data.get_account_ids()?.iter() {
             let account = db_data.get_account(*account_id)?.unwrap();

src/commands/wallet/list_addresses.rs

@@ -2,6 +2,7 @@ use clap::Args;
 use uuid::Uuid;
 use zcash_client_backend::data_api::Account;
 use zcash_client_sqlite::WalletDb;
+use zcash_keys::keys::UnifiedAddressRequest;
 
 use crate::{commands::select_account, config::get_wallet_network, data::get_db_paths};
 
@@ -16,12 +17,14 @@ impl Command {
     pub(crate) fn run(self, wallet_dir: Option<String>) -> anyhow::Result<()> {
         let params = get_wallet_network(wallet_dir.as_ref())?;
         let (_, db_data) = get_db_paths(wallet_dir.as_ref());
-        let db_data = WalletDb::for_path(db_data, params)?;
+        let db_data = WalletDb::for_path(db_data, params, ())?;
 
         let account = select_account(&db_data, self.account_id)?;
 
         println!("Account {:?}", account.id());
-        let (ua, _) = account.uivk().default_address(None)?;
+        let (ua, _) = account
+            .uivk()
+            .default_address(UnifiedAddressRequest::AllAvailableKeys)?;
         println!("     Default Address: {}", ua.encode(&params));
         Ok(())
     }

src/commands/wallet/list_unspent.rs

@@ -24,7 +24,7 @@ impl Command {
         let params = get_wallet_network(wallet_dir.as_ref())?;
 
         let (_, db_data) = get_db_paths(wallet_dir);
-        let db_data = WalletDb::for_path(db_data, params)?;
+        let db_data = WalletDb::for_path(db_data, params, ())?;
         let account = select_account(&db_data, self.account_id)?;
 
         // Use the height of the maximum scanned block as the anchor height, to emulate a