diff --git a/Cargo.lock b/Cargo.lock index c7c6d58631d..78a19264e9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2029,9 +2029,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", ] @@ -3107,20 +3107,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]] @@ -4683,6 +4673,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", + "hdrhistogram", "indexmap 1.9.3", "pin-project", "pin-project-lite", @@ -4703,14 +4694,10 @@ checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ "futures-core", "futures-util", - "hdrhistogram", "pin-project-lite", "sync_wrapper 0.1.2", - "tokio", - "tokio-util 0.7.13", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -4728,7 +4715,7 @@ dependencies = [ "tokio", "tokio-test", "tokio-util 0.7.13", - "tower 0.5.1", + "tower 0.4.13", "tower-fallback", "tower-test", "tracing", @@ -4743,7 +4730,7 @@ dependencies = [ "futures-core", "pin-project", "tokio", - "tower 0.5.1", + "tower 0.4.13", "tracing", "zebra-test", ] @@ -4780,6 +4767,7 @@ version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5677,7 +5665,7 @@ checksum = "2fde17bf53792f9c756b313730da14880257d7661b5bfc69d0571c3a7c11a76d" dependencies = [ "blake2b_simd", "byteorder", - "primitive-types 0.12.2", + "primitive-types", ] [[package]] @@ -5839,7 +5827,7 @@ dependencies = [ "lazy_static", "num-integer", "orchard", - "primitive-types 0.13.1", + "primitive-types", "proptest", "proptest-derive", "rand 0.8.5", @@ -5905,7 +5893,7 @@ dependencies = [ "thiserror 2.0.6", "tinyvec", "tokio", - "tower 0.5.1", + "tower 0.4.13", "tower-batch-control", "tower-fallback", "tracing", @@ -5935,7 +5923,7 @@ dependencies = [ "tonic", "tonic-build", "tonic-reflection", - "tower 0.5.1", + "tower 0.4.13", "zcash_primitives", "zebra-chain", "zebra-node-services", @@ -5976,7 +5964,7 @@ dependencies = [ "tokio-stream", "tokio-util 0.7.13", "toml 0.8.19", - "tower 0.5.1", + "tower 0.4.13", "tracing", "tracing-error", "tracing-futures", @@ -6023,7 +6011,7 @@ dependencies = [ "tonic", "tonic-build", "tonic-reflection", - "tower 0.5.1", + "tower 0.4.13", "tracing", "zcash_address", "zcash_primitives", @@ -6065,7 +6053,7 @@ dependencies = [ "tokio", "toml 0.8.19", "tonic", - "tower 0.5.1", + "tower 0.4.13", "tracing", "tracing-subscriber", "zcash_address", @@ -6133,7 +6121,7 @@ dependencies = [ "thiserror 2.0.6", "tinyvec", "tokio", - "tower 0.5.1", + "tower 0.4.13", "tracing", "zebra-chain", "zebra-test", @@ -6161,7 +6149,7 @@ dependencies = [ "thiserror 2.0.6", "tinyvec", "tokio", - "tower 0.5.1", + "tower 0.4.13", "tracing", "tracing-error", "tracing-subscriber", @@ -6249,7 +6237,7 @@ dependencies = [ "toml 0.8.19", "tonic", "tonic-build", - "tower 0.5.1", + "tower 0.4.13", "tracing", "tracing-appender", "tracing-error", diff --git a/tower-batch-control/Cargo.toml b/tower-batch-control/Cargo.toml index 30c16340103..9f9dd5661f6 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.42.0", features = ["time", "sync", "tracing", "macros"] } tokio-util = "0.7.13" -tower = { version = "0.5.1", features = ["util", "buffer"] } +tower = { version = "0.4.13", features = ["util", "buffer"] } tracing = "0.1.41" tracing-futures = "0.2.5" diff --git a/tower-fallback/Cargo.toml b/tower-fallback/Cargo.toml index 1bdc0659ba1..bc20a49ef7a 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.41" diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index ebd8c4ab098..b7a9b5d9d32 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -84,7 +84,7 @@ lazy_static = "1.4.0" tempfile = "3.14.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 374465a49e5..aac5cfc0c06 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -53,7 +53,7 @@ futures-util = "0.3.28" metrics = "0.24.1" thiserror = "2.0.6" tokio = { version = "1.42.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.41" tracing-futures = "0.2.5" diff --git a/zebra-grpc/Cargo.toml b/zebra-grpc/Cargo.toml index ad88e912d8c..cf01365553f 100644 --- a/zebra-grpc/Cargo.toml +++ b/zebra-grpc/Cargo.toml @@ -23,7 +23,7 @@ prost = "0.13.4" serde = { version = "1.0.215", features = ["serde_derive"] } tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread"] } tokio-stream = "0.1.17" -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 8fa8f93e09b..86d373fa8d9 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -64,7 +64,7 @@ futures = "0.3.31" tokio = { version = "1.42.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] } tokio-stream = { version = "0.1.17", features = ["sync", "time"] } tokio-util = { version = "0.7.13", 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.1" tracing-futures = "0.2.5" diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index 1ef5de81e7b..56b7f3c60f0 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -80,7 +80,7 @@ tokio = { version = "1.42.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 9a40c1fdeef..17bd29baed7 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.215", features = ["serde_derive"] } tokio = { version = "1.42.0", features = ["time"] } -tower = "0.5.1" +tower = "0.4.13" tracing = "0.1.41" futures = "0.3.31" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index cd454f526fb..8ca769f6910 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -69,7 +69,7 @@ thiserror = "2.0.6" rayon = "1.10.0" tokio = { version = "1.42.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.41" # elasticsearch specific dependencies. diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 535995c0c01..db111c88f35 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.42.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 d2f8c0ac5b1..cb3e417d0cf 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -181,7 +181,7 @@ futures = "0.3.31" rayon = "1.10.0" tokio = { version = "1.42.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] } tokio-stream = { version = "0.1.17", 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"] }