diff --git a/Cargo.lock b/Cargo.lock
index babbc447e0c40..085caa5f681b2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,16 +29,16 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
 dependencies = [
  "memchr",
 ]
@@ -74,7 +74,7 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-stream",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tower",
  "tracing",
  "webpki",
@@ -103,9 +103,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.64"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7"
+checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
 dependencies = [
  "backtrace",
 ]
@@ -312,7 +312,7 @@ dependencies = [
  "num-traits 0.2.15",
  "rusticata-macros",
  "thiserror",
- "time 0.3.9",
+ "time 0.3.14",
 ]
 
 [[package]]
@@ -455,7 +455,7 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
- "itoa 1.0.2",
+ "itoa 1.0.3",
  "matchit",
  "memchr",
  "mime",
@@ -495,7 +495,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
 dependencies = [
  "futures-core",
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
  "instant",
  "pin-project-lite",
  "rand 0.8.5",
@@ -504,16 +504,16 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.65"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
+checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
- "object 0.28.4",
+ "object",
  "rustc-demangle",
 ]
 
@@ -696,9 +696,9 @@ dependencies = [
 
 [[package]]
 name = "block-buffer"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
 dependencies = [
  "generic-array",
 ]
@@ -723,7 +723,7 @@ dependencies = [
  "ark-std",
  "blake2s_simd",
  "byteorder",
- "clap 3.2.17",
+ "clap 3.2.21",
  "csv",
  "env_logger",
  "hex",
@@ -862,7 +862,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.9",
+ "semver 1.0.13",
  "serde 1.0.144",
  "serde_json",
 ]
@@ -875,7 +875,7 @@ checksum = "3abb7553d5b9b8421c6de7cb02606ff15e0c6eea7d8eadd75ef013fd636bec36"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.9",
+ "semver 1.0.13",
  "serde 1.0.144",
  "serde_json",
 ]
@@ -886,15 +886,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
-[[package]]
-name = "cast"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
-dependencies = [
- "rustc_version 0.4.0",
-]
-
 [[package]]
 name = "cast"
 version = "0.3.0"
@@ -952,7 +943,7 @@ dependencies = [
  "num-integer",
  "num-traits 0.2.15",
  "serde 1.0.144",
- "time 0.1.43",
+ "time 0.1.44",
  "wasm-bindgen",
  "winapi",
 ]
