From 759fd6a15df8e0884c2ce740832b6ef213375a83 Mon Sep 17 00:00:00 2001 From: Oleksandr Zarudnyi Date: Thu, 23 May 2024 09:48:56 +0200 Subject: [PATCH] chore: update deps and submodules --- .gitmodules | 4 ++-- Cargo.lock | 6 +++--- compiler_tester/Cargo.toml | 6 +++--- .../src/vm/eravm/system_contracts.rs | 20 +++++++++---------- era-contracts | 2 +- fuzzer/Cargo.toml | 4 ++-- solidity | 2 +- tests | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.gitmodules b/.gitmodules index b7ce68af..2ab6cdff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [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 @@ -9,4 +9,4 @@ [submodule "era-contracts"] path = era-contracts url = https://github.com/matter-labs/era-contracts - branch = release-v23 + branch = evm-equivalence-yul diff --git a/Cargo.lock b/Cargo.lock index de609299..4d445984 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -506,7 +506,7 @@ dependencies = [ [[package]] name = "era-compiler-llvm-context" version = "1.5.0" -source = "git+https://github.com/matter-labs/era-compiler-llvm-context?branch=az-cpr-1702-support-extcodecopy-codecopy#7291c25efe8273e37541c4fb73c04aaa0fab9720" +source = "git+https://github.com/matter-labs/era-compiler-llvm-context?branch=main#fbfcee5edc1ed975686c24c161cf0b8f7dcde682" dependencies = [ "anyhow", "era-compiler-common", @@ -525,7 +525,7 @@ dependencies = [ [[package]] name = "era-compiler-solidity" version = "1.5.0" -source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=az-cpr-1702-support-extcodecopy-codecopy#5a1d7a9e535377bec0ec531677a23ba2417a12f6" +source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=main#59408918ada305f448bf475ef54049241b69e291" dependencies = [ "anyhow", "colored", @@ -554,7 +554,7 @@ dependencies = [ [[package]] name = "era-compiler-vyper" version = "1.5.0" -source = "git+https://github.com/matter-labs/era-compiler-vyper?branch=az-cpr-1702-support-extcodecopy-codecopy#318ff89cee78f9a3695ae6db33ba5b27ee69bce5" +source = "git+https://github.com/matter-labs/era-compiler-vyper?branch=main#8e0e189b14eb106144ece77401dffaecb872185a" dependencies = [ "anyhow", "colored", diff --git a/compiler_tester/Cargo.toml b/compiler_tester/Cargo.toml index cdd050ca..6819f1e0 100644 --- a/compiler_tester/Cargo.toml +++ b/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" } diff --git a/compiler_tester/src/vm/eravm/system_contracts.rs b/compiler_tester/src/vm/eravm/system_contracts.rs index b135f408..fc02b5c3 100644 --- a/compiler_tester/src/vm/eravm/system_contracts.rs +++ b/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, }) } diff --git a/era-contracts b/era-contracts index 41fb9d91..b4788f6c 160000 --- a/era-contracts +++ b/era-contracts @@ -1 +1 @@ -Subproject commit 41fb9d91819890dc756cb548000dd9ba98e7805c +Subproject commit b4788f6cf09c47f8eb2c18e35399b3a611b81131 diff --git a/fuzzer/Cargo.toml b/fuzzer/Cargo.toml index bc803f32..fa4bdc4e 100644 --- a/fuzzer/Cargo.toml +++ b/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" } diff --git a/solidity b/solidity index 8a97fa7a..f162db00 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 8a97fa7a1db1ec509221ead6fea6802c684ee887 +Subproject commit f162db005762776333a044520fb100b24b9be7cb diff --git a/tests b/tests index 702b8c6e..57e6ddf2 160000 --- a/tests +++ b/tests @@ -1 +1 @@ -Subproject commit 702b8c6efa56e00216fca9332bc67e60f64dbef9 +Subproject commit 57e6ddf2d4537fcc595d74b352a66088db80c57f