diff --git a/Cargo.lock b/Cargo.lock index 56239f59258e..b87e7b89d6df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -184,7 +184,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b72c1f1154e234325b50864a349b9c8e56939e266a4c307c0f159812df2f9537" dependencies = [ - "bytes", + "bytes 0.5.6", "flate2", "futures-core", "memchr", @@ -249,7 +249,7 @@ dependencies = [ "backup-service", "bcs", "byteorder", - "bytes", + "bytes 0.5.6", "diem-config", "diem-crypto", "diem-infallible", @@ -290,7 +290,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "diem-config", "diem-crypto", "diem-logger", @@ -300,7 +300,7 @@ dependencies = [ "diem-workspace-hack", "diemdb", "futures 0.3.8", - "hyper", + "hyper 0.14.2", "once_cell", "reqwest", "serde", @@ -587,6 +587,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bytes" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f8e949d755f9d79112b5bb46938e0ef9d3804a0b16dfab13aafcaa5f0fa72" + [[package]] name = "c_linked_list" version = "1.1.1" @@ -912,7 +918,7 @@ dependencies = [ "async-trait", "bcs", "byteorder", - "bytes", + "bytes 0.5.6", "channel", "consensus-types", "diem-config", @@ -1278,7 +1284,7 @@ name = "debug-interface" version = "0.1.0" dependencies = [ "anyhow", - "bytes", + "bytes 0.5.6", "diem-logger", "diem-metrics", "diem-workspace-hack", @@ -1358,7 +1364,7 @@ dependencies = [ "bcs", "bitvec", "byteorder", - "bytes", + "bytes 0.5.6", "criterion", "curve25519-dalek 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "curve25519-dalek 3.0.0 (git+https://github.com/novifinancial/curve25519-dalek.git?branch=fiat3)", @@ -1639,7 +1645,7 @@ dependencies = [ "futures 0.3.8", "generate-key", "hex", - "hyper", + "hyper 0.14.2", "move-core-types", "move-vm-types", "network", @@ -1833,7 +1839,7 @@ dependencies = [ "diem-metrics-core", "diem-workspace-hack", "futures 0.3.8", - "hyper", + "hyper 0.14.2", "once_cell", "prometheus", "rusty-fork", @@ -2170,7 +2176,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "chrono", "diem-crypto", "diem-crypto-derive", @@ -2283,7 +2289,7 @@ name = "diem-workspace-hack" version = "0.1.0" dependencies = [ "byteorder", - "bytes", + "bytes 0.5.6", "cc", "chrono", "itertools 0.9.0", @@ -3216,7 +3222,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "futures-sink", @@ -3264,7 +3270,7 @@ checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" dependencies = [ "base64 0.12.3", "bitflags", - "bytes", + "bytes 0.5.6", "headers-core", "http", "mime", @@ -3352,7 +3358,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "itoa", ] @@ -3363,7 +3369,17 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes", + "bytes 0.5.6", + "http", +] + +[[package]] +name = "http-body" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" +dependencies = [ + "bytes 1.0.0", "http", ] @@ -3400,13 +3416,13 @@ version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", "h2", "http", - "http-body", + "http-body 0.3.1", "httparse", "httpdate", "itoa", @@ -3418,14 +3434,36 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12219dc884514cb4a6a03737f4413c0e01c23a1b059b0156004b23f1e19dccbe" +dependencies = [ + "bytes 1.0.0", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body 0.4.0", + "httparse", + "httpdate", + "itoa", + "pin-project 1.0.2", + "tokio 1.0.1", + "tower-service", + "tracing", + "want", +] + [[package]] name = "hyper-tls" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ - "bytes", - "hyper", + "bytes 0.5.6", + "hyper 0.13.9", "native-tls", "tokio 0.2.22", "tokio-tls", @@ -3491,7 +3529,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" dependencies = [ - "bytes", + "bytes 0.5.6", ] [[package]] @@ -3668,7 +3706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcaa8ea719de24e21fe6fddb2ea996ca4e312d467c119f827551c4768d97dc5c" dependencies = [ "base64 0.13.0", - "bytes", + "bytes 0.5.6", "chrono", "serde", "serde-value", @@ -3699,7 +3737,7 @@ checksum = "6585da8efec1a3b5df0fb12b357e2f3921cd7436a6d10f1ea06377d4cbd85032" dependencies = [ "Inflector", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "chrono", "dirs-next", "either", @@ -3924,7 +3962,7 @@ dependencies = [ name = "memsocket" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "diem-infallible", "diem-workspace-hack", "futures 0.3.8", @@ -4398,7 +4436,7 @@ dependencies = [ name = "netcore" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "diem-logger", "diem-network-address", "diem-types", @@ -4418,7 +4456,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "channel", "criterion", "diem-bitvec", @@ -5126,7 +5164,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212" dependencies = [ - "bytes", + "bytes 0.5.6", "prost-derive", ] @@ -5136,7 +5174,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26" dependencies = [ - "bytes", + "bytes 0.5.6", "heck", "itertools 0.8.2", "log", @@ -5167,7 +5205,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa" dependencies = [ - "bytes", + "bytes 0.5.6", "prost", ] @@ -5548,13 +5586,13 @@ checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" dependencies = [ "async-compression", "base64 0.13.0", - "bytes", + "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", "http", - "http-body", - "hyper", + "http-body 0.3.1", + "hyper 0.13.9", "hyper-tls", "ipnet", "js-sys", @@ -5625,7 +5663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7af1c42491edaa3b2582c6f3a0221f5ef4ed7a02c71cf1f614bb12877e1d44dd" dependencies = [ "async-trait", - "bytes", + "bytes 0.5.6", "futures 0.3.8", "rusoto_core", "serde_urlencoded 0.6.1", @@ -5640,11 +5678,11 @@ checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7" dependencies = [ "async-trait", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "crc32fast", "futures 0.3.8", "http", - "hyper", + "hyper 0.13.9", "hyper-tls", "lazy_static", "log", @@ -5670,7 +5708,7 @@ dependencies = [ "chrono", "dirs 2.0.2", "futures 0.3.8", - "hyper", + "hyper 0.13.9", "pin-project 0.4.27", "regex", "serde", @@ -5687,7 +5725,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1146e37a7c1df56471ea67825fe09bbbd37984b5f6e201d8b2e0be4ee15643d8" dependencies = [ "async-trait", - "bytes", + "bytes 0.5.6", "futures 0.3.8", "rusoto_core", "xml-rs", @@ -5700,12 +5738,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97a740a88dde8ded81b6f2cff9cd5e054a5a2e38a38397260f7acdd2c85d17dd" dependencies = [ "base64 0.12.3", - "bytes", + "bytes 0.5.6", "futures 0.3.8", "hex", "hmac 0.8.1", "http", - "hyper", + "hyper 0.13.9", "log", "md5", "percent-encoding", @@ -5725,7 +5763,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3815b8c0fc1c50caf9e87603f23daadfedb18d854de287b361c69f68dc9d49e0" dependencies = [ "async-trait", - "bytes", + "bytes 0.5.6", "chrono", "futures 0.3.8", "rusoto_core", @@ -6405,7 +6443,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "channel", "compiled-stdlib", "diem-config", @@ -6979,7 +7017,7 @@ version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "iovec", @@ -7009,6 +7047,16 @@ dependencies = [ "slab", ] +[[package]] +name = "tokio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d258221f566b6c803c7b4714abadc080172b272090cdc5e244a6d4dd13c3a6bd" +dependencies = [ + "autocfg 1.0.1", + "pin-project-lite 0.2.0", +] + [[package]] name = "tokio-executor" version = "0.1.10" @@ -7047,7 +7095,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edc5a2b13a713b9134debc9aa1265b0a1ccf6a81fa05af2ba26e4aee56cdf1a" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-core", "tokio 0.3.6", ] @@ -7093,7 +7141,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-core", "futures-io", "futures-sink", @@ -7221,7 +7269,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ "base64 0.12.3", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -7496,11 +7544,11 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f41be6df54c97904af01aa23e613d4521eed7ab23537cede692d4058f6449407" dependencies = [ - "bytes", + "bytes 0.5.6", "futures 0.3.8", "headers", "http", - "hyper", + "hyper 0.13.9", "log", "mime", "mime_guess", diff --git a/common/metrics/Cargo.toml b/common/metrics/Cargo.toml index 38e59b4929d6..a77786851f0d 100644 --- a/common/metrics/Cargo.toml +++ b/common/metrics/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] anyhow = "1.0.36" futures = "0.3.8" -hyper = "0.13.9" +hyper = "0.14.2" once_cell = "1.4.1" prometheus = { version = "0.11.0", default-features = false } serde_json = "1.0.60" diff --git a/json-rpc/Cargo.toml b/json-rpc/Cargo.toml index 919a7f5d6494..b012e8f60667 100644 --- a/json-rpc/Cargo.toml +++ b/json-rpc/Cargo.toml @@ -14,7 +14,7 @@ anyhow = "1.0.36" fail = "0.4.0" futures = "0.3.8" hex = "0.4.2" -hyper = "0.13.9" +hyper = "0.14.2" once_cell = "1.4.1" rand = "0.7.3" serde_json = "1.0.60" diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml index 806fa96ff832..0cca36322d9b 100644 --- a/storage/backup/backup-service/Cargo.toml +++ b/storage/backup/backup-service/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" anyhow = "1.0.36" bytes = "0.5.6" futures = "0.3.8" -hyper = "0.13.9" +hyper = "0.14.2" once_cell = "1.4.1" serde = { version = "1.0.117", default-features = false } tokio = { version = "0.2.22", features = ["full"] }