refactor(consensus): Deprecate attesters and prepare for validator committee rotation in ZKStack CLI (#3845)

## What ❔

Continuation of #3775. It refactors the current consensus CLI commands
to set/get the validator committee instead of the attester committee.
Attesters are being deprecated. Commands will work with current
ConsensusRegistry contract but don't have any functionality. It will
made to work in a future PR after matter-labs/era-contracts#1365 is
merged.

Part of PLA-1112 and PLA-1113

## Is this a breaking change?
- [X] Yes
- [ ] No

## Operational changes

Any chains that currently use attester commands in any capacity need to
stop using them. Should be trivial as attesters were never used in any
critical capacity.

## Checklist

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [x] Tests for the changes have been added / updated.
- [x] Documentation comments have been added / updated.
- [x] Code has been formatted via `zkstack dev fmt` and `zkstack dev
lint`.

Author: brunoffranca

core/lib/mini_merkle_tree/src/tests.rs

@@ -41,7 +41,7 @@ fn hash_of_empty_tree_with_single_item() {
 fn hash_of_large_empty_tree_with_multiple_items() {
     for len in [50, 64, 100, 128, 256, 512, 1_000, 1_024] {
         println!("checking tree with {len} items");
-        let leaves = iter::repeat([0_u8; 88]).take(len);
+        let leaves = std::iter::repeat_n([0_u8; 88], len);
         let tree_size = len.next_power_of_two();
 
         let tree = MiniMerkleTree::new(leaves.clone(), Some(tree_size));
@@ -375,7 +375,7 @@ fn pushing_new_leaves() {
 
 #[test]
 fn trim_all_and_grow() {
-    let mut tree = MiniMerkleTree::new(iter::repeat([1; 88]).take(4), None);
+    let mut tree = MiniMerkleTree::new(std::iter::repeat_n([1; 88], 4), None);
     tree.trim_start(4);
     tree.push([1; 88]);
     let expected_root = "0xfa4c924185122254742622b10b68df8de89d33f685ee579f37a50c552b0d245d"
@@ -387,13 +387,13 @@ fn trim_all_and_grow() {
 #[test]
 fn trim_all_and_check_root() {
     for len in 1..=50 {
-        let mut tree = MiniMerkleTree::new(iter::repeat([1; 88]).take(len), None);
+        let mut tree = MiniMerkleTree::new(std::iter::repeat_n([1; 88], len), None);
         let root = tree.merkle_root();
         tree.trim_start(len);
         assert_eq!(tree.merkle_root(), root);
 
         let mut tree = MiniMerkleTree::new(
-            iter::repeat([1; 88]).take(len),
+            std::iter::repeat_n([1; 88], len),
             Some(len.next_power_of_two() * 2),
         );
         let root = tree.merkle_root();

core/lib/multivm/src/versions/testonly/get_used_contracts.rs

@@ -1,5 +1,3 @@
-use std::iter;
-
 use assert_matches::assert_matches;
 use ethabi::Token;
 use zk_evm_1_3_1::zkevm_opcode_defs::decoding::{EncodingModeProduction, VmEncodingMode};
@@ -86,9 +84,7 @@ pub(crate) fn test_get_used_contracts<VM: TestedVm>() {
 fn inflated_counter_bytecode() -> Vec<u8> {
     let mut counter_bytecode = TestContract::counter().bytecode.to_vec();
     counter_bytecode.extend(
-        iter::repeat(EncodingModeProduction::nop_encoding().to_be_bytes())
-            .take(10_000)
-            .flatten(),
+        std::iter::repeat_n(EncodingModeProduction::nop_encoding().to_be_bytes(), 10_000).flatten(),
     );
     counter_bytecode
 }

core/node/api_server/src/testonly.rs

@@ -1,6 +1,6 @@
 //! Test utils shared among multiple modules.
 
-use std::{collections::HashMap, iter};
+use std::collections::HashMap;
 
 use assert_matches::assert_matches;
 use zk_evm_1_5_0::zkevm_opcode_defs::decoding::{EncodingModeProduction, VmEncodingMode};
@@ -55,9 +55,11 @@ const MULTICALL3_CONTRACT_PATH: &str =
 /// Inflates the provided bytecode by appending the specified amount of NOP instructions at the end.
 fn inflate_bytecode(bytecode: &mut Vec<u8>, nop_count: usize) {
     bytecode.extend(
-        iter::repeat(EncodingModeProduction::nop_encoding().to_be_bytes())
-            .take(nop_count)
-            .flatten(),
+        std::iter::repeat_n(
+            EncodingModeProduction::nop_encoding().to_be_bytes(),
+            nop_count,
+        )
+        .flatten(),
     );
 }
 

core/node/node_sync/src/tree_data_fetcher/provider/tests.rs

@@ -157,9 +157,8 @@ impl EthereumParameters {
 
         let l1_block_number = U64::from(l1_block_number);
         let last_commit = self.batches_and_sl_blocks_for_commits.last().copied();
-        let is_increasing = last_commit.map_or(true, |last| {
-            last.0 <= l1_batch_number && last.1 <= l1_block_number
-        });
+        let is_increasing =
+            last_commit.is_none_or(|last| last.0 <= l1_batch_number && last.1 <= l1_block_number);
         assert!(
             is_increasing,
             "Invalid batch number or L1 block number for commit"

zkstack_cli/Cargo.lock

@@ -28,3 +28,5 @@ zksync_basic_types.workspace = true
 zksync_system_constants.workspace = true
 zkstack_cli_common.workspace = true
 zkstack_cli_types.workspace = true
+zksync_consensus_roles.workspace = true
+zksync_consensus_crypto.workspace = true

zkstack_cli/crates/config/Cargo.toml

@@ -20,7 +20,6 @@ impl Weighted {
 pub struct ConsensusGenesisSpecs {
     pub chain_id: L2ChainId,
     pub validators: Vec<Weighted>,
-    pub attesters: Vec<Weighted>,
     pub leader: String,
 }
 

zkstack_cli/crates/config/src/consensus.rs

@@ -189,11 +189,9 @@ impl GeneralConfigPatch {
         self.0
             .insert("consensus.genesis_spec.chain_id", specs.chain_id.as_u64())?;
         self.0
-            .insert("consensus.genesis_spec.protocol_version", 1_u64)?;
+            .insert("consensus.genesis_spec.protocol_version", 1u64)?;
         self.0
             .insert_yaml("consensus.genesis_spec.validators", specs.validators)?;
-        self.0
-            .insert_yaml("consensus.genesis_spec.attesters", specs.attesters)?;
         self.0
             .insert("consensus.genesis_spec.leader", specs.leader)?;
         Ok(())

zkstack_cli/crates/config/src/general.rs

@@ -3,6 +3,8 @@ use std::path::PathBuf;
 use url::Url;
 use xshell::Shell;
 use zkstack_cli_common::db::DatabaseConfig;
+use zksync_consensus_crypto::TextFmt;
+use zksync_consensus_roles::{node, validator};
 
 use crate::{
     da::AvailSecrets,
@@ -11,9 +13,24 @@ use crate::{
 
 #[derive(Debug)]
 pub struct RawConsensusKeys {
-    pub validator: String,
-    pub attester: String,
-    pub node: String,
+    pub validator_public: String,
+    pub node_public: String,
+    pub validator_secret: String,
+    pub node_secret: String,
+}
+
+impl RawConsensusKeys {
+    pub fn generate() -> Self {
+        let validator = validator::SecretKey::generate();
+        let node = node::SecretKey::generate();
+
+        Self {
+            validator_public: validator.public().encode(),
+            node_public: node.public().encode(),
+            validator_secret: validator.encode(),
+            node_secret: node.encode(),
+        }
+    }
 }
 
 #[derive(Debug)]
@@ -82,10 +99,9 @@ impl SecretsConfigPatch {
 
     pub fn set_consensus_keys(&mut self, consensus_keys: RawConsensusKeys) -> anyhow::Result<()> {
         self.0
-            .insert("consensus.validator_key", consensus_keys.validator)?;
+            .insert("consensus.validator_key", consensus_keys.validator_secret)?;
         self.0
-            .insert("consensus.attester_key", consensus_keys.attester)?;
-        self.0.insert("consensus.node_key", consensus_keys.node)
+            .insert("consensus.node_key", consensus_keys.node_secret)
     }
 
     pub fn set_consensus_node_key(&mut self, raw_key: &str) -> anyhow::Result<()> {

zkstack_cli/crates/config/src/secrets.rs

@@ -21,8 +21,8 @@ This document contains the help content for the `zk_inception` command-line prog
 - [`zk_inception chain deploy-multicall3`↴](#zk_inception-chain-deploy-multicall3)
 - [`zk_inception chain deploy-paymaster`↴](#zk_inception-chain-deploy-paymaster)
 - [`zk_inception chain update-token-multiplier-setter`↴](#zk_inception-chain-update-token-multiplier-setter)
-- [`zk_inception consensus set-attester-committee`↴](#zk_inception-consensus-set-attester-committee)
-- [`zk_inception consensus get-attester-committee`↴](#zk_inception-consensus-get-attester-committee)
+- [`zk_inception consensus set-validator-committee`↴](#zk_inception-consensus-set-validator-committee)
+- [`zk_inception consensus get-validator-committee`↴](#zk_inception-consensus-get-validator-committee)
 - [`zk_inception prover`↴](#zk_inception-prover)
 - [`zk_inception prover init`↴](#zk_inception-prover-init)
 - [`zk_inception prover setup-keys`↴](#zk_inception-prover-setup-keys)
@@ -438,37 +438,37 @@ Consensus related commands
 
 ###### **Subcommands:**
 
-- `set-attester-committee` — Set attester committee
-- `get-attester-committee` — Get attester committee
+- `set-validator-committee` — Set validator committee
+- `get-validator-committee` — Get validator committee
 
-## `zk_inception consensus set-attester-committee`
+## `zk_inception consensus set-validator-committee`
 
-Set attester committee in the consensus registry smart contract. Requires `consensus_registry` and `multicall3`
+Set validator committee in the consensus registry smart contract. Requires `consensus_registry` and `multicall3`
 contracts to be deployed.
 
-**Usage:** `zk_inception consensus set-attester-committee [OPTIONS]`
+**Usage:** `zk_inception consensus set-validator-committee [OPTIONS]`
 
 ###### **Options:**
 
-- `--from-genesis` — Set attester committee to `consensus.genesis_spec.attesters` in general.yaml Mutually exclusive
-  with `--from-file`.
-- `--from-file <PATH>` — Set attester committee to committee specified in yaml file at `PATH`. Mutually exclusive with
-  `--from-genesis`. File format is specified in `zk_inception/src/commands/consensus/proto/mod.proto`. Example:
+- `--from-file <PATH>` — Set validator committee to committee specified in yaml file at `PATH`. File format is as in
+  this example:
 
   ```yaml
-  attesters:
-    - key: attester:public:secp256k1:0339d4b0cdd9896d3929631a4e5e9a5b4919f52592bec571d70bb0e50a3a824714
-      weight: 1
-    - key: attester:public:secp256k1:024897d8c10d7a57d108cfe2a724d7824c657f219ef5d9f7674810a6746c19fa7b
+  validators:
+    - key: validator:public:bls12_381:????
+      pop: validator:pop:bls12_381:????
+      weight: 3
+    - key: validator:public:bls12_381:????
+      pop: validator:pop:bls12_381:????
       weight: 1
   ```
 
-## `zk_inception consensus get-attester-committee`
+## `zk_inception consensus get-validator-committee`
 
-Requires `consensus_registry` and `multicall3` contracts to be deployed. Fetches attester committee from the consensus
+Requires `consensus_registry` and `multicall3` contracts to be deployed. Fetches validator committee from the consensus
 registry contract and prints it.
 
-**Usage:** `zk_inception consensus get-attester-committee`
+**Usage:** `zk_inception consensus get-validator-committee`
 
 ## `zk_inception prover`