From d83076dcfc372fba463b6429c1737c8010ffca97 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 16 Dec 2024 20:49:19 -0700
Subject: [PATCH] Migrate to sapling-crypto version 0.4

---
 Cargo.lock                        | 5 +++--
 Cargo.toml                        | 3 +--
 zcash_client_backend/CHANGELOG.md | 1 +
 zcash_client_sqlite/CHANGELOG.md  | 1 +
 zcash_keys/CHANGELOG.md           | 2 ++
 zcash_primitives/CHANGELOG.md     | 1 +
 zcash_proofs/CHANGELOG.md         | 3 +++
 7 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3d5fd5b8e..4044f4748 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3822,8 +3822,9 @@ dependencies = [
 
 [[package]]
 name = "sapling-crypto"
-version = "0.3.0"
-source = "git+https://github.com/zcash/sapling-crypto.git?rev=e47d57f5c9c46f05740328f8ef9601f6d697cf34#e47d57f5c9c46f05740328f8ef9601f6d697cf34"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c2acdbbab83d554fc2dceea5f7d6d3da71e57adb18a6c80b8901bd0eee54b0"
 dependencies = [
  "aes",
  "bellman",
diff --git a/Cargo.toml b/Cargo.toml
index 5732ef4dd..95dc5ab8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -62,7 +62,7 @@ blake2s_simd = { version = "1", default-features = false }
 bls12_381 = "0.8"
 jubjub = "0.10"
 redjubjub = "0.7"
-sapling = { package = "sapling-crypto", version = "0.3", default-features = false }
+sapling = { package = "sapling-crypto", version = "0.4", default-features = false }
 
 # - Orchard
 nonempty = "0.7"
@@ -196,4 +196,3 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(zcash_unstable, values("zf
 
 [patch.crates-io]
 orchard = { git = "https://github.com/zcash/orchard.git", rev = "f99b6565a78763b58dac792d7492c55067bae680" }
-sapling-crypto = { git = "https://github.com/zcash/sapling-crypto.git", rev = "e47d57f5c9c46f05740328f8ef9601f6d697cf34" }
diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index b2afb2d8f..d4081b9c7 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -16,6 +16,7 @@ and this library adheres to Rust's notion of
   - `wallet::extract_and_store_transaction_from_pczt`
 
 ### Changed
+- Migrated to `sapling-crypto` version `0.4`.
 - `zcash_client_backend::data_api::AccountBalance`: Refactored to use `Balance`
   for transparent funds (issue #1411). It now has an `unshielded_balance()`
   method that returns `Balance`, allowing the unshielded spendable, unshielded
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index c0b0c6b1e..a89e04cd9 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -11,6 +11,7 @@ and this library adheres to Rust's notion of
 - `zcash_client_sqlite::AccountUuid`
 
 ### Changed
+- Migrated to `sapling-crypto` version `0.4`.
 - The `v_transactions` view has been modified:
   - The `account_id` column has been replaced with `account_uuid`.
 - The `v_tx_outputs` view has been modified:
diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
index b8eaead52..db6b02da5 100644
--- a/zcash_keys/CHANGELOG.md
+++ b/zcash_keys/CHANGELOG.md
@@ -8,6 +8,8 @@ and this library adheres to Rust's notion of
 
 ### Changed
 - Migrated to `bech32 0.11`.
+- Migrated to `sapling-crypto` version `0.4`.
+- Removed dependency on `zcash_primitives`.
 - The `UnifiedAddressRequest` argument to the following methods is now optional:
   - `zcash_keys::keys::UnifiedSpendingKey::address`
   - `zcash_keys::keys::UnifiedSpendingKey::default_address`
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 4c2c8c067..724de4209 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -21,6 +21,7 @@ and this library adheres to Rust's notion of
   - `sighash::SighashType`
 
 ### Changed
+- Migrated to `sapling-crypto` version `0.4`.
 - `zcash_primitives::transaction::components::transparent`:
   - `builder::TransparentBuilder::add_input` now takes `secp256k1::PublicKey`
     instead of `secp256k1::SecretKey`.
diff --git a/zcash_proofs/CHANGELOG.md b/zcash_proofs/CHANGELOG.md
index 10b50912b..c614dafa9 100644
--- a/zcash_proofs/CHANGELOG.md
+++ b/zcash_proofs/CHANGELOG.md
@@ -10,6 +10,9 @@ and this library adheres to Rust's notion of
 ### Added
 - `zcash_proofs::prover::LocalTxProver::verifying_keys`
 
+### Changed
+- Migrated to `sapling-crypto` version `0.4`.
+
 ## [0.20.0] - 2024-11-14
 
 ### Changed