fix: improve the interpreter tests

matter-labs · May 8, 2024 · a2715a4 · a2715a4
1 parent 2fd1db1
commit a2715a4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler_tester/Cargo.toml b/compiler_tester/Cargo.toml
@@ -44,7 +44,7 @@ zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly", br
 zkevm_opcode_defs = { git = "https://github.com/matter-labs/era-zkevm_opcode_defs", branch = "v1.5.0" }
 zkevm_tester = { git = "https://github.com/matter-labs/era-zkevm_tester", branch = "v1.5.0" }
 
-vm2 = { git = "https://github.com/matter-labs/vm2", optional = true }
+# vm2 = { git = "https://github.com/matter-labs/vm2", optional = true }
 
 era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" }
 era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "main" }

diff --git a/compiler_tester/src/vm/eravm/system_contracts.rs b/compiler_tester/src/vm/eravm/system_contracts.rs
@@ -105,9 +105,9 @@ impl SystemContracts {
     const PATH_CODE_ORACLE: &'static str =
         "era-contracts/system-contracts/contracts/precompiles/CodeOracle.yul";
 
-    /// The ETH token system contract implementation path.
-    const PATH_ETH_TOKEN: &'static str =
-        "era-contracts/system-contracts/contracts/L2EthToken.sol:L2EthToken";
+    /// The base token system contract implementation path.
+    const PATH_BASE_TOKEN: &'static str =
+        "era-contracts/system-contracts/contracts/L2BaseToken.sol:L2BaseToken";
 
     /// The EVM gas manager system contract implementation path.
     const PATH_EVM_GAS_MANAGER: &'static str =
@@ -239,7 +239,7 @@ impl SystemContracts {
             ),
             (
                 web3::types::Address::from_low_u64_be(zkevm_opcode_defs::ADDRESS_ETH_TOKEN.into()),
-                Self::PATH_ETH_TOKEN,
+                Self::PATH_BASE_TOKEN,
             ),
             (
                 web3::types::Address::from_low_u64_be(0x8013),

diff --git a/era-contracts b/era-contracts
diff --git a/system-contracts-stable-build b/system-contracts-stable-build
diff --git a/tests b/tests