Merge pull request #1979 from zcash/release/zcash_protocol-0.7

nuttycom · web-flow · commit ea229e533579 · 2025-10-02T18:50:41.000-06:00
Crate releases for NU6.1 mainnet upgrade.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,16 +36,16 @@ categories = ["cryptography::cryptocurrencies"]
 [workspace.dependencies]
 # Intra-workspace dependencies
 equihash = { version = "0.2", path = "components/equihash", default-features = false }
-zcash_address = { version = "0.9", path = "components/zcash_address", default-features = false }
+zcash_address = { version = "0.10", path = "components/zcash_address", default-features = false }
 zcash_client_backend = { version = "0.20", path = "zcash_client_backend" }
 zcash_encoding = { version = "0.3", path = "components/zcash_encoding", default-features = false }
 zcash_keys = { version = "0.11", path = "zcash_keys" }
-zcash_protocol = { version = "0.6.1", path = "components/zcash_protocol", default-features = false }
-zip321 = { version = "0.5", path = "components/zip321" }
+zcash_protocol = { version = "0.7", path = "components/zcash_protocol", default-features = false }
+zip321 = { version = "0.6", path = "components/zip321" }
 
 zcash_note_encryption = "0.4.1"
-zcash_primitives = { version = "0.25", path = "zcash_primitives", default-features = false }
-zcash_proofs = { version = "0.25", path = "zcash_proofs", default-features = false }
+zcash_primitives = { version = "0.26", path = "zcash_primitives", default-features = false }
+zcash_proofs = { version = "0.26", path = "zcash_proofs", default-features = false }
 
 pczt = { version = "0.4", path = "pczt" }
 
@@ -76,7 +76,7 @@ block-buffer = { version = "=0.11.0-rc.3" } # later RCs require edition2024
 crypto-common = { version = "=0.2.0-rc.1" } # later RCs require edition2024
 ripemd = { version = "0.1", default-features = false }
 secp256k1 = { version = "0.29", default-features = false, features = ["alloc"] }
-transparent = { package = "zcash_transparent", version = "0.5", path = "zcash_transparent", default-features = false }
+transparent = { package = "zcash_transparent", version = "0.6", path = "zcash_transparent", default-features = false }
 zcash_script = { version = "0.4", default-features = false }
 zeroize = { version = "1.7", default-features = false }
 
diff --git a/components/zcash_address/CHANGELOG.md b/components/zcash_address/CHANGELOG.md
@@ -10,6 +10,11 @@ workspace.
 
 ## [Unreleased]
 
+## [0.10.0] - 2025-10-02
+
+### Changed
+- Migrated to `zcash_protocol 0.7`
+
 ## [0.9.0] - 2025-07-31
 ### Changed
 - Migrated to `zcash_protocol 0.6`
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.9.0"
+version = "0.10.0"
 authors = [
     "Jack Grigg <jack@electriccoin.co>",
 ]
diff --git a/components/zcash_protocol/CHANGELOG.md b/components/zcash_protocol/CHANGELOG.md
@@ -10,6 +10,12 @@ workspace.
 
 ## [Unreleased]
 
+## [0.7.0] - 2025-10-02
+
+- The mainnet activation height has been set for `consensus::BranchId::Nu6_1`
+
+### Changed
+
 ## [0.6.2] - 2025-09-25
 
 ### Added
diff --git a/components/zcash_protocol/Cargo.toml b/components/zcash_protocol/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zcash_protocol"
 description = "Zcash protocol network constants and value types."
-version = "0.6.2"
+version = "0.7.0"
 authors = [
     "Jack Grigg <jack@electriccoin.co>",
     "Kris Nuttycombe <kris@nutty.land>",
diff --git a/components/zcash_protocol/src/consensus.rs b/components/zcash_protocol/src/consensus.rs
@@ -432,7 +432,7 @@ impl Parameters for MainNetwork {
             NetworkUpgrade::Canopy => Some(BlockHeight(1_046_400)),
             NetworkUpgrade::Nu5 => Some(BlockHeight(1_687_104)),
             NetworkUpgrade::Nu6 => Some(BlockHeight(2_726_400)),
-            NetworkUpgrade::Nu6_1 => None,
+            NetworkUpgrade::Nu6_1 => Some(BlockHeight(3_146_400)),
             #[cfg(zcash_unstable = "nu7")]
             NetworkUpgrade::Nu7 => None,
             #[cfg(zcash_unstable = "zfuture")]
@@ -916,9 +916,13 @@ mod tests {
             BranchId::for_height(&MAIN_NETWORK, BlockHeight(2_726_400)),
             BranchId::Nu6,
         );
+        assert_eq!(
+            BranchId::for_height(&MAIN_NETWORK, BlockHeight(3_146_400)),
+            BranchId::Nu6_1,
+        );
         assert_eq!(
             BranchId::for_height(&MAIN_NETWORK, BlockHeight(5_000_000)),
-            BranchId::Nu6,
+            BranchId::Nu6_1,
         );
     }
 }
