From 2fcde5e0470b079759e9d9622da95714c862d6f7 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 11 Apr 2023 13:25:17 +0000 Subject: [PATCH] Migrate to `orchard 0.4.0` Closes zcash/librustzcash#766. --- Cargo.toml | 1 - zcash_client_backend/CHANGELOG.md | 2 +- zcash_client_backend/Cargo.toml | 2 +- zcash_primitives/CHANGELOG.md | 3 ++- zcash_primitives/Cargo.toml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 91796fc10..0ddd568e4 100644 --- a/Cargo.toml +++ b/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" } diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md index 873f6a446..ad33bf0e4 100644 --- a/zcash_client_backend/CHANGELOG.md +++ b/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` diff --git a/zcash_client_backend/Cargo.toml b/zcash_client_backend/Cargo.toml index 1bdb36705..82f1c73f3 100644 --- a/zcash_client_backend/Cargo.toml +++ b/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 } diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md index 32da73c5e..16aa5a4f1 100644 --- a/zcash_primitives/CHANGELOG.md +++ b/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 diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index 8bd7d6af3..b3ec67cef 100644 --- a/zcash_primitives/Cargo.toml +++ b/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