feat(evm): support library linking (#135)

matter-labs · Jan 26, 2025 · 4ac605d · 4ac605d
1 parent 20c838d
commit 4ac605d
Show file tree

Hide file tree

Showing 36 changed files with 318 additions and 935 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler_tester/Cargo.toml b/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"

diff --git a/compiler_tester/src/compiler_tester/main.rs b/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)
         }
     }?;

diff --git a/compiler_tester/src/compilers/eravm/mod.rs b/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;
 

diff --git a/compiler_tester/src/compilers/llvm/mod.rs b/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;
 
@@ -116,7 +116,6 @@ impl Compiler for LLVMCompiler {
             era_compiler_common::HashType::Ipfs,
             mode.llvm_optimizer_settings.to_owned(),
             llvm_options,
-            None,
             debug_config.clone(),
         )?;
         build.check_errors()?;

diff --git a/compiler_tester/src/compilers/mod.rs b/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;
 

diff --git a/compiler_tester/src/compilers/solidity/mod.rs b/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;
@@ -426,6 +426,8 @@ impl Compiler for SolidityCompiler {
 
         let solc_compiler = SolidityCompiler::executable(&mode.solc_version)?;
 
+        let linker_symbols = libraries.as_linker_symbols()?;
+
         let project = era_compiler_solidity::Project::try_from_solc_output(
             libraries,
             mode.solc_codegen,
@@ -439,10 +441,11 @@ impl Compiler for SolidityCompiler {
             era_compiler_common::HashType::Ipfs,
             mode.llvm_optimizer_settings.to_owned(),
             llvm_options,
-            None,
             debug_config,
         )?;
         build.check_errors()?;
+        let build = build.link(linker_symbols);
+        build.check_errors()?;
         let builds: HashMap<String, EVMBuild> = build
             .results
             .into_iter()

diff --git a/compiler_tester/src/compilers/solidity/upstream/mod.rs b/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;

diff --git a/compiler_tester/src/compilers/vyper/mod.rs b/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!()
     }
 

diff --git a/compiler_tester/src/compilers/yul/mod.rs b/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;