From 3044a5a96660fb1315ba5017515a97ab4153e0b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 16:40:26 +0000 Subject: [PATCH 1/2] build(deps): bump the prod group with 3 updates Bumps the prod group with 3 updates: [serde](https://github.com/serde-rs/serde), [inferno](https://github.com/jonhoo/inferno) and [hyper](https://github.com/hyperium/hyper). Updates `serde` from 1.0.192 to 1.0.193 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.192...v1.0.193) Updates `inferno` from 0.11.18 to 0.11.19 - [Changelog](https://github.com/jonhoo/inferno/blob/main/CHANGELOG.md) - [Commits](https://github.com/jonhoo/inferno/compare/v0.11.18...v0.11.19) Updates `hyper` from 0.14.27 to 1.0.1 - [Release notes](https://github.com/hyperium/hyper/releases) - [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/hyper/compare/v0.14.27...v1.0.1) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: inferno dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod - dependency-name: hyper dependency-type: direct:production update-type: version-update:semver-major dependency-group: prod ... Signed-off-by: dependabot[bot] --- Cargo.lock | 121 ++++++++++++++++++++++++--------- zebra-chain/Cargo.toml | 2 +- zebra-consensus/Cargo.toml | 2 +- zebra-network/Cargo.toml | 2 +- zebra-node-services/Cargo.toml | 4 +- zebra-rpc/Cargo.toml | 4 +- zebra-scan/Cargo.toml | 2 +- zebra-state/Cargo.toml | 2 +- zebrad/Cargo.toml | 8 +-- 9 files changed, 103 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0c4b70c838a..56607a670b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", @@ -2071,9 +2130,9 @@ dependencies = [ [[package]] name = "inferno" -version = "0.11.18" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfb2e51b23c338595ae0b6bdaaa7a4a8b860b8d788a4331cb07b50fe5dea71b" +checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" dependencies = [ "ahash", "is-terminal", @@ -2223,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", @@ -2478,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", @@ -3513,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", @@ -3890,9 +3949,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -3908,9 +3967,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -4555,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", @@ -5768,7 +5827,7 @@ dependencies = [ "chrono", "futures", "hex", - "hyper", + "hyper 1.0.1", "indexmap 2.1.0", "insta", "jsonrpc-core", @@ -5938,7 +5997,7 @@ dependencies = [ "hex-literal", "howudoin", "humantime-serde", - "hyper", + "hyper 1.0.1", "indexmap 2.1.0", "indicatif", "inferno", diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 9c24524e26e..a87d6f232ea 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -96,7 +96,7 @@ tracing = "0.1.39" # Serialization hex = { version = "0.4.3", features = ["serde"] } -serde = { version = "1.0.192", features = ["serde_derive", "rc"] } +serde = { version = "1.0.193", features = ["serde_derive", "rc"] } serde_with = "3.4.0" serde-big-array = "0.5.1" diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index 37bb6dc2529..3406fd422ca 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -47,7 +47,7 @@ chrono = { version = "0.4.31", default-features = false, features = ["clock", "s displaydoc = "0.2.4" lazy_static = "1.4.0" once_cell = "1.18.0" -serde = { version = "1.0.192", features = ["serde_derive"] } +serde = { version = "1.0.193", features = ["serde_derive"] } futures = "0.3.29" futures-util = "0.3.28" diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index 149322e7801..a338a32da14 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -56,7 +56,7 @@ pin-project = "1.1.3" rand = "0.8.5" rayon = "1.7.0" regex = "1.10.2" -serde = { version = "1.0.192", features = ["serde_derive"] } +serde = { version = "1.0.193", features = ["serde_derive"] } tempfile = "3.8.1" thiserror = "1.0.48" diff --git a/zebra-node-services/Cargo.toml b/zebra-node-services/Cargo.toml index caf2fc8a4b2..cf640e046dc 100644 --- a/zebra-node-services/Cargo.toml +++ b/zebra-node-services/Cargo.toml @@ -44,7 +44,7 @@ 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.22", default-features = false, features = ["rustls-tls"], optional = true } -serde = { version = "1.0.192", optional = true } +serde = { version = "1.0.193", optional = true } serde_json = { version = "1.0.108", optional = true } [dev-dependencies] @@ -52,5 +52,5 @@ serde_json = { version = "1.0.108", optional = true } color-eyre = "0.6.2" jsonrpc-core = "18.0.0" reqwest = { version = "0.11.22", default-features = false, features = ["rustls-tls"] } -serde = "1.0.192" +serde = "1.0.193" serde_json = "1.0.108" diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index 0e59b84b18d..6a3802fb870 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -43,7 +43,7 @@ chrono = { version = "0.4.31", default-features = false, features = ["clock", "s futures = "0.3.29" # lightwalletd sends JSON-RPC requests over HTTP 1.1 -hyper = { version = "0.14.27", features = ["http1", "server"] } +hyper = { version = "1.0.1", features = ["http1", "server"] } jsonrpc-core = "18.0.0" jsonrpc-derive = "18.0.0" @@ -60,7 +60,7 @@ tower = "0.4.13" tracing = "0.1.39" hex = { version = "0.4.3", features = ["serde"] } -serde = { version = "1.0.192", features = ["serde_derive"] } +serde = { version = "1.0.193", features = ["serde_derive"] } # Experimental feature getblocktemplate-rpcs rand = { version = "0.8.5", optional = true } diff --git a/zebra-scan/Cargo.toml b/zebra-scan/Cargo.toml index 3f1471a34bb..4293f3c427c 100644 --- a/zebra-scan/Cargo.toml +++ b/zebra-scan/Cargo.toml @@ -24,7 +24,7 @@ zebra-state = { path = "../zebra-state", version = "1.0.0-beta.31" } color-eyre = "0.6.2" indexmap = { version = "2.0.1", features = ["serde"] } -serde = { version = "1.0.192", features = ["serde_derive"] } +serde = { version = "1.0.193", features = ["serde_derive"] } tokio = { version = "1.34.0", features = ["test-util"] } tower = "0.4.13" tracing = "0.1.39" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index aa3601ec1cd..0a30e72c254 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -59,7 +59,7 @@ regex = "1.10.2" rlimit = "0.10.1" rocksdb = { version = "0.21.0", default-features = false, features = ["lz4"] } semver = "1.0.20" -serde = { version = "1.0.192", features = ["serde_derive"] } +serde = { version = "1.0.193", features = ["serde_derive"] } tempfile = "3.8.1" thiserror = "1.0.48" diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index fdfbbd7def9..588103956a4 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -168,7 +168,7 @@ humantime-serde = "1.1.1" indexmap = "2.0.1" lazy_static = "1.4.0" semver = "1.0.20" -serde = { version = "1.0.192", features = ["serde_derive"] } +serde = { version = "1.0.193", features = ["serde_derive"] } toml = "0.8.8" futures = "0.3.29" @@ -204,13 +204,13 @@ sentry = { version = "0.31.8", default-features = false, features = ["backtrace" # prod feature flamegraph tracing-flame = { version = "0.2.0", optional = true } -inferno = { version = "0.11.18", default-features = false, optional = true } +inferno = { version = "0.11.19", default-features = false, optional = true } # prod feature journald 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 } @@ -251,7 +251,7 @@ insta = { version = "1.33.0", features = ["json"] } serde_json = { version = "1.0.108", features = ["preserve_order"] } tempfile = "3.8.1" -hyper = { version = "0.14.27", features = ["http1", "http2", "server"]} +hyper = { version = "1.0.1", features = ["http1", "http2", "server"]} tracing-test = { version = "0.2.4", features = ["no-env-filter"] } tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] } From 80575ca58fb644bf72b9c960271ee0113ab10df5 Mon Sep 17 00:00:00 2001 From: Arya Date: Mon, 27 Nov 2023 14:14:20 -0500 Subject: [PATCH 2/2] restore previous version of hyper --- Cargo.lock | 3 ++- zebra-rpc/Cargo.toml | 2 +- zebrad/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 56607a670b1..5454ac4d375 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5827,7 +5827,7 @@ dependencies = [ "chrono", "futures", "hex", - "hyper 1.0.1", + "hyper 0.14.27", "indexmap 2.1.0", "insta", "jsonrpc-core", @@ -5997,6 +5997,7 @@ dependencies = [ "hex-literal", "howudoin", "humantime-serde", + "hyper 0.14.27", "hyper 1.0.1", "indexmap 2.1.0", "indicatif", diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index 6a3802fb870..7d86829ae9a 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -43,7 +43,7 @@ chrono = { version = "0.4.31", default-features = false, features = ["clock", "s futures = "0.3.29" # lightwalletd sends JSON-RPC requests over HTTP 1.1 -hyper = { version = "1.0.1", features = ["http1", "server"] } +hyper = { version = "0.14.27", features = ["http1", "server"] } jsonrpc-core = "18.0.0" jsonrpc-derive = "18.0.0" diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 588103956a4..f3b064e7883 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -210,7 +210,7 @@ inferno = { version = "0.11.19", default-features = false, optional = true } tracing-journald = { version = "0.3.0", optional = true } # prod feature filter-reload -hyper = { version = "1.0.1", features = ["http1", "http2", "server"], optional = true } +hyper = { version = "0.14.27", features = ["http1", "http2", "server"], optional = true } # prod feature prometheus metrics-exporter-prometheus = { version = "0.12.0", default-features = false, features = ["http-listener"], optional = true }