zcash_client_backend: Permit spending pool selection.

zcash_client_backend/CHANGELOG.md

@@ -15,6 +15,7 @@ and this library adheres to Rust's notion of
 - `zcash_client_backend::data_api`:
   - `AccountBalance::with_orchard_balance_mut`
   - `AccountBirthday::orchard_frontier`
+  - `AccountSources`
   - `BlockMetadata::orchard_tree_size`
   - `DecryptedTransaction::{new, tx(), orchard_outputs()}`
   - `ScannedBlock::orchard`
@@ -49,10 +50,14 @@ and this library adheres to Rust's notion of
   - Arguments to `ScannedBlock::from_parts` have changed.
   - Changes to the `WalletRead` trait:
     - Added `get_orchard_nullifiers`
+    - `get_account_for_ufvk` now returns an `AccountSources` instead of a bare
+      `AccountId`
   - Changes to the `InputSource` trait:
-    - `select_spendable_notes` now takes its `target_value` argument as a
-      `NonNegativeAmount`. Also, the values of the returned map are also
-      `NonNegativeAmount`s instead of `Amount`s.
+    - `select_spendable_notes` has changed:
+      - It now takes its `target_value` argument as a `NonNegativeAmount`.
+      - Instead of an `AccountId`, it takes an `AccountSources` argument. The
+        separate `sources` argument has been removed.
+      - The values of the returned map are `NonNegativeAmount`s instead of `Amount`s.
   - Fields of `DecryptedTransaction` are now private. Use `DecryptedTransaction::new`
     and the newly provided accessors instead.
   - Fields of `SentTransaction` are now private. Use `SentTransaction::new`
@@ -64,6 +69,10 @@ and this library adheres to Rust's notion of
     - `fn put_orchard_subtree_roots`
   - Added method `WalletRead::validate_seed`
   - Removed `Error::AccountNotFound` variant.
+  - `wallet::input_selection::InputSelector::propose_transaction` now takes an
+    `AccountSources` rather than a bare `AccountId`.
+  - `wallet::{propose_transfer, propose_standard_transfer_to_address}` now
+    each take an `AccountSources` instead of a bare `AccountId`.
 - `zcash_client_backend::decrypt`:
   - Fields of `DecryptedOutput` are now private. Use `DecryptedOutput::new`
     and the newly provided accessors instead.

zcash_client_backend/src/data_api.rs

@@ -308,6 +308,68 @@ impl AccountBalance {
     }
 }
 
+/// A type that describes what FVK components are known to the wallet for an account.
+#[derive(Clone, Copy, Debug)]
+pub struct AccountSources<AccountId> {
+    account_id: AccountId,
+    use_orchard: bool,
+    use_sapling: bool,
+    use_transparent: bool,
+}
+
+impl<AccountId: Copy> AccountSources<AccountId> {
+    /// Constructs AccountSources from its constituent parts
+    pub fn new(
+        account_id: AccountId,
+        use_orchard: bool,
+        use_sapling: bool,
+        use_transparent: bool,
+    ) -> Self {
+        Self {
+            account_id,
+            use_orchard,
+            use_sapling,
+            use_transparent,
+        }
+    }
+
+    /// Returns the id for the account to which this metadata applies.
+    pub fn account_id(&self) -> AccountId {
+        self.account_id
+    }
+
+    /// Returns whether the account has an Orchard balance and spendability determination
+    /// capability.
+    pub fn use_orchard(&self) -> bool {
+        self.use_orchard
+    }
+
+    /// Returns whether the account has an Sapling balance and spendability determination
+    /// capability.
+    pub fn use_sapling(&self) -> bool {
+        self.use_sapling
+    }
+
+    /// Returns whether the account has a Transparent balance determination capability.
+    pub fn use_transparent(&self) -> bool {
+        self.use_transparent
+    }
+
+    /// Restricts the sources to be used to those for which the given [`UnifiedSpendingKey`]
+    /// provides a spending capability.
+    pub fn filter_with_usk(&mut self, usk: &UnifiedSpendingKey) {
+        self.use_orchard &= usk.has_orchard();
+        self.use_sapling &= usk.has_sapling();
+        self.use_transparent &= usk.has_transparent();
+    }
+
+    /// Returns the [`UnifiedAddressRequest`] that will produce a [`UnifiedAddress`] having
+    /// receivers corresponding to the spending capabilities described by this value.
+    pub fn to_unified_address_request(&self) -> Option<UnifiedAddressRequest> {
+        UnifiedAddressRequest::new(self.use_orchard, self.use_sapling, self.use_transparent)
+    }
+}
+
 /// A polymorphic ratio type, usually used for rational numbers.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct Ratio<T> {
