diff --git a/Cargo.lock b/Cargo.lock index 2cdecf71f..b0fe36aa4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4296,9 +4296,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.25.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes", @@ -4312,7 +4312,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -5139,19 +5139,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" @@ -5167,9 +5191,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" @@ -5185,9 +5209,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" @@ -5203,9 +5227,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" @@ -5221,15 +5245,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" @@ -5245,9 +5269,9 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" diff --git a/tower-batch/Cargo.toml b/tower-batch/Cargo.toml index 43f10a399..c29435e06 100644 --- a/tower-batch/Cargo.toml +++ b/tower-batch/Cargo.toml @@ -10,7 +10,7 @@ futures = "0.3.26" futures-core = "0.3.26" pin-project = "1.0.12" rayon = "1.6.1" -tokio = { version = "1.25.0", features = ["time", "sync", "tracing", "macros"] } +tokio = { version = "1.26.0", features = ["time", "sync", "tracing", "macros"] } tokio-util = "0.7.7" tower = { version = "0.4.13", features = ["util", "buffer"] } tracing = "0.1.37" @@ -25,7 +25,7 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] } ed25519-zebra = "3.1.0" rand = { version = "0.8.5", package = "rand" } -tokio = { version = "1.25.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.26.0", features = ["full", "tracing", "test-util"] } tokio-test = "0.4.2" tower-fallback = { path = "../tower-fallback/" } tower-test = "0.4.0" diff --git a/tower-fallback/Cargo.toml b/tower-fallback/Cargo.toml index 3e769fd64..49bface69 100644 --- a/tower-fallback/Cargo.toml +++ b/tower-fallback/Cargo.toml @@ -12,6 +12,6 @@ futures-core = "0.3.26" tracing = "0.1.37" [dev-dependencies] -tokio = { version = "1.25.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.26.0", features = ["full", "tracing", "test-util"] } zebra-test = { path = "../zebra-test/" } diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 9f45d5aae..6fbd527a4 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -97,7 +97,7 @@ proptest-derive = { version = "0.3.0", optional = true } rand = { version = "0.8.5", optional = true, package = "rand" } rand_chacha = { version = "0.3.1", optional = true } -tokio = { version = "1.25.0", features = ["tracing"], optional = true } +tokio = { version = "1.26.0", features = ["tracing"], optional = true } zebra-test = { path = "../zebra-test/", optional = true } @@ -120,7 +120,7 @@ proptest-derive = "0.3.0" rand = { version = "0.8.5", package = "rand" } rand_chacha = "0.3.1" -tokio = { version = "1.25.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.26.0", features = ["full", "tracing", "test-util"] } zebra-test = { path = "../zebra-test/" } diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index 51a7a198f..ab7e6fca1 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -39,7 +39,7 @@ futures = "0.3.26" futures-util = "0.3.26" metrics = "0.20.1" thiserror = "1.0.38" -tokio = { version = "1.25.0", features = ["time", "sync", "tracing", "rt-multi-thread"] } +tokio = { version = "1.26.0", features = ["time", "sync", "tracing", "rt-multi-thread"] } tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] } tracing = "0.1.37" tracing-futures = "0.2.5" @@ -71,7 +71,7 @@ proptest = "0.10.1" proptest-derive = "0.3.0" spandoc = "0.2.2" -tokio = { version = "1.25.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.26.0", features = ["full", "tracing", "test-util"] } tracing-error = "0.2.0" tracing-subscriber = "0.3.16" diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index 4ff6dfec6..b40217555 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -31,7 +31,7 @@ serde = { version = "1.0.152", features = ["serde_derive"] } thiserror = "1.0.38" futures = "0.3.26" -tokio = { version = "1.25.0", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] } +tokio = { version = "1.26.0", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] } tokio-stream = { version = "0.1.12", features = ["sync", "time"] } tokio-util = { version = "0.7.7", features = ["codec"] } tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] } @@ -57,7 +57,7 @@ proptest = "0.10.1" proptest-derive = "0.3.0" static_assertions = "1.1.0" -tokio = { version = "1.25.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.26.0", features = ["full", "tracing", "test-util"] } toml = "0.7.2" zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] } diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index 1543d1b2b..5f8e82684 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -47,7 +47,7 @@ num_cpus = "1.15.0" serde_json = { version = "1.0.93", features = ["preserve_order"] } indexmap = { version = "1.9.2", features = ["serde"] } -tokio = { version = "1.25.0", features = ["time", "rt-multi-thread", "macros", "tracing"] } +tokio = { version = "1.26.0", features = ["time", "rt-multi-thread", "macros", "tracing"] } tower = "0.4.13" tracing = "0.1.37" @@ -76,7 +76,7 @@ insta = { version = "1.28.0", features = ["redactions", "json", "ron"] } proptest = "0.10.1" thiserror = "1.0.38" -tokio = { version = "1.25.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.26.0", features = ["full", "tracing", "test-util"] } zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] } zebra-consensus = { path = "../zebra-consensus", features = ["proptest-impl"] } diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index 209d7f635..4b9eb213a 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -41,7 +41,7 @@ tempfile = "3.4.0" thiserror = "1.0.38" rayon = "1.6.1" -tokio = { version = "1.25.0", features = ["sync", "tracing"] } +tokio = { version = "1.26.0", features = ["sync", "tracing"] } tower = { version = "0.4.13", features = ["buffer", "util"] } tracing = "0.1.37" @@ -69,7 +69,7 @@ proptest-derive = "0.3.0" halo2 = { package = "halo2_proofs", version = "0.2.0" } jubjub = "0.9.0" -tokio = { version = "1.25.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.26.0", features = ["full", "tracing", "test-util"] } zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] } zebra-test = { path = "../zebra-test/" } diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 7394925f0..8d3adfaea 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -17,7 +17,7 @@ once_cell = "1.17.1" rand = { version = "0.8.5", package = "rand" } regex = "1.7.1" -tokio = { version = "1.25.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.26.0", features = ["full", "tracing", "test-util"] } tower = { version = "0.4.13", features = ["util"] } futures = "0.3.26" diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 4d21ea12b..a35470aac 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -109,7 +109,7 @@ toml = "0.7.2" futures = "0.3.26" rayon = "1.6.1" -tokio = { version = "1.25.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] } +tokio = { version = "1.26.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] } tower = { version = "0.4.13", features = ["hedge", "limit"] } pin-project = "1.0.12" @@ -184,7 +184,7 @@ tempfile = "3.4.0" hyper = { version = "0.14.24", features = ["http1", "http2", "server"]} reqwest = "0.11.14" -tokio = { version = "1.25.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.26.0", features = ["full", "tracing", "test-util"] } tokio-stream = "0.1.12" # test feature lightwalletd-grpc-tests