diff --git a/Cargo.lock b/Cargo.lock index ee0de5c7e5c8..f6035fc5d62a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,7 +178,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb1ff21a63d3262af46b9f33a826a8d134e2d0d9b2179c86034948b732ea8b2a" dependencies = [ - "bytes", + "bytes 0.5.6", "flate2", "futures-core", "memchr", @@ -243,7 +243,7 @@ dependencies = [ "backup-service", "bcs", "byteorder", - "bytes", + "bytes 0.5.6", "diem-config", "diem-crypto", "diem-infallible", @@ -268,13 +268,13 @@ dependencies = [ "proptest", "rand 0.7.3", "regex", - "reqwest", + "reqwest 0.11.8", "serde", "serde_json", "storage-interface", "structopt 0.3.21", - "tokio", - "tokio-util", + "tokio 0.2.22", + "tokio-util 0.3.1", "toml", ] @@ -284,7 +284,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "diem-config", "diem-crypto", "diem-logger", @@ -294,12 +294,12 @@ dependencies = [ "diem-workspace-hack", "diemdb", "futures 0.3.8", - "hyper", + "hyper 0.13.9", "once_cell", - "reqwest", + "reqwest 0.11.8", "serde", "storage-interface", - "tokio", + "tokio 0.2.22", "warp", ] @@ -460,7 +460,7 @@ version = "0.1.0" dependencies = [ "diem-workspace-hack", "futures 0.3.8", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -581,6 +581,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + [[package]] name = "c_linked_list" version = "1.1.1" @@ -657,7 +663,7 @@ dependencies = [ "diem-types", "diem-workspace-hack", "futures 0.3.8", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -741,13 +747,13 @@ dependencies = [ "num-traits", "once_cell", "proptest", - "reqwest", + "reqwest 0.11.8", "resource-viewer", "rust_decimal", "rustyline", "serde", "structopt 0.3.21", - "tokio", + "tokio 0.2.22", "transaction-builder", "walkdir", ] @@ -803,7 +809,7 @@ dependencies = [ "once_cell", "rand 0.7.3", "regex", - "reqwest", + "reqwest 0.11.8", "rusoto_autoscaling", "rusoto_core", "rusoto_s3", @@ -815,7 +821,7 @@ dependencies = [ "state-synchronizer", "structopt 0.3.21", "termion", - "tokio", + "tokio 0.2.22", "toml", "transaction-builder", ] @@ -906,7 +912,7 @@ dependencies = [ "async-trait", "bcs", "byteorder", - "bytes", + "bytes 0.5.6", "channel", "consensus-types", "diem-config", @@ -945,7 +951,7 @@ dependencies = [ "tempfile", "termion", "thiserror", - "tokio", + "tokio 0.2.22", "vm-genesis", "vm-validator", ] @@ -967,16 +973,6 @@ dependencies = [ "serde", ] -[[package]] -name = "console_error_panic_hook" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" -dependencies = [ - "cfg-if 0.1.10", - "wasm-bindgen", -] - [[package]] name = "const_fn" version = "0.4.4" @@ -1276,12 +1272,12 @@ name = "debug-interface" version = "0.1.0" dependencies = [ "anyhow", - "bytes", + "bytes 0.5.6", "diem-logger", "diem-metrics", "diem-workspace-hack", - "reqwest", - "tokio", + "reqwest 0.11.8", + "tokio 0.2.22", "warp", ] @@ -1356,7 +1352,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)", @@ -1444,9 +1440,9 @@ dependencies = [ "diem-workspace-hack", "futures 0.3.8", "hex", - "reqwest", + "reqwest 0.11.8", "structopt 0.3.21", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -1465,13 +1461,13 @@ dependencies = [ "generate-key", "hex", "move-core-types", - "reqwest", + "reqwest 0.11.8", "serde", "serde_derive", "serde_json", "structopt 0.3.21", "tempfile", - "tokio", + "tokio 0.2.22", "transaction-builder-generated", "warp", ] @@ -1636,19 +1632,19 @@ dependencies = [ "futures 0.3.8", "generate-key", "hex", - "hyper", + "hyper 0.13.9", "move-core-types", "move-vm-types", "network", "once_cell", "proptest", "rand 0.7.3", - "reqwest", + "reqwest 0.11.8", "scratchpad", "serde", "serde_json", "storage-interface", - "tokio", + "tokio 0.2.22", "transaction-builder-generated", "vm-genesis", "vm-validator", @@ -1670,10 +1666,10 @@ dependencies = [ "futures 0.3.8", "hex", "rand 0.7.3", - "reqwest", + "reqwest 0.11.8", "serde", "serde_json", - "tokio", + "tokio 0.2.22", "warp", ] @@ -1726,7 +1722,7 @@ dependencies = [ "serde", "storage-interface", "thiserror", - "tokio", + "tokio 0.2.22", "transaction-builder-generated", "vm-validator", ] @@ -1816,7 +1812,7 @@ dependencies = [ "storage-interface", "storage-service", "subscription-service", - "tokio", + "tokio 0.2.22", "vm-validator", ] @@ -1830,12 +1826,12 @@ dependencies = [ "diem-metrics-core", "diem-workspace-hack", "futures 0.3.8", - "hyper", + "hyper 0.13.9", "once_cell", "prometheus", "rusty-fork", "serde_json", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -1925,7 +1921,7 @@ dependencies = [ "storage-service", "structopt 0.3.21", "subscription-service", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -1971,7 +1967,7 @@ version = "0.1.0" dependencies = [ "diem-logger", "diem-workspace-hack", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -1995,7 +1991,7 @@ dependencies = [ "serde_json", "storage-interface", "thiserror", - "tokio", + "tokio 0.2.22", "ureq", "vm-validator", ] @@ -2103,7 +2099,7 @@ dependencies = [ "diem-temppath", "diem-types", "diem-workspace-hack", - "reqwest", + "reqwest 0.11.8", "structopt 0.3.21", "thiserror", ] @@ -2127,11 +2123,11 @@ dependencies = [ "diem-metrics", "diem-workspace-hack", "once_cell", - "reqwest", + "reqwest 0.11.8", "serde", "serde_json", "structopt 0.3.21", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -2166,7 +2162,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "chrono", "diem-crypto", "diem-crypto-derive", @@ -2202,7 +2198,7 @@ dependencies = [ "diem-types", "diem-workspace-hack", "diemdb", - "reqwest", + "reqwest 0.11.8", "scratchpad", "storage-interface", ] @@ -2279,7 +2275,7 @@ name = "diem-workspace-hack" version = "0.1.0" dependencies = [ "byteorder", - "bytes", + "bytes 0.5.6", "cc", "chrono", "itertools 0.9.0", @@ -3200,7 +3196,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", @@ -3208,12 +3204,31 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", - "tokio-util", + "tokio 0.2.22", + "tokio-util 0.3.1", "tracing", "tracing-futures", ] +[[package]] +name = "h2" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +dependencies = [ + "bytes 1.1.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio 1.18.2", + "tokio-util 0.7.1", + "tracing", +] + [[package]] name = "half" version = "1.6.0" @@ -3248,7 +3263,7 @@ checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" dependencies = [ "base64 0.12.3", "bitflags", - "bytes", + "bytes 0.5.6", "headers-core", "http", "mime", @@ -3336,7 +3351,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "itoa", ] @@ -3347,10 +3362,21 @@ 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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +dependencies = [ + "bytes 1.1.0", + "http", + "pin-project-lite 0.2.0", +] + [[package]] name = "httparse" version = "1.3.4" @@ -3384,19 +3410,43 @@ 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 0.2.7", + "http", + "http-body 0.3.1", + "httparse", + "httpdate", + "itoa", + "pin-project 1.0.2", + "socket2 0.3.15", + "tokio 0.2.22", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" +dependencies = [ + "bytes 1.1.0", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.13", "http", - "http-body", + "http-body 0.4.4", "httparse", "httpdate", "itoa", "pin-project 1.0.2", - "socket2", - "tokio", + "socket2 0.4.4", + "tokio 1.18.2", "tower-service", "tracing", "want", @@ -3408,13 +3458,26 @@ 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", + "tokio 0.2.22", "tokio-tls", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes 1.1.0", + "hyper 0.14.5", + "native-tls", + "tokio 1.18.2", + "tokio-native-tls", +] + [[package]] name = "idna" version = "0.2.0" @@ -3475,7 +3538,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" dependencies = [ - "bytes", + "bytes 0.5.6", ] [[package]] @@ -3639,7 +3702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57f95fd36c08ce592e67400a0f1a66f432196997d5a7e9a97e8743c33d8a9312" dependencies = [ "base64 0.12.3", - "bytes", + "bytes 0.5.6", "chrono", "serde", "serde-value", @@ -3670,7 +3733,7 @@ checksum = "f4f52dbe2c0e7ca54e43f1bc7b77b916750e63d7694e5a18c09b11307acc6b9d" dependencies = [ "Inflector", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "chrono", "dirs 3.0.1", "either", @@ -3681,14 +3744,14 @@ dependencies = [ "log", "openssl", "pem", - "reqwest", + "reqwest 0.10.10", "serde", "serde_json", "serde_yaml", "static_assertions", "thiserror", "time 0.2.23", - "tokio", + "tokio 0.2.22", "url", ] @@ -3780,9 +3843,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.81" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" +checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" [[package]] name = "libfuzzer-sys" @@ -3894,7 +3957,7 @@ dependencies = [ name = "memsocket" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "diem-infallible", "diem-workspace-hack", "futures 0.3.8", @@ -3946,6 +4009,18 @@ dependencies = [ "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + [[package]] name = "mio-named-pipes" version = "0.1.7" @@ -3953,7 +4028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", - "mio", + "mio 0.6.22", "miow 0.3.5", "winapi 0.3.9", ] @@ -3966,7 +4041,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.22", ] [[package]] @@ -3987,7 +4062,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" dependencies = [ - "socket2", + "socket2 0.3.15", "winapi 0.3.9", ] @@ -4208,7 +4283,7 @@ dependencies = [ "shell-words", "simplelog", "spec-lang", - "tokio", + "tokio 0.2.22", "toml", "vm", ] @@ -4329,9 +4404,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f" +checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" dependencies = [ "lazy_static", "libc", @@ -4366,7 +4441,7 @@ dependencies = [ name = "netcore" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "diem-logger", "diem-network-address", "diem-types", @@ -4375,7 +4450,7 @@ dependencies = [ "memsocket", "pin-project 1.0.2", "serde", - "tokio", + "tokio 0.2.22", "url", ] @@ -4385,7 +4460,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "channel", "criterion", "diem-bitvec", @@ -4418,9 +4493,9 @@ dependencies = [ "short-hex-str", "socket-bench-server", "thiserror", - "tokio", + "tokio 0.2.22", "tokio-retry", - "tokio-util", + "tokio-util 0.3.1", ] [[package]] @@ -4446,7 +4521,7 @@ dependencies = [ "rand 0.7.3", "serde", "subscription-service", - "tokio", + "tokio 0.2.22", "tokio-retry", ] @@ -4470,7 +4545,7 @@ dependencies = [ "network", "once_cell", "subscription-service", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -5093,7 +5168,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", ] @@ -5103,7 +5178,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", @@ -5134,7 +5209,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa" dependencies = [ - "bytes", + "bytes 0.5.6", "prost", ] @@ -5501,20 +5576,20 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.10.9" +version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce" +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" dependencies = [ "async-compression", "base64 0.13.0", - "bytes", + "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", "http", - "http-body", - "hyper", - "hyper-tls", + "http-body 0.3.1", + "hyper 0.13.9", + "hyper-tls 0.4.3", "ipnet", "js-sys", "lazy_static", @@ -5527,12 +5602,47 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.0", - "tokio", + "tokio 0.2.22", "tokio-tls", "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-bindgen-test", + "web-sys", + "winreg", +] + +[[package]] +name = "reqwest" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c4e0a76dc12a116108933f6301b95e83634e0c47b0afbed6abbaa0601e99258" +dependencies = [ + "base64 0.13.0", + "bytes 1.1.0", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body 0.4.4", + "hyper 0.14.5", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "native-tls", + "percent-encoding", + "pin-project-lite 0.2.0", + "serde", + "serde_json", + "serde_urlencoded 0.7.0", + "tokio 1.18.2", + "tokio-native-tls", + "tokio-util 0.6.9", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", "web-sys", "winreg", ] @@ -5585,7 +5695,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", @@ -5600,12 +5710,12 @@ checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7" dependencies = [ "async-trait", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "crc32fast", "futures 0.3.8", "http", - "hyper", - "hyper-tls", + "hyper 0.13.9", + "hyper-tls 0.4.3", "lazy_static", "log", "md5", @@ -5616,7 +5726,7 @@ dependencies = [ "rustc_version", "serde", "serde_json", - "tokio", + "tokio 0.2.22", "xml-rs", ] @@ -5630,13 +5740,13 @@ dependencies = [ "chrono", "dirs 2.0.2", "futures 0.3.8", - "hyper", + "hyper 0.13.9", "pin-project 0.4.27", "regex", "serde", "serde_json", "shlex", - "tokio", + "tokio 0.2.22", "zeroize", ] @@ -5647,7 +5757,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", @@ -5660,12 +5770,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", @@ -5675,7 +5785,7 @@ dependencies = [ "serde", "sha2", "time 0.2.23", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -5685,7 +5795,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", @@ -6277,7 +6387,7 @@ dependencies = [ "rust_decimal", "rusty-fork", "statistical", - "tokio", + "tokio 0.2.22", "transaction-builder", ] @@ -6297,8 +6407,8 @@ dependencies = [ "network", "network-builder", "rand 0.7.3", - "tokio", - "tokio-util", + "tokio 0.2.22", + "tokio-util 0.3.1", ] [[package]] @@ -6313,6 +6423,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "spec-lang" version = "0.1.0" @@ -6359,7 +6479,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "channel", "compiled-stdlib", "diem-config", @@ -6393,7 +6513,7 @@ dependencies = [ "storage-interface", "storage-service", "subscription-service", - "tokio", + "tokio 0.2.22", "transaction-builder", "vm-genesis", ] @@ -6546,7 +6666,7 @@ dependencies = [ "rand 0.7.3", "storage-client", "storage-interface", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -6909,14 +7029,14 @@ 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", "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.22", "mio-named-pipes", "mio-uds", "num_cpus", @@ -6927,6 +7047,23 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "1.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" +dependencies = [ + "bytes 1.1.0", + "libc", + "memchr", + "mio 0.8.3", + "num_cpus", + "once_cell", + "pin-project-lite 0.2.0", + "socket2 0.4.4", + "winapi 0.3.9", +] + [[package]] name = "tokio-executor" version = "0.1.10" @@ -6948,6 +7085,16 @@ dependencies = [ "syn 1.0.53", ] +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio 1.18.2", +] + [[package]] name = "tokio-retry" version = "0.2.0" @@ -6978,7 +7125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -6990,7 +7137,7 @@ dependencies = [ "futures-util", "log", "pin-project 0.4.27", - "tokio", + "tokio 0.2.22", "tungstenite", ] @@ -7000,13 +7147,41 @@ 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", "log", "pin-project-lite 0.1.11", - "tokio", + "tokio 0.2.22", +] + +[[package]] +name = "tokio-util" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +dependencies = [ + "bytes 1.1.0", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.2.0", + "tokio 1.18.2", +] + +[[package]] +name = "tokio-util" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +dependencies = [ + "bytes 1.1.0", + "futures-core", + "futures-sink", + "pin-project-lite 0.2.0", + "tokio 1.18.2", + "tracing", ] [[package]] @@ -7026,21 +7201,33 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" -version = "0.1.21" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" +checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "log", - "pin-project-lite 0.1.11", + "pin-project-lite 0.2.0", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.53", +] + [[package]] name = "tracing-core" -version = "0.1.17" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", ] @@ -7128,7 +7315,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ "base64 0.12.3", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -7403,11 +7590,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", @@ -7417,7 +7604,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.6.1", - "tokio", + "tokio 0.2.22", "tokio-tungstenite", "tower-service", "tracing", @@ -7437,6 +7624,12 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.69" @@ -7505,30 +7698,6 @@ version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" -[[package]] -name = "wasm-bindgen-test" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d1cdc8b98a557f24733d50a1199c4b0635e465eecba9c45b214544da197f64" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fb9c67be7439ee8ab1b7db502a49c05e51e2835b66796c705134d9b8e1a585" -dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", -] - [[package]] name = "web-sys" version = "0.3.45" @@ -7601,6 +7770,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "winreg" version = "0.7.0" diff --git a/client/faucet/Cargo.toml b/client/faucet/Cargo.toml index d8eb6385f72b..78655d5277e7 100644 --- a/client/faucet/Cargo.toml +++ b/client/faucet/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" hex = "0.4.2" -reqwest = { version = "0.10.9", features = ["blocking"], default-features = false } +reqwest = { version = "0.11.8", features = ["blocking"], default-features = false } serde = "1.0.117" serde_derive = "1.0.117" structopt = "0.3.21" diff --git a/client/json-rpc/Cargo.toml b/client/json-rpc/Cargo.toml index 7e68f8ad3147..137c00f9bd2e 100644 --- a/client/json-rpc/Cargo.toml +++ b/client/json-rpc/Cargo.toml @@ -15,7 +15,7 @@ async-trait = "0.1.42" futures = "0.3.8" hex = "0.4.2" rand = "0.7.3" -reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false } +reqwest = { version = "0.11.8", features = ["blocking", "json"], default_features = false } serde = { version = "1.0.117", default-features = false } serde_json = "1.0.60" tokio = { version = "0.2.22", features = ["full"] } diff --git a/common/debug-interface/Cargo.toml b/common/debug-interface/Cargo.toml index ee634b261cce..7b5e7ca49f04 100644 --- a/common/debug-interface/Cargo.toml +++ b/common/debug-interface/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" anyhow = "1.0.34" bytes = "0.5.6" tokio = { version = "0.2.22", features = ["full"] } -reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false } +reqwest = { version = "0.11.8", features = ["blocking", "json"], default_features = false } warp = "0.2.5" diem-logger = { path = "../logger", version = "0.1.0" } diff --git a/common/trace/Cargo.toml b/common/trace/Cargo.toml index 0e4317acab88..1618be31c2ef 100644 --- a/common/trace/Cargo.toml +++ b/common/trace/Cargo.toml @@ -16,7 +16,7 @@ tokio = { version = "0.2.22", features = ["full"] } serde_json = "1.0.60" serde = "1.0.117" anyhow = "1.0.34" -reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false } +reqwest = { version = "0.11.8", features = ["blocking", "json"], default_features = false } once_cell = "1.4.1" diem-logger = { path = "../../common/logger", version = "0.1.0" } diff --git a/json-rpc/Cargo.toml b/json-rpc/Cargo.toml index 3e16b9d458cf..d5dfbe25cf4e 100644 --- a/json-rpc/Cargo.toml +++ b/json-rpc/Cargo.toml @@ -21,7 +21,7 @@ serde_json = "1.0.60" serde = { version = "1.0.117", default-features = false } tokio = { version = "0.2.22", features = ["full"] } warp = "0.2.5" -reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false, optional = true } +reqwest = { version = "0.11.8", features = ["blocking", "json"], default_features = false, optional = true } proptest = { version = "0.10.1", optional = true } bcs = "0.1.1" @@ -43,7 +43,7 @@ storage-interface = { path = "../storage/storage-interface", version = "0.1.0" } [dev-dependencies] proptest = "0.10.1" -reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false } +reqwest = { version = "0.11.8", features = ["blocking", "json"], default_features = false } rand = { version = "0.7.3" } generate-key = { path = "../config/generate-key", version = "0.1.0" } diff --git a/language/diem-tools/diem-events-fetcher/Cargo.toml b/language/diem-tools/diem-events-fetcher/Cargo.toml index 83792e703499..1ba5a32c396e 100644 --- a/language/diem-tools/diem-events-fetcher/Cargo.toml +++ b/language/diem-tools/diem-events-fetcher/Cargo.toml @@ -14,7 +14,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" hex = "0.4.2" -reqwest = { version = "0.10.9", features = ["blocking", "json"] } +reqwest = { version = "0.11.8", features = ["blocking", "json"] } structopt = "0.3.21" futures = "0.3.8" tokio = { version = "0.2.22", features = ["full"] } diff --git a/language/diem-tools/diem-validator-interface/Cargo.toml b/language/diem-tools/diem-validator-interface/Cargo.toml index a076e3d6df6a..25c075817efe 100644 --- a/language/diem-tools/diem-validator-interface/Cargo.toml +++ b/language/diem-tools/diem-validator-interface/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -reqwest = { version = "0.10.9", features = ["blocking", "json"] } +reqwest = { version = "0.11.8", features = ["blocking", "json"] } anyhow = "1.0.34" diem-config = { path = "../../../config", version = "0.1.0" } diem-json-rpc-client = { path = "../../../client/json-rpc", version = "0.1.0" } diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml index 0881f975ca99..4ca8fdbf7c18 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -21,7 +21,7 @@ once_cell = "1.4.1" pin-project = "1.0.2" rand = "0.7.3" regex = "1.4.2" -reqwest = { version = "0.10.9", features = ["stream"], default-features = false } +reqwest = { version = "0.11.8", features = ["stream"], default-features = false } serde = { version = "1.0.117", features = ["derive"] } serde_json = "1.0.60" structopt = "0.3.21" diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml index 0ef45910d40d..81aacb98b4ce 100644 --- a/storage/backup/backup-service/Cargo.toml +++ b/storage/backup/backup-service/Cargo.toml @@ -32,7 +32,7 @@ diemdb = { path = "../../diemdb", version = "0.1.0", features = ["fuzzing"] } diem-config = { path = "../../../config", version = "0.1.0" } diem-temppath = { path = "../../../common/temppath", version = "0.1.0" } -reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false } +reqwest = { version = "0.11.8", features = ["blocking", "json"], default_features = false } [features] fuzzing = ["diemdb/fuzzing"] diff --git a/testsuite/cli/Cargo.toml b/testsuite/cli/Cargo.toml index a014b50148ec..7cdf9fe3736f 100644 --- a/testsuite/cli/Cargo.toml +++ b/testsuite/cli/Cargo.toml @@ -18,7 +18,7 @@ rustyline = "7.0.0" rust_decimal = "1.8.1" num-traits = "0.2.14" once_cell = "1.4.1" -reqwest = { version = "0.10.9", features = ["blocking", "json"] } +reqwest = { version = "0.11.8", features = ["blocking", "json"] } serde = { version = "1.0.117", features = ["derive"] } structopt = "0.3.21" tokio = { version = "0.2.22", features = ["full"] } diff --git a/testsuite/cluster-test/Cargo.toml b/testsuite/cluster-test/Cargo.toml index 342510e5a2f9..cfa3c32b3ae9 100644 --- a/testsuite/cluster-test/Cargo.toml +++ b/testsuite/cluster-test/Cargo.toml @@ -17,7 +17,7 @@ itertools = "0.9.0" once_cell = "1.4.1" rand = "0.7.3" regex = { version = "1.4.2", default-features = false, features = ["std", "perf"] } -reqwest = { version = "0.10.9", features = ["blocking", "json"] } +reqwest = { version = "0.11.8", features = ["blocking", "json"] } serde_json = "1.0.60" serde_yaml = "0.8.14" termion = "1.5.5" diff --git a/testsuite/diem-swarm/Cargo.toml b/testsuite/diem-swarm/Cargo.toml index 3328fbac6087..e7991902e98a 100644 --- a/testsuite/diem-swarm/Cargo.toml +++ b/testsuite/diem-swarm/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" ctrlc = { version = "3.1.7", default-features = false } -reqwest = { version = "0.10.9", features = ["blocking"], default-features = false } +reqwest = { version = "0.11.8", features = ["blocking"], default-features = false } structopt = "0.3.21" thiserror = "1.0.22" diem-config = { path = "../../config", version = "0.1.0", features = ["fuzzing"] }