@@ -444,9 +506,8 @@ pub trait InputSource {
     /// be included.
     fn select_spendable_notes(
         &self,
-        account: Self::AccountId,
+        inputs_from: AccountSources<Self::AccountId>,
         target_value: NonNegativeAmount,
-        sources: &[ShieldedProtocol],
         anchor_height: BlockHeight,
         exclude: &[Self::NoteRef],
     ) -> Result<Vec<ReceivedNote<Self::NoteRef, Note>>, Self::Error>;
@@ -606,7 +667,7 @@ pub trait WalletRead {
     fn get_account_for_ufvk(
         &self,
         ufvk: &UnifiedFullViewingKey,
-    ) -> Result<Option<Self::AccountId>, Self::Error>;
+    ) -> Result<Option<AccountSources<Self::AccountId>>, Self::Error>;
 
     /// Returns the wallet balances and sync status for an account given the specified minimum
     /// number of confirmations, or `Ok(None)` if the wallet has no balance data available.
@@ -1372,9 +1433,10 @@ pub mod testing {
     };
 
     use super::{
-        chain::CommitmentTreeRoot, scanning::ScanRange, AccountBirthday, BlockMetadata,
-        DecryptedTransaction, InputSource, NullifierQuery, ScannedBlock, SentTransaction,
-        WalletCommitmentTrees, WalletRead, WalletSummary, WalletWrite, SAPLING_SHARD_HEIGHT,
+        chain::CommitmentTreeRoot, scanning::ScanRange, AccountBirthday, AccountSources,
+        BlockMetadata, DecryptedTransaction, InputSource, NullifierQuery, ScannedBlock,
+        SentTransaction, WalletCommitmentTrees, WalletRead, WalletSummary, WalletWrite,
+        SAPLING_SHARD_HEIGHT,
     };
 
     #[cfg(feature = "transparent-inputs")]
@@ -1425,9 +1487,8 @@ pub mod testing {
 
         fn select_spendable_notes(
             &self,
-            _account: Self::AccountId,
+            _inputs_from: AccountSources<Self::AccountId>,
             _target_value: NonNegativeAmount,
-            _sources: &[ShieldedProtocol],
             _anchor_height: BlockHeight,
             _exclude: &[Self::NoteRef],
         ) -> Result<Vec<ReceivedNote<Self::NoteRef, Note>>, Self::Error> {
@@ -1523,7 +1584,7 @@ pub mod testing {
         fn get_account_for_ufvk(
             &self,
             _ufvk: &UnifiedFullViewingKey,
-        ) -> Result<Option<Self::AccountId>, Self::Error> {
+        ) -> Result<Option<AccountSources<Self::AccountId>>, Self::Error> {
             Ok(None)
         }
 

zcash_client_backend/src/data_api/wallet.rs

@@ -41,7 +41,7 @@ use sapling::{
 };
 use std::num::NonZeroU32;
 
-use super::InputSource;
+use super::{AccountSources, InputSource};
 use crate::{
     address::Address,
     data_api::{
@@ -405,7 +405,7 @@ where
 pub fn propose_transfer<DbT, ParamsT, InputsT, CommitmentTreeErrT>(
     wallet_db: &mut DbT,
     params: &ParamsT,
-    spend_from_account: <DbT as InputSource>::AccountId,
+    sources: AccountSources<<DbT as InputSource>::AccountId>,
     input_selector: &InputsT,
     request: zip321::TransactionRequest,
     min_confirmations: NonZeroU32,
@@ -435,7 +435,7 @@ where
             wallet_db,
             target_height,
             anchor_height,
-            spend_from_account,
+            sources,
             request,
         )
         .map_err(Error::from)
@@ -453,9 +453,10 @@ where
 /// * `wallet_db`: A read/write reference to the wallet database.
 /// * `params`: Consensus parameters.
 /// * `fee_rule`: The fee rule to use in creating the transaction.
-/// * `spend_from_account`: The unified account that controls the funds that will be spent
-///   in the resulting transaction. This procedure will return an error if the
-///   account ID does not correspond to an account known to the wallet.
+/// * `sources`: Metadata that describes the unified account and the pools from which
+///   funds may be spent in the resulting transaction. This procedure will return an
+///   error if the contained account ID does not correspond to an account known to
+///   the wallet.
 /// * `min_confirmations`: The minimum number of confirmations that a previously
 ///   received note must have in the blockchain in order to be considered for being
 ///   spent. A value of 10 confirmations is recommended and 0-conf transactions are
@@ -472,7 +473,7 @@ pub fn propose_standard_transfer_to_address<DbT, ParamsT, CommitmentTreeErrT>(
     wallet_db: &mut DbT,
     params: &ParamsT,
     fee_rule: StandardFeeRule,
-    spend_from_account: <DbT as InputSource>::AccountId,
+    sources: AccountSources<<DbT as InputSource>::AccountId>,
     min_confirmations: NonZeroU32,
     to: &Address,
     amount: NonNegativeAmount,
@@ -520,7 +521,7 @@ where
     propose_transfer(
         wallet_db,
         params,
-        spend_from_account,
+        sources,
         &input_selector,
         request,
         min_confirmations,
@@ -694,7 +695,8 @@ where
     let account = wallet_db
         .get_account_for_ufvk(&usk.to_unified_full_viewing_key())
         .map_err(Error::DataSource)?
-        .ok_or(Error::KeyNotRecognized)?;
+        .ok_or(Error::KeyNotRecognized)?
+        .account_id();
 
     let (sapling_anchor, sapling_inputs) =
         if proposal_step.involves(PoolType::Shielded(ShieldedProtocol::Sapling)) {

zcash_client_backend/src/data_api/wallet/input_selection.rs

@@ -21,7 +21,7 @@ use zcash_primitives::{
 
 use crate::{
     address::{Address, UnifiedAddress},
-    data_api::InputSource,
+    data_api::{AccountSources, InputSource},
     fees::{sapling, ChangeError, ChangeStrategy, DustOutputPolicy},
     proposal::{Proposal, ProposalError, ShieldedInputs},
     wallet::{Note, ReceivedNote, WalletTransparentOutput},
@@ -148,7 +148,7 @@ pub trait InputSelector {
         wallet_db: &Self::InputSource,
         target_height: BlockHeight,
         anchor_height: BlockHeight,
-        account: <Self::InputSource as InputSource>::AccountId,
+        sources: AccountSources<<Self::InputSource as InputSource>::AccountId>,
         transaction_request: TransactionRequest,
     ) -> Result<
         Proposal<Self::FeeRule, <Self::InputSource as InputSource>::NoteRef>,
@@ -328,7 +328,7 @@ where
         wallet_db: &Self::InputSource,
         target_height: BlockHeight,
         anchor_height: BlockHeight,
-        account: <DbT as InputSource>::AccountId,
+        sources: AccountSources<<DbT as InputSource>::AccountId>,
         transaction_request: TransactionRequest,
     ) -> Result<
         Proposal<Self::FeeRule, DbT::NoteRef>,
@@ -454,19 +454,8 @@ where
                 Err(other) => return Err(other.into()),
             }
 
-            #[cfg(not(feature = "orchard"))]
-            let selectable_pools = &[ShieldedProtocol::Sapling];
-            #[cfg(feature = "orchard")]
-            let selectable_pools = &[ShieldedProtocol::Sapling, ShieldedProtocol::Orchard];
-
             shielded_inputs = wallet_db
-                .select_spendable_notes(
-                    account,
-                    amount_required,
-                    selectable_pools,
-                    anchor_height,
-                    &exclude,
-                )
+                .select_spendable_notes(sources, amount_required, anchor_height, &exclude)
                 .map_err(InputSelectorError::DataSource)?;
 
             let new_available = shielded_inputs