diff --git a/Cargo.lock b/Cargo.lock index 93e7ba22d..c2bdbb35c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1890,7 +1890,7 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls 0.21.5", + "rustls 0.21.6", "tokio", "tokio-rustls", ] @@ -3467,9 +3467,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" dependencies = [ "async-compression", "base64 0.21.2", @@ -3489,7 +3489,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.5", + "rustls 0.21.6", "rustls-pemfile", "serde", "serde_json", @@ -3502,7 +3502,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.22.6", + "webpki-roots 0.25.2", "winreg", ] @@ -3632,13 +3632,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.5" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", - "rustls-webpki 0.101.1", + "rustls-webpki 0.101.3", "sct", ] @@ -3663,9 +3663,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.1" +version = "0.101.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" +checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" dependencies = [ "ring", "untrusted", @@ -3781,7 +3781,7 @@ checksum = "01b0ad16faa5d12372f914ed40d00bda21a6d1bdcc99264c5e5e1c9495cf3654" dependencies = [ "httpdate", "reqwest", - "rustls 0.21.5", + "rustls 0.21.6", "sentry-backtrace", "sentry-contexts", "sentry-core", @@ -4325,9 +4325,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.31.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ "backtrace", "bytes", @@ -4370,7 +4370,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.5", + "rustls 0.21.6", "tokio", ] @@ -4857,7 +4857,7 @@ dependencies = [ "base64 0.21.2", "log", "once_cell", - "rustls 0.21.5", + "rustls 0.21.6", "rustls-webpki 0.100.2", "url", "webpki-roots 0.23.1", @@ -5078,6 +5078,12 @@ dependencies = [ "rustls-webpki 0.100.2", ] +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "which" version = "4.4.0" @@ -5272,11 +5278,12 @@ dependencies = [ [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/deny.toml b/deny.toml index 5f91c7d26..556af40ca 100644 --- a/deny.toml +++ b/deny.toml @@ -79,6 +79,9 @@ skip-tree = [ # wait for minreq and zcash_proofs to upgrade { name = "rustls", version = "=0.20.8" }, + # wait for zcash_proofs to upgrade + { name = "webpki-roots", version = "=0.22.6" }, + # zebra-utils dependencies # wait for structopt upgrade (or upgrade to clap 4) diff --git a/tower-batch-control/Cargo.toml b/tower-batch-control/Cargo.toml index a3283e241..6f1ef8e55 100644 --- a/tower-batch-control/Cargo.toml +++ b/tower-batch-control/Cargo.toml @@ -26,7 +26,7 @@ futures = "0.3.28" futures-core = "0.3.28" pin-project = "1.1.3" rayon = "1.7.0" -tokio = { version = "1.31.0", features = ["time", "sync", "tracing", "macros"] } +tokio = { version = "1.32.0", features = ["time", "sync", "tracing", "macros"] } tokio-util = "0.7.8" tower = { version = "0.4.13", features = ["util", "buffer"] } tracing = "0.1.37" @@ -41,7 +41,7 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] } ed25519-zebra = "4.0.1" rand = "0.8.5" -tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.32.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 4611bfa4b..614dddff4 100644 --- a/tower-fallback/Cargo.toml +++ b/tower-fallback/Cargo.toml @@ -22,6 +22,6 @@ futures-core = "0.3.28" tracing = "0.1.37" [dev-dependencies] -tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.32.0", features = ["full", "tracing", "test-util"] } zebra-test = { path = "../zebra-test/" } diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 515ea93fd..05fc4bb26 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -114,7 +114,7 @@ reddsa = "0.5.1" serde_json = { version = "1.0.105", optional = true } # Production feature async-error and testing feature proptest-impl -tokio = { version = "1.31.0", optional = true } +tokio = { version = "1.32.0", optional = true } # Experimental feature getblocktemplate-rpcs zcash_address = { version = "0.3.0", optional = true } @@ -147,7 +147,7 @@ proptest-derive = "0.3.0" rand = "0.8.5" rand_chacha = "0.3.1" -tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.32.0", features = ["full", "tracing", "test-util"] } zebra-test = { path = "../zebra-test/" } diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index df190a5da..dbf8ac6bd 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -53,7 +53,7 @@ futures = "0.3.28" futures-util = "0.3.28" metrics = "0.21.1" thiserror = "1.0.47" -tokio = { version = "1.31.0", features = ["time", "sync", "tracing", "rt-multi-thread"] } +tokio = { version = "1.32.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" @@ -89,7 +89,7 @@ proptest = "1.2.0" proptest-derive = "0.3.0" spandoc = "0.2.2" -tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.32.0", features = ["full", "tracing", "test-util"] } tracing-error = "0.2.0" tracing-subscriber = "0.3.17" diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index ad332ba0d..4e09a3a68 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -61,7 +61,7 @@ tempfile = "3.8.0" thiserror = "1.0.47" futures = "0.3.28" -tokio = { version = "1.31.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] } +tokio = { version = "1.32.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] } tokio-stream = { version = "0.1.14", features = ["sync", "time"] } tokio-util = { version = "0.7.8", features = ["codec"] } tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] } @@ -90,7 +90,7 @@ proptest = "1.2.0" proptest-derive = "0.3.0" static_assertions = "1.1.0" -tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.32.0", features = ["full", "tracing", "test-util"] } toml = "0.7.6" zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] } diff --git a/zebra-node-services/Cargo.toml b/zebra-node-services/Cargo.toml index 5c9dfa2d1..037dfd59f 100644 --- a/zebra-node-services/Cargo.toml +++ b/zebra-node-services/Cargo.toml @@ -43,7 +43,7 @@ zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.28" } color-eyre = { version = "0.6.2", optional = true } jsonrpc-core = { version = "18.0.0", optional = true } # Security: avoid default dependency on openssl -reqwest = { version = "0.11.18", default-features = false, features = ["rustls-tls"], optional = true } +reqwest = { version = "0.11.19", default-features = false, features = ["rustls-tls"], optional = true } serde = { version = "1.0.185", optional = true } serde_json = { version = "1.0.105", optional = true } @@ -51,6 +51,6 @@ serde_json = { version = "1.0.105", optional = true } color-eyre = "0.6.2" jsonrpc-core = "18.0.0" -reqwest = { version = "0.11.18", default-features = false, features = ["rustls-tls"] } +reqwest = { version = "0.11.19", default-features = false, features = ["rustls-tls"] } serde = "1.0.185" serde_json = "1.0.105" diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index 42502f651..a4cc0002d 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -54,7 +54,7 @@ num_cpus = "1.16.0" serde_json = { version = "1.0.105", features = ["preserve_order"] } indexmap = { version = "2.0.0", features = ["serde"] } -tokio = { version = "1.31.0", features = ["time", "rt-multi-thread", "macros", "tracing"] } +tokio = { version = "1.32.0", features = ["time", "rt-multi-thread", "macros", "tracing"] } tower = "0.4.13" tracing = "0.1.37" @@ -83,7 +83,7 @@ insta = { version = "1.31.0", features = ["redactions", "json", "ron"] } proptest = "1.2.0" thiserror = "1.0.47" -tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.32.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 4ddbdf408..2d8be8d4d 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -62,7 +62,7 @@ tempfile = "3.8.0" thiserror = "1.0.47" rayon = "1.7.0" -tokio = { version = "1.31.0", features = ["rt-multi-thread", "sync", "tracing"] } +tokio = { version = "1.32.0", features = ["rt-multi-thread", "sync", "tracing"] } tower = { version = "0.4.13", features = ["buffer", "util"] } tracing = "0.1.37" @@ -100,7 +100,7 @@ rand = "0.8.5" halo2 = { package = "halo2_proofs", version = "0.3.0" } jubjub = "0.10.0" -tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.32.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 e5f67f79d..fc4c9e4d5 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -24,7 +24,7 @@ once_cell = "1.18.0" rand = "0.8.5" regex = "1.9.3" -tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.32.0", features = ["full", "tracing", "test-util"] } tower = { version = "0.4.13", features = ["util"] } futures = "0.3.28" diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml index 1feb8edbd..fd03157ea 100644 --- a/zebra-utils/Cargo.toml +++ b/zebra-utils/Cargo.toml @@ -86,7 +86,7 @@ itertools = { version = "0.11.0", optional = true } # These crates are needed for the search-issue-refs binary regex = { version = "1.9.3", optional = true } # Avoid default openssl dependency to reduce the dependency tree and security alerts. -reqwest = { version = "0.11.18", default-features = false, features = ["rustls-tls"], optional = true } +reqwest = { version = "0.11.19", default-features = false, features = ["rustls-tls"], optional = true } # These crates are needed for the zebra-checkpoints and search-issue-refs binaries -tokio = { version = "1.31.0", features = ["full"], optional = true } +tokio = { version = "1.32.0", features = ["full"], optional = true } diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 8ad84fcbb..f5e990ead 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -164,7 +164,7 @@ toml = "0.7.6" futures = "0.3.28" rayon = "1.7.0" -tokio = { version = "1.31.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] } +tokio = { version = "1.32.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] } tower = { version = "0.4.13", features = ["hedge", "limit"] } pin-project = "1.1.3" @@ -242,7 +242,7 @@ tempfile = "3.8.0" hyper = { version = "0.14.27", features = ["http1", "http2", "server"]} tracing-test = { version = "0.2.4", features = ["no-env-filter"] } -tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.32.0", features = ["full", "tracing", "test-util"] } tokio-stream = "0.1.14" # test feature lightwalletd-grpc-tests