diff --git a/Cargo.lock b/Cargo.lock index 413174c856f..b78e945b36c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ "termcolor", "toml 0.5.11", "tracing", - "tracing-log", + "tracing-log 0.1.4", "tracing-subscriber", "wait-timeout", ] @@ -281,9 +281,9 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.27", "itoa", "matchit", "memchr", @@ -307,8 +307,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", @@ -1670,7 +1670,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap 1.9.3", "slab", "tokio", @@ -1678,6 +1678,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util 0.7.10", + "tracing", +] + [[package]] name = "half" version = "1.8.2" @@ -1871,6 +1890,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -1878,10 +1908,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + [[package]] name = "httparse" version = "1.8.0" @@ -1920,9 +1960,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.21", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -1934,6 +1974,25 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.0", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "tokio", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1941,8 +2000,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.27", "rustls", "tokio", "tokio-rustls", @@ -1954,7 +2013,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.27", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -2156,6 +2215,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -2214,7 +2282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" dependencies = [ "futures", - "hyper", + "hyper 0.14.27", "jsonrpc-core", "jsonrpc-server-utils", "log", @@ -2469,7 +2537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5" dependencies = [ "base64 0.21.5", - "hyper", + "hyper 0.14.27", "indexmap 1.9.3", "ipnet", "metrics", @@ -3158,9 +3226,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", "prost-derive", @@ -3190,9 +3258,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools 0.11.0", @@ -3504,10 +3572,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.21", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-rustls", "ipnet", "js-sys", @@ -4546,10 +4614,10 @@ dependencies = [ "axum", "base64 0.21.5", "bytes", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.21", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", @@ -4672,11 +4740,12 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", + "thiserror", "time", "tracing-subscriber", ] @@ -4755,11 +4824,22 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -4770,7 +4850,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", ] [[package]] @@ -5604,7 +5684,7 @@ dependencies = [ "hex", "humantime", "incrementalmerkletree", - "itertools 0.11.0", + "itertools 0.12.0", "jubjub", "lazy_static", "num-integer", @@ -5701,7 +5781,7 @@ dependencies = [ "howudoin", "humantime-serde", "indexmap 2.1.0", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "metrics", "num-integer", @@ -5747,7 +5827,7 @@ dependencies = [ "chrono", "futures", "hex", - "hyper", + "hyper 0.14.27", "indexmap 2.1.0", "insta", "jsonrpc-core", @@ -5823,7 +5903,7 @@ dependencies = [ "humantime-serde", "indexmap 2.1.0", "insta", - "itertools 0.11.0", + "itertools 0.12.0", "jubjub", "lazy_static", "metrics", @@ -5860,7 +5940,7 @@ dependencies = [ "humantime", "indexmap 2.1.0", "insta", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "once_cell", "owo-colors", @@ -5884,7 +5964,7 @@ version = "1.0.0-beta.31" dependencies = [ "color-eyre", "hex", - "itertools 0.11.0", + "itertools 0.12.0", "regex", "reqwest", "serde_json", @@ -5915,7 +5995,8 @@ dependencies = [ "hex-literal", "howudoin", "humantime-serde", - "hyper", + "hyper 0.14.27", + "hyper 1.0.1", "indexmap 2.1.0", "indicatif", "inferno", diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 4a0735c3a5f..9c24524e26e 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -102,7 +102,7 @@ serde-big-array = "0.5.1" # Processing futures = "0.3.29" -itertools = "0.11.0" +itertools = "0.12.0" rayon = "1.7.0" # ZF deps diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index d998f8145a9..37bb6dc2529 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -92,7 +92,7 @@ spandoc = "0.2.2" tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] } tracing-error = "0.2.0" -tracing-subscriber = "0.3.17" +tracing-subscriber = "0.3.18" zebra-state = { path = "../zebra-state", features = ["proptest-impl"] } zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] } diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index 3d8ef372ab6..149322e7801 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -48,7 +48,7 @@ dirs = "5.0.1" hex = "0.4.3" humantime-serde = "1.1.1" indexmap = { version = "2.0.1", features = ["serde"] } -itertools = "0.11.0" +itertools = "0.12.0" lazy_static = "1.4.0" num-integer = "0.1.45" ordered-map = "0.4.2" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index 697d117078f..aa3601ec1cd 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -51,7 +51,7 @@ hex = "0.4.3" hex-literal = "0.4.1" humantime-serde = "1.1.1" indexmap = "2.0.1" -itertools = "0.11.0" +itertools = "0.12.0" lazy_static = "1.4.0" metrics = "0.21.1" mset = "0.1.1" diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 128d872d30b..6fd05c515f8 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -19,7 +19,7 @@ hex = "0.4.3" indexmap = "2.0.1" lazy_static = "1.4.0" insta = "1.33.0" -itertools = "0.11.0" +itertools = "0.12.0" proptest = "1.4.0" once_cell = "1.18.0" rand = "0.8.5" @@ -39,7 +39,7 @@ owo-colors = "3.5.0" spandoc = "0.2.2" thiserror = "1.0.48" -tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } +tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } tracing-error = "0.2.0" tracing = "0.1.39" diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml index a5d9ab1a6ec..19f5f01cd6f 100644 --- a/zebra-utils/Cargo.toml +++ b/zebra-utils/Cargo.toml @@ -71,7 +71,7 @@ structopt = "0.3.26" hex = "0.4.3" serde_json = "1.0.108" tracing-error = "0.2.0" -tracing-subscriber = "0.3.17" +tracing-subscriber = "0.3.18" thiserror = "1.0.48" zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.31" } @@ -81,7 +81,7 @@ zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.31" } zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.31", optional = true } # These crates are needed for the zebra-checkpoints binary -itertools = { version = "0.11.0", optional = true } +itertools = { version = "0.12.0", optional = true } # These crates are needed for the search-issue-refs binary regex = { version = "1.10.2", optional = true } diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index df89a0f8604..e3145783378 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -185,8 +185,8 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] } thiserror = "1.0.48" -tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } -tracing-appender = "0.2.2" +tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } +tracing-appender = "0.2.3" tracing-error = "0.2.0" tracing-futures = "0.2.5" tracing = "0.1.39" @@ -210,7 +210,7 @@ inferno = { version = "0.11.18", default-features = false, optional = true } tracing-journald = { version = "0.3.0", optional = true } # prod feature filter-reload -hyper = { version = "0.14.27", features = ["http1", "http2", "server"], optional = true } +hyper = { version = "1.0.1", features = ["http1", "http2", "server"], optional = true } # prod feature prometheus metrics-exporter-prometheus = { version = "0.12.0", default-features = false, features = ["http-listener"], optional = true } @@ -258,7 +258,7 @@ tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] } tokio-stream = "0.1.14" # test feature lightwalletd-grpc-tests -prost = "0.12.1" +prost = "0.12.2" tonic = "0.10.2" proptest = "1.4.0"