Skip to content

Commit

Permalink
Merge branch 'main' into docker-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@upbqdn
upbqdn committed Oct 11, 2024
2 parents 99cd18f + fea9f46 commit c718609
Show file tree
Hide file tree
Showing 20 changed files with 1,079 additions and 345 deletions.
280 changes: 76 additions & 204 deletions Cargo.lock
View file

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ resolver = "2"
# `cargo release` settings

[workspace.dependencies]
incrementalmerkletree = "0.6.0"
incrementalmerkletree = "0.7.0"
orchard = "0.9.0"
sapling-crypto = "0.2.0"
zcash_address = "0.5.0"
Expand Down Expand Up @@ -102,3 +102,18 @@ panic = "abort"
# - add "-flto=thin" to all C/C++ code builds
# - see https://doc.rust-lang.org/rustc/linker-plugin-lto.html#cc-code-as-a-dependency-in-rust
lto = "thin"

# We can remove this patches after we get out of 2.0 release candidate and upgrade the ECC dependencies above.
# This revisions are at the commit just before setting mainnet activation heights.
[patch.crates-io]
zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
zcash_protocol = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
sapling-crypto = { git = "https://github.com/zcash/sapling-crypto", rev = "b1ad3694ee13a2fc5d291ad04721a6252da0993c" }
orchard = { git = "https://github.com/zcash/orchard", rev = "55fb089a335bbbc1cda186c706bc037073df8eb7" }
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" }
shardtree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" }
30 changes: 20 additions & 10 deletions deny.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,26 @@ skip-tree = [
{ name = "http-body", version = "=0.4.6" },
{ name = "hyper", version = "=0.14.30" },

# TODO: Remove this after we upgrade ECC dependencies to a crates.io version (#8749)
{ name = "equihash", version = "=0.2.0" },
{ name = "f4jumble", version = "=0.1.0" },
{ name = "secp256k1", version = "=0.26.0" },
{ name = "zcash_address", version = "=0.5.0" },
{ name = "zcash_client_backend", version = "=0.13.0" },


# wait for structopt-derive to update heck
{ name = "heck", version = "=0.3.3" },

# wait for librocksdb-sys to update bindgen to one that uses newer itertools
{ name = "itertools", version = "=0.12.1" }
{ name = "itertools", version = "=0.12.1" },

# wait for halo2_gadgets and primitive-types to update uint
{ name = "uint", version = "=0.9.5" },

# wait for dirs-sys to update windows-sys
{ name = "windows-sys", version = "=0.48.0" },

# Remove after release candicate period is over and the ECC crates are not patched anymore
{ name = "equihash", version = "=0.2.0" },
{ name = "f4jumble", version = "=0.1.0" },
{ name = "incrementalmerkletree", version = "=0.6.0" },
{ name = "zcash_address", version = "=0.4.0" },
{ name = "zcash_keys", version = "=0.3.0" },
{ name = "zcash_primitives", version = "=0.16.0" },
{ name = "zcash_protocol", version = "=0.2.0" }
]

# This section is considered when running `cargo deny check sources`.
Expand All @@ -114,7 +121,10 @@ unknown-git = "deny"
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
# List of URLs for allowed Git repositories
allow-git = [
"https://github.com/zcash/librustzcash.git"
"https://github.com/zcash/librustzcash.git",
"https://github.com/zcash/incrementalmerkletree",
"https://github.com/zcash/orchard",
"https://github.com/zcash/sapling-crypto"
]

[sources.allow-org]
Expand Down
114 changes: 105 additions & 9 deletions supply-chain/audits.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.4.0 -> 0.5.0"

