wip

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>

Author: xermicus

crates/llvm-context/src/optimizer/settings/mod.rs

@@ -227,18 +227,3 @@ impl std::fmt::Display for Settings {
         )
     }
 }
-
-impl TryFrom<&SolcStandardJsonInputSettingsOptimizer> for Settings {
-    type Error = anyhow::Error;
-
-    fn try_from(value: &SolcStandardJsonInputSettingsOptimizer) -> Result<Self, Self::Error> {
-        let mut result = match value.mode {
-            Some(mode) => Self::try_from_cli(mode)?,
-            None => Self::size(),
-        };
-        if value.fallback_to_optimizing_for_size.unwrap_or_default() {
-            result.enable_fallback_to_size();
-        }
-        Ok(result)
-    }
-}

crates/resolc/src/build/contract.rs

@@ -136,15 +136,15 @@ impl Contract {
         self,
         standard_json_contract: &mut SolcStandardJsonOutputContract,
     ) -> anyhow::Result<()> {
-        standard_json_contract.metadata = Some(self.metadata_json);
+        standard_json_contract.metadata = 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);
         }
 
-        standard_json_contract.factory_dependencies = Some(self.build.factory_dependencies);
+        standard_json_contract.factory_dependencies = self.build.factory_dependencies;
         standard_json_contract.hash = self.build.bytecode_hash.map(hex::encode);
 
         Ok(())

crates/resolc/src/lib.rs

@@ -39,7 +39,6 @@ use std::collections::BTreeSet;
 use std::io::Write;
 use std::path::PathBuf;
 
-use revive_common::Keccak256;
 use revive_common::MetadataHash;
 use revive_llvm_context::OptimizerSettings;
 use revive_solc_json_interface::ResolcWarning;
