feat(state-keeper): circuits seal criterion

core/lib/multivm/Cargo.toml

@@ -14,6 +14,8 @@ zk_evm_1_4_0 = { package = "zk_evm", git = "https://github.com/matter-labs/era-z
 zk_evm_1_3_3 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", tag= "v1.3.3-rc2" }
 zk_evm_1_3_1 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", tag= "v1.3.1-rc2" }
 
+zkevm_test_harness_1_4_0 = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0", package = "zkevm_test_harness" }
+
 zksync_types = { path = "../types" }
 zksync_state = { path = "../state" }
 zksync_contracts = { path = "../contracts" }
@@ -29,7 +31,6 @@ thiserror = "1.0"
 tracing = "0.1"
 vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "dd05139b76ab0843443ab3ff730174942c825dae" }
 
-
 [dev-dependencies]
 tokio = { version = "1", features = ["time"] }
 zksync_test_account = { path = "../test_account" }

core/lib/multivm/src/glue/types/vm/vm_block_result.rs

@@ -26,6 +26,7 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult> for crate::interface::Fi
                     computational_gas_used: value.full_result.gas_used,
                     gas_used: value.full_result.gas_used,
                     pubdata_published: 0,
+                    estimated_circuits_used: 0,
                 },
                 refunds: Refunds::default(),
             },
@@ -63,6 +64,7 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult> for crate::interface::Fi
                     computational_gas_used: value.full_result.computational_gas_used,
                     gas_used: value.full_result.gas_used,
                     pubdata_published: 0,
+                    estimated_circuits_used: 0,
                 },
                 refunds: Refunds::default(),
             },
@@ -106,6 +108,7 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmBlockResult> for crate::interface:
                     computational_gas_used: value.full_result.computational_gas_used,
                     gas_used: value.full_result.gas_used,
                     pubdata_published: 0,
+                    estimated_circuits_used: 0,
                 },
                 refunds: Refunds::default(),
             },
@@ -165,6 +168,7 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmBlockResult>
                 computational_gas_used: value.full_result.computational_gas_used,
                 gas_used: value.full_result.gas_used,
                 pubdata_published: 0,
+                estimated_circuits_used: 0,
             },
             refunds: Refunds::default(),
         }
@@ -195,6 +199,7 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult>
                 computational_gas_used: 0,
                 gas_used: value.full_result.gas_used,
                 pubdata_published: 0,
+                estimated_circuits_used: 0,
             },
             refunds: Refunds::default(),
         }
@@ -236,6 +241,7 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult>
                 computational_gas_used: value.full_result.computational_gas_used,
                 gas_used: value.full_result.gas_used,
                 pubdata_published: 0,
+                estimated_circuits_used: 0,
             },
             refunds: Refunds::default(),
         }

core/lib/multivm/src/glue/types/vm/vm_partial_execution_result.rs

@@ -16,6 +16,7 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmPartialExecutionResult>
                 // There are no such fields in m5
                 computational_gas_used: 0,
                 pubdata_published: 0,
+                estimated_circuits_used: 0,
             },
             refunds: crate::interface::Refunds {
                 gas_refunded: 0,
@@ -39,6 +40,7 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmPartialExecutionResult>
                 computational_gas_used: value.computational_gas_used,
                 total_log_queries: value.logs.total_log_queries_count,
                 pubdata_published: 0,
+                estimated_circuits_used: 0,
             },
             refunds: crate::interface::Refunds {
                 gas_refunded: 0,
@@ -62,6 +64,7 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmPartialExecutionResult>
                 computational_gas_used: value.computational_gas_used,
                 total_log_queries: value.logs.total_log_queries_count,
                 pubdata_published: 0,
+                estimated_circuits_used: 0,
             },
             refunds: crate::interface::Refunds {
                 gas_refunded: 0,

core/lib/multivm/src/interface/types/outputs/execution_result.rs

@@ -101,6 +101,7 @@ impl VmExecutionResultAndLogs {
             cycles_used: self.statistics.cycles_used,
             computational_gas_used: self.statistics.computational_gas_used,
             pubdata_published: self.statistics.pubdata_published,
+            estimated_circuits_used: self.statistics.estimated_circuits_used,
         }
     }
 }

core/lib/multivm/src/interface/types/outputs/statistic.rs

@@ -12,6 +12,7 @@ pub struct VmExecutionStatistics {
     /// Number of log queries produced by the VM during the tx execution.
     pub total_log_queries: usize,
     pub pubdata_published: u32,
+    pub estimated_circuits_used: usize,
 }
 
 /// Oracle metrics of the VM.

core/lib/multivm/src/versions/vm_latest/implementation/execution.rs

