Skip to content

Commit

Permalink
Merge pull request #1711 from zcash/release-train
Browse files Browse the repository at this point in the history
Release train
  • Loading branch information
nuttycom authored Feb 21, 2025
2 parents 983941e + 33d3ebd commit dc709d2
Show file tree
Hide file tree
Showing 32 changed files with 139 additions and 74 deletions.
24 changes: 12 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 24 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ categories = ["cryptography::cryptocurrencies"]
[workspace.dependencies]
# Intra-workspace dependencies
equihash = { version = "0.2", path = "components/equihash", default-features = false }
zcash_address = { version = "0.6", path = "components/zcash_address", default-features = false }
zcash_client_backend = { version = "0.16", path = "zcash_client_backend" }
zcash_encoding = { version = "0.2.1", path = "components/zcash_encoding", default-features = false }
zcash_keys = { version = "0.6", path = "zcash_keys" }
zcash_protocol = { version = "0.4.1", path = "components/zcash_protocol", default-features = false }
zip321 = { version = "0.2", path = "components/zip321" }
zcash_address = { version = "0.7", path = "components/zcash_address", default-features = false }
zcash_client_backend = { version = "0.17", path = "zcash_client_backend" }
zcash_encoding = { version = "0.3", path = "components/zcash_encoding", default-features = false }
zcash_keys = { version = "0.7", path = "zcash_keys" }
zcash_protocol = { version = "0.5", path = "components/zcash_protocol", default-features = false }
zip321 = { version = "0.3", path = "components/zip321" }

zcash_note_encryption = "0.4.1"
zcash_primitives = { version = "0.21", path = "zcash_primitives", default-features = false }
zcash_proofs = { version = "0.21", path = "zcash_proofs", default-features = false }
zcash_primitives = { version = "0.22", path = "zcash_primitives", default-features = false }
zcash_proofs = { version = "0.22", path = "zcash_proofs", default-features = false }

pczt = { version = "0.1", path = "pczt" }
pczt = { version = "0.2", path = "pczt" }

# Shielded protocols
bellman = { version = "0.14", default-features = false, features = ["groth16"] }
Expand All @@ -71,7 +71,7 @@ pasta_curves = "0.5"
bip32 = { version = "=0.6.0-pre.1", default-features = false }
ripemd = { version = "0.1", default-features = false }
secp256k1 = { version = "0.29", default-features = false, features = ["alloc"] }
transparent = { package = "zcash_transparent", version = "0.1", path = "zcash_transparent", default-features = false }
transparent = { package = "zcash_transparent", version = "0.2", path = "zcash_transparent", default-features = false }

# Boilerplate & missing stdlib
getset = "0.1"
Expand Down Expand Up @@ -169,6 +169,20 @@ aes = "0.8"
fpe = { version = "0.6", default-features = false, features = ["alloc"] }
zip32 = { version = "0.2", default-features = false }

[workspace.metadata.release]
consolidate-commits = false
pre-release-commit-message = "{{crate_name}} {{version}}"
tag-message = "Release {{crate_name}} version {{version}}"
tag-name = "{{prefix}}{{version}}"
pre-release-replacements = [
{file="CHANGELOG.md", search="## \\[Unreleased\\]", replace="## [Unreleased]\n\n## [{{version}}] - {{date}}"},
]
pre-release-hook = ["cargo", "vet"]
# Remove the following options once we're happy to use `cargo-release` without review.
tag = false
publish = false
push = false

[profile.release]
lto = true
panic = 'abort'
Expand Down
2 changes: 2 additions & 0 deletions components/equihash/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1] - 2025-02-21
### Added
- `equihash::tromp` module behind the experimental `solver` feature flag.

Expand Down
2 changes: 1 addition & 1 deletion components/equihash/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "equihash"
description = "The Equihash Proof-of-Work function"
version = "0.2.0"
version = "0.2.1"
authors = ["Jack Grigg <[email protected]>"]
homepage = "https://github.com/zcash/librustzcash"
repository = "https://github.com/zcash/librustzcash"
Expand Down
4 changes: 4 additions & 0 deletions components/zcash_address/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ and this library adheres to Rust's notion of

## [Unreleased]

## [0.7.0] - 2025-02-21
### Added
- `zcash_address::unified::Item` to expose the opaque typed encoding of unified
items.

### Changed
- Migrated to `zcash_encoding 0.3`, `zcash_protocol 0.5`.

