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"] }