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

Release/zcash primitives 0.21 #1665

Merged
merged 10 commits into from
Dec 17, 2024
25 changes: 13 additions & 12 deletions Cargo.lock

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

20 changes: 8 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ categories = ["cryptography::cryptocurrencies"]
# Intra-workspace dependencies
equihash = { version = "0.2", path = "components/equihash" }
zcash_address = { version = "0.6", path = "components/zcash_address", default-features = false }
zcash_client_backend = { version = "0.15", path = "zcash_client_backend" }
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.5", path = "zcash_keys" }
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_note_encryption = "0.4.1"
zcash_primitives = { version = "0.20", path = "zcash_primitives", default-features = false }
zcash_proofs = { version = "0.20", path = "zcash_proofs", default-features = false }
zcash_primitives = { version = "0.21", path = "zcash_primitives", default-features = false }
zcash_proofs = { version = "0.21", path = "zcash_proofs", default-features = false }

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

# Shielded protocols
bellman = { version = "0.14", default-features = false, features = ["groth16"] }
Expand All @@ -62,18 +62,18 @@ blake2s_simd = { version = "1", default-features = false }
bls12_381 = "0.8"
jubjub = "0.10"
redjubjub = "0.7"
sapling = { package = "sapling-crypto", version = "0.3", default-features = false }
sapling = { package = "sapling-crypto", version = "0.4", default-features = false }

# - Orchard
nonempty = "0.7"
orchard = { version = "0.10", default-features = false }
orchard = { version = "0.10.1", default-features = false }
pasta_curves = "0.5"

# - Transparent
bip32 = { version = "0.5", default-features = false }
ripemd = { version = "0.1", default-features = false }
secp256k1 = { version = "0.27", default-features = false, features = ["alloc"] }
transparent = { package = "zcash_transparent", version = "0.0", path = "zcash_transparent", default-features = false }
transparent = { package = "zcash_transparent", version = "0.1", path = "zcash_transparent", default-features = false }

# Boilerplate & missing stdlib
getset = "0.1"
Expand Down Expand Up @@ -193,7 +193,3 @@ debug = true