@@ -71,6 +71,9 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             .map(|x| (x.get_refunds(), x.pubdata_published()))
             .unwrap_or_default();
 
+        let estimated_circuits_used =
+            tx_tracer.circuits_tracer.estimated_circuits_used.ceil() as usize;
+
         let statistics = self.get_statistics(
             timestamp_initial,
             cycles_initial,
@@ -80,6 +83,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             spent_pubdata_counter_before,
             pubdata_published,
             logs.total_log_queries_count,
+            estimated_circuits_used,
         );
         let result = tx_tracer.result_tracer.into_result();
 

core/lib/multivm/src/versions/vm_latest/implementation/statistics.rs

@@ -24,6 +24,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
         spent_pubdata_counter_before: u32,
         pubdata_published: u32,
         total_log_queries_count: usize,
+        estimated_circuits_used: usize,
     ) -> VmExecutionStatistics {
         let computational_gas_used = self.calculate_computational_gas_used(
             tracer,
@@ -40,6 +41,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             computational_gas_used,
             total_log_queries: total_log_queries_count,
             pubdata_published,
+            estimated_circuits_used,
         }
     }
 

core/lib/multivm/src/versions/vm_latest/oracles/storage.rs

@@ -59,6 +59,11 @@ pub struct StorageOracle<S: WriteStorage, H: HistoryMode> {
 
     // Storage refunds that oracle has returned in `estimate_refunds_for_write`.
     pub(crate) returned_refunds: HistoryRecorder<Vec<u32>, H>,
+
+    // Keeps track of storage keys that were written to.
+    pub(crate) hot_writes: HistoryRecorder<HashMap<StorageKey, ()>, HistoryEnabled>,
+    // Keeps track of storage keys that were read.
+    pub(crate) hot_reads: HistoryRecorder<HashMap<StorageKey, ()>, HistoryEnabled>,
 }
 
 impl<S: WriteStorage> OracleWithHistory for StorageOracle<S, HistoryEnabled> {
@@ -69,6 +74,8 @@ impl<S: WriteStorage> OracleWithHistory for StorageOracle<S, HistoryEnabled> {
         self.paid_changes.rollback_to_timestamp(timestamp);
         self.initial_values.rollback_to_timestamp(timestamp);
         self.returned_refunds.rollback_to_timestamp(timestamp);
+        self.hot_writes.rollback_to_timestamp(timestamp);
+        self.hot_reads.rollback_to_timestamp(timestamp);
     }
 }
 
@@ -81,6 +88,8 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
             paid_changes: Default::default(),
             initial_values: Default::default(),
             returned_refunds: Default::default(),
+            hot_writes: Default::default(),
+            hot_reads: Default::default(),
         }
     }
 
@@ -91,6 +100,8 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
         self.paid_changes.delete_history();
         self.initial_values.delete_history();
         self.returned_refunds.delete_history();
+        self.hot_writes.delete_history();
+        self.hot_reads.delete_history();
     }
 
     fn is_storage_key_free(&self, key: &StorageKey) -> bool {
@@ -108,8 +119,12 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
         }
     }
 