@@ -1007,9 +998,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.17"
+version = "3.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b"
+checksum = "1ed5341b2301a26ab80be5cbdced622e80ed808483c52e45e3310a877d3b37d7"
 dependencies = [
  "atty",
  "bitflags",
@@ -1024,9 +1015,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.2.17"
+version = "3.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa"
+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
 dependencies = [
  "heck 0.4.0",
  "proc-macro-error",
@@ -1055,9 +1046,9 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "4.4.1"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f3e1238132dc01f081e1cbb9dace14e5ef4c3a51ee244bd982275fb514605db"
+checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219"
 dependencies = [
  "error-code",
  "str-buf",
@@ -1144,7 +1135,7 @@ dependencies = [
 [[package]]
 name = "config"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
  "arc-swap",
  "crypto",
@@ -1154,9 +1145,10 @@ dependencies = [
  "rand 0.8.5",
  "serde 1.0.144",
  "serde_json",
+ "serde_with 2.0.1",
  "thiserror",
  "tracing",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
 ]
 
 [[package]]
@@ -1178,7 +1170,7 @@ dependencies = [
 [[package]]
 name = "consensus"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
  "arc-swap",
  "bincode",
@@ -1190,6 +1182,7 @@ dependencies = [
  "dag",
  "fastcrypto",
  "match_opt",
+ "mysten-util-mem",
  "prometheus",
  "rand 0.8.5",
  "serde 1.0.144",
@@ -1199,7 +1192,7 @@ dependencies = [
  "tracing",
  "typed-store",
  "types",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
 ]
 
 [[package]]
@@ -1254,9 +1247,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
 dependencies = [
  "libc",
 ]
@@ -1278,12 +1271,12 @@ checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff"
 
 [[package]]
 name = "criterion"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10"
+checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
 dependencies = [
  "atty",
- "cast 0.2.7",
+ "cast",
  "clap 2.34.0",
  "criterion-plot",
  "csv",
@@ -1308,7 +1301,7 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
 dependencies = [
- "cast 0.3.0",
+ "cast",
  "itertools",
 ]
 
@@ -1328,9 +1321,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
+checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils",
@@ -1338,9 +1331,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-epoch",
@@ -1363,9 +1356,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
+checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils",
@@ -1466,7 +1459,7 @@ dependencies = [
 [[package]]
 name = "crypto"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
  "base64ct",
  "blake2",
@@ -1480,16 +1473,17 @@ dependencies = [
  "hex",
  "hkdf",
  "merlin",
+ "mysten-util-mem",
  "once_cell",
  "rand 0.8.5",
  "readonly",
  "secp256k1",
  "serde 1.0.144",
  "serde_bytes",
- "serde_with 2.0.0",
+ "serde_with 2.0.1",
  "signature",
  "tokio",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
  "zeroize",
 ]
 
@@ -1549,9 +1543,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
+checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"
 dependencies = [
  "quote 1.0.21",
  "syn 1.0.99",
@@ -1602,7 +1596,7 @@ dependencies = [
 [[package]]
 name = "dag"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
  "arc-swap",
  "dashmap",
@@ -1613,7 +1607,7 @@ dependencies = [
  "rayon",
  "serde 1.0.144",
  "thiserror",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
 ]
 
 [[package]]
@@ -1693,7 +1687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
 dependencies = [
  "cfg-if 1.0.0",
- "hashbrown 0.12.3",
+ "hashbrown",
  "lock_api 0.4.8",
  "once_cell",
  "parking_lot_core 0.9.3",
@@ -1707,9 +1701,9 @@ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
 
 [[package]]
 name = "datatest-stable"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b205281eb7972a6e3a1aa8d55aef938bea2ba9b9ba1bc4ae52539e392386372d"
+checksum = "4eaf86e44e9f0a21f6e42d8e7f83c9ee049f081745eeed1c6f47a613c76e5977"
 dependencies = [
  "libtest-mimic",
  "regex",
@@ -1888,7 +1882,7 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
 dependencies = [
- "block-buffer 0.10.2",
+ "block-buffer 0.10.3",
  "crypto-common",
  "subtle",
 ]
@@ -1989,9 +1983,9 @@ checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
 
 [[package]]
 name = "ecdsa"
-version = "0.14.5"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1826508d57f3140a2e8e3c307b19915a266c92a1b8c2f6bb54e29e5d72a394ae"
+checksum = "fd6f2ba6c133e1d5390e2351b10b17aa43a41209c821c98efc4ec493d16a5a91"
 dependencies = [
  "der",
  "elliptic-curve",
@@ -2146,9 +2140,9 @@ dependencies = [
 
 [[package]]
 name = "ethnum"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f4ea34740bd5042b688060cbff8b010f5a324719d5e111284d648035bccc47"
+checksum = "87e4a7b7dde9ed6aed8eb4dd7474d22fb1713a4b05ac5071cdb60d9903248ad3"
 
 [[package]]
 name = "event-listener"
@@ -2159,7 +2153,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 [[package]]
 name = "executor"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
  "async-trait",
  "backoff",
@@ -2180,12 +2174,12 @@ dependencies = [
  "storage",
  "thiserror",
  "tokio",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tonic",
  "tracing",
  "typed-store",
  "types",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
 ]
 
 [[package]]
@@ -2232,7 +2226,7 @@ dependencies = [
  "secp256k1",
  "serde 1.0.144",
  "serde_bytes",
- "serde_with 2.0.0",
+ "serde_with 2.0.1",
  "signature",
  "tokio",
  "zeroize",
@@ -2279,9 +2273,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35354cf6bf9d259374646f419a25c7dd0bb208d291e44dc73db557542fe017fc"
+checksum = "70ec9f20e8cd0badcd280ad9be817f0799fe27c45301d096a7e28c9244ad3ace"
 
 [[package]]
 name = "fixedbitset"
@@ -2291,9 +2285,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 
 [[package]]
 name = "fixedbitset"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flexstr"
@@ -2525,13 +2519,13 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -2572,9 +2566,9 @@ dependencies = [
 
 [[package]]
 name = "gloo-net"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "351e6f94c76579cc9f9323a15f209086fc7bd428bff4288723d3a417851757b2"
+checksum = "ec897194fb9ac576c708f63d35604bc58f2a262b8cec0fabfed26f3991255f21"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2604,11 +2598,13 @@ dependencies = [
 
 [[package]]
 name = "gloo-utils"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "929c53c913bb7a88d75d9dc3e9705f963d8c2b9001510b25ddaf671b9fb7049d"
+checksum = "40913a05c8297adca04392f707b1e73b12ba7b8eab7244a4961580b1fd34063c"
 dependencies = [
  "js-sys",
+ "serde 1.0.144",
+ "serde_json",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -2634,7 +2630,7 @@ dependencies = [
  "cargo_metadata 0.14.2",
  "cfg-if 1.0.0",
  "debug-ignore",
- "fixedbitset 0.4.1",
+ "fixedbitset 0.4.2",
  "guppy-summaries",
  "guppy-workspace-hack",
  "indexmap",
@@ -2644,7 +2640,7 @@ dependencies = [
  "pathdiff",
  "petgraph 0.6.2",
  "rayon",
- "semver 1.0.9",
+ "semver 1.0.13",
  "serde 1.0.144",
  "serde_json",
  "smallvec",
@@ -2663,7 +2659,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "diffus",
  "guppy-workspace-hack",
- "semver 1.0.9",
+ "semver 1.0.13",
  "serde 1.0.144",
  "toml",
 ]
@@ -2676,9 +2672,9 @@ checksum = "92620684d99f750bae383ecb3be3748142d6095760afd5cbcf2261e9a279d780"
 
 [[package]]
 name = "h2"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
+checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be"
 dependencies = [
  "bytes",
  "fnv",
@@ -2689,7 +2685,7 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tracing",
 ]
 
@@ -2727,15 +2723,6 @@ version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -2751,7 +2738,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086"
 dependencies = [
- "hashbrown 0.12.3",
+ "hashbrown",
 ]
 
 [[package]]
@@ -2838,7 +2825,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.2",
+ "itoa 1.0.3",
 ]
 
 [[package]]
@@ -2860,9 +2847,9 @@ checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
 
 [[package]]
 name = "httparse"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
@@ -2897,7 +2884,7 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa 1.0.2",
+ "itoa 1.0.3",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -2949,9 +2936,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.47"
+version = "0.1.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7"
+checksum = "237a0714f28b1ee39ccec0770ccb544eb02c9ef2c82bb096230eefcffa6468b0"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -3015,6 +3002,17 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "impl-trait-for-tuples"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+dependencies = [
+ "proc-macro2 1.0.43",
+ "quote 1.0.21",
+ "syn 1.0.99",
+]
+
 [[package]]
 name = "include_dir"
 version = "0.7.2"
@@ -3048,7 +3046,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
  "autocfg 1.1.0",
- "hashbrown 0.12.3",
+ "hashbrown",
  "serde 1.0.144",
 ]
 
@@ -3091,7 +3089,7 @@ checksum = "6ab388864246d58a276e60e7569a833d9cc4cd75c66e5ca77c177dad38e59996"
 dependencies = [
  "ahash",
  "dashmap",
- "hashbrown 0.12.3",
+ "hashbrown",
  "once_cell",
  "parking_lot 0.12.1",
 ]
@@ -3110,9 +3108,9 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
 
 [[package]]
 name = "itertools"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
+checksum = "d8bf247779e67a9082a4790b45e71ac7cfd1321331a5c856a74a9faebdab78d0"
 dependencies = [
  "either",
 ]
@@ -3125,9 +3123,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
+checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
 
 [[package]]
 name = "jemalloc-ctl"
@@ -3172,9 +3170,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.58"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3223,7 +3221,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-rustls",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tracing",
  "webpki-roots",
 ]
@@ -3305,7 +3303,7 @@ version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate 1.2.1",
  "proc-macro2 1.0.43",
  "quote 1.0.21",
  "syn 1.0.99",
@@ -3363,21 +3361,21 @@ dependencies = [
  "soketto",
  "tokio",
  "tokio-stream",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tracing",
  "tracing-futures",
 ]
 
 [[package]]
 name = "k256"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c8a5a96d92d849c4499d99461da81c9cdc1467418a8ed2aaeb407e8d85940ed"
+checksum = "6db2573d3fd3e4cc741affc9b5ce1a8ce36cf29f09f80f36da4309d0ae6d7854"
 dependencies = [
  "cfg-if 1.0.0",
  "ecdsa",
  "elliptic-curve",
- "sha2 0.10.2",
+ "sha2 0.10.5",
  "sha3 0.10.4",
 ]
 
@@ -3451,9 +3449,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da83a57f3f5ba3680950aa3cbc806fc297bc0b289d42e8942ed528ace71b8145"
+checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565"
 
 [[package]]
 name = "librocksdb-sys"
@@ -3483,14 +3481,13 @@ dependencies = [
 
 [[package]]
 name = "libtest-mimic"
-version = "0.4.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc195aab5b803465bf614a5a4765741abce6c8d64e7d8ca57acd2923661fba9f"
+checksum = "79529479c298f5af41375b0c1a77ef670d450b4c9cd7949d2b43af08121b20ec"
 dependencies = [
- "clap 3.2.17",
- "crossbeam-channel",
- "rayon",
+ "clap 3.2.21",
  "termcolor",
+ "threadpool",
 ]
 
 [[package]]
@@ -3547,11 +3544,11 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a"
+checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
 dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown",
 ]
 
 [[package]]
@@ -3764,7 +3761,7 @@ version = "0.1.0"
 source = "git+https://github.com/move-language/move?rev=e1e647b73dbd3652aabb2020728a4a517c26e28e#e1e647b73dbd3652aabb2020728a4a517c26e28e"
 dependencies = [
  "anyhow",
- "clap 3.2.17",
+ "clap 3.2.21",
  "crossterm 0.21.0",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -3782,7 +3779,7 @@ source = "git+https://github.com/move-language/move?rev=e1e647b73dbd3652aabb2020
 dependencies = [
  "anyhow",
  "bcs",
- "clap 3.2.17",
+ "clap 3.2.21",
  "codespan-reporting",
  "colored",
  "difference",
@@ -3845,7 +3842,7 @@ source = "git+https://github.com/move-language/move?rev=e1e647b73dbd3652aabb2020
 dependencies = [
  "anyhow",
  "bcs",
- "clap 3.2.17",
+ "clap 3.2.21",
  "codespan-reporting",
  "difference",
  "hex",
@@ -3889,7 +3886,7 @@ source = "git+https://github.com/move-language/move?rev=e1e647b73dbd3652aabb2020
 dependencies = [
  "anyhow",
  "bcs",
- "clap 3.2.17",
+ "clap 3.2.21",
  "codespan",
  "colored",
  "move-binary-format",
@@ -3908,7 +3905,7 @@ version = "0.1.0"
 source = "git+https://github.com/move-language/move?rev=e1e647b73dbd3652aabb2020728a4a517c26e28e#e1e647b73dbd3652aabb2020728a4a517c26e28e"
 dependencies = [
  "anyhow",
- "clap 3.2.17",
+ "clap 3.2.21",
  "colored",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -3959,7 +3956,7 @@ source = "git+https://github.com/move-language/move?rev=e1e647b73dbd3652aabb2020
 dependencies = [
  "anyhow",
  "bcs",
- "clap 3.2.17",
+ "clap 3.2.21",
  "move-binary-format",
  "move-bytecode-source-map",
  "move-bytecode-verifier",
@@ -4050,7 +4047,7 @@ source = "git+https://github.com/move-language/move?rev=e1e647b73dbd3652aabb2020
 dependencies = [
  "anyhow",
  "bcs",
- "clap 3.2.17",
+ "clap 3.2.21",
  "colored",
  "dirs-next",
  "itertools",
@@ -4087,7 +4084,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "atty",
- "clap 3.2.17",
+ "clap 3.2.21",
  "codespan",
  "codespan-reporting",
  "futures",
@@ -4204,7 +4201,7 @@ source = "git+https://github.com/move-language/move?rev=e1e647b73dbd3652aabb2020
 dependencies = [
  "anyhow",
  "bytecode-interpreter-crypto",
- "clap 3.2.17",
+ "clap 3.2.21",
  "codespan-reporting",
  "itertools",
  "move-binary-format",
@@ -4269,7 +4266,7 @@ version = "0.1.0"
 source = "git+https://github.com/move-language/move?rev=e1e647b73dbd3652aabb2020728a4a517c26e28e#e1e647b73dbd3652aabb2020728a4a517c26e28e"
 dependencies = [
  "anyhow",
- "clap 3.2.17",
+ "clap 3.2.21",
  "colored",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -4301,7 +4298,7 @@ source = "git+https://github.com/move-language/move?rev=e1e647b73dbd3652aabb2020
 dependencies = [
  "anyhow",
  "better_any",
- "clap 3.2.17",
+ "clap 3.2.21",
  "codespan-reporting",
  "colored",
  "itertools",
@@ -4371,7 +4368,7 @@ dependencies = [
 [[package]]
 name = "msim"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=bccf26947cc8a22cc69526f1720edde6e55a7d8c#15dff80e8e69218bc20b08a5ef91a4f156e626ac"
+source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=bccf26947cc8a22cc69526f1720edde6e55a7d8c#bccf26947cc8a22cc69526f1720edde6e55a7d8c"
 dependencies = [
  "ahash",
  "async-task",
@@ -4388,7 +4385,7 @@ dependencies = [
  "rand 0.8.5",
  "real_tokio",
  "serde 1.0.144",
- "tokio-util 0.7.3 (git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=8ca4c94029ac1b7c8342720820e6100e9f31a372)",
+ "tokio-util 0.7.3",
  "toml",
  "tracing",
  "tracing-subscriber 0.3.15",
@@ -4397,7 +4394,7 @@ dependencies = [
 [[package]]
 name = "msim-macros"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=bccf26947cc8a22cc69526f1720edde6e55a7d8c#15dff80e8e69218bc20b08a5ef91a4f156e626ac"
+source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=bccf26947cc8a22cc69526f1720edde6e55a7d8c#bccf26947cc8a22cc69526f1720edde6e55a7d8c"
 dependencies = [
  "darling 0.14.1",
  "proc-macro2 1.0.43",
@@ -4425,9 +4422,9 @@ dependencies = [
 
 [[package]]
 name = "multihash"
-version = "0.16.2"
+version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689"
+checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc"
 dependencies = [
  "core2",
  "multihash-derive",
@@ -4440,7 +4437,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate 1.2.1",
  "proc-macro-error",
  "proc-macro2 1.0.43",
  "quote 1.0.21",
@@ -4476,6 +4473,33 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "mysten-util-mem"
+version = "0.11.0"
+source = "git+https://github.com/MystenLabs/mysten-infra#d932aa91fb5345fa72869bf943d9989fafde330c"
+dependencies = [
+ "cfg-if 1.0.0",
+ "ed25519-consensus",
+ "fastcrypto",
+ "hashbrown",
+ "impl-trait-for-tuples",
+ "indexmap",
+ "mysten-util-mem-derive",
+ "parking_lot 0.12.1",
+ "roaring",
+ "smallvec",
+]
+
+[[package]]
+name = "mysten-util-mem-derive"
+version = "0.1.0"
+source = "git+https://github.com/MystenLabs/mysten-infra#d932aa91fb5345fa72869bf943d9989fafde330c"
+dependencies = [
+ "proc-macro2 1.0.43",
+ "syn 1.0.99",
+ "synstructure",
+]
+
 [[package]]
 name = "naive-timer"
 version = "0.2.0"
@@ -4534,7 +4558,7 @@ checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e"
 [[package]]
 name = "network"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
  "anemo",
  "anyhow",
@@ -4552,11 +4576,11 @@ dependencies = [
  "serde 1.0.144",
  "thiserror",
  "tokio",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tonic",
  "tracing",
  "types",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
 ]
 
 [[package]]
@@ -4615,8 +4639,9 @@ dependencies = [
 [[package]]
 name = "node"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
+ "anemo",
  "arc-swap",
  "async-trait",
  "axum",
@@ -4643,7 +4668,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tracing",
  "tracing-log",
  "tracing-subscriber 0.3.15",
@@ -4651,7 +4676,7 @@ dependencies = [
  "types",
  "url",
  "worker",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
 ]
 
 [[package]]
@@ -4801,7 +4826,7 @@ version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate 1.2.1",
  "proc-macro2 1.0.43",
  "quote 1.0.21",
  "syn 1.0.99",
@@ -4816,15 +4841,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "object"
-version = "0.28.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "object"
 version = "0.29.0"
@@ -4863,9 +4879,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.40"
+version = "0.10.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e"
+checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
@@ -4971,9 +4987,9 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "6.2.0"
+version = "6.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4"
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
 
 [[package]]
 name = "ouroboros"
@@ -5009,9 +5025,9 @@ dependencies = [
 
 [[package]]
 name = "owo-colors"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "decf7381921fea4dcb2549c5667eda59b3ec297ab7e2b5fc33eac69d2e7da87b"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
 [[package]]
 name = "parking_lot"
@@ -5067,7 +5083,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall 0.2.13",
+ "redox_syscall 0.2.16",
  "smallvec",
  "winapi",
 ]
@@ -5080,7 +5096,7 @@ checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall 0.2.13",
+ "redox_syscall 0.2.16",
  "smallvec",
  "windows-sys",
 ]
@@ -5132,9 +5148,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "pest"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0560d531d1febc25a3c9398a62a71256c0178f2e3443baedd9ad4bb8c9deb4"
+checksum = "cb779fcf4bb850fbbb0edc96ff6cf34fd90c4b1a112ce042653280d9a7364048"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -5142,9 +5158,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.2.1"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b13570633aff33c6d22ce47dd566b10a3b9122c2fe9d8e7501895905be532b91"
+checksum = "502b62a6d0245378b04ffe0a7fb4f4419a4815fce813bd8a0ec89a56e07d67b1"
 dependencies = [
  "pest",
  "pest_generator",
@@ -5152,9 +5168,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5803d8284a629cc999094ecd630f55e91b561a1d1ba75e233b00ae13b91a69ad"
+checksum = "451e629bf49b750254da26132f1a5a9d11fd8a95a3df51d15c4abd1ba154cb6c"
 dependencies = [
  "pest",
  "pest_meta",
@@ -5165,13 +5181,13 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1538eb784f07615c6d9a8ab061089c6c54a344c5b4301db51990ca1c241e8c04"
+checksum = "bcec162c71c45e269dfc3fc2916eaeb97feab22993a21bcce4721d08cd7801a6"
 dependencies = [
  "once_cell",
  "pest",
- "sha-1 0.10.0",
+ "sha1",
 ]
 
 [[package]]
@@ -5190,15 +5206,15 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143"
 dependencies = [
- "fixedbitset 0.4.1",
+ "fixedbitset 0.4.2",
  "indexmap",
 ]
 
 [[package]]
 name = "phf"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4724fa946c8d1e7cd881bd3dbee63ce32fc1e9e191e35786b3dc1320a3f68131"
+checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
 dependencies = [
  "phf_shared",
 ]
@@ -5215,9 +5231,9 @@ dependencies = [
 
 [[package]]
 name = "phf_generator"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b450720b6f75cfbfabc195814bd3765f337a4f9a83186f8537297cac12f6705"
+checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
 dependencies = [
  "phf_shared",
  "rand 0.8.5",
@@ -5225,9 +5241,9 @@ dependencies = [
 
 [[package]]
 name = "phf_shared"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd5609d4b2df87167f908a32e1b146ce309c16cf35df76bc11f440b756048e4"
+checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
 dependencies = [
  "siphasher",
  "uncased",
@@ -5302,9 +5318,9 @@ checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9"
+checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
 dependencies = [
  "plotters-backend",
 ]
@@ -5384,21 +5400,21 @@ dependencies = [
 
 [[package]]
 name = "pretty_assertions"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563"
+checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
 dependencies = [
- "ansi_term",
  "ctor",
  "diff",
  "output_vt100",
+ "yansi",
 ]
 
 [[package]]
 name = "prettyplease"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697ae720ee02011f439e0701db107ffe2916d83f718342d65d7f8bf7b8a5fee9"
+checksum = "a49e86d2c26a24059894a3afa13fd17d063419b05dfb83f06d9c3566060c3f5a"
 dependencies = [
  "proc-macro2 1.0.43",
  "syn 1.0.99",
@@ -5407,7 +5423,7 @@ dependencies = [
 [[package]]
 name = "primary"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
  "anemo",
  "anyhow",
@@ -5438,13 +5454,13 @@ dependencies = [
  "tap",
  "thiserror",
  "tokio",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tonic",
  "tower",
  "tracing",
  "typed-store",
  "types",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
 ]
 
 [[package]]
@@ -5458,10 +5474,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.1.3"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
 dependencies = [
+ "once_cell",
  "thiserror",
  "toml",
 ]
@@ -5826,7 +5843,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
 ]
 
 [[package]]
@@ -5960,7 +5977,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
 dependencies = [
  "pem",
  "ring",
- "time 0.3.9",
+ "time 0.3.14",
  "yasna",
 ]
 
@@ -6039,9 +6056,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.13"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
  "bitflags",
 ]
@@ -6052,25 +6069,25 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.6",
- "redox_syscall 0.2.13",
+ "getrandom 0.2.7",
+ "redox_syscall 0.2.16",
  "thiserror",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "776c8940430cf563f66a93f9111d1cd39306dc6c68149ecc6b934742a44a828a"
+checksum = "ed13bcd201494ab44900a96490291651d200730904221832b9547d24a87d332b"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f26c4704460286103bff62ea1fb78d137febc86aaf76952e6c5a2249af01f54"
+checksum = "5234cd6063258a5e32903b53b1b6ac043a0541c8adc1f610f67b0326c7a578fa"
 dependencies = [
  "proc-macro2 1.0.43",
  "quote 1.0.21",
@@ -6079,9 +6096,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.5.6"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -6099,9 +6116,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.26"
+version = "0.6.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
 
 [[package]]
 name = "remove_dir_all"
@@ -6238,15 +6255,6 @@ 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.9",
-]
-
 [[package]]
 name = "rusticata-macros"
 version = "4.1.0"
@@ -6289,7 +6297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 1.0.0",
+ "rustls-pemfile 1.0.1",
  "schannel",
  "security-framework",
 ]
@@ -6305,9 +6313,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9"
+checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
 dependencies = [
  "base64",
 ]
@@ -6467,9 +6475,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.6.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
+checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -6508,9 +6516,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.9"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
+checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"
 dependencies = [
  "serde 1.0.144",
 ]
@@ -6641,7 +6649,7 @@ version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
 dependencies = [
- "itoa 1.0.2",
+ "itoa 1.0.3",
  "ryu",
  "serde 1.0.144",
 ]
@@ -6662,7 +6670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.2",
+ "itoa 1.0.3",
  "ryu",
  "serde 1.0.144",
 ]
@@ -6680,9 +6688,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89df7a26519371a3cce44fbb914c2819c84d9b897890987fa3ab096491cc0ea8"
+checksum = "368f2d60d049ea019a84dcd6687b0d1e0030fe663ae105039bdf967ed5e6a9a7"
 dependencies = [
  "base64",
  "chrono",
@@ -6690,8 +6698,8 @@ dependencies = [
  "indexmap",
  "serde 1.0.144",
  "serde_json",
- "serde_with_macros 2.0.0",
- "time 0.3.9",
+ "serde_with_macros 2.0.1",
+ "time 0.3.14",
 ]
 
 [[package]]
@@ -6708,9 +6716,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de337f322382fcdfbb21a014f7c224ee041a23785651db67b9827403178f698f"
+checksum = "1ccadfacf6cf10faad22bbadf55986bdd0856edfb5d9210aa1dcf1f516e84e93"
 dependencies = [
  "darling 0.14.1",
  "proc-macro2 1.0.43",
@@ -6754,6 +6762,17 @@ dependencies = [
  "digest 0.10.3",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "006769ba83e921b3085caa8334186b00cf92b4cb1a6cf4632fbccc8eff5c7549"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "sha2"
 version = "0.9.9"
@@ -6769,9 +6788,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.2"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
+checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
@@ -6854,9 +6873,9 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ea32af43239f0d353a7dd75a22d94c329c8cdaafdcb4c1c1335aa10c298a4a"
+checksum = "e90531723b08e4d6d71b791108faf51f03e1b4a7784f96b2b87f852ebc247228"
 dependencies = [
  "digest 0.10.3",
  "rand_core 0.6.3",
@@ -6864,9 +6883,9 @@ dependencies = [
 
 [[package]]
 name = "similar"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3"
+checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803"
 
 [[package]]
 name = "simplelog"
@@ -7021,7 +7040,7 @@ dependencies = [
  "hashlink",
  "hex",
  "indexmap",
- "itoa 1.0.2",
+ "itoa 1.0.3",
  "libc",
  "libsqlite3-sys",
  "log",
@@ -7030,8 +7049,8 @@ dependencies = [
  "paste",
  "percent-encoding",
  "rustls",
- "rustls-pemfile 1.0.0",
- "sha2 0.10.2",
+ "rustls-pemfile 1.0.1",
+ "sha2 0.10.5",
  "smallvec",
  "sqlformat",
  "sqlx-rt",
@@ -7054,7 +7073,7 @@ dependencies = [
  "once_cell",
  "proc-macro2 1.0.43",
  "quote 1.0.21",
- "sha2 0.10.2",
+ "sha2 0.10.5",
  "sqlx-core",
  "sqlx-rt",
  "syn 1.0.99",
@@ -7087,19 +7106,19 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 [[package]]
 name = "storage"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
  "dashmap",
  "fastcrypto",
  "futures",
  "thiserror",
  "tokio",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tonic",
  "tracing",
  "typed-store",
  "types",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
 ]
 
 [[package]]
@@ -7216,7 +7235,7 @@ dependencies = [
  "base64ct",
  "bcs",
  "camino",
- "clap 3.2.17",
+ "clap 3.2.21",
  "colored",
  "executor",
  "futures",
@@ -7299,7 +7318,7 @@ dependencies = [
  "async-trait",
  "base64",
  "bcs",
- "clap 3.2.17",
+ "clap 3.2.21",
  "crossterm 0.23.2",
  "futures",
  "jemalloc-ctl",
@@ -7341,7 +7360,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bcs",
- "clap 3.2.17",
+ "clap 3.2.21",
  "futures",
  "prometheus",
  "reqwest",
@@ -7410,7 +7429,7 @@ dependencies = [
  "bincode",
  "bytes",
  "chrono",
- "clap 3.2.17",
+ "clap 3.2.21",
  "config 0.1.0",
  "consensus",
  "executor",
@@ -7504,7 +7523,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "axum",
- "clap 3.2.17",
+ "clap 3.2.21",
  "futures",
  "http",
  "prometheus",
@@ -7579,7 +7598,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "clap 3.2.17",
+ "clap 3.2.21",
  "futures",
  "move-package",
  "mysten-network",
@@ -7705,7 +7724,7 @@ dependencies = [
  "anyhow",
  "axum",
  "chrono",
- "clap 3.2.17",
+ "clap 3.2.21",
  "futures",
  "jemalloc-ctl",
  "jemallocator",
@@ -7733,7 +7752,7 @@ name = "sui-open-rpc"
 version = "0.6.1"
 dependencies = [
  "anyhow",
- "clap 3.2.17",
+ "clap 3.2.21",
  "hyper",
  "move-core-types",
  "move-package",
@@ -7789,7 +7808,7 @@ dependencies = [
  "async-trait",
  "bcs",
  "bip39",
- "clap 3.2.17",
+ "clap 3.2.21",
  "dirs",
  "futures",
  "futures-core",
@@ -7895,7 +7914,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "axum",
- "clap 3.2.17",
+ "clap 3.2.21",
  "http",
  "move-package",
  "serde 1.0.144",
@@ -7915,7 +7934,7 @@ name = "sui-tool"
 version = "0.9.0"
 dependencies = [
  "anyhow",
- "clap 3.2.17",
+ "clap 3.2.21",
  "colored",
  "executor",
  "eyre",
@@ -7946,7 +7965,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bimap",
- "clap 3.2.17",
+ "clap 3.2.21",
  "move-binary-format",
  "move-bytecode-utils",
  "move-command-line-common",
@@ -8100,9 +8119,9 @@ checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1"
 
 [[package]]
 name = "target-spec"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "462215968f204588ef2d3499333d07729b692aa01f79f9b0925071127b3b353f"
+checksum = "5e57e26b3160d2b7a45f5110cdccbef33ec1b9bb96cdad91ebc0368ed947ff4d"
 dependencies = [
  "cfg-expr",
  "guppy-workspace-hack",
@@ -8139,7 +8158,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "fastrand",
  "libc",
- "redox_syscall 0.2.13",
+ "redox_syscall 0.2.16",
  "remove_dir_all",
  "winapi",
 ]
@@ -8301,18 +8320,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252"
+checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487"
+checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783"
 dependencies = [
  "proc-macro2 1.0.43",
  "quote 1.0.21",
@@ -8358,21 +8377,22 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
 dependencies = [
  "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
  "winapi",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.9"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
+checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b"
 dependencies = [
- "itoa 1.0.2",
+ "itoa 1.0.3",
  "libc",
  "num_threads",
  "serde 1.0.144",
@@ -8421,9 +8441,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.20.1"
+version = "1.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
+checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95"
 dependencies = [
  "autocfg 1.1.0",
  "bytes",
@@ -8513,38 +8533,38 @@ dependencies = [
  "futures-core",
  "pin-project-lite",
  "tokio",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
 ]
 
 [[package]]
 name = "tokio-util"
 version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
+source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=8ca4c94029ac1b7c8342720820e6100e9f31a372#8ca4c94029ac1b7c8342720820e6100e9f31a372"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-io",
  "futures-sink",
+ "futures-util",
+ "hashbrown",
  "pin-project-lite",
- "tokio",
+ "real_tokio",
+ "slab",
  "tracing",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.3"
-source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=8ca4c94029ac1b7c8342720820e6100e9f31a372#8ca4c94029ac1b7c8342720820e6100e9f31a372"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-io",
  "futures-sink",
- "futures-util",
- "hashbrown 0.12.3",
  "pin-project-lite",
- "real_tokio",
- "slab",
+ "tokio",
  "tracing",
 ]
 
@@ -8604,11 +8624,11 @@ dependencies = [
  "pin-project",
  "prost",
  "prost-derive",
- "rustls-pemfile 1.0.0",
+ "rustls-pemfile 1.0.1",
  "tokio",
  "tokio-rustls",
  "tokio-stream",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tower",
  "tower-layer",
  "tower-service",
@@ -8683,7 +8703,7 @@ dependencies = [
  "rand 0.8.5",
  "slab",
  "tokio",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -8717,9 +8737,9 @@ checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
 
 [[package]]
 name = "tower-service"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
@@ -8741,7 +8761,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
 dependencies = [
  "crossbeam-channel",
- "time 0.3.9",
+ "time 0.3.14",
  "tracing-subscriber 0.3.15",
 ]
 
@@ -8766,7 +8786,7 @@ dependencies = [
  "log",
  "serde 1.0.144",
  "serde_json",
- "time 0.3.9",
+ "time 0.3.14",
  "tracing",
  "tracing-core",
  "tracing-log",
@@ -8852,7 +8872,7 @@ dependencies = [
  "sharded-slab",
  "smallvec",
  "thread_local",
- "time 0.3.9",
+ "time 0.3.14",
  "tracing",
  "tracing-core",
  "tracing-log",
@@ -8961,7 +8981,7 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 [[package]]
 name = "types"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
  "anemo",
  "anemo-build",
@@ -8977,6 +8997,7 @@ dependencies = [
  "fastcrypto",
  "futures",
  "indexmap",
+ "mysten-util-mem",
  "prometheus",
  "proptest",
  "proptest-derive",
@@ -8986,23 +9007,23 @@ dependencies = [
  "roaring",
  "rustversion",
  "serde 1.0.144",
- "serde_with 2.0.0",
+ "serde_with 2.0.1",
  "signature",
  "thiserror",
  "tokio",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tonic",
  "tonic-build 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tracing",
  "typed-store",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
 ]
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c"
+checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
 
 [[package]]
 name = "uncased"
@@ -9086,9 +9107,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
 
 [[package]]
 name = "unicode-linebreak"
@@ -9110,15 +9131,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "unicode-xid"
@@ -9184,7 +9205,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
 dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
  "rand 0.8.5",
 ]
 
@@ -9281,9 +9302,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
 [[package]]
 name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
+version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasi"
@@ -9293,9 +9314,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
  "cfg-if 1.0.0",
  "serde 1.0.144",
@@ -9305,9 +9326,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
 dependencies = [
  "bumpalo",
  "log",
@@ -9320,9 +9341,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.31"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f"
+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -9332,9 +9353,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
 dependencies = [
  "quote 1.0.21",
  "wasm-bindgen-macro-support",
@@ -9342,9 +9363,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2 1.0.43",
  "quote 1.0.21",
@@ -9355,15 +9376,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
 [[package]]
 name = "web-sys"
-version = "0.3.58"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -9390,21 +9411,22 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "4.2.5"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
+checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
 dependencies = [
  "either",
- "lazy_static 1.4.0",
  "libc",
+ "once_cell",
 ]
 
 [[package]]
 name = "whoami"
-version = "1.2.1"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8"
+checksum = "d6631b6a2fd59b1841b622e8f1a7ad241ef0a46f2d580464ce8140ac94cbd571"
 dependencies = [
+ "bumpalo",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -9501,8 +9523,9 @@ dependencies = [
 [[package]]
 name = "worker"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
+ "anemo",
  "async-trait",
  "bincode",
  "blake2",
@@ -9521,13 +9544,13 @@ dependencies = [
  "tap",
  "tokio",
  "tokio-stream",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "tonic",
  "tower",
  "tracing",
  "typed-store",
  "types",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
 ]
 
 [[package]]
@@ -9596,7 +9619,7 @@ dependencies = [
  "bitmaps",
  "blake2",
  "blake2s_simd",
- "block-buffer 0.10.2",
+ "block-buffer 0.10.3",
  "block-buffer 0.9.0",
  "block-padding",
  "bls-crypto",
@@ -9615,8 +9638,7 @@ dependencies = [
  "cargo_metadata 0.14.2",
  "cargo_metadata 0.15.0",
  "cassowary",
- "cast 0.2.7",
- "cast 0.3.0",
+ "cast",
  "cc",
  "cexpr",
  "cfg-expr",
@@ -9627,7 +9649,7 @@ dependencies = [
  "chrono-tz-build",
  "clang-sys",
  "clap 2.34.0",
- "clap 3.2.17",
+ "clap 3.2.21",
  "clap_derive",
  "clap_lex",
  "clear_on_drop",
@@ -9738,7 +9760,7 @@ dependencies = [
  "ff",
  "fiat-crypto",
  "fixedbitset 0.2.0",
- "fixedbitset 0.4.1",
+ "fixedbitset 0.4.2",
  "flexstr",
  "float-cmp",
  "flume",
@@ -9763,7 +9785,7 @@ dependencies = [
  "generic-array",
  "gethostname",
  "getrandom 0.1.16",
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
  "gimli",
  "glob",
  "globset",
@@ -9778,8 +9800,7 @@ dependencies = [
  "h2",
  "hakari",
  "half",
- "hashbrown 0.11.2",
- "hashbrown 0.12.3",
+ "hashbrown",
  "hashlink",
  "hdrhistogram",
  "heck 0.3.3",
@@ -9806,6 +9827,7 @@ dependencies = [
  "if_chain",
  "ignore",
  "im",
+ "impl-trait-for-tuples",
  "include_dir",
  "include_dir_macros",
  "indenter",
@@ -9818,7 +9840,7 @@ dependencies = [
  "ipnet",
  "itertools",
  "itoa 0.4.8",
- "itoa 1.0.2",
+ "itoa 1.0.3",
  "jemalloc-ctl",
  "jemalloc-sys",
  "jemallocator",
@@ -9909,6 +9931,8 @@ dependencies = [
  "multihash-derive",
  "multimap",
  "mysten-network",
+ "mysten-util-mem",
+ "mysten-util-mem-derive",
  "name-variant",
  "named-lock",
  "native-tls",
@@ -9934,8 +9958,7 @@ dependencies = [
  "num_enum",
  "num_enum_derive",
  "num_threads",
- "object 0.28.4",
- "object 0.29.0",
+ "object",
  "oid-registry",
  "once_cell",
  "oorandom",
@@ -9996,7 +10019,7 @@ dependencies = [
  "prettyplease",
  "primary",
  "proc-macro-crate 0.1.5",
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate 1.2.1",
  "proc-macro-error",
  "proc-macro-error-attr",
  "proc-macro2 0.4.30",
@@ -10060,13 +10083,12 @@ dependencies = [
  "rustc-hash",
  "rustc_version 0.2.3",
  "rustc_version 0.3.3",
- "rustc_version 0.4.0",
  "rusticata-macros",
  "rustix",
  "rustls",
  "rustls-native-certs",
  "rustls-pemfile 0.2.1",
- "rustls-pemfile 1.0.0",
+ "rustls-pemfile 1.0.1",
  "rustversion",
  "rusty-fork",
  "rustyline",
@@ -10085,7 +10107,7 @@ dependencies = [
  "security-framework-sys",
  "semver 0.11.0",
  "semver 0.9.0",
- "semver 1.0.9",
+ "semver 1.0.13",
  "semver-parser 0.10.2",
  "semver-parser 0.7.0",
  "send_wrapper",
@@ -10103,13 +10125,13 @@ dependencies = [
  "serde_test",
  "serde_urlencoded",
  "serde_with 1.14.0",
- "serde_with 2.0.0",
+ "serde_with 2.0.1",
  "serde_with_macros 1.5.2",
- "serde_with_macros 2.0.0",
+ "serde_with_macros 2.0.1",
  "serde_yaml",
  "sha-1 0.10.0",
  "sha-1 0.9.8",
- "sha2 0.10.2",
+ "sha2 0.10.5",
  "sha2 0.9.9",
  "sha3 0.10.4",
  "sha3 0.9.1",
@@ -10179,8 +10201,8 @@ dependencies = [
  "thread_local",
  "threadpool",
  "thrift",
- "time 0.1.43",
- "time 0.3.9",
+ "time 0.1.44",
+ "time 0.3.14",
  "time-macros",
  "tint",
  "tinytemplate",
@@ -10193,7 +10215,7 @@ dependencies = [
  "tokio-retry",
  "tokio-rustls",
  "tokio-stream",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "toml",
  "toml_edit 0.13.4",
  "toml_edit 0.14.4",
@@ -10279,7 +10301,7 @@ dependencies = [
  "windows_x86_64_msvc",
  "winreg",
  "worker",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290)",
  "x509-parser",
  "yaml-rust",
  "yansi",
@@ -10292,7 +10314,7 @@ dependencies = [
 [[package]]
 name = "workspace-hack"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=2b77ef805c9bce0af4d74477dd922d150d31cb16#2b77ef805c9bce0af4d74477dd922d150d31cb16"
+source = "git+https://github.com/MystenLabs/narwhal?rev=aaa8a56efb5917e6b003285abe2a9a079ae90290#aaa8a56efb5917e6b003285abe2a9a079ae90290"
 dependencies = [
  "addr2line",
  "adler",
@@ -10342,7 +10364,7 @@ dependencies = [
  "bitflags",
  "blake2",
  "blake2s_simd",
- "block-buffer 0.10.2",
+ "block-buffer 0.10.3",
  "block-buffer 0.9.0",
  "block-padding",
  "bls-crypto",
@@ -10353,14 +10375,14 @@ dependencies = [
  "bytemuck",
  "byteorder",
  "bytes",
- "cast 0.3.0",
+ "cast",
  "cc",
  "cexpr",
  "cfg-if 0.1.10",
  "cfg-if 1.0.0",
  "clang-sys",
  "clap 2.34.0",
- "clap 3.2.17",
+ "clap 3.2.21",
  "clap_lex",
  "clear_on_drop",
  "cmake",
@@ -10413,7 +10435,7 @@ dependencies = [
  "fastrand",
  "fdlimit",
  "ff",
- "fixedbitset 0.4.1",
+ "fixedbitset 0.4.2",
  "float-cmp",
  "fnv",
  "form_urlencoded",
@@ -10431,13 +10453,13 @@ dependencies = [
  "generic-array",
  "gethostname",
  "getrandom 0.1.16",
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
  "gimli",
  "glob",
  "group",
  "h2",
  "half",
- "hashbrown 0.12.3",
+ "hashbrown",
  "hdrhistogram",
  "heck 0.3.3",
  "heck 0.4.0",
@@ -10455,6 +10477,7 @@ dependencies = [
  "hyper-timeout",
  "ident_case",
  "idna",
+ "impl-trait-for-tuples",
  "indenter",
  "indexmap",
  "insta",
@@ -10462,7 +10485,7 @@ dependencies = [
  "integer-encoding",
  "itertools",
  "itoa 0.4.8",
- "itoa 1.0.2",
+ "itoa 1.0.3",
  "jobserver",
  "json",
  "k256",
@@ -10494,13 +10517,15 @@ dependencies = [
  "multihash-derive",
  "multimap",
  "mysten-network",
+ "mysten-util-mem",
+ "mysten-util-mem-derive",
  "nom 7.1.1",
  "normalize-line-endings",
  "num-bigint",
  "num-integer",
  "num-traits 0.2.15",
  "num_cpus",
- "object 0.29.0",
+ "object",
  "oid-registry",
  "once_cell",
  "oorandom",
@@ -10538,7 +10563,7 @@ dependencies = [
  "pretty_assertions",
  "prettyplease",
  "proc-macro-crate 0.1.5",
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate 1.2.1",
  "proc-macro-error",
  "proc-macro-error-attr",
  "proc-macro2 0.4.30",
@@ -10584,7 +10609,7 @@ dependencies = [
  "rusticata-macros",
  "rustls",
  "rustls-pemfile 0.2.1",
- "rustls-pemfile 1.0.0",
+ "rustls-pemfile 1.0.1",
  "rustversion",
  "rusty-fork",
  "ryu",
@@ -10606,10 +10631,10 @@ dependencies = [
  "serde_json",
  "serde_test",
  "serde_urlencoded",
- "serde_with 2.0.0",
- "serde_with_macros 2.0.0",
+ "serde_with 2.0.1",
+ "serde_with_macros 2.0.1",
  "serde_yaml",
- "sha2 0.10.2",
+ "sha2 0.10.5",
  "sha2 0.9.9",
  "sha3 0.10.4",
  "sha3 0.9.1",
@@ -10646,7 +10671,7 @@ dependencies = [
  "thread_local",
  "threadpool",
  "thrift",
- "time 0.3.9",
+ "time 0.3.14",
  "time-macros",
  "tinytemplate",
  "tinyvec",
@@ -10656,7 +10681,7 @@ dependencies = [
  "tokio-macros 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-rustls",
  "tokio-stream",
- "tokio-util 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.4",
  "toml",
  "tonic",
  "tonic-build 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -10713,7 +10738,7 @@ name = "x"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 3.2.17",
+ "clap 3.2.21",
  "nexlint",
  "nexlint-lints",
 ]
@@ -10733,7 +10758,7 @@ dependencies = [
  "oid-registry",
  "rusticata-macros",
  "thiserror",
- "time 0.3.9",
+ "time 0.3.14",
 ]
 
 [[package]]
@@ -10757,7 +10782,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c"
 dependencies = [
- "time 0.3.9",
+ "time 0.3.14",
 ]
 
 [[package]]
diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml
index b70f488b28c8a..226df7ac59f33 100644
--- a/crates/sui-benchmark/Cargo.toml
+++ b/crates/sui-benchmark/Cargo.toml
@@ -41,7 +41,7 @@ sui-node = { path = "../sui-node" }
 sui-json-rpc-types = { path = "../sui-json-rpc-types" }
 
 move-core-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e", features = ["address20"] }
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "node" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "node" }
 workspace-hack = { path = "../workspace-hack"}
 test-utils = { path = "../test-utils" }
 
diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml
index 88b3c1c40e756..b52b14428ff5d 100644
--- a/crates/sui-config/Cargo.toml
+++ b/crates/sui-config/Cargo.toml
@@ -25,8 +25,8 @@ move-binary-format = { git = "https://github.com/move-language/move", rev = "e1e
 move-package = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
 move-core-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e", features = ["address20"] }
 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "config" }
-narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "crypto" }
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "config" }
+narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "crypto" }
 
 sui-framework = { path = "../sui-framework" }
 sui-adapter = { path = "../sui-adapter" }
diff --git a/crates/sui-config/src/builder.rs b/crates/sui-config/src/builder.rs
index 9ca37cdaa38bc..e7a6abf167193 100644
--- a/crates/sui-config/src/builder.rs
+++ b/crates/sui-config/src/builder.rs
@@ -123,16 +123,19 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
                             get_key_pair_from_rng::<AccountKeyPair, _>(&mut rng)
                                 .1
                                 .into(),
-                            get_key_pair_from_rng::<AccountKeyPair, _>(&mut rng)
-                                .1
-                                .into(),
+                            get_key_pair_from_rng(&mut rng).1,
                         ),
                     )
                 })
                 .map(
                     |(i, (key_pair, worker_key_pair, account_key_pair, network_key_pair)): (
                         _,
-                        (AuthorityKeyPair, AuthorityKeyPair, SuiKeyPair, SuiKeyPair),
+                        (
+                            AuthorityKeyPair,
+                            AuthorityKeyPair,
+                            SuiKeyPair,
+                            AuthorityKeyPair,
+                        ),
                     )| {
                         self.build_validator(
                             i,
@@ -156,7 +159,7 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
         key_pair: AuthorityKeyPair,
         worker_key_pair: AuthorityKeyPair,
         account_key_pair: SuiKeyPair,
-        network_key_pair: SuiKeyPair,
+        network_key_pair: AuthorityKeyPair,
     ) -> ValidatorGenesisInfo {
         match self.validator_ip_sel {
             ValidatorIpSelection::Localhost => ValidatorGenesisInfo::from_localhost_for_testing(
@@ -199,7 +202,8 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
                 let protocol_key: AuthorityPublicKeyBytes = validator.key_pair.public().into();
                 let worker_key: AuthorityPublicKeyBytes = validator.worker_key_pair.public().into();
                 let account_key: PublicKey = validator.account_key_pair.public();
-                let network_key: PublicKey = validator.network_key_pair.public();
+                let network_key: AuthorityPublicKeyBytes =
+                    validator.network_key_pair.public().into();
                 let stake = validator.stake;
                 let network_address = validator.network_address.clone();
                 let pop = generate_proof_of_possession(
@@ -218,10 +222,8 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
                         delegation: 0, // no delegation yet at genesis
                         gas_price: validator.gas_price,
                         network_address,
-                        narwhal_primary_to_primary: validator.narwhal_primary_to_primary.clone(),
-                        narwhal_worker_to_primary: validator.narwhal_worker_to_primary.clone(),
-                        narwhal_primary_to_worker: validator.narwhal_primary_to_worker.clone(),
-                        narwhal_worker_to_worker: validator.narwhal_worker_to_worker.clone(),
+                        narwhal_primary_address: validator.narwhal_primary_address.clone(),
+                        narwhal_worker_address: validator.narwhal_worker_address.clone(),
                         narwhal_consensus_address: validator.narwhal_consensus_address.clone(),
                     },
                     pop,
diff --git a/crates/sui-config/src/genesis.rs b/crates/sui-config/src/genesis.rs
index 9072e97e973b2..8ebfa6079fefd 100644
--- a/crates/sui-config/src/genesis.rs
+++ b/crates/sui-config/src/genesis.rs
@@ -73,13 +73,14 @@ impl Genesis {
                 // construct narwhal Committee struct.
                 let name = narwhal_crypto::PublicKey::from_bytes(validator.protocol_key().as_ref())
                     .expect("Can't get narwhal public key");
-                let primary = narwhal_config::PrimaryAddresses {
-                    primary_to_primary: validator.narwhal_primary_to_primary.clone(),
-                    worker_to_primary: validator.narwhal_worker_to_primary.clone(),
-                };
+                let network_key =
+                    narwhal_crypto::NetworkPublicKey::from_bytes(validator.network_key().as_ref())
+                        .expect("Can't get narwhal public key");
+                let primary_address = validator.narwhal_primary_address.clone();
                 let authority = narwhal_config::Authority {
                     stake: validator.stake as narwhal_config::Stake, //TODO this should at least be the same size integer
-                    primary,
+                    primary_address,
+                    network_key,
                 };
 
                 (name, authority)
@@ -105,9 +106,8 @@ impl Genesis {
                             .worker_key()
                             .try_into()
                             .expect("Can't get narwhal worker public key"),
-                        primary_to_worker: validator.narwhal_primary_to_worker.clone(),
                         transactions: validator.narwhal_consensus_address.clone(),
-                        worker_to_worker: validator.narwhal_worker_to_worker.clone(),
+                        worker_address: validator.narwhal_worker_address.clone(),
                     },
                 )]
                 .into_iter()
@@ -621,21 +621,19 @@ mod test {
         let key: AuthorityKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
         let worker_key: AuthorityKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
         let account_key: AccountKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
-        let network_key: AccountKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
+        let network_key: AuthorityKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
         let validator = ValidatorInfo {
             name: "0".into(),
             protocol_key: key.public().into(),
             worker_key: worker_key.public().into(),
             account_key: account_key.public().clone().into(),
-            network_key: network_key.public().clone().into(),
+            network_key: network_key.public().into(),
             stake: 1,
             delegation: 0,
             gas_price: 1,
             network_address: utils::new_network_address(),
-            narwhal_primary_to_primary: utils::new_network_address(),
-            narwhal_worker_to_primary: utils::new_network_address(),
-            narwhal_primary_to_worker: utils::new_network_address(),
-            narwhal_worker_to_worker: utils::new_network_address(),
+            narwhal_primary_address: utils::new_network_address(),
+            narwhal_worker_address: utils::new_network_address(),
             narwhal_consensus_address: utils::new_network_address(),
         };
         let pop = generate_proof_of_possession(&key, account_key.public().into());
diff --git a/crates/sui-config/src/genesis_config.rs b/crates/sui-config/src/genesis_config.rs
index 5e5524acdba46..1ea5f78777d46 100644
--- a/crates/sui-config/src/genesis_config.rs
+++ b/crates/sui-config/src/genesis_config.rs
@@ -93,14 +93,13 @@ pub struct ValidatorGenesisInfo {
     #[serde_as(as = "KeyPairBase64")]
     pub worker_key_pair: AuthorityKeyPair,
     pub account_key_pair: SuiKeyPair,
-    pub network_key_pair: SuiKeyPair,
+    #[serde_as(as = "KeyPairBase64")]
+    pub network_key_pair: AuthorityKeyPair,
     pub network_address: Multiaddr,
     pub stake: StakeUnit,
     pub gas_price: u64,
-    pub narwhal_primary_to_primary: Multiaddr,
-    pub narwhal_worker_to_primary: Multiaddr,
-    pub narwhal_primary_to_worker: Multiaddr,
-    pub narwhal_worker_to_worker: Multiaddr,
+    pub narwhal_primary_address: Multiaddr,
+    pub narwhal_worker_address: Multiaddr,
     pub narwhal_consensus_address: Multiaddr,
 }
 
@@ -109,7 +108,7 @@ impl ValidatorGenesisInfo {
         key_pair: AuthorityKeyPair,
         worker_key_pair: AuthorityKeyPair,
         account_key_pair: SuiKeyPair,
-        network_key_pair: SuiKeyPair,
+        network_key_pair: AuthorityKeyPair,
     ) -> Self {
         Self {
             key_pair,
@@ -119,10 +118,8 @@ impl ValidatorGenesisInfo {
             network_address: utils::new_network_address(),
             stake: DEFAULT_STAKE,
             gas_price: DEFAULT_GAS_PRICE,
-            narwhal_primary_to_primary: utils::new_network_address(),
-            narwhal_worker_to_primary: utils::new_network_address(),
-            narwhal_primary_to_worker: utils::new_network_address(),
-            narwhal_worker_to_worker: utils::new_network_address(),
+            narwhal_primary_address: utils::new_network_address(),
+            narwhal_worker_address: utils::new_network_address(),
             narwhal_consensus_address: utils::new_network_address(),
         }
     }
@@ -131,7 +128,7 @@ impl ValidatorGenesisInfo {
         key_pair: AuthorityKeyPair,
         worker_key_pair: AuthorityKeyPair,
         account_key_pair: SuiKeyPair,
-        network_key_pair: SuiKeyPair,
+        network_key_pair: AuthorityKeyPair,
         ip: String,
         // Port offset allows running many SuiNodes inside the same simulator node, which is
         // helpful for tests that don't use Swarm.
@@ -150,11 +147,9 @@ impl ValidatorGenesisInfo {
             network_address: make_addr(1000 + port_offset),
             stake: DEFAULT_STAKE,
             gas_price: DEFAULT_GAS_PRICE,
-            narwhal_primary_to_primary: make_addr(2000 + port_offset),
-            narwhal_worker_to_primary: make_addr(3000 + port_offset),
-            narwhal_primary_to_worker: make_addr(4000 + port_offset),
-            narwhal_worker_to_worker: make_addr(5000 + port_offset),
-            narwhal_consensus_address: make_addr(6000 + port_offset),
+            narwhal_primary_address: make_addr(2000 + port_offset),
+            narwhal_worker_address: make_addr(3000 + port_offset),
+            narwhal_consensus_address: make_addr(4000 + port_offset),
         }
     }
 }
diff --git a/crates/sui-config/src/node.rs b/crates/sui-config/src/node.rs
index 28acd0c7f5b49..98caf62a2acb4 100644
--- a/crates/sui-config/src/node.rs
+++ b/crates/sui-config/src/node.rs
@@ -40,8 +40,9 @@ pub struct NodeConfig {
     /// The keypair that the authority uses to receive payments
     #[serde(default = "default_sui_key_pair")]
     pub account_key_pair: Arc<SuiKeyPair>,
-    #[serde(default = "default_sui_key_pair")]
-    pub network_key_pair: Arc<SuiKeyPair>,
+    #[serde(default = "default_key_pair")]
+    #[serde_as(as = "Arc<KeyPairBase64>")]
+    pub network_key_pair: Arc<AuthorityKeyPair>,
     pub db_path: PathBuf,
     #[serde(default = "default_grpc_address")]
     pub network_address: Multiaddr,
@@ -193,17 +194,15 @@ pub struct ValidatorInfo {
     pub account_key: AccountsPublicKey,
     pub protocol_key: AuthorityPublicKeyBytes,
     pub worker_key: AuthorityPublicKeyBytes,
-    pub network_key: AccountsPublicKey,
+    pub network_key: AuthorityPublicKeyBytes,
     pub stake: StakeUnit,
     pub delegation: StakeUnit,
     pub gas_price: u64,
     pub network_address: Multiaddr,
-    pub narwhal_primary_to_primary: Multiaddr,
+    pub narwhal_primary_address: Multiaddr,
 
     //TODO remove all of these as they shouldn't be needed to be encoded in genesis
-    pub narwhal_worker_to_primary: Multiaddr,
-    pub narwhal_primary_to_worker: Multiaddr,
-    pub narwhal_worker_to_worker: Multiaddr,
+    pub narwhal_worker_address: Multiaddr,
     pub narwhal_consensus_address: Multiaddr,
 }
 
@@ -224,8 +223,8 @@ impl ValidatorInfo {
         self.worker_key
     }
 
-    pub fn network_key(&self) -> &AccountsPublicKey {
-        &self.network_key
+    pub fn network_key(&self) -> AuthorityPublicKeyBytes {
+        self.network_key
     }
 
     pub fn account_key(&self) -> &AccountsPublicKey {
diff --git a/crates/sui-config/src/swarm.rs b/crates/sui-config/src/swarm.rs
index b120993fc634d..95e78e33cfbb0 100644
--- a/crates/sui-config/src/swarm.rs
+++ b/crates/sui-config/src/swarm.rs
@@ -76,11 +76,7 @@ impl NetworkConfig {
                 .1
                 .into(),
         );
-        let network_key_pair: Arc<SuiKeyPair> = Arc::new(
-            get_key_pair_from_rng::<AccountKeyPair, _>(&mut OsRng)
-                .1
-                .into(),
-        );
+        let network_key_pair: Arc<AuthorityKeyPair> = Arc::new(get_key_pair_from_rng(&mut OsRng).1);
         let validator_config = &self.validator_configs[0];
 
         let mut db_path = validator_config.db_path.clone();
diff --git a/crates/sui-config/tests/snapshot_tests.rs b/crates/sui-config/tests/snapshot_tests.rs
index 18bc3beb330c8..0dab528529fbb 100644
--- a/crates/sui-config/tests/snapshot_tests.rs
+++ b/crates/sui-config/tests/snapshot_tests.rs
@@ -72,15 +72,13 @@ fn populated_genesis_snapshot_matches() {
         protocol_key: key.public().into(),
         worker_key: worker_key.public().into(),
         account_key: account_key.public().clone().into(),
-        network_key: network_key.public().clone().into(),
+        network_key: network_key.public().into(),
         stake: 1,
         delegation: 0,
         gas_price: 1,
         network_address: Multiaddr::empty(),
-        narwhal_primary_to_primary: Multiaddr::empty(),
-        narwhal_worker_to_primary: Multiaddr::empty(),
-        narwhal_primary_to_worker: Multiaddr::empty(),
-        narwhal_worker_to_worker: Multiaddr::empty(),
+        narwhal_primary_address: Multiaddr::empty(),
+        narwhal_worker_address: Multiaddr::empty(),
         narwhal_consensus_address: Multiaddr::empty(),
     };
     let pop = generate_proof_of_possession(&key, account_key.public().into());
diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap b/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
index f452e197c96b7..7cf50bd84110e 100644
--- a/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
+++ b/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
@@ -6,7 +6,7 @@ validator_configs:
   - protocol-key-pair: m/SaagdV+VOBH84SXyaD1QQpw7tJ4HQUfgCJpS6uFV+5xu4WMO8+cRFEpkjbBruyKE9ydM++5T/87lA8waSSAA==
     worker-key-pair: BWT4edJ648As6Cg0rPqMeTpinyyg3mkZYQvoL0ETJr6u8/SkuOyh38NDNhv45Da9Qt6SWcBLgxTrjiBU3W6Cqw==
     account-key-pair: AIpXYuIawc2zhwRCx3tMOvWMfO24d50CcObU8eL3Nn10C9WIQSA+dP6G/HEzjOAXPcYo67cZvcvMFRWFIUzAibQ=
-    network-key-pair: AMxiMy40uy1c1p9g77sqNsuRbH60WDAeo2Y2xNuwEr2IQiWNzaFM8RHGAriXG4zIQ+keRsqQUVHAJ0SmsBfmkxY=
+    network-key-pair: QiWNzaFM8RHGAriXG4zIQ+keRsqQUVHAJ0SmsBfmkxbMYjMuNLstXNafYO+7KjbLkWx+tFgwHqNmNsTbsBK9iA==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -48,7 +48,7 @@ validator_configs:
   - protocol-key-pair: sgzWfEvezFOOi+mQwbZCXWi/06b+l2k+SEY1FZbMqKsjjttu6akf3I5xvlDAo/s88pLZAk3brAKqpwkJawqp2g==
     worker-key-pair: 9Z/d0Lf1LcwMYKRIy/lRFhCwp0Lx5NI4p6RcrgVOwhydR2FqGN8gOTB/BkIiYCWItSpqrqp7b+jGtNnrqKeHsQ==
     account-key-pair: AOo/znbuELOmRfswQFEd+rTJzWBY9BkpAU0WRm9eOywq4BB+FmG6xjjQpGNs/bv21foY4nMY2jMCltCjhxgNbIw=
-    network-key-pair: AK+0kF6VUM9GKoIAeCSgVdl1rpNEcMR32d27bSsmTDb60gL1Yotsq+ENWrgyROSyMO/U3MzvxGNYktNenctyJd8=
+    network-key-pair: 0gL1Yotsq+ENWrgyROSyMO/U3MzvxGNYktNenctyJd+vtJBelVDPRiqCAHgkoFXZda6TRHDEd9ndu20rJkw2+g==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -90,7 +90,7 @@ validator_configs:
   - protocol-key-pair: 9Lcs30s8QZpYQnBLH+55QCOl6uAiOVb7LEcBbhB7hE6X5+2EP6saQs6cISlDUh7CKgJWh0fMADuIH70n9wvf4A==
     worker-key-pair: kYP0d2s+pZoXgeVko+rpZ2k5e4q0NbJd2kGJ4QPQMc9cR/734xE9wBxW701He/5RV6/DOWmgFPi7VTfhjM7GTA==
     account-key-pair: AIM52ZwzO7Oid/63gLjUbKwwzc2QUNviNfuMxnuRwbBqnZTXHAccZRpZcVXhUvvQe7WAB32Ak1vyNmNCX/Kl8ak=
-    network-key-pair: AIZBl/TMXKtsjt1LecSF77mlVXGLdbYD4ui5j1XsDeJnpzzqy7X725Nhn+RxRHmPNmU97IGS14ftQFbEczxPAHY=
+    network-key-pair: pzzqy7X725Nhn+RxRHmPNmU97IGS14ftQFbEczxPAHaGQZf0zFyrbI7dS3nEhe+5pVVxi3W2A+LouY9V7A3iZw==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -132,7 +132,7 @@ validator_configs:
   - protocol-key-pair: ZyDgEy8FWgoN24poviNcDhIx9n6fKOuCHqxbHTnJPg+9UN97gnKsq+V1YAwCB2p5S8AIWrDXl7g9SiPgHI58JA==
     worker-key-pair: EQwhVD8hX7efjIVAYfuALmRyfmPqQ4ebKA5PameIh5D6gqrtUVPSkBC+OW8S2LZhTDl8dcRhP9uzbU/3BOUAqw==
     account-key-pair: ABbIisgBp4THAoTQX/i9gfBB1+pjLqfKKifGyv/WUZMM+K6cRt6kc+jMcFpq8yJS6MNJtJTF3O/XGG0atPFaJY0=
-    network-key-pair: ADuhDGVL5BRtqz1tq4CzziTON9t8dFwrJTIF1i+WewCzRuBQj94iWraVKHboVHWawvBtJms/9hWcJ38WR6jgPck=
+    network-key-pair: RuBQj94iWraVKHboVHWawvBtJms/9hWcJ38WR6jgPck7oQxlS+QUbas9bauAs84kzjfbfHRcKyUyBdYvlnsAsw==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -174,7 +174,7 @@ validator_configs:
   - protocol-key-pair: PfZvwVtLB44RZJaahQ4x3/MIjSqeJ7+3cZ5iHO/Lu9p23j+getiVNaF2azeYdXyKs671vofe4W6eEG3YtQlyng==
     worker-key-pair: Neqo634LMrcrpZYZ2dT5jOG8wyg5tK6nYrRGYFGa4WGWuKxioRp0flyAuGxPURbmrq5UrHAJctMlA7eSVqFTLw==
     account-key-pair: AFWsiGMz7Iq6Fa2OHopRFFSgjPy3zXDFjdhCyqBwjRq/a7tE8gojj/hBeXcgQGHOCDL2HfJ2KPJ4Q1ggrXvO/+Y=
-    network-key-pair: ACrfZkZbhZAbp8H6tlUREGwV7kmBjrBaPeWwPzyK71YXJfcI7/BU6ez/pZl1vtJqtInUc598clMt9PH7zXa0JpA=
+    network-key-pair: JfcI7/BU6ez/pZl1vtJqtInUc598clMt9PH7zXa0JpAq32ZGW4WQG6fB+rZVERBsFe5JgY6wWj3lsD88iu9WFw==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -216,7 +216,7 @@ validator_configs:
   - protocol-key-pair: wLPaTXduKbN+3+E0nSv8HiQl8vlvWvap8+WWhpfrxhySbqu6KEzD8Zidc5KCnKQO1lurPtgYY6lq2z5rPf9fpA==
     worker-key-pair: SmwxHcV2gQzxKoBcs5t39VDlpi6qn4CTFlvWdcQ2bo98EQEujhdX27EEV3Z86OoMCQvPAkniwEgO0RrLK3A7sA==
     account-key-pair: AIuFbz7FC0IUpvvkfoabM2nORDi5yW4dNjQDEnD/+Pi9LskdaKDI6rfXAXjiEd/Ot3tQDPgwFi2lyCfU68jIPj8=
-    network-key-pair: AHLHlbka4L6NP0NGiea/RxykMn/xJfoBeJqZq8VbQoDmQ9L5PWy1M9rnj1FyqfjKGyV3jMVL8RAzMJw9OdIifHU=
+    network-key-pair: Q9L5PWy1M9rnj1FyqfjKGyV3jMVL8RAzMJw9OdIifHVyx5W5GuC+jT9DRonmv0ccpDJ/8SX6AXiamavFW0KA5g==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -258,7 +258,7 @@ validator_configs:
   - protocol-key-pair: UzKENORv6NhWOakmfPhCH8ohVHr6Ydy2XxsoQzbtSf7RwP29fVH7wkswAtz/hkGYwp98tdl70TwMB75z9G9NRw==
     worker-key-pair: zqXFxYQpWyrIZx3ICuKRy6ie+Wm8m95nm9W63uaig36qOKjHsxwR6y1zCu5mSIno9fisAX34MT7/Vna0Cbrs4A==
     account-key-pair: AN0bN3jLSY/+7Ujz2rArJBe/aA5PpUqd4MeiL6JNiqBkTuESCA04r/Za9cqm5666CpZ6hHuIcdT0QtKnD3S1qNE=
-    network-key-pair: AJW1wJJR/Qv1ZtteKTUFIDo7oHEDpMA4nuvD1dDb+rJnrluAU/PE8mYAzlBmWs/OduYKF1tza4rUOBKiTAneX0s=
+    network-key-pair: rluAU/PE8mYAzlBmWs/OduYKF1tza4rUOBKiTAneX0uVtcCSUf0L9WbbXik1BSA6O6BxA6TAOJ7rw9XQ2/qyZw==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-3.snap b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-3.snap
index 3b7f76cab385c..899f34140bdbb 100644
--- a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-3.snap
+++ b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-3.snap
@@ -5,7 +5,7 @@ expression: genesis.narwhal_committee()
 authorities:
   ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=:
     stake: 1
-    primary:
-      primary_to_primary: ""
-      worker_to_primary: ""
+    primary_address: ""
+    network_key: ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=
 epoch: 0
+
diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-4.snap b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-4.snap
index 31360de1f6e5c..f1c465b0ed07d 100644
--- a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-4.snap
+++ b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-4.snap
@@ -7,7 +7,6 @@ workers:
     0:
       name: ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=
       transactions: ""
-      worker_to_worker: ""
-      primary_to_worker: ""
+      worker_address: ""
 epoch: 0
 
diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-5.snap b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-5.snap
index cc150bb525247..3f07429c6732e 100644
--- a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-5.snap
+++ b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-5.snap
@@ -46,50 +46,38 @@ validators:
           - 146
           - 0
         network_pubkey_bytes:
-          - 65
-          - 76
-          - 110
-          - 71
-          - 55
-          - 104
-          - 89
-          - 119
-          - 55
-          - 122
-          - 53
-          - 120
-          - 69
-          - 85
-          - 83
-          - 109
-          - 83
-          - 78
-          - 115
-          - 71
-          - 117
-          - 55
-          - 73
-          - 111
-          - 84
-          - 51
-          - 74
+          - 185
+          - 198
+          - 238
+          - 22
           - 48
-          - 122
-          - 55
-          - 55
-          - 108
-          - 80
-          - 47
-          - 122
-          - 117
-          - 85
+          - 239
+          - 62
+          - 113
+          - 17
           - 68
-          - 122
-          - 66
-          - 112
-          - 74
-          - 73
-          - 65
+          - 166
+          - 72
+          - 219
+          - 6
+          - 187
+          - 178
+          - 40
+          - 79
+          - 114
+          - 116
+          - 207
+          - 190
+          - 229
+          - 63
+          - 252
+          - 238
+          - 80
+          - 60
+          - 193
+          - 164
+          - 146
+          - 0
         proof_of_possession_bytes:
           - 9
           - 244
@@ -209,50 +197,38 @@ validators:
         - 146
         - 0
       network_pubkey_bytes:
-        - 65
-        - 76
-        - 110
-        - 71
-        - 55
-        - 104
-        - 89
-        - 119
-        - 55
-        - 122
-        - 53
-        - 120
-        - 69
-        - 85
-        - 83
-        - 109
-        - 83
-        - 78
-        - 115
-        - 71
-        - 117
-        - 55
-        - 73
-        - 111
-        - 84
-        - 51
-        - 74
+        - 185
+        - 198
+        - 238
+        - 22
         - 48
-        - 122
-        - 55
-        - 55
-        - 108
-        - 80
-        - 47
-        - 122
-        - 117
-        - 85
+        - 239
+        - 62
+        - 113
+        - 17
         - 68
-        - 122
-        - 66
-        - 112
-        - 74
-        - 73
-        - 65
+        - 166
+        - 72
+        - 219
+        - 6
+        - 187
+        - 178
+        - 40
+        - 79
+        - 114
+        - 116
+        - 207
+        - 190
+        - 229
+        - 63
+        - 252
+        - 238
+        - 80
+        - 60
+        - 193
+        - 164
+        - 146
+        - 0
       proof_of_possession_bytes:
         - 9
         - 244
@@ -335,3 +311,4 @@ parameters:
 delegation_reward:
   value: 0
 reference_gas_price: 0
+
diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches.snap b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches.snap
index 55dfe4610e3a0..067f8a87c8bf6 100644
--- a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches.snap
+++ b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches.snap
@@ -6,13 +6,12 @@ expression: genesis.validator_set()
   account-key: ALnG7hYw7z5xEUSmSNsGu7IoT3J0z77lP/zuUDzBpJIA
   protocol-key: ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=
   worker-key: ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=
-  network-key: ALnG7hYw7z5xEUSmSNsGu7IoT3J0z77lP/zuUDzBpJIA
+  network-key: ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=
   stake: 1
   delegation: 0
   gas-price: 1
   network-address: ""
-  narwhal-primary-to-primary: ""
-  narwhal-worker-to-primary: ""
-  narwhal-primary-to-worker: ""
-  narwhal-worker-to-worker: ""
+  narwhal-primary-address: ""
+  narwhal-worker-address: ""
   narwhal-consensus-address: ""
+
diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml
index 304c08670b0c8..ec78d41e3f0c2 100644
--- a/crates/sui-core/Cargo.toml
+++ b/crates/sui-core/Cargo.toml
@@ -50,11 +50,11 @@ typed-store = "0.1.0"
 typed-store-derive = "0.1.0"
 mysten-network = "0.1.0"
 
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "config" }
-narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "consensus" }
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "executor" }
-narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "types" }
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "node" }
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "config" }
+narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "consensus" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "executor" }
+narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "types" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "node" }
 
 fastcrypto = "0.1.2"
 workspace-hack = { path = "../workspace-hack"}
diff --git a/crates/sui-core/src/authority.rs b/crates/sui-core/src/authority.rs
index e9d3274a42808..6529cebd05644 100644
--- a/crates/sui-core/src/authority.rs
+++ b/crates/sui-core/src/authority.rs
@@ -114,6 +114,7 @@ pub(crate) const MAX_TX_RECOVERY_RETRY: u32 = 3;
 type CertTxGuard<'a> = DBTxGuard<'a, CertifiedTransaction>;
 
 pub type ReconfigConsensusMessage = (
+    ConsensusKeyPair,
     ConsensusKeyPair,
     ConsensusCommittee,
     Vec<(ConsensusWorkerId, ConsensusKeyPair)>,
diff --git a/crates/sui-core/src/authority_server.rs b/crates/sui-core/src/authority_server.rs
index 7d88d721ca262..8cb4cef18116d 100644
--- a/crates/sui-core/src/authority_server.rs
+++ b/crates/sui-core/src/authority_server.rs
@@ -263,11 +263,13 @@ impl ValidatorService {
         let consensus_storage_base_path = consensus_config.db_path().to_path_buf();
         let consensus_execution_state = state.clone();
         let consensus_parameters = consensus_config.narwhal_config().to_owned();
+        let network_keypair = config.network_key_pair.copy();
 
         let registry = prometheus_registry.clone();
         tokio::spawn(async move {
             narwhal_node::restarter::NodeRestarter::watch(
                 consensus_keypair,
+                network_keypair,
                 vec![(0, consensus_worker_keypair)],
                 &consensus_committee,
                 consensus_worker_cache,
diff --git a/crates/sui-core/src/node_sync/node_follower.rs b/crates/sui-core/src/node_sync/node_follower.rs
index d8eb429ecedfa..c84561712fc84 100644
--- a/crates/sui-core/src/node_sync/node_follower.rs
+++ b/crates/sui-core/src/node_sync/node_follower.rs
@@ -478,7 +478,7 @@ mod test {
             // At least 3 more were fetched from the stream - this number can't be checked exactly
             // because the authority returns everything in the current batch even if fewer items
             // were requested, and batch boundaries are non-deterministic.
-            assert!(result.items_from_stream >= 3 && result.items_from_stream <= 5);
+            assert!(result.items_from_stream >= 3 && result.items_from_stream <= 10);
         }
 
         // test follower_process
diff --git a/crates/sui-core/src/node_sync/node_state.rs b/crates/sui-core/src/node_sync/node_state.rs
index 22381e575a62b..ea1673899071c 100644
--- a/crates/sui-core/src/node_sync/node_state.rs
+++ b/crates/sui-core/src/node_sync/node_state.rs
@@ -272,7 +272,7 @@ where
 
                 return (
                     tokio::spawn(async move {
-                        state.receiver.lock().await;
+                        let _ = state.receiver.lock().await;
                     }),
                     sender,
                 );
diff --git a/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs b/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs
index 895b6004b4973..c15198859dedb 100644
--- a/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs
+++ b/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs
@@ -53,21 +53,19 @@ pub async fn init_local_authorities(
         let worker_key_pair: AuthorityKeyPair = get_key_pair().1;
         let worker_name = worker_key_pair.public().into();
         let account_key_pair: SuiKeyPair = get_key_pair::<AccountKeyPair>().1.into();
-        let network_key_pair: SuiKeyPair = get_key_pair::<AccountKeyPair>().1.into();
+        let network_key_pair: AuthorityKeyPair = get_key_pair().1;
         let validator_info = ValidatorInfo {
             name: format!("validator-{i}"),
             protocol_key: authority_name,
             worker_key: worker_name,
             account_key: account_key_pair.public(),
-            network_key: network_key_pair.public(),
+            network_key: network_key_pair.public().into(),
             stake: 1,
             delegation: 0,
             gas_price: 1,
             network_address: sui_config::utils::new_network_address(),
-            narwhal_primary_to_primary: sui_config::utils::new_network_address(),
-            narwhal_worker_to_primary: sui_config::utils::new_network_address(),
-            narwhal_primary_to_worker: sui_config::utils::new_network_address(),
-            narwhal_worker_to_worker: sui_config::utils::new_network_address(),
+            narwhal_primary_address: sui_config::utils::new_network_address(),
+            narwhal_worker_address: sui_config::utils::new_network_address(),
             narwhal_consensus_address: sui_config::utils::new_network_address(),
         };
         let pop = generate_proof_of_possession(&key_pair, (&account_key_pair.public()).into());
diff --git a/crates/sui-tool/Cargo.toml b/crates/sui-tool/Cargo.toml
index d0bbaf42ae2d5..d8e9699ced2d3 100644
--- a/crates/sui-tool/Cargo.toml
+++ b/crates/sui-tool/Cargo.toml
@@ -20,7 +20,7 @@ rocksdb = "0.19.0"
 typed-store = "0.1.0"
 typed-store-derive = "0.1.0"
 tempfile = "3.3.0"
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "executor" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "executor" }
 serde_with = { version = "1.14.0", features = ["hex"] }
 sui-storage = { path = "../sui-storage" }
 strum_macros = "^0.24"
diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml
index 97bfef92db0fa..3ba59d70caadc 100644
--- a/crates/sui-types/Cargo.toml
+++ b/crates/sui-types/Cargo.toml
@@ -50,7 +50,7 @@ move-disassembler = { git = "https://github.com/move-language/move", rev = "e1e6
 move-ir-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
 move-vm-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
 
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "executor" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "executor" }
 
 fastcrypto = { version = "0.1.2", features = ["copy_key"] }
 
diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml
index c97b1957d88e9..84c0dd4ca0770 100644
--- a/crates/sui/Cargo.toml
+++ b/crates/sui/Cargo.toml
@@ -41,7 +41,7 @@ typed-store = "0.1.0"
 typed-store-derive = "0.1.0"
 
 tempfile = "3.3.0"
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "executor" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "executor" }
 
 move-core-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e", features = ["address20"] }
 move-prover = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
diff --git a/crates/sui/src/genesis_ceremony.rs b/crates/sui/src/genesis_ceremony.rs
index cef741c9d9ff6..8cd3f1564a1d5 100644
--- a/crates/sui/src/genesis_ceremony.rs
+++ b/crates/sui/src/genesis_ceremony.rs
@@ -57,13 +57,9 @@ pub enum CeremonyCommand {
         #[clap(long)]
         network_address: Multiaddr,
         #[clap(long)]
-        narwhal_primary_to_primary: Multiaddr,
+        narwhal_primary_address: Multiaddr,
         #[clap(long)]
-        narwhal_worker_to_primary: Multiaddr,
-        #[clap(long)]
-        narwhal_primary_to_worker: Multiaddr,
-        #[clap(long)]
-        narwhal_worker_to_worker: Multiaddr,
+        narwhal_worker_address: Multiaddr,
         #[clap(long)]
         narwhal_consensus_address: Multiaddr,
     },
@@ -108,10 +104,8 @@ pub fn run(cmd: Ceremony) -> Result<()> {
             account_key_file,
             network_key_file,
             network_address,
-            narwhal_primary_to_primary,
-            narwhal_worker_to_primary,
-            narwhal_primary_to_worker,
-            narwhal_worker_to_worker,
+            narwhal_primary_address,
+            narwhal_worker_address,
             narwhal_consensus_address,
         } => {
             let mut builder = Builder::load(&dir)?;
@@ -119,7 +113,8 @@ pub fn run(cmd: Ceremony) -> Result<()> {
             let worker_keypair: AuthorityKeyPair =
                 read_authority_keypair_from_file(worker_key_file)?;
             let account_keypair: SuiKeyPair = read_keypair_from_file(account_key_file)?;
-            let network_keypair: SuiKeyPair = read_keypair_from_file(network_key_file)?;
+            let network_keypair: AuthorityKeyPair =
+                read_authority_keypair_from_file(network_key_file)?;
             let pop = generate_proof_of_possession(&keypair, (&account_keypair.public()).into());
             builder = builder.add_validator(
                 sui_config::ValidatorInfo {
@@ -127,15 +122,13 @@ pub fn run(cmd: Ceremony) -> Result<()> {
                     protocol_key: keypair.public().into(),
                     worker_key: worker_keypair.public().into(),
                     account_key: account_keypair.public(),
-                    network_key: network_keypair.public(),
+                    network_key: network_keypair.public().into(),
                     stake: 1,
                     delegation: 0,
                     gas_price: 1,
                     network_address,
-                    narwhal_primary_to_primary,
-                    narwhal_worker_to_primary,
-                    narwhal_primary_to_worker,
-                    narwhal_worker_to_worker,
+                    narwhal_primary_address,
+                    narwhal_worker_address,
                     narwhal_consensus_address,
                 },
                 pop,
@@ -286,7 +279,7 @@ mod test {
                 let keypair: AuthorityKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
                 let worker_keypair: AuthorityKeyPair =
                     get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
-                let network_keypair: AccountKeyPair =
+                let network_keypair: AuthorityKeyPair =
                     get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
                 let account_keypair: AccountKeyPair =
                     get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
@@ -295,15 +288,13 @@ mod test {
                     protocol_key: keypair.public().into(),
                     worker_key: worker_keypair.public().into(),
                     account_key: account_keypair.public().clone().into(),
-                    network_key: network_keypair.public().clone().into(),
+                    network_key: network_keypair.public().into(),
                     stake: 1,
                     delegation: 0,
                     gas_price: 1,
                     network_address: utils::new_network_address(),
-                    narwhal_primary_to_primary: utils::new_network_address(),
-                    narwhal_worker_to_primary: utils::new_network_address(),
-                    narwhal_primary_to_worker: utils::new_network_address(),
-                    narwhal_worker_to_worker: utils::new_network_address(),
+                    narwhal_primary_address: utils::new_network_address(),
+                    narwhal_worker_address: utils::new_network_address(),
                     narwhal_consensus_address: utils::new_network_address(),
                 };
                 let key_file = dir.path().join(format!("{}.key", info.name));
@@ -360,10 +351,8 @@ mod test {
                     network_key_file: network_key_file.into(),
                     account_key_file: account_key_file.into(),
                     network_address: validator.network_address().to_owned(),
-                    narwhal_primary_to_primary: validator.narwhal_primary_to_primary.clone(),
-                    narwhal_worker_to_primary: validator.narwhal_worker_to_primary.clone(),
-                    narwhal_primary_to_worker: validator.narwhal_primary_to_worker.clone(),
-                    narwhal_worker_to_worker: validator.narwhal_worker_to_worker.clone(),
+                    narwhal_primary_address: validator.narwhal_primary_address.clone(),
+                    narwhal_worker_address: validator.narwhal_worker_address.clone(),
                     narwhal_consensus_address: validator.narwhal_consensus_address.clone(),
                 },
             };
diff --git a/crates/sui/src/unit_tests/cli_tests.rs b/crates/sui/src/unit_tests/cli_tests.rs
index 4b48d6f5d6e1b..5f369eb1001c8 100644
--- a/crates/sui/src/unit_tests/cli_tests.rs
+++ b/crates/sui/src/unit_tests/cli_tests.rs
@@ -109,6 +109,7 @@ async fn test_addresses_command() -> Result<(), anyhow::Error> {
     let working_dir = temp_dir.path();
     let keypair: AuthorityKeyPair = get_key_pair().1;
     let worker_keypair: AuthorityKeyPair = get_key_pair().1;
+    let network_keypair: AuthorityKeyPair = get_key_pair().1;
     let account_keypair: SuiKeyPair = get_key_pair::<AccountKeyPair>().1.into();
 
     let wallet_config = SuiClientConfig {
@@ -120,15 +121,13 @@ async fn test_addresses_command() -> Result<(), anyhow::Error> {
                 protocol_key: keypair.public().into(),
                 worker_key: worker_keypair.public().into(),
                 account_key: account_keypair.public(),
-                network_key: get_key_pair::<AccountKeyPair>().1.public().clone().into(),
+                network_key: network_keypair.public().into(),
                 stake: 1,
                 delegation: 1,
                 gas_price: 1,
                 network_address: sui_config::utils::new_network_address(),
-                narwhal_primary_to_primary: sui_config::utils::new_network_address(),
-                narwhal_worker_to_primary: sui_config::utils::new_network_address(),
-                narwhal_primary_to_worker: sui_config::utils::new_network_address(),
-                narwhal_worker_to_worker: sui_config::utils::new_network_address(),
+                narwhal_primary_address: sui_config::utils::new_network_address(),
+                narwhal_worker_address: sui_config::utils::new_network_address(),
                 narwhal_consensus_address: sui_config::utils::new_network_address(),
             }],
             ..Default::default()
diff --git a/crates/sui/tests/reconfiguration_tests.rs b/crates/sui/tests/reconfiguration_tests.rs
index f9f054e87495f..ae162b7f14821 100644
--- a/crates/sui/tests/reconfiguration_tests.rs
+++ b/crates/sui/tests/reconfiguration_tests.rs
@@ -13,8 +13,7 @@ use sui_core::safe_client::SafeClient;
 use sui_node::SuiNode;
 use sui_types::base_types::{ObjectID, ObjectRef};
 use sui_types::crypto::{
-    generate_proof_of_possession, get_key_pair, AccountKeyPair, AuthorityKeyPair,
-    AuthoritySignature, KeypairTraits,
+    generate_proof_of_possession, get_key_pair, AuthorityKeyPair, AuthoritySignature, KeypairTraits,
 };
 use sui_types::error::SuiResult;
 use sui_types::messages::ObjectInfoResponse;
@@ -160,7 +159,7 @@ pub async fn create_and_register_new_validator(
         vec![
             CallArg::Object(ObjectArg::SharedObject(SUI_SYSTEM_STATE_OBJECT_ID)),
             CallArg::Pure(bcs::to_bytes(&new_validator.protocol_key()).unwrap()),
-            CallArg::Pure(bcs::to_bytes(new_validator.network_key()).unwrap()),
+            CallArg::Pure(bcs::to_bytes(&new_validator.network_key()).unwrap()),
             CallArg::Pure(bcs::to_bytes(&new_validator_pop.as_ref()).unwrap()),
             CallArg::Pure(
                 bcs::to_bytes(format!("Validator{}", new_validator.sui_address()).as_bytes())
@@ -177,7 +176,7 @@ pub async fn create_and_register_new_validator(
 pub fn get_new_validator() -> (ValidatorInfo, AuthoritySignature) {
     let keypair: AuthorityKeyPair = get_key_pair().1;
     let worker_keypair: AuthorityKeyPair = get_key_pair().1;
-    let network_keypair: AccountKeyPair = get_key_pair().1;
+    let network_keypair: AuthorityKeyPair = get_key_pair().1;
     let account_keypair = test_account_keys().pop().unwrap().1;
     let pop = generate_proof_of_possession(&keypair, account_keypair.public().into());
     (
@@ -186,15 +185,13 @@ pub fn get_new_validator() -> (ValidatorInfo, AuthoritySignature) {
             protocol_key: keypair.public().into(),
             worker_key: worker_keypair.public().into(),
             account_key: account_keypair.public().clone().into(),
-            network_key: network_keypair.public().clone().into(),
+            network_key: network_keypair.public().into(),
             stake: 1,
             delegation: 0,
             gas_price: 1,
             network_address: sui_config::utils::new_network_address(),
-            narwhal_primary_to_primary: sui_config::utils::new_network_address(),
-            narwhal_worker_to_primary: sui_config::utils::new_network_address(),
-            narwhal_primary_to_worker: sui_config::utils::new_network_address(),
-            narwhal_worker_to_worker: sui_config::utils::new_network_address(),
+            narwhal_primary_address: sui_config::utils::new_network_address(),
+            narwhal_worker_address: sui_config::utils::new_network_address(),
             narwhal_consensus_address: sui_config::utils::new_network_address(),
         },
         pop,
diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml
index 7d813ef3ca25a..7997165816808 100644
--- a/crates/workspace-hack/Cargo.toml
+++ b/crates/workspace-hack/Cargo.toml
@@ -81,8 +81,7 @@ cargo-platform = { version = "0.1", default-features = false }
 cargo_metadata-582f2526e08bb6a0 = { package = "cargo_metadata", version = "0.14" }
 cargo_metadata-3575ec1268b04181 = { package = "cargo_metadata", version = "0.15" }
 cassowary = { version = "0.3", default-features = false }
-cast-6f8ce4dd05d13bba = { package = "cast", version = "0.2", features = ["std"] }
-cast-468e82937335b1c9 = { package = "cast", version = "0.3", default-features = false }
+cast = { version = "0.3", default-features = false }
 cfg-expr = { version = "0.10", features = ["target-lexicon", "targets"] }
 cfg-if-c65f7effa3be6d31 = { package = "cfg-if", version = "0.1", default-features = false }
 cfg-if-dff4ba8e3ae991db = { package = "cfg-if", version = "1", default-features = false }
@@ -98,9 +97,9 @@ collectable = { version = "0.0.2", default-features = false }
 colored = { version = "2", default-features = false }
 colored-diff = { version = "0.2", default-features = false }
 combine = { version = "4", features = ["alloc", "bytes", "std"] }
-config-7f92514e30201974 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+config-5f890c5b0f7b20d5 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 config-a6292c17cd707f01 = { package = "config", version = "0.11", features = ["hjson", "ini", "json", "rust-ini", "serde-hjson", "serde_json", "toml", "yaml", "yaml-rust"] }
-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", features = ["benchmark", "rand"] }
+consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", features = ["benchmark", "rand"] }
 console = { version = "0.15", default-features = false }
 const-oid = { version = "0.9", default-features = false }
 constant_time_eq = { version = "0.1", default-features = false }
@@ -119,7 +118,7 @@ crossterm-647d43efb71741da = { package = "crossterm", version = "0.21" }
 crossterm-3c51e837cfc5589a = { package = "crossterm", version = "0.22" }
 crossterm-2b5c6dc72f624058 = { package = "crossterm", version = "0.23" }
 crossterm-2ffb4c3fe830441c = { package = "crossterm", version = "0.25", features = ["bracketed-paste"] }
-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16" }
+crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290" }
 crypto-bigint = { version = "0.4", default-features = false, features = ["generic-array", "rand_core", "zeroize"] }
 crypto-common = { version = "0.1", default-features = false, features = ["std"] }
 crypto-mac = { version = "0.8", default-features = false, features = ["std"] }
@@ -128,7 +127,7 @@ csv-core = { version = "0.1" }
 curve25519-dalek = { version = "3", default-features = false, features = ["serde", "u64_backend"] }
 curve25519-dalek-fiat = { version = "0.1", default-features = false, features = ["alloc", "fiat-crypto", "fiat_u64_backend", "std"] }
 curve25519-dalek-ng = { version = "4", features = ["alloc", "serde", "std", "u64_backend"] }
-dag = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+dag = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 dashmap = { version = "5", default-features = false }
 data-encoding = { version = "2", features = ["alloc", "std"] }
 datatest-stable = { version = "0.1", default-features = false }
@@ -165,7 +164,7 @@ endian-type = { version = "0.1", default-features = false }
 env_logger = { version = "0.9", features = ["atty", "humantime", "regex", "termcolor"] }
 ethnum = { version = "1", default-features = false }
 event-listener = { version = "2", default-features = false }
-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+executor = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 eyre = { version = "0.6", features = ["auto-install", "track-caller"] }
 fail = { version = "0.4", default-features = false }
 fastcrypto = { version = "0.1", features = ["copy_key"] }
@@ -203,7 +202,7 @@ globset = { version = "0.4", features = ["log"] }
 globwalk = { version = "0.8", default-features = false }
 gloo-net = { version = "0.2", default-features = false, features = ["futures-channel", "futures-core", "futures-sink", "json", "pin-project", "serde", "serde_json", "websocket"] }
 gloo-timers = { version = "0.2", features = ["futures", "futures-channel", "futures-core"] }
-gloo-utils = { version = "0.1", default-features = false }
+gloo-utils = { version = "0.1", features = ["serde"] }
 group = { version = "0.12", default-features = false }
 guppy = { version = "0.14", default-features = false, features = ["guppy-summaries", "rayon", "rayon1", "summaries", "toml"] }
 guppy-summaries = { version = "0.7", default-features = false }
@@ -211,8 +210,7 @@ guppy-workspace-hack = { version = "0.1", default-features = false }
 h2 = { version = "0.3", default-features = false }
 hakari = { version = "0.10", default-features = false, features = ["cli-support", "include_dir", "owo-colors", "serde", "tabular", "toml"] }
 half = { version = "1", default-features = false }
-hashbrown-a6292c17cd707f01 = { package = "hashbrown", version = "0.11", features = ["ahash", "inline-more"] }
-hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12", features = ["ahash", "inline-more", "raw"] }
+hashbrown = { version = "0.12", features = ["ahash", "inline-more", "raw"] }
 hashlink = { version = "0.8", default-features = false }
 hdrhistogram = { version = "7", default-features = false }
 heck-468e82937335b1c9 = { package = "heck", version = "0.3", default-features = false }
@@ -265,7 +263,7 @@ libc = { version = "0.2", features = ["std"] }
 libm = { version = "0.2" }
 librocksdb-sys = { version = "0.8", features = ["bzip2", "bzip2-sys", "libz-sys", "lz4", "snappy", "static", "zlib", "zstd", "zstd-sys"] }
 libsqlite3-sys = { version = "0.24", default-features = false, features = ["bundled", "bundled_bindings", "cc", "pkg-config", "unlock_notify", "vcpkg"] }
-libtest-mimic = { version = "0.4", default-features = false }
+libtest-mimic = { version = "0.5", default-features = false }
 libz-sys = { version = "1", default-features = false, features = ["static"] }
 linked-hash-map = { version = "0.5", default-features = false }
 lock_api-468e82937335b1c9 = { package = "lock_api", version = "0.3", default-features = false }
@@ -321,13 +319,14 @@ move-vm-types = { git = "https://github.com/move-language/move", rev = "e1e647b7
 multiaddr = { version = "0.14", features = ["url"] }
 multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] }
 mysten-network = { version = "0.1", default-features = false }
+mysten-util-mem = { git = "https://github.com/MystenLabs/mysten-infra", features = ["estimate-heapsize", "hashbrown", "parking_lot", "smallvec", "std"] }
 named-lock = { version = "0.1", default-features = false }
 nested = { version = "0.1", default-features = false }
-network = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+network = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "bff03c566c9e22b1f4e67f516d0fd592a5a88f20", default-features = false }
 nexlint-lints = { git = "https://github.com/nextest-rs/nexlint.git", rev = "bff03c566c9e22b1f4e67f516d0fd592a5a88f20", default-features = false }
 nibble_vec = { version = "0.1", default-features = false }
-node = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false, features = ["benchmark"] }
+node = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false, features = ["benchmark"] }
 nom-cdf1610d3e1514e9 = { package = "nom", version = "5", features = ["alloc", "lexical", "lexical-core", "std"] }
 nom-15128469a54ed75a = { package = "nom", version = "7", features = ["alloc", "std"] }
 normalize-line-endings = { version = "0.3", default-features = false }
@@ -341,8 +340,7 @@ num-traits-c65f7effa3be6d31 = { package = "num-traits", version = "0.1", default
 num-traits-6f8ce4dd05d13bba = { package = "num-traits", version = "0.2", features = ["i128", "libm", "std"] }
 num_cpus = { version = "1", default-features = false }
 num_enum = { version = "0.5", features = ["std"] }
-object-1f5adca70f036a62 = { package = "object", version = "0.28", default-features = false, features = ["archive", "coff", "elf", "macho", "pe", "read_core", "unaligned"] }
-object-b73a96c0a5f6a7d9 = { package = "object", version = "0.29", default-features = false, features = ["archive", "coff", "elf", "macho", "pe", "read_core", "unaligned"] }
+object = { version = "0.29", default-features = false, features = ["archive", "coff", "elf", "macho", "pe", "read_core", "unaligned"] }
 oid-registry = { version = "0.6", features = ["crypto", "kdf", "nist_algs", "pkcs1", "pkcs12", "pkcs7", "pkcs9", "registry", "x509", "x962"] }
 once_cell = { version = "1", features = ["alloc", "race", "std"] }
 oorandom = { version = "11", default-features = false }
@@ -383,7 +381,7 @@ predicates-core = { version = "1", default-features = false }
 predicates-tree = { version = "1", default-features = false }
 pretty = { version = "0.10", default-features = false }
 pretty_assertions = { version = "1", features = ["std"] }
-primary = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false, features = ["benchmark"] }
+primary = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false, features = ["benchmark"] }
 proc-macro2-dff4ba8e3ae991db = { package = "proc-macro2", version = "1", features = ["proc-macro", "span-locations"] }
 prometheus = { version = "0.13", features = ["protobuf"] }
 proptest = { version = "1", features = ["bit-set", "break-dead-code", "fork", "lazy_static", "quick-error", "regex-syntax", "rusty-fork", "std", "tempfile", "timeout"] }
@@ -473,7 +471,7 @@ sha3-93f6ce9d446188ac = { package = "sha3", version = "0.10", features = ["std"]
 sha3-274715c4dabd11b0 = { package = "sha3", version = "0.9", features = ["std"] }
 sharded-slab = { version = "0.1", default-features = false }
 shell-words = { version = "1", features = ["std"] }
-signature = { version = "1", features = ["digest", "digest-preview", "rand-preview", "rand_core", "std"] }
+signature = { version = "1", features = ["digest", "digest-preview", "hazmat-preview", "rand-preview", "rand_core", "std"] }
 similar = { version = "2", features = ["inline", "text"] }
 simplelog = { version = "0.9", features = ["termcolor"] }
 siphasher = { version = "0.3", features = ["std"] }
@@ -482,7 +480,7 @@ slab = { version = "0.4", features = ["std"] }
 slug = { version = "0.1", default-features = false }
 smallvec = { version = "1", default-features = false }
 smawk = { version = "0.3", default-features = false }
-socket2 = { version = "0.4", default-features = false, features = ["all"] }
+socket2 = { version = "0.4", default-features = false }
 soketto = { version = "0.7" }
 spin-274715c4dabd11b0 = { package = "spin", version = "0.9", features = ["barrier", "lazy", "lock_api", "lock_api_crate", "mutex", "once", "rwlock", "spin_mutex"] }
 spki = { version = "0.6", default-features = false, features = ["alloc", "base64ct", "std"] }
@@ -492,7 +490,7 @@ sqlx-core = { version = "0.6", default-features = false, features = ["_rt-tokio"
 sqlx-rt = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "once_cell", "runtime-tokio-rustls", "tokio", "tokio-rustls"] }
 stable_deref_trait = { version = "1", features = ["alloc", "std"] }
 static_assertions = { version = "1", default-features = false }
-storage = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+storage = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 stringprep = { version = "0.1", default-features = false }
 strip-ansi-escapes = { version = "0.1", default-features = false }
 strsim-93f6ce9d446188ac = { package = "strsim", version = "0.10", default-features = false }
@@ -560,7 +558,7 @@ twox-hash = { version = "1", default-features = false }
 typed-arena = { version = "2", features = ["std"] }
 typed-store = { version = "0.1", default-features = false }
 typenum = { version = "1", default-features = false }
-types = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16" }
+types = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290" }
 ucd-trie = { version = "0.1", default-features = false, features = ["std"] }
 uncased = { version = "0.9", default-features = false }
 unescape = { version = "0.1", default-features = false }
@@ -594,8 +592,8 @@ web-sys = { version = "0.3", default-features = false, features = ["BinaryType",
 webpki = { version = "0.22", default-features = false, features = ["alloc", "std"] }
 webpki-roots = { version = "0.22", default-features = false }
 whoami = { version = "1" }
-worker = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false, features = ["benchmark"] }
-workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+worker = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false, features = ["benchmark"] }
+workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 x509-parser = { version = "0.14" }
 yaml-rust = { version = "0.4", default-features = false }
 yansi = { version = "0.5", default-features = false }
@@ -685,8 +683,7 @@ cargo-platform = { version = "0.1", default-features = false }
 cargo_metadata-582f2526e08bb6a0 = { package = "cargo_metadata", version = "0.14" }
 cargo_metadata-3575ec1268b04181 = { package = "cargo_metadata", version = "0.15" }
 cassowary = { version = "0.3", default-features = false }
-cast-6f8ce4dd05d13bba = { package = "cast", version = "0.2", features = ["std"] }
-cast-468e82937335b1c9 = { package = "cast", version = "0.3", default-features = false }
+cast = { version = "0.3", default-features = false }
 cc = { version = "1", default-features = false, features = ["jobserver", "parallel"] }
 cexpr = { version = "0.6", default-features = false }
 cfg-expr = { version = "0.10", features = ["target-lexicon", "targets"] }
@@ -708,9 +705,9 @@ collectable = { version = "0.0.2", default-features = false }
 colored = { version = "2", default-features = false }
 colored-diff = { version = "0.2", default-features = false }
 combine = { version = "4", features = ["alloc", "bytes", "std"] }
-config-7f92514e30201974 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+config-5f890c5b0f7b20d5 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 config-a6292c17cd707f01 = { package = "config", version = "0.11", features = ["hjson", "ini", "json", "rust-ini", "serde-hjson", "serde_json", "toml", "yaml", "yaml-rust"] }
-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", features = ["benchmark", "rand"] }
+consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", features = ["benchmark", "rand"] }
 console = { version = "0.15", default-features = false }
 const-oid = { version = "0.9", default-features = false }
 constant_time_eq = { version = "0.1", default-features = false }
@@ -729,7 +726,7 @@ crossterm-647d43efb71741da = { package = "crossterm", version = "0.21" }
 crossterm-3c51e837cfc5589a = { package = "crossterm", version = "0.22" }
 crossterm-2b5c6dc72f624058 = { package = "crossterm", version = "0.23" }
 crossterm-2ffb4c3fe830441c = { package = "crossterm", version = "0.25", features = ["bracketed-paste"] }
-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16" }
+crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290" }
 crypto-bigint = { version = "0.4", default-features = false, features = ["generic-array", "rand_core", "zeroize"] }
 crypto-common = { version = "0.1", default-features = false, features = ["std"] }
 crypto-mac = { version = "0.8", default-features = false, features = ["std"] }
@@ -738,7 +735,7 @@ csv-core = { version = "0.1" }
 curve25519-dalek = { version = "3", default-features = false, features = ["serde", "u64_backend"] }
 curve25519-dalek-fiat = { version = "0.1", default-features = false, features = ["alloc", "fiat-crypto", "fiat_u64_backend", "std"] }
 curve25519-dalek-ng = { version = "4", features = ["alloc", "serde", "std", "u64_backend"] }
-dag = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+dag = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 darling-594e8ee84c453af0 = { package = "darling", version = "0.13", features = ["suggestions"] }
 darling-582f2526e08bb6a0 = { package = "darling", version = "0.14", features = ["suggestions"] }
 darling_core-594e8ee84c453af0 = { package = "darling_core", version = "0.13", default-features = false, features = ["strsim", "suggestions"] }
@@ -787,7 +784,7 @@ enum_dispatch = { version = "0.3", default-features = false }
 env_logger = { version = "0.9", features = ["atty", "humantime", "regex", "termcolor"] }
 ethnum = { version = "1", default-features = false }
 event-listener = { version = "2", default-features = false }
-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+executor = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 eyre = { version = "0.6", features = ["auto-install", "track-caller"] }
 fail = { version = "0.4", default-features = false }
 fastcrypto = { version = "0.1", features = ["copy_key"] }
@@ -826,7 +823,7 @@ globset = { version = "0.4", features = ["log"] }
 globwalk = { version = "0.8", default-features = false }
 gloo-net = { version = "0.2", default-features = false, features = ["futures-channel", "futures-core", "futures-sink", "json", "pin-project", "serde", "serde_json", "websocket"] }
 gloo-timers = { version = "0.2", features = ["futures", "futures-channel", "futures-core"] }
-gloo-utils = { version = "0.1", default-features = false }
+gloo-utils = { version = "0.1", features = ["serde"] }
 group = { version = "0.12", default-features = false }
 guppy = { version = "0.14", default-features = false, features = ["guppy-summaries", "rayon", "rayon1", "summaries", "toml"] }
 guppy-summaries = { version = "0.7", default-features = false }
@@ -834,8 +831,7 @@ guppy-workspace-hack = { version = "0.1", default-features = false }
 h2 = { version = "0.3", default-features = false }
 hakari = { version = "0.10", default-features = false, features = ["cli-support", "include_dir", "owo-colors", "serde", "tabular", "toml"] }
 half = { version = "1", default-features = false }
-hashbrown-a6292c17cd707f01 = { package = "hashbrown", version = "0.11", features = ["ahash", "inline-more"] }
-hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12", features = ["ahash", "inline-more", "raw"] }
+hashbrown = { version = "0.12", features = ["ahash", "inline-more", "raw"] }
 hashlink = { version = "0.8", default-features = false }
 hdrhistogram = { version = "7", default-features = false }
 heck-468e82937335b1c9 = { package = "heck", version = "0.3", default-features = false }
@@ -861,6 +857,7 @@ idna = { version = "0.3", default-features = false }
 if_chain = { version = "1", default-features = false }
 ignore = { version = "0.4", default-features = false }
 im = { version = "15", default-features = false }
+impl-trait-for-tuples = { version = "0.2", default-features = false }
 include_dir = { version = "0.7", features = ["glob"] }
 include_dir_macros = { version = "0.7", default-features = false }
 indenter = { version = "0.3" }
@@ -898,7 +895,7 @@ libloading = { version = "0.7", default-features = false }
 libm = { version = "0.2" }
 librocksdb-sys = { version = "0.8", features = ["bzip2", "bzip2-sys", "libz-sys", "lz4", "snappy", "static", "zlib", "zstd", "zstd-sys"] }
 libsqlite3-sys = { version = "0.24", default-features = false, features = ["bundled", "bundled_bindings", "cc", "pkg-config", "unlock_notify", "vcpkg"] }
-libtest-mimic = { version = "0.4", default-features = false }
+libtest-mimic = { version = "0.5", default-features = false }
 libz-sys = { version = "1", default-features = false, features = ["static"] }
 linked-hash-map = { version = "0.5", default-features = false }
 lock_api-468e82937335b1c9 = { package = "lock_api", version = "0.3", default-features = false }
@@ -957,14 +954,16 @@ multihash = { version = "0.16", default-features = false, features = ["alloc", "
 multihash-derive = { version = "0.8", default-features = false, features = ["std"] }
 multimap = { version = "0.8", default-features = false }
 mysten-network = { version = "0.1", default-features = false }
+mysten-util-mem = { git = "https://github.com/MystenLabs/mysten-infra", features = ["estimate-heapsize", "hashbrown", "parking_lot", "smallvec", "std"] }
+mysten-util-mem-derive = { git = "https://github.com/MystenLabs/mysten-infra", default-features = false }
 name-variant = { version = "0.1", default-features = false }
 named-lock = { version = "0.1", default-features = false }
 nested = { version = "0.1", default-features = false }
-network = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+network = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "bff03c566c9e22b1f4e67f516d0fd592a5a88f20", default-features = false }
 nexlint-lints = { git = "https://github.com/nextest-rs/nexlint.git", rev = "bff03c566c9e22b1f4e67f516d0fd592a5a88f20", default-features = false }
 nibble_vec = { version = "0.1", default-features = false }
-node = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false, features = ["benchmark"] }
+node = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false, features = ["benchmark"] }
 nom-cdf1610d3e1514e9 = { package = "nom", version = "5", features = ["alloc", "lexical", "lexical-core", "std"] }
 nom-15128469a54ed75a = { package = "nom", version = "7", features = ["alloc", "std"] }
 normalize-line-endings = { version = "0.3", default-features = false }
@@ -979,8 +978,7 @@ num-traits-6f8ce4dd05d13bba = { package = "num-traits", version = "0.2", feature
 num_cpus = { version = "1", default-features = false }
 num_enum = { version = "0.5", features = ["std"] }
 num_enum_derive = { version = "0.5", default-features = false, features = ["proc-macro-crate", "std"] }
-object-1f5adca70f036a62 = { package = "object", version = "0.28", default-features = false, features = ["archive", "coff", "elf", "macho", "pe", "read_core", "unaligned"] }
-object-b73a96c0a5f6a7d9 = { package = "object", version = "0.29", default-features = false, features = ["archive", "coff", "elf", "macho", "pe", "read_core", "unaligned"] }
+object = { version = "0.29", default-features = false, features = ["archive", "coff", "elf", "macho", "pe", "read_core", "unaligned"] }
 oid-registry = { version = "0.6", features = ["crypto", "kdf", "nist_algs", "pkcs1", "pkcs12", "pkcs7", "pkcs9", "registry", "x509", "x962"] }
 once_cell = { version = "1", features = ["alloc", "race", "std"] }
 oorandom = { version = "11", default-features = false }
@@ -1034,7 +1032,7 @@ predicates-tree = { version = "1", default-features = false }
 pretty = { version = "0.10", default-features = false }
 pretty_assertions = { version = "1", features = ["std"] }
 prettyplease = { version = "0.1", default-features = false }
-primary = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false, features = ["benchmark"] }
+primary = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false, features = ["benchmark"] }
 proc-macro-crate-c65f7effa3be6d31 = { package = "proc-macro-crate", version = "0.1", default-features = false }
 proc-macro-crate-dff4ba8e3ae991db = { package = "proc-macro-crate", version = "1", default-features = false }
 proc-macro-error = { version = "1", features = ["syn", "syn-error"] }
@@ -1099,7 +1097,6 @@ rustc-demangle = { version = "0.1", default-features = false }
 rustc-hash = { version = "1", features = ["std"] }
 rustc_version-6f8ce4dd05d13bba = { package = "rustc_version", version = "0.2", default-features = false }
 rustc_version-468e82937335b1c9 = { package = "rustc_version", version = "0.3", default-features = false }
-rustc_version-9fbad63c4bcf4a8f = { package = "rustc_version", version = "0.4", default-features = false }
 rusticata-macros = { version = "4", default-features = false }
 rustls = { version = "0.20", features = ["dangerous_configuration", "log", "logging", "quic", "tls12"] }
 rustls-native-certs = { version = "0.6", default-features = false }
@@ -1151,7 +1148,7 @@ sha3-274715c4dabd11b0 = { package = "sha3", version = "0.9", features = ["std"]
 sharded-slab = { version = "0.1", default-features = false }
 shell-words = { version = "1", features = ["std"] }
 shlex = { version = "1", features = ["std"] }
-signature = { version = "1", features = ["digest", "digest-preview", "rand-preview", "rand_core", "std"] }
+signature = { version = "1", features = ["digest", "digest-preview", "hazmat-preview", "rand-preview", "rand_core", "std"] }
 similar = { version = "2", features = ["inline", "text"] }
 simplelog = { version = "0.9", features = ["termcolor"] }
 siphasher = { version = "0.3", features = ["std"] }
@@ -1160,7 +1157,7 @@ slab = { version = "0.4", features = ["std"] }
 slug = { version = "0.1", default-features = false }
 smallvec = { version = "1", default-features = false }
 smawk = { version = "0.3", default-features = false }
-socket2 = { version = "0.4", default-features = false, features = ["all"] }
+socket2 = { version = "0.4", default-features = false }
 soketto = { version = "0.7" }
 spin-274715c4dabd11b0 = { package = "spin", version = "0.9", features = ["barrier", "lazy", "lock_api", "lock_api_crate", "mutex", "once", "rwlock", "spin_mutex"] }
 spki = { version = "0.6", default-features = false, features = ["alloc", "base64ct", "std"] }
@@ -1171,7 +1168,7 @@ sqlx-macros = { version = "0.6", default-features = false, features = ["_rt-toki
 sqlx-rt = { version = "0.6", default-features = false, features = ["_rt-tokio", "_tls-rustls", "once_cell", "runtime-tokio-rustls", "tokio", "tokio-rustls"] }
 stable_deref_trait = { version = "1", features = ["alloc", "std"] }
 static_assertions = { version = "1", default-features = false }
-storage = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+storage = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 stringprep = { version = "0.1", default-features = false }
 strip-ansi-escapes = { version = "0.1", default-features = false }
 strsim-93f6ce9d446188ac = { package = "strsim", version = "0.10", default-features = false }
@@ -1184,7 +1181,7 @@ subprocess = { version = "0.2", default-features = false }
 subtle = { version = "2", default-features = false, features = ["i128", "std"] }
 subtle-ng = { version = "2", default-features = false, features = ["std"] }
 syn-3575ec1268b04181 = { package = "syn", version = "0.15", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit"] }
-syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
+syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
 sync_wrapper = { version = "0.1", default-features = false }
 synstructure = { version = "0.12", features = ["proc-macro"] }
 tabular = { version = "0.2", features = ["ansi-cell", "strip-ansi-escapes", "unicode-width"] }
@@ -1255,7 +1252,7 @@ typed-arena = { version = "2", features = ["std"] }
 typed-store = { version = "0.1", default-features = false }
 typed-store-derive = { version = "0.1", default-features = false }
 typenum = { version = "1", default-features = false }
-types = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16" }
+types = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290" }
 ucd-trie = { version = "0.1", default-features = false, features = ["std"] }
 uncased = { version = "0.9", default-features = false }
 unescape = { version = "0.1", default-features = false }
@@ -1301,8 +1298,8 @@ webpki = { version = "0.22", default-features = false, features = ["alloc", "std
 webpki-roots = { version = "0.22", default-features = false }
 which = { version = "4", default-features = false }
 whoami = { version = "1" }
-worker = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false, features = ["benchmark"] }
-workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", default-features = false }
+worker = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false, features = ["benchmark"] }
+workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", default-features = false }
 x509-parser = { version = "0.14" }
 yaml-rust = { version = "0.4", default-features = false }
 yansi = { version = "0.5", default-features = false }
@@ -1335,6 +1332,7 @@ security-framework-sys = { version = "2", features = ["OSX_10_9"] }
 signal-hook = { version = "0.3", features = ["channel", "iterator"] }
 signal-hook-mio = { version = "0.2", default-features = false, features = ["mio-0_7", "mio-0_8", "support-v0_7", "support-v0_8"] }
 signal-hook-registry = { version = "1", default-features = false }
+socket2 = { version = "0.4", default-features = false, features = ["all"] }
 tokio-native-tls = { version = "0.3", default-features = false }
 web-sys = { version = "0.3", default-features = false, features = ["Worker"] }
 
@@ -1363,6 +1361,7 @@ security-framework-sys = { version = "2", features = ["OSX_10_9"] }
 signal-hook = { version = "0.3", features = ["channel", "iterator"] }
 signal-hook-mio = { version = "0.2", default-features = false, features = ["mio-0_7", "mio-0_8", "support-v0_7", "support-v0_8"] }
 signal-hook-registry = { version = "1", default-features = false }
+socket2 = { version = "0.4", default-features = false, features = ["all"] }
 tokio-native-tls = { version = "0.3", default-features = false }
 web-sys = { version = "0.3", default-features = false, features = ["Worker"] }
 
@@ -1391,6 +1390,7 @@ rustix = { version = "0.35", features = ["fs", "io-lifetimes", "libc", "std", "u
 signal-hook = { version = "0.3", features = ["channel", "iterator"] }
 signal-hook-mio = { version = "0.2", default-features = false, features = ["mio-0_7", "mio-0_8", "support-v0_7", "support-v0_8"] }
 signal-hook-registry = { version = "1", default-features = false }
+socket2 = { version = "0.4", default-features = false, features = ["all"] }
 spin-d8f496e17d97b5cb = { package = "spin", version = "0.5", default-features = false }
 tokio-native-tls = { version = "0.3", default-features = false }
 web-sys = { version = "0.3", default-features = false, features = ["Worker"] }
@@ -1422,6 +1422,7 @@ rustix = { version = "0.35", features = ["fs", "io-lifetimes", "libc", "std", "u
 signal-hook = { version = "0.3", features = ["channel", "iterator"] }
 signal-hook-mio = { version = "0.2", default-features = false, features = ["mio-0_7", "mio-0_8", "support-v0_7", "support-v0_8"] }
 signal-hook-registry = { version = "1", default-features = false }
+socket2 = { version = "0.4", default-features = false, features = ["all"] }
 spin-d8f496e17d97b5cb = { package = "spin", version = "0.5", default-features = false }
 tokio-native-tls = { version = "0.3", default-features = false }
 web-sys = { version = "0.3", default-features = false, features = ["Worker"] }
@@ -1440,13 +1441,14 @@ native-tls = { version = "0.2", default-features = false }
 output_vt100 = { version = "0.1", default-features = false }
 rand_chacha-6f8ce4dd05d13bba = { package = "rand_chacha", version = "0.2", default-features = false, features = ["std"] }
 schannel = { version = "0.1", default-features = false }
+socket2 = { version = "0.4", default-features = false, features = ["all"] }
 spin-d8f496e17d97b5cb = { package = "spin", version = "0.5", default-features = false }
 str-buf = { version = "1", default-features = false }
 tokio = { version = "1", default-features = false, features = ["winapi"] }
 tokio-native-tls = { version = "0.3", default-features = false }
 web-sys = { version = "0.3", default-features = false, features = ["Worker"] }
 widestring = { version = "0.4", features = ["alloc", "std"] }
-winapi = { version = "0.3", default-features = false, features = ["activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntsecapi", "ntstatus", "objbase", "processenv", "processthreadsapi", "profileapi", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "sysinfoapi", "threadpoollegacyapiset", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
+winapi = { version = "0.3", default-features = false, features = ["accctrl", "aclapi", "activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntsecapi", "ntstatus", "objbase", "processenv", "processthreadsapi", "profileapi", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "sysinfoapi", "threadpoollegacyapiset", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
 winapi-util = { version = "0.1", default-features = false }
 windows-sys = { version = "0.36", features = ["Win32", "Win32_Foundation", "Win32_Networking", "Win32_Networking_WinSock", "Win32_Security", "Win32_Security_Authentication", "Win32_Security_Authentication_Identity", "Win32_Security_Credentials", "Win32_Security_Cryptography", "Win32_Storage", "Win32_Storage_FileSystem", "Win32_System", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Memory", "Win32_System_Pipes", "Win32_System_SystemServices", "Win32_System_WindowsProgramming"] }
 windows_x86_64_msvc = { version = "0.36", default-features = false }
@@ -1467,13 +1469,14 @@ native-tls = { version = "0.2", default-features = false }
 output_vt100 = { version = "0.1", default-features = false }
 rand_chacha-6f8ce4dd05d13bba = { package = "rand_chacha", version = "0.2", default-features = false, features = ["std"] }
 schannel = { version = "0.1", default-features = false }
+socket2 = { version = "0.4", default-features = false, features = ["all"] }
 spin-d8f496e17d97b5cb = { package = "spin", version = "0.5", default-features = false }
 str-buf = { version = "1", default-features = false }
 tokio = { version = "1", default-features = false, features = ["winapi"] }
 tokio-native-tls = { version = "0.3", default-features = false }
 web-sys = { version = "0.3", default-features = false, features = ["Worker"] }
 widestring = { version = "0.4", features = ["alloc", "std"] }
-winapi = { version = "0.3", default-features = false, features = ["activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntsecapi", "ntstatus", "objbase", "processenv", "processthreadsapi", "profileapi", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "sysinfoapi", "threadpoollegacyapiset", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
+winapi = { version = "0.3", default-features = false, features = ["accctrl", "aclapi", "activation", "basetsd", "combaseapi", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "impl-debug", "impl-default", "knownfolders", "libloaderapi", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntsecapi", "ntstatus", "objbase", "processenv", "processthreadsapi", "profileapi", "roapi", "shellapi", "shlobj", "std", "stringapiset", "synchapi", "sysinfoapi", "threadpoollegacyapiset", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winreg", "winstring", "winuser", "ws2ipdef", "ws2tcpip", "wtypesbase"] }
 winapi-util = { version = "0.1", default-features = false }
 windows-sys = { version = "0.36", features = ["Win32", "Win32_Foundation", "Win32_Networking", "Win32_Networking_WinSock", "Win32_Security", "Win32_Security_Authentication", "Win32_Security_Authentication_Identity", "Win32_Security_Credentials", "Win32_Security_Cryptography", "Win32_Storage", "Win32_Storage_FileSystem", "Win32_System", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Memory", "Win32_System_Pipes", "Win32_System_SystemServices", "Win32_System_WindowsProgramming"] }
 windows_x86_64_msvc = { version = "0.36", default-features = false }