diff --git a/Cargo.lock b/Cargo.lock
index 98cae4d7a51c9..ff91e20bb75ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -76,7 +76,7 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -376,7 +376,7 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
@@ -454,7 +454,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "510fd83e3eaf7263b06182f3550b4c0af2af42cb36ab8024969ff5ea7fcb2833"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
  "thiserror",
 ]
 
@@ -464,7 +464,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -499,7 +499,7 @@ version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -529,7 +529,7 @@ dependencies = [
  "bitcoin_hashes 0.9.7",
  "rand 0.6.5",
  "rand_core 0.4.2",
- "serde 1.0.143",
+ "serde 1.0.144",
  "unicode-normalization",
 ]
 
@@ -676,7 +676,7 @@ dependencies = [
  "lazy_static 1.4.0",
  "memchr",
  "regex-automata",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -692,7 +692,7 @@ dependencies = [
  "merlin",
  "rand 0.8.5",
  "rand_core 0.6.3",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_derive",
  "sha3 0.9.1",
  "subtle-ng",
@@ -752,7 +752,7 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -761,7 +761,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -773,7 +773,7 @@ dependencies = [
  "camino",
  "cargo-platform",
  "semver 1.0.9",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
 ]
 
@@ -848,7 +848,7 @@ dependencies = [
  "js-sys",
  "num-integer",
  "num-traits 0.2.15",
- "serde 1.0.143",
+ "serde 1.0.144",
  "time 0.1.43",
  "wasm-bindgen",
  "winapi",
@@ -986,7 +986,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e"
 dependencies = [
  "codespan-reporting",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -995,7 +995,7 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
  "termcolor",
  "unicode-width",
 ]
@@ -1041,17 +1041,19 @@ dependencies = [
 [[package]]
 name = "config"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
 dependencies = [
  "arc-swap",
+ "crypto",
  "fastcrypto",
+ "match_opt",
  "multiaddr",
  "rand 0.8.5",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "thiserror",
  "tracing",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
 ]
 
 [[package]]
@@ -1063,7 +1065,7 @@ dependencies = [
  "lazy_static 1.4.0",
  "nom 5.1.2",
  "rust-ini",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde-hjson",
  "serde_json",
  "toml",
@@ -1073,7 +1075,7 @@ dependencies = [
 [[package]]
 name = "consensus"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
 dependencies = [
  "arc-swap",
  "bincode",
@@ -1081,18 +1083,20 @@ dependencies = [
  "bytes",
  "cfg-if 1.0.0",
  "config 0.1.0",
+ "crypto",
  "dag",
  "fastcrypto",
  "match_opt",
  "prometheus",
  "rand 0.8.5",
- "serde 1.0.143",
+ "serde 1.0.144",
+ "storage",
  "thiserror",
  "tokio",
  "tracing",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "types",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
 ]
 
 [[package]]
@@ -1187,7 +1191,7 @@ dependencies = [
  "plotters",
  "rayon",
  "regex",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_cbor",
  "serde_derive",
  "serde_json",
@@ -1356,6 +1360,36 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "crypto"
+version = "0.1.0"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
+dependencies = [
+ "base64ct",
+ "blake2",
+ "blst",
+ "bulletproofs",
+ "curve25519-dalek-ng",
+ "digest 0.10.3",
+ "ed25519-consensus",
+ "eyre",
+ "fastcrypto",
+ "hex",
+ "hkdf",
+ "merlin",
+ "once_cell",
+ "rand 0.8.5",
+ "readonly",
+ "secp256k1",
+ "serde 1.0.144",
+ "serde_bytes",
+ "serde_with 2.0.0",
+ "signature",
+ "tokio",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
+ "zeroize",
+]
+
 [[package]]
 name = "crypto-bigint"
 version = "0.4.8"
@@ -1398,7 +1432,7 @@ dependencies = [
  "csv-core",
  "itoa 0.4.8",
  "ryu",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -1429,7 +1463,7 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "serde 1.0.143",
+ "serde 1.0.144",
  "subtle",
  "zeroize",
 ]
@@ -1457,7 +1491,7 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "rand_core 0.6.3",
- "serde 1.0.143",
+ "serde 1.0.144",
  "subtle-ng",
  "zeroize",
 ]
@@ -1465,7 +1499,7 @@ dependencies = [
 [[package]]
 name = "dag"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
 dependencies = [
  "arc-swap",
  "dashmap",
@@ -1474,9 +1508,9 @@ dependencies = [
  "itertools",
  "once_cell",
  "rayon",
- "serde 1.0.143",
+ "serde 1.0.144",
  "thiserror",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
 ]
 
 [[package]]
@@ -1660,7 +1694,7 @@ dependencies = [
  "once_cell",
  "petgraph 0.6.2",
  "rayon",
- "serde 1.0.143",
+ "serde 1.0.144",
  "toml",
 ]
 
@@ -1680,7 +1714,7 @@ dependencies = [
  "lazy_static 1.4.0",
  "parking_lot 0.11.2",
  "rustc-hash",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "thousands",
 ]
@@ -1836,7 +1870,7 @@ version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
  "signature",
 ]
 
@@ -1849,7 +1883,7 @@ dependencies = [
  "curve25519-dalek-ng",
  "hex",
  "rand_core 0.6.3",
- "serde 1.0.143",
+ "serde 1.0.144",
  "sha2 0.9.9",
  "thiserror",
  "zeroize",
@@ -1864,7 +1898,7 @@ dependencies = [
  "curve25519-dalek-fiat",
  "ed25519",
  "rand 0.8.5",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_bytes",
  "sha2 0.9.9",
  "zeroize",
@@ -1872,9 +1906,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 
 [[package]]
 name = "elliptic-curve"
@@ -1988,7 +2022,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 [[package]]
 name = "executor"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
 dependencies = [
  "async-trait",
  "backoff",
@@ -2001,18 +2035,18 @@ dependencies = [
  "futures",
  "match_opt",
  "multiaddr",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "primary",
  "prometheus",
- "serde 1.0.143",
+ "serde 1.0.144",
  "thiserror",
  "tokio",
  "tokio-util",
  "tonic",
  "tracing",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "types",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
 ]
 
 [[package]]
@@ -2039,7 +2073,7 @@ dependencies = [
 [[package]]
 name = "fastcrypto"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/fastcrypto?rev=a9e58305dc463c40b9d357730203406214909f04#a9e58305dc463c40b9d357730203406214909f04"
+source = "git+https://github.com/MystenLabs/fastcrypto?rev=c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b#c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b"
 dependencies = [
  "base64ct",
  "blake2",
@@ -2056,7 +2090,7 @@ dependencies = [
  "rand 0.8.5",
  "readonly",
  "secp256k1",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_bytes",
  "serde_with 2.0.0",
  "signature",
@@ -2400,7 +2434,7 @@ dependencies = [
  "gloo-utils",
  "js-sys",
  "pin-project",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "thiserror",
  "wasm-bindgen",
@@ -2463,7 +2497,7 @@ dependencies = [
  "petgraph 0.6.2",
  "rayon",
  "semver 1.0.9",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "smallvec",
  "static_assertions",
@@ -2482,7 +2516,7 @@ dependencies = [
  "diffus",
  "guppy-workspace-hack",
  "semver 1.0.9",
- "serde 1.0.143",
+ "serde 1.0.144",
  "toml",
 ]
 
@@ -2531,7 +2565,7 @@ dependencies = [
  "owo-colors",
  "pathdiff",
  "rayon",
- "serde 1.0.143",
+ "serde 1.0.144",
  "tabular",
  "target-spec",
  "toml",
@@ -2867,7 +2901,7 @@ checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
  "autocfg 1.1.0",
  "hashbrown 0.12.1",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -2881,7 +2915,7 @@ dependencies = [
  "once_cell",
  "pest",
  "pest_derive",
- "serde 1.0.143",
+ "serde 1.0.144",
  "similar",
  "yaml-rust",
 ]
@@ -3068,7 +3102,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "rand 0.8.5",
  "rustc-hash",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "soketto",
  "thiserror",
@@ -3091,7 +3125,7 @@ dependencies = [
  "jsonrpsee-core",
  "jsonrpsee-types",
  "rustc-hash",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "thiserror",
  "tokio",
@@ -3110,7 +3144,7 @@ dependencies = [
  "hyper",
  "jsonrpsee-core",
  "jsonrpsee-types",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "tokio",
  "tracing",
@@ -3137,7 +3171,7 @@ checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d"
 dependencies = [
  "anyhow",
  "beef",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "thiserror",
  "tracing",
@@ -3211,7 +3245,7 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b310ccceade8121d7d77fee406160e457c2f4e7c7982d589da3499bc7ea4526"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -3354,7 +3388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
  "cfg-if 1.0.0",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -3516,7 +3550,7 @@ dependencies = [
  "move-command-line-common",
  "move-core-types",
  "move-model",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -3528,7 +3562,7 @@ dependencies = [
  "move-core-types",
  "once_cell",
  "ref-cast",
- "serde 1.0.143",
+ "serde 1.0.144",
  "variant_count",
 ]
 
@@ -3549,7 +3583,7 @@ dependencies = [
  "move-core-types",
  "move-ir-types",
  "move-symbol-pool",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -3630,7 +3664,7 @@ dependencies = [
  "read-write-set",
  "read-write-set-dynamic",
  "reqwest",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "serde_yaml",
  "tempfile",
@@ -3650,7 +3684,7 @@ dependencies = [
  "move-core-types",
  "num-bigint",
  "once_cell",
- "serde 1.0.143",
+ "serde 1.0.144",
  "sha2 0.9.9",
  "walkdir",
 ]
@@ -3695,7 +3729,7 @@ dependencies = [
  "once_cell",
  "rand 0.8.5",
  "ref-cast",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_bytes",
 ]
 
@@ -3716,7 +3750,7 @@ dependencies = [
  "move-ir-types",
  "once_cell",
  "petgraph 0.5.1",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -3752,7 +3786,7 @@ dependencies = [
  "num",
  "once_cell",
  "regex",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -3766,7 +3800,7 @@ dependencies = [
  "move-command-line-common",
  "move-core-types",
  "move-model",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -3831,7 +3865,7 @@ dependencies = [
  "move-core-types",
  "move-symbol-pool",
  "once_cell",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -3857,7 +3891,7 @@ dependencies = [
  "num",
  "once_cell",
  "regex",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -3887,7 +3921,7 @@ dependencies = [
  "ptree",
  "regex",
  "reqwest",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_yaml",
  "sha2 0.9.9",
  "tempfile",
@@ -3926,7 +3960,7 @@ dependencies = [
  "once_cell",
  "pretty",
  "rand 0.8.5",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "simplelog",
  "tokio",
@@ -3955,7 +3989,7 @@ dependencies = [
  "pretty",
  "rand 0.8.5",
  "regex",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "tera",
  "tokio",
@@ -3969,7 +4003,7 @@ dependencies = [
  "anyhow",
  "move-binary-format",
  "move-core-types",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -3984,7 +4018,7 @@ dependencies = [
  "move-bytecode-utils",
  "move-core-types",
  "once_cell",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -4011,7 +4045,7 @@ dependencies = [
  "once_cell",
  "paste",
  "petgraph 0.5.1",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -4029,7 +4063,7 @@ dependencies = [
  "move-model",
  "move-stackless-bytecode",
  "num",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -4060,7 +4094,7 @@ version = "0.1.0"
 source = "git+https://github.com/move-language/move?rev=70b34a66473c34ad30d101290b249f2db3c847a2#70b34a66473c34ad30d101290b249f2db3c847a2"
 dependencies = [
  "once_cell",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -4169,7 +4203,7 @@ dependencies = [
  "move-core-types",
  "move-vm-types",
  "once_cell",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -4181,7 +4215,7 @@ dependencies = [
  "move-binary-format",
  "move-core-types",
  "once_cell",
- "serde 1.0.143",
+ "serde 1.0.144",
  "smallvec",
 ]
 
@@ -4197,7 +4231,7 @@ dependencies = [
  "data-encoding",
  "multihash",
  "percent-encoding",
- "serde 1.0.143",
+ "serde 1.0.144",
  "static_assertions",
  "unsigned-varint",
  "url",
@@ -4234,6 +4268,27 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
+[[package]]
+name = "mysten-network"
+version = "0.1.0"
+source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331#696fa25982acdc87ab64ec6a33cb111edc63a331"
+dependencies = [
+ "bincode",
+ "bytes",
+ "eyre",
+ "futures",
+ "http",
+ "multiaddr",
+ "serde 1.0.144",
+ "tokio",
+ "tokio-stream",
+ "tonic",
+ "tonic-health",
+ "tower",
+ "tower-http",
+ "tracing",
+]
+
 [[package]]
 name = "mysten-network"
 version = "0.1.0"
@@ -4245,7 +4300,7 @@ dependencies = [
  "futures",
  "http",
  "multiaddr",
- "serde 1.0.143",
+ "serde 1.0.144",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -4306,7 +4361,7 @@ checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e"
 [[package]]
 name = "network"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
 dependencies = [
  "async-trait",
  "backoff",
@@ -4315,17 +4370,17 @@ dependencies = [
  "fastcrypto",
  "futures",
  "multiaddr",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "prometheus",
  "rand 0.8.5",
- "serde 1.0.143",
+ "serde 1.0.144",
  "thiserror",
  "tokio",
  "tokio-util",
  "tonic",
  "tracing",
  "types",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
 ]
 
 [[package]]
@@ -4340,7 +4395,7 @@ dependencies = [
  "hakari",
  "hex",
  "once_cell",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -4355,7 +4410,7 @@ dependencies = [
  "guppy",
  "nexlint",
  "regex",
- "serde 1.0.143",
+ "serde 1.0.144",
  "toml",
 ]
 
@@ -4384,7 +4439,7 @@ dependencies = [
 [[package]]
 name = "node"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -4395,17 +4450,19 @@ dependencies = [
  "clap 2.34.0",
  "config 0.1.0",
  "consensus",
+ "crypto",
  "executor",
  "eyre",
  "fastcrypto",
  "futures",
  "multiaddr",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "network",
  "primary",
  "prometheus",
  "rand 0.8.5",
- "telemetry-subscribers",
+ "storage",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -4413,11 +4470,11 @@ dependencies = [
  "tracing",
  "tracing-log",
  "tracing-subscriber 0.3.15",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "types",
  "url",
  "worker",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
 ]
 
 [[package]]
@@ -5155,7 +5212,7 @@ dependencies = [
 [[package]]
 name = "primary"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
 dependencies = [
  "async-recursion",
  "async-trait",
@@ -5165,19 +5222,21 @@ dependencies = [
  "bytes",
  "config 0.1.0",
  "consensus",
+ "crypto",
  "dashmap",
  "derive_builder",
  "fastcrypto",
  "futures",
  "itertools",
  "multiaddr",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "network",
  "once_cell",
  "prometheus",
  "prost",
  "rand 0.8.5",
- "serde 1.0.143",
+ "serde 1.0.144",
+ "storage",
  "tap",
  "thiserror",
  "tokio",
@@ -5185,9 +5244,9 @@ dependencies = [
  "tonic",
  "tower",
  "tracing",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "types",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
 ]
 
 [[package]]
@@ -5369,7 +5428,7 @@ dependencies = [
  "config 0.11.0",
  "directories",
  "petgraph 0.6.2",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde-value",
  "tint",
 ]
@@ -5795,7 +5854,7 @@ dependencies = [
  "native-tls",
  "percent-encoding",
  "pin-project-lite",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "serde_urlencoded",
  "tokio",
@@ -6040,7 +6099,7 @@ dependencies = [
  "dyn-clone",
  "either",
  "schemars_derive",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
 ]
 
@@ -6153,7 +6212,7 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -6185,9 +6244,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
 
 [[package]]
 name = "serde"
-version = "1.0.143"
+version = "1.0.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
+checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
 dependencies = [
  "serde_derive",
 ]
@@ -6210,7 +6269,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b5b14ebbcc4e4f2b3642fa99c388649da58d1dc3308c7d109f39f565d1710f0"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
  "thiserror",
 ]
 
@@ -6221,7 +6280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f05a5f801ac62a51a49d378fdb3884480041b99aced450b28990673e8ff99895"
 dependencies = [
  "once_cell",
- "serde 1.0.143",
+ "serde 1.0.144",
  "thiserror",
 ]
 
@@ -6232,7 +6291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
 dependencies = [
  "ordered-float 2.10.0",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -6241,7 +6300,7 @@ version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -6251,14 +6310,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
 dependencies = [
  "half",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.143"
+version = "1.0.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
+checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
 dependencies = [
  "proc-macro2 1.0.42",
  "quote 1.0.21",
@@ -6278,13 +6337,13 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
 dependencies = [
  "itoa 1.0.2",
  "ryu",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -6293,7 +6352,7 @@ version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38b0651a2f427e4a4d74d458947aa5ca36c62c1b503344d143763ec06216a975"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -6305,7 +6364,7 @@ dependencies = [
  "form_urlencoded",
  "itoa 1.0.2",
  "ryu",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -6315,7 +6374,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
 dependencies = [
  "hex",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_with_macros 1.5.2",
 ]
 
@@ -6329,7 +6388,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "serde_with_macros 2.0.0",
  "time 0.3.9",
@@ -6367,7 +6426,7 @@ checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
 dependencies = [
  "indexmap",
  "ryu",
- "serde 1.0.143",
+ "serde 1.0.144",
  "yaml-rust",
 ]
 
@@ -6725,6 +6784,24 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "storage"
+version = "0.1.0"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
+dependencies = [
+ "dashmap",
+ "fastcrypto",
+ "futures",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+ "tonic",
+ "tracing",
+ "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
+ "types",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
+]
+
 [[package]]
 name = "str-buf"
 version = "1.0.6"
@@ -6858,7 +6935,7 @@ dependencies = [
  "rocksdb",
  "rustyline",
  "rustyline-derive",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "serde_with 1.14.0",
  "shell-words",
@@ -6873,12 +6950,12 @@ dependencies = [
  "sui-sdk",
  "sui-swarm",
  "sui-types",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "tempfile",
  "test-utils",
  "tokio",
  "tracing",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "typed-store-macros",
  "unescape",
  "workspace-hack 0.1.0",
@@ -6932,7 +7009,7 @@ dependencies = [
  "rand_distr",
  "rayon",
  "rocksdb",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "serde_with 1.14.0",
  "strum",
@@ -6944,7 +7021,7 @@ dependencies = [
  "sui-quorum-driver",
  "sui-sdk",
  "sui-types",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "tempfile",
  "test-utils",
  "tokio",
@@ -6964,7 +7041,7 @@ dependencies = [
  "futures",
  "prometheus",
  "reqwest",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "sui",
  "sui-config",
@@ -6975,7 +7052,7 @@ dependencies = [
  "sui-sdk",
  "sui-swarm",
  "sui-types",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "tempfile",
  "test-utils",
  "tokio",
@@ -7004,7 +7081,7 @@ dependencies = [
  "multiaddr",
  "once_cell",
  "rand 0.8.5",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_with 1.14.0",
  "serde_yaml",
  "sha3 0.10.2",
@@ -7040,7 +7117,7 @@ dependencies = [
  "move-package",
  "move-vm-runtime",
  "multiaddr",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "node",
  "once_cell",
  "parking_lot 0.12.1",
@@ -7049,7 +7126,7 @@ dependencies = [
  "rand 0.8.5",
  "rocksdb",
  "scopeguard",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde-reflection",
  "serde_json",
  "serde_with 1.14.0",
@@ -7064,7 +7141,7 @@ dependencies = [
  "sui-storage",
  "sui-types",
  "tap",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "tempfile",
  "test-fuzz",
  "test-utils",
@@ -7073,7 +7150,7 @@ dependencies = [
  "tokio-retry",
  "tokio-stream",
  "tracing",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "typed-store-macros",
  "types",
  "workspace-hack 0.1.0",
@@ -7096,7 +7173,7 @@ dependencies = [
  "move-vm-test-utils",
  "move-vm-types",
  "once_cell",
- "serde 1.0.143",
+ "serde 1.0.144",
  "strum",
  "strum_macros",
  "sui-config",
@@ -7119,13 +7196,13 @@ dependencies = [
  "http",
  "prometheus",
  "scopeguard",
- "serde 1.0.143",
+ "serde 1.0.144",
  "sui",
  "sui-config",
  "sui-json-rpc-types",
  "sui-node",
  "sui-types",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "test-utils",
  "thiserror",
  "tokio",
@@ -7192,9 +7269,9 @@ dependencies = [
  "clap 3.2.17",
  "futures",
  "move-package",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "prometheus",
- "serde 1.0.143",
+ "serde 1.0.144",
  "sui-config",
  "sui-core",
  "sui-framework",
@@ -7204,7 +7281,7 @@ dependencies = [
  "sui-node",
  "sui-sdk",
  "sui-types",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "test-utils",
  "tokio",
  "tracing",
@@ -7222,7 +7299,7 @@ dependencies = [
  "move-core-types",
  "move-package",
  "schemars",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "sui-adapter",
  "sui-framework",
@@ -7246,7 +7323,7 @@ dependencies = [
  "move-bytecode-utils",
  "move-core-types",
  "prometheus",
- "serde 1.0.143",
+ "serde 1.0.144",
  "signature",
  "sui-core",
  "sui-cost",
@@ -7275,7 +7352,7 @@ dependencies = [
  "move-bytecode-utils",
  "move-core-types",
  "schemars",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "serde_with 1.14.0",
  "sui-json",
@@ -7289,7 +7366,7 @@ name = "sui-network"
 version = "0.0.0"
 dependencies = [
  "async-trait",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "sui-types",
  "tonic",
  "tonic-build 0.7.2 (git+https://github.com/hyperium/tonic.git?rev=de2e4ac077c076736dc451f3415ea7da1a61a560)",
@@ -7308,7 +7385,7 @@ dependencies = [
  "jemalloc-ctl",
  "jemallocator",
  "multiaddr",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "parking_lot 0.12.1",
  "prometheus",
  "sui-config",
@@ -7319,10 +7396,10 @@ dependencies = [
  "sui-storage",
  "sui-telemetry",
  "sui-types",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "tokio",
  "tracing",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "workspace-hack 0.1.0",
 ]
 
@@ -7338,7 +7415,7 @@ dependencies = [
  "pretty_assertions",
  "rand 0.8.5",
  "schemars",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "sui",
  "sui-config",
@@ -7396,7 +7473,7 @@ dependencies = [
  "move-bytecode-utils",
  "move-core-types",
  "rand 0.8.5",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "sha3 0.10.2",
  "signature",
@@ -7429,7 +7506,7 @@ dependencies = [
  "num_cpus",
  "pretty_assertions",
  "rocksdb",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "sqlx",
  "strum",
@@ -7437,12 +7514,12 @@ dependencies = [
  "sui-json-rpc-types",
  "sui-types",
  "tap",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "tempfile",
  "tokio",
  "tokio-stream",
  "tracing",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "typed-store-macros",
  "workspace-hack 0.1.0",
 ]
@@ -7453,13 +7530,13 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "futures",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "rand 0.8.5",
  "sui-config",
  "sui-node",
  "sui-types",
  "tap",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "tempfile",
  "tokio",
  "tonic-health",
@@ -7472,7 +7549,7 @@ name = "sui-telemetry"
 version = "0.1.0"
 dependencies = [
  "reqwest",
- "serde 1.0.143",
+ "serde 1.0.144",
  "tokio",
  "tracing",
  "workspace-hack 0.1.0",
@@ -7487,7 +7564,7 @@ dependencies = [
  "clap 3.2.17",
  "http",
  "move-package",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "sui",
  "sui-cluster-test",
@@ -7509,9 +7586,9 @@ dependencies = [
  "executor",
  "eyre",
  "futures",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "rocksdb",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_with 1.14.0",
  "strum",
  "strum_macros",
@@ -7519,12 +7596,12 @@ dependencies = [
  "sui-core",
  "sui-storage",
  "sui-types",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "tempfile",
  "textwrap 0.15.0",
  "tokio",
  "tracing",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "typed-store-macros",
  "workspace-hack 0.1.0",
 ]
@@ -7583,7 +7660,7 @@ dependencies = [
  "rand 0.8.5",
  "roaring",
  "schemars",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde-name",
  "serde_bytes",
  "serde_json",
@@ -7597,7 +7674,7 @@ dependencies = [
  "thiserror",
  "tonic",
  "tracing",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "workspace-hack 0.1.0",
  "zeroize",
 ]
@@ -7692,10 +7769,28 @@ checksum = "462215968f204588ef2d3499333d07729b692aa01f79f9b0925071127b3b353f"
 dependencies = [
  "cfg-expr",
  "guppy-workspace-hack",
- "serde 1.0.143",
+ "serde 1.0.144",
  "target-lexicon",
 ]
 
+[[package]]
+name = "telemetry-subscribers"
+version = "0.1.0"
+source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331#696fa25982acdc87ab64ec6a33cb111edc63a331"
+dependencies = [
+ "crossterm 0.25.0",
+ "once_cell",
+ "opentelemetry",
+ "opentelemetry-jaeger",
+ "tokio",
+ "tracing",
+ "tracing-appender",
+ "tracing-bunyan-formatter",
+ "tracing-chrome",
+ "tracing-opentelemetry",
+ "tracing-subscriber 0.3.15",
+]
+
 [[package]]
 name = "telemetry-subscribers"
 version = "0.1.0"
@@ -7744,7 +7839,7 @@ dependencies = [
  "pest_derive",
  "rand 0.8.5",
  "regex",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "slug",
  "unic-segment",
@@ -7781,7 +7876,7 @@ version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f03298404c433dd9e5bb84e2d6e587e80aa98a01a818c45150327d06c3ae1c72"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
  "test-fuzz-internal",
  "test-fuzz-macro",
  "test-fuzz-runtime",
@@ -7796,7 +7891,7 @@ dependencies = [
  "cargo_metadata",
  "proc-macro2 1.0.42",
  "quote 1.0.21",
- "serde 1.0.143",
+ "serde 1.0.144",
  "strum_macros",
 ]
 
@@ -7827,7 +7922,7 @@ dependencies = [
  "bincode",
  "hex",
  "num-traits 0.2.15",
- "serde 1.0.143",
+ "serde 1.0.144",
  "sha-1 0.10.0",
  "test-fuzz-internal",
 ]
@@ -7959,7 +8054,7 @@ dependencies = [
  "itoa 1.0.2",
  "libc",
  "num_threads",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -7977,7 +8072,7 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
 dependencies = [
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
 ]
 
@@ -8105,7 +8200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
 dependencies = [
  "indexmap",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -8129,7 +8224,7 @@ dependencies = [
  "combine",
  "indexmap",
  "itertools",
- "serde 1.0.143",
+ "serde 1.0.144",
 ]
 
 [[package]]
@@ -8314,7 +8409,7 @@ checksum = "a788f2119fde477cd33823330c14004fa8cdac6892fd6f12181bbda9dbf14fc9"
 dependencies = [
  "gethostname",
  "log",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "time 0.3.9",
  "tracing",
@@ -8466,6 +8561,24 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae"
 
+[[package]]
+name = "typed-store"
+version = "0.1.0"
+source = "git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331#696fa25982acdc87ab64ec6a33cb111edc63a331"
+dependencies = [
+ "bincode",
+ "collectable",
+ "eyre",
+ "fdlimit",
+ "pre",
+ "rocksdb",
+ "serde 1.0.144",
+ "tap",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "typed-store"
 version = "0.1.0"
@@ -8477,7 +8590,7 @@ dependencies = [
  "fdlimit",
  "pre",
  "rocksdb",
- "serde 1.0.143",
+ "serde 1.0.144",
  "tap",
  "thiserror",
  "tokio",
@@ -8498,7 +8611,7 @@ dependencies = [
  "syn 1.0.99",
  "tempfile",
  "tokio",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
 ]
 
 [[package]]
@@ -8510,14 +8623,16 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 [[package]]
 name = "types"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
 dependencies = [
  "base64",
  "bincode",
  "blake2",
  "bytes",
  "config 0.1.0",
+ "crypto",
  "dag",
+ "dashmap",
  "derive_builder",
  "fastcrypto",
  "futures",
@@ -8529,15 +8644,16 @@ dependencies = [
  "prost-build",
  "rand 0.8.5",
  "rustversion",
- "serde 1.0.143",
+ "serde 1.0.144",
  "signature",
  "thiserror",
  "tokio",
  "tokio-util",
  "tonic",
  "tonic-build 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "typed-store",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)",
+ "tracing",
+ "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
 ]
 
 [[package]]
@@ -8841,7 +8957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
 dependencies = [
  "cfg-if 1.0.0",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde_json",
  "wasm-bindgen-macro",
 ]
@@ -9087,30 +9203,32 @@ dependencies = [
 [[package]]
 name = "worker"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
 dependencies = [
  "async-trait",
  "bincode",
  "blake2",
  "bytes",
  "config 0.1.0",
+ "crypto",
  "fastcrypto",
  "futures",
  "multiaddr",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "network",
  "primary",
  "prometheus",
- "serde 1.0.143",
+ "serde 1.0.144",
+ "tap",
  "tokio",
  "tokio-stream",
  "tokio-util",
  "tonic",
  "tower",
  "tracing",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "types",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
 ]
 
 [[package]]
@@ -9459,7 +9577,7 @@ dependencies = [
  "multihash",
  "multihash-derive",
  "multimap",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "name-variant",
  "named-lock",
  "nested",
@@ -9620,7 +9738,7 @@ dependencies = [
  "semver-parser 0.7.0",
  "send_wrapper",
  "serde 0.8.23",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde-hjson",
  "serde-name",
  "serde-reflection",
@@ -9685,7 +9803,7 @@ dependencies = [
  "tap",
  "target-lexicon",
  "target-spec",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "tempfile",
  "tera",
  "termcolor",
@@ -9745,7 +9863,7 @@ dependencies = [
  "tui",
  "twox-hash",
  "typed-arena",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=8d090689be14078f2ca41c356e7bbc0af21f73ab)",
  "typed-store-macros",
  "typenum",
  "types",
@@ -9795,7 +9913,7 @@ dependencies = [
  "which",
  "whoami",
  "worker",
- "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f)",
+ "workspace-hack 0.1.0 (git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd)",
  "yaml-rust",
  "zeroize",
  "zeroize_derive",
@@ -9805,7 +9923,7 @@ dependencies = [
 [[package]]
 name = "workspace-hack"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/narwhal?rev=f4cab79d77cf70b0d564fa640fb748584a3ba36f#f4cab79d77cf70b0d564fa640fb748584a3ba36f"
+source = "git+https://github.com/MystenLabs/narwhal?rev=c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd#c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd"
 dependencies = [
  "addr2line",
  "adler",
@@ -9997,7 +10115,7 @@ dependencies = [
  "multihash",
  "multihash-derive",
  "multimap",
- "mysten-network",
+ "mysten-network 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "nom 7.1.1",
  "normalize-line-endings",
  "num-bigint",
@@ -10092,7 +10210,7 @@ dependencies = [
  "semver 0.9.0",
  "semver-parser 0.10.2",
  "semver-parser 0.7.0",
- "serde 1.0.143",
+ "serde 1.0.144",
  "serde-reflection",
  "serde_bytes",
  "serde_cbor",
@@ -10127,7 +10245,7 @@ dependencies = [
  "sync_wrapper",
  "synstructure",
  "tap",
- "telemetry-subscribers",
+ "telemetry-subscribers 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "tempfile",
  "termcolor",
  "terminal_size",
@@ -10172,7 +10290,7 @@ dependencies = [
  "tracing-test",
  "tracing-test-macro",
  "try-lock",
- "typed-store",
+ "typed-store 0.1.0 (git+https://github.com/mystenlabs/mysten-infra.git?rev=696fa25982acdc87ab64ec6a33cb111edc63a331)",
  "typenum",
  "ucd-trie",
  "unicode-bidi",
diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml
index 23ae1265a8e10..5cee36fb90b87 100644
--- a/crates/sui-benchmark/Cargo.toml
+++ b/crates/sui-benchmark/Cargo.toml
@@ -11,7 +11,7 @@ async-trait = "0.1.57"
 rayon = "1.5.3"
 anyhow = { version = "1.0.57", features = ["backtrace"] }
 futures = "0.3.23"
-serde = { version = "1.0.142", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.83"
 tempfile = "3.3.0"
 tokio = { version = "1.20.1", features = ["full"] }
@@ -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 = "70b34a66473c34ad30d101290b249f2db3c847a2", features = ["address20"] }
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "node" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "node" }
 workspace-hack = { path = "../workspace-hack"}
 test-utils = { path = "../test-utils" }
 
diff --git a/crates/sui-benchmark/src/benchmark/validator_preparer.rs b/crates/sui-benchmark/src/benchmark/validator_preparer.rs
index 16c3015dc1630..3032d1fd5139f 100644
--- a/crates/sui-benchmark/src/benchmark/validator_preparer.rs
+++ b/crates/sui-benchmark/src/benchmark/validator_preparer.rs
@@ -284,6 +284,7 @@ fn make_authority_state(
     ));
     let epoch_store = Arc::new(EpochStore::new(path.join("epochs"), committee, Some(opts)));
     let (tx_reconfigure_consensus, _rx_reconfigure_consensus) = tokio::sync::mpsc::channel(10);
+    let (tx_consensus_to_sui, _rx_consensus_to_sui) = tokio::sync::mpsc::channel(1_000);
     (
         Runtime::new().unwrap().block_on(async {
             AuthorityState::new(
@@ -297,6 +298,7 @@ fn make_authority_state(
                 &sui_config::genesis::Genesis::get_default_genesis(),
                 &prometheus::Registry::new(),
                 tx_reconfigure_consensus,
+                tx_consensus_to_sui,
             )
             .await
         }),
diff --git a/crates/sui-cluster-test/Cargo.toml b/crates/sui-cluster-test/Cargo.toml
index 1342b10c62299..245ff85469b98 100644
--- a/crates/sui-cluster-test/Cargo.toml
+++ b/crates/sui-cluster-test/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.142", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 futures = "0.3.23"
 serde_json = "1.0.83"
 tempfile = "3.3.0"
@@ -32,4 +32,4 @@ sui-core = { path = "../sui-core" }
 sui-json = { path = "../sui-json" }
 sui-config = { path = "../sui-config" }
 test-utils = { path = "../test-utils" }
-workspace-hack = { path = "../workspace-hack"}
\ No newline at end of file
+workspace-hack = { path = "../workspace-hack"}
diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml
index 8b326a16f6275..c02abb2917e88 100644
--- a/crates/sui-config/Cargo.toml
+++ b/crates/sui-config/Cargo.toml
@@ -11,7 +11,7 @@ bcs = "0.1.3"
 arc-swap = "1.5.1"
 camino = "1.1.1"
 anyhow = { version = "1.0.58", features = ["backtrace"] }
-serde = { version = "1.0.141", features = ["derive", "rc"] }
+serde = { version = "1.0.144", features = ["derive", "rc"] }
 serde_with = "1.14.0"
 serde_yaml = "0.8.26"
 rand = "0.8.5"
@@ -20,13 +20,13 @@ multiaddr = "0.14.0"
 once_cell = "1.13.1"
 tracing = "0.1.36"
 
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04" }
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b" }
 
 move-binary-format = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 move-package = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 move-core-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2", features = ["address20"] }
 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "config" }
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "config" }
 
 
 sui-framework = { path = "../sui-framework" }
diff --git a/crates/sui-config/src/genesis.rs b/crates/sui-config/src/genesis.rs
index 1e809f1fcdd3b..78cfdf9a5e107 100644
--- a/crates/sui-config/src/genesis.rs
+++ b/crates/sui-config/src/genesis.rs
@@ -73,6 +73,29 @@ impl Genesis {
                     primary_to_primary: validator.narwhal_primary_to_primary.clone(),
                     worker_to_primary: validator.narwhal_worker_to_primary.clone(),
                 };
+                let authority = narwhal_config::Authority {
+                    stake: validator.stake as narwhal_config::Stake, //TODO this should at least be the same size integer
+                    primary,
+                };
+
+                (name, authority)
+            })
+            .collect();
+        std::sync::Arc::new(arc_swap::ArcSwap::from_pointee(narwhal_config::Committee {
+            authorities: narwhal_committee,
+            epoch: self.epoch() as narwhal_config::Epoch,
+        }))
+    }
+
+    pub fn narwhal_worker_cache(&self) -> narwhal_config::SharedWorkerCache {
+        let workers = self
+            .validator_set
+            .iter()
+            .map(|validator| {
+                let name = validator
+                    .protocol_key()
+                    .try_into()
+                    .expect("Can't get narwhal public key");
                 let workers = [(
                     0, // worker_id
                     narwhal_config::WorkerInfo {
@@ -83,19 +106,16 @@ impl Genesis {
                 )]
                 .into_iter()
                 .collect();
-                let authority = narwhal_config::Authority {
-                    stake: validator.stake as narwhal_config::Stake, //TODO this should at least be the same size integer
-                    primary,
-                    workers,
-                };
+                let worker_index = narwhal_config::WorkerIndex(workers);
 
-                (name, authority)
+                (name, worker_index)
             })
             .collect();
-        std::sync::Arc::new(arc_swap::ArcSwap::from_pointee(narwhal_config::Committee {
-            authorities: narwhal_committee,
+        narwhal_config::WorkerCache {
+            workers,
             epoch: self.epoch() as narwhal_config::Epoch,
-        }))
+        }
+        .into()
     }
 
     pub fn sui_system_object(&self) -> SuiSystemState {
diff --git a/crates/sui-config/tests/snapshot_tests.rs b/crates/sui-config/tests/snapshot_tests.rs
index 3b6630a75705f..72022e6acb134 100644
--- a/crates/sui-config/tests/snapshot_tests.rs
+++ b/crates/sui-config/tests/snapshot_tests.rs
@@ -93,6 +93,7 @@ fn populated_genesis_snapshot_matches() {
     assert_yaml_snapshot!(genesis.validator_set());
     assert_yaml_snapshot!(genesis.committee().unwrap());
     assert_yaml_snapshot!(genesis.narwhal_committee());
+    assert_yaml_snapshot!(genesis.narwhal_worker_cache());
     assert_yaml_snapshot!(genesis.sui_system_object());
     // Serialized `genesis` is not static and cannot be snapshot tested.
 }
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 f49320302eff7..3b7f76cab385c 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
@@ -8,10 +8,4 @@ authorities:
     primary:
       primary_to_primary: ""
       worker_to_primary: ""
-    workers:
-      0:
-        transactions: ""
-        worker_to_worker: ""
-        primary_to_worker: ""
 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 82f3c1556f1b9..f337149044cdf 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
@@ -1,338 +1,11 @@
 ---
 source: crates/sui-config/tests/snapshot_tests.rs
-expression: genesis.sui_system_object()
+expression: genesis.narwhal_worker_cache()
 ---
-info:
-  id: "0x0000000000000000000000000000000000000005"
+workers:
+  ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=:
+    0:
+      transactions: ""
+      worker_to_worker: ""
+      primary_to_worker: ""
 epoch: 0
-validators:
-  validator_stake: 1
-  delegation_stake: 0
-  quorum_stake_threshold: 1
-  active_validators:
-    - metadata:
-        sui_address: 375741c9373ae27bde5e6b5f5cc79f074cd84587
-        pubkey_bytes:
-          - 185
-          - 198
-          - 238
-          - 22
-          - 48
-          - 239
-          - 62
-          - 113
-          - 17
-          - 68
-          - 166
-          - 72
-          - 219
-          - 6
-          - 187
-          - 178
-          - 40
-          - 79
-          - 114
-          - 116
-          - 207
-          - 190
-          - 229
-          - 63
-          - 252
-          - 238
-          - 80
-          - 60
-          - 193
-          - 164
-          - 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
-          - 48
-          - 122
-          - 55
-          - 55
-          - 108
-          - 80
-          - 47
-          - 122
-          - 117
-          - 85
-          - 68
-          - 122
-          - 66
-          - 112
-          - 74
-          - 73
-          - 65
-        proof_of_possession_bytes:
-          - 9
-          - 244
-          - 30
-          - 127
-          - 150
-          - 249
-          - 92
-          - 80
-          - 137
-          - 37
-          - 198
-          - 94
-          - 200
-          - 72
-          - 82
-          - 231
-          - 31
-          - 184
-          - 204
-          - 174
-          - 16
-          - 221
-          - 223
-          - 207
-          - 203
-          - 116
-          - 224
-          - 209
-          - 253
-          - 41
-          - 75
-          - 199
-          - 201
-          - 174
-          - 66
-          - 189
-          - 190
-          - 115
-          - 207
-          - 66
-          - 176
-          - 118
-          - 43
-          - 204
-          - 184
-          - 193
-          - 6
-          - 231
-          - 133
-          - 181
-          - 243
-          - 229
-          - 225
-          - 15
-          - 222
-          - 35
-          - 103
-          - 126
-          - 235
-          - 122
-          - 127
-          - 51
-          - 178
-          - 10
-        name:
-          - 48
-        net_address: []
-        next_epoch_stake: 1
-        next_epoch_delegation: 0
-        next_epoch_gas_price: 1
-      stake_amount: 1
-      delegation: 0
-      pending_stake: 0
-      pending_withdraw: 0
-      pending_delegation: 0
-      pending_delegation_withdraw: 0
-      delegator_count: 0
-      pending_delegator_count: 0
-      pending_delegator_withdraw_count: 0
-      gas_price: 1
-  pending_validators: []
-  pending_removals: []
-  next_epoch_validators:
-    - sui_address: 375741c9373ae27bde5e6b5f5cc79f074cd84587
-      pubkey_bytes:
-        - 185
-        - 198
-        - 238
-        - 22
-        - 48
-        - 239
-        - 62
-        - 113
-        - 17
-        - 68
-        - 166
-        - 72
-        - 219
-        - 6
-        - 187
-        - 178
-        - 40
-        - 79
-        - 114
-        - 116
-        - 207
-        - 190
-        - 229
-        - 63
-        - 252
-        - 238
-        - 80
-        - 60
-        - 193
-        - 164
-        - 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
-        - 48
-        - 122
-        - 55
-        - 55
-        - 108
-        - 80
-        - 47
-        - 122
-        - 117
-        - 85
-        - 68
-        - 122
-        - 66
-        - 112
-        - 74
-        - 73
-        - 65
-      proof_of_possession_bytes:
-        - 9
-        - 244
-        - 30
-        - 127
-        - 150
-        - 249
-        - 92
-        - 80
-        - 137
-        - 37
-        - 198
-        - 94
-        - 200
-        - 72
-        - 82
-        - 231
-        - 31
-        - 184
-        - 204
-        - 174
-        - 16
-        - 221
-        - 223
-        - 207
-        - 203
-        - 116
-        - 224
-        - 209
-        - 253
-        - 41
-        - 75
-        - 199
-        - 201
-        - 174
-        - 66
-        - 189
-        - 190
-        - 115
-        - 207
-        - 66
-        - 176
-        - 118
-        - 43
-        - 204
-        - 184
-        - 193
-        - 6
-        - 231
-        - 133
-        - 181
-        - 243
-        - 229
-        - 225
-        - 15
-        - 222
-        - 35
-        - 103
-        - 126
-        - 235
-        - 122
-        - 127
-        - 51
-        - 178
-        - 10
-      name:
-        - 48
-      net_address: []
-      next_epoch_stake: 1
-      next_epoch_delegation: 0
-      next_epoch_gas_price: 1
-treasury_cap:
-  value: 100000000000001
-storage_fund:
-  value: 100000000000000
-parameters:
-  min_validator_stake: 100000000000000
-  max_validator_candidate_count: 100
-  storage_gas_price: 1
-delegation_reward:
-  value: 0
-reference_gas_price: 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
new file mode 100644
index 0000000000000..cc150bb525247
--- /dev/null
+++ b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-5.snap
@@ -0,0 +1,337 @@
+---
+source: crates/sui-config/tests/snapshot_tests.rs
+expression: genesis.sui_system_object()
+---
+info:
+  id: "0x0000000000000000000000000000000000000005"
+epoch: 0
+validators:
+  validator_stake: 1
+  delegation_stake: 0
+  quorum_stake_threshold: 1
+  active_validators:
+    - metadata:
+        sui_address: 375741c9373ae27bde5e6b5f5cc79f074cd84587
+        pubkey_bytes:
+          - 185
+          - 198
+          - 238
+          - 22
+          - 48
+          - 239
+          - 62
+          - 113
+          - 17
+          - 68
+          - 166
+          - 72
+          - 219
+          - 6
+          - 187
+          - 178
+          - 40
+          - 79
+          - 114
+          - 116
+          - 207
+          - 190
+          - 229
+          - 63
+          - 252
+          - 238
+          - 80
+          - 60
+          - 193
+          - 164
+          - 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
+          - 48
+          - 122
+          - 55
+          - 55
+          - 108
+          - 80
+          - 47
+          - 122
+          - 117
+          - 85
+          - 68
+          - 122
+          - 66
+          - 112
+          - 74
+          - 73
+          - 65
+        proof_of_possession_bytes:
+          - 9
+          - 244
+          - 30
+          - 127
+          - 150
+          - 249
+          - 92
+          - 80
+          - 137
+          - 37
+          - 198
+          - 94
+          - 200
+          - 72
+          - 82
+          - 231
+          - 31
+          - 184
+          - 204
+          - 174
+          - 16
+          - 221
+          - 223
+          - 207
+          - 203
+          - 116
+          - 224
+          - 209
+          - 253
+          - 41
+          - 75
+          - 199
+          - 201
+          - 174
+          - 66
+          - 189
+          - 190
+          - 115
+          - 207
+          - 66
+          - 176
+          - 118
+          - 43
+          - 204
+          - 184
+          - 193
+          - 6
+          - 231
+          - 133
+          - 181
+          - 243
+          - 229
+          - 225
+          - 15
+          - 222
+          - 35
+          - 103
+          - 126
+          - 235
+          - 122
+          - 127
+          - 51
+          - 178
+          - 10
+        name:
+          - 48
+        net_address: []
+        next_epoch_stake: 1
+        next_epoch_delegation: 0
+        next_epoch_gas_price: 1
+      stake_amount: 1
+      delegation: 0
+      pending_stake: 0
+      pending_withdraw: 0
+      pending_delegation: 0
+      pending_delegation_withdraw: 0
+      delegator_count: 0
+      pending_delegator_count: 0
+      pending_delegator_withdraw_count: 0
+      gas_price: 1
+  pending_validators: []
+  pending_removals: []
+  next_epoch_validators:
+    - sui_address: 375741c9373ae27bde5e6b5f5cc79f074cd84587
+      pubkey_bytes:
+        - 185
+        - 198
+        - 238
+        - 22
+        - 48
+        - 239
+        - 62
+        - 113
+        - 17
+        - 68
+        - 166
+        - 72
+        - 219
+        - 6
+        - 187
+        - 178
+        - 40
+        - 79
+        - 114
+        - 116
+        - 207
+        - 190
+        - 229
+        - 63
+        - 252
+        - 238
+        - 80
+        - 60
+        - 193
+        - 164
+        - 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
+        - 48
+        - 122
+        - 55
+        - 55
+        - 108
+        - 80
+        - 47
+        - 122
+        - 117
+        - 85
+        - 68
+        - 122
+        - 66
+        - 112
+        - 74
+        - 73
+        - 65
+      proof_of_possession_bytes:
+        - 9
+        - 244
+        - 30
+        - 127
+        - 150
+        - 249
+        - 92
+        - 80
+        - 137
+        - 37
+        - 198
+        - 94
+        - 200
+        - 72
+        - 82
+        - 231
+        - 31
+        - 184
+        - 204
+        - 174
+        - 16
+        - 221
+        - 223
+        - 207
+        - 203
+        - 116
+        - 224
+        - 209
+        - 253
+        - 41
+        - 75
+        - 199
+        - 201
+        - 174
+        - 66
+        - 189
+        - 190
+        - 115
+        - 207
+        - 66
+        - 176
+        - 118
+        - 43
+        - 204
+        - 184
+        - 193
+        - 6
+        - 231
+        - 133
+        - 181
+        - 243
+        - 229
+        - 225
+        - 15
+        - 222
+        - 35
+        - 103
+        - 126
+        - 235
+        - 122
+        - 127
+        - 51
+        - 178
+        - 10
+      name:
+        - 48
+      net_address: []
+      next_epoch_stake: 1
+      next_epoch_delegation: 0
+      next_epoch_gas_price: 1
+treasury_cap:
+  value: 100000000000001
+storage_fund:
+  value: 100000000000000
+parameters:
+  min_validator_stake: 100000000000000
+  max_validator_candidate_count: 100
+  storage_gas_price: 1
+delegation_reward:
+  value: 0
+reference_gas_price: 0
diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml
index fee140651ef7d..51f1b678073ed 100644
--- a/crates/sui-core/Cargo.toml
+++ b/crates/sui-core/Cargo.toml
@@ -13,7 +13,7 @@ bcs = "0.1.3"
 chrono = "0.4.0"
 futures = "0.3.23"
 bytes = "1.2.1"
-serde = { version = "1.0.142", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.83"
 serde_with = "1.14.0"
 tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
@@ -47,16 +47,16 @@ move-core-types = { git = "https://github.com/move-language/move", rev = "70b34a
 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
-typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"} 
+typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
 mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab" }
 
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "config" }
-narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "consensus" }
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "executor" }
-narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "types" }
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "node" }
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "config" }
+narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "consensus" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "executor" }
+narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "types" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "node" }
 
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04"}
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b"}
 workspace-hack = { path = "../workspace-hack"}
 thiserror = "1.0.32"
 eyre = "0.6.8"
diff --git a/crates/sui-core/src/authority.rs b/crates/sui-core/src/authority.rs
index ded828cd4e5be..65da9f68f54b7 100644
--- a/crates/sui-core/src/authority.rs
+++ b/crates/sui-core/src/authority.rs
@@ -20,7 +20,10 @@ use move_bytecode_utils::module_cache::SyncModuleCache;
 use move_core_types::{language_storage::ModuleId, resolver::ModuleResolver};
 use move_vm_runtime::{move_vm::MoveVM, native_functions::NativeFunctionTable};
 use narwhal_config::Committee as ConsensusCommittee;
-use narwhal_executor::ExecutionStateError;
+use narwhal_executor::{
+    BatchExecutionState, ExecutionStateError, SerializedTransaction, SingleExecutionState,
+    SubscriberError,
+};
 use narwhal_executor::{ExecutionIndices, ExecutionState};
 use parking_lot::Mutex;
 use prometheus::{
@@ -64,6 +67,9 @@ use tokio::sync::mpsc::Sender;
 use tracing::{debug, error, instrument, warn};
 use typed_store::Map;
 
+// The sender channel type for consensus to Sui.
+type SenderType = Sender<(Result<Vec<u8>, SubscriberError>, Vec<u8>)>;
+
 #[cfg(test)]
 #[path = "unit_tests/authority_tests.rs"]
 pub mod authority_tests;
@@ -329,6 +335,9 @@ pub struct AuthorityState {
 
     /// A channel to tell consensus to reconfigure.
     tx_reconfigure_consensus: Sender<(ConsensusKeyPair, ConsensusCommittee)>,
+
+    /// A channel to tell sui the outcome of transaction execution.
+    tx_consensus_to_sui: SenderType,
 }
 
 /// The authority state encapsulates all state, drives execution, and ensures safety.
@@ -428,6 +437,108 @@ impl AuthorityState {
         }
     }
 
+    /// Execute a single batch of transactions.
+    async fn execute_batch(
+        &self,
+        execution_indices: &mut ExecutionIndices,
+        consensus_output: &narwhal_consensus::ConsensusOutput,
+        transactions: Vec<SerializedTransaction>,
+        total_batches: usize,
+    ) -> Result<(), SuiError> {
+        if transactions.is_empty() {
+            execution_indices.skip_batch(total_batches);
+            return Ok(());
+        }
+
+        // Execute every transaction in the batch.
+        let total_transactions = transactions.len();
+        for (index, transaction) in transactions.into_iter().enumerate() {
+            // Skip transactions that we already executed (after crash-recovery).
+            if execution_indices
+                .check_next_transaction_index(index as narwhal_types::SequenceNumber)
+            {
+                // Execute the transaction
+                self.execute_transaction(
+                    execution_indices,
+                    consensus_output,
+                    transaction,
+                    total_batches,
+                    total_transactions,
+                )
+                .await?;
+            }
+        }
+        Ok(())
+    }
+
+    /// This function will be called by Narwhal, after Narwhal sequenced this certificate.
+    #[instrument(level = "trace", skip_all)]
+    async fn execute_transaction(
+        &self,
+        execution_indices: &mut ExecutionIndices,
+        consensus_output: &narwhal_consensus::ConsensusOutput,
+        transaction: SerializedTransaction,
+        total_batches: usize,
+        total_transactions: usize,
+    ) -> Result<(), SuiError> {
+        // Compute the next expected indices. Those will be persisted upon transaction execution
+        // and are only used for crash-recovery.
+        execution_indices.next(total_batches, total_transactions);
+
+        // The consensus simply orders bytes, so we first need to deserialize the transaction.
+        // If the deserialization fail it is safe to ignore the transaction since all correct
+        // clients will do the same. Remember that a bad authority or client may input random
+        // bytes to the consensus.
+        let (result, outcome) = match bincode::deserialize::<
+            <AuthorityState as SingleExecutionState>::Transaction,
+        >(&transaction)
+        {
+            Err(e) => {
+                let error = narwhal_executor::SubscriberError::ClientExecutionError(format!(
+                    "Failed to deserialize transaction: {e}"
+                ));
+                // There is always a chance that the fault lies with our deserialization.
+                debug!("{error}");
+                (Ok(()), Err(error))
+            }
+            Ok(transaction) => {
+                // Execute the transaction. Note that the executor will need to choose whether to discard
+                // transactions from previous epochs by itself.
+                let result = self
+                    .handle_consensus_transaction(
+                        consensus_output,
+                        execution_indices.clone(),
+                        transaction,
+                    )
+                    .await;
+
+                match result {
+                    Ok(outcome) => (Ok(()), Ok(outcome)),
+                    Err(error) => match narwhal_executor::SubscriberError::from(error.clone()) {
+                        // We may want to log the errors that are the user's fault (i.e., that are neither
+                        // our fault or the fault of consensus) for debug purposes. It is safe to continue
+                        // by ignoring those transactions since all honest subscribers will do the same.
+                        non_fatal @ narwhal_executor::SubscriberError::ClientExecutionError(_) => {
+                            debug!("{non_fatal}");
+                            (Ok(()), Err(non_fatal))
+                        }
+                        // We must take special care to errors that are our fault, such as storage errors.
+                        // We may be the only authority experiencing it, and thus cannot continue to process
+                        // transactions until the problem is fixed.
+                        fatal => (Err(error), Err(fatal)),
+                    },
+                }
+            }
+        };
+        // Output the result (eg. to notify the end-user);
+        let output = (outcome, transaction);
+        if self.tx_consensus_to_sui.send(output).await.is_err() {
+            debug!("No users listening for transaction execution");
+        }
+
+        result
+    }
+
     /// We cannot use handle_certificate in fullnode to execute a certificate because there is no
     /// consensus engine to assign locks for shared objects. Hence we need special handling here.
     #[instrument(level = "trace", skip_all)]
@@ -1064,6 +1175,7 @@ impl AuthorityState {
         genesis: &Genesis,
         prometheus_registry: &prometheus::Registry,
         tx_reconfigure_consensus: Sender<(ConsensusKeyPair, ConsensusCommittee)>,
+        tx_consensus_to_sui: SenderType,
     ) -> Self {
         let (tx, _rx) = tokio::sync::broadcast::channel(BROADCAST_CAPACITY);
         let native_functions =
@@ -1115,6 +1227,7 @@ impl AuthorityState {
             metrics: Arc::new(AuthorityMetrics::new(prometheus_registry)),
             latest_checkpoint_num: AtomicU64::new(0),
             tx_reconfigure_consensus,
+            tx_consensus_to_sui,
         };
 
         // Process tx recovery log first, so that the batch and checkpoint recovery (below)
@@ -1173,6 +1286,7 @@ impl AuthorityState {
         genesis: Option<&Genesis>,
         consensus_sender: Option<Box<dyn ConsensusSender>>,
         tx_reconfigure_consensus: Sender<(ConsensusKeyPair, ConsensusCommittee)>,
+        tx_consensus_to_sui: SenderType,
     ) -> Self {
         let secret = Arc::pin(key.copy());
         let path = match store_base_path {
@@ -1222,6 +1336,7 @@ impl AuthorityState {
             genesis,
             &prometheus::Registry::new(),
             tx_reconfigure_consensus,
+            tx_consensus_to_sui,
         )
         .await;
 
@@ -1730,8 +1845,58 @@ impl AuthorityState {
 
 #[async_trait]
 impl ExecutionState for AuthorityState {
-    type Transaction = ConsensusTransaction;
     type Error = SuiError;
+
+    fn ask_consensus_write_lock(&self) -> bool {
+        self.consensus_guardrail.fetch_add(1, Ordering::SeqCst) == 0
+    }
+
+    fn release_consensus_write_lock(&self) {
+        self.consensus_guardrail.fetch_sub(0, Ordering::SeqCst);
+    }
+}
+
+#[async_trait]
+impl BatchExecutionState for AuthorityState {
+    async fn load_next_certificate_index(
+        &self,
+    ) -> Result<narwhal_types::SequenceNumber, Self::Error> {
+        let indices = self.database.last_consensus_index()?;
+        Ok(indices.next_certificate_index)
+    }
+
+    async fn handle_consensus(
+        &self,
+        consensus_output: &narwhal_consensus::ConsensusOutput,
+        transaction_batches: Vec<Vec<SerializedTransaction>>,
+    ) -> Result<(), Self::Error> {
+        let mut execution_indices = self.database.last_consensus_index()?;
+        if transaction_batches.is_empty() {
+            execution_indices.skip_certificate();
+        } else {
+            // Execute every batch in the certificate.
+            let total_batches = transaction_batches.len();
+            for (index, batch) in transaction_batches.into_iter().enumerate() {
+                // Skip batches that we already executed (after crash-recovery).
+                if execution_indices.check_next_batch_index(index as narwhal_types::SequenceNumber)
+                {
+                    self.execute_batch(
+                        &mut execution_indices,
+                        consensus_output,
+                        batch,
+                        total_batches,
+                    )
+                    .await?;
+                }
+            }
+        }
+        Ok(())
+    }
+}
+
+#[async_trait]
+impl SingleExecutionState for AuthorityState {
+    type Transaction = ConsensusTransaction;
     type Outcome = Vec<u8>;
 
     /// This function will be called by Narwhal, after Narwhal sequenced this certificate.
@@ -1811,14 +1976,6 @@ impl ExecutionState for AuthorityState {
         }
     }
 
-    fn ask_consensus_write_lock(&self) -> bool {
-        self.consensus_guardrail.fetch_add(1, Ordering::SeqCst) == 0
-    }
-
-    fn release_consensus_write_lock(&self) {
-        self.consensus_guardrail.fetch_sub(0, Ordering::SeqCst);
-    }
-
     async fn load_execution_indices(&self) -> Result<ExecutionIndices, Self::Error> {
         self.database.last_consensus_index()
     }
diff --git a/crates/sui-core/src/authority_active/gossip/configurable_batch_action_client.rs b/crates/sui-core/src/authority_active/gossip/configurable_batch_action_client.rs
index a76cf028edd0f..f226aa8dfc232 100644
--- a/crates/sui-core/src/authority_active/gossip/configurable_batch_action_client.rs
+++ b/crates/sui-core/src/authority_active/gossip/configurable_batch_action_client.rs
@@ -63,6 +63,7 @@ impl ConfigurableBatchActionClient {
     #[cfg(test)]
     pub async fn new(committee: Committee, secret: AuthorityKeyPair) -> Self {
         let (tx_reconfigure_consensus, _rx_reconfigure_consensus) = tokio::sync::mpsc::channel(10);
+        let (tx_consensus_to_sui, _rx_consensus_to_sui) = tokio::sync::mpsc::channel(1_000);
         let state = AuthorityState::new_for_testing(
             committee,
             &secret,
@@ -70,6 +71,7 @@ impl ConfigurableBatchActionClient {
             None,
             None,
             tx_reconfigure_consensus,
+            tx_consensus_to_sui,
         )
         .await;
 
diff --git a/crates/sui-core/src/authority_client.rs b/crates/sui-core/src/authority_client.rs
index 0f0ee1670af2d..6dd2299126710 100644
--- a/crates/sui-core/src/authority_client.rs
+++ b/crates/sui-core/src/authority_client.rs
@@ -443,6 +443,7 @@ impl LocalAuthorityClient {
     #[cfg(test)]
     pub async fn new(committee: Committee, secret: AuthorityKeyPair, genesis: &Genesis) -> Self {
         let (tx_reconfigure_consensus, _rx_reconfigure_consensus) = tokio::sync::mpsc::channel(10);
+        let (tx_consensus_to_sui, _rx_consensus_to_sui) = tokio::sync::mpsc::channel(1_000);
         let state = AuthorityState::new_for_testing(
             committee,
             &secret,
@@ -450,6 +451,7 @@ impl LocalAuthorityClient {
             Some(genesis),
             None,
             tx_reconfigure_consensus,
+            tx_consensus_to_sui,
         )
         .await;
         Self {
diff --git a/crates/sui-core/src/authority_server.rs b/crates/sui-core/src/authority_server.rs
index e894277cba243..f3cd308b0415e 100644
--- a/crates/sui-core/src/authority_server.rs
+++ b/crates/sui-core/src/authority_server.rs
@@ -173,7 +173,7 @@ impl ValidatorService {
         prometheus_registry: Registry,
         rx_reconfigure_consensus: Receiver<(ConsensusKeyPair, ConsensusCommittee)>,
     ) -> Result<Self> {
-        let (tx_consensus_to_sui, rx_consensus_to_sui) = channel(1_000);
+        let (_tx_consensus_to_sui, rx_consensus_to_sui) = channel(1_000);
         let (tx_sui_to_consensus, rx_sui_to_consensus) = channel(1_000);
 
         // Spawn the consensus node of this authority.
@@ -182,6 +182,7 @@ impl ValidatorService {
             .ok_or_else(|| anyhow!("Validator is missing consensus config"))?;
         let consensus_keypair = config.protocol_key_pair().copy();
         let consensus_committee = config.genesis()?.narwhal_committee().load();
+        let consensus_worker_cache = config.genesis()?.narwhal_worker_cache();
         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();
@@ -191,11 +192,11 @@ impl ValidatorService {
             narwhal_node::restarter::NodeRestarter::watch(
                 consensus_keypair,
                 &(&*consensus_committee).clone(),
+                consensus_worker_cache,
                 consensus_storage_base_path,
                 consensus_execution_state,
                 consensus_parameters,
                 rx_reconfigure_consensus,
-                /* tx_output */ tx_consensus_to_sui,
                 &registry,
             )
             .await
diff --git a/crates/sui-core/src/checkpoints/tests/checkpoint_tests.rs b/crates/sui-core/src/checkpoints/tests/checkpoint_tests.rs
index 9d9d735f0b8ef..d0782b1a6a882 100644
--- a/crates/sui-core/src/checkpoints/tests/checkpoint_tests.rs
+++ b/crates/sui-core/src/checkpoints/tests/checkpoint_tests.rs
@@ -903,6 +903,7 @@ async fn test_batch_to_checkpointing() {
         init_state_parameters_from_rng(&mut StdRng::from_seed(seed));
 
     let (tx_reconfigure_consensus, _rx_reconfigure_consensus) = tokio::sync::mpsc::channel(10);
+    let (tx_consensus_to_sui, _rx_consensus_to_sui) = tokio::sync::mpsc::channel(1_000);
     let authority_state = Arc::new(
         AuthorityState::new_for_testing(
             committee.clone(),
@@ -911,6 +912,7 @@ async fn test_batch_to_checkpointing() {
             None,
             None,
             tx_reconfigure_consensus,
+            tx_consensus_to_sui,
         )
         .await,
     );
@@ -999,6 +1001,7 @@ async fn test_batch_to_checkpointing_init_crash() {
     {
         // TODO: May need to set checkpoint store to be None.
         let (tx_reconfigure_consensus, _rx_reconfigure_consensus) = tokio::sync::mpsc::channel(10);
+        let (tx_consensus_to_sui, _rx_consensus_to_sui) = tokio::sync::mpsc::channel(1_000);
         let authority_state = Arc::new(
             AuthorityState::new_for_testing(
                 committee.clone(),
@@ -1007,6 +1010,7 @@ async fn test_batch_to_checkpointing_init_crash() {
                 None,
                 None,
                 tx_reconfigure_consensus,
+                tx_consensus_to_sui,
             )
             .await,
         );
@@ -1073,6 +1077,7 @@ async fn test_batch_to_checkpointing_init_crash() {
     // Scope to ensure all variables are dropped
     {
         let (tx_reconfigure_consensus, _rx_reconfigure_consensus) = tokio::sync::mpsc::channel(10);
+        let (tx_consensus_to_sui, _rx_consensus_to_sui) = tokio::sync::mpsc::channel(1_000);
         let authority_state = Arc::new(
             AuthorityState::new_for_testing(
                 committee,
@@ -1081,6 +1086,7 @@ async fn test_batch_to_checkpointing_init_crash() {
                 None,
                 None,
                 tx_reconfigure_consensus,
+                tx_consensus_to_sui,
             )
             .await,
         );
@@ -1585,6 +1591,7 @@ pub async fn checkpoint_tests_setup(
     // Make all authorities and their services.
     for k in &keys {
         let (tx_reconfigure_consensus, _rx_reconfigure_consensus) = tokio::sync::mpsc::channel(10);
+        let (tx_consensus_to_sui, _rx_consensus_to_sui) = tokio::sync::mpsc::channel(1_000);
         let authority = Arc::new(
             AuthorityState::new_for_testing(
                 committee.clone(),
@@ -1593,6 +1600,7 @@ pub async fn checkpoint_tests_setup(
                 None,
                 Some(Box::new(sender.clone())),
                 tx_reconfigure_consensus,
+                tx_consensus_to_sui,
             )
             .await,
         );
diff --git a/crates/sui-core/src/unit_tests/authority_tests.rs b/crates/sui-core/src/unit_tests/authority_tests.rs
index c1cdc27995265..6a5c88ab850c4 100644
--- a/crates/sui-core/src/unit_tests/authority_tests.rs
+++ b/crates/sui-core/src/unit_tests/authority_tests.rs
@@ -1892,6 +1892,7 @@ pub async fn init_state_with_committee(
     };
 
     let (tx_reconfigure_consensus, _rx_reconfigure_consensus) = tokio::sync::mpsc::channel(10);
+    let (tx_consensus_to_sui, _rx_consensus_to_sui) = tokio::sync::mpsc::channel(1_000);
     AuthorityState::new_for_testing(
         committee,
         &authority_key,
@@ -1899,6 +1900,7 @@ pub async fn init_state_with_committee(
         None,
         None,
         tx_reconfigure_consensus,
+        tx_consensus_to_sui,
     )
     .await
 }
diff --git a/crates/sui-core/src/unit_tests/batch_tests.rs b/crates/sui-core/src/unit_tests/batch_tests.rs
index ac3feab10631b..a449a31ecdad2 100644
--- a/crates/sui-core/src/unit_tests/batch_tests.rs
+++ b/crates/sui-core/src/unit_tests/batch_tests.rs
@@ -59,6 +59,7 @@ pub(crate) async fn init_state(
     let epoch_path = dir.join(format!("DB_{:?}", ObjectID::random()));
     fs::create_dir(&epoch_path).unwrap();
     let (tx_reconfigure_consensus, _rx_reconfigure_consensus) = tokio::sync::mpsc::channel(10);
+    let (tx_consensus_to_sui, _rx_consensus_to_sui) = tokio::sync::mpsc::channel(1_000);
     let epoch_store = Arc::new(EpochStore::new(epoch_path, &committee, None));
     AuthorityState::new(
         authority_key.public().into(),
@@ -71,6 +72,7 @@ pub(crate) async fn init_state(
         &sui_config::genesis::Genesis::get_default_genesis(),
         &prometheus::Registry::new(),
         tx_reconfigure_consensus,
+        tx_consensus_to_sui,
     )
     .await
 }
@@ -809,6 +811,7 @@ async fn test_safe_batch_stream() {
     // Byzantine cases:
     let (_, authority_key): (_, AuthorityKeyPair) = get_key_pair();
     let (tx_reconfigure_consensus, _rx_reconfigure_consensus) = tokio::sync::mpsc::channel(10);
+    let (tx_consensus_to_sui, _rx_consensus_to_sui) = tokio::sync::mpsc::channel(1_000);
     let state_b = AuthorityState::new_for_testing(
         committee.clone(),
         &authority_key,
@@ -816,6 +819,7 @@ async fn test_safe_batch_stream() {
         None,
         None,
         tx_reconfigure_consensus,
+        tx_consensus_to_sui,
     )
     .await;
     let epoch_store = state_b.epoch_store().clone();
diff --git a/crates/sui-core/src/unit_tests/consensus_tests.rs b/crates/sui-core/src/unit_tests/consensus_tests.rs
index 70e4eaea1dd7f..a6e51e105ed33 100644
--- a/crates/sui-core/src/unit_tests/consensus_tests.rs
+++ b/crates/sui-core/src/unit_tests/consensus_tests.rs
@@ -3,7 +3,7 @@
 use super::*;
 use crate::authority::{authority_tests::init_state_with_objects, AuthorityState};
 use move_core_types::{account_address::AccountAddress, ident_str};
-use narwhal_executor::{ExecutionIndices, ExecutionState};
+use narwhal_executor::{ExecutionIndices, SingleExecutionState};
 use narwhal_types::Transactions;
 use narwhal_types::TransactionsServer;
 use narwhal_types::{Empty, TransactionProto};
diff --git a/crates/sui-cost/Cargo.toml b/crates/sui-cost/Cargo.toml
index f619f3e6906f1..4377ff6efa17b 100644
--- a/crates/sui-cost/Cargo.toml
+++ b/crates/sui-cost/Cargo.toml
@@ -23,7 +23,7 @@ move-prover-boogie-backend = { git = "https://github.com/move-language/move", re
 move-unit-test = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 move-cli = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 move-package = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
-serde = { version = "1.0.141", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 strum = { version = "0.24", features = ["derive"] }
 strum_macros = "0.24"
 toml = "0.5.9"
diff --git a/crates/sui-faucet/Cargo.toml b/crates/sui-faucet/Cargo.toml
index e6f8b4699fdfa..955b28b210f49 100644
--- a/crates/sui-faucet/Cargo.toml
+++ b/crates/sui-faucet/Cargo.toml
@@ -14,7 +14,7 @@ clap = { version = "3.2.17", features = ["derive"] }
 thiserror = "1.0.32"
 tokio = { version = "1.20.1", features = ["full"] }
 tracing = "0.1.36"
-serde = { version = "1.0.141", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 tower = { version = "0.4.12", features = ["util", "timeout", "load-shed", "limit"] }
 tower-http = { version = "0.3.4", features = ["cors"] }
 http = { version = "0.2.8" }
diff --git a/crates/sui-framework/Cargo.toml b/crates/sui-framework/Cargo.toml
index 8115f6ddd8de3..304cdc5aebf4b 100644
--- a/crates/sui-framework/Cargo.toml
+++ b/crates/sui-framework/Cargo.toml
@@ -32,7 +32,7 @@ move-stdlib = { git = "https://github.com/move-language/move", rev = "70b34a6647
 move-unit-test = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 move-vm-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04" }
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b" }
 workspace-hack = { path = "../workspace-hack"}
 move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 
diff --git a/crates/sui-gateway/Cargo.toml b/crates/sui-gateway/Cargo.toml
index d9237f7799679..86b805541b3ff 100644
--- a/crates/sui-gateway/Cargo.toml
+++ b/crates/sui-gateway/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 [dependencies]
 anyhow = { version = "1.0.58", features = ["backtrace"] }
 async-trait = "0.1.57"
-serde = { version = "1.0.142", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 tracing = "0.1.36"
 tokio = { version = "1.20.1", features = ["full"] }
 futures = "0.3.23"
diff --git a/crates/sui-json-rpc-types/Cargo.toml b/crates/sui-json-rpc-types/Cargo.toml
index 2bea0f7d58298..a7c21369a86c2 100644
--- a/crates/sui-json-rpc-types/Cargo.toml
+++ b/crates/sui-json-rpc-types/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 async-trait = "0.1.57"
 anyhow = "1.0.58"
 schemars = { version = "0.8.10", features = ["either"] }
-serde = { version = "1.0.141", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.83"
 serde_with = { version = "1.14.0", features = ["hex"] }
 colored = "2.0.0"
diff --git a/crates/sui-json-rpc/Cargo.toml b/crates/sui-json-rpc/Cargo.toml
index d377e07e22ccc..43715b5f469a3 100644
--- a/crates/sui-json-rpc/Cargo.toml
+++ b/crates/sui-json-rpc/Cargo.toml
@@ -17,7 +17,7 @@ prometheus = "0.13.1"
 anyhow = "1.0.58"
 tracing = "0.1.36"
 async-trait = "0.1.57"
-serde = { version = "1.0.141", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 futures = "0.3.23"
 tokio = { version = "1.20.1", features = ["full"] }
 signature = "1.6.0"
diff --git a/crates/sui-json/Cargo.toml b/crates/sui-json/Cargo.toml
index b0c97a5c34ae4..d77f3fe0437aa 100644
--- a/crates/sui-json/Cargo.toml
+++ b/crates/sui-json/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 anyhow = { version = "1.0.58", features = ["backtrace"] }
 bcs = "0.1.3"
 hex = "0.4.3"
-serde = { version = "1.0.141", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.83"
 schemars = "0.8.10"
 
diff --git a/crates/sui-node/src/lib.rs b/crates/sui-node/src/lib.rs
index 39d93962ccee8..494ef9b596138 100644
--- a/crates/sui-node/src/lib.rs
+++ b/crates/sui-node/src/lib.rs
@@ -125,6 +125,7 @@ impl SuiNode {
         };
 
         let (tx_reconfigure_consensus, rx_reconfigure_consensus) = channel(100);
+        let (tx_consensus_to_sui, _rx_consensus_to_sui) = channel(1_000);
         let state = Arc::new(
             AuthorityState::new(
                 config.protocol_public_key(),
@@ -137,6 +138,7 @@ impl SuiNode {
                 genesis,
                 &prometheus_registry,
                 tx_reconfigure_consensus,
+                tx_consensus_to_sui,
             )
             .await,
         );
diff --git a/crates/sui-sdk/Cargo.toml b/crates/sui-sdk/Cargo.toml
index bac53f9dea629..f3d762dec6b88 100644
--- a/crates/sui-sdk/Cargo.toml
+++ b/crates/sui-sdk/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 anyhow = "1.0.58"
 async-trait = "0.1.57"
 jsonrpsee = { version = "0.15.1", features = ["full"] }
-serde = { version = "1.0.141", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.83"
 futures-core = "0.3.21"
 futures = "0.3.23"
@@ -46,4 +46,4 @@ sha3 = "0.10.2"
 [[example]]
 name = "tic-tac-toe"
 path = "examples/tic_tac_toe.rs"
-test = false
\ No newline at end of file
+test = false
diff --git a/crates/sui-storage/Cargo.toml b/crates/sui-storage/Cargo.toml
index 4555f0a22b27d..c790e7f0a7121 100644
--- a/crates/sui-storage/Cargo.toml
+++ b/crates/sui-storage/Cargo.toml
@@ -14,7 +14,7 @@ enum_dispatch = "^0.3"
 fdlimit = "0.2.1"
 futures = "0.3.23"
 flexstr = "^0.9"
-serde = { version = "1.0.141", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.83"
 tokio = { version = "1.20.1", features = ["full", "tracing"] }
 tokio-stream = "^0.1"
@@ -29,7 +29,7 @@ tap = "1.0.1"
 
 sui-types = { path = "../sui-types" }
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
-typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"} 
+typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
 move-core-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2", features = ["address20"] }
 sui-json-rpc-types = { path = "../sui-json-rpc-types" }
 workspace-hack = { path = "../workspace-hack"}
@@ -44,4 +44,4 @@ telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", re
 
 [[bench]]
 name = "write_ahead_log"
-harness = false
\ No newline at end of file
+harness = false
diff --git a/crates/sui-telemetry/Cargo.toml b/crates/sui-telemetry/Cargo.toml
index db07100b3667d..7229ab246c8bc 100644
--- a/crates/sui-telemetry/Cargo.toml
+++ b/crates/sui-telemetry/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.141", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 reqwest = { version = "0.11.10", features = ["json"] }
 tokio = { version = "1.17.0", features = ["full", "tracing"] }
 tracing = "0.1.36"
diff --git a/crates/sui-tool/Cargo.toml b/crates/sui-tool/Cargo.toml
index 92153ab74fe04..91de4bc05a953 100644
--- a/crates/sui-tool/Cargo.toml
+++ b/crates/sui-tool/Cargo.toml
@@ -17,14 +17,14 @@ textwrap = "0.15"
 futures = "0.3.23"
 rocksdb = "0.19.0"
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
-typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"} 
+typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
 tempfile = "3.3.0"
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "executor" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "executor" }
 serde_with = { version = "1.14.0", features = ["hex"] }
 sui-storage = { path = "../sui-storage" }
 strum_macros = "^0.24"
 strum = "0.24.1"
-serde = { version = "1.0.141", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 eyre = "0.6.8"
 
 sui-core = { path = "../sui-core" }
diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml
index c72b6e476b358..10ac345885a2a 100644
--- a/crates/sui-types/Cargo.toml
+++ b/crates/sui-types/Cargo.toml
@@ -12,7 +12,7 @@ bcs = "0.1.3"
 itertools = "0.10.3"
 once_cell = "1.13.1"
 rand = "0.8.5"
-serde = { version = "1.0.141", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 curve25519-dalek = { version = "3", default-features = false, features = ["serde", "u64_backend"] }
 serde-name = "0.2.1"
 sha2 = "0.9.9"
@@ -49,12 +49,11 @@ move-ir-types = { git = "https://github.com/move-language/move", rev = "70b34a66
 move-vm-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 move-vm-test-utils = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "executor" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "executor" }
 
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04", features = ["copy_key"] }
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b", features = ["copy_key"] }
 
 workspace-hack = { path = "../workspace-hack"}
 
 [dev-dependencies]
 bincode = "1.3.3"
-
diff --git a/crates/sui-types/src/crypto.rs b/crates/sui-types/src/crypto.rs
index 7244620483428..257506e4c6618 100644
--- a/crates/sui-types/src/crypto.rs
+++ b/crates/sui-types/src/crypto.rs
@@ -1275,8 +1275,14 @@ impl VerificationObligation {
 
     pub fn verify_all(self) -> SuiResult<()> {
         AggregateAuthoritySignature::batch_verify(
-            &self.signatures[..],
-            &self.public_keys.iter().map(|x| &x[..]).collect::<Vec<_>>(),
+            &self
+                .signatures
+                .iter()
+                .collect::<Vec<&Ed25519AggregateSignature>>(),
+            self.public_keys
+                .iter()
+                .map(|x| x.iter())
+                .collect::<Vec<_>>(),
             &self.messages.iter().map(|x| &x[..]).collect::<Vec<_>>()[..],
         )
         .map_err(|error| SuiError::InvalidSignature {
diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml
index 385c8a5eae912..69505a53802f1 100644
--- a/crates/sui/Cargo.toml
+++ b/crates/sui/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = { version = "1.0.58", features = ["backtrace"] }
-serde = { version = "1.0.142", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.83"
 signature = "1.6.0"
 camino = "1.1.1"
@@ -37,9 +37,9 @@ unescape = "0.1.0"
 shell-words = "1.1.0"
 rocksdb = "0.19.0"
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
-typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"} 
+typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
 tempfile = "3.3.0"
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", package = "executor" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", package = "executor" }
 
 move-core-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2", features = ["address20"] }
 move-prover = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
@@ -60,7 +60,7 @@ jemalloc-ctl = "^0.5"
 tempfile = "3.3.0"
 futures = "0.3.23"
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
-typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"} 
+typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
 jsonrpsee = { version = "0.15.1", features = ["full"] }
 
 test-utils = { path = "../test-utils" }
diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml
index 4e2139e5a05c4..6bbd21fa0d8a1 100644
--- a/crates/workspace-hack/Cargo.toml
+++ b/crates/workspace-hack/Cargo.toml
@@ -95,9 +95,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-31526ba76f738040 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false }
+config-31526ba76f738040 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", features = ["benchmark", "rand"] }
+consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", 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 }
@@ -124,7 +124,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false }
+dag = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", default-features = false }
 dashmap = { version = "5", default-features = false }
 data-encoding = { version = "2", features = ["alloc", "std"] }
 datatest-stable = { version = "0.1", default-features = false }
@@ -160,10 +160,10 @@ 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false }
+executor = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", default-features = false }
 eyre = { version = "0.6", features = ["auto-install", "track-caller"] }
 fail = { version = "0.4", default-features = false }
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04", features = ["copy_key"] }
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b", features = ["copy_key"] }
 fastrand = { version = "1", default-features = false }
 fd-lock = { version = "3", default-features = false }
 fdlimit = { version = "0.2", default-features = false }
@@ -317,11 +317,11 @@ multihash = { version = "0.16", default-features = false, features = ["alloc", "
 mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false }
+network = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] }
+node = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", 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 }
@@ -375,7 +375,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] }
+primary = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", 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"] }
@@ -545,7 +545,7 @@ twox-hash = { version = "1", default-features = false }
 typed-arena = { version = "2", features = ["std"] }
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", default-features = false }
 typenum = { version = "1", default-features = false }
-types = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f" }
+types = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd" }
 ucd-trie = { version = "0.1", default-features = false, features = ["std"] }
 uncased = { version = "0.9", default-features = false }
 unescape = { version = "0.1", default-features = false }
@@ -579,8 +579,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] }
-workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false }
+worker = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", default-features = false, features = ["benchmark"] }
+workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", default-features = false }
 yaml-rust = { version = "0.4", default-features = false }
 zeroize = { version = "1", features = ["alloc", "zeroize_derive"] }
 zstd-sys = { version = "2", features = ["legacy", "zdict_builder"] }
@@ -684,9 +684,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-31526ba76f738040 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false }
+config-31526ba76f738040 = { package = "config", git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", features = ["benchmark", "rand"] }
+consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", 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 }
@@ -713,7 +713,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false }
+dag = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", 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"] }
@@ -760,10 +760,10 @@ 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false }
+executor = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", default-features = false }
 eyre = { version = "0.6", features = ["auto-install", "track-caller"] }
 fail = { version = "0.4", default-features = false }
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a9e58305dc463c40b9d357730203406214909f04", features = ["copy_key"] }
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b", features = ["copy_key"] }
 fastrand = { version = "1", default-features = false }
 fd-lock = { version = "3", default-features = false }
 fdlimit = { version = "0.2", default-features = false }
@@ -932,11 +932,11 @@ mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d
 name-variant = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false }
+network = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", 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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] }
+node = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", 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 }
@@ -1004,7 +1004,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] }
+primary = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", 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"] }
@@ -1217,7 +1217,7 @@ typed-arena = { version = "2", features = ["std"] }
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", default-features = false }
 typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab", default-features = false }
 typenum = { version = "1", default-features = false }
-types = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f" }
+types = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd" }
 ucd-trie = { version = "0.1", default-features = false, features = ["std"] }
 uncased = { version = "0.9", default-features = false }
 unescape = { version = "0.1", default-features = false }
@@ -1263,8 +1263,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 = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false, features = ["benchmark"] }
-workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "f4cab79d77cf70b0d564fa640fb748584a3ba36f", default-features = false }
+worker = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", default-features = false, features = ["benchmark"] }
+workspace-hack = { git = "https://github.com/MystenLabs/narwhal", rev = "c6b9f05a5260362e7b7fe1235f5e887cd6ec92cd", default-features = false }
 yaml-rust = { version = "0.4", default-features = false }
 zeroize = { version = "1", features = ["alloc", "zeroize_derive"] }
 zeroize_derive = { version = "1", default-features = false }
diff --git a/crates/x/src/lint.rs b/crates/x/src/lint.rs
index a07ed0c97bd3f..ccd696b531dcf 100644
--- a/crates/x/src/lint.rs
+++ b/crates/x/src/lint.rs
@@ -7,10 +7,7 @@ use nexlint_lints::{
     content::*,
     handle_lint_results,
     package::*,
-    project::{
-        BannedDeps, BannedDepsConfig, DirectDepDups, DirectDepDupsConfig,
-        DirectDuplicateGitDependencies,
-    },
+    project::{BannedDeps, BannedDepsConfig, DirectDuplicateGitDependencies},
 };
 
 static LICENSE_HEADER: &str = "Copyright (c) 2022, Mysten Labs, Inc.\n\
@@ -23,10 +20,6 @@ pub struct Args {
 }
 
 pub fn run(args: Args) -> crate::Result<()> {
-    // rand can be removed if/when ed25519_dalek upgrades to rand 0.8
-    let direct_dups_config = DirectDepDupsConfig {
-        allow: vec!["rand".to_string()],
-    };
     let banned_deps_config = BannedDepsConfig {
         direct: vec![
             (
@@ -42,7 +35,6 @@ pub fn run(args: Args) -> crate::Result<()> {
         .collect(),
     };
     let project_linters: &[&dyn ProjectLinter] = &[
-        &DirectDepDups::new(&direct_dups_config),
         &BannedDeps::new(&banned_deps_config),
         &DirectDuplicateGitDependencies,
     ];