From cc63fe4e90ba2c02443dfde64d543295cbaf88eb Mon Sep 17 00:00:00 2001
From: Greg Nazario <greg@gnazar.io>
Date: Thu, 3 Mar 2022 17:27:28 -0800
Subject: [PATCH] [network] Remove socket bench

Closes: #65
---
 Cargo.lock                                    | 2045 +++++++++--------
 Cargo.toml                                    |    1 -
 .../src/unit_tests/ed25519_test.rs            |    2 +-
 crates/aptos-workspace-hack/Cargo.toml        |  118 +-
 network/Cargo.toml                            |    9 -
 network/benches/network_bench.rs              |  147 --
 network/benches/socket_bench.rs               |  410 ----
 network/socket-bench-server/Cargo.toml        |   26 -
 network/socket-bench-server/src/lib.rs        |  177 --
 network/socket-bench-server/src/main.rs       |   46 -
 x.toml                                        |    1 -
 11 files changed, 1152 insertions(+), 1830 deletions(-)
 delete mode 100644 network/benches/network_bench.rs
 delete mode 100644 network/benches/socket_bench.rs
 delete mode 100644 network/socket-bench-server/Cargo.toml
 delete mode 100644 network/socket-bench-server/src/lib.rs
 delete mode 100644 network/socket-bench-server/src/main.rs

diff --git a/Cargo.lock b/Cargo.lock
index 1b243fdd57392..d2a2f388b8f42 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -46,7 +46,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -96,19 +96,15 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.3.8"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "const-random",
+ "getrandom 0.2.5",
+ "once_cell",
+ "version_check",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
-
 [[package]]
 name = "aho-corasick"
 version = "0.7.18"
@@ -118,15 +114,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -138,9 +125,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.52"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
+checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"
 dependencies = [
  "backtrace",
 ]
