compiles (currently depending on a local branch)

matter-labs · Oct 6, 2023 · 53213be · 53213be
1 parent 6d1145f
commit 53213be
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 40 deletions.
diff --git a/bootloader/test_infra/Cargo.lock b/bootloader/test_infra/Cargo.lock
diff --git a/bootloader/test_infra/Cargo.toml b/bootloader/test_infra/Cargo.toml
@@ -7,12 +7,12 @@ edition = "2021"
 
 [dependencies]
 
-vm = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
-zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
-zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
-zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
-zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
-vlog = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
+vm = { git = "https://github.com/matter-labs/zksync-era.git", branch = "mmzk_1006_fix_tracer" }
+zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", branch = "mmzk_1006_fix_tracer" }
+zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", branch = "mmzk_1006_fix_tracer" }
+zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", branch = "mmzk_1006_fix_tracer" }
+zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", branch = "mmzk_1006_fix_tracer" }
+vlog = { git = "https://github.com/matter-labs/zksync-era.git", branch = "mmzk_1006_fix_tracer" }
 
 colored = "2.0"
 hex = "0.4"

diff --git a/bootloader/test_infra/src/tracer.rs b/bootloader/test_infra/src/tracer.rs
@@ -5,7 +5,7 @@ use colored::Colorize;
 use once_cell::sync::OnceCell;
 use vm::{
     DynTracer, ExecutionEndTracer, ExecutionProcessing, Halt, HistoryMode, SimpleMemory,
-    VmExecutionResultAndLogs, VmTracer,
+    TracerExecutionStatus, TracerExecutionStopReason, VmExecutionResultAndLogs, VmTracer,
 };
 use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::zkevm_test_harness::zk_evm::tracing::{BeforeExecutionData, VmLocalStateData};
@@ -73,15 +73,15 @@ impl<S, H: HistoryMode> DynTracer<S, H> for BootloaderTestTracer {
 }
 
 impl<H: HistoryMode> ExecutionEndTracer<H> for BootloaderTestTracer {
-    fn should_stop_execution(&self) -> bool {
+    fn should_stop_execution(&self) -> TracerExecutionStatus {
         if let Some(TestResult {
             test_name: _,
             result: Err(_),
         }) = self.test_result.get()
         {
-            return true;
+            return TracerExecutionStatus::Stop(TracerExecutionStopReason::Finish);
         }
-        return false;
+        return TracerExecutionStatus::Continue;
     }
 }
 

diff --git a/package.json b/package.json
@@ -22,7 +22,6 @@
     "@types/chai": "^4.3.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.34",
-    "@typechain/hardhat": "^8.0.0",
     "chai": "^4.3.6",
     "mocha": "^10.0.0",
     "prettier": "^2.3.0",

diff --git a/yarn.lock b/yarn.lock
@@ -859,10 +859,10 @@
     lodash "^4.17.15"
     ts-essentials "^7.0.1"
 
-"@typechain/hardhat@^8.0.0":
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/@typechain/hardhat/-/hardhat-8.0.3.tgz#a114825f130405bbb8e535314003733b7ce3f91c"
-  integrity sha512-MytSmJJn+gs7Mqrpt/gWkTCOpOQ6ZDfRrRT2gtZL0rfGe4QrU4x9ZdW15fFbVM/XTa+5EsKiOMYXhRABibNeng==
+"@typechain/hardhat@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@typechain/hardhat/-/hardhat-7.0.0.tgz#ffa7465328150e793007fee616ae7b76ed20784d"
+  integrity sha512-XB79i5ewg9Met7gMVGfgVkmypicbnI25T5clJBEooMoW2161p4zvKFpoS2O+lBppQyMrPIZkdvl2M3LMDayVcA==
   dependencies:
     fs-extra "^9.1.0"