From 4cf8cab6fcaafcce3a179c63c73012efe5f281c4 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 25 Mar 2024 08:42:00 -0600
Subject: [PATCH] zcash_primitives release version 0.15.0

---
 Cargo.lock                    | 22 +++++++++++++---------
 Cargo.toml                    | 16 +++++-----------
 zcash_primitives/CHANGELOG.md |  3 +++
 zcash_primitives/Cargo.toml   |  2 +-
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f6d639f52..ae06c4aaa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1086,8 +1086,9 @@ dependencies = [
 
 [[package]]
 name = "incrementalmerkletree"
-version = "0.5.0"
-source = "git+https://github.com/zcash/incrementalmerkletree?rev=e1a7a80212c22e5a8912d05860f7eb6899c56a7c#e1a7a80212c22e5a8912d05860f7eb6899c56a7c"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb1872810fb725b06b8c153dde9e86f3ec26747b9b60096da7a869883b549cbe"
 dependencies = [
  "either",
  "proptest",
@@ -1476,8 +1477,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "orchard"
-version = "0.7.1"
-source = "git+https://github.com/zcash/orchard?rev=33474bdbfd7268e1f84718078d47f63d01a879d5#33474bdbfd7268e1f84718078d47f63d01a879d5"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0462569fc8b0d1b158e4d640571867a4e4319225ebee2ab6647e60c70af19ae3"
 dependencies = [
  "aes",
  "bitvec",
@@ -2104,8 +2106,9 @@ dependencies = [
 
 [[package]]
 name = "sapling-crypto"
-version = "0.1.2"
-source = "git+https://github.com/zcash/sapling-crypto?rev=22412ae07644813253feb064d1692b0823242853#22412ae07644813253feb064d1692b0823242853"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02f4270033afcb0c74c5c7d59c73cfd1040367f67f224fe7ed9a919ae618f1b7"
 dependencies = [
  "aes",
  "bellman",
@@ -2244,8 +2247,9 @@ dependencies = [
 
 [[package]]
 name = "shardtree"
-version = "0.2.0"
-source = "git+https://github.com/zcash/incrementalmerkletree?rev=e1a7a80212c22e5a8912d05860f7eb6899c56a7c#e1a7a80212c22e5a8912d05860f7eb6899c56a7c"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d766257c56a1bdd75479c256b97c92e72788a9afb18b5199f58faf7188dc99d9"
 dependencies = [
  "assert_matches",
  "bitflags 2.4.1",
@@ -3172,7 +3176,7 @@ dependencies = [
 
 [[package]]
 name = "zcash_primitives"
-version = "0.14.0"
+version = "0.15.0"
 dependencies = [
  "aes",
  "assert_matches",
diff --git a/Cargo.toml b/Cargo.toml
index 2e904303f..8e2102ccc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,14 +36,14 @@ zcash_keys = { version = "0.1", path = "zcash_keys" }
 zcash_protocol = { version = "0.1", path = "components/zcash_protocol" }
 
 zcash_note_encryption = "0.4"
-zcash_primitives = { version = "0.14", path = "zcash_primitives", default-features = false }
+zcash_primitives = { version = "0.15", path = "zcash_primitives", default-features = false }
 zcash_proofs = { version = "0.14", path = "zcash_proofs", default-features = false }
 
 # Shielded protocols
 ff = "0.13"
 group = "0.13"
-incrementalmerkletree = "0.5"
-shardtree = "0.2"
+incrementalmerkletree = "0.5.1"
+shardtree = "0.3"
 zcash_spec = "0.1"
 
 # Payment protocols
@@ -52,11 +52,11 @@ bitvec = "1"
 blake2s_simd = "1"
 bls12_381 = "0.8"
 jubjub = "0.10"
-sapling = { package = "sapling-crypto", version = "0.1.2" }
+sapling = { package = "sapling-crypto", version = "0.1.3" }
 
 # - Orchard
 nonempty = "0.7"
-orchard = { version = "0.7.1", default-features = false }
+orchard = { version = "0.8.0", default-features = false }
 pasta_curves = "0.5"
 
 # - Transparent
@@ -120,9 +120,3 @@ zip32 = "0.1.1"
 lto = true
 panic = 'abort'
 codegen-units = 1
-
-[patch.crates-io]
-orchard = { git = "https://github.com/zcash/orchard", rev = "33474bdbfd7268e1f84718078d47f63d01a879d5" }
-incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "e1a7a80212c22e5a8912d05860f7eb6899c56a7c" }
-sapling = { git = "https://github.com/zcash/sapling-crypto", package = "sapling-crypto", rev = "22412ae07644813253feb064d1692b0823242853" }
-shardtree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "e1a7a80212c22e5a8912d05860f7eb6899c56a7c" }
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index ffc62e899..9e9c55749 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -7,6 +7,8 @@ and this library adheres to Rust's notion of
 
 ## [Unreleased]
 
+## [0.15.0] - 2024-03-25
+
 ### Added
 - `zcash_primitives::transaction::components::sapling::zip212_enforcement`
 
@@ -21,6 +23,7 @@ and this library adheres to Rust's notion of
     `Amount` and `NonNegativeAmount` value types now return
     `Result<_, BalanceError>` instead of `Result<_, ()>`.
   - `zcash_primitives::memo` re-exports `zcash_protocol::memo`.
+  - Update to `orchard` version `0.8.0`
 
 ### Removed
 - `zcash_primitives::consensus::sapling_zip212_enforcement` instead use
diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml
index 7bbc788a0..69a7d3e13 100644
--- a/zcash_primitives/Cargo.toml
+++ b/zcash_primitives/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zcash_primitives"
 description = "Rust implementations of the Zcash primitives"
-version = "0.14.0"
+version = "0.15.0"
 authors = [
     "Jack Grigg <jack@z.cash>",
     "Kris Nuttycombe <kris@electriccoin.co>"