diff --git a/Cargo.lock b/Cargo.lock index 19f04223c..42c3ad760 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -315,7 +315,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" dependencies = [ - "http", + "http 0.2.11", "log", "url", ] @@ -1762,7 +1762,7 @@ dependencies = [ "base64 0.21.7", "chrono", "futures", - "hyper", + "hyper 1.1.0", "log", "rand 0.8.5", "reqwest", @@ -1833,7 +1833,7 @@ dependencies = [ "exocore-protos", "futures", "gloo-timers 0.3.0", - "hyper", + "hyper 1.1.0", "libp2p", "libp2p-identity", "libp2p-mplex", @@ -2268,7 +2268,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "991910e35c615d8cab86b5ab04be67e6ad24d2bf5f4f11fdbbed26da999bbeab" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", "indexmap 2.1.0", "slab", "tokio", @@ -2404,6 +2423,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.6" @@ -2411,10 +2441,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite 0.2.13", ] +[[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" @@ -2443,9 +2483,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.22", + "http 0.2.11", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -2457,6 +2497,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.1", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite 0.2.13", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -2464,8 +2524,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "rustls", "tokio", "tokio-rustls", @@ -2564,8 +2624,8 @@ dependencies = [ "attohttpc", "bytes", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "log", "rand 0.8.5", "tokio", @@ -4579,10 +4639,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.22", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls", "ipnet", "js-sys", diff --git a/discovery/Cargo.toml b/discovery/Cargo.toml index 660c5ea4f..e864c370f 100644 --- a/discovery/Cargo.toml +++ b/discovery/Cargo.toml @@ -28,7 +28,7 @@ thiserror = "1.0.56" wasm-timer = "0.2.5" # For server -hyper = { version = "0.14.28", features = ["full"], optional = true } +hyper = { version = "1.1.0", features = ["full"], optional = true } tokio = { version = "1.35.1", default-features = false, features = ["macros", "time"], optional = true } [[test]] diff --git a/transport/Cargo.toml b/transport/Cargo.toml index 8833a0a84..a96609097 100644 --- a/transport/Cargo.toml +++ b/transport/Cargo.toml @@ -25,7 +25,7 @@ exocore-core = {version = "0.1.25", path = "../core"} exocore-protos = {version = "0.1.25", path = "../protos"} futures = "0.3.30" gloo-timers = {version = "0.3", optional = true} -hyper = {version = "0.14.28", features = ["full"], optional = true} +hyper = {version = "1.1.0", features = ["full"], optional = true} libp2p = {version = "0.52.4", optional = true, default-features = false, features = ["noise", "websocket", "yamux", "ping", "identify", "macros", "tokio", "dns"]} libp2p-identity = { version = "0.2.8", features = ["secp256k1", "ed25519"], default-features = false } libp2p-mplex = {version = "0.40.0", optional = true}