diff --git a/Cargo.lock b/Cargo.lock
index f53d01079..dd2da0684 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1580,7 +1580,7 @@ dependencies = [
 [[package]]
 name = "equihash"
 version = "0.2.2"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "blake2b_simd",
  "core2",
@@ -1616,7 +1616,7 @@ dependencies = [
 [[package]]
 name = "f4jumble"
 version = "0.1.1"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "blake2b_simd",
 ]
@@ -2752,7 +2752,7 @@ dependencies = [
 [[package]]
 name = "librustvoting"
 version = "0.1.0"
-source = "git+https://github.com/valargroup/librustvoting.git#3860780a34ab37ced8a4db6752990474291d3610"
+source = "git+https://github.com/valargroup/librustvoting.git#2ca134a9cf7fb3bd2718795e6be7007d432a48da"
 dependencies = [
  "blake2b_simd",
  "ff",
@@ -2770,11 +2770,13 @@ dependencies = [
  "rusqlite",
  "serde",
  "serde_json",
+ "shardtree",
  "subtle",
  "thiserror 2.0.18",
  "vote-commitment-tree",
  "vote-commitment-tree-client",
  "voting-circuits",
+ "zcash_client_sqlite",
  "zcash_keys",
  "zcash_primitives",
  "zcash_protocol",
@@ -3426,7 +3428,7 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 [[package]]
 name = "pczt"
 version = "0.5.1"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "blake2b_simd",
  "bls12_381",
@@ -6629,7 +6631,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 [[package]]
 name = "vote-commitment-tree"
 version = "0.1.0"
-source = "git+https://github.com/valargroup/librustvoting.git#3860780a34ab37ced8a4db6752990474291d3610"
+source = "git+https://github.com/valargroup/librustvoting.git#2ca134a9cf7fb3bd2718795e6be7007d432a48da"
 dependencies = [
  "anyhow",
  "ff",
@@ -6645,7 +6647,7 @@ dependencies = [
 [[package]]
 name = "vote-commitment-tree-client"
 version = "0.1.0"
-source = "git+https://github.com/valargroup/librustvoting.git#3860780a34ab37ced8a4db6752990474291d3610"
+source = "git+https://github.com/valargroup/librustvoting.git#2ca134a9cf7fb3bd2718795e6be7007d432a48da"
 dependencies = [
  "base64",
  "clap",
@@ -7383,7 +7385,7 @@ dependencies = [
 [[package]]
 name = "zcash_address"
 version = "0.10.1"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "bech32",
  "bs58",
@@ -7396,7 +7398,7 @@ dependencies = [
 [[package]]
 name = "zcash_client_backend"
 version = "0.21.2"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "arti-client",
  "base64",
@@ -7464,7 +7466,7 @@ dependencies = [
 [[package]]
 name = "zcash_client_sqlite"
 version = "0.19.5"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "bip32",
  "bitflags 2.11.0",
@@ -7510,7 +7512,7 @@ dependencies = [
 [[package]]
 name = "zcash_encoding"
 version = "0.3.0"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "core2",
  "nonempty",
@@ -7519,7 +7521,7 @@ dependencies = [
 [[package]]
 name = "zcash_keys"
 version = "0.12.0"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "bech32",
  "bip32",
@@ -7561,7 +7563,7 @@ dependencies = [
 [[package]]
 name = "zcash_primitives"
 version = "0.26.1"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "bip32",
  "blake2b_simd",
@@ -7626,7 +7628,7 @@ dependencies = [
 [[package]]
 name = "zcash_protocol"
 version = "0.7.1"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "core2",
  "document-features",
@@ -7663,7 +7665,7 @@ dependencies = [
 [[package]]
 name = "zcash_transparent"
 version = "0.6.1"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "bip32",
  "blake2b_simd",
@@ -7794,7 +7796,7 @@ dependencies = [
 [[package]]
 name = "zip321"
 version = "0.6.0"
-source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#efb5f3470c69cff71a746deaff8318bc2b7e8aae"
+source = "git+https://github.com/valargroup/librustzcash.git?branch=shielded-voting-wallet-support#6858db4a523de05f7474a89c7df751510c71874d"
 dependencies = [
  "base64",
  "nom",
diff --git a/rust/src/voting.rs b/rust/src/voting.rs
index c7d7eb493..66153d20b 100644
--- a/rust/src/voting.rs
+++ b/rust/src/voting.rs
@@ -1383,9 +1383,13 @@ pub unsafe extern "C" fn zcashlc_voting_generate_note_witnesses(
             .collect();
         let checkpoint_height = zcash_protocol::consensus::BlockHeight::from_u32(params.snapshot_height as u32);
 
-        let merkle_paths = wallet_db
-            .generate_orchard_witnesses_at_frontier(&positions, nonempty_frontier, checkpoint_height)
-            .map_err(|e| anyhow!("generate_orchard_witnesses_at_frontier failed: {}", e))?;
+        let merkle_paths = voting::orchard_witnesses::generate_orchard_witnesses_at_frontier(
+            wallet_db.conn(),
+            &positions,
+            nonempty_frontier,
+            checkpoint_height,
+        )
+        .map_err(|e| anyhow!("generate_orchard_witnesses_at_frontier failed: {}", e))?;
 
         // Convert MerklePaths to WitnessData
         let root_bytes = frontier_root.to_bytes().to_vec();