Migrate to `orchard 0.4.0`

Closes zcash/librustzcash#766.

Cargo.toml

@@ -21,4 +21,3 @@ codegen-units = 1
 [patch.crates-io]
 zcash_encoding = { path = "components/zcash_encoding" }
 zcash_note_encryption = { path = "components/zcash_note_encryption" }
-orchard = { git = "https://github.com/zcash/orchard.git", rev = "bdcf15ba2141f94f031c195140219a99335d96d5" }

zcash_client_backend/CHANGELOG.md

@@ -8,7 +8,7 @@ and this library adheres to Rust's notion of
 ## [Unreleased]
 
 ### Changed
-- Bumped dependencies to `bls12_381 0.8`, `group 0.13`,
+- Bumped dependencies to `bls12_381 0.8`, `group 0.13`, `orchard 0.4`.
 - The dependency on `zcash_primitives` no longer enables the `multicore` feature
   by default in order to support compilation under `wasm32-wasi`. Users of other
   platforms may need to include an explicit dependency on `zcash_primitives`

zcash_client_backend/Cargo.toml

@@ -53,7 +53,7 @@ subtle = "2.2.3"
 # - Shielded protocols
 bls12_381 = "0.8"
 group = "0.13"
-orchard = { version = "0.3", default-features = false }
+orchard = { version = "0.4", default-features = false }
 
 # - Test dependencies
 proptest = { version = "1.0.0", optional = true }

zcash_primitives/CHANGELOG.md

@@ -8,7 +8,8 @@ and this library adheres to Rust's notion of
 ## [Unreleased]
 
 ### Changed
-- Bumped dependencies to `bls12_381 0.8`, `ff 0.13`, `group 0.13`, `jubjub 0.10`
+- Bumped dependencies to `bls12_381 0.8`, `ff 0.13`, `group 0.13`,
+  `jubjub 0.10`, `orchard 0.4`.
 
 ## [0.10.2] - 2023-03-16
 ### Added

zcash_primitives/Cargo.toml

@@ -45,7 +45,7 @@ group = { version = "0.13", features = ["wnaf-memuse"] }
 incrementalmerkletree = "0.3"
 jubjub = "0.10"
 nonempty = "0.7"
-orchard = { version = "0.3", default-features = false }
+orchard = { version = "0.4", default-features = false }
 
 # - Static constants
 lazy_static = "1"
@@ -89,7 +89,7 @@ criterion = "0.4"
 proptest = "1.0.0"
 assert_matches = "1.3.0"
 rand_xorshift = "0.3"
-orchard = { version = "0.3", default-features = false, features = ["test-dependencies"] }
+orchard = { version = "0.4", default-features = false, features = ["test-dependencies"] }
 
 [target.'cfg(unix)'.dev-dependencies]
 pprof = { version = "0.11", features = ["criterion", "flamegraph"] } # MSRV 1.56