Separate compilation and linker phases (#376)

Separate between compilation and linker phases to allow deploy time
linking and back-porting era compiler changes to fix #91. Unlinked
contract binaries (caused by missing libraries or missing factory
dependencies in turn) are emitted as raw ELF object.

Few drive by fixes:
- #98
- A compiler panic on missing libraries definitions.
- Fixes some incosistent type forwarding in JSON output (empty string
vs. null object).
- Remove the unused fallback for size optimization setting.
- Remove the broken `--lvm-ir`  mode.
- CI workflow fixes.

---------

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
Signed-off-by: xermicus <bigcyrill@hotmail.com>
Signed-off-by: xermicus <cyrill@parity.io>

crates/resolc/src/build/contract.rs

@@ -1,10 +1,19 @@
 //! The Solidity contract build.
 
-use std::collections::HashSet;
+use std::collections::BTreeMap;
+use std::collections::BTreeSet;
 use std::fs::File;
 use std::io::Write;
 use std::path::Path;
+use std::path::PathBuf;
 
+use revive_common::ContractIdentifier;
+use revive_common::ObjectFormat;
+use revive_common::BYTE_LENGTH_WORD;
+use revive_common::EXTENSION_JSON;
+use revive_common::EXTENSION_POLKAVM_ASSEMBLY;
+use revive_common::EXTENSION_POLKAVM_BINARY;
+use revive_llvm_context::PolkaVMBuild;
 use revive_solc_json_interface::CombinedJsonContract;
 use revive_solc_json_interface::SolcStandardJsonOutputContract;
 use serde::Deserialize;
@@ -13,92 +22,137 @@ use serde::Serialize;
 /// The Solidity contract build.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Contract {
-    /// The contract path.
-    pub path: String,
-    /// The auxiliary identifier. Used to identify Yul objects.
-    pub identifier: String,
+    /// The contract identifier.
+    pub identifier: ContractIdentifier,
     /// The LLVM module build.
-    pub build: revive_llvm_context::PolkaVMBuild,
+    pub build: PolkaVMBuild,
     /// The metadata JSON.
     pub metadata_json: serde_json::Value,
-    /// The factory dependencies.
-    pub factory_dependencies: HashSet<String>,
+    /// The unlinked missing libraries.
+    pub missing_libraries: BTreeSet<String>,
+    /// The unresolved factory dependencies.
+    pub factory_dependencies: BTreeSet<String>,
+    /// The resolved factory dependencies.
+    pub factory_dependencies_resolved: BTreeMap<[u8; BYTE_LENGTH_WORD], String>,
+    /// The binary object format.
+    pub object_format: ObjectFormat,
 }
 
 impl Contract {
     /// A shortcut constructor.
     pub fn new(
-        path: String,
-        identifier: String,
-        build: revive_llvm_context::PolkaVMBuild,
+        identifier: ContractIdentifier,
+        build: PolkaVMBuild,
         metadata_json: serde_json::Value,
-        factory_dependencies: HashSet<String>,
+        missing_libraries: BTreeSet<String>,
+        factory_dependencies: BTreeSet<String>,
+        object_format: ObjectFormat,
     ) -> Self {
         Self {
-            path,
             identifier,
             build,
             metadata_json,
+            missing_libraries,
             factory_dependencies,
+            factory_dependencies_resolved: BTreeMap::new(),
+            object_format,
         }
     }
 
+    /// Writes the contract text assembly and bytecode to terminal.
+    pub fn write_to_terminal(
+        self,
+        path: String,
+        output_metadata: bool,
+        output_assembly: bool,
+        output_binary: bool,
+    ) -> anyhow::Result<()> {
+        writeln!(std::io::stdout(), "\n======= {path} =======")?;
+        if output_assembly {
+            writeln!(
+                std::io::stdout(),
+                "Assembly:\n{}",
+                self.build.assembly_text.unwrap_or_default(),
+            )?;
+        }
+        if output_metadata {
+            writeln!(std::io::stdout(), "Metadata:\n{}", self.metadata_json)?;
+        }
+        if output_binary {
+            writeln!(
+                std::io::stdout(),
+                "Binary:\n{}",
+                hex::encode(self.build.bytecode)
+            )?;
+        }
+
+        Ok(())
+    }
+
     /// Writes the contract text assembly and bytecode to files.
     pub fn write_to_directory(
         self,
         path: &Path,
+        output_metadata: bool,
         output_assembly: bool,
         output_binary: bool,
         overwrite: bool,
     ) -> anyhow::Result<()> {
-        let file_name = Self::short_path(self.path.as_str());
-
-        if output_assembly {
-            let file_name = format!(
-                "{}.{}",
-                file_name,
-                revive_common::EXTENSION_POLKAVM_ASSEMBLY
-            );
-            let mut file_path = path.to_owned();
-            file_path.push(file_name);
+        let file_path = PathBuf::from(self.identifier.path);
+        let file_name = file_path
+            .file_name()
+            .expect("Always exists")
+            .to_str()
+            .expect("Always valid");
+        let output_path = path.to_owned();
+        std::fs::create_dir_all(output_path.as_path())?;
 
+        if output_metadata {
+            let file_path = output_path.join(format!(
+                "{file_name}:{}.{EXTENSION_JSON}",
+                self.identifier.name.as_deref().unwrap_or(file_name),
+            ));
             if file_path.exists() && !overwrite {
                 anyhow::bail!(
                     "Refusing to overwrite an existing file {file_path:?} (use --overwrite to force)."
                 );
-            } else {
-                let assembly_text = self.build.assembly_text;
-
-                File::create(&file_path)
-                    .map_err(|error| {
-                        anyhow::anyhow!("File {:?} creating error: {}", file_path, error)
-                    })?
-                    .write_all(assembly_text.as_bytes())
-                    .map_err(|error| {
-                        anyhow::anyhow!("File {:?} writing error: {}", file_path, error)
-                    })?;
             }
+            std::fs::write(
+                file_path.as_path(),
+                self.metadata_json.to_string().as_bytes(),
+            )
+            .map_err(|error| anyhow::anyhow!("File {file_path:?} writing: {error}"))?;
+        }
+        if output_assembly {
+            let file_path = output_path.join(format!(
+                "{file_name}:{}.{EXTENSION_POLKAVM_ASSEMBLY}",
+                self.identifier.name.as_deref().unwrap_or(file_name),
+            ));
+            if file_path.exists() && !overwrite {
+                anyhow::bail!(
+                    "Refusing to overwrite an existing file {file_path:?} (use --overwrite to force)."
+                );
+            }
+            File::create(&file_path)
+                .map_err(|error| anyhow::anyhow!("File {file_path:?} creating error: {error}"))?
+                .write_all(self.build.assembly_text.unwrap_or_default().as_bytes())
+                .map_err(|error| anyhow::anyhow!("File {file_path:?} writing error: {error}"))?;
         }
 
         if output_binary {
-            let file_name = format!("{}.{}", file_name, revive_common::EXTENSION_POLKAVM_BINARY);
-            let mut file_path = path.to_owned();
-            file_path.push(file_name);
-
+            let file_path = output_path.join(format!(
+                "{file_name}:{}.{EXTENSION_POLKAVM_BINARY}",
+                self.identifier.name.as_deref().unwrap_or(file_name),
+            ));
             if file_path.exists() && !overwrite {
                 anyhow::bail!(
                     "Refusing to overwrite an existing file {file_path:?} (use --overwrite to force)."
                 );
-            } else {
-                File::create(&file_path)
-                    .map_err(|error| {
-                        anyhow::anyhow!("File {:?} creating error: {}", file_path, error)
-                    })?
-                    .write_all(self.build.bytecode.as_slice())
-                    .map_err(|error| {
-                        anyhow::anyhow!("File {:?} writing error: {}", file_path, error)
-                    })?;
             }
+            File::create(&file_path)
+                .map_err(|error| anyhow::anyhow!("File {file_path:?} creating error: {error}"))?
+                .write_all(self.build.bytecode.as_slice())
+                .map_err(|error| anyhow::anyhow!("File {file_path:?} writing error: {error}"))?;
         }
 
         Ok(())
@@ -109,20 +163,30 @@ impl Contract {
         self,
         combined_json_contract: &mut CombinedJsonContract,
     ) -> anyhow::Result<()> {
+        let hexadecimal_bytecode = hex::encode(self.build.bytecode);
+
         if let Some(metadata) = combined_json_contract.metadata.as_mut() {
             *metadata = self.metadata_json.to_string();
         }
 
-        if let Some(asm) = combined_json_contract.asm.as_mut() {
-            *asm = serde_json::Value::String(self.build.assembly_text);
-        }
-        let hexadecimal_bytecode = hex::encode(self.build.bytecode);
+        combined_json_contract.assembly = self.build.assembly_text;
         combined_json_contract.bin = Some(hexadecimal_bytecode);
         combined_json_contract
             .bin_runtime
             .clone_from(&combined_json_contract.bin);
 
-        combined_json_contract.factory_deps = Some(self.build.factory_dependencies);
+        combined_json_contract
+            .missing_libraries
+            .extend(self.missing_libraries);
+        combined_json_contract
+            .factory_deps_unlinked
+            .extend(self.factory_dependencies);
+        combined_json_contract.factory_deps.extend(
+            self.factory_dependencies_resolved
+                .into_iter()
+                .map(|(hash, path)| (hex::encode(hash), path)),
+        );
+        combined_json_contract.object_format = Some(self.object_format);
 
         Ok(())
     }
@@ -132,16 +196,27 @@ impl Contract {
         self,
         standard_json_contract: &mut SolcStandardJsonOutputContract,
     ) -> anyhow::Result<()> {
-        standard_json_contract.metadata = Some(self.metadata_json);
-
-        let assembly_text = self.build.assembly_text;
         let bytecode = hex::encode(self.build.bytecode.as_slice());
-        if let Some(evm) = standard_json_contract.evm.as_mut() {
-            evm.modify(assembly_text, bytecode);
-        }
+        let assembly_text = self.build.assembly_text.unwrap_or_default();
 
-        standard_json_contract.factory_dependencies = Some(self.build.factory_dependencies);
-        standard_json_contract.hash = Some(self.build.bytecode_hash);
+        standard_json_contract.metadata = self.metadata_json;
+        standard_json_contract
+            .evm
+            .get_or_insert_with(Default::default)
+            .modify(assembly_text, bytecode);
+        standard_json_contract.hash = self.build.bytecode_hash.map(hex::encode);
+        standard_json_contract
+            .missing_libraries
+            .extend(self.missing_libraries);
+        standard_json_contract
+            .factory_dependencies_unlinked
+            .extend(self.factory_dependencies);
+        standard_json_contract.factory_dependencies.extend(
+            self.factory_dependencies_resolved
+                .into_iter()
+                .map(|(hash, path)| (hex::encode(hash), path)),
+        );
+        standard_json_contract.object_format = Some(self.object_format);
 
         Ok(())
     }

crates/resolc/src/build/mod.rs

@@ -1,94 +1,352 @@
 //! The Solidity project build.
 
+use std::collections::BTreeMap;
+use std::io::Write;
+use std::path::Path;
+use std::path::PathBuf;
+
+use normpath::PathExt;
+
+use revive_common::ObjectFormat;
+use revive_common::BYTE_LENGTH_ETH_ADDRESS;
+use revive_llvm_context::polkavm_disassemble;
+use revive_llvm_context::polkavm_hash;
+use revive_llvm_context::polkavm_link;
+use revive_llvm_context::DebugConfig;
+use revive_solc_json_interface::combined_json::CombinedJson;
+use revive_solc_json_interface::CombinedJsonContract;
+use revive_solc_json_interface::SolcStandardJsonOutput;
+use revive_solc_json_interface::SolcStandardJsonOutputContract;
+use revive_solc_json_interface::SolcStandardJsonOutputError;
+use revive_solc_json_interface::SolcStandardJsonOutputErrorHandler;
+
+use crate::build::contract::Contract;
+use crate::solc::version::Version as SolcVersion;
+
 pub mod contract;
 
-use std::collections::BTreeMap;
-use std::path::Path;
-
-use revive_solc_json_interface::combined_json::CombinedJson;
-use revive_solc_json_interface::SolcStandardJsonOutput;
-
-use crate::solc::version::Version as SolcVersion;
-use crate::ResolcVersion;
-
-use self::contract::Contract;
-
-/// The Solidity project build.
+/// The Solidity project PVM build.
 #[derive(Debug, Default)]
 pub struct Build {
     /// The contract data,
-    pub contracts: BTreeMap<String, Contract>,
+    pub results: BTreeMap<String, Result<Contract, SolcStandardJsonOutputError>>,
+    /// The additional message to output (added by the revive compiler).
+    pub messages: Vec<SolcStandardJsonOutputError>,
 }
 
 impl Build {
-    /// Writes all contracts to the specified directory.
-    pub fn write_to_directory(
-        self,
-        output_directory: &Path,
+    /// A shorthand constructor.
+    ///
+    /// Note: Takes the supplied `messages`, leaving an empty vec.
+    pub fn new(
+        results: BTreeMap<String, Result<Contract, SolcStandardJsonOutputError>>,
+        messages: &mut Vec<SolcStandardJsonOutputError>,
+    ) -> Self {
+        Self {
+            results,
+            messages: std::mem::take(messages),
+        }
+    }
+
+    /// Links the PVM build.
+    pub fn link(
+        mut self,
+        linker_symbols: BTreeMap<String, [u8; BYTE_LENGTH_ETH_ADDRESS]>,
+        debug_config: &DebugConfig,
+    ) -> Self {
+        let mut contracts: BTreeMap<String, Contract> = self
+            .results
+            .into_iter()
+            .map(|(path, result)| (path, result.expect("Cannot link a project with errors")))
+            .collect();
+
+        loop {
+            let mut linkage_data = BTreeMap::new();
+            for (path, contract) in contracts
+                .iter()
+                .filter(|(_path, contract)| contract.object_format == ObjectFormat::ELF)
+            {
+                match polkavm_link(
+                    &contract.build.bytecode,
+                    &linker_symbols,
+                    &contract
+                        .factory_dependencies
+                        .iter()
+                        .filter_map(|dependency| {
+                            let bytecode_hash = contracts
+                                .get(dependency)
+                                .as_ref()?
+                                .build
+                                .bytecode_hash
+                                .as_ref()?
+                                .to_owned();
+                            Some((dependency.to_owned(), bytecode_hash))
+                        })
+                        .collect(),
+                    !debug_config.emit_debug_info,
+                ) {
+                    Ok((memory_buffer_linked, ObjectFormat::PVM)) => {
+                        let bytecode_hash = polkavm_hash(&memory_buffer_linked);
+                        let assembly_text =
+                            polkavm_disassemble(path, &memory_buffer_linked, debug_config)
+                                .unwrap_or_else(|error| {
+                                    panic!("ICE: The PVM disassembler failed: {error}")
+                                });
+                        linkage_data.insert(
+                            path.to_owned(),
+                            (memory_buffer_linked, bytecode_hash, assembly_text),
+                        );
+                    }
+                    Ok((_memory_buffer_linked, ObjectFormat::ELF)) => {}
+                    Err(error) => self
+                        .messages
+                        .push(SolcStandardJsonOutputError::new_error(error, None, None)),
+                }
+            }
+            if linkage_data.is_empty() {
+                break;
+            }
+
+            for (path, (memory_buffer_linked, bytecode_hash, assembly_text)) in
+                linkage_data.into_iter()
+            {
+                let contract = contracts.get(path.as_str()).expect("Always exists");
+                let factory_dependencies_resolved = contract
+                    .factory_dependencies
+                    .iter()
+                    .filter_map(|dependency| {
+                        Some((
+                            contracts
+                                .get(dependency)
+                                .as_ref()?
+                                .build
+                                .bytecode_hash
+                                .as_ref()?
+                                .to_owned(),
+                            dependency.to_owned(),
+                        ))
+                    })
+                    .collect();
+                let contract = contracts.get_mut(path.as_str()).expect("Always exists");
+                contract.build.bytecode = memory_buffer_linked.as_slice().to_vec();
+                contract.build.bytecode_hash = Some(bytecode_hash);
+                contract.build.assembly_text = Some(assembly_text);
+                contract.factory_dependencies_resolved = factory_dependencies_resolved;
+                contract.object_format = ObjectFormat::PVM;
+            }
+        }
+
+        let results = contracts
+            .into_iter()
+            .map(|(path, contract)| {
+                if contract.object_format == ObjectFormat::ELF {
+                    self.messages.push(SolcStandardJsonOutputError::new_warning(
+                        format!("{path} is unlinked. Consider providing missing libraries."),
+                        None,
+                        None,
+                    ));
+                }
+                (path, Ok(contract))
+            })
+            .collect();
+        Self::new(results, &mut self.messages)
+    }
+
+    /// Writes all contracts to the terminal.
+    pub fn write_to_terminal(
+        mut self,
+        output_metadata: bool,
         output_assembly: bool,
         output_binary: bool,
-        overwrite: bool,
     ) -> anyhow::Result<()> {
-        for (_path, contract) in self.contracts.into_iter() {
-            contract.write_to_directory(
-                output_directory,
+        self.take_and_write_warnings();
+        self.exit_on_error();
+
+        if !output_metadata && !output_assembly && !output_binary {
+            writeln!(
+                std::io::stderr(),
+                "Compiler run successful. No output requested. Use flags --metadata, --asm, --bin."
+            )?;
+            return Ok(());
+        }
+
+        for (path, build) in self.results.into_iter() {
+            build.expect("Always valid").write_to_terminal(
+                path,
+                output_metadata,
                 output_assembly,
                 output_binary,
-                overwrite,
             )?;
         }
 
         Ok(())
     }
 
-    /// Writes all contracts assembly and bytecode to the combined JSON.
-    pub fn write_to_combined_json(self, combined_json: &mut CombinedJson) -> anyhow::Result<()> {
-        for (path, contract) in self.contracts.into_iter() {
-            let combined_json_contract = combined_json
-                .contracts
-                .iter_mut()
-                .find_map(|(json_path, contract)| {
-                    if path.ends_with(json_path) {
-                        Some(contract)
-                    } else {
-                        None
-                    }
-                })
-                .ok_or_else(|| anyhow::anyhow!("Contract `{}` not found in the project", path))?;
+    /// Writes all contracts to the specified directory.
+    pub fn write_to_directory(
+        mut self,
+        output_directory: &Path,
+        output_metadata: bool,
+        output_assembly: bool,
+        output_binary: bool,
+        overwrite: bool,
+    ) -> anyhow::Result<()> {
+        self.take_and_write_warnings();
+        self.exit_on_error();
 
-            contract.write_to_combined_json(combined_json_contract)?;
+        std::fs::create_dir_all(output_directory)?;
+
+        for build in self.results.into_values() {
+            build.expect("Always valid").write_to_directory(
+                output_directory,
+                output_metadata,
+                output_assembly,
+                output_binary,
+                overwrite,
+            )?;
         }
 
-        combined_json.revive_version = Some(ResolcVersion::default().long);
+        writeln!(
+            std::io::stderr(),
+            "Compiler run successful. Artifact(s) can be found in directory {output_directory:?}."
+        )?;
+        Ok(())
+    }
+
+    /// Writes all contracts assembly and bytecode to the combined JSON.
+    pub fn write_to_combined_json(
+        mut self,
+        combined_json: &mut CombinedJson,
+    ) -> anyhow::Result<()> {
+        self.take_and_write_warnings();
+        self.exit_on_error();
+
+        for result in self.results.into_values() {
+            let build = result.expect("Exits on an error above");
+            let identifier = build.identifier.clone();
+
+            let combined_json_contract =
+                match combined_json
+                    .contracts
+                    .iter_mut()
+                    .find_map(|(json_path, contract)| {
+                        if Self::normalize_full_path(identifier.full_path.as_str())
+                            .ends_with(Self::normalize_full_path(json_path).as_str())
+                        {
+                            Some(contract)
+                        } else {
+                            None
+                        }
+                    }) {
+                    Some(contract) => contract,
+                    None => {
+                        combined_json.contracts.insert(
+                            identifier.full_path.clone(),
+                            CombinedJsonContract::default(),
+                        );
+                        combined_json
+                            .contracts
+                            .get_mut(identifier.full_path.as_str())
+                            .expect("Always exists")
+                    }
+                };
+
+            build.write_to_combined_json(combined_json_contract)?;
+        }
 
         Ok(())
     }
 
     /// Writes all contracts assembly and bytecode to the standard JSON.
     pub fn write_to_standard_json(
-        mut self,
+        self,
         standard_json: &mut SolcStandardJsonOutput,
         solc_version: &SolcVersion,
     ) -> anyhow::Result<()> {
-        let contracts = match standard_json.contracts.as_mut() {
-            Some(contracts) => contracts,
-            None => return Ok(()),
-        };
+        let mut errors = Vec::with_capacity(self.results.len());
+        for result in self.results.into_values() {
+            let build = match result {
+                Ok(build) => build,
+                Err(error) => {
+                    errors.push(error);
+                    continue;
+                }
+            };
+            let identifier = build.identifier.clone();
 
-        for (path, contracts) in contracts.iter_mut() {
-            for (name, contract) in contracts.iter_mut() {
-                let full_name = format!("{path}:{name}");
-
-                if let Some(contract_data) = self.contracts.remove(full_name.as_str()) {
-                    contract_data.write_to_standard_json(contract)?;
+            match standard_json
+                .contracts
+                .get_mut(identifier.path.as_str())
+                .and_then(|contracts| {
+                    contracts.get_mut(
+                        identifier
+                            .name
+                            .as_deref()
+                            .unwrap_or(identifier.path.as_str()),
+                    )
+                }) {
+                Some(contract) => {
+                    build.write_to_standard_json(contract)?;
+                }
+                None => {
+                    let contracts = standard_json
+                        .contracts
+                        .entry(identifier.path.clone())
+                        .or_default();
+                    let mut contract = SolcStandardJsonOutputContract::default();
+                    build.write_to_standard_json(&mut contract)?;
+                    contracts.insert(identifier.name.unwrap_or(identifier.path), contract);
                 }
             }
         }
 
+        standard_json.errors.extend(errors);
         standard_json.version = Some(solc_version.default.to_string());
         standard_json.long_version = Some(solc_version.long.to_owned());
-        standard_json.revive_version = Some(ResolcVersion::default().long);
 
         Ok(())
     }
+
+    /// Normalizes the full contract path.
+    ///
+    /// # Panics
+    /// If the path does not contain a colon.
+    fn normalize_full_path(path: &str) -> String {
+        let mut iterator = path.split(':');
+        let path = iterator.next().expect("Always exists");
+        let name = iterator.next().expect("Always exists");
+
+        let mut full_path = PathBuf::from(path)
+            .normalize()
+            .expect("Path normalization error")
+            .as_os_str()
+            .to_string_lossy()
+            .into_owned();
+        full_path.push(':');
+        full_path.push_str(name);
+        full_path
+    }
+}
+
+impl SolcStandardJsonOutputErrorHandler for Build {
+    fn errors(&self) -> Vec<&SolcStandardJsonOutputError> {
+        let mut errors: Vec<&SolcStandardJsonOutputError> = self
+            .results
+            .values()
+            .filter_map(|build| build.as_ref().err())
+            .collect();
+        errors.extend(self.messages.iter().filter(|message| message.is_error()));
+        errors
+    }
+
+    fn take_warnings(&mut self) -> Vec<SolcStandardJsonOutputError> {
+        let warnings = self
+            .messages
+            .iter()
+            .filter(|message| message.is_warning())
+            .cloned()
+            .collect();
+        self.messages.retain(|message| !message.is_warning());
+        warnings
+    }
 }

crates/resolc/src/const.rs

@@ -1,5 +1,7 @@
 //! Solidity to PolkaVM compiler constants.
 
+use revive_common::BYTE_LENGTH_WORD;
+
 /// The default executable name.
 pub static DEFAULT_EXECUTABLE_NAME: &str = "resolc";
 
@@ -7,10 +9,10 @@ pub static DEFAULT_EXECUTABLE_NAME: &str = "resolc";
 pub const OFFSET_SCRATCH_SPACE: usize = 0;
 
 /// The memory pointer offset.
-pub const OFFSET_MEMORY_POINTER: usize = 2 * revive_common::BYTE_LENGTH_WORD;
+pub const OFFSET_MEMORY_POINTER: usize = 2 * BYTE_LENGTH_WORD;
 
 /// The empty slot offset.
-pub const OFFSET_EMPTY_SLOT: usize = 3 * revive_common::BYTE_LENGTH_WORD;
+pub const OFFSET_EMPTY_SLOT: usize = 3 * BYTE_LENGTH_WORD;
 
 /// The non-reserved memory offset.
-pub const OFFSET_NON_RESERVED: usize = 4 * revive_common::BYTE_LENGTH_WORD;
+pub const OFFSET_NON_RESERVED: usize = 4 * BYTE_LENGTH_WORD;

crates/resolc/src/lib.rs

@@ -1,12 +1,35 @@
 //! Solidity to PolkaVM compiler library.
 
-pub(crate) mod build;
-pub(crate) mod r#const;
-pub(crate) mod missing_libraries;
-pub(crate) mod process;
-pub(crate) mod project;
-pub(crate) mod solc;
-pub(crate) mod version;
+#![allow(clippy::too_many_arguments)]
+
+use std::collections::BTreeMap;
+use std::collections::BTreeSet;
+use std::collections::HashSet;
+use std::io::Write;
+use std::path::PathBuf;
+
+#[cfg(feature = "parallel")]
+use rayon::iter::IntoParallelIterator;
+#[cfg(feature = "parallel")]
+use rayon::iter::ParallelIterator;
+use revive_common::EVMVersion;
+use revive_common::MetadataHash;
+use revive_common::EXIT_CODE_SUCCESS;
+use revive_llvm_context::DebugConfig;
+use revive_llvm_context::OptimizerSettings;
+use revive_solc_json_interface::CombinedJsonSelector;
+use revive_solc_json_interface::ResolcWarning;
+use revive_solc_json_interface::SolcStandardJsonInput;
+use revive_solc_json_interface::SolcStandardJsonInputLanguage;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsLibraries;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVM;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsSelection;
+use revive_solc_json_interface::SolcStandardJsonOutputError;
+use revive_solc_json_interface::SolcStandardJsonOutputErrorHandler;
+
+use crate::linker::Output;
 
 pub use self::build::contract::Contract as ContractBuild;
 pub use self::build::Build;
@@ -31,118 +54,76 @@ pub use self::solc::FIRST_SUPPORTED_VERSION as SolcFirstSupportedVersion;
 pub use self::solc::LAST_SUPPORTED_VERSION as SolcLastSupportedVersion;
 pub use self::version::Version as ResolcVersion;
 
+pub(crate) mod build;
+pub(crate) mod r#const;
+pub(crate) mod linker;
+pub(crate) mod missing_libraries;
+pub(crate) mod process;
+pub(crate) mod project;
+pub(crate) mod solc;
 #[cfg(not(target_os = "emscripten"))]
 pub mod test_utils;
 pub mod tests;
+pub(crate) mod version;
 
-use std::collections::BTreeSet;
-use std::io::Write;
-use std::path::PathBuf;
-
-use revive_solc_json_interface::standard_json::input::settings::metadata_hash::MetadataHash;
-use revive_solc_json_interface::ResolcWarning;
-use revive_solc_json_interface::SolcStandardJsonInput;
-use revive_solc_json_interface::SolcStandardJsonInputLanguage;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVM;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsSelection;
+/// The rayon worker stack size.
+pub const RAYON_WORKER_STACK_SIZE: usize = 64 * 1024 * 1024;
 
 /// Runs the Yul mode.
 pub fn yul<T: Compiler>(
+    solc: &T,
     input_files: &[PathBuf],
-    solc: &mut T,
-    optimizer_settings: revive_llvm_context::OptimizerSettings,
-    include_metadata_hash: bool,
-    mut debug_config: revive_llvm_context::DebugConfig,
+    libraries: &[String],
+    metadata_hash: MetadataHash,
+    messages: &mut Vec<SolcStandardJsonOutputError>,
+    optimizer_settings: OptimizerSettings,
+    debug_config: DebugConfig,
     llvm_arguments: &[String],
     memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
-    let path = match input_files.len() {
-        1 => input_files.first().expect("Always exists"),
-        0 => anyhow::bail!("The input file is missing"),
-        length => anyhow::bail!(
-            "Only one input file is allowed in the Yul mode, but found {}",
-            length,
-        ),
-    };
+    let libraries = SolcStandardJsonInputSettingsLibraries::try_from(libraries)?;
+    solc.validate_yul_paths(input_files, libraries.clone(), messages)?;
 
-    if solc.version()?.default != solc::LAST_SUPPORTED_VERSION {
-        anyhow::bail!(
-                "The Yul mode is only supported with the most recent version of the Solidity compiler: {}",
-                solc::LAST_SUPPORTED_VERSION,
-            );
-    }
-
-    let solc_validator = Some(&*solc);
-    let project = Project::try_from_yul_path(path, solc_validator)?;
-
-    debug_config.set_yul_path(path);
-    let build = project.compile(
+    let linker_symbols = libraries.as_linker_symbols()?;
+    let project = Project::try_from_yul_paths(input_files, None, libraries, &debug_config)?;
+    let mut build = project.compile(
+        messages,
         optimizer_settings,
-        include_metadata_hash,
-        debug_config,
-        llvm_arguments,
-        memory_config,
-    )?;
-
-    Ok(build)
-}
-
-/// Runs the LLVM IR mode.
-pub fn llvm_ir(
-    input_files: &[PathBuf],
-    optimizer_settings: revive_llvm_context::OptimizerSettings,
-    include_metadata_hash: bool,
-    debug_config: revive_llvm_context::DebugConfig,
-    llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
-) -> anyhow::Result<Build> {
-    let path = match input_files.len() {
-        1 => input_files.first().expect("Always exists"),
-        0 => anyhow::bail!("The input file is missing"),
-        length => anyhow::bail!(
-            "Only one input file is allowed in the LLVM IR mode, but found {}",
-            length,
-        ),
-    };
-
-    let project = Project::try_from_llvm_ir_path(path)?;
-
-    let build = project.compile(
-        optimizer_settings,
-        include_metadata_hash,
-        debug_config,
+        metadata_hash,
+        &debug_config,
         llvm_arguments,
         memory_config,
     )?;
+    build.take_and_write_warnings();
+    build.check_errors()?;
 
+    let mut build = build.link(linker_symbols, &debug_config);
+    build.take_and_write_warnings();
+    build.check_errors()?;
     Ok(build)
 }
 
 /// Runs the standard output mode.
-#[allow(clippy::too_many_arguments)]
 pub fn standard_output<T: Compiler>(
+    solc: &T,
     input_files: &[PathBuf],
-    libraries: Vec<String>,
-    solc: &mut T,
-    evm_version: Option<revive_common::EVMVersion>,
+    libraries: &[String],
+    metadata_hash: MetadataHash,
+    messages: &mut Vec<SolcStandardJsonOutputError>,
+    evm_version: Option<EVMVersion>,
     solc_optimizer_enabled: bool,
-    optimizer_settings: revive_llvm_context::OptimizerSettings,
-    include_metadata_hash: bool,
+    optimizer_settings: OptimizerSettings,
     base_path: Option<String>,
     include_paths: Vec<String>,
     allow_paths: Option<String>,
-    remappings: Option<BTreeSet<String>>,
-    suppressed_warnings: Option<Vec<ResolcWarning>>,
-    debug_config: revive_llvm_context::DebugConfig,
-    llvm_arguments: &[String],
+    remappings: BTreeSet<String>,
+    suppressed_warnings: Vec<ResolcWarning>,
+    debug_config: DebugConfig,
+    llvm_arguments: Vec<String>,
     memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let solc_version = solc.version()?;
-
-    let solc_input = SolcStandardJsonInput::try_from_paths(
-        SolcStandardJsonInputLanguage::Solidity,
+    let mut solc_input = SolcStandardJsonInput::try_from_solidity_paths(
         evm_version,
         input_files,
         libraries,
@@ -150,162 +131,211 @@ pub fn standard_output<T: Compiler>(
         SolcStandardJsonInputSettingsSelection::new_required(),
         SolcStandardJsonInputSettingsOptimizer::new(
             solc_optimizer_enabled,
-            None,
-            &solc_version.default,
-            optimizer_settings.is_fallback_to_size_enabled(),
+            SolcStandardJsonInputSettingsOptimizer::default_mode(),
+            Default::default(),
         ),
-        None,
+        Default::default(),
         suppressed_warnings,
-        Some(SolcStandardJsonInputSettingsPolkaVM::new(
+        SolcStandardJsonInputSettingsPolkaVM::new(
             Some(memory_config),
             debug_config.emit_debug_info,
-        )),
+        ),
+        llvm_arguments,
+        false,
     )?;
+    let mut solc_output = solc.standard_json(
+        &mut solc_input,
+        messages,
+        base_path,
+        include_paths,
+        allow_paths,
+    )?;
+    solc_output.take_and_write_warnings();
+    solc_output.check_errors()?;
 
-    let source_code_files = solc_input
-        .sources
-        .iter()
-        .map(|(path, source)| (path.to_owned(), source.content.to_owned()))
-        .collect();
-
-    let libraries = solc_input.settings.libraries.clone().unwrap_or_default();
-    let solc_output = solc.standard_json(solc_input, base_path, include_paths, allow_paths)?;
-
-    if let Some(errors) = solc_output.errors.as_deref() {
-        let mut has_errors = false;
-
-        for error in errors.iter() {
-            if error.severity.as_str() == "error" {
-                has_errors = true;
-            }
-
-            writeln!(std::io::stderr(), "{error}")?;
-        }
-
-        if has_errors {
-            anyhow::bail!("Error(s) found. Compilation aborted");
-        }
-    }
+    let linker_symbols = solc_input.settings.libraries.as_linker_symbols()?;
 
     let project = Project::try_from_standard_json_output(
-        &solc_output,
-        source_code_files,
-        libraries,
+        &mut solc_output,
+        solc_input.settings.libraries,
         &solc_version,
         &debug_config,
     )?;
+    solc_output.take_and_write_warnings();
+    solc_output.check_errors()?;
 
-    let build = project.compile(
+    let mut build = project.compile(
+        messages,
         optimizer_settings,
-        include_metadata_hash,
-        debug_config,
-        llvm_arguments,
+        metadata_hash,
+        &debug_config,
+        &solc_input.settings.llvm_arguments,
         memory_config,
     )?;
+    build.take_and_write_warnings();
+    build.check_errors()?;
+
+    let mut build = build.link(linker_symbols, &debug_config);
+    build.take_and_write_warnings();
+    build.check_errors()?;
 
     Ok(build)
 }
 
 /// Runs the standard JSON mode.
-#[allow(clippy::too_many_arguments)]
 pub fn standard_json<T: Compiler>(
-    solc: &mut T,
-    detect_missing_libraries: bool,
+    solc: &T,
+    metadata_hash: MetadataHash,
+    messages: &mut Vec<SolcStandardJsonOutputError>,
+    json_path: Option<PathBuf>,
     base_path: Option<String>,
     include_paths: Vec<String>,
     allow_paths: Option<String>,
-    mut debug_config: revive_llvm_context::DebugConfig,
-    llvm_arguments: &[String],
+    mut debug_config: DebugConfig,
+    detect_missing_libraries: bool,
 ) -> anyhow::Result<()> {
     let solc_version = solc.version()?;
-
-    let solc_input = SolcStandardJsonInput::try_from_stdin()?;
-    let source_code_files = solc_input
-        .sources
-        .iter()
-        .map(|(path, source)| (path.to_owned(), source.content.to_owned()))
-        .collect();
-
-    let optimizer_settings =
-        revive_llvm_context::OptimizerSettings::try_from(&solc_input.settings.optimizer)?;
-
-    let polkavm_settings = solc_input.settings.polkavm.unwrap_or_default();
-    debug_config.emit_debug_info = polkavm_settings.debug_information.unwrap_or_default();
-
-    let include_metadata_hash = match solc_input.settings.metadata {
-        Some(ref metadata) => metadata.bytecode_hash != Some(MetadataHash::None),
-        None => true,
-    };
-
-    let libraries = solc_input.settings.libraries.clone().unwrap_or_default();
-    let mut solc_output = solc.standard_json(solc_input, base_path, include_paths, allow_paths)?;
-
-    if let Some(errors) = solc_output.errors.as_deref() {
-        for error in errors.iter() {
-            if error.severity.as_str() == "error" {
-                serde_json::to_writer(std::io::stdout(), &solc_output)?;
-                std::process::exit(0);
-            }
-        }
-    }
-
-    let project = Project::try_from_standard_json_output(
-        &solc_output,
-        source_code_files,
-        libraries,
-        &solc_version,
-        &debug_config,
+    let mut solc_input = SolcStandardJsonInput::try_from(json_path.as_deref())?;
+    let language = solc_input.language;
+    let prune_output = solc_input.settings.selection_to_prune();
+    let deployed_libraries = solc_input.settings.libraries.as_paths();
+    let linker_symbols = solc_input.settings.libraries.as_linker_symbols()?;
+    let optimizer_settings = OptimizerSettings::try_from_cli(solc_input.settings.optimizer.mode)?;
+    let detect_missing_libraries =
+        solc_input.settings.detect_missing_libraries || detect_missing_libraries;
+    debug_config.emit_debug_info = solc_input
+        .settings
+        .polkavm
+        .debug_information
+        .unwrap_or(false);
+    solc_input.extend_selection(SolcStandardJsonInputSettingsSelection::new_required());
+    let mut solc_output = solc.standard_json(
+        &mut solc_input,
+        messages,
+        base_path,
+        include_paths,
+        allow_paths,
     )?;
 
-    if detect_missing_libraries {
-        let missing_libraries = project.get_missing_libraries();
-        missing_libraries.write_to_standard_json(&mut solc_output, &solc_version)?;
-    } else {
-        let build = project.compile(
-            optimizer_settings,
-            include_metadata_hash,
-            debug_config,
-            llvm_arguments,
-            polkavm_settings
-                .memory_config
-                .unwrap_or_else(SolcStandardJsonInputSettingsPolkaVMMemory::default),
-        )?;
-        build.write_to_standard_json(&mut solc_output, &solc_version)?;
+    let (mut solc_output, project) = match language {
+        SolcStandardJsonInputLanguage::Solidity => {
+            let project = Project::try_from_standard_json_output(
+                &mut solc_output,
+                solc_input.settings.libraries,
+                &solc_version,
+                &debug_config,
+            )?;
+            (solc_output, project)
+        }
+        SolcStandardJsonInputLanguage::Yul => {
+            let mut solc_output = solc.validate_yul_standard_json(&mut solc_input, messages)?;
+            if solc_output.has_errors() {
+                solc_output.write_and_exit(prune_output);
+            }
+            let project = Project::try_from_yul_sources(
+                solc_input.sources,
+                solc_input.settings.libraries,
+                Some(&mut solc_output),
+                &debug_config,
+            )?;
+
+            (solc_output, project)
+        }
+    };
+
+    if solc_output.has_errors() {
+        solc_output.write_and_exit(prune_output);
     }
-    serde_json::to_writer(std::io::stdout(), &solc_output)?;
-    std::process::exit(0);
+
+    if detect_missing_libraries {
+        let missing_libraries = project.get_missing_libraries(&deployed_libraries);
+        missing_libraries.write_to_standard_json(&mut solc_output, &solc_version);
+        solc_output.write_and_exit(prune_output);
+    }
+
+    let build = project.compile(
+        messages,
+        optimizer_settings,
+        metadata_hash,
+        &debug_config,
+        &solc_input.settings.llvm_arguments,
+        solc_input
+            .settings
+            .polkavm
+            .memory_config
+            .unwrap_or_default(),
+    )?;
+    if build.has_errors() {
+        build.write_to_standard_json(&mut solc_output, &solc_version)?;
+        solc_output.write_and_exit(prune_output);
+    }
+
+    let build = build.link(linker_symbols, &debug_config);
+    build.write_to_standard_json(&mut solc_output, &solc_version)?;
+    solc_output.write_and_exit(prune_output);
 }
 
 /// Runs the combined JSON mode.
-#[allow(clippy::too_many_arguments)]
 pub fn combined_json<T: Compiler>(
+    solc: &T,
+    paths: &[PathBuf],
+    libraries: &[String],
+    metadata_hash: MetadataHash,
+    messages: &mut Vec<SolcStandardJsonOutputError>,
+    evm_version: Option<EVMVersion>,
     format: String,
-    input_files: &[PathBuf],
-    libraries: Vec<String>,
-    solc: &mut T,
-    evm_version: Option<revive_common::EVMVersion>,
     solc_optimizer_enabled: bool,
-    optimizer_settings: revive_llvm_context::OptimizerSettings,
-    include_metadata_hash: bool,
+    optimizer_settings: OptimizerSettings,
     base_path: Option<String>,
     include_paths: Vec<String>,
     allow_paths: Option<String>,
-    remappings: Option<BTreeSet<String>>,
-    suppressed_warnings: Option<Vec<ResolcWarning>>,
-    debug_config: revive_llvm_context::DebugConfig,
+    remappings: BTreeSet<String>,
+    suppressed_warnings: Vec<ResolcWarning>,
+    debug_config: DebugConfig,
     output_directory: Option<PathBuf>,
     overwrite: bool,
-    llvm_arguments: &[String],
+    llvm_arguments: Vec<String>,
     memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<()> {
-    let build = standard_output(
-        input_files,
-        libraries,
+    let selectors = CombinedJsonSelector::from_cli(format.as_str())
+        .into_iter()
+        .filter_map(|result| match result {
+            Ok(selector) => Some(selector),
+            Err(error) => {
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    error.to_string(),
+                    None,
+                    None,
+                ));
+                None
+            }
+        })
+        .collect::<HashSet<_>>();
+    if !selectors.contains(&CombinedJsonSelector::Bytecode) {
+        messages.push(SolcStandardJsonOutputError::new_warning(
+            "Bytecode is always emitted even if the selector is not provided.".to_string(),
+            None,
+            None,
+        ));
+    }
+    if selectors.contains(&CombinedJsonSelector::BytecodeRuntime) {
+        messages.push(SolcStandardJsonOutputError::new_warning(
+            format!("The `{}` selector does not make sense for the PVM target, since there is only one bytecode segment.", CombinedJsonSelector::BytecodeRuntime),
+            None,
+            None,
+        ));
+    }
+
+    let mut combined_json = solc.combined_json(paths, selectors)?;
+    standard_output(
         solc,
+        paths,
+        libraries,
+        metadata_hash,
+        messages,
         evm_version,
         solc_optimizer_enabled,
         optimizer_settings,
-        include_metadata_hash,
         base_path,
         include_paths,
         allow_paths,
@@ -314,24 +344,57 @@ pub fn combined_json<T: Compiler>(
         debug_config,
         llvm_arguments,
         memory_config,
-    )?;
-
-    let mut combined_json = solc.combined_json(input_files, format.as_str())?;
-    build.write_to_combined_json(&mut combined_json)?;
+    )?
+    .write_to_combined_json(&mut combined_json)?;
 
     match output_directory {
         Some(output_directory) => {
             std::fs::create_dir_all(output_directory.as_path())?;
-
             combined_json.write_to_directory(output_directory.as_path(), overwrite)?;
-        }
-        None => {
+
             writeln!(
-                std::io::stdout(),
-                "{}",
-                serde_json::to_string(&combined_json).expect("Always valid")
+                std::io::stderr(),
+                "Compiler run successful. Artifact(s) can be found in directory {output_directory:?}."
             )?;
         }
+        None => {
+            serde_json::to_writer(std::io::stdout(), &combined_json)?;
+        }
     }
-    std::process::exit(0);
+    std::process::exit(EXIT_CODE_SUCCESS);
+}
+
+/// Links unlinked bytecode files.
+pub fn link(paths: Vec<String>, libraries: Vec<String>) -> anyhow::Result<()> {
+    #[cfg(feature = "parallel")]
+    let iter = paths.into_par_iter();
+    #[cfg(not(feature = "parallel"))]
+    let iter = paths.into_iter();
+
+    let bytecodes = iter
+        .map(|path| {
+            let bytecode = std::fs::read(path.as_str())?;
+            Ok((path, bytecode))
+        })
+        .collect::<anyhow::Result<BTreeMap<String, Vec<u8>>>>()?;
+
+    let output = Output::try_from(&bytecodes, &libraries)?;
+
+    #[cfg(feature = "parallel")]
+    let iter = output.linked.into_par_iter();
+    #[cfg(not(feature = "parallel"))]
+    let iter = output.linked.into_iter();
+
+    iter.map(|(path, bytecode)| {
+        std::fs::write(path, bytecode)?;
+        Ok(())
+    })
+    .collect::<anyhow::Result<()>>()?;
+
+    for (path, _) in output.unlinked {
+        println!("Warning: file '{path}' still unresolved");
+    }
+    println!("Linking completed");
+
+    std::process::exit(EXIT_CODE_SUCCESS);
 }

crates/resolc/src/linker.rs

@@ -0,0 +1,96 @@
+//! The Solidity to PolkaVM compiler deploy time linking library.
+//!
+//! # Deploy time linking
+//!
+//! At compile time, factory dependencies and library addresses
+//! are declared but not necessarily defined.
+//!
+//! `resolc` will emit raw ELF objects for any contract requiring
+//! deploy time linking using the `--link` flag.
+//!
+//! # Internals
+//!
+//! After all contracts have been built successfully, the compiler
+//! tries to link the resulting raw ELF object files into PVM blobs.
+//! This fails if any library address symbols are unknown at compile
+//! time (which is better known in Solidity as the so called "deploy
+//! time linking" feature). Since factory dependency symbols can be
+//! resolved only after the the final PVM blob linking step, missing
+//! libraries may further lead to unresolved factory dependencies.
+
+use std::collections::BTreeMap;
+
+use revive_common::{ObjectFormat, EXTENSION_POLKAVM_BINARY};
+use revive_llvm_context::{polkavm_hash, polkavm_link};
+use revive_solc_json_interface::SolcStandardJsonInputSettingsLibraries;
+
+/// The Solidity to PolkaVM compiler deploy time linking outputs.
+pub struct Output {
+    /// The linked objects.
+    pub linked: BTreeMap<String, Vec<u8>>,
+    /// The unlinked objects.
+    pub unlinked: Vec<(String, Vec<u8>)>,
+}
+
+impl Output {
+    /// Try linking given `libraries` into given `bytecodes`.
+    ///
+    /// Bytecodes failing to fully resolve end up in [Output::unlinked].
+    pub fn try_from(
+        bytecodes: &BTreeMap<String, Vec<u8>>,
+        libraries: &[String],
+    ) -> anyhow::Result<Self> {
+        let linker_symbols =
+            SolcStandardJsonInputSettingsLibraries::try_from(libraries)?.as_linker_symbols()?;
+
+        let mut linked = BTreeMap::default();
+        let mut unlinked = Vec::default();
+        let mut factory_dependencies = BTreeMap::default();
+
+        for (path, bytecode) in bytecodes {
+            match ObjectFormat::try_from(bytecode.as_slice()) {
+                Ok(ObjectFormat::ELF) => unlinked.push((path.clone(), bytecode.clone())),
+                Ok(ObjectFormat::PVM) => {
+                    factory_dependencies
+                        .insert(factory_dependency_symbol(path), polkavm_hash(bytecode));
+                }
+                Err(error) => anyhow::bail!("{path}: {error}"),
+            }
+        }
+
+        loop {
+            let mut linked_counter = 0;
+            let mut remaining_objects = Vec::new();
+            for (path, bytecode_buffer) in unlinked.drain(..) {
+                let (linked_bytecode, object_format) = polkavm_link(
+                    &bytecode_buffer,
+                    &linker_symbols,
+                    &factory_dependencies,
+                    true,
+                )?;
+                match object_format {
+                    ObjectFormat::ELF => remaining_objects.push((path, linked_bytecode)),
+                    ObjectFormat::PVM => {
+                        factory_dependencies.insert(
+                            factory_dependency_symbol(&path),
+                            polkavm_hash(&linked_bytecode),
+                        );
+                        linked.insert(path, linked_bytecode);
+                        linked_counter += 1;
+                    }
+                }
+            }
+            unlinked = remaining_objects;
+            if linked_counter == 0 {
+                break;
+            }
+        }
+
+        Ok(Self { linked, unlinked })
+    }
+}
+
+fn factory_dependency_symbol(path: &str) -> String {
+    path.trim_end_matches(&format!(".{EXTENSION_POLKAVM_BINARY}"))
+        .to_string()
+}

crates/resolc/src/missing_libraries.rs

@@ -1,22 +1,21 @@
 //! The missing Solidity libraries.
 
 use std::collections::BTreeMap;
-use std::collections::HashSet;
+use std::collections::BTreeSet;
 
 use revive_solc_json_interface::SolcStandardJsonOutput;
 
 use crate::solc::version::Version as SolcVersion;
-use crate::ResolcVersion;
 
 /// The missing Solidity libraries.
 pub struct MissingLibraries {
     /// The missing libraries.
-    pub contract_libraries: BTreeMap<String, HashSet<String>>,
+    pub contract_libraries: BTreeMap<String, BTreeSet<String>>,
 }
 
 impl MissingLibraries {
     /// A shortcut constructor.
-    pub fn new(contract_libraries: BTreeMap<String, HashSet<String>>) -> Self {
+    pub fn new(contract_libraries: BTreeMap<String, BTreeSet<String>>) -> Self {
         Self { contract_libraries }
     }
 
@@ -25,27 +24,19 @@ impl MissingLibraries {
         mut self,
         standard_json: &mut SolcStandardJsonOutput,
         solc_version: &SolcVersion,
-    ) -> anyhow::Result<()> {
-        let contracts = match standard_json.contracts.as_mut() {
-            Some(contracts) => contracts,
-            None => return Ok(()),
-        };
-
-        for (path, contracts) in contracts.iter_mut() {
-            for (name, contract) in contracts.iter_mut() {
+    ) {
+        for (path, file) in standard_json.contracts.iter_mut() {
+            for (name, contract) in file.iter_mut() {
                 let full_name = format!("{path}:{name}");
                 let missing_libraries = self.contract_libraries.remove(full_name.as_str());
 
                 if let Some(missing_libraries) = missing_libraries {
-                    contract.missing_libraries = Some(missing_libraries);
+                    contract.missing_libraries = missing_libraries;
                 }
             }
         }
 
         standard_json.version = Some(solc_version.default.to_string());
         standard_json.long_version = Some(solc_version.long.to_owned());
-        standard_json.revive_version = Some(ResolcVersion::default().long);
-
-        Ok(())
     }
 }

crates/resolc/src/process/input.rs

@@ -1,51 +1,69 @@
 //! Process for compiling a single compilation unit.
 //! The input data.
 
+use std::collections::BTreeMap;
+use std::collections::BTreeSet;
+
+use revive_common::MetadataHash;
+use revive_llvm_context::DebugConfig;
+use revive_llvm_context::OptimizerSettings;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use serde::Deserialize;
 use serde::Serialize;
 
 use crate::project::contract::Contract;
-use crate::project::Project;
+use crate::SolcVersion;
 
 /// The input data.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Input {
     /// The contract representation.
     pub contract: Contract,
-    /// The project representation.
-    pub project: Project,
+    /// The `solc` compiler version.
+    pub solc_version: Option<SolcVersion>,
     /// Whether to append the metadata hash.
-    pub include_metadata_hash: bool,
+    pub metadata_hash: MetadataHash,
     /// The optimizer settings.
-    pub optimizer_settings: revive_llvm_context::OptimizerSettings,
+    pub optimizer_settings: OptimizerSettings,
     /// The debug output config.
-    pub debug_config: revive_llvm_context::DebugConfig,
+    pub debug_config: DebugConfig,
     /// The extra LLVM arguments give used for manual control.
     pub llvm_arguments: Vec<String>,
     /// The PVM memory configuration.
     pub memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    /// Missing unlinked libraries.
+    pub missing_libraries: BTreeSet<String>,
+    /// Factory dependencies.
+    pub factory_dependencies: BTreeSet<String>,
+    /// The mapping of auxiliary identifiers, e.g. Yul object names, to full contract paths.
+    pub identifier_paths: BTreeMap<String, String>,
 }
 
 impl Input {
     /// A shortcut constructor.
     pub fn new(
         contract: Contract,
-        project: Project,
-        include_metadata_hash: bool,
-        optimizer_settings: revive_llvm_context::OptimizerSettings,
-        debug_config: revive_llvm_context::DebugConfig,
+        solc_version: Option<SolcVersion>,
+        metadata_hash: MetadataHash,
+        optimizer_settings: OptimizerSettings,
+        debug_config: DebugConfig,
         llvm_arguments: Vec<String>,
         memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+        missing_libraries: BTreeSet<String>,
+        factory_dependencies: BTreeSet<String>,
+        identifier_paths: BTreeMap<String, String>,
     ) -> Self {
         Self {
             contract,
-            project,
-            include_metadata_hash,
+            solc_version,
+            metadata_hash,
             optimizer_settings,
             debug_config,
             llvm_arguments,
             memory_config,
+            missing_libraries,
+            factory_dependencies,
+            identifier_paths,
         }
     }
 }

crates/resolc/src/process/mod.rs

@@ -1,5 +1,12 @@
 //! Process for compiling a single compilation unit.
 
+use revive_solc_json_interface::SolcStandardJsonOutputError;
+use serde::de::DeserializeOwned;
+use serde::Serialize;
+
+use self::input::Input;
+use self::output::Output;
+
 pub mod input;
 #[cfg(not(target_os = "emscripten"))]
 pub mod native_process;
@@ -7,71 +14,13 @@ pub mod output;
 #[cfg(target_os = "emscripten")]
 pub mod worker_process;
 
-use std::io::{Read, Write};
-
-use self::input::Input;
-use self::output::Output;
-
 pub trait Process {
     /// Read input from `stdin`, compile a contract, and write the output to `stdout`.
-    fn run(input_file: Option<&mut std::fs::File>) -> anyhow::Result<()> {
-        let mut stdin = std::io::stdin();
-        let mut stdout = std::io::stdout();
-        let mut stderr = std::io::stderr();
-
-        let mut buffer = Vec::with_capacity(16384);
-        match input_file {
-            Some(ins) => {
-                if let Err(error) = ins.read_to_end(&mut buffer) {
-                    anyhow::bail!("Failed to read recursive process input file: {:?}", error);
-                }
-            }
-            None => {
-                if let Err(error) = stdin.read_to_end(&mut buffer) {
-                    anyhow::bail!(
-                        "Failed to read recursive process input from stdin: {:?}",
-                        error
-                    )
-                }
-            }
-        }
-
-        let input: Input = revive_common::deserialize_from_slice(buffer.as_slice())?;
-
-        revive_llvm_context::initialize_llvm(
-            revive_llvm_context::Target::PVM,
-            crate::DEFAULT_EXECUTABLE_NAME,
-            &input.llvm_arguments,
-        );
-
-        let result = input.contract.compile(
-            input.project,
-            input.optimizer_settings,
-            input.include_metadata_hash,
-            input.debug_config,
-            &input.llvm_arguments,
-            input.memory_config,
-        );
-
-        match result {
-            Ok(build) => {
-                let output = Output::new(build);
-                let json = serde_json::to_vec(&output).expect("Always valid");
-                stdout
-                    .write_all(json.as_slice())
-                    .expect("Stdout writing error");
-                Ok(())
-            }
-            Err(error) => {
-                let message = error.to_string();
-                stderr
-                    .write_all(message.as_bytes())
-                    .expect("Stderr writing error");
-                Err(error)
-            }
-        }
-    }
+    fn run(input: Input) -> anyhow::Result<()>;
 
     /// Runs this process recursively to compile a single contract.
-    fn call(input: Input) -> anyhow::Result<Output>;
+    fn call<I: Serialize, O: DeserializeOwned>(
+        path: &str,
+        input: I,
+    ) -> Result<O, SolcStandardJsonOutputError>;
 }

crates/resolc/src/process/native_process.rs

@@ -5,6 +5,12 @@ use std::path::PathBuf;
 use std::process::Command;
 
 use once_cell::sync::OnceCell;
+use revive_common::deserialize_from_slice;
+use revive_common::EXIT_CODE_SUCCESS;
+use revive_solc_json_interface::standard_json::output::error::source_location::SourceLocation;
+use revive_solc_json_interface::SolcStandardJsonOutputError;
+use serde::de::DeserializeOwned;
+use serde::Serialize;
 
 use super::Input;
 use super::Output;
@@ -16,61 +22,95 @@ pub static EXECUTABLE: OnceCell<PathBuf> = OnceCell::new();
 pub struct NativeProcess;
 
 impl Process for NativeProcess {
-    fn call(input: Input) -> anyhow::Result<Output> {
-        let input_json = serde_json::to_vec(&input).expect("Always valid");
+    fn run(input: Input) -> anyhow::Result<()> {
+        let source_location = SourceLocation::new(input.contract.identifier.path.to_owned());
 
-        let executable = match EXECUTABLE.get() {
-            Some(executable) => executable.to_owned(),
-            None => std::env::current_exe()?,
-        };
+        let result = std::thread::Builder::new()
+            .stack_size(crate::RAYON_WORKER_STACK_SIZE)
+            .spawn(move || {
+                input
+                    .contract
+                    .compile(
+                        input.solc_version,
+                        input.optimizer_settings,
+                        input.metadata_hash,
+                        input.debug_config,
+                        &input.llvm_arguments,
+                        input.memory_config,
+                        input.missing_libraries,
+                        input.factory_dependencies,
+                        input.identifier_paths,
+                    )
+                    .map(Output::new)
+                    .map_err(|error| {
+                        SolcStandardJsonOutputError::new_error(error, Some(source_location), None)
+                    })
+            })
+            .expect("Threading error")
+            .join()
+            .expect("Threading error");
 
+        serde_json::to_writer(std::io::stdout(), &result)
+            .map_err(|error| anyhow::anyhow!("Stdout writing error: {error}"))?;
+
+        Ok(())
+    }
+
+    fn call<I, O>(path: &str, input: I) -> Result<O, SolcStandardJsonOutputError>
+    where
+        I: Serialize,
+        O: DeserializeOwned,
+    {
+        let executable = EXECUTABLE
+            .get()
+            .cloned()
+            .unwrap_or_else(|| std::env::current_exe().expect("Should have an executable"));
         let mut command = Command::new(executable.as_path());
         command.stdin(std::process::Stdio::piped());
         command.stdout(std::process::Stdio::piped());
         command.stderr(std::process::Stdio::piped());
         command.arg("--recursive-process");
-        let process = command.spawn().map_err(|error| {
-            anyhow::anyhow!("{:?} subprocess spawning error: {:?}", executable, error)
-        })?;
+        command.arg(path);
 
-        #[cfg(debug_assertions)]
-        input
-            .debug_config
-            .dump_stage_output(&input.contract.path, Some("stage"), &input_json)
-            .map_err(|error| {
-                anyhow::anyhow!(
-                    "{:?} failed to log the recursive process output: {:?}",
-                    executable,
-                    error,
-                )
-            })?;
-
-        process
+        let mut process = command
+            .spawn()
+            .unwrap_or_else(|error| panic!("{executable:?} subprocess spawning: {error:?}"));
+        let stdin = process
             .stdin
-            .as_ref()
-            .ok_or_else(|| anyhow::anyhow!("{:?} stdin getting error", executable))?
-            .write_all(input_json.as_slice())
-            .map_err(|error| {
-                anyhow::anyhow!("{:?} stdin writing error: {:?}", executable, error)
-            })?;
-        let output = process.wait_with_output().map_err(|error| {
-            anyhow::anyhow!("{:?} subprocess output error: {:?}", executable, error)
-        })?;
-        if !output.status.success() {
-            anyhow::bail!(
-                "{}",
-                String::from_utf8_lossy(output.stderr.as_slice()).to_string(),
+            .as_mut()
+            .unwrap_or_else(|| panic!("{executable:?} subprocess stdin getting error"));
+        let stdin_input = serde_json::to_vec(&input).expect("Always valid");
+        stdin
+            .write_all(stdin_input.as_slice())
+            .unwrap_or_else(|error| panic!("{executable:?} subprocess stdin writing: {error:?}"));
+
+        let result = process
+            .wait_with_output()
+            .unwrap_or_else(|error| panic!("{executable:?} subprocess output reading: {error:?}"));
+
+        if result.status.code() != Some(EXIT_CODE_SUCCESS) {
+            let message = format!(
+                "{executable:?} subprocess failed with exit code {:?}:\n{}\n{}",
+                result.status.code(),
+                String::from_utf8_lossy(result.stdout.as_slice()),
+                String::from_utf8_lossy(result.stderr.as_slice()),
             );
+            return Err(SolcStandardJsonOutputError::new_error(
+                message,
+                Some(SourceLocation::new(path.to_owned())),
+                None,
+            ));
         }
 
-        let output: Output = revive_common::deserialize_from_slice(output.stdout.as_slice())
-            .map_err(|error| {
-                anyhow::anyhow!(
-                    "{:?} subprocess output parsing error: {}",
-                    executable,
-                    error,
-                )
-            })?;
-        Ok(output)
+        match deserialize_from_slice(result.stdout.as_slice()) {
+            Ok(output) => output,
+            Err(error) => {
+                panic!(
+                    "{executable:?} subprocess stdout parsing error: {error:?}\n{}\n{}",
+                    String::from_utf8_lossy(result.stdout.as_slice()),
+                    String::from_utf8_lossy(result.stderr.as_slice()),
+                );
+            }
+        }
     }
 }

crates/resolc/src/process/worker_process.rs

@@ -2,13 +2,18 @@
 
 use std::ffi::{c_char, c_void, CStr, CString};
 
+use serde::de::DeserializeOwned;
+use serde::Deserialize;
+use serde::Serialize;
+
+use revive_common::deserialize_from_slice;
+use revive_solc_json_interface::standard_json::output::error::source_location::SourceLocation;
+use revive_solc_json_interface::SolcStandardJsonOutputError;
+
 use super::Input;
 use super::Output;
 use super::Process;
 
-use anyhow::Context;
-use serde::Deserialize;
-
 #[derive(Deserialize)]
 struct Error {
     message: String,
@@ -29,10 +34,40 @@ enum Response {
 pub struct WorkerProcess;
 
 impl Process for WorkerProcess {
-    fn call(input: Input) -> anyhow::Result<Output> {
+    fn run(input: Input) -> anyhow::Result<()> {
+        let source_location = SourceLocation::new(input.contract.identifier.path.to_owned());
+
+        let result = input
+            .contract
+            .compile(
+                None,
+                input.optimizer_settings,
+                input.metadata_hash,
+                input.debug_config,
+                &input.llvm_arguments,
+                input.memory_config,
+                input.missing_libraries,
+                input.factory_dependencies,
+                input.identifier_paths,
+            )
+            .map(Output::new)
+            .map_err(|error| {
+                SolcStandardJsonOutputError::new_error(error, Some(source_location), None)
+            });
+
+        serde_json::to_writer(std::io::stdout(), &result)
+            .map_err(|error| anyhow::anyhow!("Stdout writing error: {error}"))?;
+
+        Ok(())
+    }
+
+    fn call<I, O>(_path: &str, input: I) -> Result<O, SolcStandardJsonOutputError>
+    where
+        I: Serialize,
+        O: DeserializeOwned,
+    {
         let input_json = serde_json::to_vec(&input).expect("Always valid");
         let input_str = String::from_utf8(input_json).expect("Input shall be valid");
-        // Prepare the input string for the Emscripten function
         let input_cstring = CString::new(input_str).expect("CString allocation failed");
 
         // Call the Emscripten function
@@ -40,26 +75,20 @@ impl Process for WorkerProcess {
             unsafe { resolc_compile(input_cstring.as_ptr(), input_cstring.as_bytes().len()) };
 
         // Convert the output pointer back to a Rust string
-        let output_str = unsafe {
-            CStr::from_ptr(output_ptr)
-                .to_str()
-                .with_context(|| "Failed to convert C string to Rust string")
-                .map(str::to_owned)
-        };
+        let output_str = unsafe { CStr::from_ptr(output_ptr).to_str().map(str::to_owned) };
         unsafe { libc::free(output_ptr as *mut c_void) };
-        let output_str = output_str?;
-        let response: Response = serde_json::from_str(&output_str)
-            .map_err(|error| anyhow::anyhow!("Worker output parsing error: {}", error,))?;
-        match response {
-            Response::Success(out) => {
-                let output: Output = revive_common::deserialize_from_slice(out.data.as_bytes())
-                    .map_err(|error| {
-                        anyhow::anyhow!("resolc.js subprocess output parsing error: {}", error,)
-                    })?;
 
-                Ok(output)
-            }
-            Response::Error(err) => anyhow::bail!("Worker error: {}", err.message,),
+        let output_str = output_str.unwrap_or_else(|error| panic!("resolc.js output: {error:?}"));
+        let response = serde_json::from_str(&output_str)
+            .unwrap_or_else(|error| panic!("Worker output parsing error: {error}"));
+        match response {
+            Response::Success(out) => match deserialize_from_slice(out.data.as_bytes()) {
+                Ok(output) => output,
+                Err(error) => {
+                    panic!("resolc.js subprocess output parsing error: {error}")
+                }
+            },
+            Response::Error(err) => panic!("Worker error: {}", err.message),
         }
     }
 }

crates/resolc/src/project/contract/ir/llvm_ir.rs

@@ -1,21 +0,0 @@
-//! The contract LLVM IR source code.
-
-use serde::Deserialize;
-use serde::Serialize;
-
-/// The contract LLVM IR source code.
-#[derive(Debug, Serialize, Deserialize, Clone)]
-#[allow(clippy::upper_case_acronyms)]
-pub struct LLVMIR {
-    /// The LLVM IR file path.
-    pub path: String,
-    /// The LLVM IR source code.
-    pub source: String,
-}
-
-impl LLVMIR {
-    /// A shortcut constructor.
-    pub fn new(path: String, source: String) -> Self {
-        Self { path, source }
-    }
-}

crates/resolc/src/project/contract/ir/mod.rs

@@ -1,66 +1,40 @@
 //! The contract source code.
 
-pub mod llvm_ir;
-pub mod yul;
-
-use std::collections::HashSet;
+use std::collections::BTreeSet;
 
 use serde::Deserialize;
 use serde::Serialize;
 
-use revive_yul::parser::statement::object::Object;
-
-use self::llvm_ir::LLVMIR;
 use self::yul::Yul;
 
+pub mod yul;
+
 /// The contract source code.
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[allow(clippy::upper_case_acronyms)]
 pub enum IR {
     /// The Yul source code.
     Yul(Yul),
-    /// The LLVM IR source code.
-    LLVMIR(LLVMIR),
 }
 
 impl IR {
-    /// A shortcut constructor.
-    pub fn new_yul(source_code: String, object: Object) -> Self {
-        Self::Yul(Yul::new(source_code, object))
-    }
-
-    /// A shortcut constructor.
-    pub fn new_llvm_ir(path: String, source: String) -> Self {
-        Self::LLVMIR(LLVMIR::new(path, source))
+    /// Drains the list of factory dependencies.
+    pub fn drain_factory_dependencies(&mut self) -> BTreeSet<String> {
+        match self {
+            IR::Yul(ref mut yul) => yul.object.factory_dependencies.drain().collect(),
+        }
     }
 
     /// Get the list of missing deployable libraries.
-    pub fn get_missing_libraries(&self) -> HashSet<String> {
+    pub fn get_missing_libraries(&self) -> BTreeSet<String> {
         match self {
             Self::Yul(inner) => inner.get_missing_libraries(),
-            Self::LLVMIR(_inner) => HashSet::new(),
         }
     }
 }
 
-impl<D> revive_llvm_context::PolkaVMWriteLLVM<D> for IR
-where
-    D: revive_llvm_context::PolkaVMDependency + Clone,
-{
-    fn declare(
-        &mut self,
-        context: &mut revive_llvm_context::PolkaVMContext<D>,
-    ) -> anyhow::Result<()> {
-        match self {
-            Self::Yul(inner) => inner.declare(context),
-            Self::LLVMIR(_inner) => Ok(()),
-        }
-    }
-
-    fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext<D>) -> anyhow::Result<()> {
-        match self {
-            Self::Yul(inner) => inner.into_llvm(context),
-            Self::LLVMIR(_inner) => Ok(()),
-        }
+impl From<Yul> for IR {
+    fn from(inner: Yul) -> Self {
+        Self::Yul(inner)
     }
 }

crates/resolc/src/project/contract/ir/yul.rs

@@ -1,48 +1,46 @@
 //! The contract Yul source code.
 
-use std::collections::HashSet;
+use std::collections::BTreeSet;
 
+use revive_yul::lexer::Lexer;
 use serde::Deserialize;
 use serde::Serialize;
 
 use revive_yul::parser::statement::object::Object;
 
-/// The contract Yul source code.
+/// he contract Yul source code.
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Yul {
-    /// The Yul source code.
-    pub source_code: String,
     /// The Yul AST object.
     pub object: Object,
 }
 
 impl Yul {
-    /// A shortcut constructor.
-    pub fn new(source_code: String, object: Object) -> Self {
-        Self {
-            source_code,
-            object,
-        }
+    /// Transforms the `solc` standard JSON output contract into a Yul object.
+    pub fn try_from_source(source_code: &str) -> anyhow::Result<Option<Self>> {
+        if source_code.is_empty() {
+            return Ok(None);
+        };
+
+        let mut lexer = Lexer::new(source_code.to_owned());
+        let object = Object::parse(&mut lexer, None)
+            .map_err(|error| anyhow::anyhow!("Yul parsing: {error:?}"))?;
+
+        Ok(Some(Self { object }))
     }
 
     /// Get the list of missing deployable libraries.
-    pub fn get_missing_libraries(&self) -> HashSet<String> {
+    pub fn get_missing_libraries(&self) -> BTreeSet<String> {
         self.object.get_missing_libraries()
     }
 }
 
-impl<D> revive_llvm_context::PolkaVMWriteLLVM<D> for Yul
-where
-    D: revive_llvm_context::PolkaVMDependency + Clone,
-{
-    fn declare(
-        &mut self,
-        context: &mut revive_llvm_context::PolkaVMContext<D>,
-    ) -> anyhow::Result<()> {
+impl revive_llvm_context::PolkaVMWriteLLVM for Yul {
+    fn declare(&mut self, context: &mut revive_llvm_context::PolkaVMContext) -> anyhow::Result<()> {
         self.object.declare(context)
     }
 
-    fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext<D>) -> anyhow::Result<()> {
+    fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext) -> anyhow::Result<()> {
         self.object.into_llvm(context)
     }
 }

crates/resolc/src/project/contract/metadata.rs

@@ -1,5 +1,6 @@
 //! The Solidity contract metadata.
 
+use revive_llvm_context::OptimizerSettings;
 use serde::Serialize;
 
 use crate::ResolcVersion;
@@ -11,13 +12,11 @@ pub struct Metadata {
     /// The `solc` metadata.
     pub solc_metadata: serde_json::Value,
     /// The `solc` version.
-    pub solc_version: String,
+    pub solc_version: Option<semver::Version>,
     /// The pallet revive edition.
-    pub revive_pallet_version: Option<semver::Version>,
-    /// The PolkaVM compiler version.
     pub revive_version: String,
     /// The PolkaVM compiler optimizer settings.
-    pub optimizer_settings: revive_llvm_context::OptimizerSettings,
+    pub optimizer_settings: OptimizerSettings,
     /// The extra LLVM arguments give used for manual control.
     pub llvm_arguments: Vec<String>,
 }
@@ -26,15 +25,13 @@ impl Metadata {
     /// A shortcut constructor.
     pub fn new(
         solc_metadata: serde_json::Value,
-        solc_version: String,
-        revive_pallet_version: Option<semver::Version>,
-        optimizer_settings: revive_llvm_context::OptimizerSettings,
+        solc_version: Option<semver::Version>,
+        optimizer_settings: OptimizerSettings,
         llvm_arguments: Vec<String>,
     ) -> Self {
         Self {
             solc_metadata,
             solc_version,
-            revive_pallet_version,
             revive_version: ResolcVersion::default().long,
             optimizer_settings,
             llvm_arguments,

crates/resolc/src/project/contract/mod.rs

@@ -1,29 +1,38 @@
 //! The contract data.
 
-pub mod ir;
-pub mod metadata;
-
-use std::collections::HashSet;
+use std::collections::BTreeMap;
+use std::collections::BTreeSet;
 
+use revive_common::ContractIdentifier;
+use revive_common::Keccak256;
+use revive_common::MetadataHash;
+use revive_common::ObjectFormat;
+use revive_llvm_context::DebugConfig;
+use revive_llvm_context::Optimizer;
+use revive_llvm_context::OptimizerSettings;
+use revive_llvm_context::PolkaVMContext;
+use revive_llvm_context::PolkaVMContextSolidityData;
+use revive_llvm_context::PolkaVMContextYulData;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use serde::Deserialize;
 use serde::Serialize;
-use sha3::Digest;
 
 use revive_llvm_context::PolkaVMWriteLLVM;
 
 use crate::build::contract::Contract as ContractBuild;
-use crate::project::Project;
 use crate::solc::version::Version as SolcVersion;
 
 use self::ir::IR;
 use self::metadata::Metadata;
 
+pub mod ir;
+pub mod metadata;
+
 /// The contract data.
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Contract {
     /// The absolute file path.
-    pub path: String,
+    pub identifier: ContractIdentifier,
     /// The IR source code data.
     pub ir: IR,
     /// The metadata JSON.
@@ -32,22 +41,9 @@ pub struct Contract {
 
 impl Contract {
     /// A shortcut constructor.
-    pub fn new(
-        path: String,
-        source_hash: [u8; revive_common::BYTE_LENGTH_WORD],
-        source_version: SolcVersion,
-        ir: IR,
-        metadata_json: Option<serde_json::Value>,
-    ) -> Self {
-        let metadata_json = metadata_json.unwrap_or_else(|| {
-            serde_json::json!({
-                "source_hash": hex::encode(source_hash.as_slice()),
-                "source_version": serde_json::to_value(&source_version).expect("Always valid"),
-            })
-        });
-
+    pub fn new(identifier: ContractIdentifier, ir: IR, metadata_json: serde_json::Value) -> Self {
         Self {
-            path,
+            identifier,
             ir,
             metadata_json,
         }
@@ -56,136 +52,77 @@ impl Contract {
     /// Returns the contract identifier, which is:
     /// - the Yul object identifier for Yul
     /// - the module name for LLVM IR
-    pub fn identifier(&self) -> &str {
+    pub fn object_identifier(&self) -> &str {
         match self.ir {
             IR::Yul(ref yul) => yul.object.identifier.as_str(),
-            IR::LLVMIR(ref llvm_ir) => llvm_ir.path.as_str(),
-        }
-    }
-
-    /// Extract factory dependencies.
-    pub fn drain_factory_dependencies(&mut self) -> HashSet<String> {
-        match self.ir {
-            IR::Yul(ref mut yul) => yul.object.factory_dependencies.drain().collect(),
-            IR::LLVMIR(_) => HashSet::new(),
         }
     }
 
     /// Compiles the specified contract, setting its build artifacts.
     pub fn compile(
-        mut self,
-        project: Project,
-        optimizer_settings: revive_llvm_context::OptimizerSettings,
-        include_metadata_hash: bool,
-        mut debug_config: revive_llvm_context::DebugConfig,
+        self,
+        solc_version: Option<SolcVersion>,
+        optimizer_settings: OptimizerSettings,
+        metadata_hash: MetadataHash,
+        mut debug_config: DebugConfig,
         llvm_arguments: &[String],
         memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+        missing_libraries: BTreeSet<String>,
+        factory_dependencies: BTreeSet<String>,
+        identifier_paths: BTreeMap<String, String>,
     ) -> anyhow::Result<ContractBuild> {
         let llvm = inkwell::context::Context::create();
-        let optimizer = revive_llvm_context::Optimizer::new(optimizer_settings);
-
-        let version = project.version.clone();
-        let identifier = self.identifier().to_owned();
-
+        let optimizer = Optimizer::new(optimizer_settings);
         let metadata = Metadata::new(
-            self.metadata_json.take(),
-            version.long.clone(),
-            version.l2_revision.clone(),
+            self.metadata_json,
+            solc_version
+                .as_ref()
+                .map(|version| version.default.to_owned()),
             optimizer.settings().to_owned(),
-            llvm_arguments.to_vec(),
+            llvm_arguments.to_owned(),
         );
         let metadata_json = serde_json::to_value(&metadata).expect("Always valid");
-        let metadata_hash: Option<[u8; revive_common::BYTE_LENGTH_WORD]> = if include_metadata_hash
-        {
-            let metadata_string = serde_json::to_string(&metadata).expect("Always valid");
-            Some(sha3::Keccak256::digest(metadata_string.as_bytes()).into())
-        } else {
-            None
+        let metadata_json_bytes = serde_json::to_vec(&metadata_json).expect("Always valid");
+        let metadata_bytes = match metadata_hash {
+            MetadataHash::Keccak256 => Keccak256::from_slice(&metadata_json_bytes).into(),
+            MetadataHash::IPFS => todo!("IPFS hash isn't supported yet"),
+            MetadataHash::None => None,
         };
+        debug_config.set_contract_path(&self.identifier.full_path);
 
-        let module = match self.ir {
-            IR::LLVMIR(ref llvm_ir) => {
-                // Create the output module
-                let memory_buffer =
-                    inkwell::memory_buffer::MemoryBuffer::create_from_memory_range_copy(
-                        llvm_ir.source.as_bytes(),
-                        self.path.as_str(),
-                    );
-                llvm.create_module_from_ir(memory_buffer)
-                    .map_err(|error| anyhow::anyhow!(error.to_string()))?
+        let build = match self.ir {
+            IR::Yul(mut yul) => {
+                let module = llvm.create_module(self.identifier.full_path.as_str());
+                let mut context =
+                    PolkaVMContext::new(&llvm, module, optimizer, debug_config, memory_config);
+                context.set_solidity_data(PolkaVMContextSolidityData::default());
+                let yul_data = PolkaVMContextYulData::new(identifier_paths);
+                context.set_yul_data(yul_data);
+
+                yul.declare(&mut context)?;
+                yul.into_llvm(&mut context)
+                    .map_err(|error| anyhow::anyhow!("LLVM IR generator: {error}"))?;
+
+                context.build(self.identifier.full_path.as_str(), metadata_bytes)?
             }
-            _ => llvm.create_module(self.path.as_str()),
         };
 
-        debug_config.set_contract_path(&self.path);
-        let mut context = revive_llvm_context::PolkaVMContext::new(
-            &llvm,
-            module,
-            optimizer,
-            Some(project),
-            include_metadata_hash,
-            debug_config,
-            llvm_arguments,
-            memory_config,
-        );
-        context.set_solidity_data(revive_llvm_context::PolkaVMContextSolidityData::default());
-        match self.ir {
-            IR::Yul(_) => {
-                context.set_yul_data(Default::default());
-            }
-            IR::LLVMIR(_) => {}
-        }
-
-        let factory_dependencies = self.drain_factory_dependencies();
-
-        self.ir.declare(&mut context).map_err(|error| {
-            anyhow::anyhow!(
-                "The contract `{}` LLVM IR generator declaration pass error: {}",
-                self.path,
-                error
-            )
-        })?;
-        self.ir.into_llvm(&mut context).map_err(|error| {
-            anyhow::anyhow!(
-                "The contract `{}` LLVM IR generator definition pass error: {}",
-                self.path,
-                error
-            )
-        })?;
-
-        if let Some(debug_info) = context.debug_info() {
-            debug_info.finalize_module()
-        }
-
-        let build = context.build(self.path.as_str(), metadata_hash)?;
-
         Ok(ContractBuild::new(
-            self.path,
-            identifier,
+            self.identifier,
             build,
             metadata_json,
+            missing_libraries,
             factory_dependencies,
+            ObjectFormat::ELF,
         ))
     }
 
     /// Get the list of missing deployable libraries.
-    pub fn get_missing_libraries(&self) -> HashSet<String> {
-        self.ir.get_missing_libraries()
-    }
-}
-
-impl<D> PolkaVMWriteLLVM<D> for Contract
-where
-    D: revive_llvm_context::PolkaVMDependency + Clone,
-{
-    fn declare(
-        &mut self,
-        context: &mut revive_llvm_context::PolkaVMContext<D>,
-    ) -> anyhow::Result<()> {
-        self.ir.declare(context)
-    }
-
-    fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext<D>) -> anyhow::Result<()> {
-        self.ir.into_llvm(context)
+    pub fn get_missing_libraries(&self, deployed_libraries: &BTreeSet<String>) -> BTreeSet<String> {
+        self.ir
+            .get_missing_libraries()
+            .into_iter()
+            .filter(|library| !deployed_libraries.contains(library))
+            .collect::<BTreeSet<String>>()
     }
 }

crates/resolc/src/project/mod.rs

@@ -3,54 +3,59 @@
 pub mod contract;
 
 use std::collections::BTreeMap;
-use std::collections::HashMap;
-use std::collections::HashSet;
-use std::path::Path;
+use std::collections::BTreeSet;
+use std::path::PathBuf;
 
 #[cfg(feature = "parallel")]
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
+use revive_common::Keccak256;
+use revive_common::MetadataHash;
+use revive_llvm_context::DebugConfig;
+use revive_llvm_context::OptimizerSettings;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
+use revive_solc_json_interface::SolcStandardJsonInputSource;
+use revive_solc_json_interface::SolcStandardJsonOutputError;
 use serde::Deserialize;
 use serde::Serialize;
-use sha3::Digest;
 
+use revive_common::ContractIdentifier;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsLibraries;
 use revive_solc_json_interface::SolcStandardJsonOutput;
-use revive_yul::lexer::Lexer;
-use revive_yul::parser::statement::object::Object;
 
 use crate::build::contract::Contract as ContractBuild;
 use crate::build::Build;
 use crate::missing_libraries::MissingLibraries;
 use crate::process::input::Input as ProcessInput;
 use crate::process::Process;
+use crate::project::contract::ir::yul::Yul;
 use crate::project::contract::ir::IR;
+use crate::project::contract::Contract;
 use crate::solc::version::Version as SolcVersion;
-use crate::solc::Compiler;
-
-use self::contract::Contract;
+use crate::ProcessOutput;
 
 /// The processes input data.
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Project {
     /// The source code version.
-    pub version: SolcVersion,
+    pub version: Option<SolcVersion>,
     /// The project contracts,
     pub contracts: BTreeMap<String, Contract>,
     /// The mapping of auxiliary identifiers, e.g. Yul object names, to full contract paths.
     pub identifier_paths: BTreeMap<String, String>,
     /// The library addresses.
-    pub libraries: BTreeMap<String, BTreeMap<String, String>>,
+    pub libraries: SolcStandardJsonInputSettingsLibraries,
 }
 
 impl Project {
     /// A shortcut constructor.
     pub fn new(
-        version: SolcVersion,
+        version: Option<SolcVersion>,
         contracts: BTreeMap<String, Contract>,
-        libraries: BTreeMap<String, BTreeMap<String, String>>,
+        libraries: SolcStandardJsonInputSettingsLibraries,
     ) -> Self {
         let mut identifier_paths = BTreeMap::new();
         for (path, contract) in contracts.iter() {
-            identifier_paths.insert(contract.identifier().to_owned(), path.to_owned());
+            identifier_paths.insert(contract.object_identifier().to_owned(), path.to_owned());
         }
 
         Self {
@@ -64,319 +69,195 @@ impl Project {
     /// Compiles all contracts, returning their build artifacts.
     pub fn compile(
         self,
-        optimizer_settings: revive_llvm_context::OptimizerSettings,
-        include_metadata_hash: bool,
-        debug_config: revive_llvm_context::DebugConfig,
+        messages: &mut Vec<SolcStandardJsonOutputError>,
+        optimizer_settings: OptimizerSettings,
+        metadata_hash: MetadataHash,
+        debug_config: &DebugConfig,
         llvm_arguments: &[String],
-        memory_config: revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory,
+        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> anyhow::Result<Build> {
-        let project = self.clone();
+        let deployed_libraries = self.libraries.as_paths();
+
         #[cfg(feature = "parallel")]
         let iter = self.contracts.into_par_iter();
         #[cfg(not(feature = "parallel"))]
         let iter = self.contracts.into_iter();
 
-        let results: BTreeMap<String, anyhow::Result<ContractBuild>> = iter
-            .map(|(full_path, contract)| {
-                let process_input = ProcessInput::new(
+        let results = iter
+            .map(|(path, mut contract)| {
+                let factory_dependencies = contract
+                    .ir
+                    .drain_factory_dependencies()
+                    .iter()
+                    .map(|identifier| {
+                        self.identifier_paths
+                            .get(identifier)
+                            .cloned()
+                            .expect("Always exists")
+                    })
+                    .collect();
+                let missing_libraries = contract.get_missing_libraries(&deployed_libraries);
+                let input = ProcessInput::new(
                     contract,
-                    project.clone(),
-                    include_metadata_hash,
+                    self.version.clone(),
+                    metadata_hash,
                     optimizer_settings.clone(),
                     debug_config.clone(),
-                    llvm_arguments.to_vec(),
+                    llvm_arguments.to_owned(),
                     memory_config,
+                    missing_libraries,
+                    factory_dependencies,
+                    self.identifier_paths.clone(),
                 );
-                let process_output = {
+                let result: Result<ProcessOutput, SolcStandardJsonOutputError> = {
                     #[cfg(target_os = "emscripten")]
                     {
-                        crate::WorkerProcess::call(process_input)
+                        crate::WorkerProcess::call(path.as_str(), input)
                     }
                     #[cfg(not(target_os = "emscripten"))]
                     {
-                        crate::NativeProcess::call(process_input)
+                        crate::NativeProcess::call(path.as_str(), input)
                     }
                 };
-                (full_path, process_output.map(|output| output.build))
+                let result = result.map(|output| output.build);
+                (path, result)
             })
-            .collect();
-
-        let mut build = Build::default();
-        let mut hashes = HashMap::with_capacity(results.len());
-        for (path, result) in results.iter() {
-            match result {
-                Ok(contract) => {
-                    hashes.insert(path.to_owned(), contract.build.bytecode_hash.to_owned());
-                }
-                Err(error) => {
-                    anyhow::bail!("Contract `{}` compiling error: {:?}", path, error);
-                }
-            }
-        }
-        for (path, result) in results.into_iter() {
-            match result {
-                Ok(mut contract) => {
-                    for dependency in contract.factory_dependencies.drain() {
-                        let dependency_path = project
-                            .identifier_paths
-                            .get(dependency.as_str())
-                            .cloned()
-                            .unwrap_or_else(|| {
-                                panic!("Dependency `{dependency}` full path not found")
-                            });
-                        let hash = match hashes.get(dependency_path.as_str()) {
-                            Some(hash) => hash.to_owned(),
-                            None => anyhow::bail!(
-                                "Dependency contract `{}` not found in the project",
-                                dependency_path
-                            ),
-                        };
-                        contract
-                            .build
-                            .factory_dependencies
-                            .insert(hash, dependency_path);
-                    }
-
-                    build.contracts.insert(path, contract);
-                }
-                Err(error) => {
-                    anyhow::bail!("Contract `{}` compiling error: {:?}", path, error);
-                }
-            }
-        }
-
-        Ok(build)
+            .collect::<BTreeMap<String, Result<ContractBuild, SolcStandardJsonOutputError>>>();
+        Ok(Build::new(results, messages))
     }
 
     /// Get the list of missing deployable libraries.
-    pub fn get_missing_libraries(&self) -> MissingLibraries {
-        let deployed_libraries = self
-            .libraries
+    pub fn get_missing_libraries(&self, deployed_libraries: &BTreeSet<String>) -> MissingLibraries {
+        let missing_libraries = self
+            .contracts
             .iter()
-            .flat_map(|(file, names)| {
-                names
-                    .keys()
-                    .map(|name| format!("{file}:{name}"))
-                    .collect::<HashSet<String>>()
+            .map(|(path, contract)| {
+                (
+                    path.to_owned(),
+                    contract.get_missing_libraries(deployed_libraries),
+                )
             })
-            .collect::<HashSet<String>>();
-
-        let mut missing_deployable_libraries = BTreeMap::new();
-        for (contract_path, contract) in self.contracts.iter() {
-            let missing_libraries = contract
-                .get_missing_libraries()
-                .into_iter()
-                .filter(|library| !deployed_libraries.contains(library))
-                .collect::<HashSet<String>>();
-            missing_deployable_libraries.insert(contract_path.to_owned(), missing_libraries);
-        }
-        MissingLibraries::new(missing_deployable_libraries)
+            .collect();
+        MissingLibraries::new(missing_libraries)
     }
 
     /// Parses the Yul source code file and returns the source data.
-    pub fn try_from_yul_path<T: Compiler>(
-        path: &Path,
-        solc_validator: Option<&T>,
+    pub fn try_from_yul_paths(
+        paths: &[PathBuf],
+        solc_output: Option<&mut SolcStandardJsonOutput>,
+        libraries: SolcStandardJsonInputSettingsLibraries,
+        debug_config: &DebugConfig,
     ) -> anyhow::Result<Self> {
-        let source_code = std::fs::read_to_string(path)
-            .map_err(|error| anyhow::anyhow!("Yul file {:?} reading error: {}", path, error))?;
-        Self::try_from_yul_string(path, source_code.as_str(), solc_validator)
+        let sources = paths
+            .iter()
+            .map(|path| {
+                let source = SolcStandardJsonInputSource::from(path.as_path());
+                (path.to_string_lossy().to_string(), source)
+            })
+            .collect::<BTreeMap<String, SolcStandardJsonInputSource>>();
+        Self::try_from_yul_sources(sources, libraries, solc_output, debug_config)
     }
 
     /// Parses the test Yul source code string and returns the source data.
-    /// Only for integration testing purposes.
-    pub fn try_from_yul_string<T: Compiler>(
-        path: &Path,
-        source_code: &str,
-        solc_validator: Option<&T>,
+    pub fn try_from_yul_sources(
+        sources: BTreeMap<String, SolcStandardJsonInputSource>,
+        libraries: SolcStandardJsonInputSettingsLibraries,
+        mut solc_output: Option<&mut SolcStandardJsonOutput>,
+        debug_config: &DebugConfig,
     ) -> anyhow::Result<Self> {
-        if let Some(solc) = solc_validator {
-            solc.validate_yul(path)?;
+        #[cfg(feature = "parallel")]
+        let iter = sources.into_par_iter();
+        #[cfg(not(feature = "parallel"))]
+        let iter = sources.into_iter();
+
+        let results = iter
+            .filter_map(|(path, mut source)| {
+                let source_code = match source.try_resolve() {
+                    Ok(()) => source.take_content().expect("Always exists"),
+                    Err(error) => return Some((path, Err(error))),
+                };
+                let ir = match Yul::try_from_source(&source_code) {
+                    Ok(ir) => ir?,
+                    Err(error) => return Some((path, Err(error))),
+                };
+                let object_identifier = ir.object.identifier.clone();
+                let name = ContractIdentifier::new(path.clone(), Some(object_identifier));
+                let full_path = name.full_path.clone();
+                if let Err(error) = debug_config.dump_yul(&name.full_path, &source_code) {
+                    return Some((full_path.clone(), Err(error)));
+                }
+                let source_metadata = serde_json::json!({
+                    "source_hash": Keccak256::from_slice(source_code.as_bytes()).to_string()
+                });
+                let contract = Contract::new(name, ir.into(), source_metadata);
+                Some((full_path, Ok(contract)))
+            })
+            .collect::<BTreeMap<String, anyhow::Result<Contract>>>();
+
+        let mut contracts = BTreeMap::new();
+        for (path, result) in results.into_iter() {
+            match result {
+                Ok(contract) => {
+                    contracts.insert(path, contract);
+                }
+                Err(error) => match solc_output {
+                    Some(ref mut solc_output) => solc_output.push_error(Some(path), error),
+                    None => anyhow::bail!(error),
+                },
+            }
         }
-
-        let source_version = SolcVersion::new_simple(crate::solc::LAST_SUPPORTED_VERSION);
-        let path = path.to_string_lossy().to_string();
-        let source_hash = sha3::Keccak256::digest(source_code.as_bytes()).into();
-
-        let mut lexer = Lexer::new(source_code.to_owned());
-        let object = Object::parse(&mut lexer, None)
-            .map_err(|error| anyhow::anyhow!("Yul object `{}` parsing error: {}", path, error))?;
-
-        let mut project_contracts = BTreeMap::new();
-        project_contracts.insert(
-            path.to_owned(),
-            Contract::new(
-                path,
-                source_hash,
-                source_version.clone(),
-                IR::new_yul(source_code.to_owned(), object),
-                None,
-            ),
-        );
-
-        Ok(Self::new(
-            source_version,
-            project_contracts,
-            BTreeMap::new(),
-        ))
-    }
-
-    /// Parses the LLVM IR source code file and returns the source data.
-    pub fn try_from_llvm_ir_path(path: &Path) -> anyhow::Result<Self> {
-        let source_code = std::fs::read_to_string(path)
-            .map_err(|error| anyhow::anyhow!("LLVM IR file {:?} reading error: {}", path, error))?;
-        let source_hash = sha3::Keccak256::digest(source_code.as_bytes()).into();
-
-        let source_version =
-            SolcVersion::new_simple(revive_llvm_context::polkavm_const::LLVM_VERSION);
-        let path = path.to_string_lossy().to_string();
-
-        let mut project_contracts = BTreeMap::new();
-        project_contracts.insert(
-            path.clone(),
-            Contract::new(
-                path.clone(),
-                source_hash,
-                source_version.clone(),
-                IR::new_llvm_ir(path, source_code),
-                None,
-            ),
-        );
-
-        Ok(Self::new(
-            source_version,
-            project_contracts,
-            BTreeMap::new(),
-        ))
+        Ok(Self::new(None, contracts, libraries))
     }
 
     /// Converts the `solc` JSON output into a convenient project.
     pub fn try_from_standard_json_output(
-        output: &SolcStandardJsonOutput,
-        source_code_files: BTreeMap<String, String>,
-        libraries: BTreeMap<String, BTreeMap<String, String>>,
+        solc_output: &mut SolcStandardJsonOutput,
+        libraries: SolcStandardJsonInputSettingsLibraries,
         solc_version: &SolcVersion,
-        debug_config: &revive_llvm_context::DebugConfig,
+        debug_config: &DebugConfig,
     ) -> anyhow::Result<Self> {
-        let files = match output.contracts.as_ref() {
-            Some(files) => files,
-            None => match &output.errors {
-                Some(errors) if errors.iter().any(|e| e.severity == "error") => {
-                    anyhow::bail!(serde_json::to_string_pretty(errors).expect("Always valid"));
-                }
-                _ => &BTreeMap::new(),
-            },
-        };
-        let mut project_contracts = BTreeMap::new();
-
-        for (path, contracts) in files.iter() {
-            for (name, contract) in contracts.iter() {
-                let full_path = format!("{path}:{name}");
-
-                let ir_optimized = match contract.ir_optimized.to_owned() {
-                    Some(ir_optimized) => ir_optimized,
-                    None => continue,
-                };
-                if ir_optimized.is_empty() {
-                    continue;
-                }
-
-                debug_config.dump_yul(full_path.as_str(), ir_optimized.as_str())?;
-
-                let mut lexer = Lexer::new(ir_optimized.to_owned());
-                let object = Object::parse(&mut lexer, None).map_err(|error| {
-                    anyhow::anyhow!("Contract `{}` parsing error: {:?}", full_path, error)
-                })?;
-
-                let source = IR::new_yul(ir_optimized.to_owned(), object);
-
-                let source_code = source_code_files
-                    .get(path.as_str())
-                    .ok_or_else(|| anyhow::anyhow!("Source code for path `{}` not found", path))?;
-                let source_hash = sha3::Keccak256::digest(source_code.as_bytes()).into();
-
-                let project_contract = Contract::new(
-                    full_path.clone(),
-                    source_hash,
-                    solc_version.to_owned(),
-                    source,
-                    contract.metadata.to_owned(),
-                );
-                project_contracts.insert(full_path, project_contract);
+        let mut input_contracts = Vec::with_capacity(solc_output.contracts.len());
+        for (path, file) in solc_output.contracts.iter() {
+            for (name, contract) in file.iter() {
+                let name = ContractIdentifier::new((*path).to_owned(), Some((*name).to_owned()));
+                input_contracts.push((name, contract));
             }
         }
 
+        #[cfg(feature = "parallel")]
+        let iter = input_contracts.into_par_iter();
+        #[cfg(not(feature = "parallel"))]
+        let iter = input_contracts.into_iter();
+
+        let results = iter
+            .filter_map(|(name, contract)| {
+                let ir = match Yul::try_from_source(&contract.ir_optimized)
+                    .map(|yul| yul.map(IR::from))
+                {
+                    Ok(ir) => ir?,
+                    Err(error) => return Some((name.full_path, Err(error))),
+                };
+                if let Err(error) = debug_config.dump_yul(&name.full_path, &contract.ir_optimized) {
+                    return Some((name.full_path, Err(error)));
+                }
+                let contract = Contract::new(name.clone(), ir, contract.metadata.clone());
+                Some((name.full_path, Ok(contract)))
+            })
+            .collect::<BTreeMap<String, anyhow::Result<Contract>>>();
+
+        let mut contracts = BTreeMap::new();
+        for (path, result) in results.into_iter() {
+            match result {
+                Ok(contract) => {
+                    contracts.insert(path, contract);
+                }
+                Err(error) => solc_output.push_error(Some(path), error),
+            }
+        }
         Ok(Project::new(
-            solc_version.to_owned(),
-            project_contracts,
+            Some(solc_version.clone()),
+            contracts,
             libraries,
         ))
     }
 }
-
-impl revive_llvm_context::PolkaVMDependency for Project {
-    fn compile(
-        project: Self,
-        identifier: &str,
-        optimizer_settings: revive_llvm_context::OptimizerSettings,
-        include_metadata_hash: bool,
-        debug_config: revive_llvm_context::DebugConfig,
-        llvm_arguments: &[String],
-        memory_config: revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory,
-    ) -> anyhow::Result<String> {
-        let contract_path = project.resolve_path(identifier)?;
-        let contract = project
-            .contracts
-            .get(contract_path.as_str())
-            .cloned()
-            .ok_or_else(|| {
-                anyhow::anyhow!(
-                    "Dependency contract `{}` not found in the project",
-                    contract_path
-                )
-            })?;
-
-        contract
-            .compile(
-                project,
-                optimizer_settings,
-                include_metadata_hash,
-                debug_config,
-                llvm_arguments,
-                memory_config,
-            )
-            .map_err(|error| {
-                anyhow::anyhow!(
-                    "Dependency contract `{}` compiling error: {}",
-                    identifier,
-                    error
-                )
-            })
-            .map(|contract| contract.build.bytecode_hash)
-    }
-
-    fn resolve_path(&self, identifier: &str) -> anyhow::Result<String> {
-        self.identifier_paths
-            .get(identifier.strip_suffix("_deployed").unwrap_or(identifier))
-            .cloned()
-            .ok_or_else(|| {
-                anyhow::anyhow!(
-                    "Contract with identifier `{}` not found in the project",
-                    identifier
-                )
-            })
-    }
-
-    fn resolve_library(&self, path: &str) -> anyhow::Result<String> {
-        for (file_path, contracts) in self.libraries.iter() {
-            for (contract_name, address) in contracts.iter() {
-                let key = format!("{file_path}:{contract_name}");
-                if key.as_str() == path {
-                    return Ok(address["0x".len()..].to_owned());
-                }
-            }
-        }
-
-        anyhow::bail!("Library `{}` not found in the project", path);
-    }
-}

crates/resolc/src/resolc/arguments.rs

@@ -6,6 +6,8 @@ use std::path::PathBuf;
 
 use clap::Parser;
 use path_slash::PathExt;
+use revive_common::MetadataHash;
+use revive_solc_json_interface::SolcStandardJsonOutputError;
 
 /// Compiles the provided Solidity input files (or use the standard input if no files
 /// are given or "-" is specified as a file name). Outputs the components based on the
@@ -58,10 +60,6 @@ pub struct Arguments {
     #[arg(short = 'O', long = "optimization")]
     pub optimization: Option<char>,
 
-    /// Try to recompile with -Oz if the bytecode is too large.
-    #[arg(long = "fallback-Oz")]
-    pub fallback_to_optimizing_for_size: bool,
-
     /// Disable the `solc` optimizer.
     /// Use it if your project uses the `MSIZE` instruction, or in other cases.
     /// Beware that it will prevent libraries from being inlined.
@@ -92,7 +90,7 @@ pub struct Arguments {
     /// Switch to standard JSON input/output mode. Read from stdin, write the result to stdout.
     /// This is the default used by the Hardhat plugin.
     #[arg(long = "standard-json")]
-    pub standard_json: bool,
+    pub standard_json: Option<Option<String>>,
 
     /// Switch to missing deployable libraries detection mode.
     /// Only available for standard JSON input/output mode.
@@ -106,17 +104,20 @@ pub struct Arguments {
     #[arg(long = "yul")]
     pub yul: bool,
 
-    /// Switch to LLVM IR mode.
-    /// Only one input LLVM IR file is allowed.
-    /// Cannot be used with combined and standard JSON modes.
-    /// Use this mode at your own risk, as LLVM IR input validation is not implemented.
-    #[arg(long = "llvm-ir")]
-    pub llvm_ir: bool,
+    /// Switch to linker mode, ignoring all options apart from `--libraries` and modify binaries in place.
+    ///
+    /// Unlinked contract binaries (caused by missing libraries or missing factory dependencies in turn)
+    /// are emitted as raw ELF objects. Use this mode to link them into PVM blobs.
+    ///
+    /// NOTE: Contracts must be present in the input files with the EXACT SAME directory structure as their source code,
+    /// otherwise this may fail to resolve factory dependencies.
+    #[arg(long)]
+    pub link: bool,
 
-    /// Set metadata hash mode.
-    /// The only supported value is `none` that disables appending the metadata hash.
-    /// Is enabled by default.
-    #[arg(long = "metadata-hash")]
+    /// Set the metadata hash type.
+    /// Available types: `none`, `ipfs`, `keccak256`.
+    /// The default is `keccak256`.
+    #[arg(long)]
     pub metadata_hash: Option<String>,
 
     /// Output PolkaVM assembly of the contracts.
@@ -127,6 +128,10 @@ pub struct Arguments {
     #[arg(long = "bin")]
     pub output_binary: bool,
 
+    /// Output metadata of the compiled project.
+    #[arg(long = "metadata")]
+    pub output_metadata: bool,
+
     /// Suppress specified warnings.
     /// Available arguments: `ecrecover`, `sendtransfer`, `extcodesize`, `txorigin`, `blocktimestamp`, `blocknumber`, `blockhash`.
     #[arg(long = "suppress-warnings")]
@@ -202,155 +207,206 @@ pub struct Arguments {
 
 impl Arguments {
     /// Validates the arguments.
-    pub fn validate(&self) -> anyhow::Result<()> {
+    pub fn validate(&self) -> Vec<SolcStandardJsonOutputError> {
+        let mut messages = Vec::new();
+
         if self.version && std::env::args().count() > 2 {
-            anyhow::bail!("No other options are allowed while getting the compiler version.");
+            messages.push(SolcStandardJsonOutputError::new_error(
+                "No other options are allowed while getting the compiler version.",
+                None,
+                None,
+            ));
         }
 
         if self.supported_solc_versions && std::env::args().count() > 2 {
-            anyhow::bail!(
-                "No other options are allowed while getting the supported `solc` versions."
-            );
+            messages.push(SolcStandardJsonOutputError::new_error(
+                "No other options are allowed while getting the supported `solc` version.",
+                None,
+                None,
+            ));
         }
 
-        #[cfg(debug_assertions)]
-        if self.recursive_process_input.is_some() && !self.recursive_process {
-            anyhow::bail!("--process-input can be only used when --recursive-process is given");
+        if self.metadata_hash == Some(MetadataHash::IPFS.to_string()) {
+            messages.push(SolcStandardJsonOutputError::new_error(
+                "`IPFS` metadata hash type is not supported. Please use `keccak256` instead.",
+                None,
+                None,
+            ));
         }
 
-        #[cfg(debug_assertions)]
-        if self.recursive_process
-            && ((self.recursive_process_input.is_none() && std::env::args().count() > 2)
-                || (self.recursive_process_input.is_some() && std::env::args().count() > 4))
-        {
-            anyhow::bail!("No other options are allowed in recursive mode.");
-        }
-
-        #[cfg(not(debug_assertions))]
-        if self.recursive_process && std::env::args().count() > 2 {
-            anyhow::bail!("No other options are allowed in recursive mode.");
-        }
-
-        let modes_count = [
+        let modes = [
             self.yul,
-            self.llvm_ir,
             self.combined_json.is_some(),
-            self.standard_json,
+            self.standard_json.is_some(),
+            self.link,
         ]
         .iter()
         .filter(|&&x| x)
         .count();
-        if modes_count > 1 {
-            anyhow::bail!("Only one modes is allowed at the same time: Yul, LLVM IR, PolkaVM assembly, combined JSON, standard JSON.");
+        let acceptable_count = 1 + self.standard_json.is_some() as usize;
+        if modes > acceptable_count {
+            messages.push(SolcStandardJsonOutputError::new_error(
+            "Only one modes is allowed at the same time: Yul, LLVM IR, PolkaVM assembly, combined JSON, standard JSON.",None,None));
         }
 
-        if self.yul || self.llvm_ir {
+        if self.yul && !self.libraries.is_empty() {
+            messages.push(SolcStandardJsonOutputError::new_error(
+                "Libraries are not supported in Yul and linker modes.",
+                None,
+                None,
+            ));
+        }
+
+        if self.yul || self.link {
             if self.base_path.is_some() {
-                anyhow::bail!(
-                    "`base-path` is not used in Yul, LLVM IR and PolkaVM assembly modes."
-                );
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "`base-path` is not used in Yul and linker modes.",
+                    None,
+                    None,
+                ));
             }
             if !self.include_paths.is_empty() {
-                anyhow::bail!(
-                    "`include-paths` is not used in Yul, LLVM IR and PolkaVM assembly modes."
-                );
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "`include-paths` is not used in Yul and linker modes.",
+                    None,
+                    None,
+                ));
             }
             if self.allow_paths.is_some() {
-                anyhow::bail!(
-                    "`allow-paths` is not used in Yul, LLVM IR and PolkaVM assembly modes."
-                );
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "`allow-paths` is not used in Yul and linker modes.",
+                    None,
+                    None,
+                ));
             }
-            if !self.libraries.is_empty() {
-                anyhow::bail!(
-                    "Libraries are not supported in Yul, LLVM IR and PolkaVM assembly modes."
-                );
-            }
-
             if self.evm_version.is_some() {
-                anyhow::bail!(
-                    "`evm-version` is not used in Yul, LLVM IR and PolkaVM assembly modes."
-                );
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "`evm-version` is not used in Yul and linker modes.",
+                    None,
+                    None,
+                ));
             }
-
             if self.disable_solc_optimizer {
-                anyhow::bail!("Disabling the solc optimizer is not supported in Yul, LLVM IR and PolkaVM assembly modes.");
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "Disabling the solc optimizer is not supported in Yul and linker modes.",
+                    None,
+                    None,
+                ));
             }
         }
 
-        if self.llvm_ir && self.solc.is_some() {
-            anyhow::bail!("`solc` is not used in LLVM IR and PolkaVM assembly modes.");
-        }
-
         if self.combined_json.is_some() && (self.output_assembly || self.output_binary) {
-            anyhow::bail!(
-                "Cannot output assembly or binary outside of JSON in combined JSON mode."
-            );
+            messages.push(SolcStandardJsonOutputError::new_error(
+                "Cannot output assembly or binary outside of JSON in combined JSON mode.",
+                None,
+                None,
+            ));
         }
 
-        if self.standard_json {
+        if self.standard_json.is_some() {
             if self.output_assembly || self.output_binary {
-                anyhow::bail!(
-                    "Cannot output assembly or binary outside of JSON in standard JSON mode."
-                );
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "Cannot output assembly or binary outside of JSON in standard JSON mode.",
+                    None,
+                    None,
+                ));
             }
 
             if !self.inputs.is_empty() {
-                anyhow::bail!("Input files must be passed via standard JSON input.");
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "Input files must be passed via standard JSON input.",
+                    None,
+                    None,
+                ));
             }
             if !self.libraries.is_empty() {
-                anyhow::bail!("Libraries must be passed via standard JSON input.");
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "Libraries must be passed via standard JSON input.",
+                    None,
+                    None,
+                ));
             }
             if self.evm_version.is_some() {
-                anyhow::bail!("EVM version must be passed via standard JSON input.");
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "EVM version must be passed via standard JSON input.",
+                    None,
+                    None,
+                ));
             }
 
             if self.output_directory.is_some() {
-                anyhow::bail!("Output directory cannot be used in standard JSON mode.");
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "Output directory cannot be used in standard JSON mode.",
+                    None,
+                    None,
+                ));
             }
             if self.overwrite {
-                anyhow::bail!("Overwriting flag cannot be used in standard JSON mode.");
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "Overwriting flag cannot be used in standard JSON mode.",
+                    None,
+                    None,
+                ));
             }
             if self.disable_solc_optimizer {
-                anyhow::bail!(
-                    "Disabling the solc optimizer must specified in standard JSON input settings."
-                );
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "Disabling the solc optimizer must specified in standard JSON input settings.",
+                    None,
+                    None,
+                ));
             }
             if self.optimization.is_some() {
-                anyhow::bail!("LLVM optimizations must specified in standard JSON input settings.");
-            }
-            if self.fallback_to_optimizing_for_size {
-                anyhow::bail!(
-                    "Falling back to -Oz must specified in standard JSON input settings."
-                );
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "LLVM optimizations must specified in standard JSON input settings.",
+                    None,
+                    None,
+                ));
             }
             if self.metadata_hash.is_some() {
-                anyhow::bail!("Metadata hash mode must specified in standard JSON input settings.");
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "Metadata hash mode must specified in standard JSON input settings.",
+                    None,
+                    None,
+                ));
             }
 
             if self.heap_size.is_some() {
-                anyhow::bail!(
-                    "Heap size must be specified in standard JSON input polkavm memory settings."
-                );
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "Heap size must be specified in standard JSON input polkavm memory settings.",
+                    None,
+                    None,
+                ));
             }
             if self.stack_size.is_some() {
-                anyhow::bail!(
-                    "Stack size must be specified in standard JSON input polkavm memory settings."
-                );
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "Stack size must be specified in standard JSON input polkavm memory settings.",
+                    None,
+                    None,
+                ));
             }
             if self.emit_source_debug_info {
-                anyhow::bail!(
-                    "Debug info must be requested in standard JSON input polkavm settings."
-                );
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "Debug info must be requested in standard JSON input polkavm settings.",
+                    None,
+                    None,
+                ));
+            }
+            if !self.llvm_arguments.is_empty() {
+                messages.push(SolcStandardJsonOutputError::new_error(
+                    "LLVM arguments must be configured in standard JSON input polkavm settings.",
+                    None,
+                    None,
+                ));
             }
         }
 
-        Ok(())
+        messages
     }
 
     /// Returns remappings from input paths.
     pub fn split_input_files_and_remappings(
         &self,
-    ) -> anyhow::Result<(Vec<PathBuf>, Option<BTreeSet<String>>)> {
+    ) -> anyhow::Result<(Vec<PathBuf>, BTreeSet<String>)> {
         let mut input_files = Vec::with_capacity(self.inputs.len());
         let mut remappings = BTreeSet::new();
 
@@ -367,7 +423,7 @@ impl Arguments {
                 }
                 if parts.len() != 2 {
                     anyhow::bail!(
-                        "Invalid remapping `{}`: expected two parts separated by '='",
+                        "Invalid remapping `{}`: expected two parts separated by '='.",
                         input
                     );
                 }
@@ -379,12 +435,6 @@ impl Arguments {
             }
         }
 
-        let remappings = if remappings.is_empty() {
-            None
-        } else {
-            Some(remappings)
-        };
-
         Ok((input_files, remappings))
     }
 

crates/resolc/src/resolc/main.rs

@@ -1,36 +1,84 @@
 //! Solidity to PolkaVM compiler binary.
 
-pub mod arguments;
-
-use std::io::Write;
 use std::str::FromStr;
+use std::{io::Write, path::PathBuf};
 
+use clap::error::ErrorKind;
 use resolc::Process;
+use revive_common::{
+    deserialize_from_str, EVMVersion, MetadataHash, EXIT_CODE_FAILURE, EXIT_CODE_SUCCESS,
+};
+use revive_llvm_context::{initialize_llvm, DebugConfig, OptimizerSettings, PolkaVMTarget};
+use revive_solc_json_interface::{
+    ResolcWarning, SolcStandardJsonInputSettingsPolkaVMMemory,
+    SolcStandardJsonInputSettingsSelection, SolcStandardJsonOutput, SolcStandardJsonOutputError,
+};
 
 use self::arguments::Arguments;
 
-#[cfg(feature = "parallel")]
-/// The rayon worker stack size.
-const RAYON_WORKER_STACK_SIZE: usize = 16 * 1024 * 1024;
+pub mod arguments;
 
 #[cfg(target_env = "musl")]
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
 fn main() -> anyhow::Result<()> {
-    std::process::exit(match main_inner() {
-        Ok(()) => revive_common::EXIT_CODE_SUCCESS,
-        Err(error) => {
-            writeln!(std::io::stderr(), "{error}")?;
-            revive_common::EXIT_CODE_FAILURE
+    let arguments = <Arguments as clap::Parser>::try_parse().inspect_err(|error| {
+        if let ErrorKind::DisplayHelp = error.kind() {
+            let _ = error.print();
+            std::process::exit(EXIT_CODE_SUCCESS);
         }
-    })
+    })?;
+
+    let is_standard_json = arguments.standard_json.is_some();
+    let mut messages = arguments.validate();
+    if messages.iter().all(|error| error.severity != "error") {
+        if !is_standard_json {
+            std::io::stderr()
+                .write_all(
+                    messages
+                        .drain(..)
+                        .map(|error| error.to_string())
+                        .collect::<Vec<String>>()
+                        .join("\n")
+                        .as_bytes(),
+                )
+                .expect("Stderr writing error");
+        }
+        if let Err(error) = main_inner(arguments, &mut messages) {
+            messages.push(SolcStandardJsonOutputError::new_error(error, None, None));
+        }
+    }
+
+    if is_standard_json {
+        let output = SolcStandardJsonOutput::new_with_messages(messages);
+        output.write_and_exit(SolcStandardJsonInputSettingsSelection::default());
+    }
+
+    std::io::stderr()
+        .write_all(
+            messages
+                .iter()
+                .map(|error| error.to_string())
+                .collect::<Vec<String>>()
+                .join("\n")
+                .as_bytes(),
+        )
+        .expect("Stderr writing error");
+
+    std::process::exit(
+        if messages.iter().any(SolcStandardJsonOutputError::is_error) {
+            EXIT_CODE_FAILURE
+        } else {
+            EXIT_CODE_SUCCESS
+        },
+    );
 }
 
-fn main_inner() -> anyhow::Result<()> {
-    let arguments = <Arguments as clap::Parser>::try_parse()?;
-    arguments.validate()?;
-
+fn main_inner(
+    arguments: Arguments,
+    messages: &mut Vec<SolcStandardJsonOutputError>,
+) -> anyhow::Result<()> {
     if arguments.version {
         writeln!(
             std::io::stdout(),
@@ -53,59 +101,60 @@ fn main_inner() -> anyhow::Result<()> {
 
     #[cfg(feature = "parallel")]
     rayon::ThreadPoolBuilder::new()
-        .stack_size(RAYON_WORKER_STACK_SIZE)
+        .stack_size(resolc::RAYON_WORKER_STACK_SIZE)
         .build_global()
         .expect("Thread pool configuration failure");
 
     if arguments.recursive_process {
-        #[cfg(debug_assertions)]
-        if let Some(fname) = arguments.recursive_process_input {
-            let mut infile = std::fs::File::open(fname)?;
-            #[cfg(target_os = "emscripten")]
-            {
-                return resolc::WorkerProcess::run(Some(&mut infile));
-            }
-            #[cfg(not(target_os = "emscripten"))]
-            {
-                return resolc::NativeProcess::run(Some(&mut infile));
-            }
-        }
+        let input_json = std::io::read_to_string(std::io::stdin())
+            .map_err(|error| anyhow::anyhow!("Stdin reading error: {error}"))?;
+        let input: resolc::ProcessInput = deserialize_from_str(input_json.as_str())
+            .map_err(|error| anyhow::anyhow!("Stdin parsing error: {error}"))?;
+
+        initialize_llvm(
+            PolkaVMTarget::PVM,
+            resolc::DEFAULT_EXECUTABLE_NAME,
+            &input.llvm_arguments,
+        );
+
         #[cfg(target_os = "emscripten")]
         {
-            return resolc::WorkerProcess::run(None);
+            return resolc::WorkerProcess::run(input);
         }
         #[cfg(not(target_os = "emscripten"))]
         {
-            return resolc::NativeProcess::run(None);
+            return resolc::NativeProcess::run(input);
         }
     }
 
+    initialize_llvm(
+        PolkaVMTarget::PVM,
+        resolc::DEFAULT_EXECUTABLE_NAME,
+        &arguments.llvm_arguments,
+    );
+
     let debug_config = match arguments.debug_output_directory {
         Some(ref debug_output_directory) => {
             std::fs::create_dir_all(debug_output_directory.as_path())?;
-            revive_llvm_context::DebugConfig::new(
+            DebugConfig::new(
                 Some(debug_output_directory.to_owned()),
                 arguments.emit_source_debug_info,
             )
         }
-        None => revive_llvm_context::DebugConfig::new(None, arguments.emit_source_debug_info),
+        None => DebugConfig::new(None, arguments.emit_source_debug_info),
     };
 
     let (input_files, remappings) = arguments.split_input_files_and_remappings()?;
 
-    let suppressed_warnings = match arguments.suppress_warnings {
-        Some(warnings) => Some(revive_solc_json_interface::ResolcWarning::try_from_strings(
-            warnings.as_slice(),
-        )?),
-        None => None,
-    };
+    let suppressed_warnings = ResolcWarning::try_from_strings(
+        arguments.suppress_warnings.unwrap_or_default().as_slice(),
+    )?;
 
-    let mut solc = {
+    let solc = {
         #[cfg(target_os = "emscripten")]
         {
-            resolc::SoljsonCompiler
+            resolc::SoljsonCompiler {}
         }
-
         #[cfg(not(target_os = "emscripten"))]
         {
             resolc::SolcCompiler::new(
@@ -117,76 +166,61 @@ fn main_inner() -> anyhow::Result<()> {
     };
 
     let evm_version = match arguments.evm_version {
-        Some(evm_version) => Some(revive_common::EVMVersion::try_from(evm_version.as_str())?),
+        Some(evm_version) => Some(EVMVersion::try_from(evm_version.as_str())?),
         None => None,
     };
 
     let mut optimizer_settings = match arguments.optimization {
-        Some(mode) => revive_llvm_context::OptimizerSettings::try_from_cli(mode)?,
-        None => revive_llvm_context::OptimizerSettings::size(),
+        Some(mode) => OptimizerSettings::try_from_cli(mode)?,
+        None => OptimizerSettings::size(),
     };
-    if arguments.fallback_to_optimizing_for_size {
-        optimizer_settings.enable_fallback_to_size();
-    }
     optimizer_settings.is_verify_each_enabled = arguments.llvm_verify_each;
     optimizer_settings.is_debug_logging_enabled = arguments.llvm_debug_logging;
 
-    let include_metadata_hash = match arguments.metadata_hash {
-        Some(metadata_hash) => {
-            let metadata =
-                revive_solc_json_interface::SolcStandardJsonInputSettingsMetadataHash::from_str(
-                    metadata_hash.as_str(),
-                )?;
-            metadata != revive_solc_json_interface::SolcStandardJsonInputSettingsMetadataHash::None
-        }
-        None => true,
+    let metadata_hash = match arguments.metadata_hash {
+        Some(ref hash_type) => MetadataHash::from_str(hash_type.as_str())?,
+        None => MetadataHash::Keccak256,
     };
 
-    let memory_config = revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory::new(
-        arguments.heap_size,
-        arguments.stack_size,
-    );
+    let memory_config =
+        SolcStandardJsonInputSettingsPolkaVMMemory::new(arguments.heap_size, arguments.stack_size);
 
     let build = if arguments.yul {
         resolc::yul(
+            &solc,
             input_files.as_slice(),
-            &mut solc,
+            arguments.libraries.as_slice(),
+            metadata_hash,
+            messages,
             optimizer_settings,
-            include_metadata_hash,
             debug_config,
             &arguments.llvm_arguments,
             memory_config,
         )
-    } else if arguments.llvm_ir {
-        resolc::llvm_ir(
-            input_files.as_slice(),
-            optimizer_settings,
-            include_metadata_hash,
-            debug_config,
-            &arguments.llvm_arguments,
-            memory_config,
-        )
-    } else if arguments.standard_json {
+    } else if let Some(standard_json) = arguments.standard_json {
         resolc::standard_json(
-            &mut solc,
-            arguments.detect_missing_libraries,
+            &solc,
+            metadata_hash,
+            messages,
+            standard_json.map(PathBuf::from),
             arguments.base_path,
             arguments.include_paths,
             arguments.allow_paths,
             debug_config,
-            &arguments.llvm_arguments,
+            arguments.detect_missing_libraries,
         )?;
         return Ok(());
     } else if let Some(format) = arguments.combined_json {
         resolc::combined_json(
-            format,
+            &solc,
             input_files.as_slice(),
-            arguments.libraries,
-            &mut solc,
+            arguments.libraries.as_slice(),
+            metadata_hash,
+            messages,
             evm_version,
+            format,
             !arguments.disable_solc_optimizer,
             optimizer_settings,
-            include_metadata_hash,
             arguments.base_path,
             arguments.include_paths,
             arguments.allow_paths,
@@ -195,67 +229,46 @@ fn main_inner() -> anyhow::Result<()> {
             debug_config,
             arguments.output_directory,
             arguments.overwrite,
-            &arguments.llvm_arguments,
+            arguments.llvm_arguments,
             memory_config,
         )?;
         return Ok(());
+    } else if arguments.link {
+        return resolc::link(arguments.inputs, arguments.libraries);
     } else {
         resolc::standard_output(
+            &solc,
             input_files.as_slice(),
-            arguments.libraries,
-            &mut solc,
+            arguments.libraries.as_slice(),
+            metadata_hash,
+            messages,
             evm_version,
             !arguments.disable_solc_optimizer,
             optimizer_settings,
-            include_metadata_hash,
             arguments.base_path,
             arguments.include_paths,
             arguments.allow_paths,
             remappings,
             suppressed_warnings,
             debug_config,
-            &arguments.llvm_arguments,
+            arguments.llvm_arguments,
             memory_config,
         )
     }?;
 
     if let Some(output_directory) = arguments.output_directory {
-        std::fs::create_dir_all(&output_directory)?;
-
         build.write_to_directory(
             &output_directory,
+            arguments.output_metadata,
             arguments.output_assembly,
             arguments.output_binary,
             arguments.overwrite,
         )?;
-
-        writeln!(
-            std::io::stderr(),
-            "Compiler run successful. Artifact(s) can be found in directory {output_directory:?}."
-        )?;
-    } else if arguments.output_assembly || arguments.output_binary {
-        for (path, contract) in build.contracts.into_iter() {
-            if arguments.output_assembly {
-                let assembly_text = contract.build.assembly_text;
-
-                writeln!(
-                    std::io::stdout(),
-                    "Contract `{path}` assembly:\n\n{assembly_text}"
-                )?;
-            }
-            if arguments.output_binary {
-                writeln!(
-                    std::io::stdout(),
-                    "Contract `{}` bytecode: 0x{}",
-                    path,
-                    hex::encode(contract.build.bytecode)
-                )?;
-            }
-        }
     } else {
-        writeln!(
-            std::io::stderr(),
-            "Compiler run successful. No output requested. Use --asm and --bin flags."
+        build.write_to_terminal(
+            arguments.output_metadata,
+            arguments.output_assembly,
+            arguments.output_binary,
         )?;
     }
 

crates/resolc/src/solc/mod.rs

@@ -1,35 +1,37 @@
 //! The Solidity compiler.
 
+use std::collections::HashSet;
+use std::path::PathBuf;
+
+use revive_solc_json_interface::combined_json::CombinedJson;
+use revive_solc_json_interface::CombinedJsonSelector;
+use revive_solc_json_interface::SolcStandardJsonInput;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsLibraries;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsSelection;
+use revive_solc_json_interface::SolcStandardJsonOutput;
+use revive_solc_json_interface::SolcStandardJsonOutputError;
+
+use self::version::Version;
+
 #[cfg(not(target_os = "emscripten"))]
 pub mod solc_compiler;
 #[cfg(target_os = "emscripten")]
 pub mod soljson_compiler;
 pub mod version;
 
-use std::path::Path;
-use std::path::PathBuf;
-
-use revive_solc_json_interface::combined_json::CombinedJson;
-use revive_solc_json_interface::SolcStandardJsonInput;
-use revive_solc_json_interface::SolcStandardJsonOutput;
-
-use self::version::Version;
-
 /// The first version of `solc` with the support of standard JSON interface.
 pub const FIRST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 0);
 
 /// The last supported version of `solc`.
 pub const LAST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 30);
 
-/// `--include-path` was introduced in solc `0.8.8` <https://github.com/ethereum/solidity/releases/tag/v0.8.8>
-pub const FIRST_INCLUDE_PATH_VERSION: semver::Version = semver::Version::new(0, 8, 8);
-
 /// The Solidity compiler.
 pub trait Compiler {
     /// Compiles the Solidity `--standard-json` input into Yul IR.
     fn standard_json(
-        &mut self,
-        input: SolcStandardJsonInput,
+        &self,
+        input: &mut SolcStandardJsonInput,
+        messages: &mut Vec<SolcStandardJsonOutputError>,
         base_path: Option<String>,
         include_paths: Vec<String>,
         allow_paths: Option<String>,
@@ -39,12 +41,32 @@ pub trait Compiler {
     fn combined_json(
         &self,
         paths: &[PathBuf],
-        combined_json_argument: &str,
+        selectors: HashSet<CombinedJsonSelector>,
     ) -> anyhow::Result<CombinedJson>;
 
-    /// The `solc` Yul validator.
-    fn validate_yul(&self, path: &Path) -> anyhow::Result<()>;
+    /// Validates the Yul project as paths and libraries.
+    fn validate_yul_paths(
+        &self,
+        paths: &[PathBuf],
+        libraries: SolcStandardJsonInputSettingsLibraries,
+        messages: &mut Vec<SolcStandardJsonOutputError>,
+    ) -> anyhow::Result<SolcStandardJsonOutput> {
+        let mut solc_input =
+            SolcStandardJsonInput::from_yul_paths(paths, libraries, Default::default(), vec![]);
+        self.validate_yul_standard_json(&mut solc_input, messages)
+    }
+
+    /// Validates the Yul project as standard JSON input.
+    fn validate_yul_standard_json(
+        &self,
+        solc_input: &mut SolcStandardJsonInput,
+        messages: &mut Vec<SolcStandardJsonOutputError>,
+    ) -> anyhow::Result<SolcStandardJsonOutput> {
+        solc_input.extend_selection(SolcStandardJsonInputSettingsSelection::new_yul_validation());
+        let solc_output = self.standard_json(solc_input, messages, None, vec![], None)?;
+        Ok(solc_output)
+    }
 
     /// The `solc --version` mini-parser.
-    fn version(&mut self) -> anyhow::Result<Version>;
+    fn version(&self) -> anyhow::Result<Version>;
 }

crates/resolc/src/solc/solc_compiler.rs

@@ -1,12 +1,15 @@
 //! The Solidity compiler solc interface.
 
+use std::collections::HashSet;
 use std::io::Write;
-use std::path::Path;
 use std::path::PathBuf;
 
+use revive_common::deserialize_from_slice;
 use revive_solc_json_interface::combined_json::CombinedJson;
+use revive_solc_json_interface::CombinedJsonSelector;
 use revive_solc_json_interface::SolcStandardJsonInput;
 use revive_solc_json_interface::SolcStandardJsonOutput;
+use revive_solc_json_interface::SolcStandardJsonOutputError;
 
 use crate::solc::version::Version;
 
@@ -39,8 +42,9 @@ impl SolcCompiler {
 impl Compiler for SolcCompiler {
     /// Compiles the Solidity `--standard-json` input into Yul IR.
     fn standard_json(
-        &mut self,
-        mut input: SolcStandardJsonInput,
+        &self,
+        input: &mut SolcStandardJsonInput,
+        messages: &mut Vec<SolcStandardJsonOutputError>,
         base_path: Option<String>,
         include_paths: Vec<String>,
         allow_paths: Option<String>,
@@ -63,10 +67,6 @@ impl Compiler for SolcCompiler {
             command.arg(allow_paths);
         }
 
-        input.normalize();
-
-        let suppressed_warnings = input.suppressed_warnings.take().unwrap_or_default();
-
         let input_json = serde_json::to_vec(&input).expect("Always valid");
 
         let process = command.spawn().map_err(|error| {
@@ -92,22 +92,32 @@ impl Compiler for SolcCompiler {
             );
         }
 
-        let mut output: SolcStandardJsonOutput =
-            revive_common::deserialize_from_slice(output.stdout.as_slice()).map_err(|error| {
-                anyhow::anyhow!(
-                    "{} subprocess output parsing error: {}\n{}",
-                    self.executable,
-                    error,
-                    revive_common::deserialize_from_slice::<serde_json::Value>(
-                        output.stdout.as_slice()
-                    )
+        let mut output: SolcStandardJsonOutput = deserialize_from_slice(output.stdout.as_slice())
+            .map_err(|error| {
+            anyhow::anyhow!(
+                "{} subprocess output parsing error: {}\n{}",
+                self.executable,
+                error,
+                deserialize_from_slice::<serde_json::Value>(output.stdout.as_slice())
                     .map(|json| serde_json::to_string_pretty(&json).expect("Always valid"))
                     .unwrap_or_else(
                         |_| String::from_utf8_lossy(output.stdout.as_slice()).to_string()
                     ),
-                )
-            })?;
-        output.preprocess_ast(suppressed_warnings.as_slice())?;
+            )
+        })?;
+        output
+            .errors
+            .retain(|error| match error.error_code.as_deref() {
+                Some(code) => !SolcStandardJsonOutputError::IGNORED_WARNING_CODES.contains(&code),
+                None => true,
+            });
+        output.errors.append(messages);
+
+        let mut suppressed_warnings = input.suppressed_warnings.clone();
+        suppressed_warnings.extend_from_slice(input.settings.suppressed_warnings.as_slice());
+
+        input.resolve_sources();
+        output.preprocess_ast(&input.sources, &suppressed_warnings)?;
 
         Ok(output)
     }
@@ -116,104 +126,58 @@ impl Compiler for SolcCompiler {
     fn combined_json(
         &self,
         paths: &[PathBuf],
-        combined_json_argument: &str,
+        mut selectors: HashSet<CombinedJsonSelector>,
     ) -> anyhow::Result<CombinedJson> {
-        let mut command = std::process::Command::new(self.executable.as_str());
+        selectors.retain(|selector| selector.is_source_solc());
+        if selectors.is_empty() {
+            let version = &self.version()?.default;
+            return Ok(CombinedJson::new(version.to_owned(), None));
+        }
+
+        let executable = self.executable.to_owned();
+
+        let mut command = std::process::Command::new(executable.as_str());
+        command.stdout(std::process::Stdio::piped());
+        command.stderr(std::process::Stdio::piped());
         command.args(paths);
-
-        let mut combined_json_flags = Vec::new();
-        let mut combined_json_fake_flag_pushed = false;
-        let mut filtered_flags = Vec::with_capacity(3);
-        for flag in combined_json_argument.split(',') {
-            match flag {
-                flag @ "asm" | flag @ "bin" | flag @ "bin-runtime" => filtered_flags.push(flag),
-                flag => combined_json_flags.push(flag),
-            }
-        }
-        if combined_json_flags.is_empty() {
-            combined_json_flags.push("ast");
-            combined_json_fake_flag_pushed = true;
-        }
         command.arg("--combined-json");
-        command.arg(combined_json_flags.join(","));
+        command.arg(
+            selectors
+                .into_iter()
+                .map(|selector| selector.to_string())
+                .collect::<Vec<String>>()
+                .join(","),
+        );
 
-        let output = command.output().map_err(|error| {
-            anyhow::anyhow!("{} subprocess error: {:?}", self.executable, error)
+        let process = command
+            .spawn()
+            .map_err(|error| anyhow::anyhow!("{executable} subprocess spawning: {error:?}"))?;
+
+        let result = process.wait_with_output().map_err(|error| {
+            anyhow::anyhow!("{} subprocess output reading: {error:?}", self.executable)
         })?;
-        if !output.status.success() {
-            writeln!(
-                std::io::stdout(),
-                "{}",
-                String::from_utf8_lossy(output.stdout.as_slice())
-            )?;
-            writeln!(
-                std::io::stdout(),
-                "{}",
-                String::from_utf8_lossy(output.stderr.as_slice())
-            )?;
+
+        if !result.status.success() {
             anyhow::bail!(
-                "{} error: {}",
+                "{} subprocess failed with exit code {:?}:\n{}\n{}",
                 self.executable,
-                String::from_utf8_lossy(output.stdout.as_slice()).to_string()
+                result.status.code(),
+                String::from_utf8_lossy(result.stdout.as_slice()),
+                String::from_utf8_lossy(result.stderr.as_slice()),
             );
         }
 
-        let mut combined_json: CombinedJson =
-            revive_common::deserialize_from_slice(output.stdout.as_slice()).map_err(|error| {
-                anyhow::anyhow!(
-                    "{} subprocess output parsing error: {}\n{}",
-                    self.executable,
-                    error,
-                    revive_common::deserialize_from_slice::<serde_json::Value>(
-                        output.stdout.as_slice()
-                    )
-                    .map(|json| serde_json::to_string_pretty(&json).expect("Always valid"))
-                    .unwrap_or_else(
-                        |_| String::from_utf8_lossy(output.stdout.as_slice()).to_string()
-                    ),
-                )
-            })?;
-        for filtered_flag in filtered_flags.into_iter() {
-            for (_path, contract) in combined_json.contracts.iter_mut() {
-                match filtered_flag {
-                    "asm" => contract.asm = Some(serde_json::Value::Null),
-                    "bin" => contract.bin = Some("".to_owned()),
-                    "bin-runtime" => contract.bin_runtime = Some("".to_owned()),
-                    _ => continue,
-                }
-            }
-        }
-        if combined_json_fake_flag_pushed {
-            combined_json.source_list = None;
-            combined_json.sources = None;
-        }
-        combined_json.remove_evm();
-
-        Ok(combined_json)
-    }
-
-    /// The `solc` Yul validator.
-    fn validate_yul(&self, path: &Path) -> anyhow::Result<()> {
-        let mut command = std::process::Command::new(self.executable.as_str());
-        command.arg("--strict-assembly");
-        command.arg(path);
-
-        let output = command.output().map_err(|error| {
-            anyhow::anyhow!("{} subprocess error: {:?}", self.executable, error)
-        })?;
-        if !output.status.success() {
-            anyhow::bail!(
-                "{} error: {}",
+        deserialize_from_slice::<CombinedJson>(result.stdout.as_slice()).map_err(|error| {
+            anyhow::anyhow!(
+                "{} subprocess stdout parsing: {error:?} (stderr: {})",
                 self.executable,
-                String::from_utf8_lossy(output.stderr.as_slice()).to_string()
-            );
-        }
-
-        Ok(())
+                String::from_utf8_lossy(result.stderr.as_slice()),
+            )
+        })
     }
 
     /// The `solc --version` mini-parser.
-    fn version(&mut self) -> anyhow::Result<Version> {
+    fn version(&self) -> anyhow::Result<Version> {
         let mut command = std::process::Command::new(self.executable.as_str());
         command.arg("--version");
         let output = command.output().map_err(|error| {
@@ -252,13 +216,6 @@ impl Compiler for SolcCompiler {
             .parse()
             .map_err(|error| anyhow::anyhow!("{} version parsing: {}", self.executable, error))?;
 
-        let l2_revision: Option<semver::Version> = stdout
-            .lines()
-            .nth(2)
-            .and_then(|line| line.split(' ').nth(1))
-            .and_then(|line| line.split('-').nth(1))
-            .and_then(|version| version.parse().ok());
-
-        Ok(Version::new(long, default, l2_revision))
+        Version::new(long, default).validate()
     }
 }

crates/resolc/src/solc/soljson_compiler.rs

@@ -1,11 +1,14 @@
 //! The Solidity compiler solJson interface.
 
-use std::path::Path;
+use std::collections::HashSet;
 use std::path::PathBuf;
 
+use revive_common::deserialize_from_slice;
 use revive_solc_json_interface::combined_json::CombinedJson;
+use revive_solc_json_interface::CombinedJsonSelector;
 use revive_solc_json_interface::SolcStandardJsonInput;
 use revive_solc_json_interface::SolcStandardJsonOutput;
+use revive_solc_json_interface::SolcStandardJsonOutputError;
 
 use crate::solc::version::Version;
 use anyhow::Context;
@@ -24,8 +27,9 @@ pub struct SoljsonCompiler;
 impl Compiler for SoljsonCompiler {
     /// Compiles the Solidity `--standard-json` input into Yul IR.
     fn standard_json(
-        &mut self,
-        mut input: SolcStandardJsonInput,
+        &self,
+        input: &mut SolcStandardJsonInput,
+        messages: &mut Vec<SolcStandardJsonOutputError>,
         base_path: Option<String>,
         include_paths: Vec<String>,
         allow_paths: Option<String>,
@@ -40,23 +44,31 @@ impl Compiler for SoljsonCompiler {
             anyhow::bail!("configuring allow paths is not supported with solJson")
         }
 
-        input.normalize();
-
-        let suppressed_warnings = input.suppressed_warnings.take().unwrap_or_default();
-
         let input_json = serde_json::to_string(&input).expect("Always valid");
         let out = Self::compile_standard_json(input_json)?;
         let mut output: SolcStandardJsonOutput =
-            revive_common::deserialize_from_slice(out.as_bytes()).map_err(|error| {
+            deserialize_from_slice(out.as_bytes()).map_err(|error| {
                 anyhow::anyhow!(
                     "Soljson output parsing error: {}\n{}",
                     error,
-                    revive_common::deserialize_from_slice::<serde_json::Value>(out.as_bytes())
+                    deserialize_from_slice::<serde_json::Value>(out.as_bytes())
                         .map(|json| serde_json::to_string_pretty(&json).expect("Always valid"))
                         .unwrap_or_else(|_| String::from_utf8_lossy(out.as_bytes()).to_string()),
                 )
             })?;
-        output.preprocess_ast(suppressed_warnings.as_slice())?;
+        output
+            .errors
+            .retain(|error| match error.error_code.as_deref() {
+                Some(code) => !SolcStandardJsonOutputError::IGNORED_WARNING_CODES.contains(&code),
+                None => true,
+            });
+        output.errors.append(messages);
+
+        let mut suppressed_warnings = input.suppressed_warnings.clone();
+        suppressed_warnings.extend_from_slice(input.settings.suppressed_warnings.as_slice());
+
+        input.resolve_sources();
+        output.preprocess_ast(&input.sources, &suppressed_warnings)?;
 
         Ok(output)
     }
@@ -64,16 +76,12 @@ impl Compiler for SoljsonCompiler {
     fn combined_json(
         &self,
         _paths: &[PathBuf],
-        _combined_json_argument: &str,
+        _selector: HashSet<CombinedJsonSelector>,
     ) -> anyhow::Result<CombinedJson> {
         unimplemented!();
     }
 
-    fn validate_yul(&self, _path: &Path) -> anyhow::Result<()> {
-        unimplemented!();
-    }
-
-    fn version(&mut self) -> anyhow::Result<Version> {
+    fn version(&self) -> anyhow::Result<Version> {
         let version = Self::get_soljson_version()?;
         let long = version.clone();
         let default: semver::Version = version
@@ -82,11 +90,7 @@ impl Compiler for SoljsonCompiler {
             .ok_or_else(|| anyhow::anyhow!("Soljson version parsing: metadata dropping"))?
             .parse()
             .map_err(|error| anyhow::anyhow!("Soljson version parsing: {}", error))?;
-        let l2_revision: Option<semver::Version> = version
-            .split('-')
-            .nth(1)
-            .and_then(|version| version.parse().ok());
-        Ok(Version::new(long, default, l2_revision))
+        Version::new(long, default).validate()
     }
 }
 

crates/resolc/src/solc/version.rs

@@ -10,34 +10,16 @@ pub struct Version {
     pub long: String,
     /// The short `semver`.
     pub default: semver::Version,
-    /// The L2 revision additional versioning.
-    pub l2_revision: Option<semver::Version>,
 }
 
 impl Version {
     /// A shortcut constructor.
-    pub fn new(
-        long: String,
-        default: semver::Version,
-        l2_revision: Option<semver::Version>,
-    ) -> Self {
-        Self {
-            long,
-            default,
-            l2_revision,
-        }
+    pub fn new(long: String, default: semver::Version) -> Self {
+        Self { long, default }
     }
 
-    /// A shortcut constructor for a simple version.
-    pub fn new_simple(version: semver::Version) -> Self {
-        Self {
-            long: version.to_string(),
-            default: version,
-            l2_revision: None,
-        }
-    }
-
-    pub fn validate(self, include_paths: &[String]) -> anyhow::Result<Self> {
+    /// Returns an error if an unsupported version is detected.
+    pub fn validate(self) -> anyhow::Result<Self> {
         if self.default < super::FIRST_SUPPORTED_VERSION {
             anyhow::bail!(
                 "`solc` versions <{} are not supported, found {}",
@@ -52,10 +34,6 @@ impl Version {
                 self.default
             );
         }
-        if !include_paths.is_empty() && self.default < super::FIRST_INCLUDE_PATH_VERSION {
-            anyhow::bail!("--include-path is not supported in solc {}", self.default);
-        }
-
         Ok(self)
     }
 }

crates/resolc/src/test_utils.rs

@@ -1,19 +1,29 @@
-//! Common utility used for in frontend and integration tests.
+//! Common helper utilities used in tests and benchmarks.
+
 use std::collections::BTreeMap;
 use std::collections::BTreeSet;
 use std::collections::HashMap;
+use std::fmt::Display;
 use std::path::PathBuf;
 use std::sync::Mutex;
 
 use once_cell::sync::Lazy;
+use revive_common::MetadataHash;
+use revive_llvm_context::initialize_llvm;
+use revive_llvm_context::DebugConfig;
 use revive_llvm_context::OptimizerSettings;
+use revive_llvm_context::PolkaVMTarget;
 use revive_solc_json_interface::standard_json::output::contract::evm::bytecode::Bytecode;
 use revive_solc_json_interface::standard_json::output::contract::evm::bytecode::DeployedBytecode;
-use revive_solc_json_interface::warning::Warning;
+use revive_solc_json_interface::ResolcWarning;
 use revive_solc_json_interface::SolcStandardJsonInput;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsLibraries;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsMetadata;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsSelection;
+use revive_solc_json_interface::SolcStandardJsonInputSource;
 use revive_solc_json_interface::SolcStandardJsonOutput;
+use revive_solc_json_interface::SolcStandardJsonOutputErrorHandler;
 
 use crate::project::Project;
 use crate::solc::solc_compiler::SolcCompiler;
@@ -24,17 +34,373 @@ static EVM_BLOB_CACHE: Lazy<Mutex<HashMap<CachedBlob, Vec<u8>>>> = Lazy::new(Def
 static EVM_RUNTIME_BLOB_CACHE: Lazy<Mutex<HashMap<CachedBlob, Vec<u8>>>> =
     Lazy::new(Default::default);
 
-const DEBUG_CONFIG: revive_llvm_context::DebugConfig =
-    revive_llvm_context::DebugConfig::new(None, true);
+const DEBUG_CONFIG: revive_llvm_context::DebugConfig = DebugConfig::new(None, true);
 
+/// Tests may share and re-use contract code.
+/// The compiled blob cache helps avoiding duplicate compilation.
 #[derive(Hash, PartialEq, Eq)]
 struct CachedBlob {
+    /// The contract name.
     contract_name: String,
-    solidity: String,
+    /// Whether the solc optimizer is enabled.
     solc_optimizer_enabled: bool,
+    /// The contract code.
+    solidity: String,
+    /// The optimization level.
     opt: String,
 }
 
+/// Builds the Solidity project and returns the standard JSON output.
+pub fn build_solidity(
+    sources: BTreeMap<String, SolcStandardJsonInputSource>,
+) -> anyhow::Result<SolcStandardJsonOutput> {
+    build_solidity_with_options(
+        sources,
+        Default::default(),
+        Default::default(),
+        OptimizerSettings::cycles(),
+        true,
+        Default::default(),
+    )
+}
+
+/// Builds the Solidity project and returns the standard JSON output.
+pub fn build_solidity_with_options(
+    sources: BTreeMap<String, SolcStandardJsonInputSource>,
+    libraries: SolcStandardJsonInputSettingsLibraries,
+    remappings: BTreeSet<String>,
+    optimizer_settings: OptimizerSettings,
+    solc_optimizer_enabled: bool,
+    suppressed_warnings: Vec<ResolcWarning>,
+) -> anyhow::Result<SolcStandardJsonOutput> {
+    check_dependencies();
+    inkwell::support::enable_llvm_pretty_stack_trace();
+    initialize_llvm(PolkaVMTarget::PVM, crate::DEFAULT_EXECUTABLE_NAME, &[]);
+
+    let _ = crate::process::native_process::EXECUTABLE
+        .set(PathBuf::from(crate::r#const::DEFAULT_EXECUTABLE_NAME));
+
+    let solc = SolcCompiler::new(SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned())?;
+    let solc_version = solc.version()?;
+
+    let mut input = SolcStandardJsonInput::try_from_solidity_sources(
+        None,
+        sources.clone(),
+        libraries.clone(),
+        remappings,
+        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
+        SolcStandardJsonInputSettingsOptimizer::new(
+            solc_optimizer_enabled,
+            optimizer_settings
+                .middle_end_as_string()
+                .chars()
+                .last()
+                .unwrap(),
+            Default::default(),
+        ),
+        SolcStandardJsonInputSettingsMetadata::default(),
+        suppressed_warnings,
+        Default::default(),
+        Default::default(),
+        false,
+    )?;
+
+    let mut output = solc.standard_json(&mut input, &mut vec![], None, vec![], None)?;
+    if output.has_errors() {
+        return Ok(output);
+    }
+    let debug_config = DebugConfig::new(None, optimizer_settings.middle_end_as_string() != "z");
+    let linker_symbols = libraries.as_linker_symbols()?;
+    let build = Project::try_from_standard_json_output(
+        &mut output,
+        libraries,
+        &solc_version,
+        &debug_config,
+    )?
+    .compile(
+        &mut vec![],
+        optimizer_settings,
+        MetadataHash::Keccak256,
+        &debug_config,
+        Default::default(),
+        Default::default(),
+    )?;
+    build.check_errors()?;
+
+    let build = build.link(linker_symbols, &debug_config);
+    build.check_errors()?;
+    build.write_to_standard_json(&mut output, &solc_version)?;
+    output.check_errors()?;
+
+    Ok(output)
+}
+
+/// Build a Solidity contract and get the EVM code
+pub fn build_solidity_with_options_evm(
+    sources: BTreeMap<String, SolcStandardJsonInputSource>,
+    libraries: SolcStandardJsonInputSettingsLibraries,
+    remappings: BTreeSet<String>,
+    solc_optimizer_enabled: bool,
+) -> anyhow::Result<BTreeMap<String, (Bytecode, DeployedBytecode)>> {
+    check_dependencies();
+    inkwell::support::enable_llvm_pretty_stack_trace();
+    initialize_llvm(PolkaVMTarget::PVM, crate::DEFAULT_EXECUTABLE_NAME, &[]);
+    let _ = crate::process::native_process::EXECUTABLE
+        .set(PathBuf::from(crate::r#const::DEFAULT_EXECUTABLE_NAME));
+
+    let solc = SolcCompiler::new(SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned())?;
+    let mut input = SolcStandardJsonInput::try_from_solidity_sources(
+        None,
+        sources.clone(),
+        libraries.clone(),
+        remappings,
+        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
+        SolcStandardJsonInputSettingsOptimizer::new(
+            solc_optimizer_enabled,
+            Default::default(),
+            Default::default(),
+        ),
+        SolcStandardJsonInputSettingsMetadata::default(),
+        Default::default(),
+        Default::default(),
+        Default::default(),
+        false,
+    )?;
+
+    let mut contracts = BTreeMap::new();
+    for files in solc
+        .standard_json(&mut input, &mut vec![], None, vec![], None)?
+        .contracts
+    {
+        for (name, contract) in files.1 {
+            if let Some(evm) = contract.evm {
+                let (Some(bytecode), Some(deployed_bytecode)) =
+                    (evm.bytecode.as_ref(), evm.deployed_bytecode.as_ref())
+                else {
+                    continue;
+                };
+                contracts.insert(name.clone(), (bytecode.clone(), deployed_bytecode.clone()));
+            }
+        }
+    }
+
+    Ok(contracts)
+}
+
+/// Builds the Solidity project and returns the standard JSON output.
+pub fn build_solidity_and_detect_missing_libraries<T: ToString>(
+    sources: &[(T, T)],
+    libraries: SolcStandardJsonInputSettingsLibraries,
+) -> anyhow::Result<SolcStandardJsonOutput> {
+    check_dependencies();
+
+    let deployed_libraries = libraries.as_paths();
+    let sources = BTreeMap::from_iter(
+        sources
+            .iter()
+            .map(|(path, code)| (path.to_string(), code.to_string().into())),
+    );
+
+    inkwell::support::enable_llvm_pretty_stack_trace();
+    initialize_llvm(PolkaVMTarget::PVM, crate::DEFAULT_EXECUTABLE_NAME, &[]);
+    let _ = crate::process::native_process::EXECUTABLE
+        .set(PathBuf::from(crate::r#const::DEFAULT_EXECUTABLE_NAME));
+
+    let solc = SolcCompiler::new(SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned())?;
+    let solc_version = solc.version()?;
+    let mut input = SolcStandardJsonInput::try_from_solidity_sources(
+        None,
+        sources.clone(),
+        libraries.clone(),
+        Default::default(),
+        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
+        SolcStandardJsonInputSettingsOptimizer::default(),
+        SolcStandardJsonInputSettingsMetadata::default(),
+        Default::default(),
+        Default::default(),
+        Default::default(),
+        true,
+    )?;
+
+    let mut output = solc.standard_json(&mut input, &mut vec![], None, vec![], None)?;
+    if output.has_errors() {
+        return Ok(output);
+    }
+
+    let project = Project::try_from_standard_json_output(
+        &mut output,
+        libraries,
+        &solc_version,
+        &DEBUG_CONFIG,
+    )?;
+
+    let missing_libraries = project.get_missing_libraries(&deployed_libraries);
+    missing_libraries.write_to_standard_json(&mut output, &solc.version()?);
+
+    Ok(output)
+}
+
+/// Checks if the Yul project can be built without errors.
+pub fn build_yul<T: ToString + Display>(sources: &[(T, T)]) -> anyhow::Result<()> {
+    check_dependencies();
+
+    inkwell::support::enable_llvm_pretty_stack_trace();
+    initialize_llvm(PolkaVMTarget::PVM, crate::DEFAULT_EXECUTABLE_NAME, &[]);
+    let optimizer_settings = OptimizerSettings::none();
+
+    let sources = sources
+        .iter()
+        .map(|(path, source)| {
+            (
+                path.to_string(),
+                SolcStandardJsonInputSource::from(source.to_string()),
+            )
+        })
+        .collect();
+    let mut output = SolcStandardJsonOutput::new(&sources, &mut vec![]);
+
+    let project = Project::try_from_yul_sources(
+        sources,
+        Default::default(),
+        Some(&mut output),
+        &Default::default(),
+    )?;
+    let build = project.compile(
+        &mut vec![],
+        optimizer_settings,
+        MetadataHash::None,
+        &DEBUG_CONFIG,
+        Default::default(),
+        Default::default(),
+    )?;
+    build.check_errors()?;
+
+    let build = build.link(BTreeMap::new(), &DEBUG_CONFIG);
+    build.check_errors()?;
+
+    let solc = SolcCompiler::new(SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned())?;
+    build.write_to_standard_json(&mut output, &solc.version()?)?;
+    output.check_errors()?;
+    Ok(())
+}
+
+/// Builds the Yul standard JSON and returns the standard JSON output.
+pub fn build_yul_standard_json(
+    mut solc_input: SolcStandardJsonInput,
+) -> anyhow::Result<SolcStandardJsonOutput> {
+    check_dependencies();
+    inkwell::support::enable_llvm_pretty_stack_trace();
+    initialize_llvm(PolkaVMTarget::PVM, crate::DEFAULT_EXECUTABLE_NAME, &[]);
+
+    let solc = SolcCompiler::new(SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned())?;
+    let mut output = solc.validate_yul_standard_json(&mut solc_input, &mut vec![])?;
+    let build = Project::try_from_yul_sources(
+        solc_input.sources,
+        Default::default(),
+        Some(&mut output),
+        &Default::default(),
+    )?
+    .compile(
+        &mut vec![],
+        OptimizerSettings::try_from_cli(solc_input.settings.optimizer.mode)?,
+        MetadataHash::Keccak256,
+        &DEBUG_CONFIG,
+        Default::default(),
+        Default::default(),
+    )?;
+    build.check_errors()?;
+
+    let build = build.link(Default::default(), &Default::default());
+    build.check_errors()?;
+    build.write_to_standard_json(&mut output, &solc.version()?)?;
+
+    output.check_errors()?;
+    Ok(output)
+}
+
+/// Compile the blob of `contract_name` found in given `source_code`.
+/// The `solc` optimizer will be enabled
+pub fn compile_blob(contract_name: &str, source_code: &str) -> Vec<u8> {
+    compile_blob_with_options(
+        contract_name,
+        source_code,
+        true,
+        OptimizerSettings::cycles(),
+    )
+}
+
+/// Compile the blob of `contract_name` found in given `source_code`.
+pub fn compile_blob_with_options(
+    contract_name: &str,
+    source_code: &str,
+    solc_optimizer_enabled: bool,
+    optimizer_settings: OptimizerSettings,
+) -> Vec<u8> {
+    let id = CachedBlob {
+        contract_name: contract_name.to_owned(),
+        opt: optimizer_settings.middle_end_as_string(),
+        solc_optimizer_enabled,
+        solidity: source_code.to_owned(),
+    };
+
+    if let Some(blob) = PVM_BLOB_CACHE.lock().unwrap().get(&id) {
+        return blob.clone();
+    }
+
+    let file_name = "contract.sol";
+    let contracts = build_solidity_with_options(
+        BTreeMap::from([(
+            file_name.to_owned(),
+            SolcStandardJsonInputSource::from(source_code.to_owned()),
+        )]),
+        Default::default(),
+        Default::default(),
+        optimizer_settings,
+        solc_optimizer_enabled,
+        Default::default(),
+    )
+    .expect("source should compile")
+    .contracts;
+    let bytecode = contracts[file_name][contract_name]
+        .evm
+        .as_ref()
+        .expect("source should produce EVM output")
+        .bytecode
+        .as_ref()
+        .expect("source should produce assembly text")
+        .object
+        .as_str();
+    let blob = hex::decode(bytecode).expect("hex encoding should always be valid");
+
+    PVM_BLOB_CACHE.lock().unwrap().insert(id, blob.clone());
+
+    blob
+}
+
+/// Compile the EVM bin-runtime of `contract_name` found in given `source_code`.
+/// The `solc` optimizer will be enabled
+pub fn compile_evm_bin_runtime(contract_name: &str, source_code: &str) -> Vec<u8> {
+    compile_evm(contract_name, source_code, true, true)
+}
+
+/// Compile the EVM bin of `contract_name` found in given `source_code`.
+pub fn compile_evm_deploy_code(
+    contract_name: &str,
+    source_code: &str,
+    solc_optimizer_enabled: bool,
+) -> Vec<u8> {
+    compile_evm(contract_name, source_code, solc_optimizer_enabled, false)
+}
+
+/// Convert `(path, solidity)` tuples to a standard JSON input source.
+pub fn sources<T: ToString>(sources: &[(T, T)]) -> BTreeMap<String, SolcStandardJsonInputSource> {
+    BTreeMap::from_iter(
+        sources
+            .iter()
+            .map(|(path, code)| (path.to_string(), code.to_string().into())),
+    )
+}
+
 /// Checks if the required executables are present in `${PATH}`.
 fn check_dependencies() {
     for executable in [
@@ -50,285 +416,7 @@ fn check_dependencies() {
     }
 }
 
-/// Builds the Solidity project and returns the standard JSON output.
-pub fn build_solidity(
-    sources: BTreeMap<String, String>,
-    libraries: BTreeMap<String, BTreeMap<String, String>>,
-    remappings: Option<BTreeSet<String>>,
-    optimizer_settings: revive_llvm_context::OptimizerSettings,
-) -> anyhow::Result<SolcStandardJsonOutput> {
-    build_solidity_with_options(sources, libraries, remappings, optimizer_settings, true)
-}
-
-/// Builds the Solidity project and returns the standard JSON output.
-/// Gives control over additional options:
-/// - `solc_optimizer_enabled`: Whether to use the `solc` optimizer
-pub fn build_solidity_with_options(
-    sources: BTreeMap<String, String>,
-    libraries: BTreeMap<String, BTreeMap<String, String>>,
-    remappings: Option<BTreeSet<String>>,
-    optimizer_settings: revive_llvm_context::OptimizerSettings,
-    solc_optimizer_enabled: bool,
-) -> anyhow::Result<SolcStandardJsonOutput> {
-    check_dependencies();
-
-    inkwell::support::enable_llvm_pretty_stack_trace();
-    revive_llvm_context::initialize_llvm(
-        revive_llvm_context::Target::PVM,
-        crate::DEFAULT_EXECUTABLE_NAME,
-        &[],
-    );
-    let _ = crate::process::native_process::EXECUTABLE
-        .set(PathBuf::from(crate::r#const::DEFAULT_EXECUTABLE_NAME));
-
-    let mut solc = SolcCompiler::new(SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned())?;
-    let solc_version = solc.version()?;
-
-    let input = SolcStandardJsonInput::try_from_sources(
-        None,
-        sources.clone(),
-        libraries.clone(),
-        remappings,
-        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
-        SolcStandardJsonInputSettingsOptimizer::new(
-            solc_optimizer_enabled,
-            optimizer_settings.middle_end_as_string().chars().last(),
-            &solc_version.default,
-            false,
-        ),
-        None,
-        None,
-        None,
-    )?;
-
-    let mut output = solc.standard_json(input, None, vec![], None)?;
-
-    let debug_config = revive_llvm_context::DebugConfig::new(
-        None,
-        optimizer_settings.middle_end_as_string() != "z",
-    );
-
-    let project = Project::try_from_standard_json_output(
-        &output,
-        sources,
-        libraries,
-        &solc_version,
-        &debug_config,
-    )?;
-
-    let build: crate::Build = project.compile(
-        optimizer_settings,
-        false,
-        debug_config,
-        Default::default(),
-        Default::default(),
-    )?;
-    build.write_to_standard_json(&mut output, &solc_version)?;
-
-    Ok(output)
-}
-
-/// Build a Solidity contract and get the EVM code
-pub fn build_solidity_with_options_evm(
-    sources: BTreeMap<String, String>,
-    libraries: BTreeMap<String, BTreeMap<String, String>>,
-    remappings: Option<BTreeSet<String>>,
-    solc_optimizer_enabled: bool,
-) -> anyhow::Result<BTreeMap<String, (Bytecode, DeployedBytecode)>> {
-    check_dependencies();
-
-    inkwell::support::enable_llvm_pretty_stack_trace();
-    revive_llvm_context::initialize_llvm(
-        revive_llvm_context::Target::PVM,
-        crate::DEFAULT_EXECUTABLE_NAME,
-        &[],
-    );
-    let _ = crate::process::native_process::EXECUTABLE
-        .set(PathBuf::from(crate::r#const::DEFAULT_EXECUTABLE_NAME));
-
-    let mut solc = SolcCompiler::new(SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned())?;
-    let solc_version = solc.version()?;
-
-    let input = SolcStandardJsonInput::try_from_sources(
-        None,
-        sources.clone(),
-        libraries.clone(),
-        remappings,
-        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
-        SolcStandardJsonInputSettingsOptimizer::new(
-            solc_optimizer_enabled,
-            None,
-            &solc_version.default,
-            false,
-        ),
-        None,
-        None,
-        None,
-    )?;
-
-    let mut output = solc.standard_json(input, None, vec![], None)?;
-
-    let mut contracts = BTreeMap::new();
-    if let Some(files) = output.contracts.as_mut() {
-        for (_, file) in files.iter_mut() {
-            for (name, contract) in file.iter_mut() {
-                if let Some(evm) = contract.evm.as_mut() {
-                    let (Some(bytecode), Some(deployed_bytecode)) =
-                        (evm.bytecode.as_ref(), evm.deployed_bytecode.as_ref())
-                    else {
-                        continue;
-                    };
-                    contracts.insert(name.clone(), (bytecode.clone(), deployed_bytecode.clone()));
-                }
-            }
-        }
-    }
-
-    Ok(contracts)
-}
-
-/// Builds the Solidity project and returns the standard JSON output.
-pub fn build_solidity_and_detect_missing_libraries(
-    sources: BTreeMap<String, String>,
-    libraries: BTreeMap<String, BTreeMap<String, String>>,
-) -> anyhow::Result<SolcStandardJsonOutput> {
-    check_dependencies();
-
-    inkwell::support::enable_llvm_pretty_stack_trace();
-    revive_llvm_context::initialize_llvm(
-        revive_llvm_context::Target::PVM,
-        crate::DEFAULT_EXECUTABLE_NAME,
-        &[],
-    );
-    let _ = crate::process::native_process::EXECUTABLE
-        .set(PathBuf::from(crate::r#const::DEFAULT_EXECUTABLE_NAME));
-
-    let mut solc = SolcCompiler::new(SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned())?;
-    let solc_version = solc.version()?;
-
-    let input = SolcStandardJsonInput::try_from_sources(
-        None,
-        sources.clone(),
-        libraries.clone(),
-        None,
-        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
-        SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
-        None,
-        None,
-        None,
-    )?;
-
-    let mut output = solc.standard_json(input, None, vec![], None)?;
-
-    let project = Project::try_from_standard_json_output(
-        &output,
-        sources,
-        libraries,
-        &solc_version,
-        &DEBUG_CONFIG,
-    )?;
-
-    let missing_libraries = project.get_missing_libraries();
-    missing_libraries.write_to_standard_json(&mut output, &solc.version()?)?;
-
-    Ok(output)
-}
-
-/// Checks if the Yul project can be built without errors.
-pub fn build_yul(source_code: &str) -> anyhow::Result<()> {
-    check_dependencies();
-
-    inkwell::support::enable_llvm_pretty_stack_trace();
-    revive_llvm_context::initialize_llvm(
-        revive_llvm_context::Target::PVM,
-        crate::DEFAULT_EXECUTABLE_NAME,
-        &[],
-    );
-    let optimizer_settings = revive_llvm_context::OptimizerSettings::none();
-
-    let project = Project::try_from_yul_string::<SolcCompiler>(
-        PathBuf::from("test.yul").as_path(),
-        source_code,
-        None,
-    )?;
-    let _build = project.compile(
-        optimizer_settings,
-        false,
-        DEBUG_CONFIG,
-        Default::default(),
-        Default::default(),
-    )?;
-
-    Ok(())
-}
-
-/// Checks if the built Solidity project contains the given warning.
-pub fn check_solidity_warning(
-    source_code: &str,
-    warning_substring: &str,
-    libraries: BTreeMap<String, BTreeMap<String, String>>,
-    skip_for_revive_edition: bool,
-    suppressed_warnings: Option<Vec<Warning>>,
-) -> anyhow::Result<bool> {
-    check_dependencies();
-
-    let mut solc = SolcCompiler::new(SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned())?;
-    let solc_version = solc.version()?;
-    if skip_for_revive_edition && solc_version.l2_revision.is_some() {
-        return Ok(true);
-    }
-
-    let mut sources = BTreeMap::new();
-    sources.insert("test.sol".to_string(), source_code.to_string());
-    let input = SolcStandardJsonInput::try_from_sources(
-        None,
-        sources.clone(),
-        libraries,
-        None,
-        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
-        SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
-        None,
-        suppressed_warnings,
-        None,
-    )?;
-
-    let output = solc.standard_json(input, None, vec![], None)?;
-    let contains_warning = output
-        .errors
-        .ok_or_else(|| anyhow::anyhow!("Solidity compiler messages not found"))?
-        .iter()
-        .any(|error| error.formatted_message.contains(warning_substring));
-
-    Ok(contains_warning)
-}
-
-/// Compile the blob of `contract_name` found in given `source_code`.
-/// The `solc` optimizer will be enabled
-pub fn compile_blob(contract_name: &str, source_code: &str) -> Vec<u8> {
-    compile_blob_with_options(
-        contract_name,
-        source_code,
-        true,
-        OptimizerSettings::cycles(),
-    )
-}
-
-/// Compile the EVM bin-runtime of `contract_name` found in given `source_code`.
-/// The `solc` optimizer will be enabled
-pub fn compile_evm_bin_runtime(contract_name: &str, source_code: &str) -> Vec<u8> {
-    compile_evm(contract_name, source_code, true, true)
-}
-
-/// Compile the EVM bin of `contract_name` found in given `source_code`.
-/// The `solc` optimizer will be enabled
-pub fn compile_evm_deploy_code(
-    contract_name: &str,
-    source_code: &str,
-    solc_optimizer_enabled: bool,
-) -> Vec<u8> {
-    compile_evm(contract_name, source_code, solc_optimizer_enabled, false)
-}
-
+/// The internal EVM bytecode compile helper.
 fn compile_evm(
     contract_name: &str,
     source_code: &str,
@@ -353,9 +441,12 @@ fn compile_evm(
 
     let file_name = "contract.sol";
     let contracts = build_solidity_with_options_evm(
-        [(file_name.into(), source_code.into())].into(),
+        BTreeMap::from([(
+            file_name.into(),
+            SolcStandardJsonInputSource::from(source_code.to_owned()),
+        )]),
+        Default::default(),
         Default::default(),
-        None,
         solc_optimizer_enabled,
     )
     .expect("source should compile");
@@ -373,49 +464,3 @@ fn compile_evm(
 
     blob
 }
-
-/// Compile the blob of `contract_name` found in given `source_code`.
-pub fn compile_blob_with_options(
-    contract_name: &str,
-    source_code: &str,
-    solc_optimizer_enabled: bool,
-    optimizer_settings: revive_llvm_context::OptimizerSettings,
-) -> Vec<u8> {
-    let id = CachedBlob {
-        contract_name: contract_name.to_owned(),
-        solidity: source_code.to_owned(),
-        solc_optimizer_enabled,
-        opt: optimizer_settings.middle_end_as_string(),
-    };
-
-    if let Some(blob) = PVM_BLOB_CACHE.lock().unwrap().get(&id) {
-        return blob.clone();
-    }
-
-    let file_name = "contract.sol";
-    let contracts = build_solidity_with_options(
-        [(file_name.into(), source_code.into())].into(),
-        Default::default(),
-        None,
-        optimizer_settings,
-        solc_optimizer_enabled,
-    )
-    .expect("source should compile")
-    .contracts
-    .expect("source should contain at least one contract");
-
-    let bytecode = contracts[file_name][contract_name]
-        .evm
-        .as_ref()
-        .expect("source should produce EVM output")
-        .bytecode
-        .as_ref()
-        .expect("source should produce assembly text")
-        .object
-        .as_str();
-    let blob = hex::decode(bytecode).expect("hex encoding should always be valid");
-
-    PVM_BLOB_CACHE.lock().unwrap().insert(id, blob.clone());
-
-    blob
-}

crates/resolc/src/tests/cli/asm.rs

@@ -1,7 +1,5 @@
 //! The tests for running resolc with asm option.
 
-#![cfg(test)]
-
 use crate::tests::cli::utils;
 
 const ASM_OPTION: &str = "--asm";
@@ -30,10 +28,7 @@ fn fails_without_input_file() {
     utils::assert_command_failure(&resolc_result, "Omitting an input file");
 
     let output = resolc_result.stderr.to_lowercase();
-    assert!(
-        output.contains("no input sources specified") || output.contains("compilation aborted"),
-        "Expected the output to contain a specific error message."
-    );
+    assert!(output.contains("no input sources specified"));
 
     let solc_result = utils::execute_solc(arguments);
     utils::assert_equal_exit_codes(&solc_result, &resolc_result);

crates/resolc/src/tests/cli/combined_json.rs

@@ -1,8 +1,6 @@
 //! The tests for running resolc with combined JSON option.
 
-#![cfg(test)]
-
-use revive_common;
+use revive_solc_json_interface::CombinedJsonInvalidSelectorMessage;
 
 use crate::tests::cli::utils;
 
@@ -53,10 +51,9 @@ fn fails_with_invalid_json_argument() {
     let resolc_result = utils::execute_resolc(arguments);
     utils::assert_command_failure(&resolc_result, "Providing an invalid json argument");
 
-    assert!(
-        resolc_result.stdout.contains("Invalid option"),
-        "Expected the output to contain a specific error message."
-    );
+    assert!(resolc_result
+        .stderr
+        .contains(CombinedJsonInvalidSelectorMessage));
 
     let solc_result = utils::execute_solc(arguments);
     utils::assert_equal_exit_codes(&solc_result, &resolc_result);
@@ -73,16 +70,12 @@ fn fails_with_multiple_json_arguments() {
     let resolc_result = utils::execute_resolc(arguments);
     utils::assert_command_failure(&resolc_result, "Providing multiple json arguments");
 
-    assert!(
-        resolc_result
-            .stderr
-            .contains("reading error: No such file or directory"),
-        "Expected the output to contain a specific error message."
-    );
+    assert!(resolc_result
+        .stderr
+        .contains(&format!("Error: \"{}\" is not found.", JSON_ARGUMENTS[1])),);
 
-    // FIX: Resolc exit code == 101
-    // let solc_result = utils::execute_solc(arguments);
-    // utils::assert_equal_exit_codes(&solc_result, &resolc_result);
+    let solc_result = utils::execute_solc(arguments);
+    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
 }
 
 #[test]
@@ -91,12 +84,9 @@ fn fails_without_json_argument() {
     let resolc_result = utils::execute_resolc(arguments);
     utils::assert_command_failure(&resolc_result, "Omitting a JSON argument");
 
-    assert!(
-        resolc_result.stderr.contains(
-            "a value is required for '--combined-json <COMBINED_JSON>' but none was supplied"
-        ),
-        "Expected the output to contain a specific error message."
-    );
+    assert!(resolc_result.stderr.contains(
+        "a value is required for '--combined-json <COMBINED_JSON>' but none was supplied"
+    ));
 
     let solc_result = utils::execute_solc(arguments);
     utils::assert_equal_exit_codes(&solc_result, &resolc_result);
@@ -108,10 +98,7 @@ fn fails_without_solidity_input_file() {
     let resolc_result = utils::execute_resolc(arguments);
     utils::assert_command_failure(&resolc_result, "Omitting a Solidity input file");
 
-    assert!(
-        resolc_result.stderr.contains("No input sources specified"),
-        "Expected the output to contain a specific error message."
-    );
+    assert!(resolc_result.stderr.contains("Error: No input files given"),);
 
     let solc_result = utils::execute_solc(arguments);
     utils::assert_equal_exit_codes(&solc_result, &resolc_result);
@@ -124,12 +111,9 @@ fn fails_with_yul_input_file() {
         let resolc_result = utils::execute_resolc(arguments);
         utils::assert_command_failure(&resolc_result, "Providing a Yul input file");
 
-        assert!(
-            resolc_result
-                .stderr
-                .contains("ParserError: Expected identifier"),
-            "Expected the output to contain a specific error message."
-        );
+        assert!(resolc_result
+            .stderr
+            .contains("Error: Expected identifier but got 'StringLiteral'"));
 
         let solc_result = utils::execute_solc(arguments);
         utils::assert_equal_exit_codes(&solc_result, &resolc_result);

crates/resolc/src/tests/cli/linker.rs

@@ -0,0 +1,64 @@
+use crate::tests::cli::utils::{assert_command_success, execute_resolc, DEPENDENCY_CONTRACT_PATH};
+
+/// Test deploy time linking a contract with unresolved factory dependencies.
+#[test]
+fn deploy_time_linking_works() {
+    let temp_dir = tempfile::TempDir::new().unwrap();
+    let output_directory = temp_dir.path().to_path_buf();
+    let source_path = temp_dir.path().to_path_buf().join("dependency.sol");
+    std::fs::copy(DEPENDENCY_CONTRACT_PATH, &source_path).unwrap();
+
+    assert_command_success(
+        &execute_resolc(&[
+            source_path.to_str().unwrap(),
+            "--bin",
+            "-o",
+            &output_directory.to_string_lossy(),
+        ]),
+        "Missing libraries should compile fine",
+    );
+
+    let dependency_blob_path = temp_dir
+        .path()
+        .to_path_buf()
+        .join("dependency.sol:Dependency.pvm");
+    let blob_path = temp_dir
+        .path()
+        .to_path_buf()
+        .join("dependency.sol:TestAssert.pvm");
+
+    let output = execute_resolc(&[
+        "--link",
+        blob_path.to_str().unwrap(),
+        dependency_blob_path.to_str().unwrap(),
+    ]);
+    assert_command_success(&output, "The linker mode with missing library should work");
+    assert!(output.stdout.contains("still unresolved"));
+
+    let assert_library_path = format!(
+        "{}:Assert=0x0000000000000000000000000000000000000001",
+        source_path.to_str().unwrap()
+    );
+    let assert_ne_library_path = format!(
+        "{}:AssertNe=0x0000000000000000000000000000000000000002",
+        source_path.to_str().unwrap()
+    );
+    let output = execute_resolc(&[
+        "--link",
+        "--libraries",
+        &assert_library_path,
+        "--libraries",
+        &assert_ne_library_path,
+        blob_path.to_str().unwrap(),
+        dependency_blob_path.to_str().unwrap(),
+    ]);
+    assert_command_success(&output, "The linker mode with all library should work");
+    assert!(!output.stdout.contains("still unresolved"));
+}
+
+#[test]
+fn emits_unlinked_binary_warning() {
+    let output = execute_resolc(&[DEPENDENCY_CONTRACT_PATH, "--bin"]);
+    assert_command_success(&output, "Missing libraries should compile fine");
+    assert!(output.stderr.contains("is unlinked"));
+}

crates/resolc/src/tests/cli/llvm_arguments.rs

@@ -0,0 +1,15 @@
+use crate::tests::cli::utils::{
+    assert_command_success, execute_resolc, RESOLC_YUL_FLAG, YUL_CONTRACT_PATH,
+};
+
+#[test]
+fn llvm_arguments_work_with_yul_input() {
+    let output_with_argument = execute_resolc(&[
+        RESOLC_YUL_FLAG,
+        YUL_CONTRACT_PATH,
+        "--llvm-arg=-riscv-soften-spills'",
+        "--bin",
+    ]);
+    assert_command_success(&output_with_argument, "Providing LLVM arguments");
+    assert!(output_with_argument.success);
+}

crates/resolc/src/tests/cli/mod.rs

@@ -1,9 +1,9 @@
-//! The CLI tests.
-
-#![cfg(test)]
+//! The `resolc` CLI tests.
 
 mod asm;
 mod combined_json;
+mod linker;
+mod llvm_arguments;
 mod optimization;
 mod output_dir;
 mod standard_json;

crates/resolc/src/tests/cli/optimization.rs

@@ -1,10 +1,9 @@
 //! The tests for running resolc with explicit optimization.
 
-#![cfg(test)]
-
-use revive_common;
-
-use crate::tests::cli::{utils, yul};
+use crate::tests::cli::utils::{
+    self, assert_command_failure, assert_command_success, assert_equal_exit_codes, execute_resolc,
+    execute_solc, RESOLC_YUL_FLAG, SOLIDITY_CONTRACT_PATH, YUL_MEMSET_CONTRACT_PATH,
+};
 
 const LEVELS: &[char] = &['0', '1', '2', '3', 's', 'z'];
 
@@ -12,11 +11,7 @@ const LEVELS: &[char] = &['0', '1', '2', '3', 's', 'z'];
 fn runs_with_valid_level() {
     for level in LEVELS {
         let optimization_argument = format!("-O{level}");
-        let arguments = &[
-            utils::YUL_MEMSET_CONTRACT_PATH,
-            yul::YUL_OPTION,
-            &optimization_argument,
-        ];
+        let arguments = &[YUL_MEMSET_CONTRACT_PATH, "--yul", &optimization_argument];
         let resolc_result = utils::execute_resolc(arguments);
         assert!(
             resolc_result.success,
@@ -37,17 +32,27 @@ fn runs_with_valid_level() {
 
 #[test]
 fn fails_with_invalid_level() {
-    let arguments = &[utils::YUL_MEMSET_CONTRACT_PATH, yul::YUL_OPTION, "-O9"];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_failure(&resolc_result, "Providing an invalid optimization level");
+    let arguments = &[YUL_MEMSET_CONTRACT_PATH, RESOLC_YUL_FLAG, "-O9"];
+    let resolc_result = execute_resolc(arguments);
+    assert_command_failure(&resolc_result, "Providing an invalid optimization level");
 
-    assert!(
-        resolc_result
-            .stderr
-            .contains("Unexpected optimization option"),
-        "Expected the output to contain a specific error message."
-    );
+    assert!(resolc_result
+        .stderr
+        .contains("Unexpected optimization option"));
 
-    let solc_result = utils::execute_solc(arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
+    let solc_result = execute_solc(arguments);
+    assert_equal_exit_codes(&solc_result, &resolc_result);
+}
+
+#[test]
+fn disable_solc_optimzer() {
+    let arguments = &[SOLIDITY_CONTRACT_PATH, "--bin", "--disable-solc-optimizer"];
+    let disabled = execute_resolc(arguments);
+    assert_command_success(&disabled, "Disabling the solc optimizer");
+
+    let arguments = &[SOLIDITY_CONTRACT_PATH, "--bin"];
+    let enabled = execute_resolc(arguments);
+    assert_command_success(&disabled, "Enabling the solc optimizer");
+
+    assert_ne!(enabled.stdout, disabled.stdout);
 }

crates/resolc/src/tests/cli/output_dir.rs

@@ -1,52 +1,41 @@
 //! The tests for running resolc with output directory option.
 
-#![cfg(test)]
-
 use std::path::Path;
 
+use tempfile::tempdir;
+
 use crate::tests::cli::utils;
 
-const OUTPUT_DIRECTORY: &str = "src/tests/cli/artifacts";
-const OUTPUT_BIN_FILE_PATH: &str = "src/tests/cli/artifacts/contract.sol:C.pvm";
-const OUTPUT_ASM_FILE_PATH: &str = "src/tests/cli/artifacts/contract.sol:C.pvmasm";
-const OUTPUT_LLVM_OPTIMIZED_FILE_PATH: &str =
-    "src/tests/cli/artifacts/src_tests_cli_contracts_solidity_contract.sol.C.optimized.ll";
+const OUTPUT_BIN_FILE_PATH: &str = "contract.sol:C.pvm";
+const OUTPUT_ASM_FILE_PATH: &str = "contract.sol:C.pvmasm";
+const OUTPUT_LLVM_OPTIMIZED_FILE_PATH: &str = "src_tests_data_solidity_contract.sol.C.optimized.ll";
 const OUTPUT_LLVM_UNOPTIMIZED_FILE_PATH: &str =
-    "src/tests/cli/artifacts/src_tests_cli_contracts_solidity_contract.sol.C.unoptimized.ll";
-
-fn file_exists(path: &str) -> bool {
-    Path::new(path).try_exists().unwrap()
-}
-
-fn file_is_empty(path: &str) -> bool {
-    Path::new(path).metadata().unwrap().len() == 0
-}
+    "src_tests_data_solidity_contract.sol.C.unoptimized.ll";
 
 fn assert_valid_output_file(
     result: &utils::CommandResult,
-    output_file_type: &str,
-    output_file_path: &str,
+    debug_output_directory: &Path,
+    output_file_name: &str,
 ) {
     utils::assert_command_success(result, "Providing an output directory");
 
-    assert!(
-        result.stderr.contains("Compiler run successful"),
-        "Expected the compiler output to contain a success message.",
-    );
+    assert!(result.stderr.contains("Compiler run successful"),);
 
-    assert!(
-        file_exists(output_file_path),
-        "Expected the {output_file_type} output file `{output_file_path}` to exist."
-    );
+    let file = debug_output_directory.to_path_buf().join(output_file_name);
 
-    assert!(
-        !file_is_empty(output_file_path),
-        "Expected the {output_file_type} output file `{output_file_path}` to not be empty."
+    assert!(file.exists(), "Artifact should exist: {}", file.display());
+
+    assert_ne!(
+        file.metadata().unwrap().len(),
+        0,
+        "Artifact shouldn't be empty: {}",
+        file.display()
     );
 }
 
 #[test]
 fn writes_to_file() {
+    let temp_dir = tempdir().unwrap();
     let arguments = &[
         utils::SOLIDITY_CONTRACT_PATH,
         "--overwrite",
@@ -54,15 +43,16 @@ fn writes_to_file() {
         "--bin",
         "--asm",
         "--output-dir",
-        OUTPUT_DIRECTORY,
+        temp_dir.path().to_str().unwrap(),
     ];
     let result = utils::execute_resolc(arguments);
-    assert_valid_output_file(&result, "--bin", OUTPUT_BIN_FILE_PATH);
-    assert_valid_output_file(&result, "--asm", OUTPUT_ASM_FILE_PATH);
+    assert_valid_output_file(&result, temp_dir.path(), OUTPUT_BIN_FILE_PATH);
+    assert_valid_output_file(&result, temp_dir.path(), OUTPUT_ASM_FILE_PATH);
 }
 
 #[test]
 fn writes_debug_info_to_file_unoptimized() {
+    let temp_dir = tempdir().unwrap();
     let arguments = &[
         utils::SOLIDITY_CONTRACT_PATH,
         "-g",
@@ -71,15 +61,16 @@ fn writes_debug_info_to_file_unoptimized() {
         "--bin",
         "--asm",
         "--output-dir",
-        OUTPUT_DIRECTORY,
+        temp_dir.path().to_str().unwrap(),
     ];
     let result = utils::execute_resolc(arguments);
-    assert_valid_output_file(&result, "--bin", OUTPUT_BIN_FILE_PATH);
-    assert_valid_output_file(&result, "--asm", OUTPUT_ASM_FILE_PATH);
+    assert_valid_output_file(&result, temp_dir.path(), OUTPUT_BIN_FILE_PATH);
+    assert_valid_output_file(&result, temp_dir.path(), OUTPUT_ASM_FILE_PATH);
 }
 
 #[test]
 fn writes_debug_info_to_file_optimized() {
+    let temp_dir = tempdir().unwrap();
     let arguments = &[
         utils::SOLIDITY_CONTRACT_PATH,
         "-g",
@@ -87,36 +78,38 @@ fn writes_debug_info_to_file_optimized() {
         "--bin",
         "--asm",
         "--output-dir",
-        OUTPUT_DIRECTORY,
+        temp_dir.path().to_str().unwrap(),
     ];
     let result = utils::execute_resolc(arguments);
-    assert_valid_output_file(&result, "--bin", OUTPUT_BIN_FILE_PATH);
-    assert_valid_output_file(&result, "--asm", OUTPUT_ASM_FILE_PATH);
+    assert_valid_output_file(&result, temp_dir.path(), OUTPUT_BIN_FILE_PATH);
+    assert_valid_output_file(&result, temp_dir.path(), OUTPUT_ASM_FILE_PATH);
 }
 
 #[test]
 fn writes_llvm_debug_info_to_file_unoptimized() {
+    let temp_dir = tempdir().unwrap();
     let arguments = &[
         utils::SOLIDITY_CONTRACT_PATH,
         "-g",
         "--disable-solc-optimizer",
         "--overwrite",
         "--debug-output-dir",
-        OUTPUT_DIRECTORY,
+        temp_dir.path().to_str().unwrap(),
     ];
     let result = utils::execute_resolc(arguments);
-    assert_valid_output_file(&result, "llvm", OUTPUT_LLVM_UNOPTIMIZED_FILE_PATH);
+    assert_valid_output_file(&result, temp_dir.path(), OUTPUT_LLVM_UNOPTIMIZED_FILE_PATH);
 }
 
 #[test]
 fn writes_llvm_debug_info_to_file_optimized() {
+    let temp_dir = tempdir().unwrap();
     let arguments = &[
         utils::SOLIDITY_CONTRACT_PATH,
         "-g",
         "--overwrite",
         "--debug-output-dir",
-        OUTPUT_DIRECTORY,
+        temp_dir.path().to_str().unwrap(),
     ];
     let result = utils::execute_resolc(arguments);
-    assert_valid_output_file(&result, "llvm", OUTPUT_LLVM_OPTIMIZED_FILE_PATH);
+    assert_valid_output_file(&result, temp_dir.path(), OUTPUT_LLVM_OPTIMIZED_FILE_PATH);
 }

crates/resolc/src/tests/cli/standard_json.rs

@@ -1,24 +1,23 @@
 //! The tests for running resolc with standard JSON option.
 
-#![cfg(test)]
-
-use crate::tests::cli::utils;
+use crate::tests::cli::utils::{
+    assert_command_success, assert_equal_exit_codes, execute_resolc_with_stdin_input,
+    execute_solc_with_stdin_input, STANDARD_JSON_CONTRACTS_PATH,
+};
 
 const JSON_OPTION: &str = "--standard-json";
 
 #[test]
 fn runs_with_valid_input_file() {
     let arguments = &[JSON_OPTION];
-    let resolc_result =
-        utils::execute_resolc_with_stdin_input(arguments, utils::STANDARD_JSON_CONTRACTS_PATH);
-    utils::assert_command_success(&resolc_result, "Providing a valid input file to stdin");
+    let resolc_result = execute_resolc_with_stdin_input(arguments, STANDARD_JSON_CONTRACTS_PATH);
+    assert_command_success(&resolc_result, "Providing a valid input file to stdin");
 
     assert!(
         resolc_result.stdout.contains("contracts"),
         "Expected the output to contain a `contracts` field."
     );
 
-    let solc_result =
-        utils::execute_solc_with_stdin_input(arguments, utils::STANDARD_JSON_CONTRACTS_PATH);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
+    let solc_result = execute_solc_with_stdin_input(arguments, STANDARD_JSON_CONTRACTS_PATH);
+    assert_equal_exit_codes(&solc_result, &resolc_result);
 }

crates/resolc/src/tests/cli/usage.rs

@@ -1,20 +1,14 @@
 //! The tests for running resolc when expecting usage output.
 
-#![cfg(test)]
-
 use crate::tests::cli::utils;
 
 #[test]
-#[ignore = "Fix: 'resolc --help' should exit with success exit code"]
 fn shows_usage_with_help() {
     let arguments = &["--help"];
     let resolc_result = utils::execute_resolc(arguments);
     utils::assert_command_success(&resolc_result, "Providing the `--help` option");
 
-    assert!(
-        resolc_result.stdout.contains("Usage: resolc"),
-        "Expected the output to contain usage information."
-    );
+    assert!(resolc_result.stdout.contains("Usage: resolc"));
 
     let solc_result = utils::execute_solc(arguments);
     utils::assert_equal_exit_codes(&solc_result, &resolc_result);
@@ -25,10 +19,7 @@ fn fails_without_options() {
     let resolc_result = utils::execute_resolc(&[]);
     utils::assert_command_failure(&resolc_result, "Omitting options");
 
-    assert!(
-        resolc_result.stderr.contains("Usage: resolc"),
-        "Expected the output to contain usage information."
-    );
+    assert!(resolc_result.stderr.contains("Usage: resolc"));
 
     let solc_result = utils::execute_solc(&[]);
     utils::assert_equal_exit_codes(&solc_result, &resolc_result);

crates/resolc/src/tests/cli/utils.rs

@@ -5,15 +5,28 @@ use std::{
     process::{Command, Stdio},
 };
 
-use revive_common;
-
 use crate::SolcCompiler;
 
-pub const SOLIDITY_CONTRACT_PATH: &str = "src/tests/cli/contracts/solidity/contract.sol";
-pub const YUL_CONTRACT_PATH: &str = "src/tests/cli/contracts/yul/contract.yul";
-pub const YUL_MEMSET_CONTRACT_PATH: &str = "src/tests/cli/contracts/yul/memset.yul";
+/// The simple Solidity contract test fixture path.
+pub const SOLIDITY_CONTRACT_PATH: &str = "src/tests/data/solidity/contract.sol";
+/// The dependency Solidity contract test fixture path.
+pub const DEPENDENCY_CONTRACT_PATH: &str = "src/tests/data/solidity/dependency.sol";
+
+/// The simple YUL contract test fixture path.
+pub const YUL_CONTRACT_PATH: &str = "src/tests/data/yul/contract.yul";
+
+/// The memeset YUL contract test fixture path.
+pub const YUL_MEMSET_CONTRACT_PATH: &str = "src/tests/data/yul/memset.yul";
+/// The standard JSON contracts test fixture path.
+///
 pub const STANDARD_JSON_CONTRACTS_PATH: &str =
-    "src/tests/cli/contracts/standard_json/solidity_contracts.json";
+    "src/tests/data/standard_json/solidity_contracts.json";
+
+/// The `resolc` YUL mode flag.
+pub const RESOLC_YUL_FLAG: &str = "--yul";
+/// The `--yul` option was deprecated in Solidity 0.8.27 in favor of `--strict-assembly`.
+/// See section `--strict-assembly vs. --yul` in https://soliditylang.org/blog/2024/09/04/solidity-0.8.27-release-announcement/
+pub const SOLC_YUL_FLAG: &str = "--strict-assembly";
 
 /// The result of executing a command.
 pub struct CommandResult {
@@ -52,6 +65,14 @@ fn execute_command(
     arguments: &[&str],
     stdin_file_path: Option<&str>,
 ) -> CommandResult {
+    println!(
+        "executing command: '{command} {}{}'",
+        arguments.join(" "),
+        stdin_file_path
+            .map(|argument| format!("< {argument}"))
+            .unwrap_or_default()
+    );
+
     let stdin_config = match stdin_file_path {
         Some(path) => Stdio::from(File::open(path).unwrap()),
         None => Stdio::null(),
@@ -73,10 +94,7 @@ fn execute_command(
 }
 
 pub fn assert_equal_exit_codes(solc_result: &CommandResult, resolc_result: &CommandResult) {
-    assert_eq!(
-        solc_result.code, resolc_result.code,
-        "Expected solc and resolc to have the same exit code."
-    );
+    assert_eq!(solc_result.code, resolc_result.code,);
 }
 
 pub fn assert_command_success(result: &CommandResult, error_message_prefix: &str) {

crates/resolc/src/tests/cli/yul.rs

@@ -1,44 +1,32 @@
 //! The tests for running resolc with yul option.
 
-#![cfg(test)]
-
-use crate::tests::cli::utils;
-
-pub const YUL_OPTION: &str = "--yul";
-/// The `--yul` option was deprecated in Solidity 0.8.27 in favor of `--strict-assembly`.
-/// See section `--strict-assembly vs. --yul` in https://soliditylang.org/blog/2024/09/04/solidity-0.8.27-release-announcement/
-const SOLC_YUL_OPTION: &str = "--strict-assembly";
+use crate::tests::cli::utils::{
+    assert_command_success, assert_equal_exit_codes, execute_resolc, execute_solc, RESOLC_YUL_FLAG,
+    SOLC_YUL_FLAG, YUL_CONTRACT_PATH,
+};
 
 #[test]
 fn runs_with_valid_input_file() {
-    let arguments = &[utils::YUL_CONTRACT_PATH, YUL_OPTION];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_success(&resolc_result, "Providing a valid input file");
+    let resolc_result = execute_resolc(&[YUL_CONTRACT_PATH, RESOLC_YUL_FLAG]);
+    assert_command_success(&resolc_result, "Providing a valid input file");
 
-    assert!(
-        resolc_result
-            .stderr
-            .contains("Compiler run successful. No output requested"),
-        "Expected the output to contain a success message."
-    );
+    assert!(resolc_result
+        .stderr
+        .contains("Compiler run successful. No output requested"));
 
-    let solc_arguments = &[utils::YUL_CONTRACT_PATH, SOLC_YUL_OPTION];
-    let solc_result = utils::execute_solc(solc_arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
+    let solc_result = execute_solc(&[YUL_CONTRACT_PATH, SOLC_YUL_FLAG]);
+    assert_equal_exit_codes(&solc_result, &resolc_result);
 }
 
+/// While the `solc` Solidity mode requires output selection,
+/// the strict-assembly mode does not.
+///
+/// `resolc` exhibits consistent behavior for both modes.
 #[test]
-fn fails_without_input_file() {
-    let arguments = &[YUL_OPTION];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_failure(&resolc_result, "Omitting an input file");
-
-    assert!(
-        resolc_result.stderr.contains("The input file is missing"),
-        "Expected the output to contain a specific error message."
-    );
-
-    let solc_arguments = &[SOLC_YUL_OPTION];
-    let solc_result = utils::execute_solc(solc_arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
+fn runs_without_input_file() {
+    let resolc_result = execute_resolc(&[RESOLC_YUL_FLAG]);
+    assert_command_success(&resolc_result, "Omitting an input file");
+    assert!(resolc_result
+        .stderr
+        .contains("Compiler run successful. No output requested"));
 }

crates/resolc/src/tests/data/solidity/dependency.sol

@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-3.0
+
+pragma solidity >=0.7.0 <0.9.0;
+
+library Assert {
+    function equal(uint256 a, uint256 b) public pure returns (bool result) {
+    result = (a == b);
+  }
+}
+
+library AssertNe {
+    function notEqual(uint256 a, uint256 b) public pure returns (bool result) {
+    result = (a != b);
+  }
+}
+
+contract TestAssert {
+    constructor() payable {
+        new Dependency(); 
+    }
+
+    function checkEquality(uint256 a, uint256 b) public pure returns (string memory) {
+        Assert.equal(a, b);
+        return "Values are equal";
+    }
+}
+
+contract Dependency {
+    function checkNotEquality(uint256 a, uint256 b) public pure returns (string memory) {
+        AssertNe.notEqual(a, b);
+        return "Values are not equal";
+    }
+}

crates/resolc/src/tests/data/standard_json/yul_solc.json

@@ -0,0 +1,29 @@
+{
+  "language": "Yul",
+  "sources": {
+    "Test": {
+      "content": "object \"Return\" { code { { return(0, 0) } } object \"Return_deployed\" { code { { return(0, 0) } } } }"
+    }
+  },
+  "settings": {
+    "optimizer": {
+      "enabled": true
+    },
+    "metadata": {
+      "useLiteralContent": true
+    },
+    "outputSelection": {
+      "*": {
+        "": [
+          "ast"
+        ],
+        "*": [
+          "abi",
+          "evm.methodIdentifiers",
+          "evm.bytecode"
+        ]
+      }
+    },
+    "libraries": {}
+  }
+}

crates/resolc/src/tests/data/standard_json/yul_solc_urls.json

@@ -0,0 +1,31 @@
+{
+  "language": "Yul",
+  "sources": {
+    "Test": {
+      "urls": [
+        "src/tests/data/yul/Test.yul"
+      ]
+    }
+  },
+  "settings": {
+    "optimizer": {
+      "enabled": true
+    },
+    "metadata": {
+      "useLiteralContent": true
+    },
+    "outputSelection": {
+      "*": {
+        "": [
+          "ast"
+        ],
+        "*": [
+          "abi",
+          "evm.methodIdentifiers",
+          "evm.bytecode"
+        ]
+      }
+    },
+    "libraries": {}
+  }
+}

crates/resolc/src/tests/data/yul/Test.yul

@@ -0,0 +1,16 @@
+object "Return" {
+    code {
+        {
+            return(0, 0)
+        }
+    }
+
+    object "Return_deployed" {
+        code {
+            {
+                mstore(0, 42)
+                return(0, 32)
+            }
+        }
+    }
+}

crates/resolc/src/tests/messages.rs

@@ -1,251 +0,0 @@
-//! The Solidity compiler unit tests for messages.
-
-#![cfg(test)]
-
-use std::collections::BTreeMap;
-
-use revive_solc_json_interface::warning::Warning;
-
-pub const ECRECOVER_TEST_SOURCE: &str = r#"
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract ECRecoverExample {
-    function recoverAddress(
-        bytes32 messageHash,
-        uint8 v,
-        bytes32 r,
-        bytes32 s
-    ) public pure returns (address) {
-        return ecrecover(messageHash, v, r, s);
-    }
-}
-    "#;
-
-#[test]
-fn ecrecover() {
-    assert!(
-        super::check_solidity_warning(
-            ECRECOVER_TEST_SOURCE,
-            "Warning: It looks like you are using 'ecrecover' to validate a signature of a user account.",
-            BTreeMap::new(),
-            false,
-            None,
-        ).expect("Test failure")
-    );
-}
-
-#[test]
-fn ecrecover_suppressed() {
-    assert!(
-        !super::check_solidity_warning(
-            ECRECOVER_TEST_SOURCE,
-            "Warning: It looks like you are using 'ecrecover' to validate a signature of a user account.",
-            BTreeMap::new(),
-            false,
-            Some(vec![Warning::EcRecover]),
-        ).expect("Test failure")
-    );
-}
-
-pub const SEND_TEST_SOURCE: &str = r#"
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract SendExample {
-    address payable public recipient;
-
-    constructor(address payable _recipient) {
-        recipient = _recipient;
-    }
-
-    function forwardEther() external payable {
-        bool success = recipient.send(msg.value);
-        require(success, "Failed to send Ether");
-    }
-}
-"#;
-
-pub const BALANCE_CALLS_MESSAGE: &str =
-    "Warning: It looks like you are using '<address payable>.send/transfer(<X>)'";
-
-#[test]
-fn send() {
-    assert!(super::check_solidity_warning(
-        SEND_TEST_SOURCE,
-        BALANCE_CALLS_MESSAGE,
-        BTreeMap::new(),
-        false,
-        None,
-    )
-    .expect("Test failure"));
-}
-
-#[test]
-fn send_suppressed() {
-    assert!(!super::check_solidity_warning(
-        SEND_TEST_SOURCE,
-        BALANCE_CALLS_MESSAGE,
-        BTreeMap::new(),
-        false,
-        Some(vec![Warning::SendTransfer]),
-    )
-    .expect("Test failure"));
-}
-
-pub const TRANSFER_TEST_SOURCE: &str = r#"
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract TransferExample {
-    address payable public recipient;
-
-    constructor(address payable _recipient) {
-        recipient = _recipient;
-    }
-
-    function forwardEther() external payable {
-        recipient.transfer(msg.value);
-    }
-}
-    "#;
-
-#[test]
-fn transfer() {
-    assert!(super::check_solidity_warning(
-        TRANSFER_TEST_SOURCE,
-        BALANCE_CALLS_MESSAGE,
-        BTreeMap::new(),
-        false,
-        None,
-    )
-    .expect("Test failure"));
-}
-
-#[test]
-fn transfer_suppressed() {
-    assert!(!super::check_solidity_warning(
-        TRANSFER_TEST_SOURCE,
-        BALANCE_CALLS_MESSAGE,
-        BTreeMap::new(),
-        false,
-        Some(vec![Warning::SendTransfer]),
-    )
-    .expect("Test failure"));
-}
-
-pub const EXTCODESIZE_TEST_SOURCE: &str = r#"
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract ExternalCodeSize {
-    function getExternalCodeSize(address target) public view returns (uint256) {
-        uint256 codeSize;
-        assembly {
-            codeSize := extcodesize(target)
-        }
-        return codeSize;
-    }
-}
-    "#;
-
-#[test]
-fn extcodesize() {
-    assert!(super::check_solidity_warning(
-        EXTCODESIZE_TEST_SOURCE,
-        "Warning: Your code or one of its dependencies uses the 'extcodesize' instruction,",
-        BTreeMap::new(),
-        false,
-        None,
-    )
-    .expect("Test failure"));
-}
-
-#[test]
-fn extcodesize_suppressed() {
-    assert!(!super::check_solidity_warning(
-        EXTCODESIZE_TEST_SOURCE,
-        "Warning: Your code or one of its dependencies uses the 'extcodesize' instruction,",
-        BTreeMap::new(),
-        false,
-        Some(vec![Warning::ExtCodeSize]),
-    )
-    .expect("Test failure"));
-}
-
-pub const TX_ORIGIN_TEST_SOURCE: &str = r#"
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract TxOriginExample {
-    function isOriginSender() public view returns (bool) {
-        return tx.origin == msg.sender;
-    }
-}
-    "#;
-
-#[test]
-fn tx_origin() {
-    assert!(super::check_solidity_warning(
-        TX_ORIGIN_TEST_SOURCE,
-        "Warning: You are checking for 'tx.origin' in your code, which might lead to",
-        BTreeMap::new(),
-        false,
-        None,
-    )
-    .expect("Test failure"));
-}
-
-#[test]
-fn tx_origin_suppressed() {
-    assert!(!super::check_solidity_warning(
-        TX_ORIGIN_TEST_SOURCE,
-        "Warning: You are checking for 'tx.origin' in your code, which might lead to",
-        BTreeMap::new(),
-        false,
-        Some(vec![Warning::TxOrigin]),
-    )
-    .expect("Test failure"));
-}
-
-pub const TX_ORIGIN_ASSEMBLY_TEST_SOURCE: &str = r#"
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract TxOriginExample {
-    function isOriginSender() public view returns (bool) {
-        address txOrigin;
-        address sender = msg.sender;
-
-        assembly {
-            txOrigin := origin() // Get the transaction origin using the 'origin' instruction
-        }
-
-        return txOrigin == sender;
-    }
-}
-    "#;
-
-#[test]
-fn tx_origin_assembly() {
-    assert!(super::check_solidity_warning(
-        TX_ORIGIN_ASSEMBLY_TEST_SOURCE,
-        "Warning: You are checking for 'tx.origin' in your code, which might lead to",
-        BTreeMap::new(),
-        false,
-        None,
-    )
-    .expect("Test failure"));
-}
-
-#[test]
-fn tx_origin_assembly_suppressed() {
-    assert!(!super::check_solidity_warning(
-        TX_ORIGIN_ASSEMBLY_TEST_SOURCE,
-        "Warning: You are checking for 'tx.origin' in your code, which might lead to",
-        BTreeMap::new(),
-        false,
-        Some(vec![Warning::TxOrigin]),
-    )
-    .expect("Test failure"));
-}

crates/resolc/src/tests/mod.rs

@@ -1,15 +1,6 @@
-//! The Solidity compiler unit tests.
+//! The Solidity compiler tests.
 
 #![cfg(test)]
 
 mod cli;
-mod factory_dependency;
-mod ir_artifacts;
-mod libraries;
-mod messages;
-mod optimizer;
-mod remappings;
-mod runtime_code;
-mod unsupported_opcodes;
-
-pub(crate) use super::test_utils::*;
+mod unit;

crates/resolc/src/tests/remappings.rs

@@ -1,50 +0,0 @@
-//! The Solidity compiler unit tests for remappings.
-
-#![cfg(test)]
-
-use std::collections::BTreeMap;
-use std::collections::BTreeSet;
-
-pub const CALLEE_TEST_SOURCE: &str = r#"
-// SPDX-License-Identifier: MIT
-
-pragma solidity >=0.4.16;
-
-contract Callable {
-    function f(uint a) public pure returns(uint) {
-        return a * 2;
-    }
-}
-"#;
-
-pub const CALLER_TEST_SOURCE: &str = r#"
-// SPDX-License-Identifier: MIT
-
-pragma solidity >=0.4.16;
-
-import "libraries/default/callable.sol";
-
-contract Main {
-    function main(Callable callable) public returns(uint) {
-        return callable.f(5);
-    }
-}
-"#;
-
-#[test]
-fn default() {
-    let mut sources = BTreeMap::new();
-    sources.insert("./test.sol".to_owned(), CALLER_TEST_SOURCE.to_owned());
-    sources.insert("./callable.sol".to_owned(), CALLEE_TEST_SOURCE.to_owned());
-
-    let mut remappings = BTreeSet::new();
-    remappings.insert("libraries/default/=./".to_owned());
-
-    super::build_solidity(
-        sources,
-        BTreeMap::new(),
-        Some(remappings),
-        revive_llvm_context::OptimizerSettings::cycles(),
-    )
-    .expect("Test failure");
-}

crates/resolc/src/tests/runtime_code.rs

@@ -1,33 +0,0 @@
-//! The Solidity compiler unit tests for runtime code.
-
-#![cfg(test)]
-
-use std::collections::BTreeMap;
-
-#[test]
-#[should_panic(expected = "runtimeCode is not supported")]
-fn default() {
-    let source_code = r#"
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract A {}
-
-contract Test {
-    function main() public pure returns(bytes memory) {
-        return type(A).runtimeCode;
-    }
-}
-    "#;
-
-    let mut sources = BTreeMap::new();
-    sources.insert("test.sol".to_owned(), source_code.to_owned());
-
-    super::build_solidity(
-        sources,
-        BTreeMap::new(),
-        None,
-        revive_llvm_context::OptimizerSettings::cycles(),
-    )
-    .expect("Test failure");
-}

crates/resolc/src/tests/unit/factory_dependency.rs

@@ -1,10 +1,10 @@
 //! The Solidity compiler unit tests for factory dependencies.
 
-#![cfg(test)]
+use crate::test_utils::{build_solidity, sources};
 
-use std::collections::BTreeMap;
-
-pub const MAIN_CODE: &str = r#"
+#[test]
+fn default() {
+    let caller_code = r#"
 // SPDX-License-Identifier: MIT
 
 pragma solidity >=0.4.16;
@@ -18,10 +18,9 @@ contract Main {
         callable.set(10);
         return callable.get();
     }
-}
-"#;
+}"#;
 
-pub const CALLABLE_CODE: &str = r#"
+    let callee_code = r#"
 // SPDX-License-Identifier: MIT
 
 pragma solidity >=0.4.16;
@@ -36,35 +35,22 @@ contract Callable {
     function get() external view returns(uint256) {
         return value;
     }
-}
-"#;
+}"#;
 
-#[test]
-fn default() {
-    let mut sources = BTreeMap::new();
-    sources.insert("main.sol".to_owned(), MAIN_CODE.to_owned());
-    sources.insert("callable.sol".to_owned(), CALLABLE_CODE.to_owned());
-
-    let output = super::build_solidity(
-        sources,
-        BTreeMap::new(),
-        None,
-        revive_llvm_context::OptimizerSettings::cycles(),
-    )
-    .expect("Build failure");
+    let output = build_solidity(sources(&[
+        ("main.sol", caller_code),
+        ("callable.sol", callee_code),
+    ]))
+    .unwrap();
 
     assert_eq!(
         output
             .contracts
-            .as_ref()
-            .expect("Missing field `contracts`")
             .get("main.sol")
             .expect("Missing file `main.sol`")
             .get("Main")
             .expect("Missing contract `main.sol:Main`")
             .factory_dependencies
-            .as_ref()
-            .expect("Missing field `factory_dependencies`")
             .len(),
         1,
         "Expected 1 factory dependency in `main.sol:Main`"
@@ -72,15 +58,11 @@ fn default() {
     assert_eq!(
         output
             .contracts
-            .as_ref()
-            .expect("Missing field `contracts`")
             .get("callable.sol")
             .expect("Missing file `callable.sol`")
             .get("Callable")
             .expect("Missing contract `callable.sol:Callable`")
             .factory_dependencies
-            .as_ref()
-            .expect("Missing field `factory_dependencies`")
             .len(),
         0,
         "Expected 0 factory dependencies in `callable.sol:Callable`"

crates/resolc/src/tests/unit/ir_artifacts.rs

@@ -1,13 +1,11 @@
 //! The Solidity compiler unit tests for IR artifacts.
 //! The tests check if the IR artifacts are kept in the final output.
 
-#![cfg(test)]
-
-use std::collections::BTreeMap;
+use crate::test_utils::{build_solidity, sources};
 
 #[test]
 fn yul() {
-    let source_code = r#"
+    let code = r#"
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
@@ -18,28 +16,17 @@ contract Test {
 }
     "#;
 
-    let mut sources = BTreeMap::new();
-    sources.insert("test.sol".to_owned(), source_code.to_owned());
-
-    let build = super::build_solidity(
-        sources,
-        BTreeMap::new(),
-        None,
-        revive_llvm_context::OptimizerSettings::cycles(),
-    )
-    .expect("Test failure");
+    let build = build_solidity(sources(&[("test.sol", code)])).expect("Test failure");
 
     assert!(
-        build
+        !build
             .contracts
-            .as_ref()
-            .expect("Always exists")
             .get("test.sol")
             .expect("Always exists")
             .get("Test")
             .expect("Always exists")
             .ir_optimized
-            .is_some(),
+            .is_empty(),
         "Yul IR is missing"
     );
 }

crates/resolc/src/tests/unit/libraries.rs

@@ -1,10 +1,10 @@
 //! The Solidity compiler unit tests for libraries.
 
-#![cfg(test)]
+use revive_solc_json_interface::SolcStandardJsonInputSettingsLibraries;
 
-use std::collections::BTreeMap;
+use crate::test_utils::build_solidity_and_detect_missing_libraries;
 
-pub const LIBRARY_TEST_SOURCE: &str = r#"
+pub const CODE: &str = r#"
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
@@ -28,29 +28,21 @@ contract SimpleContract {
         }
         return sum;
     }
-}
-    "#;
+}"#;
 
 #[test]
 fn not_specified() {
-    let mut sources = BTreeMap::new();
-    sources.insert("test.sol".to_owned(), LIBRARY_TEST_SOURCE.to_owned());
-
     let output =
-        super::build_solidity_and_detect_missing_libraries(sources.clone(), BTreeMap::new())
-            .expect("Test failure");
+        build_solidity_and_detect_missing_libraries(&[("test.sol", CODE)], Default::default())
+            .unwrap();
     assert!(
         output
             .contracts
-            .as_ref()
-            .expect("Always exists")
             .get("test.sol")
             .expect("Always exists")
             .get("SimpleContract")
             .expect("Always exists")
             .missing_libraries
-            .as_ref()
-            .expect("Always exists")
             .contains("test.sol:SimpleLibrary"),
         "Missing library not detected"
     );
@@ -58,32 +50,25 @@ fn not_specified() {
 
 #[test]
 fn specified() {
-    let mut sources = BTreeMap::new();
-    sources.insert("test.sol".to_owned(), LIBRARY_TEST_SOURCE.to_owned());
-
-    let mut libraries = BTreeMap::new();
+    let mut libraries = SolcStandardJsonInputSettingsLibraries::default();
     libraries
+        .as_inner_mut()
         .entry("test.sol".to_string())
-        .or_insert_with(BTreeMap::new)
+        .or_default()
         .entry("SimpleLibrary".to_string())
         .or_insert("0x00000000000000000000000000000000DEADBEEF".to_string());
 
     let output =
-        super::build_solidity_and_detect_missing_libraries(sources.clone(), libraries.clone())
-            .expect("Test failure");
+        build_solidity_and_detect_missing_libraries(&[("test.sol", CODE)], libraries.clone())
+            .unwrap();
     assert!(
         output
             .contracts
-            .as_ref()
-            .expect("Always exists")
             .get("test.sol")
             .expect("Always exists")
             .get("SimpleContract")
             .expect("Always exists")
             .missing_libraries
-            .as_ref()
-            .cloned()
-            .unwrap_or_default()
             .is_empty(),
         "The list of missing libraries must be empty"
     );

crates/resolc/src/tests/unit/messages.rs

@@ -0,0 +1,116 @@
+//! The Solidity compiler unit tests for messages.
+
+use revive_llvm_context::OptimizerSettings;
+use revive_solc_json_interface::{ResolcWarning, SolcStandardJsonOutput};
+
+use crate::test_utils::{build_solidity, build_solidity_with_options, sources};
+
+pub const SEND_TEST_SOURCE: &str = r#"
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract SendExample {
+    address payable public recipient;
+
+    constructor(address payable _recipient) {
+        recipient = _recipient;
+    }
+
+    function forwardEther() external payable {
+        bool success = recipient.send(msg.value);
+        require(success, "Failed to send Ether");
+    }
+}"#;
+
+pub const TRANSFER_TEST_SOURCE: &str = r#"
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract TransferExample {
+    address payable public recipient;
+
+    constructor(address payable _recipient) {
+        recipient = _recipient;
+    }
+
+    function forwardEther() external payable {
+        recipient.transfer(msg.value);
+    }
+}"#;
+
+pub const TX_ORIGIN_TEST_SOURCE: &str = r#"
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract TxOriginExample {
+    function isOriginSender() public view returns (bool) {
+        return tx.origin == msg.sender;
+    }
+}"#;
+
+fn contains_warning(build: SolcStandardJsonOutput, warning: ResolcWarning) -> bool {
+    build
+        .errors
+        .iter()
+        .any(|error| error.is_warning() && error.message.contains(warning.as_message()))
+}
+
+#[test]
+fn send() {
+    let build = build_solidity(sources(&[("test.sol", SEND_TEST_SOURCE)])).unwrap();
+    assert!(contains_warning(build, ResolcWarning::SendAndTransfer));
+}
+
+#[test]
+fn send_suppressed() {
+    let build = build_solidity_with_options(
+        sources(&[("test.sol", SEND_TEST_SOURCE)]),
+        Default::default(),
+        Default::default(),
+        OptimizerSettings::cycles(),
+        true,
+        vec![ResolcWarning::SendAndTransfer],
+    )
+    .unwrap();
+    assert!(!contains_warning(build, ResolcWarning::SendAndTransfer));
+}
+
+#[test]
+fn transfer() {
+    let build = build_solidity(sources(&[("test.sol", TRANSFER_TEST_SOURCE)])).unwrap();
+    assert!(contains_warning(build, ResolcWarning::SendAndTransfer));
+}
+
+#[test]
+fn transfer_suppressed() {
+    let build = build_solidity_with_options(
+        sources(&[("test.sol", TRANSFER_TEST_SOURCE)]),
+        Default::default(),
+        Default::default(),
+        OptimizerSettings::cycles(),
+        true,
+        vec![ResolcWarning::SendAndTransfer],
+    )
+    .unwrap();
+    assert!(!contains_warning(build, ResolcWarning::SendAndTransfer))
+}
+
+#[test]
+fn tx_origin() {
+    let build = build_solidity(sources(&[("test.sol", TX_ORIGIN_TEST_SOURCE)])).unwrap();
+    assert!(contains_warning(build, ResolcWarning::TxOrigin));
+}
+
+#[test]
+fn tx_origin_suppressed() {
+    let build = build_solidity_with_options(
+        sources(&[("test.sol", TX_ORIGIN_TEST_SOURCE)]),
+        Default::default(),
+        Default::default(),
+        OptimizerSettings::cycles(),
+        true,
+        vec![ResolcWarning::TxOrigin],
+    )
+    .unwrap();
+    assert!(!contains_warning(build, ResolcWarning::TxOrigin))
+}

crates/resolc/src/tests/unit/mod.rs

@@ -0,0 +1,11 @@
+//! The Solidity compiler unit tests.
+
+mod factory_dependency;
+mod ir_artifacts;
+mod libraries;
+mod messages;
+mod optimizer;
+mod remappings;
+mod runtime_code;
+mod standard_json;
+mod unsupported_opcodes;

crates/resolc/src/tests/unit/optimizer.rs

@@ -1,10 +1,12 @@
 //! The Solidity compiler unit tests for the optimizer.
 
-#![cfg(test)]
+use crate::test_utils::{build_solidity, build_solidity_with_options, sources};
 
-use std::collections::BTreeMap;
-
-pub const SOURCE_CODE: &str = r#"
+#[test]
+fn optimizer() {
+    let source = &[(
+        "test.sol",
+        r#"
 // SPDX-License-Identifier: MIT
 
 pragma solidity >=0.5.0;
@@ -40,40 +42,31 @@ contract Test {
         }
         return h;
     }
-}
-"#;
+}"#,
+    )];
 
-#[test]
-fn optimizer() {
-    let mut sources = BTreeMap::new();
-    sources.insert("test.sol".to_owned(), SOURCE_CODE.to_owned());
-
-    let build_unoptimized = super::build_solidity(
-        sources.clone(),
-        BTreeMap::new(),
-        None,
+    let build_unoptimized = build_solidity_with_options(
+        sources(source),
+        Default::default(),
+        Default::default(),
         revive_llvm_context::OptimizerSettings::none(),
+        true,
+        Default::default(),
     )
-    .expect("Build failure");
-    let build_optimized_for_cycles = super::build_solidity(
-        sources.clone(),
-        BTreeMap::new(),
-        None,
-        revive_llvm_context::OptimizerSettings::cycles(),
-    )
-    .expect("Build failure");
-    let build_optimized_for_size = super::build_solidity(
-        sources,
-        BTreeMap::new(),
-        None,
+    .unwrap();
+    let build_optimized_for_cycles = build_solidity(sources(source)).unwrap();
+    let build_optimized_for_size = build_solidity_with_options(
+        sources(source),
+        Default::default(),
+        Default::default(),
         revive_llvm_context::OptimizerSettings::size(),
+        true,
+        Default::default(),
     )
-    .expect("Build failure");
+    .unwrap();
 
     let size_when_unoptimized = build_unoptimized
         .contracts
-        .as_ref()
-        .expect("Missing field `contracts`")
         .get("test.sol")
         .expect("Missing file `test.sol`")
         .get("Test")
@@ -88,8 +81,6 @@ fn optimizer() {
         .len();
     let size_when_optimized_for_cycles = build_optimized_for_cycles
         .contracts
-        .as_ref()
-        .expect("Missing field `contracts`")
         .get("test.sol")
         .expect("Missing file `test.sol`")
         .get("Test")
@@ -104,8 +95,6 @@ fn optimizer() {
         .len();
     let size_when_optimized_for_size = build_optimized_for_size
         .contracts
-        .as_ref()
-        .expect("Missing field `contracts`")
         .get("test.sol")
         .expect("Missing file `test.sol`")
         .get("Test")

crates/resolc/src/tests/unit/remappings.rs

@@ -0,0 +1,40 @@
+//! The Solidity compiler unit tests for remappings.
+
+use crate::test_utils::{build_solidity_with_options, sources};
+
+#[test]
+fn default() {
+    let callee_code = r#"
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.4.16;
+
+contract Callable {
+    function f(uint a) public pure returns(uint) {
+        return a * 2;
+    }
+}"#;
+
+    let caller_code = r#"
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.4.16;
+
+import "libraries/default/callable.sol";
+
+contract Main {
+    function main(Callable callable) public returns(uint) {
+        return callable.f(5);
+    }
+}"#;
+
+    build_solidity_with_options(
+        sources(&[("./test.sol", caller_code), ("./callable.sol", callee_code)]),
+        Default::default(),
+        ["libraries/default/=./".to_owned()].into(),
+        revive_llvm_context::OptimizerSettings::cycles(),
+        true,
+        Default::default(),
+    )
+    .unwrap();
+}

crates/resolc/src/tests/unit/runtime_code.rs

@@ -0,0 +1,30 @@
+//! The Solidity compiler unit tests for runtime code.
+
+use crate::test_utils::{build_solidity, sources};
+
+#[test]
+fn default() {
+    let code = r#"
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract A {}
+
+contract Test {
+    function main() public pure returns(bytes memory) {
+        return type(A).runtimeCode;
+    }
+}
+    "#;
+
+    build_solidity(sources(&[("test.sol", code)]))
+        .unwrap()
+        .errors
+        .iter()
+        .find(|error| {
+            error
+                .to_string()
+                .contains("Error: Deploy and runtime code are merged in PVM")
+        })
+        .unwrap();
+}

crates/resolc/src/tests/unit/standard_json.rs

@@ -0,0 +1,53 @@
+use std::path::PathBuf;
+
+use revive_solc_json_interface::SolcStandardJsonInput;
+
+use crate::test_utils::build_yul_standard_json;
+
+#[test]
+fn standard_json_yul_solc() {
+    let solc_input = SolcStandardJsonInput::try_from(Some(
+        PathBuf::from("src/tests/data/standard_json/yul_solc.json").as_path(),
+    ))
+    .unwrap();
+    let solc_output = build_yul_standard_json(solc_input).unwrap();
+
+    assert!(!solc_output
+        .contracts
+        .get("Test")
+        .expect("The `Test` contract is missing")
+        .get("Return")
+        .expect("The `Return` contract is missing")
+        .evm
+        .as_ref()
+        .expect("The `evm` field is missing")
+        .bytecode
+        .as_ref()
+        .expect("The `bytecode` field is missing")
+        .object
+        .is_empty())
+}
+
+#[test]
+fn standard_json_yul_solc_urls() {
+    let solc_input = SolcStandardJsonInput::try_from(Some(
+        PathBuf::from("src/tests/data/standard_json/yul_solc_urls.json").as_path(),
+    ))
+    .unwrap();
+    let solc_output = build_yul_standard_json(solc_input).unwrap();
+
+    assert!(!solc_output
+        .contracts
+        .get("Test")
+        .expect("The `Test` contract is missing")
+        .get("Return")
+        .expect("The `Return` contract is missing")
+        .evm
+        .as_ref()
+        .expect("The `evm` field is missing")
+        .bytecode
+        .as_ref()
+        .expect("The `bytecode` field is missing")
+        .object
+        .is_empty())
+}

crates/resolc/src/tests/unit/unsupported_opcodes.rs

@@ -1,13 +1,11 @@
 //! The Solidity compiler unit tests for unsupported opcodes.
 
-#![cfg(test)]
-
-use std::collections::BTreeMap;
+use crate::test_utils::{build_solidity, build_yul, sources};
 
 #[test]
 #[should_panic(expected = "The `CODECOPY` instruction is not supported")]
 fn codecopy_yul_runtime() {
-    let source_code = r#"
+    let code = r#"
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
@@ -22,22 +20,15 @@ contract FixedCodeCopy {
 
         return code;
     }
-}
-    "#;
+}"#;
 
-    let mut sources = BTreeMap::new();
-    sources.insert("test.sol".to_owned(), source_code.to_owned());
-
-    super::build_solidity(
-        sources,
-        BTreeMap::new(),
-        None,
-        revive_llvm_context::OptimizerSettings::cycles(),
-    )
-    .expect("Test failure");
+    build_solidity(sources(&[("test.sol", code)])).unwrap();
 }
 
-pub const CALLCODE_TEST_SOURCE: &str = r#"
+#[test]
+#[should_panic(expected = "The `CALLCODE` instruction is not supported")]
+fn callcode_yul() {
+    let solidity = r#"
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
@@ -57,28 +48,15 @@ contract CallcodeTest {
 
         return success;
     }
-}
-    "#;
+}"#;
 
-#[test]
-#[should_panic(expected = "The `CALLCODE` instruction is not supported")]
-fn callcode_yul() {
-    let mut sources = BTreeMap::new();
-    sources.insert("test.sol".to_owned(), CALLCODE_TEST_SOURCE.to_owned());
-
-    super::build_solidity(
-        sources,
-        BTreeMap::new(),
-        None,
-        revive_llvm_context::OptimizerSettings::cycles(),
-    )
-    .expect("Test failure");
+    build_solidity(sources(&[("test.sol", solidity)])).unwrap();
 }
 
 #[test]
 #[should_panic(expected = "The `PC` instruction is not supported")]
 fn pc_yul() {
-    let source_code = r#"
+    let code = r#"
 object "ProgramCounter" {
     code {
         datacopy(0, dataoffset("ProgramCounter_deployed"), datasize("ProgramCounter_deployed"))
@@ -94,13 +72,15 @@ object "ProgramCounter" {
             sstore(0, pcValue)
         }
     }
-}
-    "#;
+}"#;
 
-    super::build_yul(source_code).expect("Test failure");
+    build_yul(&[("test.sol", code)]).unwrap();
 }
 
-pub const EXTCODECOPY_TEST_SOURCE: &str = r#"
+#[test]
+#[should_panic(expected = "The `EXTCODECOPY` instruction is not supported")]
+fn extcodecopy_yul() {
+    let code = r#"
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
@@ -114,25 +94,15 @@ contract ExternalCodeCopy {
 
         return code;
     }
+}"#;
+
+    build_solidity(sources(&[("test.sol", code)])).unwrap();
 }
-    "#;
 
 #[test]
-#[should_panic(expected = "The `EXTCODECOPY` instruction is not supported")]
-fn extcodecopy_yul() {
-    let mut sources = BTreeMap::new();
-    sources.insert("test.sol".to_owned(), EXTCODECOPY_TEST_SOURCE.to_owned());
-
-    super::build_solidity(
-        sources,
-        BTreeMap::new(),
-        None,
-        revive_llvm_context::OptimizerSettings::cycles(),
-    )
-    .expect("Test failure");
-}
-
-pub const SELFDESTRUCT_TEST_SOURCE: &str = r#"
+#[should_panic(expected = "The `SELFDESTRUCT` instruction is not supported")]
+fn selfdestruct_yul() {
+    let solidity = r#"
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
@@ -147,20 +117,7 @@ contract MinimalDestructible {
         require(msg.sender == owner, "Only the owner can call this function.");
         selfdestruct(owner);
     }
-}
-    "#;
+}"#;
 
-#[test]
-#[should_panic(expected = "The `SELFDESTRUCT` instruction is not supported")]
-fn selfdestruct_yul() {
-    let mut sources = BTreeMap::new();
-    sources.insert("test.sol".to_owned(), SELFDESTRUCT_TEST_SOURCE.to_owned());
-
-    super::build_solidity(
-        sources,
-        BTreeMap::new(),
-        None,
-        revive_llvm_context::OptimizerSettings::cycles(),
-    )
-    .expect("Test failure");
+    build_solidity(sources(&[("test.sol", solidity)])).unwrap();
 }