Merge pull request zcash#1556 from zcash/zcash_primitives-0.19.0-etc

`zcash_address 0.6.0`, `zcash_primitives 0.19.0`, `zcash_proofs 0.19.0`
ShieldedLabs · Oct 2, 2024 · 69cca07 · 69cca07
2 parents ee4692a + 091a0bf
commit 69cca07
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 44 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,16 +32,16 @@ categories = ["cryptography::cryptocurrencies"]
 [workspace.dependencies]
 # Intra-workspace dependencies
 equihash = { version = "0.2", path = "components/equihash" }
-zcash_address = { version = "0.5", path = "components/zcash_address" }
+zcash_address = { version = "0.6", path = "components/zcash_address" }
 zcash_client_backend = { version = "0.13", path = "zcash_client_backend" }
 zcash_encoding = { version = "0.2.1", path = "components/zcash_encoding" }
 zcash_keys = { version = "0.3", path = "zcash_keys" }
 zcash_protocol = { version = "0.4", path = "components/zcash_protocol" }
 zip321 = { version = "0.1", path = "components/zip321" }
 
 zcash_note_encryption = "0.4"
-zcash_primitives = { version = "0.18", path = "zcash_primitives", default-features = false }
-zcash_proofs = { version = "0.18", path = "zcash_proofs", default-features = false }
+zcash_primitives = { version = "0.19", path = "zcash_primitives", default-features = false }
+zcash_proofs = { version = "0.19", path = "zcash_proofs", default-features = false }
 
 # Shielded protocols
 bellman = { version = "0.14", default-features = false, features = ["groth16"] }

diff --git a/components/zcash_address/CHANGELOG.md b/components/zcash_address/CHANGELOG.md
@@ -7,6 +7,10 @@ and this library adheres to Rust's notion of
 
 ## [Unreleased]
 
+## [0.6.0] - 2024-10-02
+### Changed
+- Migrated to `zcash_protocol 0.4`.
+
 ## [0.5.0] - 2024-08-26
 ### Changed
 - Updated `zcash_protocol` dependency to version `0.3`

diff --git a/components/zcash_address/Cargo.toml b/components/zcash_address/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zcash_address"
 description = "Zcash address parsing and serialization"
-version = "0.5.0"
+version = "0.6.0"
 authors = [
     "Jack Grigg <[email protected]>",
 ]

diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
@@ -663,6 +663,12 @@ user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2023-02-28"
 end = "2025-04-22"
 
+[[trusted.incrementalmerkletree-testing]]
+criteria = "safe-to-deploy"
+user-id = 169181 # Kris Nuttycombe (nuttycom)
+start = "2024-09-25"
+end = "2025-10-02"
+
 [[trusted.orchard]]
 criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
 user-id = 6289 # Jack Grigg (str4d)

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
@@ -1,18 +1,6 @@
 
 # cargo-vet imports lock
 
-[[unpublished.zcash_primitives]]
-version = "0.18.0"
-audited_as = "0.17.0"
-
-[[unpublished.zcash_proofs]]
-version = "0.18.0"
-audited_as = "0.17.0"
-
-[[unpublished.zcash_protocol]]
-version = "0.4.0"
-audited_as = "0.3.0"
-
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
@@ -236,11 +224,11 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.zcash_address]]
-version = "0.5.0"
-when = "2024-08-26"
-user-id = 169181
-user-login = "nuttycom"
-user-name = "Kris Nuttycombe"
+version = "0.6.0"
+when = "2024-10-02"
+user-id = 6289
+user-login = "str4d"
+user-name = "Jack Grigg"
 
 [[publisher.zcash_client_backend]]
 version = "0.13.0"
@@ -291,22 +279,22 @@ user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
 
 [[publisher.zcash_primitives]]
-version = "0.17.0"
-when = "2024-08-26"
-user-id = 169181
-user-login = "nuttycom"
-user-name = "Kris Nuttycombe"
+version = "0.19.0"
+when = "2024-10-02"
+user-id = 6289
+user-login = "str4d"
+user-name = "Jack Grigg"
 
 [[publisher.zcash_proofs]]
