From dbca3c3d2db744f35ffcf55e9924480f1eaf8252 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 09:57:01 +0000 Subject: [PATCH 1/4] build(deps): bump the prod group across 1 directory with 18 updates Bumps the prod group with 15 updates in the / directory: | Package | From | To | | --- | --- | --- | | [clap](https://github.com/clap-rs/clap) | `4.5.18` | `4.5.20` | | [indexmap](https://github.com/indexmap-rs/indexmap) | `2.5.0` | `2.6.0` | | [serde](https://github.com/serde-rs/serde) | `1.0.210` | `1.0.211` | | [futures](https://github.com/rust-lang/futures-rs) | `0.3.30` | `0.3.31` | | [tokio](https://github.com/tokio-rs/tokio) | `1.40.0` | `1.41.0` | | [tower](https://github.com/tower-rs/tower) | `0.4.13` | `0.5.1` | | [pin-project](https://github.com/taiki-e/pin-project) | `1.1.5` | `1.1.6` | | [metrics](https://github.com/metrics-rs/metrics) | `0.23.0` | `0.24.0` | | [hyper](https://github.com/hyperium/hyper) | `1.4.1` | `1.5.0` | | [bytes](https://github.com/tokio-rs/bytes) | `1.7.2` | `1.8.0` | | [metrics-exporter-prometheus](https://github.com/metrics-rs/metrics) | `0.15.3` | `0.16.0` | | [once_cell](https://github.com/matklad/once_cell) | `1.19.0` | `1.20.2` | | [serde_json](https://github.com/serde-rs/json) | `1.0.128` | `1.0.132` | | [primitive-types](https://github.com/paritytech/parity-common) | `0.12.2` | `0.13.1` | | [serde_with](https://github.com/jonasbb/serde_with) | `3.9.0` | `3.11.0` | Updates `clap` from 4.5.18 to 4.5.20 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.18...clap_complete-v4.5.20) Updates `indexmap` from 2.5.0 to 2.6.0 - [Changelog](https://github.com/indexmap-rs/indexmap/blob/master/RELEASES.md) - [Commits](https://github.com/indexmap-rs/indexmap/compare/2.5.0...2.6.0) Updates `serde` from 1.0.210 to 1.0.211 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.210...v1.0.211) Updates `futures` from 0.3.30 to 0.3.31 - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.30...0.3.31) Updates `tokio` from 1.40.0 to 1.41.0 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.40.0...tokio-1.41.0) Updates `tower` from 0.4.13 to 0.5.1 - [Release notes](https://github.com/tower-rs/tower/releases) - [Commits](https://github.com/tower-rs/tower/compare/tower-0.4.13...tower-0.5.1) Updates `pin-project` from 1.1.5 to 1.1.6 - [Release notes](https://github.com/taiki-e/pin-project/releases) - [Changelog](https://github.com/taiki-e/pin-project/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/pin-project/compare/v1.1.5...v1.1.6) Updates `metrics` from 0.23.0 to 0.24.0 - [Changelog](https://github.com/metrics-rs/metrics/blob/main/release.toml) - [Commits](https://github.com/metrics-rs/metrics/compare/metrics-v0.23.0...metrics-v0.24.0) Updates `hyper` from 1.4.1 to 1.5.0 - [Release notes](https://github.com/hyperium/hyper/releases) - [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/hyper/compare/v1.4.1...v1.5.0) Updates `bytes` from 1.7.2 to 1.8.0 - [Release notes](https://github.com/tokio-rs/bytes/releases) - [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/bytes/compare/v1.7.2...v1.8.0) Updates `metrics-exporter-prometheus` from 0.15.3 to 0.16.0 - [Changelog](https://github.com/metrics-rs/metrics/blob/main/release.toml) - [Commits](https://github.com/metrics-rs/metrics/compare/metrics-exporter-prometheus-v0.15.3...metrics-exporter-prometheus-v0.16.0) Updates `once_cell` from 1.19.0 to 1.20.2 - [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md) - [Commits](https://github.com/matklad/once_cell/compare/v1.19.0...v1.20.2) Updates `serde_json` from 1.0.128 to 1.0.132 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/1.0.128...1.0.132) Updates `primitive-types` from 0.12.2 to 0.13.1 - [Commits](https://github.com/paritytech/parity-common/commits/primitive-types-v0.13.1) Updates `serde_with` from 3.9.0 to 3.11.0 - [Release notes](https://github.com/jonasbb/serde_with/releases) - [Commits](https://github.com/jonasbb/serde_with/compare/v3.9.0...v3.11.0) Updates `futures-util` from 0.3.30 to 0.3.31 - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.30...0.3.31) Updates `syn` from 2.0.79 to 2.0.82 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.79...2.0.82) Updates `futures-core` from 0.3.30 to 0.3.31 - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.30...0.3.31) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: indexmap dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: futures dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: tower dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: pin-project dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: metrics dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: hyper dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: bytes dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: metrics-exporter-prometheus dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: once_cell dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: primitive-types dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: serde_with dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod - dependency-name: futures-util dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: futures-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod ... Signed-off-by: dependabot[bot] --- Cargo.lock | 302 +++++++++++++++++++-------------- tower-batch-control/Cargo.toml | 10 +- tower-fallback/Cargo.toml | 6 +- zebra-chain/Cargo.toml | 14 +- zebra-consensus/Cargo.toml | 14 +- zebra-grpc/Cargo.toml | 6 +- zebra-network/Cargo.toml | 18 +- zebra-node-services/Cargo.toml | 10 +- zebra-rpc/Cargo.toml | 14 +- zebra-scan/Cargo.toml | 14 +- zebra-state/Cargo.toml | 18 +- zebra-test/Cargo.toml | 10 +- zebra-utils/Cargo.toml | 8 +- zebrad/Cargo.toml | 30 ++-- 14 files changed, 257 insertions(+), 217 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b45ed61909d..6828a4d894c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,7 +12,7 @@ dependencies = [ "arc-swap", "backtrace", "canonical-path", - "clap 4.5.18", + "clap 4.5.20", "color-eyre", "fs-err", "once_cell", @@ -240,7 +240,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -251,7 +251,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -299,7 +299,7 @@ dependencies = [ "rustversion", "serde", "sync_wrapper 1.0.1", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", ] @@ -424,7 +424,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.79", + "syn 2.0.82", "which", ] @@ -592,9 +592,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bzip2-sys" @@ -801,9 +801,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.18" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -811,9 +811,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.18" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -830,7 +830,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -980,7 +980,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.18", + "clap 4.5.20", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1082,7 +1082,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -1130,7 +1130,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -1152,7 +1152,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core 0.20.9", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -1442,6 +1442,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1482,9 +1488,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1497,9 +1503,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1507,15 +1513,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1524,38 +1530,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1665,7 +1671,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util 0.7.12", @@ -1684,7 +1690,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util 0.7.12", @@ -1757,6 +1763,15 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "foldhash", +] + [[package]] name = "hdrhistogram" version = "7.5.4" @@ -1971,9 +1986,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -2010,7 +2025,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" dependencies = [ - "hyper 1.4.1", + "hyper 1.5.0", "hyper-util", "pin-project-lite", "tokio", @@ -2028,7 +2043,7 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.4.1", + "hyper 1.5.0", "pin-project-lite", "socket2", "tokio", @@ -2077,9 +2092,9 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" +checksum = "b67aa010c1e3da95bf151bd8b4c059b2ed7e75387cdb969b4f8f2723a43f9941" dependencies = [ "parity-scale-codec", ] @@ -2131,12 +2146,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -2555,9 +2570,9 @@ dependencies = [ [[package]] name = "metrics" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" +checksum = "8ae428771d17306715c5091d446327d1cfdedc82185c65ba8423ab404e45bf10" dependencies = [ "ahash", "portable-atomic", @@ -2565,15 +2580,15 @@ dependencies = [ [[package]] name = "metrics-exporter-prometheus" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6" +checksum = "85b6f8152da6d7892ff1b7a1c0fa3f435e92b5918ad67035c3bb432111d9a29b" dependencies = [ "base64 0.22.1", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-util", - "indexmap 2.5.0", + "indexmap 2.6.0", "ipnet", "metrics", "metrics-util", @@ -2585,15 +2600,14 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" +checksum = "15b482df36c13dd1869d73d14d28cd4855fbd6cfc32294bee109908a9f4a4ed7" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "metrics", - "num_cpus", "quanta", "sketches-ddsketch", ] @@ -2782,9 +2796,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" @@ -3008,7 +3022,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -3029,27 +3043,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.6.0", ] [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -3144,7 +3158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -3154,10 +3168,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", - "impl-codec", "uint 0.9.5", ] +[[package]] +name = "primitive-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15600a7d856470b7d278b3fe0e311fe28c2526348549f8ef2ff7db3299c87f5" +dependencies = [ + "fixed-hash", + "impl-codec", + "uint 0.10.0", +] + [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -3237,7 +3261,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -3267,7 +3291,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.79", + "syn 2.0.82", "tempfile", ] @@ -3281,7 +3305,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -3981,9 +4005,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.210" +version = "1.0.211" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "1ac55e59090389fb9f0dd9e0f3c09615afed1d19094284d0b200441f13550793" dependencies = [ "serde_derive", ] @@ -3999,22 +4023,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.211" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "54be4f245ce16bc58d57ef2716271d0d4519e0f6defa147f6e081005bcb278ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "memchr", "ryu", @@ -4054,19 +4078,19 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", - "serde_with_macros 3.9.0", + "serde_with_macros 3.11.0", "time", ] @@ -4084,14 +4108,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -4100,7 +4124,7 @@ version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59e2dd588bf1597a252c3b920e0143eb99b0f76e4e082f4c92ce34fbc9e71ddd" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "libyml", "memchr", @@ -4172,9 +4196,9 @@ checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "sketches-ddsketch" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" +checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" [[package]] name = "slab" @@ -4315,9 +4339,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", @@ -4423,7 +4447,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -4510,9 +4534,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -4535,7 +4559,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -4636,7 +4660,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "toml_datetime", "winnow 0.5.40", ] @@ -4647,7 +4671,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -4669,7 +4693,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-timeout", "hyper-util", "percent-encoding", @@ -4678,7 +4702,7 @@ dependencies = [ "socket2", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -4695,7 +4719,7 @@ dependencies = [ "prost-build", "prost-types", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -4719,7 +4743,6 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "hdrhistogram", "indexmap 1.9.3", "pin-project", "pin-project-lite", @@ -4732,6 +4755,24 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "hdrhistogram", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", + "tokio-util 0.7.12", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower-batch-control" version = "0.2.41-beta.16" @@ -4747,7 +4788,7 @@ dependencies = [ "tokio", "tokio-test", "tokio-util 0.7.12", - "tower", + "tower 0.5.1", "tower-fallback", "tower-test", "tracing", @@ -4762,7 +4803,7 @@ dependencies = [ "futures-core", "pin-project", "tokio", - "tower", + "tower 0.5.1", "tracing", "zebra-test", ] @@ -4799,7 +4840,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4825,7 +4865,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -4938,7 +4978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -5152,7 +5192,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -5272,7 +5312,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", "wasm-bindgen-shared", ] @@ -5306,7 +5346,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5678,7 +5718,7 @@ source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc dependencies = [ "blake2b_simd", "byteorder", - "primitive-types", + "primitive-types 0.12.2", ] [[package]] @@ -5908,7 +5948,7 @@ dependencies = [ "lazy_static", "num-integer", "orchard", - "primitive-types", + "primitive-types 0.13.1", "proptest", "proptest-derive", "rand 0.8.5", @@ -5923,7 +5963,7 @@ dependencies = [ "serde", "serde-big-array", "serde_json", - "serde_with 3.9.0", + "serde_with 3.11.0", "sha2", "spandoc", "static_assertions", @@ -5974,7 +6014,7 @@ dependencies = [ "thiserror", "tinyvec", "tokio", - "tower", + "tower 0.5.1", "tower-batch-control", "tower-fallback", "tracing", @@ -6004,7 +6044,7 @@ dependencies = [ "tonic", "tonic-build", "tonic-reflection", - "tower", + "tower 0.5.1", "zcash_primitives 0.17.0", "zebra-chain", "zebra-node-services", @@ -6025,7 +6065,7 @@ dependencies = [ "hex", "howudoin", "humantime-serde", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.13.0", "lazy_static", "metrics", @@ -6045,7 +6085,7 @@ dependencies = [ "tokio-stream", "tokio-util 0.7.12", "toml 0.8.19", - "tower", + "tower 0.5.1", "tracing", "tracing-error", "tracing-futures", @@ -6075,7 +6115,7 @@ dependencies = [ "color-eyre", "futures", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "insta", "jsonrpc-core", "jsonrpc-derive", @@ -6092,7 +6132,7 @@ dependencies = [ "tonic", "tonic-build", "tonic-reflection", - "tower", + "tower 0.5.1", "tracing", "zcash_address 0.5.0", "zcash_primitives 0.17.0", @@ -6116,7 +6156,7 @@ dependencies = [ "futures", "group", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "insta", "itertools 0.13.0", "jsonrpc", @@ -6134,7 +6174,7 @@ dependencies = [ "tokio", "toml 0.8.19", "tonic", - "tower", + "tower 0.5.1", "tracing", "tracing-subscriber", "zcash_address 0.5.0", @@ -6179,7 +6219,7 @@ dependencies = [ "howudoin", "human_bytes", "humantime-serde", - "indexmap 2.5.0", + "indexmap 2.6.0", "insta", "itertools 0.13.0", "jubjub", @@ -6202,7 +6242,7 @@ dependencies = [ "thiserror", "tinyvec", "tokio", - "tower", + "tower 0.5.1", "tracing", "zebra-chain", "zebra-test", @@ -6216,7 +6256,7 @@ dependencies = [ "futures", "hex", "humantime", - "indexmap 2.5.0", + "indexmap 2.6.0", "insta", "itertools 0.13.0", "lazy_static", @@ -6230,7 +6270,7 @@ dependencies = [ "thiserror", "tinyvec", "tokio", - "tower", + "tower 0.5.1", "tracing", "tracing-error", "tracing-subscriber", @@ -6242,7 +6282,7 @@ version = "1.0.0-beta.40" dependencies = [ "color-eyre", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.13.0", "jsonrpc", "quote", @@ -6253,7 +6293,7 @@ dependencies = [ "serde_json", "serde_yml", "structopt", - "syn 2.0.79", + "syn 2.0.82", "thiserror", "tinyvec", "tokio", @@ -6275,7 +6315,7 @@ dependencies = [ "atty", "bytes", "chrono", - "clap 4.5.18", + "clap 4.5.20", "color-eyre", "console-subscriber", "dirs", @@ -6285,9 +6325,9 @@ dependencies = [ "howudoin", "http-body-util", "humantime-serde", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-util", - "indexmap 2.5.0", + "indexmap 2.6.0", "indicatif", "inferno", "insta", @@ -6318,7 +6358,7 @@ dependencies = [ "toml 0.8.19", "tonic", "tonic-build", - "tower", + "tower 0.5.1", "tracing", "tracing-appender", "tracing-error", @@ -6356,7 +6396,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] @@ -6376,7 +6416,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.82", ] [[package]] diff --git a/tower-batch-control/Cargo.toml b/tower-batch-control/Cargo.toml index 8bcc9a3ba34..a9b18e5807b 100644 --- a/tower-batch-control/Cargo.toml +++ b/tower-batch-control/Cargo.toml @@ -22,13 +22,13 @@ keywords = ["tower", "batch"] categories = ["algorithms", "asynchronous"] [dependencies] -futures = "0.3.30" +futures = "0.3.31" futures-core = "0.3.28" -pin-project = "1.1.5" +pin-project = "1.1.6" rayon = "1.10.0" -tokio = { version = "1.40.0", features = ["time", "sync", "tracing", "macros"] } +tokio = { version = "1.41.0", features = ["time", "sync", "tracing", "macros"] } tokio-util = "0.7.12" -tower = { version = "0.4.13", features = ["util", "buffer"] } +tower = { version = "0.5.1", features = ["util", "buffer"] } tracing = "0.1.39" tracing-futures = "0.2.5" @@ -41,7 +41,7 @@ tinyvec = { version = "1.8.0", features = ["rustc_1_55"] } ed25519-zebra = "4.0.3" rand = "0.8.5" -tokio = { version = "1.40.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } tokio-test = "0.4.4" tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.16" } tower-test = "0.4.0" diff --git a/tower-fallback/Cargo.toml b/tower-fallback/Cargo.toml index a3078d916cc..71bc6dd9588 100644 --- a/tower-fallback/Cargo.toml +++ b/tower-fallback/Cargo.toml @@ -16,12 +16,12 @@ keywords = ["tower", "batch"] categories = ["algorithms", "asynchronous"] [dependencies] -pin-project = "1.1.5" -tower = "0.4.13" +pin-project = "1.1.6" +tower = "0.5.1" futures-core = "0.3.28" tracing = "0.1.39" [dev-dependencies] -tokio = { version = "1.40.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.40" } diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 3f932ea298a..3aecbe711c7 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -84,7 +84,7 @@ lazy_static = "1.4.0" tempfile = "3.13.0" dirs = "5.0.1" num-integer = "0.1.46" -primitive-types = "0.12.2" +primitive-types = "0.13.1" rand_core = "0.6.4" ripemd = "0.1.3" # Matches version used by hdwallet @@ -115,12 +115,12 @@ tracing = "0.1.39" # Serialization hex = { version = "0.4.3", features = ["serde"] } -serde = { version = "1.0.210", features = ["serde_derive", "rc"] } -serde_with = "3.9.0" +serde = { version = "1.0.211", features = ["serde_derive", "rc"] } +serde_with = "3.11.0" serde-big-array = "0.5.1" # Processing -futures = "0.3.30" +futures = "0.3.31" itertools = "0.13.0" rayon = "1.10.0" @@ -130,10 +130,10 @@ redjubjub = "0.7.0" reddsa = "0.5.1" # Production feature json-conversion -serde_json = { version = "1.0.128", optional = true } +serde_json = { version = "1.0.132", optional = true } # Production feature async-error and testing feature proptest-impl -tokio = { version = "1.40.0", optional = true } +tokio = { version = "1.41.0", optional = true } # Experimental feature shielded-scan zcash_client_backend = { workspace = true, optional = true } @@ -166,7 +166,7 @@ proptest-derive = "0.5.0" rand = "0.8.5" rand_chacha = "0.3.1" -tokio = { version = "1.40.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.40" } diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index ba71369d060..819e0dba3f0 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -45,15 +45,15 @@ rayon = "1.10.0" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] } lazy_static = "1.4.0" -once_cell = "1.18.0" -serde = { version = "1.0.210", features = ["serde_derive"] } +once_cell = "1.20.2" +serde = { version = "1.0.211", features = ["serde_derive"] } -futures = "0.3.30" +futures = "0.3.31" futures-util = "0.3.28" -metrics = "0.23.0" +metrics = "0.24.0" thiserror = "1.0.64" -tokio = { version = "1.40.0", features = ["time", "sync", "tracing", "rt-multi-thread"] } -tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] } +tokio = { version = "1.41.0", features = ["time", "sync", "tracing", "rt-multi-thread"] } +tower = { version = "0.5.1", features = ["timeout", "util", "buffer"] } tracing = "0.1.39" tracing-futures = "0.2.5" @@ -90,7 +90,7 @@ proptest = "1.4.0" proptest-derive = "0.5.0" spandoc = "0.2.2" -tokio = { version = "1.40.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } tracing-error = "0.2.0" tracing-subscriber = "0.3.18" diff --git a/zebra-grpc/Cargo.toml b/zebra-grpc/Cargo.toml index 9f10802f7d6..e3c199d464d 100644 --- a/zebra-grpc/Cargo.toml +++ b/zebra-grpc/Cargo.toml @@ -20,10 +20,10 @@ futures-util = "0.3.28" tonic = "0.12.3" tonic-reflection = "0.12.3" prost = "0.13.3" -serde = { version = "1.0.210", features = ["serde_derive"] } -tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] } +serde = { version = "1.0.211", features = ["serde_derive"] } +tokio = { version = "1.41.0", features = ["macros", "rt-multi-thread"] } tokio-stream = "0.1.16" -tower = { version = "0.4.13", features = ["util", "buffer", "timeout"] } +tower = { version = "0.5.1", features = ["util", "buffer", "timeout"] } color-eyre = "0.6.3" zcash_primitives.workspace = true diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index e042e583955..f7b44e14c08 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -42,31 +42,31 @@ proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl"] [dependencies] bitflags = "2.5.0" byteorder = "1.5.0" -bytes = "1.7.2" +bytes = "1.8.0" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] } dirs = "5.0.1" hex = "0.4.3" humantime-serde = "1.1.1" -indexmap = { version = "2.5.0", features = ["serde"] } +indexmap = { version = "2.6.0", features = ["serde"] } itertools = "0.13.0" lazy_static = "1.4.0" num-integer = "0.1.46" ordered-map = "0.4.2" -pin-project = "1.1.5" +pin-project = "1.1.6" rand = "0.8.5" rayon = "1.10.0" regex = "1.11.0" -serde = { version = "1.0.210", features = ["serde_derive"] } +serde = { version = "1.0.211", features = ["serde_derive"] } tempfile = "3.13.0" thiserror = "1.0.64" -futures = "0.3.30" -tokio = { version = "1.40.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] } +futures = "0.3.31" +tokio = { version = "1.41.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] } tokio-stream = { version = "0.1.16", features = ["sync", "time"] } tokio-util = { version = "0.7.12", features = ["codec"] } -tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] } +tower = { version = "0.5.1", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] } -metrics = "0.23.0" +metrics = "0.24.0" tracing-futures = "0.2.5" tracing-error = { version = "0.2.0", features = ["traced-error"] } tracing = "0.1.39" @@ -90,7 +90,7 @@ proptest = "1.4.0" proptest-derive = "0.5.0" static_assertions = "1.1.0" -tokio = { version = "1.40.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } toml = "0.8.19" zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] } diff --git a/zebra-node-services/Cargo.toml b/zebra-node-services/Cargo.toml index 01c464b361b..aa0fb7e902e 100644 --- a/zebra-node-services/Cargo.toml +++ b/zebra-node-services/Cargo.toml @@ -46,14 +46,14 @@ color-eyre = { version = "0.6.3", optional = true } jsonrpc-core = { version = "18.0.0", optional = true } # Security: avoid default dependency on openssl reqwest = { version = "0.11.26", default-features = false, features = ["rustls-tls"], optional = true } -serde = { version = "1.0.210", optional = true } -serde_json = { version = "1.0.128", optional = true } -tokio = { version = "1.40.0", features = ["time", "sync"] } +serde = { version = "1.0.211", optional = true } +serde_json = { version = "1.0.132", optional = true } +tokio = { version = "1.41.0", features = ["time", "sync"] } [dev-dependencies] color-eyre = "0.6.3" jsonrpc-core = "18.0.0" reqwest = { version = "0.11.26", default-features = false, features = ["rustls-tls"] } -serde = "1.0.210" -serde_json = "1.0.128" +serde = "1.0.211" +serde_json = "1.0.132" diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index d3976e15e1e..414f5af19d6 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -57,15 +57,15 @@ chrono = { version = "0.4.38", default-features = false, features = [ "clock", "std", ] } -futures = "0.3.30" +futures = "0.3.31" jsonrpc-core = "18.0.0" jsonrpc-derive = "18.0.0" jsonrpc-http-server = "18.0.0" # zebra-rpc needs the preserve_order feature in serde_json, which is a dependency of jsonrpc-core -serde_json = { version = "1.0.128", features = ["preserve_order"] } -indexmap = { version = "2.5.0", features = ["serde"] } +serde_json = { version = "1.0.132", features = ["preserve_order"] } +indexmap = { version = "2.6.0", features = ["serde"] } # RPC endpoint basic auth base64 = "0.22.1" @@ -74,13 +74,13 @@ rand = "0.8.5" # Error handling color-eyre = "0.6.3" -tokio = { version = "1.40.0", features = [ +tokio = { version = "1.41.0", features = [ "time", "rt-multi-thread", "macros", "tracing", ] } -tower = "0.4.13" +tower = "0.5.1" # indexer-rpcs dependencies tonic = { version = "0.12.3", optional = true } @@ -91,7 +91,7 @@ tokio-stream = { version = "0.1.16", optional = true } tracing = "0.1.39" hex = { version = "0.4.3", features = ["serde"] } -serde = { version = "1.0.210", features = ["serde_derive"] } +serde = { version = "1.0.211", features = ["serde_derive"] } # For the `stop` RPC method. nix = { version = "0.29.0", features = ["signal"] } @@ -124,7 +124,7 @@ insta = { version = "1.40.0", features = ["redactions", "json", "ron"] } proptest = "1.4.0" thiserror = "1.0.64" -tokio = { version = "1.40.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40", features = [ "proptest-impl", diff --git a/zebra-scan/Cargo.toml b/zebra-scan/Cargo.toml index 8ca2facdb47..762b74cd81e 100644 --- a/zebra-scan/Cargo.toml +++ b/zebra-scan/Cargo.toml @@ -61,14 +61,14 @@ results-reader = [ [dependencies] color-eyre = "0.6.3" -indexmap = { version = "2.5.0", features = ["serde"] } +indexmap = { version = "2.6.0", features = ["serde"] } itertools = "0.13.0" semver = "1.0.23" -serde = { version = "1.0.210", features = ["serde_derive"] } -tokio = { version = "1.40.0", features = ["time"] } -tower = "0.4.13" +serde = { version = "1.0.211", features = ["serde_derive"] } +tokio = { version = "1.41.0", features = ["time"] } +tower = "0.5.1" tracing = "0.1.39" -futures = "0.3.30" +futures = "0.3.31" # ECC dependencies. zcash_client_backend.workspace = true @@ -102,7 +102,7 @@ zebra-test = { path = "../zebra-test", version = "1.0.0-beta.40", optional = tru tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } structopt = "0.3.26" lazy_static = "1.4.0" -serde_json = "1.0.128" +serde_json = "1.0.132" jsonrpc = { version = "0.18.0", optional = true } hex = { version = "0.4.3", optional = true } @@ -111,7 +111,7 @@ zebrad = { path = "../zebrad", version = "2.0.0-rc.0" } [dev-dependencies] insta = { version = "1.40.0", features = ["ron", "redactions"] } -tokio = { version = "1.40.0", features = ["test-util"] } +tokio = { version = "1.41.0", features = ["test-util"] } proptest = "1.4.0" proptest-derive = "0.5.0" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index a3ee910ef11..ab753ad4e2c 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -49,33 +49,33 @@ elasticsearch = [ bincode = "1.3.3" chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] } dirs = "5.0.1" -futures = "0.3.30" +futures = "0.3.31" hex = "0.4.3" hex-literal = "0.4.1" humantime-serde = "1.1.1" human_bytes = { version = "0.4.3", default-features = false } -indexmap = "2.5.0" +indexmap = "2.6.0" itertools = "0.13.0" lazy_static = "1.4.0" -metrics = "0.23.0" +metrics = "0.24.0" mset = "0.1.1" regex = "1.11.0" rlimit = "0.10.2" rocksdb = { version = "0.22.0", default-features = false, features = ["lz4"] } semver = "1.0.23" -serde = { version = "1.0.210", features = ["serde_derive"] } +serde = { version = "1.0.211", features = ["serde_derive"] } tempfile = "3.13.0" thiserror = "1.0.64" rayon = "1.10.0" -tokio = { version = "1.40.0", features = ["rt-multi-thread", "sync", "tracing"] } -tower = { version = "0.4.13", features = ["buffer", "util"] } +tokio = { version = "1.41.0", features = ["rt-multi-thread", "sync", "tracing"] } +tower = { version = "0.5.1", features = ["buffer", "util"] } tracing = "0.1.39" # elasticsearch specific dependencies. # Security: avoid default dependency on openssl elasticsearch = { version = "8.5.0-alpha.1", default-features = false, features = ["rustls-tls"], optional = true } -serde_json = { version = "1.0.128", package = "serde_json", optional = true } +serde_json = { version = "1.0.132", package = "serde_json", optional = true } zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40", features = ["async-error"] } @@ -93,7 +93,7 @@ color-eyre = "0.6.3" # Enable a feature that makes tinyvec compile much faster. tinyvec = { version = "1.8.0", features = ["rustc_1_55"] } -once_cell = "1.18.0" +once_cell = "1.20.2" spandoc = "0.2.2" hex = { version = "0.4.3", features = ["serde"] } @@ -106,7 +106,7 @@ rand = "0.8.5" halo2 = { package = "halo2_proofs", version = "0.3.0" } jubjub = "0.10.0" -tokio = { version = "1.40.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40", features = ["proptest-impl"] } zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.40" } diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 8cbec5f35ac..80c9c8a3784 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -16,18 +16,18 @@ categories = ["command-line-utilities", "cryptography::cryptocurrencies"] [dependencies] hex = "0.4.3" -indexmap = "2.5.0" +indexmap = "2.6.0" lazy_static = "1.4.0" insta = "1.40.0" itertools = "0.13.0" proptest = "1.4.0" -once_cell = "1.18.0" +once_cell = "1.20.2" rand = "0.8.5" regex = "1.11.0" -tokio = { version = "1.40.0", features = ["full", "tracing", "test-util"] } -tower = { version = "0.4.13", features = ["util"] } -futures = "0.3.30" +tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } +tower = { version = "0.5.1", features = ["util"] } +futures = "0.3.31" color-eyre = "0.6.3" # This is a transitive dependency via color-eyre. diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml index 9e241bd58f7..3d925649aec 100644 --- a/zebra-utils/Cargo.toml +++ b/zebra-utils/Cargo.toml @@ -89,7 +89,7 @@ tinyvec = { version = "1.8.0", features = ["rustc_1_55"] } structopt = "0.3.26" hex = "0.4.3" -serde_json = "1.0.128" +serde_json = "1.0.132" tracing-error = "0.2.0" tracing-subscriber = "0.3.18" thiserror = "1.0.64" @@ -109,7 +109,7 @@ regex = { version = "1.11.0", optional = true } reqwest = { version = "0.11.26", default-features = false, features = ["rustls-tls"], optional = true } # These crates are needed for the zebra-checkpoints and search-issue-refs binaries -tokio = { version = "1.40.0", features = ["full"], optional = true } +tokio = { version = "1.41.0", features = ["full"], optional = true } jsonrpc = { version = "0.18.0", optional = true } @@ -122,6 +122,6 @@ rand = "0.8.5" syn = { version = "2.0.79", features = ["full"], optional = true } quote = { version = "1.0.37", optional = true } serde_yml = { version = "0.0.12", optional = true } -serde = { version = "1.0.210", features = ["serde_derive"], optional = true } -indexmap = "2.5.0" +serde = { version = "1.0.211", features = ["serde_derive"], optional = true } +indexmap = "2.6.0" diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index ab687f8225d..662a2bf59f6 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -168,21 +168,21 @@ zebra-state = { path = "../zebra-state", version = "1.0.0-beta.40" } zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.40", optional = true } abscissa_core = "0.7.0" -clap = { version = "4.5.18", features = ["cargo"] } +clap = { version = "4.5.20", features = ["cargo"] } chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] } humantime-serde = "1.1.1" -indexmap = "2.5.0" +indexmap = "2.6.0" lazy_static = "1.4.0" semver = "1.0.23" -serde = { version = "1.0.210", features = ["serde_derive"] } +serde = { version = "1.0.211", features = ["serde_derive"] } toml = "0.8.19" -futures = "0.3.30" +futures = "0.3.31" rayon = "1.10.0" -tokio = { version = "1.40.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] } +tokio = { version = "1.41.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] } tokio-stream = { version = "0.1.16", features = ["time"] } -tower = { version = "0.4.13", features = ["hedge", "limit"] } -pin-project = "1.1.5" +tower = { version = "0.5.1", features = ["hedge", "limit"] } +pin-project = "1.1.6" color-eyre = { version = "0.6.3", default-features = false, features = ["issue-url"] } # This is a transitive dependency via color-eyre. @@ -197,7 +197,7 @@ tracing-error = "0.2.0" tracing-futures = "0.2.5" tracing = "0.1.39" -metrics = "0.23.0" +metrics = "0.24.0" dirs = "5.0.1" atty = "0.2.14" @@ -219,13 +219,13 @@ inferno = { version = "0.11.21", default-features = false, optional = true } tracing-journald = { version = "0.3.0", optional = true } # prod feature filter-reload -hyper = { version = "1.3.1", features = ["http1", "http2", "server"], optional = true } +hyper = { version = "1.5.0", features = ["http1", "http2", "server"], optional = true } http-body-util = { version = "0.1.2", optional = true } hyper-util = { version = "0.1.9", optional = true } -bytes = { version = "1.7.2", optional = true } +bytes = { version = "1.8.0", optional = true } # prod feature prometheus -metrics-exporter-prometheus = { version = "0.15.3", default-features = false, features = ["http-listener"], optional = true } +metrics-exporter-prometheus = { version = "0.16.0", default-features = false, features = ["http-listener"], optional = true } # prod feature release_max_level_info # @@ -255,18 +255,18 @@ abscissa_core = { version = "0.7.0", features = ["testing"] } hex = "0.4.3" hex-literal = "0.4.1" jsonrpc-core = "18.0.0" -once_cell = "1.18.0" +once_cell = "1.20.2" regex = "1.11.0" insta = { version = "1.40.0", features = ["json"] } # zebra-rpc needs the preserve_order feature, it also makes test results more stable -serde_json = { version = "1.0.128", features = ["preserve_order"] } +serde_json = { version = "1.0.132", features = ["preserve_order"] } tempfile = "3.13.0" -hyper = { version = "1.3.1", features = ["http1", "http2", "server"]} +hyper = { version = "1.5.0", features = ["http1", "http2", "server"]} tracing-test = { version = "0.2.4", features = ["no-env-filter"] } -tokio = { version = "1.40.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } tokio-stream = "0.1.16" # test feature lightwalletd-grpc-tests From 81b19ecdc94aa5e70cfe64270637e9db4071b7af Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Wed, 23 Oct 2024 09:27:30 -0300 Subject: [PATCH 2/4] downgrade `primitive-types` and `tower` --- Cargo.lock | 64 ++++++++++------------------------ tower-batch-control/Cargo.toml | 2 +- tower-fallback/Cargo.toml | 2 +- zebra-chain/Cargo.toml | 2 +- zebra-consensus/Cargo.toml | 2 +- zebra-grpc/Cargo.toml | 2 +- zebra-network/Cargo.toml | 2 +- zebra-rpc/Cargo.toml | 2 +- zebra-scan/Cargo.toml | 2 +- zebra-state/Cargo.toml | 2 +- zebra-test/Cargo.toml | 2 +- zebrad/Cargo.toml | 2 +- 12 files changed, 30 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6828a4d894c..370725fe41d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -299,7 +299,7 @@ dependencies = [ "rustversion", "serde", "sync_wrapper 1.0.1", - "tower 0.4.13", + "tower", "tower-layer", "tower-service", ] @@ -2092,9 +2092,9 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.7.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67aa010c1e3da95bf151bd8b4c059b2ed7e75387cdb969b4f8f2723a43f9941" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ "parity-scale-codec", ] @@ -3166,20 +3166,10 @@ name = "primitive-types" version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" -dependencies = [ - "fixed-hash", - "uint 0.9.5", -] - -[[package]] -name = "primitive-types" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15600a7d856470b7d278b3fe0e311fe28c2526348549f8ef2ff7db3299c87f5" dependencies = [ "fixed-hash", "impl-codec", - "uint 0.10.0", + "uint 0.9.5", ] [[package]] @@ -4702,7 +4692,7 @@ dependencies = [ "socket2", "tokio", "tokio-stream", - "tower 0.4.13", + "tower", "tower-layer", "tower-service", "tracing", @@ -4743,6 +4733,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", + "hdrhistogram", "indexmap 1.9.3", "pin-project", "pin-project-lite", @@ -4755,24 +4746,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" -dependencies = [ - "futures-core", - "futures-util", - "hdrhistogram", - "pin-project-lite", - "sync_wrapper 0.1.2", - "tokio", - "tokio-util 0.7.12", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower-batch-control" version = "0.2.41-beta.16" @@ -4788,7 +4761,7 @@ dependencies = [ "tokio", "tokio-test", "tokio-util 0.7.12", - "tower 0.5.1", + "tower", "tower-fallback", "tower-test", "tracing", @@ -4803,7 +4776,7 @@ dependencies = [ "futures-core", "pin-project", "tokio", - "tower 0.5.1", + "tower", "tracing", "zebra-test", ] @@ -4840,6 +4813,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5718,7 +5692,7 @@ source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc dependencies = [ "blake2b_simd", "byteorder", - "primitive-types 0.12.2", + "primitive-types", ] [[package]] @@ -5948,7 +5922,7 @@ dependencies = [ "lazy_static", "num-integer", "orchard", - "primitive-types 0.13.1", + "primitive-types", "proptest", "proptest-derive", "rand 0.8.5", @@ -6014,7 +5988,7 @@ dependencies = [ "thiserror", "tinyvec", "tokio", - "tower 0.5.1", + "tower", "tower-batch-control", "tower-fallback", "tracing", @@ -6044,7 +6018,7 @@ dependencies = [ "tonic", "tonic-build", "tonic-reflection", - "tower 0.5.1", + "tower", "zcash_primitives 0.17.0", "zebra-chain", "zebra-node-services", @@ -6085,7 +6059,7 @@ dependencies = [ "tokio-stream", "tokio-util 0.7.12", "toml 0.8.19", - "tower 0.5.1", + "tower", "tracing", "tracing-error", "tracing-futures", @@ -6132,7 +6106,7 @@ dependencies = [ "tonic", "tonic-build", "tonic-reflection", - "tower 0.5.1", + "tower", "tracing", "zcash_address 0.5.0", "zcash_primitives 0.17.0", @@ -6174,7 +6148,7 @@ dependencies = [ "tokio", "toml 0.8.19", "tonic", - "tower 0.5.1", + "tower", "tracing", "tracing-subscriber", "zcash_address 0.5.0", @@ -6242,7 +6216,7 @@ dependencies = [ "thiserror", "tinyvec", "tokio", - "tower 0.5.1", + "tower", "tracing", "zebra-chain", "zebra-test", @@ -6270,7 +6244,7 @@ dependencies = [ "thiserror", "tinyvec", "tokio", - "tower 0.5.1", + "tower", "tracing", "tracing-error", "tracing-subscriber", @@ -6358,7 +6332,7 @@ dependencies = [ "toml 0.8.19", "tonic", "tonic-build", - "tower 0.5.1", + "tower", "tracing", "tracing-appender", "tracing-error", diff --git a/tower-batch-control/Cargo.toml b/tower-batch-control/Cargo.toml index a9b18e5807b..993b4cbc7d3 100644 --- a/tower-batch-control/Cargo.toml +++ b/tower-batch-control/Cargo.toml @@ -28,7 +28,7 @@ pin-project = "1.1.6" rayon = "1.10.0" tokio = { version = "1.41.0", features = ["time", "sync", "tracing", "macros"] } tokio-util = "0.7.12" -tower = { version = "0.5.1", features = ["util", "buffer"] } +tower = { version = "0.4.13", features = ["util", "buffer"] } tracing = "0.1.39" tracing-futures = "0.2.5" diff --git a/tower-fallback/Cargo.toml b/tower-fallback/Cargo.toml index 71bc6dd9588..9ca8691b135 100644 --- a/tower-fallback/Cargo.toml +++ b/tower-fallback/Cargo.toml @@ -17,7 +17,7 @@ categories = ["algorithms", "asynchronous"] [dependencies] pin-project = "1.1.6" -tower = "0.5.1" +tower = "0.4.13" futures-core = "0.3.28" tracing = "0.1.39" diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 3aecbe711c7..50779cb0359 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -84,7 +84,7 @@ lazy_static = "1.4.0" tempfile = "3.13.0" dirs = "5.0.1" num-integer = "0.1.46" -primitive-types = "0.13.1" +primitive-types = "0.12.2" rand_core = "0.6.4" ripemd = "0.1.3" # Matches version used by hdwallet diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index 819e0dba3f0..2a680d144b9 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -53,7 +53,7 @@ futures-util = "0.3.28" metrics = "0.24.0" thiserror = "1.0.64" tokio = { version = "1.41.0", features = ["time", "sync", "tracing", "rt-multi-thread"] } -tower = { version = "0.5.1", features = ["timeout", "util", "buffer"] } +tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] } tracing = "0.1.39" tracing-futures = "0.2.5" diff --git a/zebra-grpc/Cargo.toml b/zebra-grpc/Cargo.toml index e3c199d464d..ab273b66e97 100644 --- a/zebra-grpc/Cargo.toml +++ b/zebra-grpc/Cargo.toml @@ -23,7 +23,7 @@ prost = "0.13.3" serde = { version = "1.0.211", features = ["serde_derive"] } tokio = { version = "1.41.0", features = ["macros", "rt-multi-thread"] } tokio-stream = "0.1.16" -tower = { version = "0.5.1", features = ["util", "buffer", "timeout"] } +tower = { version = "0.4.13", features = ["util", "buffer", "timeout"] } color-eyre = "0.6.3" zcash_primitives.workspace = true diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index f7b44e14c08..ae02c4a6a5b 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -64,7 +64,7 @@ futures = "0.3.31" tokio = { version = "1.41.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] } tokio-stream = { version = "0.1.16", features = ["sync", "time"] } tokio-util = { version = "0.7.12", features = ["codec"] } -tower = { version = "0.5.1", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] } +tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] } metrics = "0.24.0" tracing-futures = "0.2.5" diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index 414f5af19d6..da909de70fc 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -80,7 +80,7 @@ tokio = { version = "1.41.0", features = [ "macros", "tracing", ] } -tower = "0.5.1" +tower = "0.4.13" # indexer-rpcs dependencies tonic = { version = "0.12.3", optional = true } diff --git a/zebra-scan/Cargo.toml b/zebra-scan/Cargo.toml index 762b74cd81e..b66f38520cc 100644 --- a/zebra-scan/Cargo.toml +++ b/zebra-scan/Cargo.toml @@ -66,7 +66,7 @@ itertools = "0.13.0" semver = "1.0.23" serde = { version = "1.0.211", features = ["serde_derive"] } tokio = { version = "1.41.0", features = ["time"] } -tower = "0.5.1" +tower = "0.4.13" tracing = "0.1.39" futures = "0.3.31" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index ab753ad4e2c..3ed659f2a6d 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -69,7 +69,7 @@ thiserror = "1.0.64" rayon = "1.10.0" tokio = { version = "1.41.0", features = ["rt-multi-thread", "sync", "tracing"] } -tower = { version = "0.5.1", features = ["buffer", "util"] } +tower = { version = "0.4.13", features = ["buffer", "util"] } tracing = "0.1.39" # elasticsearch specific dependencies. diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 80c9c8a3784..837c5f685a5 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -26,7 +26,7 @@ rand = "0.8.5" regex = "1.11.0" tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } -tower = { version = "0.5.1", features = ["util"] } +tower = { version = "0.4.13", features = ["util"] } futures = "0.3.31" color-eyre = "0.6.3" diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 662a2bf59f6..73a5139395f 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -181,7 +181,7 @@ futures = "0.3.31" rayon = "1.10.0" tokio = { version = "1.41.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] } tokio-stream = { version = "0.1.16", features = ["time"] } -tower = { version = "0.5.1", features = ["hedge", "limit"] } +tower = { version = "0.4.13", features = ["hedge", "limit"] } pin-project = "1.1.6" color-eyre = { version = "0.6.3", default-features = false, features = ["issue-url"] } From 9a75b22029663eec743f272bd305c27105bc0f5f Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Wed, 23 Oct 2024 10:15:13 -0300 Subject: [PATCH 3/4] cargo vet --- supply-chain/audits.toml | 130 ++++++++++++++++++++++++++++++++++++++ supply-chain/imports.lock | 70 ++++++++++++++++---- 2 files changed, 189 insertions(+), 11 deletions(-) diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index 284db15ec14..b151f020ab5 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -46,6 +46,11 @@ who = "Alfredo Garcia " criteria = "safe-to-deploy" delta = "1.6.1 -> 1.7.1" +[[audits.bytes]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "1.7.2 -> 1.8.0" + [[audits.cfg_aliases]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -108,11 +113,66 @@ criteria = "safe-to-deploy" delta = "0.1.0 -> 0.1.0@git:1410f1449100a417bfbc4f6c7167aa9808e38792" importable = false +[[audits.foldhash]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +version = "0.1.3" + +[[audits.futures]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.3.30 -> 0.3.31" + +[[audits.futures-channel]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.3.30 -> 0.3.31" + +[[audits.futures-core]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.3.30 -> 0.3.31" + +[[audits.futures-executor]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.3.30 -> 0.3.31" + +[[audits.futures-io]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.3.30 -> 0.3.31" + +[[audits.futures-macro]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.3.30 -> 0.3.31" + +[[audits.futures-sink]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.3.30 -> 0.3.31" + +[[audits.futures-task]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.3.30 -> 0.3.31" + +[[audits.futures-util]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.3.30 -> 0.3.31" + [[audits.git2]] who = "Alfredo Garcia " criteria = "safe-to-deploy" delta = "0.18.3 -> 0.19.0" +[[audits.hashbrown]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.14.5 -> 0.15.0" + [[audits.hyper]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -123,6 +183,11 @@ who = "Alfredo Garcia " criteria = "safe-to-deploy" delta = "1.3.1 -> 1.4.1" +[[audits.hyper]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "1.4.1 -> 1.5.0" + [[audits.hyper-util]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -154,6 +219,11 @@ who = "Alfredo Garcia " criteria = "safe-to-deploy" delta = "2.3.0 -> 2.5.0" +[[audits.indexmap]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "2.5.0 -> 2.6.0" + [[audits.inferno]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -194,6 +264,11 @@ who = "Alfredo Garcia " criteria = "safe-to-deploy" delta = "0.22.3 -> 0.23.0" +[[audits.metrics]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.23.0 -> 0.24.0" + [[audits.metrics-exporter-prometheus]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -204,11 +279,21 @@ who = "Alfredo Garcia " criteria = "safe-to-deploy" delta = "0.15.1 -> 0.15.3" +[[audits.metrics-exporter-prometheus]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.15.3 -> 0.16.0" + [[audits.metrics-util]] who = "Alfredo Garcia " criteria = "safe-to-deploy" delta = "0.16.3 -> 0.17.0" +[[audits.metrics-util]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.17.0 -> 0.18.0" + [[audits.mio]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -219,6 +304,11 @@ who = "Alfredo Garcia " criteria = "safe-to-deploy" version = "0.15.0" +[[audits.once_cell]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "1.19.0 -> 1.20.2" + [[audits.orchard]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -240,6 +330,16 @@ who = "Alfredo Garcia " criteria = "safe-to-deploy" delta = "4.0.0 -> 4.1.0" +[[audits.pin-project]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "1.1.5 -> 1.1.6" + +[[audits.pin-project-internal]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "1.1.5 -> 1.1.6" + [[audits.proptest-derive]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -321,6 +421,16 @@ criteria = "safe-to-deploy" delta = "0.3.0 -> 0.2.0@git:b1ad3694ee13a2fc5d291ad04721a6252da0993c" importable = false +[[audits.serde]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "1.0.210 -> 1.0.211" + +[[audits.serde_derive]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "1.0.210 -> 1.0.211" + [[audits.serde_spanned]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -336,6 +446,11 @@ who = "Alfredo Garcia " criteria = "safe-to-deploy" delta = "3.8.3 -> 3.9.0" +[[audits.serde_with]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "3.9.0 -> 3.11.0" + [[audits.serde_with_macros]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -346,6 +461,11 @@ who = "Alfredo Garcia " criteria = "safe-to-deploy" delta = "3.8.3 -> 3.9.0" +[[audits.serde_with_macros]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "3.9.0 -> 3.11.0" + [[audits.serde_yml]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -367,6 +487,11 @@ criteria = "safe-to-deploy" delta = "0.5.0 -> 0.4.0@git:ffe4234788fd22662b937ba7c6ea01535fcc1293" importable = false +[[audits.sketches-ddsketch]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "0.2.2 -> 0.3.0" + [[audits.tempfile]] who = "Alfredo Garcia " criteria = "safe-to-deploy" @@ -735,6 +860,11 @@ who = "Alfredo Garcia " criteria = "safe-to-deploy" delta = "1.0.0-beta.38 -> 1.0.0-beta.39" +[[audits.zebra-test]] +who = "Alfredo Garcia " +criteria = "safe-to-deploy" +delta = "1.0.0-beta.39 -> 1.0.0-beta.40" + [[audits.zebra-utils]] who = "Alfredo Garcia " criteria = "safe-to-deploy" diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index b855130e47d..510c79906eb 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -1,10 +1,58 @@ # cargo-vet imports lock +[[unpublished.tower-batch-control]] +version = "0.2.41-beta.16" +audited_as = "0.2.41-beta.15" + +[[unpublished.tower-fallback]] +version = "0.2.41-beta.16" +audited_as = "0.2.41-beta.15" + +[[unpublished.zebra-chain]] +version = "1.0.0-beta.40" +audited_as = "1.0.0-beta.39" + +[[unpublished.zebra-consensus]] +version = "1.0.0-beta.40" +audited_as = "1.0.0-beta.39" + +[[unpublished.zebra-grpc]] +version = "0.1.0-alpha.7" +audited_as = "0.1.0-alpha.6" + +[[unpublished.zebra-network]] +version = "1.0.0-beta.40" +audited_as = "1.0.0-beta.39" + +[[unpublished.zebra-node-services]] +version = "1.0.0-beta.40" +audited_as = "1.0.0-beta.39" + +[[unpublished.zebra-rpc]] +version = "1.0.0-beta.40" +audited_as = "1.0.0-beta.39" + [[unpublished.zebra-scan]] -version = "0.1.0-alpha.8" +version = "0.1.0-alpha.9" audited_as = "0.1.0-alpha.7" +[[unpublished.zebra-script]] +version = "1.0.0-beta.40" +audited_as = "1.0.0-beta.39" + +[[unpublished.zebra-state]] +version = "1.0.0-beta.40" +audited_as = "1.0.0-beta.39" + +[[unpublished.zebra-utils]] +version = "1.0.0-beta.40" +audited_as = "1.0.0-beta.39" + +[[unpublished.zebrad]] +version = "2.0.0-rc.0" +audited_as = "1.9.0" + [[publisher.cexpr]] version = "0.6.0" when = "2021-10-11" @@ -13,15 +61,15 @@ user-login = "emilio" user-name = "Emilio Cobos Álvarez" [[publisher.clap]] -version = "4.5.18" -when = "2024-09-20" +version = "4.5.20" +when = "2024-10-08" user-id = 6743 user-login = "epage" user-name = "Ed Page" [[publisher.clap_builder]] -version = "4.5.18" -when = "2024-09-20" +version = "4.5.20" +when = "2024-10-08" user-id = 6743 user-login = "epage" user-name = "Ed Page" @@ -48,8 +96,8 @@ user-login = "hsivonen" user-name = "Henri Sivonen" [[publisher.serde_json]] -version = "1.0.128" -when = "2024-09-04" +version = "1.0.132" +when = "2024-10-19" user-id = 3618 user-login = "dtolnay" user-name = "David Tolnay" @@ -62,15 +110,15 @@ user-login = "dtolnay" user-name = "David Tolnay" [[publisher.syn]] -version = "2.0.79" -when = "2024-09-27" +version = "2.0.82" +when = "2024-10-20" user-id = 3618 user-login = "dtolnay" user-name = "David Tolnay" [[publisher.tokio]] -version = "1.40.0" -when = "2024-08-30" +version = "1.41.0" +when = "2024-10-22" user-id = 6741 user-login = "Darksonn" user-name = "Alice Ryhl" From 2189aad518ffc338c308eb36db46f9c2b32f1935 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Wed, 23 Oct 2024 10:18:40 -0300 Subject: [PATCH 4/4] update deny.toml --- deny.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deny.toml b/deny.toml index b8d35b41cc4..72e700945dc 100644 --- a/deny.toml +++ b/deny.toml @@ -96,6 +96,9 @@ skip-tree = [ # wait for dirs-sys to update windows-sys { name = "windows-sys", version = "=0.48.0" }, + # wait for zebra to update tower + { name = "hashbrown", version = "=0.12.3" }, + # 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" },