remove the old unmaintained EVM emulator

LLVM.lock

@@ -1,2 +1,2 @@
 url = "https://github.com/matter-labs/era-compiler-llvm"
-branch = "kpv-evm-libraries-support"
+branch = "main"

compiler_tester/Cargo.toml

@@ -40,7 +40,6 @@ lazy_static = "=1.5.0"
 bincode = "=1.3.3"
 chrono = "=0.4.38"
 
-evm = { git = "https://github.com/rust-ethereum/evm", rev = "f7a23df6c478ca6a151af5f60e62944800529a61" }
 revm = { git = "https://github.com/bluealloy/revm", rev = "fa5650ee8a4d802f4f3557014dd157adfb074460" }
 
 zkevm_opcode_defs = "=0.150.6"
@@ -49,10 +48,10 @@ vm2 = { git = "https://github.com/matter-labs/vm2", optional = true, package = "
 
 era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" }
 era-compiler-downloader = { 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-1846-support-libraries-in-the-evm-linker" }
-era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-cpr-1846-support-libraries-in-the-evm-linker" }
-era-solc = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-cpr-1846-support-libraries-in-the-evm-linker" }
-era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "az-cpr-1846-support-libraries-in-the-evm-linker" }
+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-solc = { 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" }
 
 solidity-adapter = { path = "../solidity_adapter" }
 benchmark-analyzer = { path = "../benchmark_analyzer" }
@@ -70,6 +69,6 @@ features = ["blocking"]
 
 [dependencies.inkwell]
 git = "https://github.com/matter-labs-forks/inkwell"
-branch = "az-cpr-1846-support-libraries-in-the-evm-linker"
+branch = "llvm-17"
 default-features = false
 features = ["llvm17-0", "no-libffi-linking", "target-eravm", "target-evm"]

compiler_tester/src/compiler_tester/main.rs

@@ -211,7 +211,7 @@ fn main_inner(arguments: Arguments) -> anyhow::Result<()> {
                 )
         }
         compiler_tester::Environment::REVM => {
-            compiler_tester::EVM::download(executable_download_config_paths)?;
+            compiler_tester::REVM::download(executable_download_config_paths)?;
             compiler_tester.run_revm(toolchain)
         }
     }?;

compiler_tester/src/compilers/eravm/mod.rs

@@ -11,7 +11,7 @@ use era_solc::CollectableError;
 use crate::compilers::mode::Mode;
 use crate::compilers::Compiler;
 use crate::vm::eravm::input::Input as EraVMInput;
-use crate::vm::evm::input::Input as EVMInput;
+use crate::vm::revm::input::Input as EVMInput;
 
 use self::mode::Mode as EraVMMode;
 

compiler_tester/src/compilers/llvm/mod.rs

@@ -11,8 +11,8 @@ use era_solc::CollectableError;
 use crate::compilers::mode::Mode;
 use crate::compilers::Compiler;
 use crate::vm::eravm::input::Input as EraVMInput;
-use crate::vm::evm::input::build::Build as EVMBuild;
-use crate::vm::evm::input::Input as EVMInput;
+use crate::vm::revm::input::build::Build as EVMBuild;
+use crate::vm::revm::input::Input as EVMInput;
 
 use self::mode::Mode as LLVMMode;
 

compiler_tester/src/compilers/mod.rs

@@ -11,7 +11,7 @@ pub mod vyper;
 pub mod yul;
 
 use crate::vm::eravm::input::Input as EraVMInput;
-use crate::vm::evm::input::Input as EVMInput;
+use crate::vm::revm::input::Input as EVMInput;
 
 use self::mode::Mode;
 

compiler_tester/src/compilers/solidity/mod.rs

@@ -19,8 +19,8 @@ use crate::compilers::cache::Cache;
 use crate::compilers::mode::Mode;
 use crate::compilers::Compiler;
 use crate::vm::eravm::input::Input as EraVMInput;