@@ -181,7 +168,7 @@ dependencies = [
  "percent-encoding",
  "rand 0.8.4",
  "reqwest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "storage-interface",
  "tokio",
@@ -203,7 +190,7 @@ dependencies = [
  "move-binary-format",
  "move-core-types",
  "move-resource-viewer",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "warp",
 ]
@@ -216,7 +203,7 @@ dependencies = [
  "bcs",
  "proptest",
  "proptest-derive",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_bytes",
 ]
 
@@ -237,7 +224,7 @@ dependencies = [
  "log",
  "mirai-annotations",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_yaml",
  "short-hex-str",
  "thiserror",
@@ -266,9 +253,9 @@ dependencies = [
  "proptest",
  "proptest-derive",
  "rand 0.8.4",
- "rand_core 0.6.2",
+ "rand_core 0.6.3",
  "ripemd160",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde-name",
  "serde_bytes",
  "serde_json",
@@ -287,9 +274,9 @@ version = "0.0.3"
 dependencies = [
  "anyhow",
  "aptos-workspace-hack",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -310,11 +297,11 @@ dependencies = [
  "channel",
  "claim",
  "futures",
- "itertools 0.10.1",
+ "itertools",
  "maplit",
  "network",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-service-client",
  "storage-service-server",
  "storage-service-types",
@@ -330,7 +317,7 @@ dependencies = [
  "aptos-workspace-hack",
  "once_cell",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde-generate",
  "serde-reflection",
  "serde_yaml",
@@ -378,7 +365,7 @@ dependencies = [
  "hex",
  "rand 0.8.4",
  "reqwest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "structopt",
  "tempfile",
@@ -448,7 +435,7 @@ dependencies = [
  "safety-rules",
  "scratchpad",
  "serde_json",
- "sha-1 0.9.4",
+ "sha-1 0.9.8",
  "state-sync-v1",
  "stats_alloc",
  "storage-interface",
@@ -477,7 +464,7 @@ dependencies = [
  "executor",
  "generate-key",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-interface",
  "structopt",
  "thiserror",
@@ -492,7 +479,7 @@ dependencies = [
  "aptos-workspace-hack",
  "base64",
  "proxy",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "thiserror",
  "ureq",
@@ -529,7 +516,7 @@ dependencies = [
  "aptos-workspace-hack",
  "bcs",
  "byteorder",
- "itertools 0.10.1",
+ "itertools",
  "mirai-annotations",
  "num-derive",
  "num-traits 0.2.14",
@@ -537,7 +524,7 @@ dependencies = [
  "proptest",
  "proptest-derive",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-interface",
  "thiserror",
 ]
@@ -559,9 +546,9 @@ name = "aptos-log-derive"
 version = "0.1.0"
 dependencies = [
  "aptos-workspace-hack",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -577,7 +564,7 @@ dependencies = [
  "hostname",
  "once_cell",
  "prometheus",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "tracing",
  "tracing-subscriber",
@@ -599,7 +586,7 @@ dependencies = [
  "aptos-workspace-hack",
  "bcs",
  "hex",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_yaml",
  "structopt",
  "thiserror",
@@ -628,7 +615,7 @@ dependencies = [
  "event-notifications",
  "fail",
  "futures",
- "itertools 0.10.1",
+ "itertools",
  "mempool-notifications",
  "mirai-annotations",
  "netcore",
@@ -637,7 +624,7 @@ dependencies = [
  "proptest",
  "rand 0.8.4",
  "rayon",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "short-hex-str",
  "storage-interface",
@@ -746,17 +733,17 @@ dependencies = [
  "fallible",
  "futures",
  "hex",
- "itertools 0.10.1",
+ "itertools",
  "netcore",
  "network",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "serde_yaml",
  "structopt",
  "thiserror",
  "tokio",
- "tokio-util",
+ "tokio-util 0.6.9",
  "toml",
  "url",
 ]
@@ -799,7 +786,7 @@ dependencies = [
  "futures",
  "pin-project",
  "tokio",
- "tokio-util",
+ "tokio-util 0.6.9",
 ]
 
 [[package]]
@@ -828,7 +815,7 @@ dependencies = [
  "hex",
  "move-core-types",
  "reqwest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "tokio",
  "url",
@@ -853,8 +840,8 @@ dependencies = [
  "aptos-workspace-hack",
  "bcs",
  "move-core-types",
- "rand_core 0.6.2",
- "serde 1.0.130",
+ "rand_core 0.6.3",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -866,7 +853,7 @@ dependencies = [
  "aptos-secure-push-metrics",
  "aptos-workspace-hack",
  "once_cell",
- "serde 1.0.130",
+ "serde 1.0.136",
  "thiserror",
 ]
 
@@ -898,7 +885,7 @@ dependencies = [
  "chrono",
  "enum_dispatch",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "thiserror",
 ]
@@ -982,7 +969,7 @@ dependencies = [
  "once_cell",
  "proptest",
  "proptest-derive",
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -1054,7 +1041,7 @@ dependencies = [
  "bytes",
  "chrono",
  "hex",
- "itertools 0.10.1",
+ "itertools",
  "mirai-annotations",
  "move-core-types",
  "move-read-write-set-types",
@@ -1063,7 +1050,7 @@ dependencies = [
  "proptest-derive",
  "rand 0.8.4",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_bytes",
  "serde_json",
  "thiserror",
@@ -1099,7 +1086,7 @@ dependencies = [
  "native-tls",
  "once_cell",
  "proptest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "thiserror",
  "ureq",
@@ -1133,7 +1120,7 @@ dependencies = [
  "proptest",
  "rayon",
  "read-write-set-dynamic",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "tracing",
 ]
@@ -1153,7 +1140,7 @@ dependencies = [
  "mirai-annotations",
  "pbkdf2",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "sha2",
  "thiserror",
 ]
@@ -1165,7 +1152,6 @@ dependencies = [
  "Inflector",
  "anyhow",
  "backtrace",
- "bitvec",
  "byteorder",
  "bytes",
  "cc",
@@ -1181,29 +1167,31 @@ dependencies = [
  "futures-io",
  "futures-sink",
  "futures-util",
+ "generic-array 0.14.5",
  "hyper",
  "indexmap",
- "itertools 0.10.1",
+ "itertools",
  "libc",
  "log",
  "memchr",
  "num-integer",
  "num-traits 0.2.14",
+ "parking_lot 0.12.0",
+ "phf_shared",
  "plotters",
  "rand 0.8.4",
  "regex",
  "regex-automata",
  "reqwest",
  "rusty-fork",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
- "sha-1 0.9.4",
+ "sha-1 0.9.8",
  "standback",
  "subtle",
- "syn 1.0.74",
- "tiny-keccak",
+ "syn 1.0.86",
  "tokio",
- "tokio-util",
+ "tokio-util 0.6.9",
  "toml",
  "tracing",
  "warp",
@@ -1237,7 +1225,7 @@ dependencies = [
  "move-vm-types",
  "once_cell",
  "read-write-set",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "structopt",
  "tempfile",
@@ -1263,7 +1251,7 @@ dependencies = [
  "bcs",
  "byteorder",
  "executor-types",
- "itertools 0.10.1",
+ "itertools",
  "move-core-types",
  "num-derive",
  "num-traits 0.2.14",
@@ -1274,7 +1262,7 @@ dependencies = [
  "rand 0.8.4",
  "schemadb",
  "scratchpad",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-interface",
  "thiserror",
 ]
@@ -1288,7 +1276,7 @@ dependencies = [
  "aptos-types",
  "aptos-workspace-hack",
  "aptosdb",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "storage-interface",
  "structopt",
@@ -1302,9 +1290,9 @@ checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569"
 
 [[package]]
 name = "arc-swap"
-version = "1.2.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d7d63395147b81a9e570bcc6243aaf71c017bd666d4909cfef0085bdda8d73"
+checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f"
 
 [[package]]
 name = "array_tool"
@@ -1326,9 +1314,9 @@ checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd"
 
 [[package]]
 name = "async-stream"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3670df70cbc01729f901f94c887814b3c68db038aad1329a418bae178bc5295c"
+checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -1336,33 +1324,32 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70"
+checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.48"
+version = "0.1.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf"
+checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
 name = "atomicwrites"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4830ac690261d0b47f06e86d18c47eaa65d0184e576cf9b62c3a49b28cb876b"
+checksum = "eb8f2cd6962fa53c0e2a9d3f97eaa7dbd1e3cbbeeb4745403515b42ae07b3ff6"
 dependencies = [
- "nix 0.20.0",
  "tempfile",
  "winapi 0.3.9",
 ]
@@ -1386,17 +1373,18 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.56"
+version = "0.3.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
+checksum = "88fb5a785d6b44fd9d6700935608639af1b8356de1e55d5f7c2740f4faa15d82"
 dependencies = [
  "addr2line",
- "cfg-if 1.0.0",
+ "cc",
+ "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -1426,7 +1414,7 @@ dependencies = [
  "executor-types",
  "futures",
  "hex",
- "itertools 0.10.1",
+ "itertools",
  "num_cpus",
  "once_cell",
  "pin-project",
@@ -1434,13 +1422,13 @@ dependencies = [
  "rand 0.8.4",
  "regex",
  "reqwest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "storage-interface",
  "structopt",
  "tokio",
  "tokio-stream",
- "tokio-util",
+ "tokio-util 0.6.9",
  "toml",
  "warp",
 ]
@@ -1464,7 +1452,7 @@ dependencies = [
  "hyper",
  "once_cell",
  "reqwest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-interface",
  "tokio",
  "warp",
@@ -1484,9 +1472,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "base64ct"
-version = "0.2.1"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b8a45dc8036c7e52889226a96edacd45831c0dbdb8b803a58b8e0e12613b1a6"
+checksum = "874f8444adcb4952a8bc51305c8be95c8ec8237bb0d2e78d2e039f771f8828a0"
 
 [[package]]
 name = "bcs"
@@ -1494,21 +1482,21 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "510fd83e3eaf7263b06182f3550b4c0af2af42cb36ab8024969ff5ea7fcb2833"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
  "thiserror",
 ]
 
 [[package]]
 name = "bech32"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c7f7096bc256f5e5cb960f60dfc4f4ef979ca65abe7fb9d5a4f77150d3783d4"
+checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b"
 
 [[package]]
 name = "bimap"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50ae17cabbc8a38a1e3e4c1a6a664e9a09672dc14d0896fa8d865d3a5a446b07"
+checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b"
 
 [[package]]
 name = "bincode"
@@ -1516,14 +1504,14 @@ version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
 name = "bindgen"
-version = "0.59.1"
+version = "0.59.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453c49e5950bb0eb63bb3df640e31618846c89d5b7faa54040d76e98e0134375"
+checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -1531,8 +1519,8 @@ dependencies = [
  "lazy_static 1.4.0",
  "lazycell",
  "peeking_take_while",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
  "regex",
  "rustc-hash",
  "shlex 1.1.0",
@@ -1555,9 +1543,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitmaps"
@@ -1570,9 +1558,9 @@ dependencies = [
 
 [[package]]
 name = "bitvec"
-version = "0.19.5"
+version = "0.19.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
+checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33"
 dependencies = [
  "funty",
  "radium",
@@ -1599,7 +1587,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
  "block-padding 0.2.1",
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+dependencies = [
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -1628,14 +1625,14 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
 dependencies = [
  "lazy_static 1.4.0",
  "memchr",
  "regex-automata",
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -1650,9 +1647,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.6.1"
+version = "3.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
+checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
 
 [[package]]
 name = "byte-tools"
@@ -1670,7 +1667,7 @@ dependencies = [
  "ed25519-dalek-fiat",
  "sha2",
  "sha3",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -1681,11 +1678,11 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -1696,32 +1693,32 @@ checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b"
 
 [[package]]
 name = "camino"
-version = "1.0.5"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b"
+checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7"
+checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
 name = "cargo_metadata"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2ae6de944143141f6155a473a6b02f66c7c3f9f47316f802f80204ebfe6e12"
+checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.4",
- "serde 1.0.130",
+ "semver 1.0.6",
+ "serde 1.0.136",
  "serde_json",
 ]
 
@@ -1733,47 +1730,41 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cast"
-version = "0.2.3"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
+checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
 dependencies = [
- "rustc_version 0.2.3",
+ "rustc_version 0.4.0",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.67"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 dependencies = [
  "jobserver",
 ]
 
 [[package]]
 name = "cexpr"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db507a7679252d2276ed0dd8113c6875ec56d3089f9225b2b42c30cc1f8e5c89"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom 6.1.2",
+ "nom 7.1.0",
 ]
 
 [[package]]
 name = "cfg-expr"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571"
+checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7"
 dependencies = [
  "smallvec",
  "target-lexicon",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -1802,19 +1793,31 @@ dependencies = [
  "libc",
  "num-integer",
  "num-traits 0.2.14",
- "serde 1.0.130",
+ "serde 1.0.136",
  "time 0.1.44",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "chrono-tz"
-version = "0.5.3"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2554a3155fec064362507487171dcc4edc3df60cb10f3a1fb10ed8094822b120"
+checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552"
 dependencies = [
  "chrono",
+ "chrono-tz-build",
+ "phf",
+]
+
+[[package]]
+name = "chrono-tz-build"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069"
+dependencies = [
  "parse-zoneinfo",
+ "phf",
+ "phf_codegen",
 ]
 
 [[package]]
@@ -1829,7 +1832,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -1843,9 +1846,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.2.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cf2cc85830eae84823884db23c5306442a6c3d5bfd3beb2f2a2c829faa1816"
+checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21"
 dependencies = [
  "glob",
  "libc",
@@ -1854,11 +1857,11 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "2.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
- "ansi_term 0.11.0",
+ "ansi_term",
  "atty",
  "bitflags",
  "strsim",
@@ -1874,7 +1877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e"
 dependencies = [
  "codespan-reporting",
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -1883,7 +1886,7 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
  "termcolor",
  "unicode-width",
 ]
@@ -1901,20 +1904,20 @@ dependencies = [
 
 [[package]]
 name = "colored-diff"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516f260afc909bb0d056b76891ad91b3275b83682d851b566792077eee946efd"
+checksum = "410208eb08c3f3ad44b95b51c4fc0d5993cbcc9dd39cfadb4214b9115a97dcb5"
 dependencies = [
- "ansi_term 0.11.0",
- "difference",
- "itertools 0.7.11",
+ "ansi_term",
+ "dissimilar",
+ "itertools",
 ]
 
 [[package]]
 name = "combine"
-version = "4.6.2"
+version = "4.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b2f5d0ee456f3928812dfc8c6d9a1d592b98678f6d56db9b0cd2b7bc6c8db5"
+checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062"
 dependencies = [
  "bytes",
  "memchr",
@@ -1929,7 +1932,7 @@ dependencies = [
  "lazy_static 1.4.0",
  "nom 5.1.2",
  "rust-ini",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde-hjson",
  "serde_json",
  "toml",
@@ -1968,7 +1971,7 @@ dependencies = [
  "fail",
  "fallible",
  "futures",
- "itertools 0.10.1",
+ "itertools",
  "mirai-annotations",
  "network",
  "num-derive",
@@ -1978,7 +1981,7 @@ dependencies = [
  "rand 0.8.4",
  "safety-rules",
  "schemadb",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "short-hex-str",
  "storage-interface",
@@ -2001,7 +2004,7 @@ dependencies = [
  "claim",
  "futures",
  "move-core-types",
- "serde 1.0.130",
+ "serde 1.0.136",
  "thiserror",
  "tokio",
 ]
@@ -2018,62 +2021,40 @@ dependencies = [
  "aptos-workspace-hack",
  "bcs",
  "executor-types",
- "itertools 0.10.1",
+ "itertools",
  "mirai-annotations",
  "proptest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "short-hex-str",
 ]
 
 [[package]]
 name = "console"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc80946b3480f421c2f17ed1cb841753a371c7c5104f51d507e13f532c856aa"
+checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
 dependencies = [
  "encode_unicode",
- "lazy_static 1.4.0",
  "libc",
+ "once_cell",
  "regex",
  "terminal_size",
  "unicode-width",
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "const-random"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4"
-dependencies = [
- "const-random-macro",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40"
-dependencies = [
- "getrandom 0.2.2",
- "lazy_static 1.4.0",
- "proc-macro-hack",
- "tiny-keccak",
-]
-
 [[package]]
 name = "const_fn"
-version = "0.4.5"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
+checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
 
 [[package]]
 name = "core-foundation"
-version = "0.9.1"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2081,15 +2062,18 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
-name = "cpuid-bool"
-version = "0.1.2"
+name = "cpufeatures"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
+checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "cpuid-bool"
@@ -2104,38 +2088,38 @@ dependencies = [
  "aptos-logger",
  "aptos-workspace-hack",
  "backtrace",
- "serde 1.0.130",
+ "serde 1.0.136",
  "toml",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
 name = "criterion"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
+checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10"
 dependencies = [
  "atty",
  "cast",
  "clap",
  "criterion-plot",
  "csv",
- "itertools 0.10.1",
+ "itertools",
  "lazy_static 1.4.0",
  "num-traits 0.2.14",
  "oorandom",
  "plotters",
  "rayon",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_cbor",
  "serde_derive",
  "serde_json",
@@ -2155,21 +2139,21 @@ dependencies = [
 
 [[package]]
 name = "criterion-plot"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
+checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57"
 dependencies = [
  "cast",
- "itertools 0.9.0",
+ "itertools",
 ]
 
 [[package]]
 name = "crossbeam"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80"
+checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-epoch",
@@ -2179,11 +2163,11 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
 ]
 
@@ -2193,18 +2177,18 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.3"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
+checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
  "lazy_static 1.4.0",
  "memoffset",
@@ -2213,22 +2197,21 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.1"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756"
+checksum = "4dd435b205a4842da59efd07628f921c096bc1cc0a156835b4fa0bcb9a19bcce"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.3"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
+checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"
 dependencies = [
- "autocfg",
- "cfg-if 1.0.0",
+ "cfg-if",
  "lazy_static 1.4.0",
 ]
 
@@ -2238,13 +2221,23 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
+[[package]]
+name = "crypto-common"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
+dependencies = [
+ "generic-array 0.14.5",
+ "typenum",
+]
+
 [[package]]
 name = "crypto-mac"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6"
+checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
  "subtle",
 ]
 
@@ -2256,9 +2249,9 @@ checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
 dependencies = [
  "bstr",
  "csv-core",
- "itoa 0.4.7",
+ "itoa 0.4.8",
  "ryu",
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -2285,7 +2278,7 @@ version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf"
 dependencies = [
- "nix 0.23.1",
+ "nix",
  "winapi 0.3.9",
 ]
 
@@ -2298,20 +2291,20 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "fiat-crypto",
- "rand_core 0.6.2",
+ "rand_core 0.6.3",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "dashmap"
-version = "3.11.10"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f260e2fc850179ef410018660006951c1b55b79e8087e87111a2c388994b9b5"
+checksum = "c0834a35a3fce649144119e18da2a4d8ed12ef3862f47183fd46f625d072d96c"
 dependencies = [
- "ahash 0.3.8",
- "cfg-if 0.1.10",
+ "cfg-if",
  "num_cpus",
+ "parking_lot 0.12.0",
 ]
 
 [[package]]
@@ -2335,7 +2328,7 @@ dependencies = [
  "network",
  "once_cell",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "short-hex-str",
  "storage-service-types",
  "thiserror",
@@ -2390,7 +2383,7 @@ dependencies = [
  "aptos-workspace-hack",
  "bytes",
  "reqwest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "tokio",
  "warp",
@@ -2405,11 +2398,11 @@ dependencies = [
  "camino",
  "globset",
  "guppy",
- "itertools 0.10.1",
+ "itertools",
  "once_cell",
  "petgraph 0.6.0",
  "rayon",
- "serde 1.0.130",
+ "serde 1.0.136",
  "toml",
 ]
 
@@ -2521,16 +2514,16 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c0ff24a73b51d9009c40897faf87d31b77345c90ffbf4dc3a1d2957032c5653"
 dependencies = [
- "itertools 0.10.1",
+ "itertools",
 ]
 
 [[package]]
 name = "diffy"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c1ff48e3f358d3158f88b2c95071f28d136be31d89e5fa843095032a70bff56"
+checksum = "c27ec7cef89a63c063e06570bb861b7d35e406d6885551b346d77c459b34d3db"
 dependencies = [
- "ansi_term 0.12.1",
+ "ansi_term",
 ]
 
 [[package]]
@@ -2548,7 +2541,17 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+dependencies = [
+ "block-buffer 0.10.2",
+ "crypto-common",
 ]
 
 [[package]]
@@ -2575,7 +2578,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "dirs-sys-next",
 ]
 
@@ -2607,11 +2610,17 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 
+[[package]]
+name = "dissimilar"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31ad93652f40969dead8d4bf897a41e9462095152eb21c56e5830537e41179dd"
+
 [[package]]
 name = "dtoa"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e"
+checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
 
 [[package]]
 name = "duct"
@@ -2627,11 +2636,11 @@ dependencies = [
 
 [[package]]
 name = "ed25519"
-version = "1.0.3"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c66a534cbb46ab4ea03477eae19d5c22c01da8258030280b7bd9d8433fb6ef"
+checksum = "eed12bbf7b5312f8da1c2722bc06d8c6b12c2d86a7fb35a194c7f3e6fc2bbe39"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
  "signature",
 ]
 
@@ -2644,7 +2653,7 @@ dependencies = [
  "curve25519-dalek-fiat",
  "ed25519",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_bytes",
  "sha2",
  "zeroize",
@@ -2664,23 +2673,23 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.28"
+version = "0.8.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
+checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
 name = "enum_dispatch"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e"
+checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb"
 dependencies = [
  "once_cell",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -2698,9 +2707,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
+checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
 dependencies = [
  "atty",
  "humantime 2.1.0",
@@ -2711,11 +2720,11 @@ dependencies = [
 
 [[package]]
 name = "erased-serde"
-version = "0.3.13"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0465971a8cc1fa2455c8465aaa377131e1f1cf4983280f474a13e68793aa770c"
+checksum = "56047058e1ab118075ca22f9ecd737bcc961aa3566a3019cb71388afa280bd8a"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -2736,9 +2745,9 @@ dependencies = [
  "claim",
  "executor-test-helpers",
  "futures",
- "itertools 0.10.1",
+ "itertools",
  "move-core-types",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-interface",
  "thiserror",
  "tokio",
@@ -2769,7 +2778,7 @@ dependencies = [
  "executor-test-helpers",
  "executor-types",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-client",
  "storage-interface",
  "thiserror",
@@ -2800,7 +2809,7 @@ dependencies = [
  "executor-test-helpers",
  "executor-types",
  "fail",
- "itertools 0.10.1",
+ "itertools",
  "move-core-types",
  "move-ir-compiler",
  "once_cell",
@@ -2808,7 +2817,7 @@ dependencies = [
  "rand 0.8.4",
  "rayon",
  "scratchpad",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "storage-interface",
  "vm-genesis",
@@ -2837,12 +2846,12 @@ dependencies = [
  "executor",
  "executor-types",
  "indicatif",
- "itertools 0.10.1",
+ "itertools",
  "jemallocator",
  "rand 0.8.4",
  "rayon",
  "schemadb",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-client",
  "storage-interface",
  "structopt",
@@ -2884,7 +2893,7 @@ dependencies = [
  "aptos-workspace-hack",
  "bcs",
  "scratchpad",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-interface",
  "thiserror",
 ]
@@ -2914,11 +2923,20 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "fastrand"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "fiat-crypto"
-version = "0.1.6"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72312b32704d99a969a55168f1f77edf8554fc7c7b978d457962aaf21404ef85"
+checksum = "2176874104231d65f2dd4d0c2e027e78614170d356c8ccfa826aaef103c8fe89"
 
 [[package]]
 name = "fixedbitset"
@@ -2928,9 +2946,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 
 [[package]]
 name = "fixedbitset"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e"
+checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e"
 
 [[package]]
 name = "fnv"
@@ -2975,11 +2993,11 @@ dependencies = [
  "hyper",
  "hyper-proxy",
  "hyper-tls",
- "itertools 0.10.1",
+ "itertools",
  "k8s-openapi",
  "kube",
  "rand 0.8.4",
- "rand_core 0.6.2",
+ "rand_core 0.6.3",
  "rayon",
  "regex",
  "reqwest",
@@ -2987,7 +3005,7 @@ dependencies = [
  "rusoto_credential",
  "rusoto_eks",
  "rusoto_sts",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "structopt",
  "tempfile",
@@ -3006,8 +3024,8 @@ dependencies = [
  "aptos-sdk",
  "aptos-workspace-hack",
  "forge",
- "itertools 0.10.1",
- "rand_core 0.6.2",
+ "itertools",
+ "rand_core 0.6.3",
  "structopt",
  "testcases",
  "tokio",
@@ -3066,9 +3084,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
 
 [[package]]
 name = "futures"
-version = "0.3.12"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
+checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -3097,9 +3115,9 @@ checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.12"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
+checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -3108,21 +3126,21 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"
+checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
+checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
 dependencies = [
  "autocfg",
  "proc-macro-hack",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -3133,15 +3151,15 @@ checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
 
 [[package]]
 name = "futures-task"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
 
 [[package]]
 name = "futures-util"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
+checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
 dependencies = [
  "autocfg",
  "futures-channel",
@@ -3179,7 +3197,7 @@ dependencies = [
  "move-core-types",
  "network",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde-reflection",
  "serde_yaml",
  "structopt",
@@ -3207,9 +3225,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.4"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
 dependencies = [
  "typenum",
  "version_check",
@@ -3259,18 +3277,18 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
+checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi 0.10.0+wasi-snapshot-preview1",
 ]
@@ -3339,20 +3357,20 @@ checksum = "2d2086fdcefd1a3dc6f4ba4568147648231e2211be1fcc4d1063601c6baadd2e"
 dependencies = [
  "camino",
  "cargo_metadata",
- "cfg-if 1.0.0",
+ "cfg-if",
  "debug-ignore",
- "fixedbitset 0.4.0",
+ "fixedbitset 0.4.1",
  "guppy-summaries",
  "guppy-workspace-hack",
  "indexmap",
- "itertools 0.10.1",
+ "itertools",
  "nested",
  "once_cell",
  "pathdiff",
  "petgraph 0.6.0",
  "rayon",
- "semver 1.0.4",
- "serde 1.0.130",
+ "semver 1.0.6",
+ "serde 1.0.136",
  "serde_json",
  "smallvec",
  "target-spec",
@@ -3366,10 +3384,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ca5ad97ff788027e546992f7f374e277da50ca4e06dab268f33088a74897e9e"
 dependencies = [
  "camino",
- "cfg-if 1.0.0",
+ "cfg-if",
  "diffus",
- "semver 1.0.4",
- "serde 1.0.130",
+ "semver 1.0.6",
+ "serde 1.0.136",
  "toml",
 ]
 
@@ -3381,9 +3399,9 @@ checksum = "92620684d99f750bae383ecb3be3748142d6095760afd5cbcf2261e9a279d780"
 
 [[package]]
 name = "h2"
-version = "0.3.3"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
+checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e"
 dependencies = [
  "bytes",
  "fnv",
@@ -3394,87 +3412,87 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio",
- "tokio-util",
+ "tokio-util 0.6.9",
  "tracing",
 ]
 
 [[package]]
 name = "hakari"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0e0360cf1f4a59ec6837c0466532d5307194ebad2d088d44470cae16893d23"
+checksum = "f48905a7968260802691e8b6cc2e9426822b79eaf9164d07f2212e9327181b3e"
 dependencies = [
  "atomicwrites",
  "bimap",
  "camino",
- "cfg-if 1.0.0",
+ "cfg-if",
  "debug-ignore",
  "diffy",
  "guppy",
+ "guppy-workspace-hack",
  "include_dir",
  "indenter",
- "itertools 0.10.1",
+ "itertools",
  "owo-colors",
  "pathdiff",
  "rayon",
- "serde 1.0.130",
+ "serde 1.0.136",
  "strip-ansi-escapes",
  "target-spec",
  "toml",
  "toml_edit",
  "twox-hash",
- "workspace-hack 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "half"
-version = "1.7.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
 [[package]]
 name = "handlebars"
-version = "3.5.3"
+version = "3.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb0867bbc5a3da37a753e78021d5fcf8a4db00e18dd2dd90fd36e24190e162d"
+checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3"
 dependencies = [
  "log",
  "pest",
  "pest_derive",
- "quick-error 2.0.0",
- "serde 1.0.130",
+ "quick-error 2.0.1",
+ "serde 1.0.136",
  "serde_json",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.9.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-dependencies = [
- "ahash 0.4.7",
-]
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
+dependencies = [
+ "ahash",
+]
 
 [[package]]
 name = "headers"
-version = "0.3.4"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0b7591fb62902706ae8e7aaff416b1b0fa2c0fd0878b46dc13baa3712d8a855"
+checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d"
 dependencies = [
  "base64",
  "bitflags",
  "bytes",
  "headers-core",
  "http",
+ "httpdate",
  "mime",
- "sha-1 0.9.4",
- "time 0.1.44",
+ "sha-1 0.10.0",
 ]
 
 [[package]]
@@ -3488,9 +3506,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -3543,20 +3561,20 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
+checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 0.4.7",
+ "itoa 1.0.1",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"
+checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
 dependencies = [
  "bytes",
  "http",
@@ -3565,21 +3583,21 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
+checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4"
 
 [[package]]
 name = "httpdate"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
 [[package]]
 name = "humansize"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e"
+checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026"
 
 [[package]]
 name = "humantime"
@@ -3603,14 +3621,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac34a56cfd4acddb469cc7fff187ed5ac36f498ba085caf8bbc725e3ff474058"
 dependencies = [
  "humantime 2.1.0",
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
 name = "hyper"
-version = "0.14.11"
+version = "0.14.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11"
+checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3621,7 +3639,7 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa 0.4.7",
+ "itoa 1.0.1",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -3675,9 +3693,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -3686,9 +3704,9 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.17"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c"
+checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
 dependencies = [
  "crossbeam-utils",
  "globset",
@@ -3735,9 +3753,9 @@ checksum = "0a0c890c85da4bab7bce4204c707396bbd3c6c8a681716a51c8814cfc2b682df"
 dependencies = [
  "anyhow",
  "proc-macro-hack",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -3754,9 +3772,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
 [[package]]
 name = "indexmap"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
+checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
 dependencies = [
  "autocfg",
  "hashbrown 0.11.2",
@@ -3776,38 +3794,40 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136"
+checksum = "e7906a9fababaeacb774f72410e497a1d18de916322e33797bb2cd29baa23c9e"
 dependencies = [
  "unindent",
 ]
 
 [[package]]
 name = "instant"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
 name = "internment"
-version = "0.5.0"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84361d019110e87ee0b527edae8cba07feb78a09c53d8579e5411005d0ad5065"
+checksum = "6ab388864246d58a276e60e7569a833d9cc4cd75c66e5ca77c177dad38e59996"
 dependencies = [
+ "ahash",
  "dashmap",
- "hashbrown 0.9.1",
+ "hashbrown 0.12.0",
  "once_cell",
+ "parking_lot 0.12.0",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
+checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c"
 
 [[package]]
 name = "is_ci"
@@ -3817,36 +3837,18 @@ checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb"
 
 [[package]]
 name = "itertools"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d47946d458e94a1b7bcabbf6521ea7c037062c81f534615abcad76e84d4970d"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
@@ -3877,18 +3879,18 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.21"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
+checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.48"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78"
+checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3902,7 +3904,7 @@ dependencies = [
  "array_tool",
  "env_logger 0.7.1",
  "log",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
 ]
 
@@ -3915,7 +3917,7 @@ dependencies = [
  "base64",
  "bytes",
  "chrono",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde-value",
  "serde_json",
 ]
@@ -3932,7 +3934,7 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b310ccceade8121d7d77fee406160e457c2f4e7c7982d589da3499bc7ea4526"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -3958,14 +3960,14 @@ dependencies = [
  "openssl",
  "pem",
  "pin-project",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "serde_yaml",
  "static_assertions",
  "thiserror",
  "tokio",
  "tokio-native-tls",
- "tokio-util",
+ "tokio-util 0.6.9",
  "tower",
  "url",
 ]
@@ -4000,7 +4002,7 @@ dependencies = [
  "proptest-derive",
  "rand 0.8.4",
  "read-write-set",
- "serde 1.0.130",
+ "serde 1.0.136",
  "vm-genesis",
 ]
 
@@ -4059,16 +4061,16 @@ checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
 dependencies = [
  "arrayvec",
  "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
  "ryu",
  "static_assertions",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.112"
+version = "0.2.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -4082,11 +4084,11 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
+checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "winapi 0.3.9",
 ]
 
@@ -4110,9 +4112,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
 name = "lock_api"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
 dependencies = [
  "scopeguard",
 ]
@@ -4123,8 +4125,8 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 1.0.0",
- "serde 1.0.130",
+ "cfg-if",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -4141,9 +4143,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
 
 [[package]]
 name = "matches"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "md5"
@@ -4153,9 +4155,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
 
 [[package]]
 name = "memchr"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memoffset"
@@ -4176,7 +4178,7 @@ dependencies = [
  "async-trait",
  "claim",
  "futures",
- "serde 1.0.130",
+ "serde 1.0.136",
  "thiserror",
  "tokio",
 ]
@@ -4200,14 +4202,20 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
 dependencies = [
  "mime",
  "unicase",
 ]
 
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
 [[package]]
 name = "miniz_oxide"
 version = "0.4.4"
@@ -4220,9 +4228,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.7.13"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
+checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2"
 dependencies = [
  "libc",
  "log",
@@ -4259,8 +4267,8 @@ dependencies = [
  "move-command-line-common",
  "move-core-types",
  "move-model",
- "serde 1.0.130",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "serde 1.0.136",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4275,9 +4283,9 @@ dependencies = [
  "proptest",
  "proptest-derive",
  "ref-cast",
- "serde 1.0.130",
+ "serde 1.0.136",
  "variant_count",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4286,7 +4294,7 @@ version = "0.0.1"
 source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
 dependencies = [
  "mirai-annotations",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4302,8 +4310,8 @@ dependencies = [
  "move-core-types",
  "move-ir-types",
  "move-symbol-pool",
- "serde 1.0.130",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "serde 1.0.136",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4315,7 +4323,7 @@ dependencies = [
  "move-binary-format",
  "move-core-types",
  "petgraph 0.5.1",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4329,7 +4337,7 @@ dependencies = [
  "move-borrow-graph",
  "move-core-types",
  "petgraph 0.5.1",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4347,7 +4355,7 @@ dependencies = [
  "structopt",
  "termion",
  "tui",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4361,7 +4369,7 @@ dependencies = [
  "colored",
  "difference",
  "include_dir",
- "itertools 0.10.1",
+ "itertools",
  "move-binary-format",
  "move-bytecode-source-map",
  "move-bytecode-utils",
@@ -4385,12 +4393,12 @@ dependencies = [
  "once_cell",
  "read-write-set",
  "read-write-set-dynamic",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_yaml",
  "structopt",
  "tempfile",
  "walkdir",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4401,10 +4409,10 @@ dependencies = [
  "anyhow",
  "difference",
  "hex",
- "serde 1.0.130",
+ "serde 1.0.136",
  "sha2",
  "walkdir",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4432,7 +4440,7 @@ dependencies = [
  "structopt",
  "tempfile",
  "walkdir",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4449,9 +4457,9 @@ dependencies = [
  "proptest-derive",
  "rand 0.8.4",
  "ref-cast",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_bytes",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4471,9 +4479,9 @@ dependencies = [
  "move-ir-types",
  "once_cell",
  "petgraph 0.5.1",
- "serde 1.0.130",
+ "serde 1.0.136",
  "structopt",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4492,7 +4500,7 @@ dependencies = [
  "move-coverage",
  "move-ir-types",
  "structopt",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4503,7 +4511,7 @@ dependencies = [
  "anyhow",
  "codespan",
  "codespan-reporting",
- "itertools 0.10.1",
+ "itertools",
  "log",
  "move-compiler",
  "move-model",
@@ -4511,8 +4519,8 @@ dependencies = [
  "num",
  "once_cell",
  "regex",
- "serde 1.0.130",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "serde 1.0.136",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4526,8 +4534,8 @@ dependencies = [
  "move-command-line-common",
  "move-core-types",
  "move-model",
- "serde 1.0.130",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "serde 1.0.136",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4547,7 +4555,7 @@ dependencies = [
  "move-symbol-pool",
  "serde_json",
  "structopt",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4567,7 +4575,7 @@ dependencies = [
  "move-symbol-pool",
  "ouroboros",
  "thiserror",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4581,7 +4589,7 @@ dependencies = [
  "move-core-types",
  "move-ir-types",
  "move-symbol-pool",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4595,8 +4603,8 @@ dependencies = [
  "move-core-types",
  "move-symbol-pool",
  "once_cell",
- "serde 1.0.130",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "serde 1.0.136",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4608,7 +4616,7 @@ dependencies = [
  "codespan",
  "codespan-reporting",
  "internment",
- "itertools 0.10.1",
+ "itertools",
  "log",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -4622,8 +4630,8 @@ dependencies = [
  "num",
  "once_cell",
  "regex",
- "serde 1.0.130",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "serde 1.0.136",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4648,14 +4656,14 @@ dependencies = [
  "petgraph 0.5.1",
  "ptree",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_yaml",
  "sha2",
  "structopt",
  "tempfile",
  "toml",
  "walkdir",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4671,7 +4679,7 @@ dependencies = [
  "codespan-reporting",
  "futures",
  "hex",
- "itertools 0.10.1",
+ "itertools",
  "log",
  "move-abigen",
  "move-binary-format",
@@ -4689,12 +4697,12 @@ dependencies = [
  "once_cell",
  "pretty",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "simplelog",
  "tokio",
  "toml",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4707,7 +4715,7 @@ dependencies = [
  "codespan",
  "codespan-reporting",
  "futures",
- "itertools 0.10.1",
+ "itertools",
  "log",
  "move-binary-format",
  "move-command-line-common",
@@ -4719,11 +4727,11 @@ dependencies = [
  "pretty",
  "rand 0.8.4",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "tera",
  "tokio",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4734,8 +4742,8 @@ dependencies = [
  "anyhow",
  "move-binary-format",
  "move-core-types",
- "serde 1.0.130",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "serde 1.0.136",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4750,8 +4758,8 @@ dependencies = [
  "move-core-types",
  "move-vm-types",
  "once_cell",
- "serde 1.0.130",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "serde 1.0.136",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4762,7 +4770,7 @@ dependencies = [
  "codespan",
  "codespan-reporting",
  "im",
- "itertools 0.10.1",
+ "itertools",
  "log",
  "move-binary-format",
  "move-borrow-graph",
@@ -4776,9 +4784,9 @@ dependencies = [
  "once_cell",
  "paste",
  "petgraph 0.5.1",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4789,16 +4797,16 @@ dependencies = [
  "anyhow",
  "bytecode-interpreter-crypto",
  "codespan-reporting",
- "itertools 0.10.1",
+ "itertools",
  "move-binary-format",
  "move-core-types",
  "move-model",
  "move-stackless-bytecode",
  "move-vm-runtime",
  "num",
- "serde 1.0.130",
+ "serde 1.0.136",
  "structopt",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4820,7 +4828,7 @@ dependencies = [
  "sha3",
  "smallvec",
  "walkdir",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4829,8 +4837,8 @@ version = "0.1.0"
 source = "git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860#98ed299a7e3a9223019c9bdf4dd92fea9faef860"
 dependencies = [
  "once_cell",
- "serde 1.0.130",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "serde 1.0.136",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4862,7 +4870,7 @@ dependencies = [
  "regex",
  "structopt",
  "tempfile",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4887,7 +4895,7 @@ dependencies = [
  "rayon",
  "regex",
  "structopt",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4902,10 +4910,10 @@ dependencies = [
  "move-core-types",
  "move-vm-types",
  "once_cell",
- "parking_lot",
+ "parking_lot 0.11.2",
  "sha3",
  "tracing",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4917,7 +4925,7 @@ dependencies = [
  "move-binary-format",
  "move-core-types",
  "move-vm-runtime",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4931,10 +4939,10 @@ dependencies = [
  "move-core-types",
  "once_cell",
  "proptest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "sha2",
  "smallvec",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -4969,9 +4977,9 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4"
+checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d"
 dependencies = [
  "lazy_static 1.4.0",
  "libc",
@@ -5003,9 +5011,9 @@ dependencies = [
  "memsocket",
  "pin-project",
  "proxy",
- "serde 1.0.130",
+ "serde 1.0.136",
  "tokio",
- "tokio-util",
+ "tokio-util 0.6.9",
  "url",
 ]
 
@@ -5035,7 +5043,7 @@ dependencies = [
  "futures",
  "futures-util",
  "hex",
- "itertools 0.10.1",
+ "itertools",
  "maplit",
  "memsocket",
  "netcore",
@@ -5046,18 +5054,17 @@ dependencies = [
  "proptest",
  "proptest-derive",
  "rand 0.8.4",
- "rand_core 0.6.2",
- "serde 1.0.130",
+ "rand_core 0.6.3",
+ "serde 1.0.136",
  "serde_bytes",
  "serde_json",
  "serial_test",
  "short-hex-str",
- "socket-bench-server",
  "thiserror",
  "tokio",
  "tokio-retry",
  "tokio-stream",
- "tokio-util",
+ "tokio-util 0.6.9",
 ]
 
 [[package]]
@@ -5081,7 +5088,7 @@ dependencies = [
  "network",
  "network-discovery",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "tokio",
 ]
 
@@ -5121,7 +5128,7 @@ dependencies = [
  "camino",
  "config",
  "humantime-serde",
- "serde 1.0.130",
+ "serde 1.0.136",
  "toml",
 ]
 
@@ -5147,7 +5154,7 @@ dependencies = [
  "owo-colors",
  "quick-junit",
  "rayon",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "strip-ansi-escapes",
  "twox-hash",
@@ -5159,19 +5166,7 @@ version = "0.1.0"
 source = "git+https://github.com/diem/diem-devtools?rev=f99a204e3d3f8e503d51d7df42e55c8282b59154#f99a204e3d3f8e503d51d7df42e55c8282b59154"
 dependencies = [
  "camino",
- "serde 1.0.130",
-]
-
-[[package]]
-name = "nix"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -5182,7 +5177,7 @@ checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
 dependencies = [
  "bitflags",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "memoffset",
 ]
@@ -5200,21 +5195,20 @@ dependencies = [
 
 [[package]]
 name = "nom"
-version = "6.1.2"
+version = "7.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
+checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
 dependencies = [
- "bitvec",
- "funty",
  "memchr",
+ "minimal-lexical",
  "version_check",
 ]
 
 [[package]]
 name = "ntapi"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
 dependencies = [
  "winapi 0.3.9",
 ]
@@ -5235,9 +5229,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -5259,9 +5253,9 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -5320,16 +5314,16 @@ name = "num-variants"
 version = "0.1.0"
 dependencies = [
  "aptos-workspace-hack",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -5363,9 +5357,9 @@ dependencies = [
  "bech32",
  "hex",
  "rand 0.8.4",
- "rand_core 0.6.2",
+ "rand_core 0.6.3",
  "rstest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "serde_repr",
  "thiserror",
@@ -5375,9 +5369,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
 
 [[package]]
 name = "oorandom"
@@ -5399,29 +5393,29 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.32"
+version = "0.10.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70"
+checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
 dependencies = [
  "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
  "foreign-types",
- "lazy_static 1.4.0",
  "libc",
+ "once_cell",
  "openssl-sys",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.2"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.60"
+version = "0.9.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6"
+checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
 dependencies = [
  "autocfg",
  "cc",
@@ -5432,9 +5426,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "2.1.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "766f840da25490628d8e63e529cd21c014f6600c6b8517add12a6fa6167a6218"
+checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
 dependencies = [
  "num-traits 0.2.14",
 ]
@@ -5451,9 +5445,9 @@ dependencies = [
 
 [[package]]
 name = "ouroboros"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc1f52300b81ac4eeeb6c00c20f7e86556c427d9fb2d92b68fc73c22f331cd15"
+checksum = "fbeff60e3e37407a80ead3e9458145b456e978c4068cddbfea6afb48572962ca"
 dependencies = [
  "ouroboros_macro",
  "stable_deref_trait",
@@ -5461,41 +5455,51 @@ dependencies = [
 
 [[package]]
 name = "ouroboros_macro"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41db02c8f8731cdd7a72b433c7900cce4bf245465b452c364bfd21f4566ab055"
+checksum = "03f2cb802b5bdfdf52f1ffa0b54ce105e4d346e91990dd571f86c91321ad49e2"
 dependencies = [
  "Inflector",
  "proc-macro-error",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
 name = "owo-colors"
-version = "3.1.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3b1ca05e7e4171727a5dab03790a344f248eaad925dce8ba0014fd78392b88"
+checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4"
 
 [[package]]
 name = "parking_lot"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.8.5",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.1",
 ]
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "instant",
  "libc",
  "redox_syscall",
@@ -5503,6 +5507,19 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "parking_lot_core"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-sys",
+]
+
 [[package]]
 name = "parse-zoneinfo"
 version = "0.3.0"
@@ -5514,19 +5531,19 @@ dependencies = [
 
 [[package]]
 name = "password-hash"
-version = "0.1.1"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721a49e14f1803441886c688ba8b653b52e1dcc926969081d22384e300ea4106"
+checksum = "54986aa4bfc9b98c6a5f40184223658d187159d7b3c6af33f2b2aa25ae1db0fa"
 dependencies = [
  "base64ct",
- "rand_core 0.6.2",
+ "rand_core 0.6.3",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58"
+checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5"
 
 [[package]]
 name = "pathdiff"
@@ -5539,9 +5556,9 @@ dependencies = [
 
 [[package]]
 name = "pbkdf2"
-version = "0.7.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "309c95c5f738c85920eb7062a2de29f3840d4f96974453fc9ac1ba078da9c627"
+checksum = "bf916dd32dd26297907890d99dc2740e33f6bd9073965af4ccff2967962f5508"
 dependencies = [
  "base64ct",
  "crypto-mac",
@@ -5600,9 +5617,9 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -5632,35 +5649,74 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f"
 dependencies = [
- "fixedbitset 0.4.0",
+ "fixedbitset 0.4.1",
  "indexmap",
 ]
 
+[[package]]
+name = "phf"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+dependencies = [
+ "phf_shared",
+ "rand 0.8.4",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+ "uncased",
+]
+
 [[package]]
 name = "pin-project"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
+checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
+checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
 
 [[package]]
 name = "pin-utils"
@@ -5670,15 +5726,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.19"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
 
 [[package]]
 name = "plotters"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a"
+checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a"
 dependencies = [
  "num-traits 0.2.14",
  "plotters-backend",
@@ -5689,15 +5745,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590"
+checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211"
+checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9"
 dependencies = [
  "plotters-backend",
 ]
@@ -5708,16 +5764,16 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
 dependencies = [
- "cpuid-bool 0.2.0",
+ "cpuid-bool",
  "opaque-debug 0.3.0",
  "universal-hash",
 ]
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.10"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "pretty"
@@ -5736,9 +5792,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
  "version_check",
 ]
 
@@ -5748,8 +5804,8 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
  "version_check",
 ]
 
@@ -5776,9 +5832,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.28"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
  "unicode-xid 0.2.2",
 ]
@@ -5789,11 +5845,11 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fnv",
  "lazy_static 1.4.0",
  "memchr",
- "parking_lot",
+ "parking_lot 0.11.2",
  "thiserror",
 ]
 
@@ -5808,9 +5864,9 @@ dependencies = [
  "byteorder",
  "lazy_static 1.4.0",
  "num-traits 0.2.14",
- "quick-error 2.0.0",
+ "quick-error 2.0.1",
  "rand 0.8.4",
- "rand_chacha 0.3.0",
+ "rand_chacha 0.3.1",
  "rand_xorshift",
  "regex-syntax",
  "rusty-fork",
@@ -5842,12 +5898,12 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0de80796b316aec75344095a6d2ef68ec9b8f573b9e7adc821149ba3598e270"
 dependencies = [
- "ansi_term 0.12.1",
+ "ansi_term",
  "atty",
  "config",
  "directories",
  "petgraph 0.6.0",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde-value",
  "tint",
 ]
@@ -5869,9 +5925,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quick-error"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-junit"
@@ -5903,11 +5959,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.9"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.36",
 ]
 
 [[package]]
@@ -5936,9 +5992,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
  "libc",
- "rand_chacha 0.3.0",
- "rand_core 0.6.2",
- "rand_hc 0.3.0",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.3",
+ "rand_hc 0.3.1",
 ]
 
 [[package]]
@@ -5953,12 +6009,12 @@ dependencies = [
 
 [[package]]
 name = "rand_chacha"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.2",
+ "rand_core 0.6.3",
 ]
 
 [[package]]
@@ -5972,11 +6028,11 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.2",
+ "getrandom 0.2.5",
 ]
 
 [[package]]
@@ -5990,11 +6046,11 @@ dependencies = [
 
 [[package]]
 name = "rand_hc"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
 dependencies = [
- "rand_core 0.6.2",
+ "rand_core 0.6.3",
 ]
 
 [[package]]
@@ -6003,7 +6059,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "rand_core 0.6.2",
+ "rand_core 0.6.3",
 ]
 
 [[package]]
@@ -6054,7 +6110,7 @@ dependencies = [
  "move-resource-viewer",
  "move-stackless-bytecode",
  "read-write-set-dynamic",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
@@ -6067,14 +6123,14 @@ dependencies = [
  "move-bytecode-utils",
  "move-core-types",
  "move-read-write-set-types",
- "workspace-hack 0.1.0 (git+https://github.com/diem/move?rev=98ed299a7e3a9223019c9bdf4dd92fea9faef860)",
+ "workspace-hack",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"
 dependencies = [
  "bitflags",
 ]
@@ -6094,7 +6150,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
- "getrandom 0.2.2",
+ "getrandom 0.2.5",
  "redox_syscall",
 ]
 
@@ -6113,9 +6169,9 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -6132,19 +6188,18 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 dependencies = [
- "byteorder",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.23"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remove_dir_all"
@@ -6157,15 +6212,16 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.2"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf12057f289428dbf5c591c74bf10392e4a8003f993405a902f20117019022d4"
+checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525"
 dependencies = [
  "base64",
  "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
+ "h2",
  "http",
  "http-body",
  "hyper",
@@ -6178,11 +6234,12 @@ dependencies = [
  "native-tls",
  "percent-encoding",
  "pin-project-lite",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
- "serde_urlencoded 0.7.0",
+ "serde_urlencoded 0.7.1",
  "tokio",
  "tokio-native-tls",
+ "tokio-util 0.6.9",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -6232,11 +6289,11 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "041bb0202c14f6a158bbbf086afb03d0c6e975c2dec7d4912f8061ed44f290af"
 dependencies = [
- "cfg-if 1.0.0",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "cfg-if",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
  "rustc_version 0.3.3",
- "syn 1.0.74",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -6258,7 +6315,7 @@ dependencies = [
  "rusoto_credential",
  "rusoto_signature",
  "rustc_version 0.2.3",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "tokio",
  "xml-rs",
@@ -6275,7 +6332,7 @@ dependencies = [
  "dirs-next",
  "futures",
  "hyper",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "shlex 0.1.1",
  "tokio",
@@ -6292,7 +6349,7 @@ dependencies = [
  "bytes",
  "futures",
  "rusoto_core",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_derive",
  "serde_json",
 ]
@@ -6316,9 +6373,9 @@ dependencies = [
  "pin-project-lite",
  "rusoto_credential",
  "rustc_version 0.2.3",
- "serde 1.0.130",
+ "serde 1.0.136",
  "sha2",
- "time 0.2.25",
+ "time 0.2.27",
  "tokio",
 ]
 
@@ -6345,9 +6402,9 @@ checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.18"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
 [[package]]
 name = "rustc-hash"
@@ -6373,6 +6430,15 @@ dependencies = [
  "semver 0.11.0",
 ]
 
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver 1.0.6",
+]
+
 [[package]]
 name = "rustls"
 version = "0.19.1"
@@ -6400,9 +6466,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.5"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
 
 [[package]]
 name = "safemem"
@@ -6433,8 +6499,8 @@ dependencies = [
  "once_cell",
  "proptest",
  "rand 0.8.4",
- "rand_core 0.6.2",
- "serde 1.0.130",
+ "rand_core 0.6.3",
+ "serde 1.0.136",
  "serde_json",
  "tempfile",
  "thiserror",
@@ -6499,7 +6565,7 @@ dependencies = [
  "arc-swap",
  "bitvec",
  "criterion",
- "itertools 0.10.1",
+ "itertools",
  "once_cell",
  "proptest",
  "rand 0.8.4",
@@ -6519,9 +6585,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.1.2"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
+checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -6532,9 +6598,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.1.1"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee48cdde5ed250b0d3252818f646e174ab414036edb884dde62d80a3ac6082d"
+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -6582,11 +6648,11 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
+checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -6612,9 +6678,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
 
 [[package]]
 name = "serde"
-version = "1.0.130"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
 dependencies = [
  "serde_derive",
 ]
@@ -6630,7 +6696,7 @@ dependencies = [
  "heck",
  "include_dir",
  "maplit",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde-reflection",
  "serde_bytes",
  "serde_yaml",
@@ -6652,11 +6718,11 @@ dependencies = [
 
 [[package]]
 name = "serde-name"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87442b7a30baedc6e8875cb7156cb0e2cf41cdd9f13c34de73090c463f028bd8"
+checksum = "12c47087018ec281d1cdab673d36aea22d816b54d498264029c05d5fa1910da6"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
  "thiserror",
 ]
 
@@ -6667,7 +6733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "167450ba550f903a2b35a81ba3ca387585189e2430e3df6b94b95f3bec2f26bd"
 dependencies = [
  "once_cell",
- "serde 1.0.130",
+ "serde 1.0.136",
  "thiserror",
 ]
 
@@ -6678,7 +6744,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
 dependencies = [
  "ordered-float",
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -6687,51 +6753,51 @@ version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
 name = "serde_cbor"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
 dependencies = [
  "half",
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.130"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.73"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5"
+checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
 dependencies = [
  "indexmap",
  "itoa 1.0.1",
  "ryu",
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
 name = "serde_repr"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
+checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -6741,32 +6807,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
 dependencies = [
  "dtoa",
- "itoa 0.4.7",
- "serde 1.0.130",
+ "itoa 0.4.8",
+ "serde 1.0.136",
  "url",
 ]
 
 [[package]]
 name = "serde_urlencoded"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 0.4.7",
+ "itoa 1.0.1",
  "ryu",
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.17"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
+checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
 dependencies = [
- "dtoa",
- "linked-hash-map",
- "serde 1.0.130",
+ "indexmap",
+ "ryu",
+ "serde 1.0.136",
  "yaml-rust",
 ]
 
@@ -6777,7 +6843,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d"
 dependencies = [
  "lazy_static 1.4.0",
- "parking_lot",
+ "parking_lot 0.11.2",
  "serial_test_derive",
 ]
 
@@ -6787,9 +6853,9 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -6806,32 +6872,52 @@ dependencies = [
 
 [[package]]
 name = "sha-1"
-version = "0.9.4"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f"
+checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpuid-bool 0.1.2",
+ "cfg-if",
+ "cpufeatures",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "sha-1"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "sha1"
-version = "0.6.0"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+dependencies = [
+ "sha1_smol",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 
 [[package]]
 name = "sha2"
-version = "0.9.3"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpuid-bool 0.1.2",
+ "cfg-if",
+ "cpufeatures",
  "digest 0.9.0",
  "opaque-debug 0.3.0",
 ]
@@ -6850,9 +6936,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.1"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
 dependencies = [
  "lazy_static 1.4.0",
 ]
@@ -6887,7 +6973,7 @@ dependencies = [
  "hex",
  "mirai-annotations",
  "proptest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "static_assertions",
  "thiserror",
 ]
@@ -6903,9 +6989,9 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.3.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f0242b8e50dd9accdd56170e94ca1ebd223b098eb9c83539a6e367d0f36ae68"
+checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4"
 
 [[package]]
 name = "simplelog"
@@ -6918,6 +7004,12 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+
 [[package]]
 name = "sized-chunks"
 version = "0.6.5"
@@ -6930,9 +7022,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
 
 [[package]]
 name = "slug"
@@ -6945,9 +7037,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
 [[package]]
 name = "smawk"
@@ -7004,30 +7096,11 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "socket-bench-server"
-version = "0.1.0"
-dependencies = [
- "aptos-config",
- "aptos-crypto",
- "aptos-logger",
- "aptos-types",
- "aptos-workspace-hack",
- "futures",
- "memsocket",
- "netcore",
- "network",
- "network-builder",
- "rand 0.8.4",
- "tokio",
- "tokio-util",
-]
-
 [[package]]
 name = "socket2"
-version = "0.4.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
 dependencies = [
  "libc",
  "winapi 0.3.9",
@@ -7047,9 +7120,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "standback"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2beb4d1860a61f571530b3f855a1b538d0200f7871c63331ecd6f17b1f014f8"
+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
 dependencies = [
  "version_check",
 ]
@@ -7080,7 +7153,7 @@ dependencies = [
  "futures",
  "mempool-notifications",
  "network",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-interface",
  "storage-service-client",
  "thiserror",
@@ -7152,7 +7225,7 @@ dependencies = [
  "executor-types",
  "fail",
  "futures",
- "itertools 0.10.1",
+ "itertools",
  "mempool-notifications",
  "memsocket",
  "move-core-types",
@@ -7162,7 +7235,7 @@ dependencies = [
  "once_cell",
  "proptest",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "short-hex-str",
  "storage-interface",
  "storage-service",
@@ -7204,11 +7277,11 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "serde 1.0.130",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "serde 1.0.136",
  "serde_derive",
- "syn 1.0.74",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -7218,13 +7291,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
  "base-x",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "serde 1.0.130",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "serde 1.0.136",
  "serde_derive",
  "serde_json",
  "sha1",
- "syn 1.0.74",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -7245,7 +7318,7 @@ dependencies = [
  "aptos-types",
  "aptos-workspace-hack",
  "bcs",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-interface",
 ]
 
@@ -7260,11 +7333,11 @@ dependencies = [
  "aptos-types",
  "aptos-workspace-hack",
  "bcs",
- "itertools 0.10.1",
+ "itertools",
  "move-core-types",
- "parking_lot",
+ "parking_lot 0.11.2",
  "scratchpad",
- "serde 1.0.130",
+ "serde 1.0.136",
  "thiserror",
 ]
 
@@ -7284,7 +7357,7 @@ dependencies = [
  "aptosdb",
  "bcs",
  "futures",
- "itertools 0.10.1",
+ "itertools",
  "proptest",
  "rand 0.8.4",
  "storage-client",
@@ -7326,7 +7399,7 @@ dependencies = [
  "move-core-types",
  "network",
  "once_cell",
- "serde 1.0.130",
+ "serde 1.0.136",
  "storage-interface",
  "storage-service-types",
  "thiserror",
@@ -7344,7 +7417,7 @@ dependencies = [
  "claim",
  "num-traits 0.2.14",
  "proptest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "thiserror",
 ]
 
@@ -7365,9 +7438,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "structopt"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c"
+checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
 dependencies = [
  "clap",
  "lazy_static 1.4.0",
@@ -7382,16 +7455,16 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
  "heck",
  "proc-macro-error",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
 name = "subtle"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "supports-color"
@@ -7415,7 +7488,7 @@ dependencies = [
  "hex",
  "move-core-types",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "structopt",
 ]
@@ -7433,24 +7506,24 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.74"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
  "unicode-xid 0.2.2",
 ]
 
 [[package]]
 name = "synstructure"
-version = "0.12.4"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
  "unicode-xid 0.2.2",
 ]
 
@@ -7462,9 +7535,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9bffcddbc2458fa3e6058414599e3c838a022abae82e5c67b4f7f80298d5bff"
+checksum = "d7fa7e55043acb85fca6b3c01485a2eeb6b69c5d21002e273c79e465f43b7ac1"
 
 [[package]]
 name = "target-spec"
@@ -7473,19 +7546,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdc03d14ed79a75163d3509ebf1970a2ec67945c5cac68d947d1dddace43cec0"
 dependencies = [
  "cfg-expr",
- "serde 1.0.130",
+ "serde 1.0.136",
  "target-lexicon",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
+ "fastrand",
  "libc",
- "rand 0.8.4",
  "redox_syscall",
  "remove_dir_all",
  "winapi 0.3.9",
@@ -7493,9 +7566,9 @@ dependencies = [
 
 [[package]]
 name = "tera"
-version = "1.7.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2617ab2fb1de8587a988a761692e59895438bebf404725d4f2123251f60bf23e"
+checksum = "d3cac831b615c25bcef632d1cabf864fa05813baad3d526829db18eb70e8b58d"
 dependencies = [
  "chrono",
  "chrono-tz",
@@ -7507,7 +7580,7 @@ dependencies = [
  "pest_derive",
  "rand 0.8.4",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "slug",
  "unic-segment",
@@ -7515,18 +7588,18 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "terminal_size"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406"
+checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
 dependencies = [
  "libc",
  "winapi 0.3.9",
@@ -7581,29 +7654,29 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.26"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.26"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
 dependencies = [
  "once_cell",
 ]
@@ -7621,9 +7694,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.2.25"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1195b046942c221454c2539395f85413b33383a067449d78aab2b7b052a142f7"
+checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
 dependencies = [
  "const_fn",
  "libc",
@@ -7646,15 +7719,15 @@ dependencies = [
 
 [[package]]
 name = "time-macros-impl"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
+checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
 dependencies = [
  "proc-macro-hack",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
  "standback",
- "syn 1.0.74",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -7681,15 +7754,15 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
 ]
 
 [[package]]
 name = "tinyvec"
-version = "1.1.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023"
+checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -7702,29 +7775,29 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.9.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c"
+checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
 dependencies = [
- "autocfg",
  "bytes",
  "libc",
  "memchr",
  "mio",
  "num_cpus",
  "once_cell",
- "parking_lot",
+ "parking_lot 0.12.0",
  "pin-project-lite",
  "signal-hook-registry",
+ "socket2",
  "tokio-macros",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "tokio-io-timeout"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9"
+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
 dependencies = [
  "pin-project-lite",
  "tokio",
@@ -7732,13 +7805,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "1.3.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
+checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
@@ -7775,9 +7848,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.4"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c535f53c0cfa1acace62995a8994fc9cc1f12d202420da96ff306ee24d576469"
+checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -7786,9 +7859,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-test"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f58403903e94d4bc56805e46597fced893410b2e753e229d3f7f22423ea03f67"
+checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3"
 dependencies = [
  "async-stream",
  "bytes",
@@ -7812,9 +7885,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.7"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
+checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
 dependencies = [
  "bytes",
  "futures-core",
@@ -7825,6 +7898,20 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64910e1b9c1901aaf5375561e35b9c057d95ff41a44ede043a03e09279eabaf1"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "log",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.8"
@@ -7832,7 +7919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
 dependencies = [
  "indexmap",
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
 [[package]]
@@ -7843,21 +7930,22 @@ checksum = "2782eb01c48f7f6f66d63bebe64dd8302dbf6bc0be0d65a85a1854d472e2dfa8"
 dependencies = [
  "combine",
  "indexmap",
- "itertools 0.10.1",
+ "itertools",
  "kstring",
 ]
 
 [[package]]
 name = "tower"
-version = "0.4.6"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f715efe02c0862926eb463e49368d38ddb119383475686178e32e26d15d06a66"
+checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e"
 dependencies = [
  "futures-core",
  "futures-util",
  "pin-project",
+ "pin-project-lite",
  "tokio",
- "tokio-util",
+ "tokio-util 0.7.0",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -7877,11 +7965,11 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.26"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
+checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "log",
  "pin-project-lite",
  "tracing-attributes",
@@ -7890,22 +7978,23 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.15"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
+checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
+checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23"
 dependencies = [
  "lazy_static 1.4.0",
+ "valuable",
 ]
 
 [[package]]
@@ -7921,11 +8010,11 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.3"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3"
+checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce"
 dependencies = [
- "ansi_term 0.12.1",
+ "ansi_term",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -7966,11 +8055,11 @@ dependencies = [
  "aptos-workspace-hack",
  "futures",
  "generate-key",
- "itertools 0.10.1",
+ "itertools",
  "rand 0.8.4",
- "rand_core 0.6.2",
+ "rand_core 0.6.3",
  "reqwest",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "structopt",
  "termion",
@@ -7985,13 +8074,13 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "trybuild"
-version = "1.0.41"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b"
+checksum = "2d60539445867cdd9680b2bfe2d0428f1814b7d5c9652f09d8d3eae9d19308db"
 dependencies = [
  "glob",
- "lazy_static 1.4.0",
- "serde 1.0.130",
+ "once_cell",
+ "serde 1.0.136",
  "serde_json",
  "termcolor",
  "toml",
@@ -8023,7 +8112,7 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.8.4",
- "sha-1 0.9.4",
+ "sha-1 0.9.8",
  "thiserror",
  "url",
  "utf-8",
@@ -8040,11 +8129,11 @@ dependencies = [
 
 [[package]]
 name = "twox-hash"
-version = "1.6.1"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e"
+checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "static_assertions",
 ]
 
@@ -8056,9 +8145,9 @@ checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae"
 
 [[package]]
 name = "typenum"
-version = "1.12.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "ucd-trie"
@@ -8066,6 +8155,15 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 
+[[package]]
+name = "uncased"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baeed7327e25054889b9bd4f975f32e5f4c5d434042d59ab6cd4142c0a76ed0"
+dependencies = [
+ "version_check",
+]
+
 [[package]]
 name = "unic-char-property"
 version = "0.9.0"
@@ -8127,33 +8225,30 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.4"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.17"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.7.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
 [[package]]
 name = "unicode-xid"
@@ -8169,17 +8264,17 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "unindent"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
+checksum = "514672a55d7380da379785a4d70ca8386c8883ff7eaae877be4d2081cebe73d8"
 
 [[package]]
 name = "universal-hash"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
+checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
 dependencies = [
- "generic-array 0.14.4",
+ "generic-array 0.14.5",
  "subtle",
 ]
 
@@ -8191,9 +8286,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "ureq"
-version = "1.5.4"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "294b85ef5dbc3670a72e82a89971608a1fcc4ed5c7c5a2895230d31a95f0569b"
+checksum = "2b8b063c2d59218ae09f22b53c42eaad0d53516457905f5235ca4bc9e99daa71"
 dependencies = [
  "base64",
  "chunked_transfer",
@@ -8201,7 +8296,7 @@ dependencies = [
  "native-tls",
  "once_cell",
  "qstring",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "url",
 ]
@@ -8220,9 +8315,9 @@ dependencies = [
 
 [[package]]
 name = "utf-8"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
 [[package]]
 name = "utf8parse"
@@ -8236,24 +8331,30 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.136",
 ]
 
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
 [[package]]
 name = "variant_count"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aae2faf80ac463422992abf4de234731279c058aaf33171ca70277c98406b124"
 dependencies = [
- "quote 1.0.9",
- "syn 1.0.74",
+ "quote 1.0.15",
+ "syn 1.0.86",
 ]
 
 [[package]]
 name = "vcpkg"
-version = "0.2.11"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "vec_map"
@@ -8263,9 +8364,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "version_check"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vm-genesis"
@@ -8336,8 +8437,8 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
 ]
 
 [[package]]
@@ -8389,14 +8490,14 @@ dependencies = [
  "percent-encoding",
  "pin-project",
  "scoped-tls",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
- "serde_urlencoded 0.7.0",
+ "serde_urlencoded 0.7.1",
  "tokio",
  "tokio-rustls",
  "tokio-stream",
  "tokio-tungstenite",
- "tokio-util",
+ "tokio-util 0.6.9",
  "tower-service",
  "tracing",
 ]
@@ -8415,38 +8516,36 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.71"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7"
+checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
- "cfg-if 1.0.0",
- "serde 1.0.130",
- "serde_json",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.71"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8"
+checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
 dependencies = [
  "bumpalo",
  "lazy_static 1.4.0",
  "log",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.21"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e67a5806118af01f0d9045915676b22aaebecf4178ae7021bc171dab0b897ab"
+checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -8454,38 +8553,38 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.71"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b"
+checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
 dependencies = [
- "quote 1.0.9",
+ "quote 1.0.15",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.71"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e"
+checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.71"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1"
+checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
 
 [[package]]
 name = "web-sys"
-version = "0.3.48"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b"
+checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -8503,12 +8602,13 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "4.0.2"
+version = "4.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef"
+checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2"
 dependencies = [
+ "either",
+ "lazy_static 1.4.0",
  "libc",
- "thiserror",
 ]
 
 [[package]]
@@ -8548,6 +8648,49 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6"
+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.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
+
 [[package]]
 name = "winreg"
 version = "0.7.0"
@@ -8557,12 +8700,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "workspace-hack"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beffa227304dbaea3ad6a06ac674f9bc83a3dec3b7f63eeb442de37e7cb6bb01"
-
 [[package]]
 name = "workspace-hack"
 version = "0.1.0"
@@ -8574,23 +8711,23 @@ dependencies = [
  "byteorder",
  "codespan-reporting",
  "crossbeam-utils",
- "getrandom 0.2.2",
+ "getrandom 0.2.5",
  "libc",
  "log",
  "memchr",
  "num-traits 0.2.14",
  "plotters",
  "proc-macro2 0.4.30",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.36",
  "quote 0.6.13",
- "quote 1.0.9",
+ "quote 1.0.15",
  "rand_core 0.5.1",
  "regex",
  "regex-automata",
  "regex-syntax",
- "serde 1.0.130",
+ "serde 1.0.136",
  "syn 0.15.44",
- "syn 1.0.74",
+ "syn 1.0.86",
  "tracing-core",
 ]
 
@@ -8610,7 +8747,7 @@ dependencies = [
  "chrono",
  "colored-diff",
  "determinator",
- "env_logger 0.8.3",
+ "env_logger 0.8.4",
  "globset",
  "guppy",
  "hakari",
@@ -8621,7 +8758,7 @@ dependencies = [
  "nextest-runner",
  "rayon",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.136",
  "serde_json",
  "structopt",
  "supports-color",
@@ -8644,7 +8781,7 @@ dependencies = [
  "log",
  "once_cell",
  "ouroboros",
- "serde 1.0.130",
+ "serde 1.0.136",
  "toml",
 ]
 
@@ -8656,7 +8793,7 @@ dependencies = [
  "guppy",
  "hakari",
  "once_cell",
- "serde 1.0.130",
+ "serde 1.0.136",
  "toml",
  "x-core",
 ]
@@ -8668,15 +8805,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f3519d56987103ef084eba6ddfc3be45b7eaee08f2d60bc8495cdca30362a32"
 dependencies = [
  "curve25519-dalek-fiat",
- "rand_core 0.6.2",
+ "rand_core 0.6.3",
  "zeroize",
 ]
 
 [[package]]
 name = "xml-rs"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a"
+checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
 
 [[package]]
 name = "yaml-rust"
@@ -8689,21 +8826,21 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.2.0"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36"
+checksum = "50344758e2f40e3a1fcfc8f6f91aa57b5f8ebd8d27919fe6451f15aaaf9ee608"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.2.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7"
+checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.74",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "syn 1.0.86",
  "synstructure",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 3ee65ed2e8b6e..c56e821810b34 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,7 +81,6 @@ members = [
     "network/discovery",
     "network/memsocket",
     "network/netcore",
-    "network/socket-bench-server",
     "sdk",
     "sdk/offchain",
     "sdk/transaction-builder",
diff --git a/crates/aptos-crypto/src/unit_tests/ed25519_test.rs b/crates/aptos-crypto/src/unit_tests/ed25519_test.rs
index 908988f74b2b8..f2295471935a6 100644
--- a/crates/aptos-crypto/src/unit_tests/ed25519_test.rs
+++ b/crates/aptos-crypto/src/unit_tests/ed25519_test.rs
@@ -16,7 +16,7 @@ use core::{
     convert::TryFrom,
     ops::{Add, Index, IndexMut, Mul, Neg},
 };
-use ed25519_dalek::ed25519::signature::{Signature as _, Verifier as _};
+use ed25519_dalek::ed25519::signature::Verifier as _;
 
 use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher};
 use digest::Digest;
diff --git a/crates/aptos-workspace-hack/Cargo.toml b/crates/aptos-workspace-hack/Cargo.toml
index fff17ce55d951..8dfec68e2f659 100644
--- a/crates/aptos-workspace-hack/Cargo.toml
+++ b/crates/aptos-workspace-hack/Cargo.toml
@@ -12,96 +12,98 @@ edition = "2018"
 ### BEGIN HAKARI SECTION
 [dependencies]
 Inflector = { version = "0.11.4", features = ["heavyweight", "lazy_static", "regex"] }
-anyhow = { version = "1.0.52", features = ["backtrace", "std"] }
-backtrace = { version = "0.3.56", features = ["addr2line", "gimli-symbolize", "miniz_oxide", "object", "serde", "std"] }
-bitvec = { version = "0.19.5", features = ["alloc", "atomic", "std"] }
+anyhow = { version = "1.0.56", features = ["backtrace", "std"] }
+backtrace = { version = "0.3.58", features = ["addr2line", "gimli-symbolize", "miniz_oxide", "object", "serde", "std"] }
 byteorder = { version = "1.4.3", features = ["i128", "std"] }
-bytes = { version = "1.0.1", features = ["serde", "std"] }
+bytes = { version = "1.1.0", features = ["serde", "std"] }
 chrono = { version = "0.4.19", features = ["clock", "libc", "oldtime", "serde", "std", "time", "winapi"] }
-clap = { version = "2.33.3", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] }
-crossbeam-channel = { version = "0.5.1", features = ["crossbeam-utils", "std"] }
+clap = { version = "2.34.0", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] }
+crossbeam-channel = { version = "0.5.2", features = ["crossbeam-utils", "std"] }
 crossbeam-deque = { version = "0.8.1", features = ["crossbeam-epoch", "crossbeam-utils", "std"] }
-crossbeam-queue = { version = "0.3.1", features = ["alloc", "std"] }
-crossbeam-utils = { version = "0.8.3", features = ["lazy_static", "std"] }
+crossbeam-queue = { version = "0.3.4", features = ["alloc", "std"] }
+crossbeam-utils = { version = "0.8.7", features = ["lazy_static", "std"] }
 either = { version = "1.6.1", features = ["use_std"] }
 futures-channel = { version = "0.3.21", features = ["alloc", "futures-sink", "sink", "std"] }
 futures-core = { version = "0.3.21", features = ["alloc", "std"] }
-futures-io = { version = "0.3.16", features = ["std"] }
+futures-io = { version = "0.3.21", features = ["std"] }
 futures-sink = { version = "0.3.21", features = ["alloc", "std"] }
-futures-util = { version = "0.3.16", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] }
-hyper = { version = "0.14.11", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
-indexmap = { version = "1.7.0", default-features = false, features = ["std"] }
-itertools = { version = "0.10.1", features = ["use_alloc", "use_std"] }
-libc = { version = "0.2.112", features = ["std"] }
+futures-util = { version = "0.3.17", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] }
+generic-array = { version = "0.14.5", default-features = false, features = ["more_lengths"] }
+hyper = { version = "0.14.17", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
+indexmap = { version = "1.8.0", default-features = false, features = ["std"] }
+itertools = { version = "0.10.3", features = ["use_alloc", "use_std"] }
+libc = { version = "0.2.119", features = ["std"] }
 log = { version = "0.4.14", default-features = false, features = ["serde", "std"] }
-memchr = { version = "2.4.0", features = ["std", "use_std"] }
+memchr = { version = "2.4.1", features = ["std", "use_std"] }
 num-integer = { version = "0.1.44", default-features = false, features = ["i128", "std"] }
 num-traits = { version = "0.2.14", features = ["i128", "std"] }
-plotters = { version = "0.3.0", default-features = false, features = ["area_series", "evcxr", "histogram", "line_series", "plotters-svg", "svg_backend"] }
+parking_lot = { version = "0.12.0", features = ["send_guard"] }
+phf_shared = { version = "0.10.0", features = ["std", "uncased"] }
+plotters = { version = "0.3.1", default-features = false, features = ["area_series", "evcxr", "histogram", "line_series", "plotters-svg", "svg_backend"] }
 rand = { version = "0.8.4", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] }
 regex = { version = "1.4.3", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "thread_local", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
-regex-automata = { version = "0.1.9", features = ["regex-syntax", "std"] }
-reqwest = { version = "0.11.2", features = ["__tls", "blocking", "default-tls", "hyper-tls", "json", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] }
+regex-automata = { version = "0.1.10", features = ["regex-syntax", "std"] }
+reqwest = { version = "0.11.9", features = ["__tls", "blocking", "default-tls", "hyper-tls", "json", "native-tls-crate", "serde_json", "stream", "tokio-native-tls", "tokio-util"] }
 rusty-fork = { version = "0.3.0", features = ["timeout", "wait-timeout"] }
-serde = { version = "1.0.130", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
-serde_json = { version = "1.0.73", features = ["indexmap", "preserve_order", "std"] }
-sha-1 = { version = "0.9.4", features = ["std"] }
-standback = { version = "0.2.15", default-features = false, features = ["std"] }
-subtle = { version = "2.4.0", default-features = false, features = ["std"] }
-tiny-keccak = { version = "2.0.2", features = ["sha3"] }
-tokio = { version = "1.9.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] }
-tokio-util = { version = "0.6.7", features = ["codec", "compat", "futures-io", "io"] }
+serde = { version = "1.0.136", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
+serde_json = { version = "1.0.79", features = ["indexmap", "preserve_order", "std"] }
+sha-1 = { version = "0.9.8", features = ["std"] }
+standback = { version = "0.2.17", default-features = false, features = ["std"] }
+subtle = { version = "2.4.1", default-features = false, features = ["std"] }
+tokio = { version = "1.17.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "test-util", "time", "tokio-macros", "winapi"] }
+tokio-util = { version = "0.6.9", features = ["codec", "compat", "futures-io", "io"] }
 toml = { version = "0.5.8" }
-tracing = { version = "0.1.26", features = ["attributes", "log", "std", "tracing-attributes"] }
+tracing = { version = "0.1.31", features = ["attributes", "log", "std", "tracing-attributes"] }
 warp = { version = "0.3.2", features = ["multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
-zeroize = { version = "1.2.0", features = ["alloc", "zeroize_derive"] }
+zeroize = { version = "1.5.3", features = ["alloc", "zeroize_derive"] }
 
 [build-dependencies]
 Inflector = { version = "0.11.4", features = ["heavyweight", "lazy_static", "regex"] }
-anyhow = { version = "1.0.52", features = ["backtrace", "std"] }
-backtrace = { version = "0.3.56", features = ["addr2line", "gimli-symbolize", "miniz_oxide", "object", "serde", "std"] }
-bitvec = { version = "0.19.5", features = ["alloc", "atomic", "std"] }
+anyhow = { version = "1.0.56", features = ["backtrace", "std"] }
+backtrace = { version = "0.3.58", features = ["addr2line", "gimli-symbolize", "miniz_oxide", "object", "serde", "std"] }
 byteorder = { version = "1.4.3", features = ["i128", "std"] }
-bytes = { version = "1.0.1", features = ["serde", "std"] }
-cc = { version = "1.0.67", default-features = false, features = ["jobserver", "parallel"] }
+bytes = { version = "1.1.0", features = ["serde", "std"] }
+cc = { version = "1.0.73", default-features = false, features = ["jobserver", "parallel"] }
 chrono = { version = "0.4.19", features = ["clock", "libc", "oldtime", "serde", "std", "time", "winapi"] }
-clap = { version = "2.33.3", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] }
-crossbeam-channel = { version = "0.5.1", features = ["crossbeam-utils", "std"] }
+clap = { version = "2.34.0", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] }
+crossbeam-channel = { version = "0.5.2", features = ["crossbeam-utils", "std"] }
 crossbeam-deque = { version = "0.8.1", features = ["crossbeam-epoch", "crossbeam-utils", "std"] }
-crossbeam-queue = { version = "0.3.1", features = ["alloc", "std"] }
-crossbeam-utils = { version = "0.8.3", features = ["lazy_static", "std"] }
+crossbeam-queue = { version = "0.3.4", features = ["alloc", "std"] }
+crossbeam-utils = { version = "0.8.7", features = ["lazy_static", "std"] }
 either = { version = "1.6.1", features = ["use_std"] }
 futures-channel = { version = "0.3.21", features = ["alloc", "futures-sink", "sink", "std"] }
 futures-core = { version = "0.3.21", features = ["alloc", "std"] }
-futures-io = { version = "0.3.16", features = ["std"] }
+futures-io = { version = "0.3.21", features = ["std"] }
 futures-sink = { version = "0.3.21", features = ["alloc", "std"] }
-futures-util = { version = "0.3.16", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] }
-hyper = { version = "0.14.11", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
-indexmap = { version = "1.7.0", default-features = false, features = ["std"] }
-itertools = { version = "0.10.1", features = ["use_alloc", "use_std"] }
-libc = { version = "0.2.112", features = ["std"] }
+futures-util = { version = "0.3.17", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] }
+generic-array = { version = "0.14.5", default-features = false, features = ["more_lengths"] }
+hyper = { version = "0.14.17", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
+indexmap = { version = "1.8.0", default-features = false, features = ["std"] }
+itertools = { version = "0.10.3", features = ["use_alloc", "use_std"] }
+libc = { version = "0.2.119", features = ["std"] }
 log = { version = "0.4.14", default-features = false, features = ["serde", "std"] }
-memchr = { version = "2.4.0", features = ["std", "use_std"] }
+memchr = { version = "2.4.1", features = ["std", "use_std"] }
 num-integer = { version = "0.1.44", default-features = false, features = ["i128", "std"] }
 num-traits = { version = "0.2.14", features = ["i128", "std"] }
-plotters = { version = "0.3.0", default-features = false, features = ["area_series", "evcxr", "histogram", "line_series", "plotters-svg", "svg_backend"] }
+parking_lot = { version = "0.12.0", features = ["send_guard"] }
+phf_shared = { version = "0.10.0", features = ["std", "uncased"] }
+plotters = { version = "0.3.1", default-features = false, features = ["area_series", "evcxr", "histogram", "line_series", "plotters-svg", "svg_backend"] }
 rand = { version = "0.8.4", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] }
 regex = { version = "1.4.3", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "thread_local", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
-regex-automata = { version = "0.1.9", features = ["regex-syntax", "std"] }
-reqwest = { version = "0.11.2", features = ["__tls", "blocking", "default-tls", "hyper-tls", "json", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] }
+regex-automata = { version = "0.1.10", features = ["regex-syntax", "std"] }
+reqwest = { version = "0.11.9", features = ["__tls", "blocking", "default-tls", "hyper-tls", "json", "native-tls-crate", "serde_json", "stream", "tokio-native-tls", "tokio-util"] }
 rusty-fork = { version = "0.3.0", features = ["timeout", "wait-timeout"] }
-serde = { version = "1.0.130", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
-serde_json = { version = "1.0.73", features = ["indexmap", "preserve_order", "std"] }
-sha-1 = { version = "0.9.4", features = ["std"] }
-standback = { version = "0.2.15", default-features = false, features = ["std"] }
-subtle = { version = "2.4.0", default-features = false, features = ["std"] }
-syn = { version = "1.0.74", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
-tiny-keccak = { version = "2.0.2", features = ["sha3"] }
-tokio = { version = "1.9.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] }
-tokio-util = { version = "0.6.7", features = ["codec", "compat", "futures-io", "io"] }
+serde = { version = "1.0.136", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
+serde_json = { version = "1.0.79", features = ["indexmap", "preserve_order", "std"] }
+sha-1 = { version = "0.9.8", features = ["std"] }
+standback = { version = "0.2.17", default-features = false, features = ["std"] }
+subtle = { version = "2.4.1", default-features = false, features = ["std"] }
+syn = { version = "1.0.86", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
+tokio = { version = "1.17.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "test-util", "time", "tokio-macros", "winapi"] }
+tokio-util = { version = "0.6.9", features = ["codec", "compat", "futures-io", "io"] }
 toml = { version = "0.5.8" }
-tracing = { version = "0.1.26", features = ["attributes", "log", "std", "tracing-attributes"] }
+tracing = { version = "0.1.31", features = ["attributes", "log", "std", "tracing-attributes"] }
 warp = { version = "0.3.2", features = ["multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
-zeroize = { version = "1.2.0", features = ["alloc", "zeroize_derive"] }
+zeroize = { version = "1.5.3", features = ["alloc", "zeroize_derive"] }
 
 ### END HAKARI SECTION
diff --git a/network/Cargo.toml b/network/Cargo.toml
index b06a7cc8f0d64..025b2a6077fe4 100644
--- a/network/Cargo.toml
+++ b/network/Cargo.toml
@@ -63,17 +63,8 @@ proptest = { version = "1.0.0", default-features = true }
 proptest-derive = { version = "0.3.0" }
 rand_core = "0.6.2"
 serial_test = "0.5.1"
-socket-bench-server = { path = "./socket-bench-server" }
 
 [features]
 default = []
 fuzzing = ["bitvec/fuzzing", "aptos-config/fuzzing", "aptos-crypto/fuzzing", "aptos-types/fuzzing", "aptos-proptest-helpers", "aptos-time-service/testing", "aptos-types/fuzzing", "memsocket/testing", "netcore/fuzzing", "proptest", "proptest-derive", "rand_core"]
 testing = ["aptos-config/testing", "aptos-time-service/testing", "memsocket/testing", "netcore/testing"]
-
-[[bench]]
-name = "socket_bench"
-harness = false
-
-[[bench]]
-name = "network_bench"
-harness = false
diff --git a/network/benches/network_bench.rs b/network/benches/network_bench.rs
deleted file mode 100644
index c683a98b06d83..0000000000000
--- a/network/benches/network_bench.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) The Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-// Allow KiB, MiB consts
-#![allow(non_upper_case_globals, non_snake_case)]
-// Allow fns to take &usize, since criterion only passes parameters by ref
-#![allow(clippy::trivially_copy_pass_by_ref)]
-// Allow writing 1 * KiB or 1 * MiB
-#![allow(clippy::identity_op)]
-// Criterion API has changed, TODO: Remove parameterized groups, and bench()
-#![allow(deprecated)]
-
-use aptos_types::PeerId;
-use bytes::Bytes;
-use criterion::{
-    criterion_group, criterion_main, AxisScale, Bencher, Criterion, ParameterizedBenchmark,
-    PlotConfiguration, Throughput,
-};
-use futures::{
-    channel::mpsc,
-    executor::block_on,
-    sink::SinkExt,
-    stream::{FuturesUnordered, StreamExt},
-};
-use network::protocols::{
-    network::{ApplicationNetworkSender, Event},
-    rpc::error::RpcError,
-};
-use network_builder::dummy::{setup_network, DummyMsg, DummyNetworkSender};
-use std::time::Duration;
-
-const KiB: usize = 1 << 10;
-const MiB: usize = 1 << 20;
-const NUM_MSGS: u32 = 100;
-const TOLERANCE: u32 = 20;
-
-fn direct_send_bench(b: &mut Bencher, msg_len: &usize) {
-    let tn = setup_network();
-    let runtime = tn.runtime;
-    let dialer_sender = tn.dialer_sender;
-    let listener_peer_id = tn.listener_peer_id;
-    let mut listener_events = tn.listener_events;
-
-    // Compose Proposal message with `msg_len` bytes payload
-    let msg = DummyMsg(vec![0u8; *msg_len]);
-
-    let (mut tx, mut rx) = mpsc::channel(0);
-    // The listener side keeps receiving messages and send signal back to the bencher to finish
-    // the iteration once NUM_MSGS messages are received.
-    let f_listener = async move {
-        let mut counter = 0u32;
-        while listener_events.next().await.is_some() {
-            counter += 1;
-            // By the nature of DirectSend protocol, some messages may be lost when a connection is
-            // broken temporarily.
-            if counter == NUM_MSGS - TOLERANCE {
-                let _ = tx.send(()).await;
-                counter = 0;
-            }
-        }
-    };
-    runtime.spawn(f_listener);
-
-    // The dialer side keeps sending messages. In each iteration of the benchmark, it sends
-    // NUM_MSGS messages and wait until the listener side sends signal back.
-    b.iter(|| {
-        for _ in 0..NUM_MSGS {
-            dialer_sender
-                .send_to(listener_peer_id, msg.clone())
-                .unwrap();
-        }
-        block_on(rx.next()).unwrap();
-    });
-}
-
-fn rpc_bench(b: &mut Bencher, msg_len: &usize) {
-    let tn = setup_network();
-    let runtime = tn.runtime;
-    let dialer_sender = tn.dialer_sender;
-    let listener_peer_id = tn.listener_peer_id;
-    let mut listener_events = tn.listener_events;
-
-    // Compose RequestBlock message and RespondBlock message with `msg_len` bytes payload
-    let req = DummyMsg(vec![]);
-    let res = DummyMsg(vec![0u8; *msg_len]);
-    let res: Bytes = bcs::to_bytes(&res)
-        .expect("failed to serialize message")
-        .into();
-
-    // The listener side keeps receiving RPC requests and sending responses back
-    let f_listener = async move {
-        while let Some(event) = listener_events.next().await {
-            match event {
-                Event::RpcRequest(_, _, _, res_tx) => res_tx
-                    .send(Ok(res.clone()))
-                    .expect("fail to send rpc response to network"),
-                event => panic!("Unexpected event: {:?}", event),
-            }
-        }
-    };
-    runtime.spawn(f_listener);
-
-    // The dialer side keeps sending RPC requests. In each iteration of the benchmark, it sends
-    // NUM_MSGS requests and blocks on getting the responses.
-    b.iter(|| {
-        let mut requests = FuturesUnordered::new();
-        for _ in 0..NUM_MSGS {
-            requests.push(send_rpc(
-                dialer_sender.clone(),
-                listener_peer_id,
-                req.clone(),
-            ));
-        }
-        while let Some(res) = block_on(requests.next()) {
-            let _ = res.unwrap();
-        }
-    });
-}
-
-async fn send_rpc(
-    sender: DummyNetworkSender,
-    recipient: PeerId,
-    req_msg: DummyMsg,
-) -> Result<DummyMsg, RpcError> {
-    sender
-        .send_rpc(recipient, req_msg, Duration::from_secs(15))
-        .await
-}
-
-fn network_crate_benchmark(c: &mut Criterion) {
-    ::aptos_logger::Logger::init_for_testing();
-
-    // Parameterize benchmarks over the message length.
-    let msg_lens = vec![32usize, 256, 1 * KiB, 4 * KiB, 64 * KiB, 256 * KiB, 1 * MiB];
-
-    c.bench(
-        "network_crate_benchmark",
-        ParameterizedBenchmark::new("direct_send", direct_send_bench, msg_lens)
-            .with_function("rpc", rpc_bench)
-            .sample_size(10)
-            .plot_config(PlotConfiguration::default().summary_scale(AxisScale::Logarithmic))
-            .throughput(|msg_len| Throughput::Bytes(((*msg_len as u32) * NUM_MSGS).into())),
-    );
-}
-
-criterion_group!(benches, network_crate_benchmark);
-criterion_main!(benches);
diff --git a/network/benches/socket_bench.rs b/network/benches/socket_bench.rs
deleted file mode 100644
index ce9007ebe487d..0000000000000
--- a/network/benches/socket_bench.rs
+++ /dev/null
@@ -1,410 +0,0 @@
-// Copyright (c) The Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-// Allow KiB, MiB consts
-#![allow(non_upper_case_globals, non_snake_case)]
-// Allow fns to take &usize, since criterion only passes parameters by ref
-#![allow(clippy::trivially_copy_pass_by_ref)]
-// Allow writing 1 * KiB or 1 * MiB
-#![allow(clippy::identity_op)]
-// Criterion API has changed, TODO: Remove parameterized groups, and bench()
-#![allow(deprecated)]
-
-//! Network Benchmarks
-//! ==================
-//!
-//! The `socket_bench` benchmarks measures the throughput of sending
-//! messages over a single socket.
-//!
-//! # Run the benchmarks
-//!
-//! `cargo bench -p network`
-//!
-//! # View the report
-//!
-//! `open network/target/criterion/report/index.html`
-//!
-//! # Remote benchmarks
-//!
-//! The `socket_bench` can also act as a client to the corresponding
-//! `socket-bench-server`. Simply pass in one or more of the following env vars
-//! which correspond to different remote benchmarks, e.g.,
-//!
-//! `TCP_ADDR=/ip4/12.34.56.78/tcp/1234 cargo bench -p network remote_tcp`
-//!
-//! The message lengths (in bytes) we benchmark can be changed using the
-//! `$MSG_LENS` environment variable.
-//!
-//! `MSG_LENS="[123, 456]" cargo bench -p network local_tcp`
-//!
-//! Note: gnuplot must be installed to generate benchmark plots.
-
-use aptos_logger::prelude::*;
-use aptos_types::{network_address::NetworkAddress, PeerId};
-use bytes::{Bytes, BytesMut};
-use criterion::{
-    criterion_group, criterion_main, AxisScale, Bencher, Criterion, ParameterizedBenchmark,
-    PlotConfiguration, Throughput,
-};
-use futures::{
-    executor::block_on,
-    io::{AsyncRead, AsyncWrite},
-    sink::{Sink, SinkExt},
-    stream::{self, FuturesUnordered, Stream, StreamExt},
-};
-use netcore::transport::{memory::MemoryTransport, tcp::TcpTransport, Transport};
-use network::{constants, protocols::wire::messaging::v1::network_message_frame_codec};
-use socket_bench_server::{
-    build_memsocket_noise_transport, build_tcp_noise_transport, start_stream_server, Args,
-};
-use std::{fmt::Debug, io, time::Duration};
-use tokio::runtime::{Builder, Runtime};
-use tokio_util::{codec::Framed, compat::FuturesAsyncReadCompatExt};
-
-const KiB: usize = 1 << 10;
-const MiB: usize = 1 << 20;
-
-// The number of messages to send per `Bencher::iter`. We also flush to ensure
-// we measure all the message being sent.
-const SENDS_PER_ITER: usize = 100;
-
-/// The tight inner loop we're actually benchmarking. In this benchmark, we simply
-/// measure the throughput of sending many messages of size `msg_len` over
-/// `client_stream`.
-fn bench_client_send<S>(b: &mut Bencher, msg_len: usize, client_stream: &mut S)
-where
-    S: Sink<Bytes> + Stream<Item = Result<BytesMut, io::Error>> + Unpin,
-    S::Error: Debug,
-{
-    // Benchmark sending over the in-memory stream.
-    let data = Bytes::from(vec![0u8; msg_len]);
-    b.iter(|| {
-        // Create a stream of messages to send
-        let mut data_stream = stream::repeat(data.clone()).take(SENDS_PER_ITER).map(Ok);
-        // Send the batch of messages. Note that `Sink::send_all` will flush the
-        // sink after exhausting the `data_stream`, which is necessary to ensure
-        // we measure sending all of the messages.
-        block_on(client_stream.send_all(&mut data_stream)).unwrap();
-    });
-
-    // Client half-closes their side of the stream
-    block_on(client_stream.close()).unwrap();
-
-    // Wait for server to half-close to complete the shutdown
-    assert!(block_on(client_stream.next()).is_none());
-}
-
-/// Setup and benchmark the client side for the simple stream case
-/// (tcp or in-memory).
-fn bench_client_stream_send<T, S>(
-    b: &mut Bencher,
-    msg_len: usize,
-    runtime: &mut Runtime,
-    server_addr: NetworkAddress,
-    client_transport: T,
-) -> impl Stream
-where
-    T: Transport<Output = S> + 'static,
-    S: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-{
-    // Client dials the server. Some of our transports have timeouts built in,
-    // which means the futures must be run on a tokio Runtime.
-    let server_peer_id = PeerId::random();
-    let client_socket = runtime
-        .block_on(client_transport.dial(server_peer_id, server_addr).unwrap())
-        .unwrap();
-    let codec = network_message_frame_codec(constants::MAX_FRAME_SIZE);
-    let mut client_stream = Framed::new(client_socket.compat(), codec);
-
-    // Benchmark client sending data to server.
-    bench_client_send(b, msg_len, &mut client_stream);
-
-    // Return the stream so we can drop it after the bench completes
-    client_stream
-}
-
-/// Benchmark the throughput of sending messages of size `msg_len` over an
-/// in-memory socket.
-fn bench_memsocket_send(b: &mut Bencher, msg_len: &usize, server_addr: NetworkAddress) {
-    let mut runtime = Runtime::new().unwrap();
-
-    let client_transport = MemoryTransport::default();
-
-    // Benchmark sending some data to the server.
-    let _client_stream =
-        bench_client_stream_send(b, *msg_len, &mut runtime, server_addr, client_transport);
-}
-
-/// Benchmark the throughput of sending messages of size `msg_len` over an
-/// in-memory socket with Noise encryption.
-fn bench_memsocket_noise_send(b: &mut Bencher, msg_len: &usize, server_addr: NetworkAddress) {
-    let mut runtime = Runtime::new().unwrap();
-
-    let client_transport = build_memsocket_noise_transport();
-
-    // Benchmark sending some data to the server.
-    let _client_stream =
-        bench_client_stream_send(b, *msg_len, &mut runtime, server_addr, client_transport);
-}
-
-/// Benchmark the throughput of sending messages of size `msg_len` over tcp to
-/// server at multiaddr `server_addr`.
-fn bench_tcp_send(b: &mut Bencher, msg_len: &usize, server_addr: NetworkAddress) {
-    let mut runtime = Runtime::new().unwrap();
-
-    let client_transport = TcpTransport::default();
-
-    // Benchmark sending some data to the server.
-    let _client_stream =
-        bench_client_stream_send(b, *msg_len, &mut runtime, server_addr, client_transport);
-}
-
-/// Benchmark the throughput of sending messages of size `msg_len` over tcp to
-/// server at multiaddr `server_addr` with TCP_NODELAY set.
-fn bench_tcp_send_with_nodelay(b: &mut Bencher, msg_len: &usize, server_addr: NetworkAddress) {
-    let mut runtime = Runtime::new().unwrap();
-
-    let client_transport = TcpTransport {
-        nodelay: Some(true),
-        ..TcpTransport::default()
-    };
-
-    // Benchmark sending some data to the server.
-    let _client_stream =
-        bench_client_stream_send(b, *msg_len, &mut runtime, server_addr, client_transport);
-}
-
-/// Benchmark the throughput of sending messages of size `msg_len` over tcp with
-/// Noise encryption to server at multiaddr `server_addr`.
-fn bench_tcp_noise_send(b: &mut Bencher, msg_len: &usize, server_addr: NetworkAddress) {
-    let mut runtime = Runtime::new().unwrap();
-
-    let client_transport = build_tcp_noise_transport();
-
-    // Benchmark sending some data to the server.
-    let _client_stream =
-        bench_client_stream_send(b, *msg_len, &mut runtime, server_addr, client_transport);
-}
-
-/// Measure sending messages of varying sizes over varying transports, where
-///
-/// base transport := {in-memory, loopback tcp, remote tcp}
-/// encryption := {none, noise}
-/// transports := base transport × encryption
-///
-/// listed explicitly,
-///
-///  1. in-memory transport
-///  2. in-memory transport + noise encryption
-///  3. loopback tcp transport
-///  4. loopback tcp transport + noise encryption
-///  5. remote tcp transport
-///  6. remote tcp transport + noise encryption
-///  7. remote tcp transport + nodelay
-///
-/// Important:
-/// 1. We use a `UviBytes` codec to frame the benchmark messages since this is
-///    what we currently use in the codebase; however, this seems to add not
-///    insignificant overhead and might change in the near future.
-/// 2. Socket buffer sizes and buffering strategies are not yet optimized.
-/// 3. local_tcp benchmarks are only over loopback.
-/// 4. remote_tcp benchmarks connect to a `socket_bench_server` instance running
-///    running remotely.
-/// 6. The remote benchmarks connect to env-defined multiaddrs `$TCP_ADDR` and
-///    `$TCP_NOISE_ADDR`  for
-///    benchmarks `remote_tcp`, `remote_tcp+noise` and `remote_tcp+nodelay` respectively.
-fn socket_bench(c: &mut Criterion) {
-    ::aptos_logger::Logger::init_for_testing();
-
-    let rt = Runtime::new().unwrap();
-    let executor = rt.handle().clone();
-
-    let args = Args::from_env();
-
-    let remote_tcp_addr = args.tcp_addr;
-    let remote_tcp_noise_addr = args.tcp_noise_addr;
-
-    // Parameterize benchmarks over the message length.
-    let default_msg_lens = vec![32usize, 256, 1 * KiB, 4 * KiB, 64 * KiB, 256 * KiB, 1 * MiB];
-    let msg_lens = args.msg_lens.unwrap_or(default_msg_lens);
-
-    // start local bench servers
-
-    let memsocket_addr = start_stream_server(
-        &executor,
-        MemoryTransport::default(),
-        "/memory/0".parse().unwrap(),
-    );
-    let memsocket_noise_addr = start_stream_server(
-        &executor,
-        build_memsocket_noise_transport(),
-        "/memory/0".parse().unwrap(),
-    );
-
-    let local_tcp_addr = start_stream_server(
-        &executor,
-        TcpTransport::default(),
-        "/ip4/127.0.0.1/tcp/0".parse().unwrap(),
-    );
-    let local_tcp_nodelay_addr = start_stream_server(
-        &executor,
-        TcpTransport {
-            nodelay: Some(true),
-            ..TcpTransport::default()
-        },
-        "/ip4/127.0.0.1/tcp/0".parse().unwrap(),
-    );
-    let local_tcp_noise_addr = start_stream_server(
-        &executor,
-        build_tcp_noise_transport(),
-        "/ip4/127.0.0.1/tcp/0".parse().unwrap(),
-    );
-
-    // add the memsocket and tcp loopback socket benches
-
-    let mut bench = ParameterizedBenchmark::new(
-        "memsocket",
-        move |b, msg_len| bench_memsocket_send(b, msg_len, memsocket_addr.clone()),
-        msg_lens,
-    )
-    .with_function("memsocket+noise", move |b, msg_len| {
-        bench_memsocket_noise_send(b, msg_len, memsocket_noise_addr.clone())
-    })
-    .with_function("local_tcp", move |b, msg_len| {
-        bench_tcp_send(b, msg_len, local_tcp_addr.clone())
-    })
-    .with_function("local_tcp+noise", move |b, msg_len| {
-        bench_tcp_noise_send(b, msg_len, local_tcp_noise_addr.clone())
-    })
-    .with_function("local_tcp_nodelay", move |b, msg_len| {
-        bench_tcp_send_with_nodelay(b, msg_len, local_tcp_nodelay_addr.clone())
-    });
-
-    // optionally enable remote benches if the env variables are set
-
-    if let Some(remote_tcp_addr) = remote_tcp_addr {
-        bench = bench.with_function("remote_tcp", move |b, msg_len| {
-            bench_tcp_send(b, msg_len, remote_tcp_addr.clone())
-        });
-    }
-    if let Some(remote_tcp_noise_addr) = remote_tcp_noise_addr {
-        bench = bench.with_function("remote_tcp+noise", move |b, msg_len| {
-            bench_tcp_noise_send(b, msg_len, remote_tcp_noise_addr.clone())
-        });
-    }
-
-    // set bench configuration
-
-    bench = bench
-        .warm_up_time(Duration::from_secs(2))
-        .measurement_time(Duration::from_secs(2))
-        .sample_size(10)
-        .plot_config(PlotConfiguration::default().summary_scale(AxisScale::Logarithmic))
-        .throughput(|msg_len| {
-            let msg_len = *msg_len as u32;
-            let num_msgs = SENDS_PER_ITER as u32;
-            Throughput::Bytes(u64::from(msg_len * num_msgs))
-        });
-
-    c.bench("socket_send_throughput", bench);
-}
-
-/// Concurrently dial into server
-fn bench_client_connection<F, T, S>(
-    b: &mut Bencher,
-    concurrency: u64,
-    transport_func: F,
-    server_addr: NetworkAddress,
-) where
-    F: Fn() -> T,
-    T: Transport<Output = S> + Send + Sync + 'static,
-    S: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-{
-    let peer_id = PeerId::random();
-    let runtime = Builder::new_multi_thread()
-        .worker_threads(concurrency as usize)
-        .enable_all()
-        .build()
-        .unwrap();
-    b.iter_with_setup(
-        || {
-            let mut futures = vec![];
-            for _ in 0..concurrency {
-                let transport = transport_func();
-                let addr = server_addr.clone();
-                loop {
-                    if let Ok(fut) = transport.dial(peer_id, addr.clone()) {
-                        futures.push(async move {
-                            match fut.await {
-                                Ok(_socket) => (),
-                                Err(e) => error!(
-                                    error = ?e,
-                                    "Failed to upgrade {:?}", e
-                                ),
-                            };
-                        });
-                        break;
-                    }
-                }
-            }
-            futures
-        },
-        |fut| {
-            let mut handles = FuturesUnordered::new();
-            for f in fut {
-                handles.push(runtime.spawn(f));
-            }
-            runtime.block_on(async move { while let Some(Ok(_)) = handles.next().await {} });
-        },
-    );
-}
-
-/// Measure the concurrent connection throughput of the servers, use with socket-bench-server.
-/// Note: This doesn't work on macos due to https://github.com/tokio-rs/mio/issues/1320
-/// Start server with: TCP_NOISE_ADDR=/ip6/::1/tcp/12345 cargo run --release -p socket-bench-server
-/// Then run the bench: TCP_NOISE_ADDR=/ip6/::1/tcp/12345 cargo x bench -p network noise_connections
-/// Example Output:
-/// connection_throughput/noise_connections/128
-///                         time:   [69.816 ms 70.666 ms 71.679 ms]
-///                         thrpt:  [1.7857 Kelem/s 1.8113 Kelem/s 1.8334 Kelem/s]
-///                  change:
-///                         time:   [-9.0403% -4.6666% -0.6491%] (p = 0.06 > 0.05)
-///                         thrpt:  [+0.6533% +4.8951% +9.9388%]
-fn connection_bench(c: &mut Criterion) {
-    ::aptos_logger::Logger::init_for_testing();
-    let concurrency_param: Vec<u64> = vec![16, 32, 64, 128];
-    let args = Args::from_env();
-    let bench = if let Some(noise_addr) = args.tcp_noise_addr {
-        ParameterizedBenchmark::new(
-            "noise_connections",
-            move |b, concurrency| {
-                bench_client_connection(
-                    b,
-                    *concurrency,
-                    build_tcp_noise_transport,
-                    noise_addr.clone(),
-                )
-            },
-            concurrency_param,
-        )
-    } else if let Some(tcp_addr) = args.tcp_addr {
-        ParameterizedBenchmark::new(
-            "tcp_connections",
-            move |b, concurrency| {
-                bench_client_connection(b, *concurrency, TcpTransport::default, tcp_addr.clone())
-            },
-            concurrency_param,
-        )
-    } else {
-        panic!("Server addr not set");
-    }
-    .warm_up_time(Duration::from_secs(1))
-    .measurement_time(Duration::from_secs(10))
-    .sample_size(10)
-    .throughput(|concurrency| Throughput::Elements(*concurrency));
-
-    c.bench("connection_throughput", bench);
-}
-
-criterion_group!(network_benches, socket_bench, connection_bench);
-criterion_main!(network_benches);
diff --git a/network/socket-bench-server/Cargo.toml b/network/socket-bench-server/Cargo.toml
deleted file mode 100644
index d95cfd9afd3e8..0000000000000
--- a/network/socket-bench-server/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "socket-bench-server"
-version = "0.1.0"
-authors = ["Aptos Foundation <opensource@aptos-labs.com>"]
-description = "Diem socket bench server"
-repository = "https://github.com/aptos-labs/aptos-core"
-homepage = "https://aptos-labs.com"
-license = "Apache-2.0"
-publish = false
-edition = "2018"
-
-[dependencies]
-futures = "0.3.12"
-tokio = { version = "1.8.1", features = ["full"] }
-tokio-util = { version = "0.6.4", features = ["compat", "codec"] }
-
-aptos-crypto = { path = "../../crates/aptos-crypto" }
-aptos-config = { path = "../../config" }
-aptos-logger = { path = "../../crates/aptos-logger" }
-aptos-types = { path = "../../types" }
-aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
-memsocket = { path = "../memsocket" }
-netcore = { path = "../netcore", features = ["fuzzing", "testing"] }
-network = { path = "../.", features = ["testing", "fuzzing"] }
-network-builder = { path = "../builder"}
-rand = "0.8.3"
diff --git a/network/socket-bench-server/src/lib.rs b/network/socket-bench-server/src/lib.rs
deleted file mode 100644
index 4ec9a6b3b93df..0000000000000
--- a/network/socket-bench-server/src/lib.rs
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright (c) The Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-#![forbid(unsafe_code)]
-
-use aptos_config::network_id::NetworkContext;
-use aptos_crypto::{test_utils::TEST_SEED, x25519, Uniform as _};
-use aptos_logger::prelude::*;
-use aptos_types::network_address::NetworkAddress;
-use futures::{
-    future::Future,
-    io::{AsyncRead, AsyncWrite},
-    sink::SinkExt,
-    stream::{Stream, StreamExt},
-};
-use memsocket::MemorySocket;
-use netcore::transport::{
-    memory::MemoryTransport,
-    tcp::{TcpSocket, TcpTransport},
-    Transport, TransportExt,
-};
-use network::{
-    constants,
-    noise::{stream::NoiseStream, HandshakeAuthMode, NoiseUpgrader},
-    protocols::wire::messaging::v1::network_message_frame_codec,
-};
-use rand::prelude::*;
-use std::{env, ffi::OsString, io, sync::Arc};
-use tokio::runtime::Handle;
-use tokio_util::{codec::Framed, compat::FuturesAsyncReadCompatExt};
-
-#[derive(Debug)]
-pub struct Args {
-    pub tcp_addr: Option<NetworkAddress>,
-    pub tcp_noise_addr: Option<NetworkAddress>,
-    pub msg_lens: Option<Vec<usize>>,
-}
-
-fn parse_addr(s: OsString) -> NetworkAddress {
-    s.to_str()
-        .expect("Error: Address should be valid Unicode")
-        .parse()
-        .expect("Error: Address should be a multiaddr")
-}
-
-fn parse_msg_lens(s: OsString) -> Vec<usize> {
-    let s = s
-        .into_string()
-        .expect("Error: $MSG_LENS should be valid Unicode");
-
-    // check for surrounding array brackets
-    if &s[..1] != "[" || &s[s.len() - 1..] != "]" {
-        panic!(
-            "Error: Malformed $MSG_LENS: \"{}\": Should be formatted like an array \"[123, 456]\"",
-            s
-        );
-    }
-
-    // parse Vec<usize> from comma-delimited string
-    s[1..s.len() - 1]
-        .split(',')
-        .map(|ss| {
-            ss.trim()
-                .parse::<usize>()
-                .expect("Error: Malformed $MSG_LENS: Failed to parse usize")
-        })
-        .collect()
-}
-
-impl Args {
-    pub fn from_env() -> Self {
-        Self {
-            tcp_addr: env::var_os("TCP_ADDR").map(parse_addr),
-            tcp_noise_addr: env::var_os("TCP_NOISE_ADDR").map(parse_addr),
-            msg_lens: env::var_os("MSG_LENS").map(parse_msg_lens),
-        }
-    }
-}
-
-/// Build a MemorySocket + Noise transport
-pub fn build_memsocket_noise_transport() -> impl Transport<Output = NoiseStream<MemorySocket>> {
-    MemoryTransport::default().and_then(move |socket, addr, origin| async move {
-        let mut rng: StdRng = SeedableRng::from_seed(TEST_SEED);
-        let private = x25519::PrivateKey::generate(&mut rng);
-        let public = private.public_key();
-        let peer_id = aptos_types::account_address::from_identity_public_key(public);
-        let noise_config = Arc::new(NoiseUpgrader::new(
-            NetworkContext::mock_with_peer_id(peer_id),
-            private,
-            HandshakeAuthMode::server_only(),
-        ));
-        let remote_public_key = addr.find_noise_proto();
-        let (_remote_static_key, socket) = noise_config
-            .upgrade_with_noise(socket, origin, remote_public_key)
-            .await
-            .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
-        Ok(socket)
-    })
-}
-
-/// Build a Tcp + Noise transport
-pub fn build_tcp_noise_transport() -> impl Transport<Output = NoiseStream<TcpSocket>> {
-    TcpTransport::default().and_then(move |socket, addr, origin| async move {
-        let mut rng: StdRng = SeedableRng::from_seed(TEST_SEED);
-        let private = x25519::PrivateKey::generate(&mut rng);
-        let public = private.public_key();
-        let peer_id = aptos_types::account_address::from_identity_public_key(public);
-        let noise_config = Arc::new(NoiseUpgrader::new(
-            NetworkContext::mock_with_peer_id(peer_id),
-            private,
-            HandshakeAuthMode::server_only(),
-        ));
-        let remote_public_key = addr.find_noise_proto();
-        let (_remote_static_key, socket) = noise_config
-            .upgrade_with_noise(socket, origin, remote_public_key)
-            .await
-            .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
-        Ok(socket)
-    })
-}
-
-/// Server side handler for send throughput benchmark when the messages are sent
-/// over a simple stream (tcp or in-memory).
-pub async fn server_stream_handler<L, I, S, E>(server_listener: L)
-where
-    L: Stream<Item = Result<(I, NetworkAddress), E>> + Unpin,
-    I: Future<Output = Result<S, E>> + Send + 'static,
-    S: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-    E: ::std::error::Error + Send,
-{
-    // Wait for next inbound connection, this simulated the TransportHandler
-    // which is single-threaded asynchronous accepting new connections.
-    server_listener
-        .for_each_concurrent(None, |result| async {
-            match result {
-                Ok((f_stream, _)) => {
-                    match f_stream.await {
-                        Ok(stream) => {
-                            let codec = network_message_frame_codec(constants::MAX_FRAME_SIZE);
-                            let mut stream = Framed::new(stream.compat(), codec);
-
-                            tokio::task::spawn(async move {
-                                // Drain all messages from the client.
-                                while stream.next().await.is_some() {}
-                                stream.close().await.unwrap();
-                            });
-                        }
-                        Err(e) => error!(
-                            error = ?e,
-                            "Connection upgrade failed {:?}", e),
-                    };
-                }
-                Err(e) => error!(
-                    error = ?e,
-                    "Stream failed {:?}", e),
-            }
-        })
-        .await
-}
-
-pub fn start_stream_server<T, L, I, S, E>(
-    executor: &Handle,
-    transport: T,
-    listen_addr: NetworkAddress,
-) -> NetworkAddress
-where
-    T: Transport<Output = S, Error = E, Listener = L, Inbound = I>,
-    L: Stream<Item = Result<(I, NetworkAddress), E>> + Unpin + Send + 'static,
-    I: Future<Output = Result<S, E>> + Send + 'static,
-    S: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-    E: ::std::error::Error + Send + Sync + 'static,
-{
-    let _gaurd = executor.enter();
-    let (listener, server_addr) = transport.listen_on(listen_addr).unwrap();
-    executor.spawn(server_stream_handler(listener));
-    server_addr
-}
diff --git a/network/socket-bench-server/src/main.rs b/network/socket-bench-server/src/main.rs
deleted file mode 100644
index 90307f3eaa42e..0000000000000
--- a/network/socket-bench-server/src/main.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) The Aptos Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-#![forbid(unsafe_code)]
-
-//! Standalone server for socket_bench
-//! ========================================
-//!
-//! You can run `socket_bench` across a real network by running this bench
-//! server remotely. For example,
-//!
-//! `RUSTFLAGS="-Ctarget-cpu=skylake -Ctarget-feature=+aes,+sse2,+sse4.1,+ssse3" TCP_ADDR=/ip6/::1/tcp/12345 cargo run --release -p socket-bench-server`
-//!
-//! will run the socket bench server handling the remote_tcp benchmark. A
-//! corresponding client would exercise this benchmark using
-//!
-//! `RUSTFLAGS="-Ctarget-cpu=skylake -Ctarget-feature=+aes,+sse2,+sse4.1,+ssse3" TCP_ADDR=/ip6/::1/tcp/12345 cargo x bench -p network remote_tcp`
-
-use aptos_logger::info;
-use netcore::transport::tcp::TcpTransport;
-use socket_bench_server::{build_tcp_noise_transport, start_stream_server, Args};
-use tokio::runtime::Builder;
-
-fn main() {
-    ::aptos_logger::Logger::new().init();
-
-    let args = Args::from_env();
-
-    let rt = Builder::new_multi_thread()
-        .worker_threads(32)
-        .enable_all()
-        .build()
-        .unwrap();
-    let executor = rt.handle();
-
-    if let Some(addr) = args.tcp_addr {
-        let addr = start_stream_server(executor, TcpTransport::default(), addr);
-        info!("bench: tcp: listening on: {}", addr);
-    }
-
-    if let Some(addr) = args.tcp_noise_addr {
-        let addr = start_stream_server(executor, build_tcp_noise_transport(), addr);
-        info!("bench: tcp+noise: listening on: {}", addr);
-    }
-    std::thread::park();
-}
diff --git a/x.toml b/x.toml
index 915c0ac5f504a..d25b4e5565c8d 100644
--- a/x.toml
+++ b/x.toml
@@ -188,7 +188,6 @@ members = [
     "memsocket",
     "offchain",
     "smoke-test",
-    "socket-bench-server",
     "transaction-emitter",
     "x",
     "x-core",