feat(consensus): Added view_timeout to consensus config

Cargo.toml

@@ -246,16 +246,16 @@ zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.7" }
 zksync_vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "457d8a7eea9093af9440662e33e598c13ba41633" }
 
 # Consensus dependencies.
-zksync_concurrency = "=0.6.0"
-zksync_consensus_bft = "=0.6.0"
-zksync_consensus_crypto = "=0.6.0"
-zksync_consensus_executor = "=0.6.0"
-zksync_consensus_network = "=0.6.0"
-zksync_consensus_roles = "=0.6.0"
-zksync_consensus_storage = "=0.6.0"
-zksync_consensus_utils = "=0.6.0"
-zksync_protobuf = "=0.6.0"
-zksync_protobuf_build = "=0.6.0"
+zksync_concurrency = "=0.7.0"
+zksync_consensus_bft = "=0.7.0"
+zksync_consensus_crypto = "=0.7.0"
+zksync_consensus_executor = "=0.7.0"
+zksync_consensus_network = "=0.7.0"
+zksync_consensus_roles = "=0.7.0"
+zksync_consensus_storage = "=0.7.0"
+zksync_consensus_utils = "=0.7.0"
+zksync_protobuf = "=0.7.0"
+zksync_protobuf_build = "=0.7.0"
 
 # "Local" dependencies
 zksync_multivm = { version = "0.1.0", path = "core/lib/multivm" }

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

@@ -126,6 +126,9 @@ pub struct ConsensusConfig {
     /// Maximal allowed size of the payload in bytes.
     pub max_payload_size: usize,
 
+    /// View timeout duration in milliseconds.
+    pub view_timeout: usize,
+
     /// Maximal allowed size of the sync-batch payloads in bytes.
     ///
     /// The batch consists of block payloads and a Merkle proof of inclusion on L1 (~1kB),

core/lib/config/src/testonly.rs

@@ -809,6 +809,7 @@ impl Distribution<configs::consensus::ConsensusConfig> for EncodeDist {
             server_addr: self.sample(rng),
             public_addr: Host(self.sample(rng)),
             max_payload_size: self.sample(rng),
+            view_timeout: self.sample(rng),
             max_batch_size: self.sample(rng),
             gossip_dynamic_inbound_limit: self.sample(rng),
             gossip_static_inbound: self

core/lib/protobuf_config/src/consensus.rs

@@ -134,6 +134,10 @@ impl ProtoRepr for proto::Config {
             .and_then(|x| Ok((*x).try_into()?))
             .context("max_payload_size")?;
 
+        let view_timeout = required(&self.view_timeout)
+            .and_then(|x| Ok((*x).try_into()?))
+            .context("view_timeout")?;
+
         let max_batch_size = match self.max_batch_size {
             Some(x) => x.try_into().context("max_batch_size")?,
             None => {
@@ -154,6 +158,7 @@ impl ProtoRepr for proto::Config {
                 .context("server_addr")?,
             public_addr: Host(required(&self.public_addr).context("public_addr")?.clone()),
             max_payload_size,
+            view_timeout,
             max_batch_size,
             gossip_dynamic_inbound_limit: required(&self.gossip_dynamic_inbound_limit)
                 .and_then(|x| Ok((*x).try_into()?))
@@ -187,6 +192,7 @@ impl ProtoRepr for proto::Config {
             server_addr: Some(this.server_addr.to_string()),
             public_addr: Some(this.public_addr.0.clone()),
             max_payload_size: Some(this.max_payload_size.try_into().unwrap()),
+            view_timeout: Some(this.view_timeout.try_into().unwrap()),
             max_batch_size: Some(this.max_batch_size.try_into().unwrap()),
             gossip_dynamic_inbound_limit: Some(
                 this.gossip_dynamic_inbound_limit.try_into().unwrap(),

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

@@ -87,6 +87,9 @@ message Config {
   // Maximal allowed size of the sync batches.
   optional uint64 max_batch_size = 10; // required; bytes
 
+  // View timeout for the consensus protocol.
+  optional uint64 view_timeout = 13; // required; milliseconds
+
   // Inbound connections that should be unconditionally accepted on the gossip network.
   repeated string gossip_static_inbound = 5; // required; NodePublicKey
 

core/node/consensus/src/config.rs

@@ -3,7 +3,7 @@ use std::collections::{BTreeMap, HashMap};
 
 use anyhow::Context as _;
 use secrecy::{ExposeSecret as _, Secret};
-use zksync_concurrency::{limiter, net, time};
+use zksync_concurrency::{net, time};
 use zksync_config::{
     configs,
     configs::consensus::{ConsensusConfig, ConsensusSecrets, Host, NodePublicKey},
@@ -152,11 +152,6 @@ pub(super) fn executor(
 
     let mut rpc = executor::RpcConfig::default();
     rpc.get_block_rate = cfg.rpc().get_block_rate();
-    // Disable batch syncing, because it is not implemented.
-    rpc.get_batch_rate = limiter::Rate {
-        burst: 0,
-        refresh: time::Duration::ZERO,
-    };
 
     let debug_page = cfg.debug_page_addr.map(|addr| network::debug_page::Config {
         addr,
@@ -169,6 +164,7 @@ pub(super) fn executor(
         server_addr: cfg.server_addr,
         public_addr: net::Host(cfg.public_addr.0.clone()),
         max_payload_size: cfg.max_payload_size,
+        view_timeout: time::Duration::milliseconds(cfg.view_timeout as i64),
         node_key: node_key(secrets)
             .context("node_key")?
             .context("missing node_key")?,

core/node/consensus/src/testonly.rs

@@ -149,6 +149,7 @@ fn make_config(
         public_addr: config::Host(cfg.public_addr.0.clone()),
         max_payload_size: usize::MAX,
         max_batch_size: usize::MAX,
+        view_timeout: usize::MAX,
         gossip_dynamic_inbound_limit: cfg.gossip.dynamic_inbound_limit,
         gossip_static_inbound: cfg
             .gossip

etc/env/consensus_config.yaml

@@ -2,6 +2,7 @@ port: 3054
 server_addr: "127.0.0.1:3054"
 public_addr: "127.0.0.1:3054"
 max_payload_size: 2500000
+view_timeout: 2000
 gossip_dynamic_inbound_limit: 1
 # LOCALHOST TEST CONFIGURATION ONLY, don't copy to other environments.
 genesis_spec:

etc/env/en_consensus_config.yaml

@@ -2,6 +2,7 @@ port: 3055
 server_addr: '127.0.0.1:3055'
 public_addr: '127.0.0.1:3055'
 max_payload_size: 2500000
+view_timeout: 2000
 gossip_dynamic_inbound_limit: 0
 gossip_static_outbound:
 - key: 'node:public:ed25519:a9995979f228c91e4f387f7e141a9afe409196ee0c4fca0045c1c6b6e7892cb5'

etc/env/file_based/general.yaml

@@ -382,4 +382,5 @@ consensus:
   server_addr: "127.0.0.1:3054"
   public_addr: "127.0.0.1:3054"
   max_payload_size: 2500000
+  view_timeout: 2000
   gossip_dynamic_inbound_limit: 100