From 9c993f82e2f2726b6c8d836aa37e11ccee30435c Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Thu, 19 Oct 2023 23:12:02 -0300 Subject: [PATCH] build(deps): bump ECC dependencies (#7784) * bump the versions * replace `is_odd()` with `is_right_child()` --------- Co-authored-by: teor --- Cargo.lock | 174 ++++++++----------------- zebra-chain/Cargo.toml | 8 +- zebra-chain/src/orchard/tree/legacy.rs | 2 +- zebra-chain/src/sapling/tree/legacy.rs | 2 +- zebra-chain/src/sprout/tree/legacy.rs | 2 +- zebra-consensus/Cargo.toml | 4 +- zebra-script/Cargo.toml | 2 +- 7 files changed, 61 insertions(+), 133 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fc52d9156c..c6d76e909d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -400,27 +400,6 @@ dependencies = [ "clang-sys", "lazy_static", "lazycell", - "peeking_take_while", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.38", -] - -[[package]] -name = "bindgen" -version = "0.68.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" -dependencies = [ - "bitflags 2.4.1", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", "log", "peeking_take_while", "prettyplease", @@ -542,9 +521,9 @@ dependencies = [ [[package]] name = "bridgetree" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a813dadc684e4c78a4547757debd99666282545d90e4ccc3210913ed4337ad2" +checksum = "fbfcb6c5a091e80cb3d3b0c1a7f126af4631cd5065b1f9929b139f1be8f3fb62" dependencies = [ "incrementalmerkletree", ] @@ -1063,9 +1042,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.95" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109308c20e8445959c2792e81871054c6a17e6976489a93d2769641a2ba5839c" +checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe" dependencies = [ "cc", "cxxbridge-flags", @@ -1087,15 +1066,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.95" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882074421238e84fe3b4c65d0081de34e5b323bf64555d3e61991f76eb64a7bb" +checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2" [[package]] name = "cxxbridge-macro" -version = "1.0.95" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a076022ece33e7686fb76513518e219cca4fce5750a8ae6d1ce6c0f48fd1af9" +checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" dependencies = [ "proc-macro2", "quote", @@ -1751,7 +1730,7 @@ checksum = "5a03ba7d4c9ea41552cd4351965ff96883e629693ae85005c501bb4b9e1c48a7" dependencies = [ "lazy_static", "rand_core 0.6.4", - "ring 0.16.20", + "ring", "secp256k1", "thiserror", ] @@ -1924,7 +1903,7 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls 0.21.7", + "rustls", "tokio", "tokio-rustls", ] @@ -2002,9 +1981,9 @@ dependencies = [ [[package]] name = "incrementalmerkletree" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb91780c91bfc79769006a55c49127b83e1c1a6cf2b3b149ce3f247cbe342f0" +checksum = "361c467824d4d9d4f284be4b2608800839419dccc4d4608f28345237fe354623" dependencies = [ "either", ] @@ -2300,7 +2279,7 @@ version = "0.11.0+8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" dependencies = [ - "bindgen 0.65.1", + "bindgen", "bzip2-sys", "cc", "glob", @@ -2344,9 +2323,9 @@ checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2509,15 +2488,15 @@ dependencies = [ [[package]] name = "minreq" -version = "2.8.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de406eeb24aba36ed3829532fa01649129677186b44a49debec0ec574ca7da7" +checksum = "cb3371dfc7b772c540da1380123674a8e20583aca99907087d990ca58cf44203" dependencies = [ "log", "once_cell", - "rustls 0.20.9", - "webpki", - "webpki-roots 0.22.6", + "rustls", + "rustls-webpki", + "webpki-roots", ] [[package]] @@ -2690,9 +2669,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orchard" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4e7a52f510cb8c39e639e662a353adbaf86025478af89ae54a0551f8ca35e2" +checksum = "5d31e68534df32024dcc89a8390ec6d7bef65edd87d91b45cfb481a2eb2d77c5" dependencies = [ "aes", "bitvec", @@ -3500,7 +3479,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.7", + "rustls", "rustls-pemfile", "serde", "serde_json", @@ -3514,7 +3493,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots", "winreg", ] @@ -3537,25 +3516,11 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted 0.7.1", + "untrusted", "web-sys", "winapi", ] -[[package]] -name = "ring" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" -dependencies = [ - "cc", - "getrandom 0.2.10", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", -] - [[package]] name = "ripemd" version = "0.1.3" @@ -3633,9 +3598,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.19" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ "bitflags 2.4.1", "errno", @@ -3644,18 +3609,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.7" @@ -3663,7 +3616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring 0.16.20", + "ring", "rustls-webpki", "sct", ] @@ -3683,8 +3636,8 @@ version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring", + "untrusted", ] [[package]] @@ -3732,8 +3685,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring", + "untrusted", ] [[package]] @@ -3797,14 +3750,14 @@ checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc" dependencies = [ "httpdate", "reqwest", - "rustls 0.21.7", + "rustls", "sentry-backtrace", "sentry-contexts", "sentry-core", "sentry-tracing", "tokio", "ureq", - "webpki-roots 0.25.2", + "webpki-roots", ] [[package]] @@ -4267,18 +4220,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", @@ -4397,7 +4350,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.7", + "rustls", "tokio", ] @@ -4633,9 +4586,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.39" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", "pin-project-lite", @@ -4878,12 +4831,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - [[package]] name = "ureq" version = "2.8.0" @@ -4893,10 +4840,10 @@ dependencies = [ "base64 0.21.4", "log", "once_cell", - "rustls 0.21.7", + "rustls", "rustls-webpki", "url", - "webpki-roots 0.25.2", + "webpki-roots", ] [[package]] @@ -5085,25 +5032,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.3", - "untrusted 0.9.0", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.25.2" @@ -5397,9 +5325,9 @@ dependencies = [ [[package]] name = "zcash_primitives" -version = "0.12.0" +version = "0.13.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de1a231e6a58d3dcdd6e21d229db33d7c10f9b54d8c170e122b267f6826bb48f" +checksum = "0cc4391d9325e0a51a7cbff02b5c4b5472d66087bd9c903ddb12dea7ec22f3e0" dependencies = [ "aes", "bip0039", @@ -5433,16 +5361,15 @@ dependencies = [ [[package]] name = "zcash_proofs" -version = "0.12.1" +version = "0.13.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d2e066a717f28451a081f2ebd483ddda896cf00d572972c10979d645ffa6c4" +checksum = "48f22eff3bdc382327ef28f809024ddc89ec6d903ba71be629b2cbea34afdda2" dependencies = [ "bellman", "blake2b_simd", "bls12_381", "group", "home", - "incrementalmerkletree", "jubjub", "known-folders", "lazy_static", @@ -5456,13 +5383,14 @@ dependencies = [ [[package]] name = "zcash_script" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4f95043fd34d402b8d5debb0e54a28c2b84fc99591f5973b4999e9c5b01bfd" +checksum = "8deff8ea47cbe2a008abefedc1a2d9c0e48a87844379759ace270a0b53353c71" dependencies = [ "bellman", - "bindgen 0.68.1", + "bindgen", "blake2b_simd", + "blake2s_simd", "bls12_381", "bridgetree", "byteorder", diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 630ce281134..8cc223cd551 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -58,12 +58,12 @@ bitflags = "2.4.1" bitflags-serde-legacy = "0.1.1" blake2b_simd = "1.0.2" blake2s_simd = "1.0.2" -bridgetree = "0.3.0" +bridgetree = "0.4.0" bs58 = { version = "0.5.0", features = ["check"] } byteorder = "1.5.0" equihash = "0.2.0" group = "0.13.0" -incrementalmerkletree = "0.4.0" +incrementalmerkletree = "0.5.0" jubjub = "0.10.0" lazy_static = "1.4.0" num-integer = "0.1.45" @@ -78,11 +78,11 @@ x25519-dalek = { version = "2.0.0-rc.3", features = ["serde"] } # ECC deps halo2 = { package = "halo2_proofs", version = "0.3.0" } -orchard = "0.5.0" +orchard = "0.6.0" zcash_encoding = "0.2.0" zcash_history = "0.3.0" zcash_note_encryption = "0.4.0" -zcash_primitives = { version = "0.12.0", features = ["transparent-inputs"] } +zcash_primitives = { version = "0.13.0-rc.1", features = ["transparent-inputs"] } # Time chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "serde"] } diff --git a/zebra-chain/src/orchard/tree/legacy.rs b/zebra-chain/src/orchard/tree/legacy.rs index b4d97cf48d1..a275bb4c3ed 100644 --- a/zebra-chain/src/orchard/tree/legacy.rs +++ b/zebra-chain/src/orchard/tree/legacy.rs @@ -84,7 +84,7 @@ impl From> for LegacyFrontier { let mut ommers = frontier_data.ommers().to_vec(); let position = usize::try_from(u64::from(frontier_data.position())) .expect("new position should fit in a `usize`"); - if frontier_data.position().is_odd() { + if frontier_data.position().is_right_child() { let left = ommers.remove(0); leaf = LegacyLeaf::Right(left, leaf_from_frontier); } diff --git a/zebra-chain/src/sapling/tree/legacy.rs b/zebra-chain/src/sapling/tree/legacy.rs index 0e66e8aedea..6fce18337dd 100644 --- a/zebra-chain/src/sapling/tree/legacy.rs +++ b/zebra-chain/src/sapling/tree/legacy.rs @@ -84,7 +84,7 @@ impl From> for LegacyFrontier { let mut ommers = frontier_data.ommers().to_vec(); let position = usize::try_from(u64::from(frontier_data.position())) .expect("new position should fit in a `usize`"); - if frontier_data.position().is_odd() { + if frontier_data.position().is_right_child() { let left = ommers.remove(0); leaf = LegacyLeaf::Right(left, leaf_from_frontier); } diff --git a/zebra-chain/src/sprout/tree/legacy.rs b/zebra-chain/src/sprout/tree/legacy.rs index b11e674bafa..9faea7750b5 100644 --- a/zebra-chain/src/sprout/tree/legacy.rs +++ b/zebra-chain/src/sprout/tree/legacy.rs @@ -83,7 +83,7 @@ impl From> for LegacyFrontier { let mut ommers = frontier_data.ommers().to_vec(); let position = usize::try_from(u64::from(frontier_data.position())) .expect("new position should fit in a `usize`"); - if frontier_data.position().is_odd() { + if frontier_data.position().is_right_child() { let left = ommers.remove(0); leaf = LegacyLeaf::Right(left, leaf_from_frontier); } diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index 3a25c105d92..f674e18777c 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -58,9 +58,9 @@ tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] } tracing = "0.1.39" tracing-futures = "0.2.5" -orchard = "0.5.0" +orchard = "0.6.0" -zcash_proofs = { version = "0.12.1", features = ["local-prover", "multicore", "download-params"] } +zcash_proofs = { version = "0.13.0-rc.1", features = ["local-prover", "multicore", "download-params"] } tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.6" } tower-batch-control = { path = "../tower-batch-control/", version = "0.2.41-beta.6" } diff --git a/zebra-script/Cargo.toml b/zebra-script/Cargo.toml index da39011298a..e337ab6e641 100644 --- a/zebra-script/Cargo.toml +++ b/zebra-script/Cargo.toml @@ -15,7 +15,7 @@ keywords = ["zebra", "zcash"] categories = ["api-bindings", "cryptography::cryptocurrencies"] [dependencies] -zcash_script = "0.1.13" +zcash_script = "0.1.14" zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.30" }