### Deprecated
- `zcash_address::Network` (use `zcash_protocol::consensus::NetworkType` instead).

Expand Down
2 changes: 1 addition & 1 deletion components/zcash_address/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zcash_address"
description = "Zcash address parsing and serialization"
version = "0.6.2"
version = "0.7.0"
authors = [
"Jack Grigg <[email protected]>",
]
Expand Down
1 change: 1 addition & 0 deletions components/zcash_encoding/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this library adheres to Rust's notion of

## [Unreleased]

## [0.3.0] - 2025-02-21
### Changed
- Migrated to `nonempty 0.11`

Expand Down
2 changes: 1 addition & 1 deletion components/zcash_encoding/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zcash_encoding"
description = "Binary encodings used throughout the Zcash ecosystem."
version = "0.2.2"
version = "0.3.0"
authors = [
"Jack Grigg <[email protected]>",
"Kris Nuttycombe <[email protected]>",
Expand Down
1 change: 1 addition & 0 deletions components/zcash_protocol/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this library adheres to Rust's notion of

## [Unreleased]

## [0.5.0] - 2025-02-21
### Added
- `zcash_protocol::memo::MemoBytes::into_bytes`

Expand Down
2 changes: 1 addition & 1 deletion components/zcash_protocol/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zcash_protocol"
description = "Zcash protocol network constants and value types."
version = "0.4.3"
version = "0.5.0"
authors = [
"Jack Grigg <[email protected]>",
"Kris Nuttycombe <[email protected]>",
Expand Down
2 changes: 2 additions & 0 deletions components/zip321/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ and this library adheres to Rust's notion of

## [Unreleased]

## [0.3.0] - 2025-02-21
### Changed
- MSRV is now 1.81.0.
- Migrated to `zcash_protocol 0.5`, `zcash_address 0.7`.

## [0.2.0] 2024-10-04

Expand Down
2 changes: 1 addition & 1 deletion components/zip321/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zip321"
description = "Parsing functions and data types for Zcash ZIP 321 Payment Request URIs"
version = "0.2.0"
version = "0.3.0"
authors = [
"Kris Nuttycombe <[email protected]>"
]
Expand Down
5 changes: 4 additions & 1 deletion pczt/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this library adheres to Rust's notion of

## [Unreleased]

## [0.2.0] - 2025-02-21

### Added
- `pczt::common`:
- `Global::{tx_version, version_group_id, consensus_branch_id, expiry_height}`
Expand All @@ -32,7 +34,8 @@ and this library adheres to Rust's notion of
### Changed
- MSRV is now 1.81.0.
- Migrated to `nonempty 0.11`, `secp256k1 0.29`, `redjubjub 0.8`, `orchard 0.11`,
`sapling-crypto 0.5`.
`sapling-crypto 0.5`, `zcash_protocol 0.5`, `zcash_transparent 0.2`,
`zcash_primitives 0.22`.


## [0.1.0] - 2024-12-16
Expand Down
2 changes: 1 addition & 1 deletion pczt/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pczt"
version = "0.1.0"
version = "0.2.0"
authors = ["Jack Grigg <[email protected]>"]
edition.workspace = true
rust-version.workspace = true
Expand Down
12 changes: 12 additions & 0 deletions supply-chain/audits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,12 @@ user-id = 6289 # Jack Grigg (str4d)
start = "2020-06-26"
end = "2025-04-22"

[[trusted.equihash]]
criteria = "safe-to-deploy"
user-id = 169181 # Kris Nuttycombe (nuttycom)
start = "2025-02-21"
end = "2026-02-21"

[[trusted.f4jumble]]
criteria = ["safe-to-deploy", "crypto-reviewed"]
user-id = 6289 # Jack Grigg (str4d)
Expand Down Expand Up @@ -1003,6 +1009,12 @@ user-id = 6289 # Jack Grigg (str4d)
start = "2021-08-31"
end = "2025-12-13"

[[trusted.zcash_encoding]]
criteria = "safe-to-deploy"
user-id = 169181 # Kris Nuttycombe (nuttycom)
start = "2024-08-19"
end = "2026-02-21"

[[trusted.zcash_extensions]]
criteria = "safe-to-deploy"
user-id = 6289 # Jack Grigg (str4d)
Expand Down
Loading

0 comments on commit dc709d2

Please sign in to comment.