-version = "0.17.0"
-when = "2024-08-26"
-user-id = 169181
-user-login = "nuttycom"
-user-name = "Kris Nuttycombe"
+version = "0.19.0"
+when = "2024-10-02"
+user-id = 6289
+user-login = "str4d"
+user-name = "Jack Grigg"
 
 [[publisher.zcash_protocol]]
-version = "0.3.0"
-when = "2024-08-26"
+version = "0.4.0"
+when = "2024-10-02"
 user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
@@ -13,8 +13,8 @@ and this library adheres to Rust's notion of
   - `WalletSummary::recovery_progress`
 
 ### Changed
-- Migrated to `orchard 0.10`, `sapling-crypto 0.3`, `zcash_primitives 0.18`,
-  `zcash_proofs 0.18`, `zcash_protocol 0.4`.
+- Migrated to `orchard 0.10`, `sapling-crypto 0.3`, `zcash_address 0.6`,
+  `zcash_primitives 0.19`, `zcash_proofs 0.19`, `zcash_protocol 0.4`.
 - The `Account` trait now uses an associated type for its `AccountId`
   type instead of a type parameter. This change allows for the simplification
   of some type signatures.

diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
@@ -8,8 +8,8 @@ and this library adheres to Rust's notion of
 ## [Unreleased]
 
 ### Changed
-- Migrated to `orchard 0.10`, `sapling-crypto 0.3`, `zcash_primitives 0.18`,
-  `zcash_proofs 0.18`, `zcash_protocol 0.4`.
+- Migrated to `orchard 0.10`, `sapling-crypto 0.3`, `zcash_address 0.6`,
+  `zcash_primitives 0.19`, `zcash_proofs 0.19`, `zcash_protocol 0.4`.
 - `zcash_client_sqlite::error::SqliteClientError::RequestedRewindInvalid`
   is now a structured variant.
 

diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
@@ -13,8 +13,8 @@ and this library adheres to Rust's notion of
 - `impl std::error::Error for DerivationError`
 
 ### Changed
-- Migrated to `orchard 0.10`, `sapling-crypto 0.3`, `zcash_primitives 0.18`,
-  `zcash_protocol 0.4`.
+- Migrated to `orchard 0.10`, `sapling-crypto 0.3`, `zcash_address 0.6`,
+  `zcash_primitives 0.19`, `zcash_protocol 0.4`.
 
 ## [0.3.0] - 2024-08-19
 ### Notable changes

diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
@@ -7,6 +7,17 @@ and this library adheres to Rust's notion of
 
 ## [Unreleased]
 
+## [0.19.0] - 2024-10-02
+
+### Changed
+- Migrated to `zcash_address 0.6`.
+
+### Fixed
+- The previous release did not bump `zcash_address` and ended up depending on
+  multiple versions of `zcash_protocol`, which didn't cause a code conflict but
+  results in two different consensus protocol states being present in the
+  dependency tree.
+
 ## [0.18.0] - 2024-10-02
 
 ### Changed

diff --git 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.18.0"
+version = "0.19.0"
 authors = [
     "Jack Grigg <[email protected]>",
     "Kris Nuttycombe <[email protected]>"

diff --git a/zcash_proofs/CHANGELOG.md b/zcash_proofs/CHANGELOG.md
@@ -7,6 +7,17 @@ and this library adheres to Rust's notion of
 
 ## [Unreleased]
 
+## [0.19.0] - 2024-10-02
+
+### Changed
+- Migrated to `zcash_primitives 0.19`.
+
+### Fixed
+- The previous release of `zcash_primitives` did not bump `zcash_address` and
+  ended up depending on multiple versions of `zcash_protocol`, which didn't
+  cause a code conflict but results in two different consensus protocol states
+  being present in the dependency tree.
+
 ## [0.18.0] - 2024-10-02
 
 ### Changed

diff --git 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.18.0"
+version = "0.19.0"
 authors = [
     "Jack Grigg <[email protected]>",
 ]