MystenLabs · bmwill · Sep 9, 2022 · Sep 9, 2022
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml
@@ -41,7 +41,7 @@ sui-node = { path = "../sui-node" }
 sui-json-rpc-types = { path = "../sui-json-rpc-types" }
 
 move-core-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e", features = ["address20"] }
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "c969da55ca1812be2360c1a1e730d03d4b867bcc", package = "node" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "a383ad626355035cf5e388be6ee668fff17bb646", package = "node" }
 workspace-hack = { path = "../workspace-hack"}
 test-utils = { path = "../test-utils" }
 

diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml
@@ -20,14 +20,13 @@ multiaddr = "0.14.0"
 once_cell = "1.14.0"
 tracing = "0.1.36"
 
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c022a2ae23ca7cc2778293fd3b1db42e8cd02d3b" }
+fastcrypto = { version = "0.1.1" }
 
 move-binary-format = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
 move-package = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
 move-core-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e", features = ["address20"] }
 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "c969da55ca1812be2360c1a1e730d03d4b867bcc", package = "config" }
-
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "a383ad626355035cf5e388be6ee668fff17bb646", package = "config" }
 
 sui-framework = { path = "../sui-framework" }
 sui-adapter = { path = "../sui-adapter" }

diff --git a/crates/sui-config/src/builder.rs b/crates/sui-config/src/builder.rs
@@ -118,6 +118,7 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
  (
  i,
  (
+ get_key_pair_from_rng(&mut rng).1,
  get_key_pair_from_rng(&mut rng).1,
  get_key_pair_from_rng::<AccountKeyPair, _>(&mut rng)
  .1
@@ -129,11 +130,17 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
  )
  })
  .map(
- |(i, (key_pair, account_key_pair, network_key_pair)): (
+ |(i, (key_pair, worker_key_pair, account_key_pair, network_key_pair)): (
  _,
- (AuthorityKeyPair, SuiKeyPair, SuiKeyPair),
+ (AuthorityKeyPair, AuthorityKeyPair, SuiKeyPair, SuiKeyPair),
  )| {
- self.build_validator(i, key_pair, account_key_pair, network_key_pair)
+ self.build_validator(
+ i,
+ key_pair,
+ worker_key_pair,
+ account_key_pair,
+ network_key_pair,
+ )
  },
  )
  .collect::<Vec<_>>(),
@@ -147,12 +154,14 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
  &self,
  index: usize,
  key_pair: AuthorityKeyPair,
+ worker_key_pair: AuthorityKeyPair,
  account_key_pair: SuiKeyPair,
  network_key_pair: SuiKeyPair,
  ) -> ValidatorGenesisInfo {
  match self.validator_ip_sel {
  ValidatorIpSelection::Localhost => ValidatorGenesisInfo::from_localhost_for_testing(
  key_pair,
+ worker_key_pair,
  account_key_pair,
  network_key_pair,
  ),
@@ -167,6 +176,7 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
 
  ValidatorGenesisInfo::from_base_ip(
  key_pair,
+ worker_key_pair,
  account_key_pair,
  network_key_pair,
  ip,
@@ -187,6 +197,7 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
  .map(|(i, validator)| {
  let name = format!("validator-{i}");
  let protocol_key: AuthorityPublicKeyBytes = validator.key_pair.public().into();
+ let worker_key: AuthorityPublicKeyBytes = validator.worker_key_pair.public().into();
  let account_key: PublicKey = validator.account_key_pair.public();
  let network_key: PublicKey = validator.network_key_pair.public();
  let stake = validator.stake;
@@ -200,6 +211,7 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
  ValidatorInfo {
  name,
  protocol_key,
+ worker_key,
  network_key,
  account_key,
  stake,
@@ -255,6 +267,7 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
 
  NodeConfig {
  protocol_key_pair: Arc::new(validator.key_pair),
+ worker_key_pair: Arc::new(validator.worker_key_pair),
  account_key_pair: Arc::new(validator.account_key_pair),
  network_key_pair: Arc::new(validator.network_key_pair),
  db_path,

diff --git a/crates/sui-config/src/genesis.rs b/crates/sui-config/src/genesis.rs
@@ -104,6 +104,10 @@ impl Genesis {
  let workers = [(
  0, // worker_id
  narwhal_config::WorkerInfo {
+ name: validator
+ .worker_key()
+ .try_into()
+ .expect("Can't get narwhal worker public key"),
  primary_to_worker: validator.narwhal_primary_to_worker.clone(),
  transactions: validator.narwhal_consensus_address.clone(),
  worker_to_worker: validator.narwhal_worker_to_worker.clone(),
@@ -618,11 +622,13 @@ mod test {
  .unwrap();
 
  let key: AuthorityKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
+ let worker_key: AuthorityKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
  let account_key: AccountKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
  let network_key: AccountKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
  let validator = ValidatorInfo {
  name: "0".into(),
  protocol_key: key.public().into(),
+ worker_key: worker_key.public().into(),
  account_key: account_key.public().clone().into(),
  network_key: network_key.public().clone().into(),
  stake: 1,

diff --git a/crates/sui-config/src/genesis_config.rs b/crates/sui-config/src/genesis_config.rs
@@ -90,6 +90,7 @@ impl GenesisConfig {
 pub struct ValidatorGenesisInfo {
  #[serde_as(as = "KeyPairBase64")]
  pub key_pair: AuthorityKeyPair,
+ pub worker_key_pair: AuthorityKeyPair,
  pub account_key_pair: SuiKeyPair,
  pub network_key_pair: SuiKeyPair,
  pub network_address: Multiaddr,
@@ -105,11 +106,13 @@ pub struct ValidatorGenesisInfo {
 impl ValidatorGenesisInfo {
  pub fn from_localhost_for_testing(
  key_pair: AuthorityKeyPair,
+ worker_key_pair: AuthorityKeyPair,
  account_key_pair: SuiKeyPair,
  network_key_pair: SuiKeyPair,
  ) -> Self {
  Self {
  key_pair,
+ worker_key_pair,
  account_key_pair,
  network_key_pair,
  network_address: utils::new_network_address(),
@@ -125,6 +128,7 @@ impl ValidatorGenesisInfo {
 
  pub fn from_base_ip(
  key_pair: AuthorityKeyPair,
+ worker_key_pair: AuthorityKeyPair,
  account_key_pair: SuiKeyPair,
  network_key_pair: SuiKeyPair,
  ip: String,
@@ -139,6 +143,7 @@ impl ValidatorGenesisInfo {
 
  ValidatorGenesisInfo {
  key_pair,
+ worker_key_pair,
  account_key_pair,
  network_key_pair,
  network_address: make_addr(1000 + port_offset),

diff --git a/crates/sui-config/src/node.rs b/crates/sui-config/src/node.rs
@@ -33,6 +33,10 @@ pub struct NodeConfig {
  #[serde(default = "default_key_pair")]
  #[serde_as(as = "Arc<KeyPairBase64>")]
  pub protocol_key_pair: Arc<AuthorityKeyPair>,
+ /// The keypair that is used by the narwhal worker.
+ #[serde(default = "default_worker_key_pair")]
+ #[serde_as(as = "Arc<KeyPairBase64>")]
+ pub worker_key_pair: Arc<AuthorityKeyPair>,
  /// The keypair that the authority uses to receive payments
  #[serde(default = "default_sui_key_pair")]
  pub account_key_pair: Arc<SuiKeyPair>,
@@ -79,6 +83,10 @@ fn default_key_pair() -> Arc<AuthorityKeyPair> {
  Arc::new(sui_types::crypto::get_key_pair().1)
 }
 
+fn default_worker_key_pair() -> Arc<AuthorityKeyPair> {
+ Arc::new(sui_types::crypto::get_key_pair().1)
+}
+
 fn default_sui_key_pair() -> Arc<SuiKeyPair> {
  Arc::new((sui_types::crypto::get_key_pair::<AccountKeyPair>().1).into())
 }
@@ -122,6 +130,10 @@ impl NodeConfig {
  &self.protocol_key_pair
  }
 
+ pub fn worker_key_pair(&self) -> &AuthorityKeyPair {
+ &self.worker_key_pair
+ }
+
  pub fn protocol_public_key(&self) -> AuthorityPublicKeyBytes {
  self.protocol_key_pair.public().into()
  }
@@ -180,6 +192,7 @@ pub struct ValidatorInfo {
  pub name: String,
  pub account_key: AccountsPublicKey,
  pub protocol_key: AuthorityPublicKeyBytes,
+ pub worker_key: AuthorityPublicKeyBytes,
  pub network_key: AccountsPublicKey,
  pub stake: StakeUnit,
  pub delegation: StakeUnit,
@@ -207,6 +220,10 @@ impl ValidatorInfo {
  self.protocol_key
  }
 
+ pub fn worker_key(&self) -> AuthorityPublicKeyBytes {
+ self.worker_key
+ }
+
  pub fn network_key(&self) -> &AccountsPublicKey {
  &self.network_key
  }

diff --git a/crates/sui-config/src/swarm.rs b/crates/sui-config/src/swarm.rs
@@ -70,6 +70,7 @@ impl NetworkConfig {
  ) -> NodeConfig {
  let protocol_key_pair: Arc<AuthorityKeyPair> =
  Arc::new(get_key_pair_from_rng(&mut OsRng).1);
+ let worker_key_pair: Arc<AuthorityKeyPair> = Arc::new(get_key_pair_from_rng(&mut OsRng).1);
  let account_key_pair: Arc<SuiKeyPair> = Arc::new(
  get_key_pair_from_rng::<AccountKeyPair, _>(&mut OsRng)
  .1
@@ -93,6 +94,7 @@ impl NetworkConfig {
 
  NodeConfig {
  protocol_key_pair,
+ worker_key_pair,
  account_key_pair,
  network_key_pair,
  db_path: db_path.join(fullnode_db_dir.unwrap_or(FULL_NODE_DB_PATH)),

@@ -64,11 +64,13 @@ fn populated_genesis_snapshot_matches() {
  .generate_accounts(&mut StdRng::from_seed([0; 32]))
  .unwrap();
  let key: AuthorityKeyPair = get_key_pair_from_rng(&mut StdRng::from_seed([0; 32])).1;
+ let worker_key: AuthorityKeyPair = get_key_pair_from_rng(&mut StdRng::from_seed([0; 32])).1;
  let network_key: AccountKeyPair = get_key_pair_from_rng(&mut StdRng::from_seed([0; 32])).1;
  let account_key: AccountKeyPair = get_key_pair_from_rng(&mut StdRng::from_seed([0; 32])).1;
  let validator = ValidatorInfo {
  name: "0".into(),
  protocol_key: key.public().into(),
+ worker_key: worker_key.public().into(),
  account_key: account_key.public().clone().into(),
  network_key: network_key.public().clone().into(),
  stake: 1,

diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap b/crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
@@ -4,8 +4,9 @@ expression: network_config
 ---
 validator_configs:
  - protocol-key-pair: m/SaagdV+VOBH84SXyaD1QQpw7tJ4HQUfgCJpS6uFV+5xu4WMO8+cRFEpkjbBruyKE9ydM++5T/87lA8waSSAA==
- account-key-pair: AK7z9KS47KHfw0M2G/jkNr1C3pJZwEuDFOuOIFTdboKrBWT4edJ648As6Cg0rPqMeTpinyyg3mkZYQvoL0ETJr4=
- network-key-pair: AIpXYuIawc2zhwRCx3tMOvWMfO24d50CcObU8eL3Nn10C9WIQSA+dP6G/HEzjOAXPcYo67cZvcvMFRWFIUzAibQ=
+ worker-key-pair: BWT4edJ648As6Cg0rPqMeTpinyyg3mkZYQvoL0ETJr6u8/SkuOyh38NDNhv45Da9Qt6SWcBLgxTrjiBU3W6Cqw==
+ account-key-pair: AIpXYuIawc2zhwRCx3tMOvWMfO24d50CcObU8eL3Nn10C9WIQSA+dP6G/HEzjOAXPcYo67cZvcvMFRWFIUzAibQ=
+ network-key-pair: AMxiMy40uy1c1p9g77sqNsuRbH60WDAeo2Y2xNuwEr2IQiWNzaFM8RHGAriXG4zIQ+keRsqQUVHAJ0SmsBfmkxY=
  db-path: /tmp/foo/
  network-address: ""
  json-rpc-address: "0.0.0.0:1"
@@ -44,9 +45,10 @@ validator_configs:
  grpc-concurrency-limit: 20000000000
  genesis:
  genesis: "[fake genesis]"
- - protocol-key-pair: QiWNzaFM8RHGAriXG4zIQ+keRsqQUVHAJ0SmsBfmkxbMYjMuNLstXNafYO+7KjbLkWx+tFgwHqNmNsTbsBK9iA==
- account-key-pair: ACOO227pqR/cjnG+UMCj+zzyktkCTdusAqqnCQlrCqnasgzWfEvezFOOi+mQwbZCXWi/06b+l2k+SEY1FZbMqKs=
- network-key-pair: AJ1HYWoY3yA5MH8GQiJgJYi1Kmquqntv6Ma02euop4ex9Z/d0Lf1LcwMYKRIy/lRFhCwp0Lx5NI4p6RcrgVOwhw=
+ - protocol-key-pair: sgzWfEvezFOOi+mQwbZCXWi/06b+l2k+SEY1FZbMqKsjjttu6akf3I5xvlDAo/s88pLZAk3brAKqpwkJawqp2g==
+ worker-key-pair: 9Z/d0Lf1LcwMYKRIy/lRFhCwp0Lx5NI4p6RcrgVOwhydR2FqGN8gOTB/BkIiYCWItSpqrqp7b+jGtNnrqKeHsQ==
+ account-key-pair: AOo/znbuELOmRfswQFEd+rTJzWBY9BkpAU0WRm9eOywq4BB+FmG6xjjQpGNs/bv21foY4nMY2jMCltCjhxgNbIw=
+ network-key-pair: AK+0kF6VUM9GKoIAeCSgVdl1rpNEcMR32d27bSsmTDb60gL1Yotsq+ENWrgyROSyMO/U3MzvxGNYktNenctyJd8=
  db-path: /tmp/foo/
  network-address: ""
  json-rpc-address: "0.0.0.0:1"
@@ -85,9 +87,10 @@ validator_configs:
  grpc-concurrency-limit: 20000000000
  genesis:
  genesis: "[fake genesis]"
- - protocol-key-pair: 4BB+FmG6xjjQpGNs/bv21foY4nMY2jMCltCjhxgNbIzqP8527hCzpkX7MEBRHfq0yc1gWPQZKQFNFkZvXjssKg==
- account-key-pair: AK+0kF6VUM9GKoIAeCSgVdl1rpNEcMR32d27bSsmTDb60gL1Yotsq+ENWrgyROSyMO/U3MzvxGNYktNenctyJd8=
- network-key-pair: AJfn7YQ/qxpCzpwhKUNSHsIqAlaHR8wAO4gfvSf3C9/g9Lcs30s8QZpYQnBLH+55QCOl6uAiOVb7LEcBbhB7hE4=
+ - protocol-key-pair: 9Lcs30s8QZpYQnBLH+55QCOl6uAiOVb7LEcBbhB7hE6X5+2EP6saQs6cISlDUh7CKgJWh0fMADuIH70n9wvf4A==
+ worker-key-pair: kYP0d2s+pZoXgeVko+rpZ2k5e4q0NbJd2kGJ4QPQMc9cR/734xE9wBxW701He/5RV6/DOWmgFPi7VTfhjM7GTA==
+ account-key-pair: AIM52ZwzO7Oid/63gLjUbKwwzc2QUNviNfuMxnuRwbBqnZTXHAccZRpZcVXhUvvQe7WAB32Ak1vyNmNCX/Kl8ak=
+ network-key-pair: AIZBl/TMXKtsjt1LecSF77mlVXGLdbYD4ui5j1XsDeJnpzzqy7X725Nhn+RxRHmPNmU97IGS14ftQFbEczxPAHY=
  db-path: /tmp/foo/
  network-address: ""
  json-rpc-address: "0.0.0.0:1"
@@ -126,9 +129,10 @@ validator_configs:
  grpc-concurrency-limit: 20000000000
  genesis:
  genesis: "[fake genesis]"
- - protocol-key-pair: kYP0d2s+pZoXgeVko+rpZ2k5e4q0NbJd2kGJ4QPQMc9cR/734xE9wBxW701He/5RV6/DOWmgFPi7VTfhjM7GTA==
- account-key-pair: AIM52ZwzO7Oid/63gLjUbKwwzc2QUNviNfuMxnuRwbBqnZTXHAccZRpZcVXhUvvQe7WAB32Ak1vyNmNCX/Kl8ak=
- network-key-pair: AIZBl/TMXKtsjt1LecSF77mlVXGLdbYD4ui5j1XsDeJnpzzqy7X725Nhn+RxRHmPNmU97IGS14ftQFbEczxPAHY=
+ - protocol-key-pair: ZyDgEy8FWgoN24poviNcDhIx9n6fKOuCHqxbHTnJPg+9UN97gnKsq+V1YAwCB2p5S8AIWrDXl7g9SiPgHI58JA==
+ worker-key-pair: EQwhVD8hX7efjIVAYfuALmRyfmPqQ4ebKA5PameIh5D6gqrtUVPSkBC+OW8S2LZhTDl8dcRhP9uzbU/3BOUAqw==
+ account-key-pair: ABbIisgBp4THAoTQX/i9gfBB1+pjLqfKKifGyv/WUZMM+K6cRt6kc+jMcFpq8yJS6MNJtJTF3O/XGG0atPFaJY0=
+ network-key-pair: ADuhDGVL5BRtqz1tq4CzziTON9t8dFwrJTIF1i+WewCzRuBQj94iWraVKHboVHWawvBtJms/9hWcJ38WR6jgPck=
  db-path: /tmp/foo/
  network-address: ""
  json-rpc-address: "0.0.0.0:1"
@@ -167,9 +171,10 @@ validator_configs:
  grpc-concurrency-limit: 20000000000
  genesis:
  genesis: "[fake genesis]"
- - protocol-key-pair: ZyDgEy8FWgoN24poviNcDhIx9n6fKOuCHqxbHTnJPg+9UN97gnKsq+V1YAwCB2p5S8AIWrDXl7g9SiPgHI58JA==
- account-key-pair: APqCqu1RU9KQEL45bxLYtmFMOXx1xGE/27NtT/cE5QCrEQwhVD8hX7efjIVAYfuALmRyfmPqQ4ebKA5PameIh5A=
- network-key-pair: ABbIisgBp4THAoTQX/i9gfBB1+pjLqfKKifGyv/WUZMM+K6cRt6kc+jMcFpq8yJS6MNJtJTF3O/XGG0atPFaJY0=
+ - protocol-key-pair: PfZvwVtLB44RZJaahQ4x3/MIjSqeJ7+3cZ5iHO/Lu9p23j+getiVNaF2azeYdXyKs671vofe4W6eEG3YtQlyng==
+ worker-key-pair: Neqo634LMrcrpZYZ2dT5jOG8wyg5tK6nYrRGYFGa4WGWuKxioRp0flyAuGxPURbmrq5UrHAJctMlA7eSVqFTLw==
+ account-key-pair: AFWsiGMz7Iq6Fa2OHopRFFSgjPy3zXDFjdhCyqBwjRq/a7tE8gojj/hBeXcgQGHOCDL2HfJ2KPJ4Q1ggrXvO/+Y=
+ network-key-pair: ACrfZkZbhZAbp8H6tlUREGwV7kmBjrBaPeWwPzyK71YXJfcI7/BU6ez/pZl1vtJqtInUc598clMt9PH7zXa0JpA=
  db-path: /tmp/foo/
  network-address: ""
  json-rpc-address: "0.0.0.0:1"
@@ -208,9 +213,10 @@ validator_configs:
  grpc-concurrency-limit: 20000000000
  genesis:
  genesis: "[fake genesis]"
- - protocol-key-pair: RuBQj94iWraVKHboVHWawvBtJms/9hWcJ38WR6jgPck7oQxlS+QUbas9bauAs84kzjfbfHRcKyUyBdYvlnsAsw==
- account-key-pair: AHbeP6B62JU1oXZrN5h1fIqzrvW+h97hbp4Qbdi1CXKePfZvwVtLB44RZJaahQ4x3/MIjSqeJ7+3cZ5iHO/Lu9o=
- network-key-pair: AJa4rGKhGnR+XIC4bE9RFuaurlSscAly0yUDt5JWoVMvNeqo634LMrcrpZYZ2dT5jOG8wyg5tK6nYrRGYFGa4WE=
+ - protocol-key-pair: wLPaTXduKbN+3+E0nSv8HiQl8vlvWvap8+WWhpfrxhySbqu6KEzD8Zidc5KCnKQO1lurPtgYY6lq2z5rPf9fpA==
+ worker-key-pair: SmwxHcV2gQzxKoBcs5t39VDlpi6qn4CTFlvWdcQ2bo98EQEujhdX27EEV3Z86OoMCQvPAkniwEgO0RrLK3A7sA==
+ account-key-pair: AIuFbz7FC0IUpvvkfoabM2nORDi5yW4dNjQDEnD/+Pi9LskdaKDI6rfXAXjiEd/Ot3tQDPgwFi2lyCfU68jIPj8=
+ network-key-pair: AHLHlbka4L6NP0NGiea/RxykMn/xJfoBeJqZq8VbQoDmQ9L5PWy1M9rnj1FyqfjKGyV3jMVL8RAzMJw9OdIifHU=
  db-path: /tmp/foo/
  network-address: ""
  json-rpc-address: "0.0.0.0:1"
@@ -249,9 +255,10 @@ validator_configs:
  grpc-concurrency-limit: 20000000000
  genesis:
  genesis: "[fake genesis]"
- - protocol-key-pair: a7tE8gojj/hBeXcgQGHOCDL2HfJ2KPJ4Q1ggrXvO/+ZVrIhjM+yKuhWtjh6KURRUoIz8t81wxY3YQsqgcI0avw==
- account-key-pair: ACrfZkZbhZAbp8H6tlUREGwV7kmBjrBaPeWwPzyK71YXJfcI7/BU6ez/pZl1vtJqtInUc598clMt9PH7zXa0JpA=
- network-key-pair: AJJuq7ooTMPxmJ1zkoKcpA7WW6s+2BhjqWrbPms9/1+kwLPaTXduKbN+3+E0nSv8HiQl8vlvWvap8+WWhpfrxhw=
+ - protocol-key-pair: UzKENORv6NhWOakmfPhCH8ohVHr6Ydy2XxsoQzbtSf7RwP29fVH7wkswAtz/hkGYwp98tdl70TwMB75z9G9NRw==
+ worker-key-pair: zqXFxYQpWyrIZx3ICuKRy6ie+Wm8m95nm9W63uaig36qOKjHsxwR6y1zCu5mSIno9fisAX34MT7/Vna0Cbrs4A==
+ account-key-pair: AN0bN3jLSY/+7Ujz2rArJBe/aA5PpUqd4MeiL6JNiqBkTuESCA04r/Za9cqm5666CpZ6hHuIcdT0QtKnD3S1qNE=
+ network-key-pair: AJW1wJJR/Qv1ZtteKTUFIDo7oHEDpMA4nuvD1dDb+rJnrluAU/PE8mYAzlBmWs/OduYKF1tza4rUOBKiTAneX0s=
  db-path: /tmp/foo/
  network-address: ""
  json-rpc-address: "0.0.0.0:1"
@@ -291,10 +298,9 @@ validator_configs:
  genesis:
  genesis: "[fake genesis]"
 account_keys:
- - SmwxHcV2gQzxKoBcs5t39VDlpi6qn4CTFlvWdcQ2bo98EQEujhdX27EEV3Z86OoMCQvPAkniwEgO0RrLK3A7sA==
- - LskdaKDI6rfXAXjiEd/Ot3tQDPgwFi2lyCfU68jIPj+LhW8+xQtCFKb75H6GmzNpzkQ4ucluHTY0AxJw//j4vQ==
- - Q9L5PWy1M9rnj1FyqfjKGyV3jMVL8RAzMJw9OdIifHVyx5W5GuC+jT9DRonmv0ccpDJ/8SX6AXiamavFW0KA5g==
- - UzKENORv6NhWOakmfPhCH8ohVHr6Ydy2XxsoQzbtSf7RwP29fVH7wkswAtz/hkGYwp98tdl70TwMB75z9G9NRw==
- - zqXFxYQpWyrIZx3ICuKRy6ie+Wm8m95nm9W63uaig36qOKjHsxwR6y1zCu5mSIno9fisAX34MT7/Vna0Cbrs4A==
+ - yIbne+wwgP4d/FJwW9ew24THp3ndohgNYuCyjolSB7FkenjWSH2tsGuc37yf7VtGcAsiwgbeT4MmrSfWJkv72A==
+ - 4SbmUpOLhdu5hStv+P9N7Y0PaQjksjQ4qZ6N65TG3fYH8hVkxLer32Jowa3ene0Lod8xIpaJ/1ai/5vkqnMAYA==
+ - NV3nFIyLRqifiyuDhR71ZWFstfk11FzoI0/boWx6PrODNKZSXLEEg4HNvd7Fjdy2v+pgU07hg/imnQkcuGZvQg==
+ - PvPO23Xcf7+pO4XpJeTSk+HnbBvHomH5eiXZrcP6ED+7yoogulSh/bvgp+PbcaUy+Rrg5RRpihG3aL+mKDCK9g==
+ - QRJXlCdYPZTIW1/5uk1RzO8KRRO+JLxooHkVCJMxGitwxRrVJ0dTYnP2qxhjeFQCyfEIAMJlI5mGhE8E8wXeUA==
 genesis: "[fake genesis]"
-
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
@@ -5,7 +5,9 @@ expression: genesis.narwhal_worker_cache()
 workers:
  ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=:
  0:
+ name: ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=
  transactions: ""
  worker_to_worker: ""
  primary_to_worker: ""
 epoch: 0
+
diff --git a/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches.snap b/crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches.snap
@@ -5,6 +5,7 @@ expression: genesis.validator_set()
 - name: "0"
  account-key: ALnG7hYw7z5xEUSmSNsGu7IoT3J0z77lP/zuUDzBpJIA
  protocol-key: ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=
+ worker-key: ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=
  network-key: ALnG7hYw7z5xEUSmSNsGu7IoT3J0z77lP/zuUDzBpJIA
  stake: 1
  delegation: 0
@@ -15,4 +16,3 @@ expression: genesis.validator_set()
  narwhal-primary-to-worker: ""
  narwhal-worker-to-worker: ""
  narwhal-consensus-address: ""
-