-    pub fn read_value(&mut self, mut query: LogQuery) -> LogQuery {
+    fn read_value(&mut self, mut query: LogQuery) -> LogQuery {
         let key = triplet_to_storage_key(query.shard_id, query.address, query.key);
+
+        if !self.hot_reads.inner().contains_key(&key) {
+            self.hot_reads.insert(key, (), query.timestamp);
+        }
         let current_value = self.storage.read_from_storage(&key);
 
         query.read_value = current_value;
@@ -127,8 +142,11 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
         query
     }
 
-    pub fn write_value(&mut self, query: LogQuery) -> LogQuery {
+    fn write_value(&mut self, query: LogQuery) -> LogQuery {
         let key = triplet_to_storage_key(query.shard_id, query.address, query.key);
+        if !self.hot_writes.inner().contains_key(&key) {
+            self.hot_writes.insert(key, (), query.timestamp);
+        }
         let current_value =
             self.storage
                 .write_to_storage(key, query.written_value, query.timestamp);

core/lib/multivm/src/versions/vm_latest/tracers/circuits_capacity.rs

@@ -0,0 +1,72 @@
+use zkevm_test_harness_1_4_0::{geometry_config::get_geometry_config, toolset::GeometryConfig};
+
+const GEOMETRY_CONFIG: GeometryConfig = get_geometry_config();
+const OVERESTIMATE_PERCENT: f32 = 1.05;
+
+const MAIN_VM_CYCLE_FRACTION: f32 =
+    OVERESTIMATE_PERCENT / GEOMETRY_CONFIG.cycles_per_vm_snapshot as f32;
+
+const CODE_DECOMMITTER_SORTER_CYCLE_FRACTION: f32 =
+    OVERESTIMATE_PERCENT / GEOMETRY_CONFIG.cycles_code_decommitter_sorter as f32;
+
+const LOG_DEMUXER_CYCLE_FRACTION: f32 =
+    OVERESTIMATE_PERCENT / GEOMETRY_CONFIG.cycles_per_log_demuxer as f32;
+
+const STORAGE_SORTER_CYCLE_FRACTION: f32 =
+    OVERESTIMATE_PERCENT / GEOMETRY_CONFIG.cycles_per_storage_sorter as f32;
+
+const EVENTS_OR_L1_MESSAGES_SORTER_CYCLE_FRACTION: f32 =
+    OVERESTIMATE_PERCENT / GEOMETRY_CONFIG.cycles_per_events_or_l1_messages_sorter as f32;
+
+const RAM_PERMUTATION_CYCLE_FRACTION: f32 =
+    OVERESTIMATE_PERCENT / GEOMETRY_CONFIG.cycles_per_ram_permutation as f32;
+
+pub(crate) const CODE_DECOMMITTER_CYCLE_FRACTION: f32 =
+    OVERESTIMATE_PERCENT / GEOMETRY_CONFIG.cycles_per_code_decommitter as f32;
+
+pub(crate) const STORAGE_APPLICATION_CYCLE_FRACTION: f32 =
+    OVERESTIMATE_PERCENT / GEOMETRY_CONFIG.cycles_per_storage_application as f32;
+
+pub(crate) const KECCAK256_CYCLE_FRACTION: f32 =
+    OVERESTIMATE_PERCENT / GEOMETRY_CONFIG.cycles_per_keccak256_circuit as f32;
+
+pub(crate) const SHA256_CYCLE_FRACTION: f32 =
+    OVERESTIMATE_PERCENT / GEOMETRY_CONFIG.cycles_per_sha256_circuit as f32;
+
+pub(crate) const ECRECOVER_CYCLE_FRACTION: f32 =
+    OVERESTIMATE_PERCENT / GEOMETRY_CONFIG.cycles_per_ecrecover_circuit as f32;
+
+pub(crate) const RICH_ADDRESSING_OPCODE_FRACTION: f32 =
+    MAIN_VM_CYCLE_FRACTION + 3.0 * RAM_PERMUTATION_CYCLE_FRACTION;
+
+pub(crate) const AVERAGE_OPCODE_FRACTION: f32 =
+    MAIN_VM_CYCLE_FRACTION + RAM_PERMUTATION_CYCLE_FRACTION;
+
+pub(crate) const STORAGE_READ_BASE_FRACTION: f32 = MAIN_VM_CYCLE_FRACTION
+    + RAM_PERMUTATION_CYCLE_FRACTION
+    + LOG_DEMUXER_CYCLE_FRACTION
+    + STORAGE_SORTER_CYCLE_FRACTION;
+
+pub(crate) const EVENT_OR_L1_MESSAGE_FRACTION: f32 = 2.0 * MAIN_VM_CYCLE_FRACTION
+    + RAM_PERMUTATION_CYCLE_FRACTION
+    + 2.0 * LOG_DEMUXER_CYCLE_FRACTION
+    + 2.0 * EVENTS_OR_L1_MESSAGES_SORTER_CYCLE_FRACTION;
+
+pub(crate) const STORAGE_WRITE_BASE_FRACTION: f32 = 2.0 * MAIN_VM_CYCLE_FRACTION
+    + RAM_PERMUTATION_CYCLE_FRACTION
+    + 2.0 * LOG_DEMUXER_CYCLE_FRACTION
+    + 2.0 * STORAGE_SORTER_CYCLE_FRACTION;
+
+pub(crate) const FAR_CALL_FRACTION: f32 = 2.0 * MAIN_VM_CYCLE_FRACTION
+    + RAM_PERMUTATION_CYCLE_FRACTION
+    + STORAGE_SORTER_CYCLE_FRACTION
+    + CODE_DECOMMITTER_SORTER_CYCLE_FRACTION;
+
+pub(crate) const UMA_WRITE_FRACTION: f32 =
+    2.0 * MAIN_VM_CYCLE_FRACTION + 5.0 * RAM_PERMUTATION_CYCLE_FRACTION;
+
+pub(crate) const UMA_READ_FRACTION: f32 =
+    2.0 * MAIN_VM_CYCLE_FRACTION + 3.0 * RAM_PERMUTATION_CYCLE_FRACTION;
+
+pub(crate) const PRECOMPILE_CALL_COMMON_FRACTION: f32 =
+    MAIN_VM_CYCLE_FRACTION + RAM_PERMUTATION_CYCLE_FRACTION + LOG_DEMUXER_CYCLE_FRACTION;