diff --git a/Cargo.lock b/Cargo.lock index 43e2f5a4..3c34ad2c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1248,7 +1248,7 @@ dependencies = [ "grin_store", "grin_util", "http", - "hyper", + "hyper 0.13.10", "hyper-rustls 0.20.0", "hyper-timeout", "lazy_static", @@ -1260,7 +1260,7 @@ dependencies = [ "serde_derive", "serde_json", "thiserror", - "tokio", + "tokio 0.2.25", "tokio-rustls 0.13.1", "url", ] @@ -1507,7 +1507,7 @@ dependencies = [ "grin_wallet_impls", "grin_wallet_libwallet", "grin_wallet_util", - "hyper", + "hyper 0.14.12", "lazy_static", "log", "prettytable-rs", @@ -1520,7 +1520,7 @@ dependencies = [ "serde_json", "term 0.6.1", "thiserror", - "tokio", + "tokio 0.2.25", "url", "uuid", ] @@ -1552,7 +1552,7 @@ dependencies = [ "sysinfo", "thiserror", "timer", - "tokio", + "tokio 0.2.25", "url", "uuid", "x25519-dalek 0.6.0", @@ -1623,7 +1623,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.25", "tokio-util", "tracing", "tracing-futures", @@ -1703,6 +1703,17 @@ dependencies = [ "http", ] +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes 1.1.0", + "http", + "pin-project-lite 0.2.9", +] + [[package]] name = "httparse" version = "1.7.1" @@ -1715,6 +1726,12 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + [[package]] name = "humantime" version = "1.3.0" @@ -1742,13 +1759,35 @@ dependencies = [ "futures-util", "h2", "http", - "http-body", + "http-body 0.3.1", "httparse", - "httpdate", + "httpdate 0.3.2", "itoa 0.4.8", "pin-project", "socket2", - "tokio", + "tokio 0.2.25", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "0.14.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd" +dependencies = [ + "bytes 1.1.0", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body 0.4.5", + "httparse", + "httpdate 1.0.2", + "itoa 0.4.8", + "pin-project-lite 0.2.9", + "tokio 1.20.1", "tower-service", "tracing", "want", @@ -1763,11 +1802,11 @@ dependencies = [ "bytes 0.5.6", "ct-logs", "futures-util", - "hyper", + "hyper 0.13.10", "log", "rustls 0.17.0", "rustls-native-certs", - "tokio", + "tokio 0.2.25", "tokio-rustls 0.13.1", "webpki", ] @@ -1780,10 +1819,10 @@ checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" dependencies = [ "bytes 0.5.6", "futures-util", - "hyper", + "hyper 0.13.10", "log", "rustls 0.18.1", - "tokio", + "tokio 0.2.25", "tokio-rustls 0.14.1", "webpki", ] @@ -1795,8 +1834,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d1f9b0b8258e3ef8f45928021d3ef14096c2b93b99e4b8cfcabf1f58ec84b0a" dependencies = [ "bytes 0.5.6", - "hyper", - "tokio", + "hyper 0.13.10", + "tokio 0.2.25", "tokio-io-timeout", ] @@ -1807,9 +1846,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ "bytes 0.5.6", - "hyper", + "hyper 0.13.10", "native-tls", - "tokio", + "tokio 0.2.25", "tokio-tls", ] @@ -3203,8 +3242,8 @@ dependencies = [ "futures-core", "futures-util", "http", - "http-body", - "hyper", + "http-body 0.3.1", + "hyper 0.13.10", "hyper-rustls 0.21.0", "hyper-tls", "ipnet", @@ -3219,7 +3258,7 @@ dependencies = [ "rustls 0.18.1", "serde", "serde_urlencoded", - "tokio", + "tokio 0.2.25", "tokio-rustls 0.14.1", "tokio-socks", "tokio-tls", @@ -3983,6 +4022,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "1.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +dependencies = [ + "autocfg 1.1.0", + "pin-project-lite 0.2.9", +] + [[package]] name = "tokio-io-timeout" version = "0.4.0" @@ -3990,7 +4039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9390a43272c8a6ac912ed1d1e2b6abeafd5047e05530a2fa304deee041a06215" dependencies = [ "bytes 0.5.6", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -4012,7 +4061,7 @@ checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4" dependencies = [ "futures-core", "rustls 0.17.0", - "tokio", + "tokio 0.2.25", "webpki", ] @@ -4024,7 +4073,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls 0.18.1", - "tokio", + "tokio 0.2.25", "webpki", ] @@ -4038,7 +4087,7 @@ dependencies = [ "either", "futures 0.3.21", "thiserror", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -4048,7 +4097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -4062,7 +4111,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.12", - "tokio", + "tokio 0.2.25", ] [[package]] diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 8d98f933..4b299511 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] futures = "0.3" -hyper = "0.13" +hyper = "0.14" rand = "0.7" serde = "1" serde_derive = "1"