Merge branch 'main' into anastasiia-pla-578

matter-labs · Oct 11, 2023 · 967fdcc · 967fdcc
2 parents 67e0ed4 + c175033
commit 967fdcc
Show file tree

Hide file tree

Showing 164 changed files with 13,229 additions and 1,144 deletions.
diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
@@ -1,6 +1,6 @@
 {
   "sdk/zksync-web3.js": "0.15.4",
   "sdk/zksync-rs": "0.4.0",
-  "core": "15.1.1",
+  "core": "16.0.0",
   "prover": "7.1.1"
 }
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [16.0.0](https://github.com/matter-labs/zksync-era/compare/core-v15.1.1...core-v16.0.0) (2023-10-11)
+
+
+### ⚠ BREAKING CHANGES
+
+* **vm:** Update Refund model ([#181](https://github.com/matter-labs/zksync-era/issues/181))
+
+### Features
+
+* change chainId to u64 ([#167](https://github.com/matter-labs/zksync-era/issues/167)) ([f14bf68](https://github.com/matter-labs/zksync-era/commit/f14bf6851059a7add6677c89b3192e1b23cbf3c5))
+* **merkle tree:** Provide Merkle proofs for tree entries and entry ranges ([#119](https://github.com/matter-labs/zksync-era/issues/119)) ([1e30d0b](https://github.com/matter-labs/zksync-era/commit/1e30d0ba8d243f41ad1e86e77d24848d64bd11e6))
+* **storage:** save enum indices in RocksDB ([#162](https://github.com/matter-labs/zksync-era/issues/162)) ([bab099d](https://github.com/matter-labs/zksync-era/commit/bab099d83d9640c965bc02b32d90cce86a3f53cb))
+* **vm:** Update Refund model ([#181](https://github.com/matter-labs/zksync-era/issues/181)) ([92b6f59](https://github.com/matter-labs/zksync-era/commit/92b6f5999b66666f01b89b5ff188d220139751a2))
+
+
+### Bug Fixes
+
+* **db:** drop constraint prover_jobs_fri_l1_batch_number_fkey ([#173](https://github.com/matter-labs/zksync-era/issues/173)) ([fa71650](https://github.com/matter-labs/zksync-era/commit/fa7165002884e7137b623feec3721cbbe3332a40))
+* **vm:** Make execution status and stop reason public ([#169](https://github.com/matter-labs/zksync-era/issues/169)) ([f98c4fa](https://github.com/matter-labs/zksync-era/commit/f98c4fab0f10d190ceb2ae9bfa77929bf793a6ea))
+
 ## [15.1.1](https://github.com/matter-labs/zksync-era/compare/core-v15.1.0...core-v15.1.1) (2023-10-05)
 
 

diff --git a/core/bin/external_node/src/config/mod.rs b/core/bin/external_node/src/config/mod.rs
@@ -197,6 +197,9 @@ pub struct OptionalENConfig {
     /// Whether to try running EN with MultiVM.
     #[serde(default)]
     pub experimental_multivm_support: bool,
+    /// Number of keys that is processed by enum_index migration in State Keeper each L1 batch.
+    #[serde(default = "OptionalENConfig::default_enum_index_migration_chunk_size")]
+    pub enum_index_migration_chunk_size: usize,
 }
 
 impl OptionalENConfig {
@@ -283,6 +286,10 @@ impl OptionalENConfig {
         10
     }
 
+    const fn default_enum_index_migration_chunk_size() -> usize {
+        5000
+    }
+
     pub fn polling_interval(&self) -> Duration {
         Duration::from_millis(self.polling_interval)
     }

diff --git a/core/bin/external_node/src/main.rs b/core/bin/external_node/src/main.rs
@@ -76,6 +76,7 @@ async fn build_state_keeper(
             max_allowed_l2_tx_gas_limit,
             save_call_traces,
             false,
+            config.optional.enum_index_migration_chunk_size,
         ));
 
     let io = Box::new(

diff --git a/core/lib/config/src/configs/chain.rs b/core/lib/config/src/configs/chain.rs
@@ -109,6 +109,9 @@ pub struct StateKeeperConfig {
     /// Flag which will enable storage to cache witness_inputs during State Keeper's run.
     /// NOTE: This will slow down StateKeeper, to be used in non-production environments!
     pub upload_witness_inputs_to_gcs: bool,
+
+    /// Number of keys that is processed by enum_index migration in State Keeper each L1 batch.
+    pub enum_index_migration_chunk_size: Option<usize>,
 }
 
 impl StateKeeperConfig {
@@ -122,6 +125,10 @@ impl StateKeeperConfig {
             default_aa: self.default_aa_hash,
         }
     }
+
+    pub fn enum_index_migration_chunk_size(&self) -> usize {
+        self.enum_index_migration_chunk_size.unwrap_or(1_000)
+    }
 }
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
@@ -226,6 +233,7 @@ mod tests {
                 virtual_blocks_interval: 1,
                 virtual_blocks_per_miniblock: 1,
                 upload_witness_inputs_to_gcs: false,
+                enum_index_migration_chunk_size: Some(2_000),
             },
             operations_manager: OperationsManagerConfig {
                 delay_interval: 100,
@@ -273,6 +281,7 @@ mod tests {
             CHAIN_STATE_KEEPER_VALIDATION_COMPUTATIONAL_GAS_LIMIT="10000000"
             CHAIN_STATE_KEEPER_SAVE_CALL_TRACES="false"
             CHAIN_STATE_KEEPER_UPLOAD_WITNESS_INPUTS_TO_GCS="false"
+            CHAIN_STATE_KEEPER_ENUM_INDEX_MIGRATION_CHUNK_SIZE="2000"
             CHAIN_OPERATIONS_MANAGER_DELAY_INTERVAL="100"
             CHAIN_MEMPOOL_SYNC_INTERVAL_MS="10"
             CHAIN_MEMPOOL_SYNC_BATCH_SIZE="1000"