zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build(deps): Upgrade to ed25519-zebra 4.0.0 (#6881) 

* build: Upgrade to ed5519-zebra 4.0.0

* skip-tree hashbrown =0.13.2 because ed25519-zebra is 0.14.0 and a dep of metrics-exporter-prometheus is 0.13.2

* Use correct versions in deny.toml

* Oops turns out we need both exceptions

---------

Co-authored-by: teor <teor@riseup.net>
This commit is contained in:
Deirdre Connolly 2023-06-09 06:03:58 -04:00 committed by GitHub
parent 89bf875744
commit 954ff2ef42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 92 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
Cargo.lock
View File

@ -35,7 +35,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55bfb86e57d13c06e482c570826ddcddcc8f07fab916760e8911141d4fda8b62"
dependencies = [
"ident_case",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
"synstructure",
@ -118,6 +118,12 @@ dependencies = [
"memchr",
]
[[package]]
name = "allocator-api2"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4f263788a35611fba42eb41ff811c5d0360c58b97402570312a350736e2542e"
[[package]]
name = "android-tzdata"
version = "0.1.1"
@ -251,7 +257,7 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -262,7 +268,7 @@ version = "0.1.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -418,7 +424,7 @@ dependencies = [
"log",
"peeking_take_while",
"prettyplease 0.2.6",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"regex",
"rustc-hash",
@ -797,7 +803,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
dependencies = [
"heck 0.4.1",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -1036,19 +1042,6 @@ dependencies = [
"typenum",
]
[[package]]
name = "curve25519-dalek"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
dependencies = [
"byteorder",
"digest 0.9.0",
"rand_core 0.5.1",
"subtle",
"zeroize",
]
[[package]]
name = "curve25519-dalek"
version = "4.0.0-rc.2"
@ -1056,6 +1049,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585"
dependencies = [
"cfg-if 1.0.0",
"digest 0.10.7",
"fiat-crypto",
"packed_simd_2",
"platforms",
@ -1083,7 +1077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b677bcf759c79656defee3b0374aeff759122d3fc80edb0b77eeb0fd06e8fd20"
dependencies = [
"codespan-reporting",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -1100,7 +1094,7 @@ version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -1133,7 +1127,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
dependencies = [
"fnv",
"ident_case",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"strsim 0.10.0",
"syn 1.0.109",
@ -1147,7 +1141,7 @@ checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb"
dependencies = [
"fnv",
"ident_case",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"strsim 0.10.0",
"syn 2.0.18",
@ -1241,7 +1235,7 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -1253,17 +1247,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
[[package]]
name = "ed25519-zebra"
version = "3.1.0"
name = "ed25519"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963"
dependencies = [
"curve25519-dalek 3.2.0",
"hashbrown 0.12.3",
"serde",
"signature",
]
[[package]]
name = "ed25519-zebra"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6af5e1fb700a3c779c7a7ed25c8c0b7f193db101de3773ac46e704bcb882d772"
dependencies = [
"curve25519-dalek",
"ed25519",
"hashbrown 0.14.0",
"hex",
"rand_core 0.6.4",
"serde",
"sha2 0.9.9",
"sha2 0.10.6",
"zeroize",
]
@ -1545,7 +1550,7 @@ version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -1734,9 +1739,6 @@ name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
dependencies = [
"ahash 0.7.6",
]
[[package]]
name = "hashbrown"
@ -1747,6 +1749,16 @@ dependencies = [
"ahash 0.8.3",
]
[[package]]
name = "hashbrown"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
dependencies = [
"ahash 0.8.3",
"allocator-api2",
]
[[package]]
name = "hdrhistogram"
version = "7.5.2"
@ -2017,7 +2029,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
]
@ -2197,7 +2209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2"
dependencies = [
"proc-macro-crate 0.1.5",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
]
@ -2488,7 +2500,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
]
@ -2499,7 +2511,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -2754,7 +2766,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -2884,7 +2896,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b"
dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
]
@ -3013,7 +3025,7 @@ checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e"
dependencies = [
"pest",
"pest_meta",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -3054,7 +3066,7 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -3149,7 +3161,7 @@ version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"syn 1.0.109",
]
@ -3159,7 +3171,7 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b69d39aab54d069e7f2fe8cb970493e7834601ca2d8c65fd7bbd183578080d1"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"syn 2.0.18",
]
@ -3200,7 +3212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
"version_check",
@ -3212,7 +3224,7 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"version_check",
]
@ -3228,9 +3240,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.59"
version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
dependencies = [
"unicode-ident",
]
@ -3306,7 +3318,7 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
dependencies = [
"anyhow",
"itertools",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
]
@ -3369,7 +3381,7 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
]
@ -3389,7 +3401,7 @@ version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
]
[[package]]
@ -4045,7 +4057,7 @@ version = "1.0.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -4116,7 +4128,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
dependencies = [
"darling 0.13.4",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
]
@ -4128,7 +4140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070"
dependencies = [
"darling 0.20.1",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -4181,6 +4193,12 @@ dependencies = [
"libc",
]
[[package]]
name = "signature"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
[[package]]
name = "similar"
version = "2.2.1"
@ -4235,7 +4253,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bdfb59103e43a0f99a346b57860d50f2138a7008d08acd964e9ac0fef3ae9a5"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
]
@ -4298,7 +4316,7 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
dependencies = [
"heck 0.3.3",
"proc-macro-error",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
]
@ -4326,7 +4344,7 @@ version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"unicode-ident",
]
@ -4337,7 +4355,7 @@ version = "2.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"unicode-ident",
]
@ -4354,7 +4372,7 @@ version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 1.0.109",
"unicode-xid 0.2.4",
@ -4413,7 +4431,7 @@ version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -4430,9 +4448,9 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.21"
version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
dependencies = [
"itoa",
"serde",
@ -4516,7 +4534,7 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -4672,7 +4690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07"
dependencies = [
"prettyplease 0.1.25",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"prost-build",
"quote 1.0.28",
"syn 1.0.109",
@ -4791,7 +4809,7 @@ version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]
@ -5161,7 +5179,7 @@ dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
"wasm-bindgen-shared",
@ -5195,7 +5213,7 @@ version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
"wasm-bindgen-backend",
@ -5468,7 +5486,7 @@ version = "2.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fabd6e16dd08033932fc3265ad4510cc2eab24656058a6dcb107ffe274abcc95"
dependencies = [
"curve25519-dalek 4.0.0-rc.2",
"curve25519-dalek",
"rand_core 0.6.4",
"serde",
"zeroize",
@ -5990,7 +6008,7 @@ version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2 1.0.59",
"proc-macro2 1.0.60",
"quote 1.0.28",
"syn 2.0.18",
]

6
deny.toml
View File

@ -55,8 +55,10 @@ skip-tree = [
# ed25519-zebra/hashbrown: https://github.com/ZcashFoundation/ed25519-zebra/pull/65
{ name = "ahash", version = "=0.7.6" },
# wait for ed25519-zebra to upgrade
{ name = "curve25519-dalek", version = "=3.2.0" },
# wait for indexmap, toml_edit, serde_json, tower to upgrade
{ name = "hashbrown", version = "=0.12.3" },
# wait for metrics-exporter-prometheus to upgrade
{ name = "hashbrown", version = "=0.13.2" },
# ECC crates

2
tower-batch/Cargo.toml
View File

@ -22,7 +22,7 @@ color-eyre = "0.6.2"
# Enable a feature that makes tinyvec compile much faster.
tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
ed25519-zebra = "3.1.0"
ed25519-zebra = "4.0.0"
rand = { version = "0.8.5", package = "rand" }
tokio = { version = "1.28.2", features = ["full", "tracing", "test-util"] }

2
zebra-chain/Cargo.toml
View File

@ -90,7 +90,7 @@ itertools = "0.10.5"
rayon = "1.7.0"
# ZF deps
ed25519-zebra = "3.1.0"
ed25519-zebra = "4.0.0"
redjubjub = "0.7.0"
reddsa = "0.5.0"