fix: test zksolc interface changes after unification (#117)

matter-labs · Oct 31, 2024 · 1939677 · 1939677
1 parent 5c4da35
commit 1939677
Show file tree

Hide file tree

Showing 25 changed files with 271 additions and 252 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/LLVM.lock b/LLVM.lock
@@ -1,2 +1,2 @@
 url = "https://github.com/matter-labs/era-compiler-llvm"
-branch = "main"
+branch = "kpv-eravm-fix-linker-duplicating-symbols"
diff --git a/README.md b/README.md
@@ -169,7 +169,7 @@ When testing is done, these tags should be removed.
 - [0.4.10; latest] for compiling Solidity via EVM assembly
 - [0.3.3, 0.3.9] for compiling Vyper via LLL IR
 
-### Compiler pipelines
+### Compiler codegens
 
 Currently only relevant for the Solidity compiler, where you can choose the IR:
 

diff --git a/compiler_tester/src/compilers/eravm/mod.rs b/compiler_tester/src/compilers/eravm/mod.rs
@@ -27,7 +27,7 @@ impl Compiler for EraVMCompiler {
         &self,
         _test_path: String,
         sources: Vec<(String, String)>,
-        _libraries: BTreeMap<String, BTreeMap<String, String>>,
+        _libraries: era_compiler_solidity::SolcStandardJsonInputSettingsLibraries,
         _mode: &Mode,
         llvm_options: Vec<String>,
         debug_config: Option<era_compiler_llvm_context::DebugConfig>,
@@ -54,6 +54,7 @@ impl Compiler for EraVMCompiler {
         let build = project.compile_to_eravm(
             &mut vec![],
             true,
+            BTreeMap::new(),
             era_compiler_common::HashType::Ipfs,
             era_compiler_llvm_context::OptimizerSettings::none(),
             llvm_options,
@@ -75,7 +76,7 @@ impl Compiler for EraVMCompiler {
         &self,
         _test_path: String,
         _sources: Vec<(String, String)>,
-        _libraries: BTreeMap<String, BTreeMap<String, String>>,
+        _libraries: era_compiler_solidity::SolcStandardJsonInputSettingsLibraries,
         _mode: &Mode,
         _test_params: Option<&solidity_adapter::Params>,
         _llvm_options: Vec<String>,

diff --git a/compiler_tester/src/compilers/llvm/mod.rs b/compiler_tester/src/compilers/llvm/mod.rs
@@ -4,7 +4,6 @@
 
 pub mod mode;
 
-use std::collections::BTreeMap;
 use std::collections::HashMap;
 
 use era_compiler_solidity::CollectableError;
@@ -40,7 +39,7 @@ impl Compiler for LLVMCompiler {
         &self,
         _test_path: String,
         sources: Vec<(String, String)>,
-        _libraries: BTreeMap<String, BTreeMap<String, String>>,
+        libraries: era_compiler_solidity::SolcStandardJsonInputSettingsLibraries,
         mode: &Mode,
         llvm_options: Vec<String>,
         debug_config: Option<era_compiler_llvm_context::DebugConfig>,
@@ -53,6 +52,8 @@ impl Compiler for LLVMCompiler {
             .0
             .clone();
 
+        let linker_symbols = libraries.as_linker_symbols()?;
+
         let project = era_compiler_solidity::Project::try_from_llvm_ir_sources(
             sources
                 .into_iter()
@@ -63,12 +64,14 @@ impl Compiler for LLVMCompiler {
                     )
                 })
                 .collect(),
+            libraries,
             None,
         )?;
 
         let build = project.compile_to_eravm(
             &mut vec![],
             true,
+            linker_symbols,
             era_compiler_common::HashType::Ipfs,
             mode.llvm_optimizer_settings.to_owned(),
             llvm_options,
@@ -90,7 +93,7 @@ impl Compiler for LLVMCompiler {
         &self,
         _test_path: String,
         sources: Vec<(String, String)>,
-        _libraries: BTreeMap<String, BTreeMap<String, String>>,
+        _libraries: era_compiler_solidity::SolcStandardJsonInputSettingsLibraries,
         mode: &Mode,
         _test_params: Option<&solidity_adapter::Params>,
         llvm_options: Vec<String>,
@@ -114,6 +117,7 @@ impl Compiler for LLVMCompiler {
                     )
                 })
                 .collect(),
+            era_compiler_solidity::SolcStandardJsonInputSettingsLibraries::default(),
             None,
         )?;
 

diff --git a/compiler_tester/src/compilers/mod.rs b/compiler_tester/src/compilers/mod.rs
@@ -10,8 +10,6 @@ pub mod solidity;
 pub mod vyper;
 pub mod yul;
 
-use std::collections::BTreeMap;
-
 use crate::vm::eravm::input::Input as EraVMInput;
 use crate::vm::evm::input::Input as EVMInput;
 
@@ -28,7 +26,7 @@ pub trait Compiler: Send + Sync + 'static {
         &self,
         test_path: String,
         sources: Vec<(String, String)>,
-        libraries: BTreeMap<String, BTreeMap<String, String>>,
+        libraries: era_compiler_solidity::SolcStandardJsonInputSettingsLibraries,
         mode: &Mode,
         llvm_options: Vec<String>,
         debug_config: Option<era_compiler_llvm_context::DebugConfig>,
@@ -41,7 +39,7 @@ pub trait Compiler: Send + Sync + 'static {
         &self,
         test_path: String,
         sources: Vec<(String, String)>,
-        libraries: BTreeMap<String, BTreeMap<String, String>>,
+        libraries: era_compiler_solidity::SolcStandardJsonInputSettingsLibraries,
         mode: &Mode,
         test_params: Option<&solidity_adapter::Params>,
         llvm_options: Vec<String>,

diff --git a/compiler_tester/src/compilers/solidity/cache_key.rs b/compiler_tester/src/compilers/solidity/cache_key.rs
@@ -12,7 +12,7 @@ pub struct CacheKey {
     /// The Solidity compiler version.
     pub version: semver::Version,
     /// The Solidity compiler output type.
-    pub pipeline: era_compiler_solidity::SolcPipeline,
+    pub codegen: era_compiler_solidity::SolcStandardJsonInputSettingsCodegen,
     /// Whether to enable the EVMLA codegen via Yul IR.
     pub via_ir: bool,
     /// Whether to run the Solidity compiler optimizer.
@@ -26,14 +26,14 @@ impl CacheKey {
     pub fn new(
         test_path: String,
         version: semver::Version,
-        pipeline: era_compiler_solidity::SolcPipeline,
+        codegen: era_compiler_solidity::SolcStandardJsonInputSettingsCodegen,
         via_ir: bool,
         optimize: bool,
     ) -> Self {
         Self {
             test_path,
             version,
-            pipeline,
+            codegen,
             via_ir,
             optimize,
         }