[workspace.lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(zcash_unstable, values("zfuture"))'] }

[patch.crates-io]
orchard = { git = "https://github.com/zcash/orchard.git", rev = "f99b6565a78763b58dac792d7492c55067bae680" }
sapling-crypto = { git = "https://github.com/zcash/sapling-crypto.git", rev = "e47d57f5c9c46f05740328f8ef9601f6d697cf34" }
11 changes: 11 additions & 0 deletions pczt/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Changelog
All notable changes to this library will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this library adheres to Rust's notion of
[Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [0.1.0] - 2024-12-16
Initial release supporting the PCZT v1 format.
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.0.0"
version = "0.1.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 @@ -747,6 +747,12 @@ user-id = 169181 # Kris Nuttycombe (nuttycom)
start = "2024-08-12"
end = "2025-08-12"

[[trusted.pczt]]
criteria = "safe-to-deploy"
user-id = 169181 # Kris Nuttycombe (nuttycom)
start = "2024-12-17"
end = "2025-12-17"

[[trusted.sapling-crypto]]
criteria = "safe-to-deploy"
user-id = 169181 # Kris Nuttycombe (nuttycom)
Expand Down Expand Up @@ -987,6 +993,12 @@ user-id = 6289 # Jack Grigg (str4d)
start = "2024-12-14"
end = "2025-12-16"

[[trusted.zcash_transparent]]
criteria = "safe-to-deploy"
user-id = 169181 # Kris Nuttycombe (nuttycom)
start = "2024-12-17"
end = "2025-12-17"

[[trusted.zip32]]
criteria = "safe-to-deploy"
user-id = 6289 # Jack Grigg (str4d)
Expand Down
3 changes: 3 additions & 0 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ audit-as-crates-io = true
[policy.zcash_protocol]
audit-as-crates-io = true

[policy.zcash_transparent]
audit-as-crates-io = true

[policy.zip321]
audit-as-crates-io = true

Expand Down
51 changes: 36 additions & 15 deletions supply-chain/imports.lock
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,27 @@ user-id = 6289
user-login = "str4d"
user-name = "Jack Grigg"

[[publisher.orchard]]
version = "0.10.1"
when = "2024-12-17"
user-id = 169181
user-login = "nuttycom"
user-name = "Kris Nuttycombe"

[[publisher.pczt]]
version = "0.1.0"
when = "2024-12-17"
user-id = 169181
user-login = "nuttycom"
user-name = "Kris Nuttycombe"

[[publisher.sapling-crypto]]
version = "0.4.0"
when = "2024-12-17"
user-id = 169181
user-login = "nuttycom"
user-name = "Kris Nuttycombe"

[[publisher.schemerz]]
version = "0.2.0"
when = "2024-10-16"
Expand Down Expand Up @@ -267,15 +288,15 @@ user-login = "str4d"
user-name = "Jack Grigg"

[[publisher.zcash_client_backend]]
version = "0.15.0"
when = "2024-11-14"
version = "0.16.0"
when = "2024-12-17"
user-id = 169181
user-login = "nuttycom"
user-name = "Kris Nuttycombe"

[[publisher.zcash_client_sqlite]]
version = "0.13.0"
when = "2024-11-14"
version = "0.14.0"
when = "2024-12-17"
user-id = 169181
user-login = "nuttycom"
user-name = "Kris Nuttycombe"
Expand All @@ -302,22 +323,22 @@ user-login = "str4d"
user-name = "Jack Grigg"

[[publisher.zcash_keys]]
version = "0.5.0"
when = "2024-11-14"
version = "0.6.0"
when = "2024-12-17"
user-id = 169181
user-login = "nuttycom"
user-name = "Kris Nuttycombe"

[[publisher.zcash_primitives]]
version = "0.20.0"
when = "2024-11-14"
version = "0.21.0"
when = "2024-12-17"
user-id = 169181
user-login = "nuttycom"
user-name = "Kris Nuttycombe"

[[publisher.zcash_proofs]]
version = "0.20.0"
when = "2024-11-14"
version = "0.21.0"
when = "2024-12-17"
user-id = 169181
user-login = "nuttycom"
user-name = "Kris Nuttycombe"
Expand All @@ -337,11 +358,11 @@ user-login = "str4d"
user-name = "Jack Grigg"

[[publisher.zcash_transparent]]
version = "0.0.0"
when = "2024-12-14"
user-id = 6289
user-login = "str4d"
user-name = "Jack Grigg"
version = "0.1.0"
when = "2024-12-17"
user-id = 169181
user-login = "nuttycom"
user-name = "Kris Nuttycombe"

[[publisher.zip32]]
version = "0.1.1"
Expand Down
4 changes: 4 additions & 0 deletions zcash_client_backend/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.16.0] - 2024-12-16

### Added
- `zcash_client_backend::data_api`
- `AccountSource::key_derivation`
Expand All @@ -16,6 +18,8 @@ and this library adheres to Rust's notion of
- `wallet::extract_and_store_transaction_from_pczt`

### Changed
- Migrated to `sapling-crypto 0.4`, `zcash_keys 0.6`, `zcash_primitives 0.21`,
`zcash_proofs 0.21`.
- `zcash_client_backend::data_api::AccountBalance`: Refactored to use `Balance`
for transparent funds (issue #1411). It now has an `unshielded_balance()`
method that returns `Balance`, allowing the unshielded spendable, unshielded
Expand Down
2 changes: 1 addition & 1 deletion zcash_client_backend/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zcash_client_backend"
description = "APIs for creating shielded Zcash light clients"
version = "0.15.0"
version = "0.16.0"
authors = [
"Jack Grigg <[email protected]>",
"Kris Nuttycombe <[email protected]>"
Expand Down
4 changes: 4 additions & 0 deletions zcash_client_sqlite/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.14.0] - 2024-12-16

### Added
- `zcash_client_sqlite::AccountUuid`

### Changed
- Migrated to `sapling-crypto 0.4`, `zcash_keys 0.6`, `zcash_primitives 0.21`,
`zcash_proofs 0.21`, `zcash_client_backend 0.16`
- The `v_transactions` view has been modified:
- The `account_id` column has been replaced with `account_uuid`.
- The `v_tx_outputs` view has been modified:
Expand Down
2 changes: 1 addition & 1 deletion zcash_client_sqlite/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zcash_client_sqlite"
description = "An SQLite-based Zcash light client"
version = "0.13.0"
version = "0.14.0"
authors = [
"Jack Grigg <[email protected]>",
"Kris Nuttycombe <[email protected]>"
Expand Down
6 changes: 5 additions & 1 deletion zcash_keys/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ and this library adheres to Rust's notion of

## [Unreleased]

## [0.6.0] - 2024-12-16

### Changed
- Migrated to `bech32 0.11`.
- Migrated to `bech32 0.11`, `sapling-crypto 0.4`.
- Added dependency on `zcash_transparent 0.1` to replace dependency
on `zcash_primitives`.
- The `UnifiedAddressRequest` argument to the following methods is now optional:
- `zcash_keys::keys::UnifiedSpendingKey::address`
- `zcash_keys::keys::UnifiedSpendingKey::default_address`
Expand Down
12 changes: 8 additions & 4 deletions zcash_keys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "zcash_keys"
description = "Zcash key and address management"
version = "0.5.0"
version = "0.6.0"
authors = [
"Jack Grigg <[email protected]>",
"Kris Nuttycombe <[email protected]>"
Expand Down Expand Up @@ -72,12 +72,15 @@ hex.workspace = true
jubjub.workspace = true
proptest.workspace = true
rand_core.workspace = true
orchard = { workspace = true, features = ["circuit"] }
zcash_address = { workspace = true, features = ["test-dependencies"] }
zcash_primitives = { workspace = true, features = ["test-dependencies"] }

[features]
## Enables use of transparent key parts and addresses
transparent-inputs = ["dep:bip32", "zcash_primitives/transparent-inputs"]
transparent-inputs = [
"dep:bip32",
"transparent/transparent-inputs",
]

## Enables use of Orchard key parts and addresses
orchard = ["dep:orchard"]
Expand All @@ -89,7 +92,8 @@ sapling = ["dep:sapling"]
test-dependencies = [
"dep:proptest",
"orchard?/test-dependencies",
"zcash_primitives/test-dependencies",
"sapling?/test-dependencies",
"transparent/test-dependencies",
]

#! ### Experimental features
Expand Down
Loading
Loading