feat(en): seal criteria (#4429)

## What ❔

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- The `Why` has to be clear to non-Matter Labs entities running their
own ZK Chain -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

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

## Operational changes
<!-- Any config changes? Any new flags? Any changes to any scripts? -->
<!-- Please add anything that non-Matter Labs entities running their own
ZK Chain may need to know -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

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

---------

Co-authored-by: Artur Puzio <[email protected]>

Author: Deniallugo

core/bin/external_node/src/node_builder.rs

@@ -191,7 +191,10 @@ impl ExternalNodeBuilder {
                     .protective_reads_persistence_enabled,
             );
 
-        let io_layer = ExternalIOLayer::new(self.config.local.networks.l2_chain_id);
+        let io_layer = ExternalIOLayer::new(
+            self.config.local.networks.l2_chain_id,
+            self.config.local.node_sync.validate_seal_criteria,
+        );
 
         // We only need call traces on the external node if the `debug_` namespace is enabled.
         // TODO(PLA-1153): this is backwards / unobvious. Can readily use `config.state_keeper.save_call_traces` instead.

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

@@ -51,6 +51,65 @@ pub struct SharedStateKeeperConfig {
     pub protective_reads_persistence_enabled: bool,
 }
 
+#[derive(Debug, Clone, PartialEq, DescribeConfig, DeserializeConfig)]
+pub struct SealCriteriaConfig {
+    /// The max number of slots for txs in a block before it should be sealed by the slots sealer.
+    #[config(default_t = 8_192)]
+    pub transaction_slots: usize,
+    /// Configuration option for tx to be rejected in case
+    /// it takes more percentage of the block capacity than this value.
+    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
+    pub reject_tx_at_geometry_percentage: f64,
+    /// Configuration option for tx to be rejected in case
+    /// it takes more percentage of the block capacity than this value.
+    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
+    pub reject_tx_at_eth_params_percentage: f64,
+    /// Configuration option for tx to be rejected in case
+    /// it takes more percentage of the block capacity than this value.
+    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
+    pub reject_tx_at_gas_percentage: f64,
+    /// Denotes the percentage of geometry params used in L2 block that triggers L2 block seal.
+    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
+    pub close_block_at_geometry_percentage: f64,
+    /// Denotes the percentage of L1 params used in L2 block that triggers L2 block seal.
+    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
+    pub close_block_at_eth_params_percentage: f64,
+    /// Denotes the percentage of L1 gas used in L2 block that triggers L2 block seal.
+    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
+    pub close_block_at_gas_percentage: f64,
+    /// The maximum amount of pubdata that can be used by the batch.
+    /// This variable should not exceed:
+    /// - 128kb for calldata-based rollups
+    /// - 120kb * n, where `n` is a number of blobs for blob-based rollups
+    /// - the DA layer's blob size limit for the DA layer-based validiums
+    /// - 100 MB for the object store-based or no-da validiums
+    #[config(with = Fallback(SizeUnit::Bytes))]
+    pub max_pubdata_per_batch: ByteSize,
+    /// The maximum number of circuits that a batch can support.
+    /// Note, that this number corresponds to the "base layer" circuits, i.e. it does not include
+    /// the recursion layers' circuits.
+    #[config(default_t = 31_100)]
+    pub max_circuits_per_batch: usize,
+}
+
+impl SealCriteriaConfig {
+    /// Creates a config object suitable for use in unit tests.
+    /// Values mostly repeat the values used in the localhost environment.
+    pub fn for_tests() -> Self {
+        SealCriteriaConfig {
+            transaction_slots: 250,
+            max_pubdata_per_batch: ByteSize(100_000),
+            reject_tx_at_geometry_percentage: 0.95,
+            reject_tx_at_eth_params_percentage: 0.95,
+            reject_tx_at_gas_percentage: 0.95,
+            close_block_at_geometry_percentage: 0.95,
+            close_block_at_eth_params_percentage: 0.95,
+            close_block_at_gas_percentage: 0.95,
+            max_circuits_per_batch: 24100,
+        }
+    }
+}
+
 /// State keeper config.
 ///
 /// # Developer notes
@@ -61,9 +120,8 @@ pub struct SharedStateKeeperConfig {
 pub struct StateKeeperConfig {
     #[config(flatten)]
     pub shared: SharedStateKeeperConfig,
-    /// The max number of slots for txs in a block before it should be sealed by the slots sealer.
-    #[config(default_t = 8_192)]
-    pub transaction_slots: usize,
+    #[config(flatten)]
+    pub seal_criteria: SealCriteriaConfig,
 
     /// Deadline after which an L1 batch is going to be unconditionally sealed.
     #[config(deprecated = "block_commit_deadline")]
@@ -85,28 +143,6 @@ pub struct StateKeeperConfig {
     #[config(default_t = 15_000_000_000)]
     pub max_allowed_l2_tx_gas_limit: u64,
 
-    /// Configuration option for tx to be rejected in case
-    /// it takes more percentage of the block capacity than this value.
-    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
-    pub reject_tx_at_geometry_percentage: f64,
-    /// Configuration option for tx to be rejected in case
-    /// it takes more percentage of the block capacity than this value.
-    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
-    pub reject_tx_at_eth_params_percentage: f64,
-    /// Configuration option for tx to be rejected in case
-    /// it takes more percentage of the block capacity than this value.
-    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
-    pub reject_tx_at_gas_percentage: f64,
-    /// Denotes the percentage of geometry params used in L2 block that triggers L2 block seal.
-    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
-    pub close_block_at_geometry_percentage: f64,
-    /// Denotes the percentage of L1 params used in L2 block that triggers L2 block seal.
-    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
-    pub close_block_at_eth_params_percentage: f64,
-    /// Denotes the percentage of L1 gas used in L2 block that triggers L2 block seal.
-    #[config(default_t = 0.95, validate(ZERO_TO_ONE))]
-    pub close_block_at_gas_percentage: f64,
-
     // Parameters without defaults.
     /// The minimal acceptable L2 gas price, i.e. the price that should include the cost of computation/proving as well
     /// as potentially premium for congestion.
@@ -125,25 +161,12 @@ pub struct StateKeeperConfig {
     pub batch_overhead_l1_gas: u64,
     /// The maximum amount of gas that can be used by the batch. This value is derived from the circuits limitation per batch.
     pub max_gas_per_batch: u64,
-    /// The maximum amount of pubdata that can be used by the batch.
-    /// This variable should not exceed:
-    /// - 128kb for calldata-based rollups
-    /// - 120kb * n, where `n` is a number of blobs for blob-based rollups
-    /// - the DA layer's blob size limit for the DA layer-based validiums
-    /// - 100 MB for the object store-based or no-da validiums
-    #[config(with = Fallback(SizeUnit::Bytes))]
-    pub max_pubdata_per_batch: ByteSize,
     /// The version of the fee model to use.
     #[config(default_t = FeeModelVersion::V2, with = Serde![str])]
     pub fee_model_version: FeeModelVersion,
     /// Max number of computational gas that validation step is allowed to take. Also applied on the API server.
     #[config(default_t = 300_000)]
     pub validation_computational_gas_limit: u32,
-    /// The maximum number of circuits that a batch can support.
-    /// Note, that this number corresponds to the "base layer" circuits, i.e. it does not include
-    /// the recursion layers' circuits.
-    #[config(default_t = 31_100)]
-    pub max_circuits_per_batch: usize,
     /// Allowed deployers for L2 transactions.
     #[config(nest)]
     pub deployment_allowlist: Option<DeploymentAllowlist>,
@@ -155,27 +178,19 @@ impl StateKeeperConfig {
     pub fn for_tests() -> Self {
         Self {
             shared: SharedStateKeeperConfig::default(),
-            transaction_slots: 250,
+            seal_criteria: SealCriteriaConfig::for_tests(),
             l1_batch_commit_deadline: Duration::from_millis(2500),
             l2_block_commit_deadline: Duration::from_secs(1),
             l2_block_max_payload_size: ByteSize(1_000_000),
             max_single_tx_gas: 6000000,
             max_allowed_l2_tx_gas_limit: 4000000000,
-            reject_tx_at_geometry_percentage: 0.95,
-            reject_tx_at_eth_params_percentage: 0.95,
-            reject_tx_at_gas_percentage: 0.95,
-            close_block_at_geometry_percentage: 0.95,
-            close_block_at_eth_params_percentage: 0.95,
-            close_block_at_gas_percentage: 0.95,
             compute_overhead_part: 0.0,
             pubdata_overhead_part: 1.0,
             batch_overhead_l1_gas: 800_000,
             max_gas_per_batch: 200_000_000,
-            max_pubdata_per_batch: ByteSize(100_000),
             minimal_l2_gas_price: 100000000,
             fee_model_version: FeeModelVersion::V2,
             validation_computational_gas_limit: 300000,
-            max_circuits_per_batch: 24100,
             deployment_allowlist: None,
         }
     }
@@ -269,27 +284,29 @@ mod tests {
                 save_call_traces: false,
                 protective_reads_persistence_enabled: true,
             },
-            transaction_slots: 50,
+            seal_criteria: SealCriteriaConfig {
+                transaction_slots: 50,
+                close_block_at_eth_params_percentage: 0.2,
+                close_block_at_gas_percentage: 0.8,
+                close_block_at_geometry_percentage: 0.5,
+                reject_tx_at_eth_params_percentage: 0.8,
+                reject_tx_at_geometry_percentage: 0.3,
+                reject_tx_at_gas_percentage: 0.5,
+                max_pubdata_per_batch: ByteSize(131_072),
+                max_circuits_per_batch: 24100,
+            },
             l1_batch_commit_deadline: Duration::from_millis(2500),
             l2_block_commit_deadline: Duration::from_millis(1000),
             l2_block_max_payload_size: ByteSize(1_000_000),
             max_single_tx_gas: 1_000_000,
             max_allowed_l2_tx_gas_limit: 2_000_000_000,
-            close_block_at_eth_params_percentage: 0.2,
-            close_block_at_gas_percentage: 0.8,
-            close_block_at_geometry_percentage: 0.5,
-            reject_tx_at_eth_params_percentage: 0.8,
-            reject_tx_at_geometry_percentage: 0.3,
-            reject_tx_at_gas_percentage: 0.5,
             minimal_l2_gas_price: 100000000,
             compute_overhead_part: 0.0,
             pubdata_overhead_part: 1.0,
             batch_overhead_l1_gas: 800_000,
             max_gas_per_batch: 200_000_000,
-            max_pubdata_per_batch: ByteSize(131_072),
             fee_model_version: FeeModelVersion::V2,
             validation_computational_gas_limit: 10_000_000,
-            max_circuits_per_batch: 24100,
             deployment_allowlist: Some(DeploymentAllowlist::Dynamic(DeploymentAllowlistDynamic {
                 http_file_url: "http://deployment-allowlist/".to_owned(),
                 refresh_interval: Duration::from_secs(120),

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

@@ -12,6 +12,9 @@ pub struct NodeSyncConfig {
     /// Maximum number of transactions to process in a single batch
     #[config(default_t = NonZeroU64::new(10_000).unwrap())]
     pub batch_transaction_updater_batch_size: NonZeroU64,
+    /// Toggle for disabling seal criteria validation in case of some issues / forced proved batches
+    #[config(default_t = true)]
+    pub validate_seal_criteria: bool,
 }
 
 #[cfg(test)]
@@ -24,6 +27,7 @@ mod tests {
         NodeSyncConfig {
             batch_transaction_updater_interval: Duration::from_secs(2),
             batch_transaction_updater_batch_size: NonZeroU64::new(100).unwrap(),
+            validate_seal_criteria: false,
         }
     }
 
@@ -32,6 +36,7 @@ mod tests {
         let env = r#"
             NODE_SYNC_BATCH_TRANSACTION_UPDATER_INTERVAL=2sec
             NODE_SYNC_BATCH_TRANSACTION_UPDATER_BATCH_SIZE=100
+            NODE_SYNC_VALIDATE_SEAL_CRITERIA=false
         "#;
         let env = Environment::from_dotenv("test.env", env)
             .unwrap()
@@ -46,6 +51,7 @@ mod tests {
         let yaml = r#"
           batch_transaction_updater_interval: 2sec
           batch_transaction_updater_batch_size: 100
+          validate_seal_criteria: false
         "#;
         let yaml = Yaml::new("test.yml", serde_yaml::from_str(yaml).unwrap()).unwrap();
         let config: NodeSyncConfig = test_complete(yaml).unwrap();

core/lib/multivm/src/utils/mod.rs

@@ -653,6 +653,27 @@ pub fn get_max_new_factory_deps(version: VmVersion) -> usize {
     }
 }
 
+pub fn get_max_vm_pubdata_per_batch(version: VmVersion) -> usize {
+    match version {
+        VmVersion::M5WithRefunds
+        | VmVersion::M5WithoutRefunds
+        | VmVersion::M6Initial
+        | VmVersion::M6BugWithCompressionFixed
+        | VmVersion::Vm1_3_2
+        | VmVersion::VmVirtualBlocks
+        | VmVersion::VmVirtualBlocksRefundsEnhancement
+        | VmVersion::VmBoojumIntegration
+        | VmVersion::Vm1_4_1
+        | VmVersion::Vm1_4_2 => crate::vm_1_4_2::constants::MAX_VM_PUBDATA_PER_BATCH,
+        VmVersion::Vm1_5_0SmallBootloaderMemory
+        | VmVersion::Vm1_5_0IncreasedBootloaderMemory
+        | VmVersion::VmGateway
+        | VmVersion::VmEvmEmulator
+        | VmVersion::VmEcPrecompiles
+        | VmVersion::VmInterop => crate::vm_latest::constants::MAX_VM_PUBDATA_PER_BATCH,
+    }
+}
+
 /// Holds information about number of cycles used per circuit type.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 pub(crate) struct CircuitCycleStatistic {

core/node/da_dispatcher/src/node.rs

@@ -52,10 +52,16 @@ impl WiringLayer for DataAvailabilityDispatcherLayer {
     async fn wire(self, input: Self::Input) -> Result<Self::Output, WiringError> {
         let da_client = input.da_client;
         if let Some(limit) = da_client.blob_size_limit() {
-            if self.state_keeper_config.max_pubdata_per_batch.0 > limit as u64 {
+            if self
+                .state_keeper_config
+                .seal_criteria
+                .max_pubdata_per_batch
+                .0
+                > limit as u64
+            {
                 return Err(WiringError::Configuration(format!(
                     "Max pubdata per batch is greater than the blob size limit: {} > {} B",
-                    self.state_keeper_config.max_pubdata_per_batch, limit
+                    self.state_keeper_config.seal_criteria.max_pubdata_per_batch, limit
                 )));
             }
         }

core/node/eth_sender/src/eth_tx_manager.rs

@@ -465,7 +465,7 @@ impl EthTxManager {
 
         // Not confirmed transactions, ordered by nonce
         for tx in inflight_txs {
-            tracing::info!(
+            tracing::trace!(
                 "Checking tx id: {}, operator_nonce: {:?}, tx nonce: {}",
                 tx.id,
                 operator_nonce,
@@ -508,17 +508,12 @@ impl EthTxManager {
 
             tracing::trace!(
                 "Sender's nonce on finalized block is greater than current tx's nonce. \
-                 Checking transaction with id {}. Tx nonce is equal to {}",
+                 Checking transaction with id {} and type {}. Tx nonce is equal to {}",
                 tx.id,
+                tx.tx_type,
                 tx.nonce,
             );
 
-            tracing::info!(
-                "Updating status of tx {} of type {} with nonce {}",
-                tx.id,
-                tx.tx_type,
-                tx.nonce
-            );
             match self.check_all_sending_attempts(storage, &tx).await {
                 Ok(Some(tx_status)) => {
                     self.apply_tx_status(storage, &tx, tx_status, l1_block_numbers)

core/node/fee_model/src/node/l1_gas.rs

@@ -61,7 +61,7 @@ impl L1GasLayer {
                 pubdata_overhead_part: state_keeper_config.pubdata_overhead_part,
                 batch_overhead_l1_gas: state_keeper_config.batch_overhead_l1_gas,
                 max_gas_per_batch: state_keeper_config.max_gas_per_batch,
-                max_pubdata_per_batch: state_keeper_config.max_pubdata_per_batch.0,
+                max_pubdata_per_batch: state_keeper_config.seal_criteria.max_pubdata_per_batch.0,
             }),
         }
     }

core/node/node_sync/src/node/external_io.rs

@@ -7,10 +7,10 @@ use zksync_node_framework::{
     wiring_layer::{WiringError, WiringLayer},
     FromContext, IntoContext,
 };
-use zksync_shared_resources::api::SyncState;
+use zksync_shared_resources::{api::SyncState, L1BatchCommitmentModeResource};
 use zksync_state_keeper::{
     node::StateKeeperIOResource,
-    seal_criteria::{ConditionalSealer, NoopSealer},
+    seal_criteria::{ConditionalSealer, NoopSealer, PanicSealer},
 };
 use zksync_types::L2ChainId;
 use zksync_web3_decl::client::{DynClient, L2};
@@ -22,13 +22,15 @@ use crate::{ActionQueue, ExternalIO};
 #[derive(Debug)]
 pub struct ExternalIOLayer {
     chain_id: L2ChainId,
+    should_verify_seal_criteria: bool,
 }
 
 #[derive(Debug, FromContext)]
 pub struct Input {
     app_health: Arc<AppHealthCheck>,
     pool: PoolResource<MasterPool>,
     main_node_client: Box<DynClient<L2>>,
+    l1_batch_commit_data_generator_mode: L1BatchCommitmentModeResource,
 }
 
 #[derive(Debug, IntoContext)]
@@ -40,8 +42,11 @@ pub struct Output {
 }
 
 impl ExternalIOLayer {
-    pub fn new(chain_id: L2ChainId) -> Self {
-        Self { chain_id }
+    pub fn new(chain_id: L2ChainId, should_verify_seal_criteria: bool) -> Self {
+        Self {
+            chain_id,
+            should_verify_seal_criteria,
+        }
     }
 }
 
@@ -76,7 +81,13 @@ impl WiringLayer for ExternalIOLayer {
         .context("Failed initializing I/O for external node state keeper")?;
 
         // Create sealer.
-        let sealer = Arc::new(NoopSealer);
+        let sealer: Arc<dyn ConditionalSealer> = if self.should_verify_seal_criteria {
+            Arc::new(PanicSealer::new(
+                input.l1_batch_commit_data_generator_mode.0,
+            ))
+        } else {
+            Arc::new(NoopSealer)
+        };
 
         Ok(Output {
             sync_state,

core/node/state_keeper/Cargo.toml

@@ -33,7 +33,6 @@ zksync_base_token_adjuster.workspace = true
 zksync_node_framework.workspace = true
 zksync_shared_resources.workspace = true
 kzg.workspace = true
-
 anyhow.workspace = true
 async-trait.workspace = true
 tokio = { workspace = true, features = ["time"] }