compiles now

Author: ec2

crates/webzjs-wallet/src/bindgen/mod.rs

@@ -1,4 +1,2 @@
-use serde::{Deserialize, Serialize};
-
 pub mod proposal;
 pub mod wallet;

crates/webzjs-wallet/src/bindgen/wallet.rs

@@ -2,7 +2,6 @@ use std::num::NonZeroU32;
 use std::str::FromStr;
 
 use nonempty::NonEmpty;
-use prost::Message;
 use serde::{Deserialize, Serialize};
 use wasm_bindgen::prelude::*;
 
@@ -13,15 +12,16 @@ use crate::wallet::usk_from_seed_str;
 use crate::{bindgen::proposal::Proposal, Wallet, PRUNING_DEPTH};
 use wasm_thread as thread;
 use webzjs_common::{Network, Pczt};
-use webzjs_keys::{ProofGenerationKey, SeedFingerprint, UnifiedSpendingKey};
+use webzjs_keys::{ProofGenerationKey, SeedFingerprint};
 use zcash_address::ZcashAddress;
+use zcash_client_backend::data_api::wallet::ConfirmationsPolicy;
 use zcash_client_backend::data_api::{AccountPurpose, InputSource, WalletRead, Zip32Derivation};
 use zcash_client_backend::proto::service::{
     compact_tx_streamer_client::CompactTxStreamerClient, ChainSpec,
 };
 use zcash_client_memory::MemoryWalletDb;
 use zcash_keys::encoding::AddressCodec;
-use zcash_keys::keys::UnifiedFullViewingKey;
+use zcash_keys::keys::{UnifiedAddressRequest, UnifiedFullViewingKey};
 use zcash_primitives::transaction::TxId;
 
 pub type MemoryWallet<T> = Wallet<MemoryWalletDb<Network>, T>;
