Merge remote-tracking branch 'origin/main' into resolc.js

crates/solidity/src/solc/combined_json/mod.rs

@@ -28,7 +28,7 @@ pub struct CombinedJson {
     pub version: String,
     /// The `resolc` compiler version.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub zk_version: Option<String>,
+    pub revive_version: Option<String>,
 }
 
 impl CombinedJson {

crates/solidity/src/solc/mod.rs

@@ -37,7 +37,7 @@ impl Compiler {
     pub const FIRST_VIA_IR_VERSION: semver::Version = semver::Version::new(0, 8, 13);
 
     /// The last supported version of `solc`.
-    pub const LAST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 26);
+    pub const LAST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 28);
 
     /// A shortcut constructor.
     /// Different tools may use different `executable` names. For example, the integration tester
@@ -129,7 +129,6 @@ impl Compiler {
                 )
             })?;
         output.preprocess_ast(&version, pipeline, suppressed_warnings.as_slice())?;
-        output.remove_evm();
 
         Ok(output)
     }

crates/solidity/src/solc/pipeline.rs

@@ -1,10 +1,12 @@
 //! The Solidity compiler pipeline type.
 
-use crate::compiler;
-use crate::compiler::version::Version as SolcVersion;
+use serde::{Deserialize, Serialize};
+
+use crate::solc::version::Version as SolcVersion;
+use crate::solc::Compiler as SolcCompiler;
 
 /// The Solidity compiler pipeline type.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[allow(non_camel_case_types)]
 #[allow(clippy::upper_case_acronyms)]
 pub enum Pipeline {

crates/solidity/src/solc/standard_json/input/settings/optimizer/mod.rs

@@ -22,9 +22,6 @@ pub struct Optimizer {
     /// Whether to try to recompile with -Oz if the bytecode is too large.
     #[serde(skip_serializing)]
     pub fallback_to_optimizing_for_size: Option<bool>,
-    /// Whether to disable the system request memoization.
-    #[serde(skip_serializing)]
-    pub disable_system_request_memoization: Option<bool>,
 }
 
 impl Optimizer {
@@ -34,14 +31,12 @@ impl Optimizer {
         mode: Option<char>,
         version: &semver::Version,
         fallback_to_optimizing_for_size: bool,
-        disable_system_request_memoization: bool,
     ) -> Self {
         Self {
             enabled,
             mode,
             details: Some(Details::disabled(version)),
             fallback_to_optimizing_for_size: Some(fallback_to_optimizing_for_size),
-            disable_system_request_memoization: Some(disable_system_request_memoization),
         }
     }
 
@@ -66,9 +61,6 @@ impl TryFrom<&Optimizer> for revive_llvm_context::OptimizerSettings {
         if value.fallback_to_optimizing_for_size.unwrap_or_default() {
             result.enable_fallback_to_size();
         }
-        if value.disable_system_request_memoization.unwrap_or_default() {
-            result.disable_system_request_memoization();
-        }
         Ok(result)
     }
 }

crates/solidity/src/solc/standard_json/input/settings/selection/file/flag.rs

@@ -37,8 +37,13 @@ pub enum Flag {
     /// The EVM legacy assembly JSON.
     #[serde(rename = "evm.legacyAssembly")]
     EVMLA,
+    #[serde(rename = "evm.bytecode")]
+    EVMBC,
     #[serde(rename = "evm.deployedBytecode")]
     EVMDBC,
+    /// The assembly code
+    #[serde(rename = "evm.assembly")]
+    Assembly,
 }
 
 impl From<SolcPipeline> for Flag {
@@ -62,7 +67,9 @@ impl std::fmt::Display for Flag {
             Self::AST => write!(f, "ast"),
             Self::Yul => write!(f, "irOptimized"),
             Self::EVMLA => write!(f, "evm.legacyAssembly"),
+            Self::EVMBC => write!(f, "evm.bytecode"),
             Self::EVMDBC => write!(f, "evm.deployedBytecode"),
+            Self::Assembly => write!(f, "evm.assembly"),
         }
     }
 }

crates/solidity/src/solc/standard_json/input/settings/selection/file/mod.rs

@@ -28,6 +28,7 @@ impl File {
         Self {
             per_file: Some(HashSet::from_iter([SelectionFlag::AST])),
             per_contract: Some(HashSet::from_iter([
+                SelectionFlag::EVMBC,
                 SelectionFlag::EVMDBC,
                 SelectionFlag::MethodIdentifiers,
                 SelectionFlag::Metadata,

crates/solidity/src/solc/standard_json/output/contract/evm/mod.rs

@@ -20,15 +20,19 @@ use self::extra_metadata::ExtraMetadata;
 #[serde(rename_all = "camelCase")]
 pub struct EVM {
     /// The contract EVM legacy assembly code.
-    #[serde(rename = "legacyAssembly")]
+    #[serde(rename = "legacyAssembly", skip_serializing_if = "Option::is_none")]
     pub assembly: Option<Assembly>,
     /// The contract PolkaVM assembly code.
-    #[serde(rename = "assembly")]
+    #[serde(rename = "assembly", skip_serializing_if = "Option::is_none")]
     pub assembly_text: Option<String>,
     /// The contract bytecode.
     /// Is reset by that of PolkaVM before yielding the compiled project artifacts.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub bytecode: Option<Bytecode>,
-    /// The contract deployed bytecode.
+    /// The deployed bytecode of the contract.
+    /// It is overwritten with the PolkaVM blob before yielding the compiled project artifacts.
+    /// Hence it will be the same as the runtime code but we keep both for compatibility reasons.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub deployed_bytecode: Option<DeployedBytecode>,
     /// The contract function signatures.
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -42,6 +46,7 @@ impl EVM {
     /// Sets the PolkaVM assembly and bytecode.
     pub fn modify(&mut self, assembly_text: String, bytecode: String) {
         self.assembly_text = Some(assembly_text);
-        self.bytecode = Some(Bytecode::new(bytecode));
+        self.bytecode = Some(Bytecode::new(bytecode.clone()));
+        self.deployed_bytecode = Some(DeployedBytecode::new(bytecode));
     }
 }

crates/solidity/src/solc/standard_json/output/mod.rs

@@ -45,7 +45,7 @@ pub struct Output {
     pub long_version: Option<String>,
     /// The `resolc` compiler version.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub zk_version: Option<String>,
+    pub revive_version: Option<String>,
 }
 
 impl Output {
@@ -138,19 +138,6 @@ impl Output {
         ))
     }
 
-    /// Removes EVM artifacts to prevent their accidental usage.
-    pub fn remove_evm(&mut self) {
-        if let Some(files) = self.contracts.as_mut() {
-            for (_, file) in files.iter_mut() {
-                for (_, contract) in file.iter_mut() {
-                    if let Some(evm) = contract.evm.as_mut() {
-                        evm.bytecode = None;
-                    }
-                }
-            }
-        }
-    }
-
     /// Traverses the AST and returns the list of additional errors and warnings.
     pub fn preprocess_ast(
         &mut self,