From 0909a73a2cb6fe41ec8afe7a17a2cb2582919e48 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Tue, 10 Dec 2024 16:27:37 +0000
Subject: [PATCH] Migrate to Rust crate revision with bugfix to account UUID
 migration

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

diff --git a/backend-lib/Cargo.lock b/backend-lib/Cargo.lock
index c1607f0ff..d9e7447e4 100644
--- a/backend-lib/Cargo.lock
+++ b/backend-lib/Cargo.lock
@@ -1130,7 +1130,7 @@ dependencies = [
 [[package]]
 name = "equihash"
 version = "0.2.0"
-source = "git+https://github.com/zcash/librustzcash?rev=f1724c436a99208e612d8dec2119613fd280492d#f1724c436a99208e612d8dec2119613fd280492d"
+source = "git+https://github.com/zcash/librustzcash?rev=f2dfa4702ad19c15c302f77c4000c3babd23d7eb#f2dfa4702ad19c15c302f77c4000c3babd23d7eb"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -1166,7 +1166,7 @@ dependencies = [
 [[package]]
 name = "f4jumble"
 version = "0.1.0"
-source = "git+https://github.com/zcash/librustzcash?rev=f1724c436a99208e612d8dec2119613fd280492d#f1724c436a99208e612d8dec2119613fd280492d"
+source = "git+https://github.com/zcash/librustzcash?rev=f2dfa4702ad19c15c302f77c4000c3babd23d7eb#f2dfa4702ad19c15c302f77c4000c3babd23d7eb"
 dependencies = [
  "blake2b_simd",
 ]
@@ -5237,7 +5237,7 @@ dependencies = [
 [[package]]
 name = "zcash_address"
 version = "0.6.0"
-source = "git+https://github.com/zcash/librustzcash?rev=f1724c436a99208e612d8dec2119613fd280492d#f1724c436a99208e612d8dec2119613fd280492d"
+source = "git+https://github.com/zcash/librustzcash?rev=f2dfa4702ad19c15c302f77c4000c3babd23d7eb#f2dfa4702ad19c15c302f77c4000c3babd23d7eb"
 dependencies = [
  "bech32",
  "bs58",
@@ -5249,7 +5249,7 @@ dependencies = [
 [[package]]
 name = "zcash_client_backend"
 version = "0.15.0"
-source = "git+https://github.com/zcash/librustzcash?rev=f1724c436a99208e612d8dec2119613fd280492d#f1724c436a99208e612d8dec2119613fd280492d"
+source = "git+https://github.com/zcash/librustzcash?rev=f2dfa4702ad19c15c302f77c4000c3babd23d7eb#f2dfa4702ad19c15c302f77c4000c3babd23d7eb"
 dependencies = [
  "arti-client",
  "base64",
@@ -5308,7 +5308,7 @@ dependencies = [
 [[package]]
 name = "zcash_client_sqlite"
 version = "0.13.0"
-source = "git+https://github.com/zcash/librustzcash?rev=f1724c436a99208e612d8dec2119613fd280492d#f1724c436a99208e612d8dec2119613fd280492d"
+source = "git+https://github.com/zcash/librustzcash?rev=f2dfa4702ad19c15c302f77c4000c3babd23d7eb#f2dfa4702ad19c15c302f77c4000c3babd23d7eb"
 dependencies = [
  "bip32",
  "bs58",
@@ -5345,7 +5345,7 @@ dependencies = [
 [[package]]
 name = "zcash_encoding"
 version = "0.2.1"
-source = "git+https://github.com/zcash/librustzcash?rev=f1724c436a99208e612d8dec2119613fd280492d#f1724c436a99208e612d8dec2119613fd280492d"
+source = "git+https://github.com/zcash/librustzcash?rev=f2dfa4702ad19c15c302f77c4000c3babd23d7eb#f2dfa4702ad19c15c302f77c4000c3babd23d7eb"
 dependencies = [
  "byteorder",
  "nonempty",
@@ -5354,7 +5354,7 @@ dependencies = [
 [[package]]
 name = "zcash_keys"
 version = "0.5.0"
-source = "git+https://github.com/zcash/librustzcash?rev=f1724c436a99208e612d8dec2119613fd280492d#f1724c436a99208e612d8dec2119613fd280492d"
+source = "git+https://github.com/zcash/librustzcash?rev=f2dfa4702ad19c15c302f77c4000c3babd23d7eb#f2dfa4702ad19c15c302f77c4000c3babd23d7eb"
 dependencies = [
  "bech32",
  "bip32",
@@ -5395,7 +5395,7 @@ dependencies = [
 [[package]]
 name = "zcash_primitives"
 version = "0.20.0"
-source = "git+https://github.com/zcash/librustzcash?rev=f1724c436a99208e612d8dec2119613fd280492d#f1724c436a99208e612d8dec2119613fd280492d"
+source = "git+https://github.com/zcash/librustzcash?rev=f2dfa4702ad19c15c302f77c4000c3babd23d7eb#f2dfa4702ad19c15c302f77c4000c3babd23d7eb"
 dependencies = [
  "aes",
  "bip32",
@@ -5433,7 +5433,7 @@ dependencies = [
 [[package]]
 name = "zcash_proofs"
 version = "0.20.0"
-source = "git+https://github.com/zcash/librustzcash?rev=f1724c436a99208e612d8dec2119613fd280492d#f1724c436a99208e612d8dec2119613fd280492d"
+source = "git+https://github.com/zcash/librustzcash?rev=f2dfa4702ad19c15c302f77c4000c3babd23d7eb#f2dfa4702ad19c15c302f77c4000c3babd23d7eb"
 dependencies = [
  "bellman",
  "blake2b_simd",
@@ -5455,7 +5455,7 @@ dependencies = [
 [[package]]
 name = "zcash_protocol"
 version = "0.4.1"
-source = "git+https://github.com/zcash/librustzcash?rev=f1724c436a99208e612d8dec2119613fd280492d#f1724c436a99208e612d8dec2119613fd280492d"
+source = "git+https://github.com/zcash/librustzcash?rev=f2dfa4702ad19c15c302f77c4000c3babd23d7eb#f2dfa4702ad19c15c302f77c4000c3babd23d7eb"
 dependencies = [
  "document-features",
  "memuse",
@@ -5526,7 +5526,7 @@ dependencies = [
 [[package]]
 name = "zip321"
 version = "0.2.0"
-source = "git+https://github.com/zcash/librustzcash?rev=f1724c436a99208e612d8dec2119613fd280492d#f1724c436a99208e612d8dec2119613fd280492d"
+source = "git+https://github.com/zcash/librustzcash?rev=f2dfa4702ad19c15c302f77c4000c3babd23d7eb#f2dfa4702ad19c15c302f77c4000c3babd23d7eb"
 dependencies = [
  "base64",
  "nom",
diff --git a/backend-lib/Cargo.toml b/backend-lib/Cargo.toml
index 17c201076..b323532f9 100644
--- a/backend-lib/Cargo.toml
+++ b/backend-lib/Cargo.toml
@@ -72,8 +72,8 @@ path = "src/main/rust/lib.rs"
 crate-type = ["staticlib", "cdylib"]
 
 [patch.crates-io]
-zcash_address = { git = "https://github.com/zcash/librustzcash", rev = "f1724c436a99208e612d8dec2119613fd280492d" }
-zcash_client_backend = { git = "https://github.com/zcash/librustzcash", rev = "f1724c436a99208e612d8dec2119613fd280492d" }
-zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash", rev = "f1724c436a99208e612d8dec2119613fd280492d" }
-zcash_primitives = { git = "https://github.com/zcash/librustzcash", rev = "f1724c436a99208e612d8dec2119613fd280492d" }
-zcash_proofs = { git = "https://github.com/zcash/librustzcash", rev = "f1724c436a99208e612d8dec2119613fd280492d" }
+zcash_address = { git = "https://github.com/zcash/librustzcash", rev = "f2dfa4702ad19c15c302f77c4000c3babd23d7eb" }
+zcash_client_backend = { git = "https://github.com/zcash/librustzcash", rev = "f2dfa4702ad19c15c302f77c4000c3babd23d7eb" }
+zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash", rev = "f2dfa4702ad19c15c302f77c4000c3babd23d7eb" }
+zcash_primitives = { git = "https://github.com/zcash/librustzcash", rev = "f2dfa4702ad19c15c302f77c4000c3babd23d7eb" }
+zcash_proofs = { git = "https://github.com/zcash/librustzcash", rev = "f2dfa4702ad19c15c302f77c4000c3babd23d7eb" }