Dev

zcash_client_backend/CHANGELOG.md

@@ -5,7 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this library adheres to Rust's notion of
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [Zingo]
+- replace create_proposed_transaction with `calculate_proposed_transaction`
+  - dont try to write the calculated transaction to wallet, that will be handled later
+  - ignore collecting any transaction metadata
+  - handle usk differently
+- modify change algorithm
+- added display for NoteId
 
 ## [0.12.1] - 2024-03-27
 

zcash_client_backend/src/data_api/wallet.rs

@@ -36,7 +36,7 @@
 use nonempty::NonEmpty;
 use rand_core::OsRng;
 use sapling::{
     note_encryption::{try_sapling_note_decryption, PreparedIncomingViewingKey},
     prover::{OutputProver, SpendProver},
 };
 use std::num::NonZeroU32;
@@ -45,20 +45,20 @@
 use crate::{
     address::Address,
     data_api::{
         error::Error, Account, SentTransaction, SentTransactionOutput, WalletCommitmentTrees,
         WalletRead, WalletWrite,
     },
     decrypt_transaction,
     fees::{self, DustOutputPolicy},
     keys::UnifiedSpendingKey,
     proposal::{self, Proposal, ProposalError},
-    wallet::{Note, OvkPolicy, Recipient},
+    wallet::{Note, OvkPolicy, Recipient, TransparentAddressMetadata},
     zip321::{self, Payment},
     PoolType, ShieldedProtocol,
 };
 use zcash_primitives::transaction::{
     builder::{BuildConfig, BuildResult, Builder},
     components::{amount::NonNegativeAmount, sapling::zip212_enforcement},
     fees::{zip317::FeeError as Zip317FeeError, FeeRule, StandardFeeRule},
     Transaction, TxId,
 };
@@ -584,13 +584,13 @@
 #[allow(clippy::too_many_arguments)]
 #[allow(clippy::type_complexity)]
 pub fn create_proposed_transactions<DbT, ParamsT, InputsErrT, FeeRuleT, N>(
     wallet_db: &mut DbT,
     params: &ParamsT,
     spend_prover: &impl SpendProver,
     output_prover: &impl OutputProver,
     usk: &UnifiedSpendingKey,
     ovk_policy: OvkPolicy,
     proposal: &Proposal<FeeRuleT, N>,
 ) -> Result<
     NonEmpty<TxId>,
     Error<
@@ -606,7 +606,7 @@
     FeeRuleT: FeeRule,
 {
     unimplemented!();
     let mut step_results = Vec::with_capacity(proposal.steps().len());
     for step in proposal.steps() {
         let step_result = calculate_proposed_transaction(
             wallet_db,
@@ -619,6 +619,7 @@
             proposal.min_target_height(),
             &step_results,
             step,
+            None,
         )?;
         step_results.push((step, step_result));
     }
@@ -646,6 +647,9 @@
     min_target_height: BlockHeight,
     prior_step_results: &[(&proposal::Step<N>, BuildResult)],
     proposal_step: &proposal::Step<N>,
+    usk_to_tkey: Option<
+        fn(&UnifiedSpendingKey, &TransparentAddressMetadata) -> hdwallet::secp256k1::SecretKey,
+    >,
 ) -> Result<
     BuildResult,
     Error<
@@ -800,7 +804,7 @@
     }
 
     #[cfg(feature = "transparent-inputs")]
     let utxos_spent = {
         let known_addrs = wallet_db
             .get_transparent_receivers(account)
             .map_err(Error::DataSource)?;
@@ -824,10 +828,16 @@
                 .clone()
                 .ok_or_else(|| Error::NoSpendingKey(addr.encode(params)))?;
 
-            let secret_key = usk
-                .transparent()
-                .derive_secret_key(address_metadata.scope(), address_metadata.address_index())
-                .unwrap();
+            let secret_key = usk_to_tkey
+                .map(|f| f(usk, &address_metadata))
+                .unwrap_or_else(|| {
+                    usk.transparent()
+                        .derive_secret_key(
+                            address_metadata.scope(),
+                            address_metadata.address_index(),
+                        )
+                        .unwrap()
+                });
 
             utxos_spent.push(outpoint.clone());
             builder.add_transparent_input(secret_key, outpoint, utxo)?;

zcash_client_backend/src/fees/common.rs

@@ -203,7 +203,15 @@ where
     })?;
 
     if proposed_change.is_zero() {
-        TransactionBalance::new(vec![], fee_amount).map_err(|_| overflow())
+        TransactionBalance::new(
+            vec![ChangeValue::new(
+                _fallback_change_pool,
+                NonNegativeAmount::const_from_u64(0),
+                change_memo,
+            )],
+            fee_amount,
+        )
+        .map_err(|_| overflow())
     } else {
         let dust_threshold = dust_output_policy
             .dust_threshold()

zcash_client_backend/src/wallet.rs

@@ -1,6 +1,8 @@
 //! Structs representing transaction data scanned from the block chain by a wallet or
 //! light client.
 
+use std::fmt;
+
 use incrementalmerkletree::Position;
 use zcash_keys::address::Address;
 use zcash_note_encryption::EphemeralKeyBytes;
@@ -62,6 +64,18 @@ impl NoteId {
     }
 }
 
+impl fmt::Display for NoteId {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "txid {} protocol {:?} output_index {}",
+            self.txid(),
+            self.protocol(),
+            self.output_index()
+        )
+    }
+}
+
 /// A type that represents the recipient of a transaction output: a recipient address (and, for
 /// unified addresses, the pool to which the payment is sent) in the case of an outgoing output, or an
 /// internal account ID and the pool to which funds were sent in the case of a wallet-internal