Skip to content

Commit

Permalink
Merge pull request #1662 from zcash/zcash_keys-prepare_no_std
Browse files Browse the repository at this point in the history
zcash_keys: Prepare for `no_std` usage.
  • Loading branch information
str4d authored Dec 17, 2024
2 parents c04a71e + b06868e commit 0e3c35e
Show file tree
Hide file tree
Showing 11 changed files with 148 additions and 68 deletions.
46 changes: 36 additions & 10 deletions Cargo.lock

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

24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ pczt = { version = "0.0", path = "pczt" }

# Shielded protocols
bellman = { version = "0.14", default-features = false, features = ["groth16"] }
ff = "0.13"
ff = { version = "0.13", default-features = false }
group = "0.13"
incrementalmerkletree = "0.7"
incrementalmerkletree = { version = "0.7.1", default-features = false }
shardtree = "0.5"
zcash_spec = "0.1"

# Payment protocols
# - Sapling
bitvec = "1"
blake2s_simd = "1"
bitvec = { version = "1", default-features = false, features = ["alloc"] }
blake2s_simd = { version = "1", default-features = false }
bls12_381 = "0.8"
jubjub = "0.10"
redjubjub = "0.7"
Expand All @@ -75,12 +75,12 @@ 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 }

# Boilerplate
# Boilerplate & missing stdlib
getset = "0.1"

# CSPRNG
rand = "0.8"
rand_core = "0.6"
rand = { version = "0.8", default-features = false }
rand_core = { version = "0.6", default-features = false }

# Currency conversions
rust_decimal = { version = "1.35", default-features = false, features = ["serde"] }
Expand All @@ -100,7 +100,7 @@ byteorder = "1"
hex = { version = "0.4", default-features = false, features = ["alloc"] }
percent-encoding = "2.1.0"
postcard = { version = "1", features = ["alloc"] }
serde = { version = "1", features = ["derive"] }
serde = { version = "1", default-features = false, features = ["derive"] }
serde_json = "1"

# HTTP
Expand All @@ -111,8 +111,8 @@ tokio-rustls = "0.24"
webpki-roots = "0.25"

# Logging and metrics
memuse = "0.2.1"
tracing = "0.1"
memuse = { version = "0.2.2", default-features = false }
tracing = { version = "0.1", default-features = false }

# No-std support
core2 = { version = "0.3", default-features = false, features = ["alloc"] }
Expand Down Expand Up @@ -166,7 +166,7 @@ trait-variant = "0.1"

# ZIP 32
aes = "0.8"
fpe = "0.6"
fpe = { version = "0.6", default-features = false, features = ["alloc"] }
zip32 = { version = "0.1.1", default-features = false }

[profile.release]
Expand Down Expand Up @@ -195,5 +195,5 @@ debug = true
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(zcash_unstable, values("zfuture"))'] }

[patch.crates-io]
orchard = { git = "https://github.com/zcash/orchard.git", rev = "7a44e3279b5747819022c4d8f4474fa79b2d9746" }
orchard = { git = "https://github.com/zcash/orchard.git", rev = "f99b6565a78763b58dac792d7492c55067bae680" }
sapling-crypto = { git = "https://github.com/zcash/sapling-crypto.git", rev = "e47d57f5c9c46f05740328f8ef9601f6d697cf34" }
30 changes: 30 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 = 6289 # Jack Grigg (str4d)
start = "2021-09-22"
end = "2025-04-22"

[[trusted.halo2_gadgets]]
criteria = "safe-to-deploy"
user-id = 6289 # Jack Grigg (str4d)
start = "2022-02-15"
end = "2025-12-16"

[[trusted.halo2_gadgets]]
criteria = ["safe-to-deploy", "crypto-reviewed"]
user-id = 1244 # ebfull
Expand All @@ -675,6 +681,12 @@ user-id = 199950 # Daira Emma Hopwood (daira)
start = "2023-02-24"
end = "2025-04-22"

[[trusted.halo2_poseidon]]
criteria = "safe-to-deploy"
user-id = 6289 # Jack Grigg (str4d)
start = "2024-12-13"
end = "2025-12-16"

[[trusted.halo2_proofs]]
criteria = ["safe-to-deploy", "crypto-reviewed"]
user-id = 1244 # ebfull
Expand Down Expand Up @@ -705,6 +717,12 @@ user-id = 169181 # Kris Nuttycombe (nuttycom)
start = "2024-09-25"
end = "2025-10-02"

[[trusted.memuse]]
criteria = "safe-to-deploy"
user-id = 6289 # Jack Grigg (str4d)
start = "2021-09-03"
end = "2025-12-16"

[[trusted.orchard]]
criteria = "safe-to-deploy"
user-id = 169181 # Kris Nuttycombe (nuttycom)
Expand Down Expand Up @@ -765,6 +783,12 @@ user-id = 169181 # Kris Nuttycombe (nuttycom)
start = "2022-12-15"
end = "2025-04-22"

[[trusted.sinsemilla]]
criteria = "safe-to-deploy"
user-id = 6289 # Jack Grigg (str4d)
start = "2024-12-13"
end = "2025-12-16"

[[trusted.windows-sys]]
criteria = "safe-to-deploy"
user-id = 64539 # Kenny Kerr (kennykerr)
Expand Down Expand Up @@ -957,6 +981,12 @@ user-id = 6289 # Jack Grigg (str4d)
start = "2023-12-07"
end = "2025-04-22"

[[trusted.zcash_transparent]]
criteria = "safe-to-deploy"
user-id = 6289 # Jack Grigg (str4d)
start = "2024-12-14"
end = "2025-12-16"

[[trusted.zip32]]
criteria = "safe-to-deploy"
user-id = 6289 # Jack Grigg (str4d)
Expand Down
4 changes: 0 additions & 4 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -738,10 +738,6 @@ criteria = "safe-to-deploy"
version = "0.5.4"
criteria = "safe-to-deploy"

[[exemptions.memuse]]
version = "0.2.1"
criteria = "safe-to-deploy"

[[exemptions.merlin]]
version = "3.0.0"
criteria = "safe-to-deploy"
Expand Down
Loading

0 comments on commit 0e3c35e

Please sign in to comment.