From abb98bd19259172be47f256c5616eaf2b9eb913c Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Thu, 17 Aug 2023 18:22:56 -0600
Subject: [PATCH] Migrate to Rust revision with scanning and spending fixes

---
 backend-lib/Cargo.lock | 16 ++++++++--------
 backend-lib/Cargo.toml | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend-lib/Cargo.lock b/backend-lib/Cargo.lock
index c2e1c9c9..1dffe3e4 100644
--- a/backend-lib/Cargo.lock
+++ b/backend-lib/Cargo.lock
@@ -483,7 +483,7 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 [[package]]
 name = "equihash"
 version = "0.2.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=81d1928497683cdd3bb97e1411f66d3b2715dd85#81d1928497683cdd3bb97e1411f66d3b2715dd85"
+source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -513,7 +513,7 @@ dependencies = [
 [[package]]
 name = "f4jumble"
 version = "0.1.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=81d1928497683cdd3bb97e1411f66d3b2715dd85#81d1928497683cdd3bb97e1411f66d3b2715dd85"
+source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d"
 dependencies = [
  "blake2b_simd",
 ]
@@ -2258,7 +2258,7 @@ dependencies = [
 [[package]]
 name = "zcash_address"
 version = "0.3.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=81d1928497683cdd3bb97e1411f66d3b2715dd85#81d1928497683cdd3bb97e1411f66d3b2715dd85"
+source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d"
 dependencies = [
  "bech32",
  "bs58",
@@ -2269,7 +2269,7 @@ dependencies = [
 [[package]]
 name = "zcash_client_backend"
 version = "0.9.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=81d1928497683cdd3bb97e1411f66d3b2715dd85#81d1928497683cdd3bb97e1411f66d3b2715dd85"
+source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d"
 dependencies = [
  "base64",
  "bech32",
@@ -2302,7 +2302,7 @@ dependencies = [
 [[package]]
 name = "zcash_client_sqlite"
 version = "0.7.1"
-source = "git+https://github.com/zcash/librustzcash.git?rev=81d1928497683cdd3bb97e1411f66d3b2715dd85#81d1928497683cdd3bb97e1411f66d3b2715dd85"
+source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d"
 dependencies = [
  "bs58",
  "byteorder",
@@ -2328,7 +2328,7 @@ dependencies = [
 [[package]]
 name = "zcash_encoding"
 version = "0.2.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=81d1928497683cdd3bb97e1411f66d3b2715dd85#81d1928497683cdd3bb97e1411f66d3b2715dd85"
+source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d"
 dependencies = [
  "byteorder",
  "nonempty",
@@ -2350,7 +2350,7 @@ dependencies = [
 [[package]]
 name = "zcash_primitives"
 version = "0.12.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=81d1928497683cdd3bb97e1411f66d3b2715dd85#81d1928497683cdd3bb97e1411f66d3b2715dd85"
+source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d"
 dependencies = [
  "aes",
  "bip0039",
@@ -2385,7 +2385,7 @@ dependencies = [
 [[package]]
 name = "zcash_proofs"
 version = "0.12.1"
-source = "git+https://github.com/zcash/librustzcash.git?rev=81d1928497683cdd3bb97e1411f66d3b2715dd85#81d1928497683cdd3bb97e1411f66d3b2715dd85"
+source = "git+https://github.com/zcash/librustzcash.git?rev=f61d60bb967308b4c84defcfd6c8c7a70e1c276d#f61d60bb967308b4c84defcfd6c8c7a70e1c276d"
 dependencies = [
  "bellman",
  "blake2b_simd",
diff --git a/backend-lib/Cargo.toml b/backend-lib/Cargo.toml
index 4ed3e727..63a2cc9d 100644
--- a/backend-lib/Cargo.toml
+++ b/backend-lib/Cargo.toml
@@ -44,11 +44,11 @@ libc = "0.2"
 incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "da97e6c399c5acddedad2c1730dbb7ee55499a2f" }
 shardtree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "da97e6c399c5acddedad2c1730dbb7ee55499a2f" }
 orchard = { git = "https://github.com/zcash/orchard.git", rev = "6ef89d5f154de2cf7b7dd87edb8d8c49158beebb" }
-zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "81d1928497683cdd3bb97e1411f66d3b2715dd85" }
-zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "81d1928497683cdd3bb97e1411f66d3b2715dd85" }
-zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "81d1928497683cdd3bb97e1411f66d3b2715dd85" }
-zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "81d1928497683cdd3bb97e1411f66d3b2715dd85" }
-zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "81d1928497683cdd3bb97e1411f66d3b2715dd85" }
+zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" }
+zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" }
+zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" }
+zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" }
+zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "f61d60bb967308b4c84defcfd6c8c7a70e1c276d" }
 
 ## Uncomment this to test librustzcash changes locally
 #[patch.crates-io]