[[audits.bridgetree]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.5.0 -> 0.6.0"

[[audits.bytemuck]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -94,13 +99,13 @@ delta = "0.3.0 -> 0.4.0"
[[audits.equihash]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.2.0 -> 0.2.0@git:a1047adf0b6f324dad415db34762dc26f8367ce4"
delta = "0.2.0 -> 0.2.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[audits.f4jumble]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.1.0 -> 0.1.0@git:a1047adf0b6f324dad415db34762dc26f8367ce4"
delta = "0.1.0 -> 0.1.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[audits.git2]]
Expand Down Expand Up @@ -128,6 +133,17 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.5.1 -> 0.6.0"

[[audits.incrementalmerkletree]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.6.0 -> 0.7.0"

[[audits.incrementalmerkletree]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.7.0 -> 0.7.0@git:ffe4234788fd22662b937ba7c6ea01535fcc1293"
importable = false

[[audits.indexmap]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -208,6 +224,17 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.8.0 -> 0.9.0"

[[audits.orchard]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.9.0 -> 0.10.0"

[[audits.orchard]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.10.0 -> 0.9.1@git:55fb089a335bbbc1cda186c706bc037073df8eb7"
importable = false

[[audits.owo-colors]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -283,6 +310,17 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.1.3 -> 0.2.0"

[[audits.sapling-crypto]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.2.0 -> 0.3.0"

[[audits.sapling-crypto]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.0 -> 0.2.0@git:b1ad3694ee13a2fc5d291ad04721a6252da0993c"
importable = false

[[audits.serde_spanned]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -318,6 +356,17 @@ who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.1 -> 0.4.0"

[[audits.shardtree]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.4.0 -> 0.5.0"

[[audits.shardtree]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.5.0 -> 0.4.0@git:ffe4234788fd22662b937ba7c6ea01535fcc1293"
importable = false

[[audits.tempfile]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -541,9 +590,14 @@ delta = "0.4.0 -> 0.5.0"
[[audits.zcash_address]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.5.0 -> 0.5.0@git:a1047adf0b6f324dad415db34762dc26f8367ce4"
delta = "0.5.0 -> 0.5.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[audits.zcash_address]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.5.0 -> 0.6.0"

[[audits.zcash_client_backend]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -552,19 +606,35 @@ delta = "0.12.1 -> 0.13.0"
[[audits.zcash_client_backend]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.13.0 -> 0.13.0@git:a1047adf0b6f324dad415db34762dc26f8367ce4"
delta = "0.13.0 -> 0.14.0"

[[audits.zcash_client_backend]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.14.0 -> 0.13.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[audits.zcash_encoding]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.2.1 -> 0.2.1@git:a1047adf0b6f324dad415db34762dc26f8367ce4"
delta = "0.2.1 -> 0.2.1@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[audits.zcash_history]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.4.0 -> 0.4.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[audits.zcash_keys]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.0 -> 0.4.0"

[[audits.zcash_keys]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.0 -> 0.3.0@git:a1047adf0b6f324dad415db34762dc26f8367ce4"
delta = "0.4.0 -> 0.3.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[audits.zcash_primitives]]
Expand All @@ -575,14 +645,30 @@ delta = "0.16.0 -> 0.17.0"
[[audits.zcash_primitives]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.17.0 -> 0.17.0@git:a1047adf0b6f324dad415db34762dc26f8367ce4"
delta = "0.17.0 -> 0.17.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[audits.zcash_primitives]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.17.0 -> 0.19.0"

[[audits.zcash_proofs]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.16.0 -> 0.17.0"

[[audits.zcash_proofs]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.17.0 -> 0.17.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[audits.zcash_proofs]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.17.0 -> 0.19.0"

[[audits.zcash_protocol]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -596,7 +682,12 @@ delta = "0.1.1 -> 0.3.0"
[[audits.zcash_protocol]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.0 -> 0.3.0@git:a1047adf0b6f324dad415db34762dc26f8367ce4"
delta = "0.3.0 -> 0.4.0"

[[audits.zcash_protocol]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.4.0 -> 0.3.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[audits.zebra-chain]]
Expand Down Expand Up @@ -662,7 +753,12 @@ version = "0.1.0"
[[audits.zip321]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.1.0 -> 0.1.0@git:a1047adf0b6f324dad415db34762dc26f8367ce4"
delta = "0.1.0 -> 0.2.0"

[[audits.zip321]]
who = "Alfredo Garcia <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.2.0 -> 0.1.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"
importable = false

[[trusted.clap]]
Expand Down
44 changes: 38 additions & 6 deletions supply-chain/config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,28 @@ url = "https://raw.githubusercontent.com/zcash/rust-ecosystem/main/supply-chain/
[imports.zcashd]
url = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"

[policy.equihash]
[policy."equihash:0.2.0"]

[policy."equihash:0.2.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"]
audit-as-crates-io = true

[policy."f4jumble:0.1.0"]

[policy."f4jumble:0.1.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"]
audit-as-crates-io = true

[policy."incrementalmerkletree:0.6.0"]

[policy."incrementalmerkletree:0.7.0@git:ffe4234788fd22662b937ba7c6ea01535fcc1293"]
audit-as-crates-io = true

[policy.f4jumble]
[policy.orchard]
audit-as-crates-io = true

[policy.sapling-crypto]
audit-as-crates-io = true

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

[policy.tower-batch-control]
Expand All @@ -28,7 +46,9 @@ audit-as-crates-io = true
[policy.tower-fallback]
audit-as-crates-io = true

[policy.zcash_address]
[policy."zcash_address:0.4.0"]

[policy."zcash_address:0.5.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"]
audit-as-crates-io = true

[policy.zcash_client_backend]
Expand All @@ -37,13 +57,25 @@ audit-as-crates-io = true
[policy.zcash_encoding]
audit-as-crates-io = true

[policy.zcash_keys]
[policy.zcash_history]
audit-as-crates-io = true

[policy.zcash_primitives]
[policy."zcash_keys:0.3.0"]

[policy."zcash_keys:0.3.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"]
audit-as-crates-io = true

[policy.zcash_protocol]
[policy."zcash_primitives:0.16.0"]

[policy."zcash_primitives:0.17.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"]
audit-as-crates-io = true

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

[policy."zcash_protocol:0.2.0"]

[policy."zcash_protocol:0.3.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792"]
audit-as-crates-io = true

[policy.zebra-chain]
Expand Down
4 changes: 2 additions & 2 deletions zebra-chain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ bitflags = "2.5.0"
bitflags-serde-legacy = "0.1.1"
blake2b_simd = "1.0.2"
blake2s_simd = "1.0.2"
bridgetree = "0.5.0"
bridgetree = "0.6.0"
bs58 = { version = "0.5.1", features = ["check"] }
byteorder = "1.5.0"

Expand All @@ -88,7 +88,7 @@ primitive-types = "0.12.2"
rand_core = "0.6.4"
ripemd = "0.1.3"
# Matches version used by hdwallet
secp256k1 = { version = "0.26.0", features = ["serde"] }
secp256k1 = { version = "0.27.0", features = ["serde"] }
sha2 = { version = "0.10.7", features = ["compress"] }
uint = "0.10.0"
x25519-dalek = { version = "2.0.1", features = ["serde"] }
Expand Down
Loading

0 comments on commit c718609

Please sign in to comment.