chore: update narwhal pointer (#4628)

crates/sui-benchmark/Cargo.toml

@@ -41,7 +41,7 @@ sui-node = { path = "../sui-node" }
 sui-json-rpc-types = { path = "../sui-json-rpc-types" }
 
 move-core-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e", features = ["address20"] }
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "node" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "node" }
 workspace-hack = { path = "../workspace-hack"}
 test-utils = { path = "../test-utils" }
 

crates/sui-config/Cargo.toml

@@ -25,8 +25,8 @@ move-binary-format = { git = "https://github.com/move-language/move", rev = "e1e
 move-package = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
 move-core-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e", features = ["address20"] }
 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "config" }
-narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "crypto" }
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "config" }
+narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "aaa8a56efb5917e6b003285abe2a9a079ae90290", package = "crypto" }
 
 sui-framework = { path = "../sui-framework" }
 sui-adapter = { path = "../sui-adapter" }

crates/sui-config/src/builder.rs

@@ -123,16 +123,19 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
                             get_key_pair_from_rng::<AccountKeyPair, _>(&mut rng)
                                 .1
                                 .into(),
-                            get_key_pair_from_rng::<AccountKeyPair, _>(&mut rng)
-                                .1
-                                .into(),
+                            get_key_pair_from_rng(&mut rng).1,
                         ),
                     )
                 })
                 .map(
                     |(i, (key_pair, worker_key_pair, account_key_pair, network_key_pair)): (
                         _,
-                        (AuthorityKeyPair, AuthorityKeyPair, SuiKeyPair, SuiKeyPair),
+                        (
+                            AuthorityKeyPair,
+                            AuthorityKeyPair,
+                            SuiKeyPair,
+                            AuthorityKeyPair,
+                        ),
                     )| {
                         self.build_validator(
                             i,
@@ -156,7 +159,7 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
         key_pair: AuthorityKeyPair,
         worker_key_pair: AuthorityKeyPair,
         account_key_pair: SuiKeyPair,
-        network_key_pair: SuiKeyPair,
+        network_key_pair: AuthorityKeyPair,
     ) -> ValidatorGenesisInfo {
         match self.validator_ip_sel {
             ValidatorIpSelection::Localhost => ValidatorGenesisInfo::from_localhost_for_testing(
@@ -199,7 +202,8 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
                 let protocol_key: AuthorityPublicKeyBytes = validator.key_pair.public().into();
                 let worker_key: AuthorityPublicKeyBytes = validator.worker_key_pair.public().into();
                 let account_key: PublicKey = validator.account_key_pair.public();
-                let network_key: PublicKey = validator.network_key_pair.public();
+                let network_key: AuthorityPublicKeyBytes =
+                    validator.network_key_pair.public().into();
                 let stake = validator.stake;
                 let network_address = validator.network_address.clone();
                 let pop = generate_proof_of_possession(
@@ -218,10 +222,8 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
                         delegation: 0, // no delegation yet at genesis
                         gas_price: validator.gas_price,
                         network_address,
-                        narwhal_primary_to_primary: validator.narwhal_primary_to_primary.clone(),
-                        narwhal_worker_to_primary: validator.narwhal_worker_to_primary.clone(),
-                        narwhal_primary_to_worker: validator.narwhal_primary_to_worker.clone(),
-                        narwhal_worker_to_worker: validator.narwhal_worker_to_worker.clone(),
+                        narwhal_primary_address: validator.narwhal_primary_address.clone(),
+                        narwhal_worker_address: validator.narwhal_worker_address.clone(),
                         narwhal_consensus_address: validator.narwhal_consensus_address.clone(),
                     },
                     pop,

crates/sui-config/src/genesis.rs

@@ -73,13 +73,14 @@ impl Genesis {
                 // construct narwhal Committee struct.
                 let name = narwhal_crypto::PublicKey::from_bytes(validator.protocol_key().as_ref())
                     .expect("Can't get narwhal public key");
-                let primary = narwhal_config::PrimaryAddresses {
-                    primary_to_primary: validator.narwhal_primary_to_primary.clone(),
-                    worker_to_primary: validator.narwhal_worker_to_primary.clone(),
-                };
+                let network_key =
+                    narwhal_crypto::NetworkPublicKey::from_bytes(validator.network_key().as_ref())
+                        .expect("Can't get narwhal public key");
+                let primary_address = validator.narwhal_primary_address.clone();
                 let authority = narwhal_config::Authority {
                     stake: validator.stake as narwhal_config::Stake, //TODO this should at least be the same size integer
-                    primary,
+                    primary_address,
+                    network_key,
                 };
 
                 (name, authority)
@@ -105,9 +106,8 @@ impl Genesis {
                             .worker_key()
                             .try_into()
                             .expect("Can't get narwhal worker public key"),
-                        primary_to_worker: validator.narwhal_primary_to_worker.clone(),
                         transactions: validator.narwhal_consensus_address.clone(),
-                        worker_to_worker: validator.narwhal_worker_to_worker.clone(),
+                        worker_address: validator.narwhal_worker_address.clone(),
                     },
                 )]
                 .into_iter()
@@ -621,21 +621,19 @@ mod test {
         let key: AuthorityKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
         let worker_key: AuthorityKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
         let account_key: AccountKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
-        let network_key: AccountKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
+        let network_key: AuthorityKeyPair = get_key_pair_from_rng(&mut rand::rngs::OsRng).1;
         let validator = ValidatorInfo {
             name: "0".into(),
             protocol_key: key.public().into(),
             worker_key: worker_key.public().into(),
             account_key: account_key.public().clone().into(),
-            network_key: network_key.public().clone().into(),
+            network_key: network_key.public().into(),
             stake: 1,
             delegation: 0,
             gas_price: 1,
             network_address: utils::new_network_address(),
-            narwhal_primary_to_primary: utils::new_network_address(),
-            narwhal_worker_to_primary: utils::new_network_address(),
-            narwhal_primary_to_worker: utils::new_network_address(),
-            narwhal_worker_to_worker: utils::new_network_address(),
+            narwhal_primary_address: utils::new_network_address(),
+            narwhal_worker_address: utils::new_network_address(),
             narwhal_consensus_address: utils::new_network_address(),
         };
         let pop = generate_proof_of_possession(&key, account_key.public().into());

crates/sui-config/src/genesis_config.rs

@@ -93,14 +93,13 @@ pub struct ValidatorGenesisInfo {
     #[serde_as(as = "KeyPairBase64")]
     pub worker_key_pair: AuthorityKeyPair,
     pub account_key_pair: SuiKeyPair,
-    pub network_key_pair: SuiKeyPair,
+    #[serde_as(as = "KeyPairBase64")]
+    pub network_key_pair: AuthorityKeyPair,
     pub network_address: Multiaddr,
     pub stake: StakeUnit,
     pub gas_price: u64,
-    pub narwhal_primary_to_primary: Multiaddr,
-    pub narwhal_worker_to_primary: Multiaddr,
-    pub narwhal_primary_to_worker: Multiaddr,
-    pub narwhal_worker_to_worker: Multiaddr,
+    pub narwhal_primary_address: Multiaddr,
+    pub narwhal_worker_address: Multiaddr,
     pub narwhal_consensus_address: Multiaddr,
 }
 
@@ -109,7 +108,7 @@ impl ValidatorGenesisInfo {
         key_pair: AuthorityKeyPair,
         worker_key_pair: AuthorityKeyPair,
         account_key_pair: SuiKeyPair,
-        network_key_pair: SuiKeyPair,
+        network_key_pair: AuthorityKeyPair,
     ) -> Self {
         Self {
             key_pair,
@@ -119,10 +118,8 @@ impl ValidatorGenesisInfo {
             network_address: utils::new_network_address(),
             stake: DEFAULT_STAKE,
             gas_price: DEFAULT_GAS_PRICE,
-            narwhal_primary_to_primary: utils::new_network_address(),
-            narwhal_worker_to_primary: utils::new_network_address(),
-            narwhal_primary_to_worker: utils::new_network_address(),
-            narwhal_worker_to_worker: utils::new_network_address(),
+            narwhal_primary_address: utils::new_network_address(),
+            narwhal_worker_address: utils::new_network_address(),
             narwhal_consensus_address: utils::new_network_address(),
         }
     }
@@ -131,7 +128,7 @@ impl ValidatorGenesisInfo {
         key_pair: AuthorityKeyPair,
         worker_key_pair: AuthorityKeyPair,
         account_key_pair: SuiKeyPair,
-        network_key_pair: SuiKeyPair,
+        network_key_pair: AuthorityKeyPair,
         ip: String,
         // Port offset allows running many SuiNodes inside the same simulator node, which is
         // helpful for tests that don't use Swarm.
@@ -150,11 +147,9 @@ impl ValidatorGenesisInfo {
             network_address: make_addr(1000 + port_offset),
             stake: DEFAULT_STAKE,
             gas_price: DEFAULT_GAS_PRICE,
-            narwhal_primary_to_primary: make_addr(2000 + port_offset),
-            narwhal_worker_to_primary: make_addr(3000 + port_offset),
-            narwhal_primary_to_worker: make_addr(4000 + port_offset),
-            narwhal_worker_to_worker: make_addr(5000 + port_offset),
-            narwhal_consensus_address: make_addr(6000 + port_offset),
+            narwhal_primary_address: make_addr(2000 + port_offset),
+            narwhal_worker_address: make_addr(3000 + port_offset),
+            narwhal_consensus_address: make_addr(4000 + port_offset),
         }
     }
 }

crates/sui-config/src/node.rs

@@ -40,8 +40,9 @@ pub struct NodeConfig {
     /// The keypair that the authority uses to receive payments
     #[serde(default = "default_sui_key_pair")]
     pub account_key_pair: Arc<SuiKeyPair>,
-    #[serde(default = "default_sui_key_pair")]
-    pub network_key_pair: Arc<SuiKeyPair>,
+    #[serde(default = "default_key_pair")]
+    #[serde_as(as = "Arc<KeyPairBase64>")]
+    pub network_key_pair: Arc<AuthorityKeyPair>,
     pub db_path: PathBuf,
     #[serde(default = "default_grpc_address")]
     pub network_address: Multiaddr,
@@ -193,17 +194,15 @@ pub struct ValidatorInfo {
     pub account_key: AccountsPublicKey,
     pub protocol_key: AuthorityPublicKeyBytes,
     pub worker_key: AuthorityPublicKeyBytes,
-    pub network_key: AccountsPublicKey,
+    pub network_key: AuthorityPublicKeyBytes,
     pub stake: StakeUnit,
     pub delegation: StakeUnit,
     pub gas_price: u64,
     pub network_address: Multiaddr,
-    pub narwhal_primary_to_primary: Multiaddr,
+    pub narwhal_primary_address: Multiaddr,
 
     //TODO remove all of these as they shouldn't be needed to be encoded in genesis
-    pub narwhal_worker_to_primary: Multiaddr,
-    pub narwhal_primary_to_worker: Multiaddr,
-    pub narwhal_worker_to_worker: Multiaddr,
+    pub narwhal_worker_address: Multiaddr,
     pub narwhal_consensus_address: Multiaddr,
 }
 
@@ -224,8 +223,8 @@ impl ValidatorInfo {
         self.worker_key
     }
 
-    pub fn network_key(&self) -> &AccountsPublicKey {
-        &self.network_key
+    pub fn network_key(&self) -> AuthorityPublicKeyBytes {
+        self.network_key
     }
 
     pub fn account_key(&self) -> &AccountsPublicKey {

crates/sui-config/src/swarm.rs

@@ -76,11 +76,7 @@ impl NetworkConfig {
                 .1
                 .into(),
         );
-        let network_key_pair: Arc<SuiKeyPair> = Arc::new(
-            get_key_pair_from_rng::<AccountKeyPair, _>(&mut OsRng)
-                .1
-                .into(),
-        );
+        let network_key_pair: Arc<AuthorityKeyPair> = Arc::new(get_key_pair_from_rng(&mut OsRng).1);
         let validator_config = &self.validator_configs[0];
 
         let mut db_path = validator_config.db_path.clone();

crates/sui-config/tests/snapshot_tests.rs

@@ -72,15 +72,13 @@ fn populated_genesis_snapshot_matches() {
         protocol_key: key.public().into(),
         worker_key: worker_key.public().into(),
         account_key: account_key.public().clone().into(),
-        network_key: network_key.public().clone().into(),
+        network_key: network_key.public().into(),
         stake: 1,
         delegation: 0,
         gas_price: 1,
         network_address: Multiaddr::empty(),
-        narwhal_primary_to_primary: Multiaddr::empty(),
-        narwhal_worker_to_primary: Multiaddr::empty(),
-        narwhal_primary_to_worker: Multiaddr::empty(),
-        narwhal_worker_to_worker: Multiaddr::empty(),
+        narwhal_primary_address: Multiaddr::empty(),
+        narwhal_worker_address: Multiaddr::empty(),
         narwhal_consensus_address: Multiaddr::empty(),
     };
     let pop = generate_proof_of_possession(&key, account_key.public().into());

crates/sui-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap

@@ -6,7 +6,7 @@ validator_configs:
   - protocol-key-pair: m/SaagdV+VOBH84SXyaD1QQpw7tJ4HQUfgCJpS6uFV+5xu4WMO8+cRFEpkjbBruyKE9ydM++5T/87lA8waSSAA==
     worker-key-pair: BWT4edJ648As6Cg0rPqMeTpinyyg3mkZYQvoL0ETJr6u8/SkuOyh38NDNhv45Da9Qt6SWcBLgxTrjiBU3W6Cqw==
     account-key-pair: AIpXYuIawc2zhwRCx3tMOvWMfO24d50CcObU8eL3Nn10C9WIQSA+dP6G/HEzjOAXPcYo67cZvcvMFRWFIUzAibQ=
-    network-key-pair: AMxiMy40uy1c1p9g77sqNsuRbH60WDAeo2Y2xNuwEr2IQiWNzaFM8RHGAriXG4zIQ+keRsqQUVHAJ0SmsBfmkxY=
+    network-key-pair: QiWNzaFM8RHGAriXG4zIQ+keRsqQUVHAJ0SmsBfmkxbMYjMuNLstXNafYO+7KjbLkWx+tFgwHqNmNsTbsBK9iA==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -48,7 +48,7 @@ validator_configs:
   - protocol-key-pair: sgzWfEvezFOOi+mQwbZCXWi/06b+l2k+SEY1FZbMqKsjjttu6akf3I5xvlDAo/s88pLZAk3brAKqpwkJawqp2g==
     worker-key-pair: 9Z/d0Lf1LcwMYKRIy/lRFhCwp0Lx5NI4p6RcrgVOwhydR2FqGN8gOTB/BkIiYCWItSpqrqp7b+jGtNnrqKeHsQ==
     account-key-pair: AOo/znbuELOmRfswQFEd+rTJzWBY9BkpAU0WRm9eOywq4BB+FmG6xjjQpGNs/bv21foY4nMY2jMCltCjhxgNbIw=
-    network-key-pair: AK+0kF6VUM9GKoIAeCSgVdl1rpNEcMR32d27bSsmTDb60gL1Yotsq+ENWrgyROSyMO/U3MzvxGNYktNenctyJd8=
+    network-key-pair: 0gL1Yotsq+ENWrgyROSyMO/U3MzvxGNYktNenctyJd+vtJBelVDPRiqCAHgkoFXZda6TRHDEd9ndu20rJkw2+g==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -90,7 +90,7 @@ validator_configs:
   - protocol-key-pair: 9Lcs30s8QZpYQnBLH+55QCOl6uAiOVb7LEcBbhB7hE6X5+2EP6saQs6cISlDUh7CKgJWh0fMADuIH70n9wvf4A==
     worker-key-pair: kYP0d2s+pZoXgeVko+rpZ2k5e4q0NbJd2kGJ4QPQMc9cR/734xE9wBxW701He/5RV6/DOWmgFPi7VTfhjM7GTA==
     account-key-pair: AIM52ZwzO7Oid/63gLjUbKwwzc2QUNviNfuMxnuRwbBqnZTXHAccZRpZcVXhUvvQe7WAB32Ak1vyNmNCX/Kl8ak=
-    network-key-pair: AIZBl/TMXKtsjt1LecSF77mlVXGLdbYD4ui5j1XsDeJnpzzqy7X725Nhn+RxRHmPNmU97IGS14ftQFbEczxPAHY=
+    network-key-pair: pzzqy7X725Nhn+RxRHmPNmU97IGS14ftQFbEczxPAHaGQZf0zFyrbI7dS3nEhe+5pVVxi3W2A+LouY9V7A3iZw==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -132,7 +132,7 @@ validator_configs:
   - protocol-key-pair: ZyDgEy8FWgoN24poviNcDhIx9n6fKOuCHqxbHTnJPg+9UN97gnKsq+V1YAwCB2p5S8AIWrDXl7g9SiPgHI58JA==
     worker-key-pair: EQwhVD8hX7efjIVAYfuALmRyfmPqQ4ebKA5PameIh5D6gqrtUVPSkBC+OW8S2LZhTDl8dcRhP9uzbU/3BOUAqw==
     account-key-pair: ABbIisgBp4THAoTQX/i9gfBB1+pjLqfKKifGyv/WUZMM+K6cRt6kc+jMcFpq8yJS6MNJtJTF3O/XGG0atPFaJY0=
-    network-key-pair: ADuhDGVL5BRtqz1tq4CzziTON9t8dFwrJTIF1i+WewCzRuBQj94iWraVKHboVHWawvBtJms/9hWcJ38WR6jgPck=
+    network-key-pair: RuBQj94iWraVKHboVHWawvBtJms/9hWcJ38WR6jgPck7oQxlS+QUbas9bauAs84kzjfbfHRcKyUyBdYvlnsAsw==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -174,7 +174,7 @@ validator_configs:
   - protocol-key-pair: PfZvwVtLB44RZJaahQ4x3/MIjSqeJ7+3cZ5iHO/Lu9p23j+getiVNaF2azeYdXyKs671vofe4W6eEG3YtQlyng==
     worker-key-pair: Neqo634LMrcrpZYZ2dT5jOG8wyg5tK6nYrRGYFGa4WGWuKxioRp0flyAuGxPURbmrq5UrHAJctMlA7eSVqFTLw==
     account-key-pair: AFWsiGMz7Iq6Fa2OHopRFFSgjPy3zXDFjdhCyqBwjRq/a7tE8gojj/hBeXcgQGHOCDL2HfJ2KPJ4Q1ggrXvO/+Y=
-    network-key-pair: ACrfZkZbhZAbp8H6tlUREGwV7kmBjrBaPeWwPzyK71YXJfcI7/BU6ez/pZl1vtJqtInUc598clMt9PH7zXa0JpA=
+    network-key-pair: JfcI7/BU6ez/pZl1vtJqtInUc598clMt9PH7zXa0JpAq32ZGW4WQG6fB+rZVERBsFe5JgY6wWj3lsD88iu9WFw==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -216,7 +216,7 @@ validator_configs:
   - protocol-key-pair: wLPaTXduKbN+3+E0nSv8HiQl8vlvWvap8+WWhpfrxhySbqu6KEzD8Zidc5KCnKQO1lurPtgYY6lq2z5rPf9fpA==
     worker-key-pair: SmwxHcV2gQzxKoBcs5t39VDlpi6qn4CTFlvWdcQ2bo98EQEujhdX27EEV3Z86OoMCQvPAkniwEgO0RrLK3A7sA==
     account-key-pair: AIuFbz7FC0IUpvvkfoabM2nORDi5yW4dNjQDEnD/+Pi9LskdaKDI6rfXAXjiEd/Ot3tQDPgwFi2lyCfU68jIPj8=
-    network-key-pair: AHLHlbka4L6NP0NGiea/RxykMn/xJfoBeJqZq8VbQoDmQ9L5PWy1M9rnj1FyqfjKGyV3jMVL8RAzMJw9OdIifHU=
+    network-key-pair: Q9L5PWy1M9rnj1FyqfjKGyV3jMVL8RAzMJw9OdIifHVyx5W5GuC+jT9DRonmv0ccpDJ/8SX6AXiamavFW0KA5g==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
@@ -258,7 +258,7 @@ validator_configs:
   - protocol-key-pair: UzKENORv6NhWOakmfPhCH8ohVHr6Ydy2XxsoQzbtSf7RwP29fVH7wkswAtz/hkGYwp98tdl70TwMB75z9G9NRw==
     worker-key-pair: zqXFxYQpWyrIZx3ICuKRy6ie+Wm8m95nm9W63uaig36qOKjHsxwR6y1zCu5mSIno9fisAX34MT7/Vna0Cbrs4A==
     account-key-pair: AN0bN3jLSY/+7Ujz2rArJBe/aA5PpUqd4MeiL6JNiqBkTuESCA04r/Za9cqm5666CpZ6hHuIcdT0QtKnD3S1qNE=
-    network-key-pair: AJW1wJJR/Qv1ZtteKTUFIDo7oHEDpMA4nuvD1dDb+rJnrluAU/PE8mYAzlBmWs/OduYKF1tza4rUOBKiTAneX0s=
+    network-key-pair: rluAU/PE8mYAzlBmWs/OduYKF1tza4rUOBKiTAneX0uVtcCSUf0L9WbbXik1BSA6O6BxA6TAOJ7rw9XQ2/qyZw==
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"

crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-3.snap

@@ -5,7 +5,7 @@ expression: genesis.narwhal_committee()
 authorities:
   ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=:
     stake: 1
-    primary:
-      primary_to_primary: ""
-      worker_to_primary: ""
+    primary_address: ""
+    network_key: ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=
 epoch: 0
+

crates/sui-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-4.snap

@@ -7,7 +7,6 @@ workers:
     0:
       name: ucbuFjDvPnERRKZI2wa7sihPcnTPvuU//O5QPMGkkgA=
       transactions: ""
-      worker_to_worker: ""
-      primary_to_worker: ""
+      worker_address: ""
 epoch: 0