chore: update deps and submodules

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "tests"]
 	path = tests
 	url = https://github.com/matter-labs/era-compiler-tests
-	branch = az-cpr-1702-support-extcodecopy-codecopy
+	branch = main
 [submodule "solidity"]
 	path = solidity
 	url = https://github.com/ethereum/solidity
 	branch = develop
 [submodule "era-contracts"]
 	path = era-contracts
 	url = https://github.com/matter-labs/era-contracts
-	branch = release-v23
+	branch = evm-equivalence-yul

compiler_tester/Cargo.toml

@@ -47,9 +47,9 @@ zkevm_tester = { git = "https://github.com/matter-labs/era-zkevm_tester", branch
 # 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 = "az-cpr-1702-support-extcodecopy-codecopy" }
-era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-cpr-1702-support-extcodecopy-codecopy" }
-era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "az-cpr-1702-support-extcodecopy-codecopy" }
+era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "main" }
+era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "main" }
+era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "main" }
 
 # era-compiler-common = { path = "../../era-compiler-common" }
 # era-compiler-llvm-context = { path = "../../era-compiler-llvm-context" }

compiler_tester/src/vm/eravm/system_contracts.rs

@@ -239,10 +239,10 @@ impl SystemContracts {
                 web3::types::Address::from_low_u64_be(zkevm_opcode_defs::ADDRESS_ETH_TOKEN.into()),
                 Self::PATH_BASE_TOKEN,
             ),
-            // (
-            //     web3::types::Address::from_low_u64_be(0x8013),
-            //     Self::PATH_EVM_GAS_MANAGER,
-            // ),
+            (
+                web3::types::Address::from_low_u64_be(0x8013),
+                Self::PATH_EVM_GAS_MANAGER,
+            ),
             (
                 web3::types::Address::from_low_u64_be(0x10000),
                 Self::PATH_EVM_PROXY,
@@ -253,7 +253,7 @@ impl SystemContracts {
         for (_, path) in yul_system_contracts.into_iter() {
             yul_file_paths.push(path.to_owned());
         }
-        // yul_file_paths.push(Self::PATH_EVM_INTERPRETER.to_owned());
+        yul_file_paths.push(Self::PATH_EVM_INTERPRETER.to_owned());
         let yul_optimizer_settings =
             era_compiler_llvm_context::OptimizerSettings::evm_interpreter();
         let yul_mode = YulMode::new(yul_optimizer_settings, true).into();
@@ -295,9 +295,9 @@ impl SystemContracts {
         let default_aa = builds.remove(Self::PATH_DEFAULT_AA).ok_or_else(|| {
             anyhow::anyhow!("The default AA code not found in the compiler build artifacts")
         })?;
-        // let evm_interpreter = builds.remove(Self::PATH_EVM_INTERPRETER).ok_or_else(|| {
-        //     anyhow::anyhow!("The EVM interpreter code not found in the compiler build artifacts")
-        // })?;
+        let evm_interpreter = builds.remove(Self::PATH_EVM_INTERPRETER).ok_or_else(|| {
+            anyhow::anyhow!("The EVM interpreter code not found in the compiler build artifacts")
+        })?;
 
         let mut system_contracts =
             Vec::with_capacity(solidity_system_contracts.len() + yul_system_contracts.len());
@@ -321,8 +321,8 @@ impl SystemContracts {
 
         Ok(Self {
             deployed_contracts,
-            default_aa: default_aa.clone(),
-            evm_interpreter: default_aa,
+            default_aa,
+            evm_interpreter,
         })
     }
 

fuzzer/Cargo.toml

@@ -33,8 +33,8 @@ semver = { version = "1.0", features = ["serde"] }
 zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly", branch = "v1.5.0" }
 zkevm_tester = { git = "https://github.com/matter-labs/era-zkevm_tester", branch = "v1.5.0" }
 
-era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "az-cpr-1702-support-extcodecopy-codecopy" }
-era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-cpr-1702-support-extcodecopy-codecopy" }
+era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "main" }
+era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "main" }
 
 compiler-tester = { path = "../compiler_tester" }
 solidity-adapter = { path = "../solidity_adapter" }