Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zcash_address 0.6.0, zcash_primitives 0.19.0, zcash_proofs 0.19.0 #1556

Merged
merged 4 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
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,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`
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.5.0"
version = "0.6.0"
authors = [
"Jack Grigg <jack@electriccoin.co>",
]
Expand Down
6 changes: 6 additions & 0 deletions supply-chain/audits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
46 changes: 17 additions & 29 deletions supply-chain/imports.lock
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions zcash_client_backend/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions zcash_client_sqlite/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions zcash_keys/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions zcash_primitives/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion zcash_primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <jack@z.cash>",
"Kris Nuttycombe <kris@electriccoin.co>"
Expand Down
11 changes: 11 additions & 0 deletions zcash_proofs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion zcash_proofs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <jack@z.cash>",
]
Expand Down
Loading