diff --git a/Cargo.toml b/Cargo.toml index cc0491b3fd..45a673e2b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,6 +21,5 @@ 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 = "4035a97d178f99bb889f4d7ed26c59378fa88961" } schemer = { git = "https://github.com/aschampion/schemer.git", rev = "6726b60f43f72c6e24a18d31be0ec7d42829e5e1" } schemer-rusqlite = { git = "https://github.com/aschampion/schemer.git", rev = "6726b60f43f72c6e24a18d31be0ec7d42829e5e1" } diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md index fc48063962..1e6372c69e 100644 --- a/zcash_client_backend/CHANGELOG.md +++ b/zcash_client_backend/CHANGELOG.md @@ -64,7 +64,7 @@ and this library adheres to Rust's notion of ### Changed - MSRV is now 1.56.1. - Bumped dependencies to `ff 0.12`, `group 0.12`, `bls12_381 0.7`, `jubjub 0.9`, - `zcash_primitives 0.7`. + `zcash_primitives 0.8`, `orchard 0.3`. - `zcash_client_backend::proto`: - `compact_formats::CompactSpend` has been renamed to `CompactSaplingSpend`, and its `epk` field (and associated `set_epk` method) has been renamed to diff --git a/zcash_client_backend/Cargo.toml b/zcash_client_backend/Cargo.toml index 5bdd1f3763..28a4b9ca40 100644 --- a/zcash_client_backend/Cargo.toml +++ b/zcash_client_backend/Cargo.toml @@ -29,7 +29,7 @@ hdwallet = { version = "0.3.1", optional = true } jubjub = "0.9" memuse = "0.2" nom = "7" -orchard = "0.2" +orchard = "0.3" percent-encoding = "2.1.0" proptest = { version = "1.0.0", optional = true } protobuf = "~2.27.1" # MSRV 1.52.1 @@ -45,7 +45,7 @@ tracing = "0.1" zcash_address = { version = "0.1", path = "../components/zcash_address" } zcash_encoding = { version = "0.1", path = "../components/zcash_encoding" } zcash_note_encryption = { version = "0.2", path = "../components/zcash_note_encryption" } -zcash_primitives = { version = "0.7", path = "../zcash_primitives" } +zcash_primitives = { version = "0.8", path = "../zcash_primitives" } [build-dependencies] protobuf-codegen-pure = "~2.27.1" # MSRV 1.52.1 @@ -55,7 +55,7 @@ gumdrop = "0.8" proptest = "1.0.0" rand_xorshift = "0.3" tempfile = "3.1.0" -zcash_proofs = { version = "0.7", path = "../zcash_proofs" } +zcash_proofs = { version = "0.8", path = "../zcash_proofs" } zcash_address = { version = "0.1", path = "../components/zcash_address", features = ["test-dependencies"] } [features] diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md index 8a72b9ea8d..f8f71bbc19 100644 --- a/zcash_client_sqlite/CHANGELOG.md +++ b/zcash_client_sqlite/CHANGELOG.md @@ -62,7 +62,7 @@ and this library adheres to Rust's notion of (and in the future, outputs to other pools). Values for this column should be assigned by inference from the address type in the stored data. - MSRV is now 1.56.1. -- Bumped dependencies to `ff 0.12`, `group 0.12`, `jubjub 0.9`. +- Bumped dependencies to `ff 0.12`, `group 0.12`, `jubjub 0.9`, `zcash_primitives 0.8`. - Renamed the following to use lower-case abbreviations (matching Rust naming conventions): - `zcash_client_sqlite::BlockDB` to `BlockDb` diff --git a/zcash_client_sqlite/Cargo.toml b/zcash_client_sqlite/Cargo.toml index f6ad8b4dba..a8e55cfb5e 100644 --- a/zcash_client_sqlite/Cargo.toml +++ b/zcash_client_sqlite/Cargo.toml @@ -28,14 +28,14 @@ secrecy = "0.8" time = "0.2" uuid = "1.1" zcash_client_backend = { version = "0.5", path = "../zcash_client_backend" } -zcash_primitives = { version = "0.7", path = "../zcash_primitives" } +zcash_primitives = { version = "0.8", path = "../zcash_primitives" } [dev-dependencies] proptest = "1.0.0" regex = "1.4" tempfile = "3" -zcash_proofs = { version = "0.7", path = "../zcash_proofs" } -zcash_primitives = { version = "0.7", path = "../zcash_primitives", features = ["test-dependencies"] } +zcash_proofs = { version = "0.8", path = "../zcash_proofs" } +zcash_primitives = { version = "0.8", path = "../zcash_primitives", features = ["test-dependencies"] } zcash_address = { version = "0.1", path = "../components/zcash_address", features = ["test-dependencies"] } [features] diff --git a/zcash_extensions/Cargo.toml b/zcash_extensions/Cargo.toml index c92dd9e171..440d17fbb5 100644 --- a/zcash_extensions/Cargo.toml +++ b/zcash_extensions/Cargo.toml @@ -11,14 +11,14 @@ rust-version = "1.56.1" [dependencies] blake2b_simd = "1" -zcash_primitives = { version = "0.7", path = "../zcash_primitives", features = ["zfuture" ] } +zcash_primitives = { version = "0.8", path = "../zcash_primitives", features = ["zfuture" ] } [dev-dependencies] ff = "0.12" jubjub = "0.9" rand_core = "0.6" zcash_address = { version = "0.1", path = "../components/zcash_address" } -zcash_proofs = { version = "0.7", path = "../zcash_proofs" } +zcash_proofs = { version = "0.8", path = "../zcash_proofs" } [features] transparent-inputs = [] diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md index 900ecbe45a..89cc61cd19 100644 --- a/zcash_primitives/CHANGELOG.md +++ b/zcash_primitives/CHANGELOG.md @@ -6,6 +6,8 @@ and this library adheres to Rust's notion of [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [0.8.0] - 2022-10-19 ### Added - `zcash_primitives::legacy`: - `impl {Copy, Eq, Ord} for TransparentAddress` @@ -57,6 +59,7 @@ and this library adheres to Rust's notion of ### Changed - Migrated to `group 0.13`. +- Migrated to `orchard 0.3`. - `zcash_primitives::sapling::ViewingKey` now stores `nk` as a `NullifierDerivingKey` instead of as a bare `jubjub::SubgroupPoint`. - The signature of `zcash_primitives::sapling::Note::nf` has changed to diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index 91d6e7db1a..8248e880b5 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.7.0" +version = "0.8.0" authors = [ "Jack Grigg ", "Kris Nuttycombe " @@ -38,7 +38,7 @@ jubjub = "0.9" lazy_static = "1" memuse = "0.2.1" nonempty = "0.7" -orchard = "0.2" +orchard = "0.3" proptest = { version = "1.0.0", optional = true } rand = "0.8" rand_core = "0.6" @@ -58,7 +58,7 @@ features = ["pre-zip-212"] criterion = "0.3" proptest = "1.0.0" rand_xorshift = "0.3" -orchard = { version = "0.2", features = ["test-dependencies"] } +orchard = { version = "0.3", features = ["test-dependencies"] } [target.'cfg(unix)'.dev-dependencies] pprof = { version = "0.9", features = ["criterion", "flamegraph"] } # MSRV 1.56 diff --git a/zcash_proofs/CHANGELOG.md b/zcash_proofs/CHANGELOG.md index 81f5a00af2..2a33ac28a6 100644 --- a/zcash_proofs/CHANGELOG.md +++ b/zcash_proofs/CHANGELOG.md @@ -7,6 +7,10 @@ and this library adheres to Rust's notion of ## [Unreleased] +## [0.8.0] - 2022-10-19 +### Changed +- Bumped dependencies to `zcash_primitives 0.8`. + ## [0.7.1] - 2022-07-05 ### Added - `zcash_proofs::sapling::BatchValidator` diff --git a/zcash_proofs/Cargo.toml b/zcash_proofs/Cargo.toml index 86d0ad73c3..5302cabbf9 100644 --- a/zcash_proofs/Cargo.toml +++ b/zcash_proofs/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "zcash_proofs" description = "Zcash zk-SNARK circuits and proving APIs" -version = "0.7.1" +version = "0.8.0" authors = [ "Jack Grigg ", ] @@ -30,7 +30,7 @@ rand_core = "0.6" redjubjub = "0.5" tracing = "0.1" wagyu-zcash-parameters = { version = "0.2", optional = true } -zcash_primitives = { version = "0.7", path = "../zcash_primitives" } +zcash_primitives = { version = "0.8", path = "../zcash_primitives" } [dev-dependencies] criterion = "0.3"