@@ -94,7 +93,7 @@ pub fn yul<T: Compiler>(
 pub fn llvm_ir(
     input_files: &[PathBuf],
     libraries: &[String],
-    metadata_hash: Keccak256,
+    metadata_hash: MetadataHash,
     messages: &mut Vec<SolcStandardJsonOutputError>,
     optimizer_settings: revive_llvm_context::OptimizerSettings,
     debug_config: revive_llvm_context::DebugConfig,
@@ -129,40 +128,34 @@ pub fn standard_output<T: Compiler>(
     input_files: &[PathBuf],
     libraries: &[String],
     messages: &mut Vec<SolcStandardJsonOutputError>,
-    metadata_hash: Keccak256,
+    metadata_hash: MetadataHash,
     solc: &mut T,
     evm_version: Option<revive_common::EVMVersion>,
     solc_optimizer_enabled: bool,
     optimizer_settings: revive_llvm_context::OptimizerSettings,
     base_path: Option<String>,
     include_paths: Vec<String>,
     allow_paths: Option<String>,
-    remappings: Option<BTreeSet<String>>,
+    remappings: BTreeSet<String>,
     suppressed_warnings: Vec<ResolcWarning>,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
     memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let solc_version = solc.version()?;
-
-    let solc_input = SolcStandardJsonInput::try_from_solidity_paths(
+    let mut solc_input = SolcStandardJsonInput::try_from_solidity_paths(
         evm_version,
         input_files,
         libraries,
         remappings,
         SolcStandardJsonInputSettingsSelection::new_required(),
-        SolcStandardJsonInputSettingsOptimizer::new(
-            solc_optimizer_enabled,
-            None,
-            &solc_version.default,
-            optimizer_settings.is_fallback_to_size_enabled(),
-        ),
-        None,
+        SolcStandardJsonInputSettingsOptimizer::default(),
+        Default::default(),
         suppressed_warnings,
-        Some(SolcStandardJsonInputSettingsPolkaVM::new(
+        SolcStandardJsonInputSettingsPolkaVM::new(
             Some(memory_config),
             debug_config.emit_debug_info,
-        )),
+        ),
         false,
     )?;
     let mut solc_output = solc.standard_json(
@@ -178,9 +171,9 @@ pub fn standard_output<T: Compiler>(
     let linker_symbols = solc_input.settings.libraries.as_linker_symbols()?;
 
     let project = Project::try_from_standard_json_output(
-        solc_output,
+        &mut solc_output,
         solc_input.settings.libraries,
-        solc_version,
+        &solc_version,
         &debug_config,
     )?;
     solc_output.take_and_write_warnings();
@@ -210,14 +203,16 @@ pub fn standard_json<T: Compiler>(
     solc: &mut T,
     detect_missing_libraries: bool,
     messages: &mut Vec<SolcStandardJsonOutputError>,
-    metadata_hash: Keccak256,
+    metadata_hash: MetadataHash,
     json_path: Option<PathBuf>,
     base_path: Option<String>,
     include_paths: Vec<String>,
     allow_paths: Option<String>,
-    mut debug_config: revive_llvm_context::DebugConfig,
+    debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
+    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<()> {
+    let solc_version = solc.version()?;
     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();
@@ -247,9 +242,9 @@ pub fn standard_json<T: Compiler>(
     )?;
 
     let project = Project::try_from_standard_json_output(
-        solc_output,
+        &mut solc_output,
         solc_input.settings.libraries,
-        solc.version(),
+        &solc_version,
         &debug_config,
     )?;
     if solc_output.has_errors() {
@@ -258,7 +253,7 @@ pub fn standard_json<T: Compiler>(
 
     if detect_missing_libraries {
         let missing_libraries = project.get_missing_libraries(&deployed_libraries);
-        missing_libraries.write_to_standard_json(&mut solc_output, solc_version.as_ref());
+        missing_libraries.write_to_standard_json(&mut solc_output, &solc_version);
         solc_output.write_and_exit(prune_output);
     }
 
@@ -271,12 +266,12 @@ pub fn standard_json<T: Compiler>(
         memory_config,
     )?;
     if build.has_errors() {
-        build.write_to_standard_json(&mut solc_output, solc.version().as_ref())?;
+        build.write_to_standard_json(&mut solc_output, &solc_version)?;
         solc_output.write_and_exit(prune_output);
     }
 
     let build = build.link(linker_symbols);
-    build.write_to_standard_json(&mut solc_output, solc.version().as_ref())?;
+    build.write_to_standard_json(&mut solc_output, &solc_version)?;
     solc_output.write_and_exit(prune_output);
 }
 
@@ -286,15 +281,16 @@ pub fn combined_json<T: Compiler>(
     format: String,
     input_files: &[PathBuf],
     libraries: &[String],
-    metadata_hash: Keccak256,
+    messages: &mut Vec<SolcStandardJsonOutputError>,
+    metadata_hash: MetadataHash,
     solc: &mut T,
     evm_version: Option<revive_common::EVMVersion>,
     solc_optimizer_enabled: bool,
     optimizer_settings: revive_llvm_context::OptimizerSettings,
     base_path: Option<String>,
     include_paths: Vec<String>,
     allow_paths: Option<String>,
-    remappings: Option<BTreeSet<String>>,
+    remappings: BTreeSet<String>,
     suppressed_warnings: Vec<ResolcWarning>,
     debug_config: revive_llvm_context::DebugConfig,
     output_directory: Option<PathBuf>,
@@ -305,11 +301,12 @@ pub fn combined_json<T: Compiler>(
     let build = standard_output(
         input_files,
         libraries,
+        messages,
+        metadata_hash,
         solc,
         evm_version,
         solc_optimizer_enabled,
         optimizer_settings,
-        include_metadata_hash,
         base_path,
         include_paths,
         allow_paths,

crates/resolc/src/process/input.rs

@@ -4,7 +4,7 @@
 use std::collections::BTreeMap;
 use std::collections::BTreeSet;
 
-use revive_common::Keccak256;
+use revive_common::MetadataHash;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use serde::Deserialize;
 use serde::Serialize;
@@ -17,7 +17,7 @@ pub struct Input {
     /// The contract representation.
     pub contract: Contract,
     /// Whether to append the metadata hash.
-    pub metadata_hash: Keccak256,
+    pub metadata_hash: MetadataHash,
     /// The optimizer settings.
     pub optimizer_settings: revive_llvm_context::OptimizerSettings,
     /// The debug output config.
@@ -38,7 +38,7 @@ impl Input {
     /// A shortcut constructor.
     pub fn new(
         contract: Contract,
-        metadata_hash: Keccak256,
+        metadata_hash: MetadataHash,
         optimizer_settings: revive_llvm_context::OptimizerSettings,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: Vec<String>,

crates/resolc/src/process/mod.rs

@@ -25,23 +25,23 @@ pub trait Process {
         let input: Input = revive_common::deserialize_from_str(input_json.as_str())
             .map_err(|error| anyhow::anyhow!("Stdin parsing error: {error}"))?;
 
-        let source_location = SourceLocation::new(input.contract.identifier.path);
+        let source_location = SourceLocation::new(input.contract.identifier.path.to_owned());
 
         let result = std::thread::Builder::new()
             .stack_size(64 * 1024 * 1024)
             .spawn(move || {
                 input
                     .contract
                     .compile(
-                        input.identifier_paths,
-                        input.missing_libraries,
-                        input.factory_dependencies,
-                        input.metadata_hash_type,
-                        input.append_cbor,
+                        None,
                         input.optimizer_settings,
-                        input.llvm_options,
-                        input.output_assembly,
+                        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| {

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

@@ -8,6 +8,7 @@ use std::collections::BTreeSet;
 use std::collections::HashSet;
 
 use revive_common::Keccak256;
+use revive_common::MetadataHash;
 use revive_llvm_context::Optimizer;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use serde::Deserialize;
@@ -61,11 +62,10 @@ impl Contract {
     /// Compiles the specified contract, setting its build artifacts.
     pub fn compile(
         mut self,
-        project: Project,
         solc_version: Option<SolcVersion>,
         optimizer_settings: revive_llvm_context::OptimizerSettings,
-        include_metadata_hash: bool,
-        mut debug_config: revive_llvm_context::DebugConfig,
+        metadata_hash: MetadataHash,
+        debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: &[String],
         memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
         missing_libraries: BTreeSet<String>,
@@ -87,7 +87,11 @@ impl Contract {
         );
         let metadata_json = serde_json::to_value(&metadata).expect("Always valid");
         let metadata_json_bytes = serde_json::to_vec(&metadata_json).expect("Always valid");
-        let metadata_bytes = Keccak256::from_slice(&metadata_json_bytes).into();
+        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,
+        };
 
         let build = match self.ir {
             IR::Yul(mut yul) => {

crates/resolc/src/project/mod.rs

@@ -12,6 +12,7 @@ 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;
@@ -79,7 +80,7 @@ impl Project {
         self,
         messages: &mut Vec<SolcStandardJsonOutputError>,
         optimizer_settings: OptimizerSettings,
-        metadata_hash: Keccak256,
+        metadata_hash: MetadataHash,
         debug_config: DebugConfig,
         llvm_arguments: &[String],
         memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,

crates/resolc/src/solc/solc_compiler.rs

@@ -65,8 +65,6 @@ impl Compiler for SolcCompiler {
             command.arg(allow_paths);
         }
 
-        input.normalize();
-
         let input_json = serde_json::to_vec(&input).expect("Always valid");
 
         let process = command.spawn().map_err(|error| {

crates/resolc/src/solc/soljson_compiler.rs

@@ -41,8 +41,6 @@ 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");