diff --git a/Cargo.lock b/Cargo.lock index ee0de5c7e5c8..519bd6b4964c 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", @@ -193,7 +193,7 @@ checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -215,9 +215,9 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" @@ -243,7 +243,7 @@ dependencies = [ "backup-service", "bcs", "byteorder", - "bytes", + "bytes 0.5.6", "diem-config", "diem-crypto", "diem-infallible", @@ -273,7 +273,7 @@ dependencies = [ "serde_json", "storage-interface", "structopt 0.3.21", - "tokio", + "tokio 1.19.2", "tokio-util", "toml", ] @@ -284,7 +284,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "diem-config", "diem-crypto", "diem-logger", @@ -299,7 +299,7 @@ dependencies = [ "reqwest", "serde", "storage-interface", - "tokio", + "tokio 1.19.2", "warp", ] @@ -460,7 +460,7 @@ version = "0.1.0" dependencies = [ "diem-workspace-hack", "futures 0.3.8", - "tokio", + "tokio 1.19.2", ] [[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 1.19.2", ] [[package]] @@ -747,7 +753,7 @@ dependencies = [ "rustyline", "serde", "structopt 0.3.21", - "tokio", + "tokio 1.19.2", "transaction-builder", "walkdir", ] @@ -815,7 +821,7 @@ dependencies = [ "state-synchronizer", "structopt 0.3.21", "termion", - "tokio", + "tokio 1.19.2", "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 1.19.2", "vm-genesis", "vm-validator", ] @@ -1132,7 +1138,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "cfg-if 0.1.10", "lazy_static", ] @@ -1143,7 +1149,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "cfg-if 1.0.0", "const_fn", "lazy_static", @@ -1276,12 +1282,12 @@ name = "debug-interface" version = "0.1.0" dependencies = [ "anyhow", - "bytes", + "bytes 0.5.6", "diem-logger", "diem-metrics", "diem-workspace-hack", "reqwest", - "tokio", + "tokio 1.19.2", "warp", ] @@ -1356,7 +1362,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)", @@ -1398,7 +1404,7 @@ dependencies = [ "diem-workspace-hack", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -1446,7 +1452,7 @@ dependencies = [ "hex", "reqwest", "structopt 0.3.21", - "tokio", + "tokio 1.19.2", ] [[package]] @@ -1471,7 +1477,7 @@ dependencies = [ "serde_json", "structopt 0.3.21", "tempfile", - "tokio", + "tokio 1.19.2", "transaction-builder-generated", "warp", ] @@ -1648,7 +1654,7 @@ dependencies = [ "serde", "serde_json", "storage-interface", - "tokio", + "tokio 1.19.2", "transaction-builder-generated", "vm-genesis", "vm-validator", @@ -1673,7 +1679,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tokio", + "tokio 1.19.2", "warp", ] @@ -1726,7 +1732,7 @@ dependencies = [ "serde", "storage-interface", "thiserror", - "tokio", + "tokio 1.19.2", "transaction-builder-generated", "vm-validator", ] @@ -1738,7 +1744,7 @@ dependencies = [ "diem-workspace-hack", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -1816,7 +1822,7 @@ dependencies = [ "storage-interface", "storage-service", "subscription-service", - "tokio", + "tokio 1.19.2", "vm-validator", ] @@ -1835,7 +1841,7 @@ dependencies = [ "prometheus", "rusty-fork", "serde_json", - "tokio", + "tokio 1.19.2", ] [[package]] @@ -1925,7 +1931,7 @@ dependencies = [ "storage-service", "structopt 0.3.21", "subscription-service", - "tokio", + "tokio 1.19.2", ] [[package]] @@ -1971,7 +1977,7 @@ version = "0.1.0" dependencies = [ "diem-logger", "diem-workspace-hack", - "tokio", + "tokio 1.19.2", ] [[package]] @@ -1995,7 +2001,7 @@ dependencies = [ "serde_json", "storage-interface", "thiserror", - "tokio", + "tokio 1.19.2", "ureq", "vm-validator", ] @@ -2131,7 +2137,7 @@ dependencies = [ "serde", "serde_json", "structopt 0.3.21", - "tokio", + "tokio 1.19.2", ] [[package]] @@ -2166,7 +2172,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "chrono", "diem-crypto", "diem-crypto-derive", @@ -2279,7 +2285,7 @@ name = "diem-workspace-hack" version = "0.1.0" dependencies = [ "byteorder", - "bytes", + "bytes 0.5.6", "cc", "chrono", "itertools 0.9.0", @@ -2293,7 +2299,7 @@ dependencies = [ "serde", "sha-1 0.9.2", "subtle", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -2565,7 +2571,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -2961,7 +2967,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -3200,7 +3206,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,7 +3214,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.25", "tokio-util", "tracing", "tracing-futures", @@ -3248,7 +3254,7 @@ checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" dependencies = [ "base64 0.12.3", "bitflags", - "bytes", + "bytes 0.5.6", "headers-core", "http", "mime", @@ -3336,7 +3342,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,7 +3353,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes", + "bytes 0.5.6", "http", ] @@ -3384,7 +3390,7 @@ 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", @@ -3395,8 +3401,8 @@ dependencies = [ "httpdate", "itoa", "pin-project 1.0.2", - "socket2", - "tokio", + "socket2 0.3.15", + "tokio 0.2.25", "tower-service", "tracing", "want", @@ -3408,10 +3414,10 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ - "bytes", + "bytes 0.5.6", "hyper", "native-tls", - "tokio", + "tokio 0.2.25", "tokio-tls", ] @@ -3447,7 +3453,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -3456,7 +3462,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "hashbrown", ] @@ -3475,7 +3481,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 +3645,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 +3676,7 @@ checksum = "f4f52dbe2c0e7ca54e43f1bc7b77b916750e63d7694e5a18c09b11307acc6b9d" dependencies = [ "Inflector", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "chrono", "dirs 3.0.1", "either", @@ -3688,7 +3694,7 @@ dependencies = [ "static_assertions", "thiserror", "time 0.2.23", - "tokio", + "tokio 0.2.25", "url", ] @@ -3780,9 +3786,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.81" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libfuzzer-sys" @@ -3824,10 +3830,11 @@ checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" [[package]] name = "lock_api" -version = "0.4.2" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg 1.1.0", "scopeguard", ] @@ -3887,14 +3894,14 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", ] [[package]] name = "memsocket" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "diem-infallible", "diem-workspace-hack", "futures 0.3.8", @@ -3924,14 +3931,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" dependencies = [ "adler", - "autocfg 1.0.1", + "autocfg 1.1.0", ] [[package]] name = "mio" -version = "0.6.22" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" dependencies = [ "cfg-if 0.1.10", "fuchsia-zircon", @@ -3940,12 +3947,24 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow 0.2.1", + "miow 0.2.2", "net2", "slab", "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 +3972,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", - "mio", + "mio 0.6.23", "miow 0.3.5", "winapi 0.3.9", ] @@ -3966,14 +3985,14 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] name = "miow" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" dependencies = [ "kernel32-sys", "net2", @@ -3987,7 +4006,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 +4227,7 @@ dependencies = [ "shell-words", "simplelog", "spec-lang", - "tokio", + "tokio 1.19.2", "toml", "vm", ] @@ -4366,7 +4385,7 @@ dependencies = [ name = "netcore" version = "0.1.0" dependencies = [ - "bytes", + "bytes 0.5.6", "diem-logger", "diem-network-address", "diem-types", @@ -4375,7 +4394,7 @@ dependencies = [ "memsocket", "pin-project 1.0.2", "serde", - "tokio", + "tokio 1.19.2", "url", ] @@ -4385,7 +4404,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "channel", "criterion", "diem-bitvec", @@ -4418,7 +4437,7 @@ dependencies = [ "short-hex-str", "socket-bench-server", "thiserror", - "tokio", + "tokio 1.19.2", "tokio-retry", "tokio-util", ] @@ -4446,7 +4465,7 @@ dependencies = [ "rand 0.7.3", "serde", "subscription-service", - "tokio", + "tokio 1.19.2", "tokio-retry", ] @@ -4470,7 +4489,7 @@ dependencies = [ "network", "once_cell", "subscription-service", - "tokio", + "tokio 1.19.2", ] [[package]] @@ -4541,7 +4560,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-integer", "num-traits", ] @@ -4552,7 +4571,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-integer", "num-traits", ] @@ -4563,7 +4582,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-traits", ] @@ -4584,7 +4603,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -4593,7 +4612,7 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-traits", ] @@ -4603,7 +4622,7 @@ version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-integer", "num-traits", ] @@ -4614,7 +4633,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-bigint 0.2.6", "num-integer", "num-traits", @@ -4626,7 +4645,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-bigint 0.3.1", "num-integer", "num-traits", @@ -4638,7 +4657,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", ] [[package]] @@ -4648,7 +4667,7 @@ dependencies = [ "diem-workspace-hack", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -4723,7 +4742,7 @@ version = "0.9.58" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "cc", "libc", "pkg-config", @@ -4747,7 +4766,17 @@ checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.1", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.3", ] [[package]] @@ -4759,11 +4788,24 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.1.57", "smallvec", "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.13", + "smallvec", + "windows-sys", +] + [[package]] name = "pathdiff" version = "0.2.0" @@ -4837,7 +4879,7 @@ dependencies = [ "pest_meta", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -4887,7 +4929,7 @@ checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -4898,7 +4940,7 @@ checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -4997,7 +5039,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", "version_check", ] @@ -5051,7 +5093,7 @@ dependencies = [ "cfg-if 1.0.0", "fnv", "lazy_static", - "parking_lot", + "parking_lot 0.11.0", "regex", "thiserror", ] @@ -5093,7 +5135,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 +5145,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", @@ -5125,7 +5167,7 @@ dependencies = [ "itertools 0.8.2", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -5134,7 +5176,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa" dependencies = [ - "bytes", + "bytes 0.5.6", "prost", ] @@ -5368,7 +5410,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "crossbeam-deque", "either", "rayon-core", @@ -5402,13 +5444,22 @@ version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +[[package]] +name = "redox_syscall" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_termios" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" dependencies = [ - "redox_syscall", + "redox_syscall 0.1.57", ] [[package]] @@ -5418,7 +5469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ "getrandom 0.1.15", - "redox_syscall", + "redox_syscall 0.1.57", "rust-argon2", ] @@ -5439,7 +5490,7 @@ checksum = "0c523ccaed8ac4b0288948849a350b37d3035827413c458b6a40ddb614bb4f72" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -5496,7 +5547,7 @@ checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -5507,7 +5558,7 @@ checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce" dependencies = [ "async-compression", "base64 0.13.0", - "bytes", + "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", @@ -5527,7 +5578,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.0", - "tokio", + "tokio 0.2.25", "tokio-tls", "url", "wasm-bindgen", @@ -5585,7 +5636,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,7 +5651,7 @@ checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7" dependencies = [ "async-trait", "base64 0.12.3", - "bytes", + "bytes 0.5.6", "crc32fast", "futures 0.3.8", "http", @@ -5616,7 +5667,7 @@ dependencies = [ "rustc_version", "serde", "serde_json", - "tokio", + "tokio 0.2.25", "xml-rs", ] @@ -5636,7 +5687,7 @@ dependencies = [ "serde", "serde_json", "shlex", - "tokio", + "tokio 0.2.25", "zeroize", ] @@ -5647,7 +5698,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,7 +5711,7 @@ 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", @@ -5675,7 +5726,7 @@ dependencies = [ "serde", "sha2", "time 0.2.23", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -5685,7 +5736,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", @@ -6035,7 +6086,7 @@ checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -6092,7 +6143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d" dependencies = [ "lazy_static", - "parking_lot", + "parking_lot 0.11.0", "serial_test_derive", ] @@ -6104,7 +6155,7 @@ checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -6231,9 +6282,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "smallvec" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "smoke-test" @@ -6277,7 +6328,7 @@ dependencies = [ "rust_decimal", "rusty-fork", "statistical", - "tokio", + "tokio 1.19.2", "transaction-builder", ] @@ -6297,7 +6348,7 @@ dependencies = [ "network", "network-builder", "rand 0.7.3", - "tokio", + "tokio 1.19.2", "tokio-util", ] @@ -6309,7 +6360,17 @@ checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44" dependencies = [ "cfg-if 0.1.10", "libc", - "redox_syscall", + "redox_syscall 0.1.57", + "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", ] @@ -6359,7 +6420,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bcs", - "bytes", + "bytes 0.5.6", "channel", "compiled-stdlib", "diem-config", @@ -6393,7 +6454,7 @@ dependencies = [ "storage-interface", "storage-service", "subscription-service", - "tokio", + "tokio 1.19.2", "transaction-builder", "vm-genesis", ] @@ -6466,7 +6527,7 @@ dependencies = [ "quote 1.0.7", "serde", "serde_derive", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -6482,7 +6543,7 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -6546,7 +6607,7 @@ dependencies = [ "rand 0.7.3", "storage-client", "storage-interface", - "tokio", + "tokio 1.19.2", ] [[package]] @@ -6598,7 +6659,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -6653,9 +6714,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.53" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8833e20724c24de12bbaba5ad230ea61c3eafb05b881c7c9d3cfe8638b187e68" +checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -6670,7 +6731,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", "unicode-xid 0.2.1", ] @@ -6699,7 +6760,7 @@ dependencies = [ "cfg-if 0.1.10", "libc", "rand 0.7.3", - "redox_syscall", + "redox_syscall 0.1.57", "remove_dir_all", "winapi 0.3.9", ] @@ -6742,7 +6803,7 @@ checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905" dependencies = [ "libc", "numtoa", - "redox_syscall", + "redox_syscall 0.1.57", "redox_termios", ] @@ -6808,7 +6869,7 @@ checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -6866,7 +6927,7 @@ dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", "standback", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -6905,25 +6966,45 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "iovec", "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.23", "mio-named-pipes", "mio-uds", "num_cpus", "pin-project-lite 0.1.11", "signal-hook-registry", "slab", - "tokio-macros", + "tokio-macros 0.2.6", + "winapi 0.3.9", +] + +[[package]] +name = "tokio" +version = "1.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" +dependencies = [ + "bytes 1.1.0", + "libc", + "memchr", + "mio 0.8.3", + "num_cpus", + "once_cell", + "parking_lot 0.12.1", + "pin-project-lite 0.2.0", + "signal-hook-registry", + "socket2 0.4.4", + "tokio-macros 1.8.0", "winapi 0.3.9", ] @@ -6939,13 +7020,24 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "0.2.5" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.67", +] + +[[package]] +name = "tokio-macros" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", ] [[package]] @@ -6978,7 +7070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -6990,7 +7082,7 @@ dependencies = [ "futures-util", "log", "pin-project 0.4.27", - "tokio", + "tokio 0.2.25", "tungstenite", ] @@ -7000,13 +7092,13 @@ 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.25", ] [[package]] @@ -7128,7 +7220,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ "base64 0.12.3", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -7403,7 +7495,7 @@ 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", @@ -7417,7 +7509,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.6.1", - "tokio", + "tokio 0.2.25", "tokio-tungstenite", "tower-service", "tracing", @@ -7437,6 +7529,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" @@ -7460,7 +7558,7 @@ dependencies = [ "log", "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", "wasm-bindgen-shared", ] @@ -7494,7 +7592,7 @@ checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7601,6 +7699,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" @@ -7732,6 +7873,6 @@ checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.53", + "syn 1.0.67", "synstructure", ] diff --git a/client/faucet/Cargo.toml b/client/faucet/Cargo.toml index d8eb6385f72b..9abed73667c3 100644 --- a/client/faucet/Cargo.toml +++ b/client/faucet/Cargo.toml @@ -16,7 +16,7 @@ reqwest = { version = "0.10.9", features = ["blocking"], default-features = fals serde = "1.0.117" serde_derive = "1.0.117" structopt = "0.3.21" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } warp = "0.2.5" generate-key = { path = "../../config/generate-key", version = "0.1.0" } diff --git a/client/json-rpc/Cargo.toml b/client/json-rpc/Cargo.toml index 7e68f8ad3147..be2e03a7ef92 100644 --- a/client/json-rpc/Cargo.toml +++ b/client/json-rpc/Cargo.toml @@ -18,7 +18,7 @@ rand = "0.7.3" reqwest = { version = "0.10.9", 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"] } +tokio = { version = "1.19.2", features = ["full"] } diem-crypto = { path = "../../crypto/crypto", version = "0.1.0" } bcs = "0.1.1" diff --git a/common/bounded-executor/Cargo.toml b/common/bounded-executor/Cargo.toml index dcd03f30c059..d89d3946147b 100644 --- a/common/bounded-executor/Cargo.toml +++ b/common/bounded-executor/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] futures = "0.3.8" diem-workspace-hack = { path = "../workspace-hack", version = "0.1.0" } -tokio = { version = "0.2.22", features = ["sync"] } +tokio = { version = "1.19.2", features = ["sync"] } [dev-dependencies] -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } diff --git a/common/channel/Cargo.toml b/common/channel/Cargo.toml index d0042378e9ec..3d8199a2c38a 100644 --- a/common/channel/Cargo.toml +++ b/common/channel/Cargo.toml @@ -18,4 +18,4 @@ diem-workspace-hack = { path = "../workspace-hack", version = "0.1.0" } [dev-dependencies] diem-types = { path = "../../types", version = "0.1.0" } -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } diff --git a/common/debug-interface/Cargo.toml b/common/debug-interface/Cargo.toml index ee634b261cce..cf9c06226a3b 100644 --- a/common/debug-interface/Cargo.toml +++ b/common/debug-interface/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" bytes = "0.5.6" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false } warp = "0.2.5" diff --git a/common/metrics/Cargo.toml b/common/metrics/Cargo.toml index 94a8c9b7a022..1b339d300160 100644 --- a/common/metrics/Cargo.toml +++ b/common/metrics/Cargo.toml @@ -16,7 +16,7 @@ hyper = "0.13.9" once_cell = "1.4.1" prometheus = { version = "0.11.0", default-features = false } serde_json = "1.0.60" -tokio = "0.2.22" +tokio = "1.19.2" diem-logger = { path = "../logger", version = "0.1.0" } diem-metrics-core = { path = "../metrics-core", version = "0.1.0" } diff --git a/common/retrier/Cargo.toml b/common/retrier/Cargo.toml index 7c613e9793d3..e5bfe13469ba 100644 --- a/common/retrier/Cargo.toml +++ b/common/retrier/Cargo.toml @@ -11,5 +11,5 @@ edition = "2018" [dependencies] diem-workspace-hack = { path = "..//workspace-hack", version = "0.1.0" } -tokio = { version = "0.2.22", features = ["time"] } +tokio = { version = "1.19.2", features = ["time"] } diem-logger = { path = "../../common/logger", version = "0.1.0"} diff --git a/common/trace/Cargo.toml b/common/trace/Cargo.toml index 0e4317acab88..26c645fe1bbb 100644 --- a/common/trace/Cargo.toml +++ b/common/trace/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] chrono = "0.4.19" structopt = "0.3.21" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } serde_json = "1.0.60" serde = "1.0.117" anyhow = "1.0.34" diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index d359dc0d2c26..9d242517570b 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -27,7 +27,7 @@ serde = { version = "1.0.117", default-features = false } serde_json = "1.0.60" termion = { version = "1.5.5", default-features = false } thiserror = "1.0.22" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } channel = { path = "../common/channel", version = "0.1.0" } consensus-types = { path = "consensus-types", version = "0.1.0", default-features = false } diff --git a/diem-node/Cargo.toml b/diem-node/Cargo.toml index 66f4b18e8004..454968e43856 100644 --- a/diem-node/Cargo.toml +++ b/diem-node/Cargo.toml @@ -14,7 +14,7 @@ fail = "0.4.0" futures = "0.3.8" jemallocator = { version = "0.3.2", features = ["profiling", "unprefixed_malloc_on_supported_platforms"] } structopt = "0.3.21" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } backup-service = { path = "../storage/backup/backup-service", version = "0.1.0" } consensus = { path = "../consensus", version = "0.1.0" } diff --git a/json-rpc/Cargo.toml b/json-rpc/Cargo.toml index 3e16b9d458cf..ae5fc9dadf28 100644 --- a/json-rpc/Cargo.toml +++ b/json-rpc/Cargo.toml @@ -19,7 +19,7 @@ once_cell = "1.4.1" rand = "0.7.3" serde_json = "1.0.60" serde = { version = "1.0.117", default-features = false } -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } warp = "0.2.5" reqwest = { version = "0.10.9", features = ["blocking", "json"], default_features = false, optional = true } proptest = { version = "0.10.1", optional = true } diff --git a/language/diem-tools/diem-events-fetcher/Cargo.toml b/language/diem-tools/diem-events-fetcher/Cargo.toml index 83792e703499..5ec317c8385c 100644 --- a/language/diem-tools/diem-events-fetcher/Cargo.toml +++ b/language/diem-tools/diem-events-fetcher/Cargo.toml @@ -17,7 +17,7 @@ hex = "0.4.2" reqwest = { version = "0.10.9", features = ["blocking", "json"] } structopt = "0.3.21" futures = "0.3.8" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } diem-workspace-hack = { path = "../../../common/workspace-hack", version = "0.1.0" } diem-json-rpc-client = { path = "../../../client/json-rpc", version = "0.1.0" } diff --git a/language/move-prover/Cargo.toml b/language/move-prover/Cargo.toml index 1e926144f975..dfaca8cc1ee1 100644 --- a/language/move-prover/Cargo.toml +++ b/language/move-prover/Cargo.toml @@ -40,7 +40,7 @@ serde = { version = "1.0.117", features = ["derive"] } serde_json = "1.0.60" simplelog = "0.8.0" once_cell = "1.4.1" -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "1.19", features = ["full"] } toml = "0.5.7" [dev-dependencies] diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml index b5576b216bcb..a6ee14fda97f 100644 --- a/mempool/Cargo.toml +++ b/mempool/Cargo.toml @@ -18,7 +18,7 @@ once_cell = "1.4.1" proptest = { version = "0.10.1", optional = true } rayon = "1.4.1" serde = { version = "1.0.117", default-features = false } -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } bounded-executor = { path = "../common/bounded-executor", version = "0.1.0" } channel = { path = "../common/channel", version = "0.1.0" } diff --git a/network/Cargo.toml b/network/Cargo.toml index 1e8922225ce8..c8bca3811e20 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -24,7 +24,7 @@ rand_core = { version = "0.5.1", optional = true } serde = { version = "1.0.117", default-features = false } serde_bytes = "0.11.5" thiserror = "1.0.22" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } tokio-retry = "0.2.0" tokio-util = { version = "0.3.1", features = ["codec"] } diff --git a/network/builder/Cargo.toml b/network/builder/Cargo.toml index c3b102946578..53d84dc9aab8 100644 --- a/network/builder/Cargo.toml +++ b/network/builder/Cargo.toml @@ -15,7 +15,7 @@ edition = "2018" futures = "0.3.8" rand = "0.7.3" serde = { version = "1.0.117", default-features = false } -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } tokio-retry = "0.2.0" diff --git a/network/netcore/Cargo.toml b/network/netcore/Cargo.toml index 291d2507038d..9ed12fe4d67d 100644 --- a/network/netcore/Cargo.toml +++ b/network/netcore/Cargo.toml @@ -14,7 +14,7 @@ bytes = "0.5.6" futures = "0.3.8" pin-project = "1.0.2" serde = { version = "1.0.117", default-features = false } -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } url = { version = "2.1.1" } diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" } diff --git a/network/simple-onchain-discovery/Cargo.toml b/network/simple-onchain-discovery/Cargo.toml index ab7fc52e56c8..420a980e8126 100644 --- a/network/simple-onchain-discovery/Cargo.toml +++ b/network/simple-onchain-discovery/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" anyhow = "1.0.34" futures = "0.3.8" once_cell = "1.4.1" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } channel = {path = "../../common/channel", version = "0.1.0"} bcs = "0.1.1" diff --git a/network/socket-bench-server/Cargo.toml b/network/socket-bench-server/Cargo.toml index 21e30f8edc60..9157e018c8cc 100644 --- a/network/socket-bench-server/Cargo.toml +++ b/network/socket-bench-server/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] futures = "0.3.8" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } tokio-util = { version = "0.3.1", features = ["codec"] } diem-crypto = { path = "../../crypto/crypto" } diff --git a/secure/json-rpc/Cargo.toml b/secure/json-rpc/Cargo.toml index 5ea261ac8259..9bbc555b424a 100644 --- a/secure/json-rpc/Cargo.toml +++ b/secure/json-rpc/Cargo.toml @@ -27,7 +27,7 @@ diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" anyhow = "1.0.34" futures = "0.3.8" proptest = "0.10.1" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } diem-config = { path = "../../config", version = "0.1.0" } diem-proptest-helpers = { path = "../../common/proptest-helpers", version = "0.1.0"} diff --git a/secure/key-manager/Cargo.toml b/secure/key-manager/Cargo.toml index 5c6ca03a0f89..4549fa7a77b1 100644 --- a/secure/key-manager/Cargo.toml +++ b/secure/key-manager/Cargo.toml @@ -32,7 +32,7 @@ transaction-builder-generated = { path = "../../client/transaction-builder", ver anyhow = "1.0.34" futures = "0.3.8" rand = "0.7.3" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } executor = { path = "../../execution/executor", version = "0.1.0" } executor-test-helpers = { path = "../../execution/executor-test-helpers", version = "0.1.0" } diff --git a/state-synchronizer/Cargo.toml b/state-synchronizer/Cargo.toml index 4d312257427d..a0eb80a59fa6 100644 --- a/state-synchronizer/Cargo.toml +++ b/state-synchronizer/Cargo.toml @@ -16,7 +16,7 @@ futures = "0.3.8" serde = { version = "1.0.117", default-features = false } once_cell = "1.4.1" rand = "0.7.3" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } itertools = { version = "0.9.0", default-features = false } proptest = { version = "0.10.1", optional = true } diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml index 0881f975ca99..dbc66b70f724 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -26,7 +26,7 @@ serde = { version = "1.0.117", features = ["derive"] } serde_json = "1.0.60" structopt = "0.3.21" toml = "0.5.7" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } tokio-util = { version = "0.3.1", features = ["compat"] } executor = { path = "../../../execution/executor", version = "0.1.0" } diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml index 0ef45910d40d..ae27721dda12 100644 --- a/storage/backup/backup-service/Cargo.toml +++ b/storage/backup/backup-service/Cargo.toml @@ -15,7 +15,7 @@ futures = "0.3.8" hyper = "0.13.9" once_cell = "1.4.1" serde = { version = "1.0.117", default-features = false } -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } warp = "0.2.5" bcs = "0.1.1" diff --git a/storage/storage-service/Cargo.toml b/storage/storage-service/Cargo.toml index 6e3fed197739..a9eaf5dfef49 100644 --- a/storage/storage-service/Cargo.toml +++ b/storage/storage-service/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.34" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } futures = "0.3.8" bcs = "0.1.1" diff --git a/testsuite/cli/Cargo.toml b/testsuite/cli/Cargo.toml index a014b50148ec..65934cbaf921 100644 --- a/testsuite/cli/Cargo.toml +++ b/testsuite/cli/Cargo.toml @@ -21,7 +21,7 @@ once_cell = "1.4.1" reqwest = { version = "0.10.9", features = ["blocking", "json"] } serde = { version = "1.0.117", features = ["derive"] } structopt = "0.3.21" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } walkdir = "2.3.1" diem-config = { path = "../../config", version = "0.1.0" } diff --git a/testsuite/cluster-test/Cargo.toml b/testsuite/cluster-test/Cargo.toml index 342510e5a2f9..cc8d522e8a67 100644 --- a/testsuite/cluster-test/Cargo.toml +++ b/testsuite/cluster-test/Cargo.toml @@ -62,7 +62,7 @@ state-synchronizer = { path = "../../state-synchronizer", version = "0.1.0" } transaction-builder = { path = "../../language/transaction-builder", version = "0.1.0" } futures = "0.3.8" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } async-trait = "0.1.42" kube = { version = "0.42.0" } diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml index 23467d3ef7ab..0052fa0416ba 100644 --- a/testsuite/smoke-test/Cargo.toml +++ b/testsuite/smoke-test/Cargo.toml @@ -20,7 +20,7 @@ regex = "1.4.2" rust_decimal = "1.8.1" rusty-fork = "0.3.0" statistical = "1.0.0" -tokio = { version = "0.2.22", features = ["full"] } +tokio = { version = "1.19.2", features = ["full"] } backup-cli = { path = "../../storage/backup/backup-cli", version = "0.1.0" } cli = { path = "../cli", version = "0.1.0", features = ["fuzzing"] }