zcash_client_sqlite: Ensure that we only exclude the correct notes fr…

…om selection.
zcash · Mar 10, 2024 · a017717 · a017717
1 parent a9c2d77
commit a017717
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/zcash_client_sqlite/src/wallet/orchard.rs b/zcash_client_sqlite/src/wallet/orchard.rs
@@ -319,7 +319,10 @@ pub(crate) fn select_spendable_orchard_notes<P: consensus::Parameters>(
          FROM (SELECT * from eligible WHERE so_far >= :target_value LIMIT 1)",
     )?;
 
-    let excluded: Vec<Value> = exclude.iter().map(|n| Value::from(n.1)).collect();
+    let excluded: Vec<Value> = exclude
+        .iter()
+        .filter_map(|n| matches!(n.0, ShieldedProtocol::Orchard).then(|| Value::from(n.1)))
+        .collect();
     let excluded_ptr = Rc::new(excluded);
 
     let notes = stmt_select_notes.query_and_then(

diff --git a/zcash_client_sqlite/src/wallet/sapling.rs b/zcash_client_sqlite/src/wallet/sapling.rs
@@ -317,7 +317,10 @@ pub(crate) fn select_spendable_sapling_notes<P: consensus::Parameters>(
          FROM (SELECT * from eligible WHERE so_far >= :target_value LIMIT 1)",
     )?;
 
-    let excluded: Vec<Value> = exclude.iter().map(|n| Value::from(n.1)).collect();
+    let excluded: Vec<Value> = exclude
+        .iter()
+        .filter_map(|n| matches!(n.0, ShieldedProtocol::Sapling).then(|| Value::from(n.1)))
+        .collect();
     let excluded_ptr = Rc::new(excluded);
 
     let notes = stmt_select_notes.query_and_then(