diff --git a/components/zip321/CHANGELOG.md b/components/zip321/CHANGELOG.md
@@ -10,6 +10,11 @@ workspace.
 
 ## [Unreleased]
 
+## [0.6.0] - 2025-10-02
+
+### Changed
+- Migrated to `zcash_protocol 0.7`, `zcash_address 0.10`
+
 ## [0.5.0] - 2025-07-31
 ### Changed
 - Migrated to `zcash_protocol 0.6`, `zcash_address 0.9`.
diff --git a/components/zip321/Cargo.toml b/components/zip321/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zip321"
 description = "Parsing functions and data types for Zcash ZIP 321 Payment Request URIs"
-version = "0.5.0"
+version = "0.6.0"
 authors = [
     "Kris Nuttycombe <kris@electriccoin.co>"
 ]
diff --git a/pczt/CHANGELOG.md b/pczt/CHANGELOG.md
@@ -10,6 +10,11 @@ workspace.
 
 ## [Unreleased]
 
+## [0.5.0] - PLANNED
+
+- Migrated to `zcash_protocol 0.7`, `zcash_transparent 0.6`, `zcash_primitives 0.26`,
+  `zcash_proofs 0.26`
+
 ## [0.4.0] - 2025-09-25
 
 ### Changed
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
@@ -1170,7 +1170,7 @@ end = "2025-04-22"
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-08-20"
-end = "2025-08-26"
+end = "2026-10-02"
 
 [[trusted.zcash_client_backend]]
 criteria = "safe-to-deploy"
@@ -1260,7 +1260,7 @@ end = "2026-09-25"
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-08-20"
-end = "2025-08-26"
+end = "2026-10-02"
 
 [[trusted.zcash_primitives]]
 criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
@@ -1284,7 +1284,7 @@ end = "2026-09-25"
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-08-20"
-end = "2025-08-26"
+end = "2026-10-02"
 
 [[trusted.zcash_proofs]]
 criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
@@ -288,8 +288,8 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.zcash_address]]
-version = "0.9.0"
-when = "2025-07-31"
+version = "0.10.0"
+when = "2025-10-02"
 user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
@@ -337,25 +337,25 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.zcash_primitives]]
-version = "0.25.0"
-when = "2025-09-25"
-user-id = 6289
-user-login = "str4d"
-user-name = "Jack Grigg"
+version = "0.26.0"
+when = "2025-10-02"
+user-id = 169181
+user-login = "nuttycom"
+user-name = "Kris Nuttycombe"
 
 [[publisher.zcash_proofs]]
-version = "0.25.0"
-when = "2025-09-25"
-user-id = 6289
-user-login = "str4d"
-user-name = "Jack Grigg"
+version = "0.26.0"
+when = "2025-10-02"
+user-id = 169181
+user-login = "nuttycom"
+user-name = "Kris Nuttycombe"
 
 [[publisher.zcash_protocol]]
-version = "0.6.2"
-when = "2025-09-25"
-user-id = 6289
-user-login = "str4d"
-user-name = "Jack Grigg"
+version = "0.7.0"
+when = "2025-10-02"
+user-id = 169181
+user-login = "nuttycom"
+user-name = "Kris Nuttycombe"
 
 [[publisher.zcash_script]]
 version = "0.4.0"
@@ -372,11 +372,11 @@ user-login = "daira"
 user-name = "Daira-Emma Hopwood"
 
 [[publisher.zcash_transparent]]
-version = "0.5.0"
-when = "2025-09-25"
-user-id = 6289
-user-login = "str4d"
-user-name = "Jack Grigg"
+version = "0.6.0"
+when = "2025-10-02"
+user-id = 169181
+user-login = "nuttycom"
+user-name = "Kris Nuttycombe"
 
 [[publisher.zip32]]
 version = "0.2.0"
