zcash_client_sqlite: Add Orchard note selection.

zcash_client_sqlite/src/lib.rs

@@ -62,7 +62,7 @@ use zcash_client_backend::{
     },
     proto::compact_formats::CompactBlock,
     wallet::{Note, NoteId, ReceivedNote, Recipient, WalletTransparentOutput},
-    DecryptedOutput, ShieldedProtocol, TransferType,
+    DecryptedOutput, PoolType, ShieldedProtocol, TransferType,
 };
 use zcash_keys::keys::HdSeedFingerprint;
 use zcash_primitives::{
@@ -76,7 +76,7 @@ use zip32::{DiversifierIndex, Scope};
 use crate::{error::SqliteClientError, wallet::commitment_tree::SqliteShardStore};
 
 #[cfg(feature = "orchard")]
-use zcash_client_backend::{data_api::ORCHARD_SHARD_HEIGHT, PoolType};
+use zcash_client_backend::data_api::ORCHARD_SHARD_HEIGHT;
 
 #[cfg(feature = "transparent-inputs")]
 use {
@@ -112,6 +112,7 @@ pub(crate) const PRUNING_DEPTH: u32 = 100;
 pub(crate) const VERIFY_LOOKAHEAD: u32 = 10;
 
 pub(crate) const SAPLING_TABLES_PREFIX: &str = "sapling";
+
 #[cfg(feature = "orchard")]
 pub(crate) const ORCHARD_TABLES_PREFIX: &str = "orchard";
 
@@ -135,14 +136,14 @@ impl ConditionallySelectable for AccountId {
     }
 }
 
-/// A newtype wrapper for received note identifiers.
+/// An opaque type for received note identifiers.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct ReceivedNoteId(pub(crate) i64);
+pub struct ReceivedNoteId(pub(crate) ShieldedProtocol, pub(crate) i64);
 
 impl fmt::Display for ReceivedNoteId {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            ReceivedNoteId(id) => write!(f, "Received Note {}", id),
+            ReceivedNoteId(protocol, id) => write!(f, "Received {:?} Note: {}", protocol, id),
         }
     }
 }
@@ -209,7 +210,20 @@ impl<C: Borrow<rusqlite::Connection>, P: consensus::Parameters> InputSource for
                 txid,
                 index,
             ),
-            ShieldedProtocol::Orchard => Ok(None),
+            ShieldedProtocol::Orchard => {
+                #[cfg(feature = "orchard")]
+                return wallet::orchard::get_spendable_orchard_note(
+                    self.conn.borrow(),
+                    &self.params,
+                    txid,
+                    index,
+                );
+
+                #[cfg(not(feature = "orchard"))]
+                return Err(SqliteClientError::UnsupportedPoolType(PoolType::Shielded(
+                    ShieldedProtocol::Orchard,
+                )));
+            }
         }
     }
 
@@ -221,14 +235,25 @@ impl<C: Borrow<rusqlite::Connection>, P: consensus::Parameters> InputSource for
         anchor_height: BlockHeight,
         exclude: &[Self::NoteRef],
     ) -> Result<Vec<ReceivedNote<Self::NoteRef, Note>>, Self::Error> {
-        wallet::sapling::select_spendable_sapling_notes(
+        let received_iter = std::iter::empty();
+        let received_iter = received_iter.chain(wallet::sapling::select_spendable_sapling_notes(
             self.conn.borrow(),
             &self.params,
             account,
             target_value,
             anchor_height,
             exclude,
-        )
+        )?);
+        #[cfg(feature = "orchard")]
+        let received_iter = received_iter.chain(wallet::orchard::select_spendable_orchard_notes(
+            self.conn.borrow(),
+            &self.params,
+            account,
+            target_value,
+            anchor_height,
+            exclude,
+        )?);
+        Ok(received_iter.collect())
     }
 
     #[cfg(feature = "transparent-inputs")]

zcash_client_sqlite/src/wallet.rs

@@ -73,7 +73,6 @@ use std::io::{self, Cursor};
 use std::num::NonZeroU32;
 use std::ops::RangeInclusive;
 use tracing::debug;
-use zcash_client_backend::data_api::ORCHARD_SHARD_HEIGHT;
 use zcash_keys::keys::HdSeedFingerprint;
 
 use zcash_client_backend::{
@@ -101,7 +100,6 @@ use zcash_primitives::{
     zip32::{self, DiversifierIndex, Scope},
 };
 
-use crate::ORCHARD_TABLES_PREFIX;
 use crate::{
     error::SqliteClientError,
     wallet::commitment_tree::{get_max_checkpointed_height, SqliteShardStore},
@@ -126,6 +124,9 @@ use {
     },
 };
 
+#[cfg(feature = "orchard")]
+use {crate::ORCHARD_TABLES_PREFIX, zcash_client_backend::data_api::ORCHARD_SHARD_HEIGHT};
+
 pub mod commitment_tree;
 pub mod init;
 #[cfg(feature = "orchard")]
@@ -287,6 +288,7 @@ pub(crate) fn add_account<P: consensus::Parameters>(
         )?;
     }
 
+    #[cfg(feature = "orchard")]
     if let Some(frontier) = birthday.orchard_frontier().value() {
         debug!("Inserting Orchard frontier into ShardTree: {:?}", frontier);
         let shard_store = SqliteShardStore::<