@@ -129,12 +129,19 @@ impl WebWallet {
     pub fn new(
         network: &str,
         lightwalletd_url: &str,
-        min_confirmations: u32,
+        min_confirmations_trusted: u32,
+        min_confirmations_untrusted: u32,
         db_bytes: Option<Box<[u8]>>,
     ) -> Result<WebWallet, Error> {
         let network = Network::from_str(network)?;
-        let min_confirmations = NonZeroU32::try_from(min_confirmations)
-            .map_err(|_| Error::InvalidMinConformations(min_confirmations))?;
+        let min_confirmations_trusted = NonZeroU32::try_from(min_confirmations_trusted)
+            .map_err(|_| Error::InvalidMinConformations)?;
+        let min_confirmations_untrusted = NonZeroU32::try_from(min_confirmations_untrusted)
+            .map_err(|_| Error::InvalidMinConformations)?;
+
+        let min_confirmations =
+            ConfirmationsPolicy::new(min_confirmations_trusted, min_confirmations_untrusted, true)
+                .map_err(|_| Error::InvalidMinConformations)?;
         let client = Client::new(lightwalletd_url.to_string());
 
         let db = match db_bytes {
@@ -431,7 +438,10 @@ impl WebWallet {
     ///
     pub async fn get_current_address(&self, account_id: u32) -> Result<String, Error> {
         let db = self.inner.db.read().await;
-        if let Some(address) = db.get_current_address(account_id.into())? {
+        if let Some(address) = db.get_last_generated_address_matching(
+            account_id.into(),
+            UnifiedAddressRequest::ALLOW_ALL,
+        )? {
             Ok(address.encode(&self.inner.network))
         } else {
             Err(Error::AccountNotFound(account_id))
@@ -517,7 +527,10 @@ impl WebWallet {
     ///
     pub async fn get_current_address_transparent(&self, account_id: u32) -> Result<String, Error> {
         let db = self.inner.db.read().await;
-        if let Some(address) = db.get_current_address(account_id.into())? {
+        if let Some(address) = db.get_last_generated_address_matching(
+            account_id.into(),
+            UnifiedAddressRequest::ALLOW_ALL,
+        )? {
             Ok(address.transparent().unwrap().encode(&self.inner.network))
         } else {
             Err(Error::AccountNotFound(account_id))

crates/webzjs-wallet/src/error.rs

@@ -41,10 +41,8 @@ pub enum Error {
     Scan(zcash_client_backend::scanning::ScanError),
     #[error("IO Error: {0}")]
     Io(#[from] std::io::Error),
-    #[error(
-        "Error parsing min_confirmations argument {0}. Must be an integer > 0 (e.g. at least 1)"
-    )]
-    InvalidMinConformations(u32),
+    #[error("Error parsing min_confirmations. Must be an integer > 0 (e.g. at least 1)")]
+    InvalidMinConformations,
     #[error("Error parsing zatoshi amount: {0}")]
     InvalidAmount(#[from] zcash_protocol::value::BalanceError),
     #[error("Failed to send transaction")]

crates/webzjs-wallet/src/wallet.rs

@@ -1,4 +1,4 @@
-use std::num::{NonZeroU32, NonZeroUsize};
+use std::num::NonZeroUsize;
 
 use bip0039::{English, Mnemonic};
 use nonempty::NonEmpty;
@@ -29,7 +29,7 @@ use zcash_address::ZcashAddress;
 use zcash_client_backend::data_api::wallet::{
     create_pczt_from_proposal, create_proposed_transactions,
     extract_and_store_transaction_from_pczt, input_selection::GreedyInputSelector,
-    propose_shielding, propose_transfer,
+    propose_shielding, propose_transfer, ConfirmationsPolicy, SpendingKeys,
 };
 use zcash_client_backend::data_api::{
     Account, AccountBirthday, AccountPurpose, InputSource, WalletRead, WalletSummary, WalletWrite,
@@ -88,7 +88,7 @@ pub struct Wallet<W, T> {
     // gRPC client used to connect to a lightwalletd instance for network data
     pub(crate) client: CompactTxStreamerClient<T>,
     pub(crate) network: Network,
-    pub(crate) min_confirmations: NonZeroU32,
+    pub(crate) min_confirmations: ConfirmationsPolicy,
     /// Note management: the number of notes to maintain in the wallet
     pub(crate) target_note_count: usize,
     /// Note management: the minimum allowed value for split change amounts
@@ -154,7 +154,7 @@ where
         db: W,
         client: T,
         network: Network,
-        min_confirmations: NonZeroU32,
+        min_confirmations: ConfirmationsPolicy,
     ) -> Result<Self, Error> {
         Ok(Wallet {
             db: Arc::new(RwLock::new(db)),
@@ -294,7 +294,7 @@ where
             .db
             .read()
             .await
-            .get_wallet_summary(self.min_confirmations.into())?)
+            .get_wallet_summary(self.min_confirmations)?)
     }
 
     ///
@@ -330,7 +330,7 @@ where
             self.db
                 .read()
                 .await
-                .get_target_and_anchor_heights(self.min_confirmations)?
+                .get_target_and_anchor_heights(self.min_confirmations.trusted())?
         );
         let mut db = self.db.write().await;
         let proposal = propose_transfer::<_, _, _,_, <W as WalletCommitmentTrees>::Error>(
@@ -372,7 +372,7 @@ where
             &self.network,
             &prover,
             &prover,
-            usk,
+            &SpendingKeys::from_unified_spending_key(usk.clone()),
             OvkPolicy::Sender,
             &proposal,
         )
@@ -459,7 +459,8 @@ where
             }
         };
 
-        let transparent_balances = db.get_transparent_balances(account_id, max_height)?;
+        let transparent_balances =
+            db.get_transparent_balances(account_id, max_height.into(), self.min_confirmations)?;
         let from_addrs = transparent_balances.into_keys().collect::<Vec<_>>();
 
         let proposal = propose_shielding::<_, _, _, _, <W as WalletCommitmentTrees>::Error>(
@@ -470,7 +471,7 @@ where
             SHIELDING_THRESHOLD, // use a shielding threshold above a marginal fee transaction plus some value like Zashi does.
             &from_addrs,
             account_id,
-            1, // librustzcash operates under the assumption of zero or one conf being the same but that could change.
+            self.min_confirmations, // librustzcash operates under the assumption of zero or one conf being the same but that could change.
         )
         .map_err(|e| Error::Generic(format!("Error when shielding: {:?}", e)))?;
 
@@ -617,9 +618,8 @@ where
         let txid = extract_and_store_transaction_from_pczt::<_, ()>(
             &mut *db,
             pczt,
-            &spend_vk,
-            &output_vk,
-            &orchard::circuit::VerifyingKey::build(),
+            Some((&spend_vk, &output_vk)),
+            Some(&orchard::circuit::VerifyingKey::build()),
         )
         .map_err(|e| {
             Error::PcztSend(format!(