@@ -386,8 +386,8 @@ user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
 
 [[publisher.zip321]]
-version = "0.5.0"
-when = "2025-07-31"
+version = "0.6.0"
+when = "2025-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
@@ -10,7 +10,11 @@ workspace.
 
 ## [Unreleased]
 
+## [0.21.0] - PLANNED
+
 ### Changed
+- Migrated to `zcash_protocol 0.7`, `zcash_address 0.10`, `zip321 0.6`,
+  `zcash_transparent 0.6`, `zcash_primitives 0.26`, `zcash_proofs 0.26`
 - `zcash_client_backend::data_api`:
   - `testing::pool::ShieldedPoolTester` has added methods `note_value` and
     `select_unspent_notes`.
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
@@ -10,13 +10,19 @@ workspace.
 
 ## [Unreleased]
 
+## [0.19.0] - PLANNED
+
+### Changed
+- Migrated to `zcash_protocol 0.7`, `zcash_address 0.10`, `zip321 0.6`,
+  `zcash_transparent 0.6`, `zcash_primitives 0.26`, `zcash_proofs 0.26`
+
 ## [0.18.3] - 2025-09-30
 
 ### Changed
 - The `zcash_client_sqlite` implementation of `WalletWrite::update_chain_tip`
   now ensures that a transaction status request is queued for any transactions
   for which we do not have mined-height information and which are known to be
-  unexpired. 
+  unexpired.
 - Transaction status requests are no longer deleted until the transaction in
   question is positively known to be expired.
 
diff --git a/zcash_extensions/CHANGELOG.md b/zcash_extensions/CHANGELOG.md
@@ -9,7 +9,6 @@ and this library adheres to Rust's notion of
 
 ### Changed
 - MSRV is now 1.81.0.
-- Migrated to `zcash_protocol 0.6`, `zcash_primitives 0.25`.
 
 ## [0.1.0] - 2024-07-15
 Initial release.
diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
@@ -9,6 +9,11 @@ workspace.
 
 ## [Unreleased]
 
+## [0.12.0] - PLANNED
+
+### Changed
+- Migrated to `zcash_protocol 0.7`, `zcash_address 0.10`, `zcash_transparent 0.6`
+
 ## [0.11.0] - 2025-09-25
 
 ### Added
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
@@ -10,11 +10,14 @@ workspace.
 
 ## [Unreleased]
 
+## [0.26.0] - 2025-10-02
+
 ### Added
 - `zcash_primitives::transaction::builder::Builder::add_transparent_p2sh_input`
   (only for use in combination with `Builder::build_for_pczt`).
 
 ### Changed
+- Migrated to `zcash_protocol 0.7`, `zcash_address 0.10`, `zcash_transparent 0.6`
 - `zcash_primitives::transaction::fees::zip317`:
   - `FeeError::NonP2pkhInputs` has been renamed to `UnknownP2shInputs`.
 
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.25.0"
+version = "0.26.0"
 authors = [
     "Jack Grigg <jack@z.cash>",
     "Kris Nuttycombe <kris@electriccoin.co>"
diff --git a/zcash_proofs/CHANGELOG.md b/zcash_proofs/CHANGELOG.md
@@ -10,6 +10,11 @@ workspace.
 
 ## [Unreleased]
 
+## [0.26.0] - 2025-10-02
+
+### Changed
+- Migrated to `zcash_primitives 0.26`
+
 ## [0.25.0] - 2025-09-25
 
 ### 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.25.0"
+version = "0.26.0"
 authors = [
     "Jack Grigg <jack@z.cash>",
 ]
diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
diff --git a/zcash_transparent/Cargo.toml b/zcash_transparent/Cargo.toml

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`[package]`
`2`	`2`	`name = "zcash_address"`
`3`	`3`	`description = "Zcash address parsing and serialization"`
`4`		`-version = "0.9.0"`
	`4`	`+version = "0.10.0"`
`5`	`5`	`authors = [`
`6`	`6`	`"Jack Grigg <jack@electriccoin.co>",`
`7`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`[package]`
`2`	`2`	`name = "zip321"`
`3`	`3`	`description = "Parsing functions and data types for Zcash ZIP 321 Payment Request URIs"`
`4`		`-version = "0.5.0"`
	`4`	`+version = "0.6.0"`
`5`	`5`	`authors = [`
`6`	`6`	`"Kris Nuttycombe <kris@electriccoin.co>"`
`7`	`7`	`]`