diff --git a/Cargo.lock b/Cargo.lock index fbc9f921e..da8ad242f 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", ] @@ -1760,7 +1760,7 @@ dependencies = [ "base64 0.22.0", "chrono", "futures", - "hyper", + "hyper 1.2.0", "log", "rand 0.8.5", "reqwest", @@ -1831,7 +1831,7 @@ dependencies = [ "exocore-protos", "futures", "gloo-timers 0.3.0", - "hyper", + "hyper 1.2.0", "libp2p", "libp2p-identity", "libp2p-mplex", @@ -2266,7 +2266,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", + "indexmap 2.2.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.1.0", "indexmap 2.2.3", "slab", "tokio", @@ -2406,6 +2425,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -2413,10 +2443,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.1.0", +] + [[package]] name = "httparse" version = "1.8.0" @@ -2445,9 +2485,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -2459,6 +2499,27 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.2", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite 0.2.13", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -2466,8 +2527,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", @@ -2566,8 +2627,8 @@ dependencies = [ "attohttpc", "bytes", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "log", "rand 0.8.5", "tokio", @@ -4588,10 +4649,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.24", + "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 d0a6830d2..16682239a 100644 --- a/discovery/Cargo.toml +++ b/discovery/Cargo.toml @@ -28,7 +28,7 @@ thiserror = "1.0.57" wasm-timer = "0.2.5" # For server -hyper = { version = "0.14.28", features = ["full"], optional = true } +hyper = { version = "1.2.0", features = ["full"], optional = true } tokio = { version = "1.36.0", default-features = false, features = ["macros", "time"], optional = true } [[test]] diff --git a/transport/Cargo.toml b/transport/Cargo.toml index 044108d42..dbe38b3de 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.2.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}