feat(configs): Add port parameter to ConsensusConfig

core/lib/config/src/configs/consensus.rs

@@ -115,12 +115,13 @@ impl RpcConfig {
 /// Config (shared between main node and external node).
 #[derive(Clone, Debug, PartialEq)]
 pub struct ConsensusConfig {
+    pub port: u16,
     /// Local socket address to listen for the incoming connections.
-    pub server_addr: std::net::SocketAddr,
+    pub server_url: std::net::SocketAddr,
     /// Public address of this node (should forward to `server_addr`)
     /// that will be advertised to peers, so that they can connect to this
     /// node.
-    pub public_addr: Host,
+    pub public_url: Host,
 
     /// Maximal allowed size of the payload in bytes.
     pub max_payload_size: usize,

core/lib/config/src/testonly.rs

@@ -799,8 +799,9 @@ impl Distribution<configs::consensus::ConsensusConfig> for EncodeDist {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::consensus::ConsensusConfig {
         use configs::consensus::{ConsensusConfig, Host, NodePublicKey};
         ConsensusConfig {
-            server_addr: self.sample(rng),
-            public_addr: Host(self.sample(rng)),
+            port: self.sample(rng),
+            server_url: self.sample(rng),
+            public_url: Host(self.sample(rng)),
             max_payload_size: self.sample(rng),
             max_batch_size: self.sample(rng),
             gossip_dynamic_inbound_limit: self.sample(rng),

core/lib/protobuf_config/src/consensus.rs

@@ -147,11 +147,26 @@ impl ProtoRepr for proto::Config {
             }
         };
 
-        Ok(Self::Type {
-            server_addr: required(&self.server_addr)
+        let server_url = match &self.server_url {
+            Some(x) => x.parse().context("server_url")?,
+            None => required(&self.server_addr)
                 .and_then(|x| Ok(x.parse()?))
-                .context("server_addr")?,
-            public_addr: Host(required(&self.public_addr).context("public_addr")?.clone()),
+                .context("server_url")?,
+        };
+
+        let public_url = match &self.public_url {
+            Some(x) => Host(x.clone()),
+            None => required(&self.public_addr)
+                .and_then(|x| Ok(Host(x.clone())))
+                .context("public_url")?,
+        };
+
+        Ok(Self::Type {
+            port: required(&self.port)
+                .and_then(|x| Ok((*x).try_into()?))
+                .context("port")?,
+            server_url,
+            public_url,
             max_payload_size,
             max_batch_size,
             gossip_dynamic_inbound_limit: required(&self.gossip_dynamic_inbound_limit)
@@ -182,8 +197,11 @@ impl ProtoRepr for proto::Config {
 
     fn build(this: &Self::Type) -> Self {
         Self {
-            server_addr: Some(this.server_addr.to_string()),
-            public_addr: Some(this.public_addr.0.clone()),
+            port: Some(this.port.into()),
+            server_url: Some(this.server_url.to_string()),
+            public_url: Some(this.public_url.0.clone()),
+            server_addr: None,
+            public_addr: None,
             max_payload_size: Some(this.max_payload_size.try_into().unwrap()),
             max_batch_size: Some(this.max_batch_size.try_into().unwrap()),
             gossip_dynamic_inbound_limit: Some(

core/lib/protobuf_config/src/proto/core/consensus.proto

@@ -70,13 +70,22 @@ message Config {
   reserved 3;
   reserved "validators";
 
+  // Port to listen on, for incoming TCP connections.
+  optional uint32 port = 12; // required
+
   // IP:port to listen on, for incoming TCP connections.
   // Use `0.0.0.0:<port>` to listen on all network interfaces (i.e. on all IPs exposed by this VM).
-  optional string server_addr = 1; // required; IpAddr
+  optional string server_url = 13; // required; IpAddr
 
-  // Public IP:port to advertise, should forward to server_addr.
+  // Public IP:port to advertise, should forward to server_url.
   // Can be `127.0.0.1:<port>` for local tests.
-  optional string public_addr = 2; // required; Host
+  optional string public_url = 14; // required; Host
+
+  // deprecated - use server_url instead
+  optional string server_addr = 1;
+
+  // deprecated - use public_url instead
+  optional string public_addr = 2;
 
   // Maximal allowed size of the payload.
   optional uint64 max_payload_size = 4; // required; bytes

core/node/consensus/src/config.rs

@@ -166,8 +166,8 @@ pub(super) fn executor(
 
     Ok(executor::Config {
         build_version,
-        server_addr: cfg.server_addr,
-        public_addr: net::Host(cfg.public_addr.0.clone()),
+        server_addr: cfg.server_url,
+        public_addr: net::Host(cfg.public_url.0.clone()),
         max_payload_size: cfg.max_payload_size,
         max_batch_size: cfg.max_batch_size,
         node_key: node_key(secrets)

core/node/consensus/src/testonly.rs

@@ -154,8 +154,9 @@ fn make_config(
     genesis_spec: Option<config::GenesisSpec>,
 ) -> config::ConsensusConfig {
     config::ConsensusConfig {
-        server_addr: *cfg.server_addr,
-        public_addr: config::Host(cfg.public_addr.0.clone()),
+        port: cfg.server_addr.port(),
+        server_url: *cfg.server_addr,
+        public_url: config::Host(cfg.public_addr.0.clone()),
         max_payload_size: usize::MAX,
         max_batch_size: usize::MAX,
         gossip_dynamic_inbound_limit: cfg.gossip.dynamic_inbound_limit,

etc/env/consensus_config.yaml

@@ -1,5 +1,6 @@
-server_addr: "127.0.0.1:3054"
-public_addr: "127.0.0.1:3054"
+port: 3054
+server_url: "127.0.0.1:3054"
+public_url: "127.0.0.1:3054"
 max_payload_size: 2500000
 gossip_dynamic_inbound_limit: 1
 # LOCALHOST TEST CONFIGURATION ONLY, don't copy to other environments.

etc/env/en_consensus_config.yaml

@@ -1,5 +1,6 @@
-server_addr: '127.0.0.1:3055'
-public_addr: '127.0.0.1:3055'
+port: 3055
+server_url: '127.0.0.1:3055'
+public_url: '127.0.0.1:3055'
 max_payload_size: 2500000
 gossip_dynamic_inbound_limit: 0
 gossip_static_outbound:

etc/env/file_based/general.yaml

@@ -375,3 +375,10 @@ da_dispatcher:
 
 external_proof_integration_api:
   http_port: 3073
+
+consensus:
+  port: 3054
+  server_url: "127.0.0.1:3054"
+  public_url: "127.0.0.1:3054"
+  max_payload_size: 2500000
+  gossip_dynamic_inbound_limit: 100

zk_toolbox/crates/config/src/consts.rs

@@ -62,8 +62,6 @@ pub const DEFAULT_EXPLORER_WORKER_PORT: u16 = 3001;
 pub const DEFAULT_EXPLORER_API_PORT: u16 = 3002;
 /// Default port for the explorer data fetcher service
 pub const DEFAULT_EXPLORER_DATA_FETCHER_PORT: u16 = 3040;
-/// Default port for consensus service
-pub const DEFAULT_CONSENSUS_PORT: u16 = 3054;
 
 pub const EXPLORER_API_DOCKER_IMAGE: &str = "matterlabs/block-explorer-api";
 pub const EXPLORER_DATA_FETCHER_DOCKER_IMAGE: &str = "matterlabs/block-explorer-data-fetcher";

zk_toolbox/crates/zk_inception/src/commands/chain/init.rs

@@ -2,7 +2,7 @@ use anyhow::Context;
 use common::{git, logger, spinner::Spinner};
 use config::{
     copy_configs, set_l1_rpc_url, traits::SaveConfigWithBasePath, update_from_chain_config,
-    ChainConfig, EcosystemConfig, DEFAULT_CONSENSUS_PORT,
+    ChainConfig, EcosystemConfig,
 };
 use types::BaseToken;
 use xshell::Shell;
@@ -20,15 +20,15 @@ use crate::{
         },
         portal::update_portal_config,
     },
-    defaults::PORT_RANGE_END,
     messages::{
         msg_initializing_chain, MSG_ACCEPTING_ADMIN_SPINNER, MSG_CHAIN_INITIALIZED,
-        MSG_CHAIN_NOT_FOUND_ERR, MSG_DEPLOYING_PAYMASTER, MSG_GENESIS_DATABASE_ERR,
-        MSG_PORTAL_FAILED_TO_CREATE_CONFIG_ERR, MSG_REGISTERING_CHAIN_SPINNER, MSG_SELECTED_CONFIG,
+        MSG_CHAIN_NOT_FOUND_ERR, MSG_CONSENSUS_CONFIG_MISSING_ERR, MSG_DEPLOYING_PAYMASTER,
+        MSG_GENESIS_DATABASE_ERR, MSG_PORTAL_FAILED_TO_CREATE_CONFIG_ERR,
+        MSG_REGISTERING_CHAIN_SPINNER, MSG_SELECTED_CONFIG,
         MSG_UPDATING_TOKEN_MULTIPLIER_SETTER_SPINNER, MSG_WALLET_TOKEN_MULTIPLIER_SETTER_NOT_FOUND,
     },
     utils::{
-        consensus::{generate_consensus_keys, get_consensus_config, get_consensus_secrets},
+        consensus::{generate_consensus_keys, get_consensus_secrets, get_genesis_specs},
         ports::EcosystemPortsScanner,
     },
 };
@@ -67,20 +67,13 @@ pub async fn init(
         )?;
     }
     let mut general_config = chain_config.get_general_config()?;
-
-    // TODO: This is a temporary solution. We should allocate consensus port using `EcosystemPorts::allocate_ports_in_yaml`
-    let offset = ((chain_config.id - 1) * 100) as u16;
-    let consensus_port_range = DEFAULT_CONSENSUS_PORT + offset..PORT_RANGE_END;
-    let consensus_port =
-        ecosystem_ports.allocate_port(consensus_port_range, "Consensus".to_string())?;
+    let mut consensus_config = general_config
+        .consensus_config
+        .context(MSG_CONSENSUS_CONFIG_MISSING_ERR)?;
 
     let consensus_keys = generate_consensus_keys();
-    let consensus_config = get_consensus_config(
-        chain_config,
-        consensus_port,
-        Some(consensus_keys.clone()),
-        None,
-    )?;
+    consensus_config.genesis_spec = Some(get_genesis_specs(chain_config, &consensus_keys));
+
     general_config.consensus_config = Some(consensus_config);
     general_config.save_with_base_path(shell, &chain_config.configs)?;
 

zk_toolbox/crates/zk_inception/src/commands/external_node/prepare_configs.rs

@@ -6,27 +6,26 @@ use config::{
     external_node::ENConfig,
     set_rocks_db_config,
     traits::{FileConfigWithDefaultName, SaveConfigWithBasePath},
-    ChainConfig, EcosystemConfig, GeneralConfig, SecretsConfig, DEFAULT_CONSENSUS_PORT,
+    ChainConfig, EcosystemConfig, GeneralConfig, SecretsConfig,
 };
 use xshell::Shell;
 use zksync_basic_types::url::SensitiveUrl;
 use zksync_config::configs::{
-    consensus::{ConsensusSecrets, NodeSecretKey, Secret},
+    consensus::{ConsensusConfig, ConsensusSecrets, NodeSecretKey, Secret},
     DatabaseSecrets, L1Secrets,
 };
 use zksync_consensus_crypto::TextFmt;
 use zksync_consensus_roles as roles;
 
 use crate::{
     commands::external_node::args::prepare_configs::{PrepareConfigArgs, PrepareConfigFinal},
-    defaults::PORT_RANGE_END,
     messages::{
         msg_preparing_en_config_is_done, MSG_CHAIN_NOT_INITIALIZED,
         MSG_CONSENSUS_CONFIG_MISSING_ERR, MSG_CONSENSUS_SECRETS_MISSING_ERR,
         MSG_CONSENSUS_SECRETS_NODE_KEY_MISSING_ERR, MSG_PREPARING_EN_CONFIGS,
     },
     utils::{
-        consensus::{get_consensus_config, node_public_key},
+        consensus::node_public_key,
         ports::EcosystemPortsScanner,
         rocks_db::{recreate_rocksdb_dirs, RocksDBDirOption},
     },
@@ -78,19 +77,12 @@ fn prepare_configs(
         gateway_url: None,
     };
     let mut general_en = general.clone();
+    general_en.consensus_config = None;
 
     let main_node_consensus_config = general
         .consensus_config
         .context(MSG_CONSENSUS_CONFIG_MISSING_ERR)?;
-
-    // TODO: This is a temporary solution. We should allocate consensus port using `EcosystemPorts::allocate_ports_in_yaml`
-    ports.add_port_info(
-        main_node_consensus_config.server_addr.port(),
-        "Main node consensus".to_string(),
-    );
-    let offset = ((config.id - 1) * 100) as u16;
-    let consensus_port_range = DEFAULT_CONSENSUS_PORT + offset..PORT_RANGE_END;
-    let consensus_port = ports.allocate_port(consensus_port_range, "Consensus".to_string())?;
+    let mut en_consensus_config = main_node_consensus_config.clone();
 
     let mut gossip_static_outbound = BTreeMap::new();
     let main_node_public_key = node_public_key(
@@ -100,13 +92,8 @@ fn prepare_configs(
             .context(MSG_CONSENSUS_SECRETS_MISSING_ERR)?,
     )?
     .context(MSG_CONSENSUS_SECRETS_NODE_KEY_MISSING_ERR)?;
-
-    gossip_static_outbound.insert(main_node_public_key, main_node_consensus_config.public_addr);
-
-    let en_consensus_config =
-        get_consensus_config(config, consensus_port, None, Some(gossip_static_outbound))?;
-    general_en.consensus_config = Some(en_consensus_config.clone());
-    en_consensus_config.save_with_base_path(shell, en_configs_path)?;
+    gossip_static_outbound.insert(main_node_public_key, main_node_consensus_config.public_url);
+    en_consensus_config.gossip_static_outbound = gossip_static_outbound;
 
     // Set secrets config
     let node_key = roles::node::SecretKey::generate().encode();
@@ -127,16 +114,25 @@ fn prepare_configs(
         }),
         data_availability: None,
     };
-    secrets.save_with_base_path(shell, en_configs_path)?;
+
     let dirs = recreate_rocksdb_dirs(shell, &config.rocks_db_path, RocksDBDirOption::ExternalNode)?;
     set_rocks_db_config(&mut general_en, dirs)?;
+
     general_en.save_with_base_path(shell, en_configs_path)?;
     en_config.save_with_base_path(shell, en_configs_path)?;
+    en_consensus_config.save_with_base_path(shell, en_configs_path)?;
+    secrets.save_with_base_path(shell, en_configs_path)?;
 
+    let offset = 0; // This is zero because general_en ports already have a chain offset
     ports.allocate_ports_in_yaml(
         shell,
         &GeneralConfig::get_path_with_base_path(en_configs_path),
-        0, // This is zero because general_en ports already have a chain offset
+        offset,
+    )?;
+    ports.allocate_ports_in_yaml(
+        shell,
+        &ConsensusConfig::get_path_with_base_path(en_configs_path),
+        offset,
     )?;
 
     Ok(())

zk_toolbox/crates/zk_inception/src/consts.rs

@@ -1,5 +1,3 @@
-use std::net::{IpAddr, Ipv4Addr};
-
 pub const AMOUNT_FOR_DISTRIBUTION_TO_WALLETS: u128 = 1000000000000000000000;
 
 pub const MINIMUM_BALANCE_FOR_WALLET: u128 = 5000000000000000000;
@@ -12,27 +10,6 @@ pub const DEFAULT_UNSIGNED_TRANSACTIONS_DIR: &str = "transactions";
 pub const BELLMAN_CUDA_DIR: &str = "era-bellman-cuda";
 pub const L2_BASE_TOKEN_ADDRESS: &str = "0x000000000000000000000000000000000000800A";
 
-#[allow(non_upper_case_globals)]
-const kB: usize = 1024;
-
-/// Max payload size for consensus in bytes
-pub const MAX_PAYLOAD_SIZE: usize = 2_500_000;
-/// Max batch size for consensus in bytes
-/// Compute a default batch size, so operators are not caught out by the missing setting
-/// while we're still working on batch syncing. The batch interval is ~1 minute,
-/// so there will be ~60 blocks, and an Ethereum Merkle proof is ~1kB, but under high
-/// traffic there can be thousands of huge transactions that quickly fill up blocks
-/// and there could be more blocks in a batch then expected. We chose a generous
-/// limit so as not to prevent any legitimate batch from being transmitted.
-pub const MAX_BATCH_SIZE: usize = MAX_PAYLOAD_SIZE * 5000 + kB;
-/// Gossip dynamic inbound limit for consensus
-pub const GOSSIP_DYNAMIC_INBOUND_LIMIT: usize = 100;
-
-/// Public address for consensus
-pub const CONSENSUS_PUBLIC_ADDRESS_HOST: IpAddr = IpAddr::V4(Ipv4Addr::UNSPECIFIED);
-/// Server address for consensus
-pub const CONSENSUS_SERVER_ADDRESS_HOST: IpAddr = IpAddr::V4(Ipv4Addr::LOCALHOST);
-
 /// Path to the JS runtime config for the block-explorer-app docker container to be mounted to
 pub const EXPLORER_APP_DOCKER_CONFIG_PATH: &str = "/usr/src/app/packages/app/dist/config.js";
 pub const EXPLORER_APP_DOCKER_IMAGE: &str = "matterlabs/block-explorer-app";