From 7ca695ea3cc7f2f9d7d9a6ff6e93ee8847c73948 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 23 May 2024 18:15:36 +0000 Subject: [PATCH 1/2] Disable `sapling-crypto` default features by default The only default-enabled feature flag in `sapling-crypto` is the `multicore` feature flag, which we re-export in each crate that includes proof creation. We need to disable it as a default feature of our dependency in order to enable it to be correctly disabled when a user of e.g. `zcash_primitives` disables its default features. --- Cargo.toml | 2 +- zcash_primitives/CHANGELOG.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 8e2102ccc..8615f8f89 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ bitvec = "1" blake2s_simd = "1" bls12_381 = "0.8" jubjub = "0.10" -sapling = { package = "sapling-crypto", version = "0.1.3" } +sapling = { package = "sapling-crypto", version = "0.1.3", default-features = false } # - Orchard nonempty = "0.7" diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md index 9e9c55749..195867e31 100644 --- a/zcash_primitives/CHANGELOG.md +++ b/zcash_primitives/CHANGELOG.md @@ -7,6 +7,9 @@ and this library adheres to Rust's notion of ## [Unreleased] +- Fixed `sapling-crypto` dependency to not enable its `multicore` feature flag + when the default features of `zcash_primitives` are disabled. + ## [0.15.0] - 2024-03-25 ### Added From 8b2188a0f34fea2cebbf48a9945c75715f92992e Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 23 May 2024 20:35:18 +0000 Subject: [PATCH 2/2] zcash_primitives 0.15.1 --- Cargo.lock | 2 +- zcash_primitives/CHANGELOG.md | 2 ++ zcash_primitives/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae06c4aaa..6fcb556af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3176,7 +3176,7 @@ dependencies = [ [[package]] name = "zcash_primitives" -version = "0.15.0" +version = "0.15.1" dependencies = [ "aes", "assert_matches", diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md index 195867e31..9136c34b3 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.1] - 2024-05-23 + - Fixed `sapling-crypto` dependency to not enable its `multicore` feature flag when the default features of `zcash_primitives` are disabled. diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index 69a7d3e13..822e50928 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.15.0" +version = "0.15.1" authors = [ "Jack Grigg ", "Kris Nuttycombe "