-use crate::vm::evm::input::build::Build as EVMBuild;
-use crate::vm::evm::input::Input as EVMInput;
+use crate::vm::revm::input::build::Build as EVMBuild;
+use crate::vm::revm::input::Input as EVMInput;
 
 use self::cache_key::CacheKey;
 use self::mode::Mode as SolidityMode;

compiler_tester/src/compilers/solidity/upstream/mod.rs

@@ -16,8 +16,8 @@ use crate::compilers::yul::mode_upstream::Mode as YulUpstreamMode;
 use crate::compilers::Compiler;
 use crate::toolchain::Toolchain;
 use crate::vm::eravm::input::Input as EraVMInput;
-use crate::vm::evm::input::build::Build as EVMBuild;
-use crate::vm::evm::input::Input as EVMInput;
+use crate::vm::revm::input::build::Build as EVMBuild;
+use crate::vm::revm::input::Input as EVMInput;
 
 use self::mode::Mode as SolidityUpstreamMode;
 use self::solc::standard_json::input::language::Language as SolcStandardJsonInputLanguage;

compiler_tester/src/compilers/vyper/mod.rs

@@ -16,6 +16,7 @@ use crate::compilers::cache::Cache;
 use crate::compilers::mode::Mode;
 use crate::compilers::Compiler;
 use crate::vm::eravm::input::Input as EraVMInput;
+use crate::vm::revm::input::Input as EVMInput;
 
 use self::cache_key::CacheKey;
 use self::mode::Mode as VyperMode;
@@ -267,7 +268,7 @@ impl Compiler for VyperCompiler {
         _test_params: Option<&solidity_adapter::Params>,
         _llvm_options: Vec<String>,
         _debug_config: Option<era_compiler_llvm_context::DebugConfig>,
-    ) -> anyhow::Result<crate::vm::evm::input::Input> {
+    ) -> anyhow::Result<EVMInput> {
         todo!()
     }
 

compiler_tester/src/compilers/yul/mod.rs

@@ -16,8 +16,8 @@ use crate::compilers::solidity::SolidityCompiler;
 use crate::compilers::Compiler;
 use crate::toolchain::Toolchain;
 use crate::vm::eravm::input::Input as EraVMInput;
-use crate::vm::evm::input::build::Build as EVMBuild;
-use crate::vm::evm::input::Input as EVMInput;
+use crate::vm::revm::input::build::Build as EVMBuild;
+use crate::vm::revm::input::Input as EVMInput;
 
 use self::mode::Mode as YulMode;
 

compiler_tester/src/directories/ethereum/test.rs

@@ -19,7 +19,7 @@ use crate::test::selector::TestSelector;
 use crate::test::Test;
 use crate::vm::address_iterator::AddressIterator;
 use crate::vm::eravm::address_iterator::EraVMAddressIterator;
-use crate::vm::evm::address_iterator::EVMAddressIterator;
+use crate::vm::revm::address_iterator::EVMAddressIterator;
 
 ///
 /// The Ethereum compiler test.

compiler_tester/src/directories/matter_labs/test/metadata/case/mod.rs

@@ -14,7 +14,7 @@ use crate::environment::Environment;
 use crate::test::instance::Instance;
 use crate::vm::address_iterator::AddressIterator;
 use crate::vm::eravm::address_iterator::EraVMAddressIterator;
-use crate::vm::evm::address_iterator::EVMAddressIterator;
+use crate::vm::revm::address_iterator::EVMAddressIterator;
 
 use self::input::expected::Expected;
 use self::input::Input;

compiler_tester/src/directories/matter_labs/test/mod.rs

@@ -25,7 +25,7 @@ use crate::test::selector::TestSelector;
 use crate::test::Test;
 use crate::vm::address_iterator::AddressIterator;
 use crate::vm::eravm::address_iterator::EraVMAddressIterator;
-use crate::vm::evm::address_iterator::EVMAddressIterator;
+use crate::vm::revm::address_iterator::EVMAddressIterator;
 
 use self::metadata::case::input::calldata::Calldata as MatterLabsCaseInputCalldata;
 use self::metadata::case::input::expected::Expected as MatterLabsCaseInputExpected;