feat: EVM dependencies

Author: hedgar2017

.gitmodules

@@ -1,10 +1,8 @@
 [submodule "llvm"]
 	path = llvm
 	url = https://github.com/matter-labs/era-compiler-llvm
-	branch = main
-	shallow = true
+	branch = evm-pushdeployaddress-new
 [submodule "era-solidity"]
 	path = era-solidity
 	url = https://github.com/matter-labs/era-solidity
-	branch = app-libsolc
-	shallow = true
+	branch = 0.8.29

Cargo.lock

@@ -13,7 +13,7 @@ pub struct Optimizer {
     pub mode: char,
     /// Whether to try to recompile with -Oz if the bytecode is too large.
     #[serde(default, skip_serializing)]
-    pub fallback_to_optimizing_for_size: bool,
+    pub size_fallback: bool,
 
     /// Enable the solc optimizer.
     /// Always `true` in order to allow library inlining.
@@ -31,10 +31,10 @@ impl Optimizer {
     ///
     /// A shortcut constructor.
     ///
-    pub fn new(mode: char, fallback_to_optimizing_for_size: bool) -> Self {
+    pub fn new(mode: char, size_fallback: bool) -> Self {
         Self {
             mode,
-            fallback_to_optimizing_for_size,
+            size_fallback,
 
             enabled: Self::default_enabled(),
         }

era-solidity

@@ -35,9 +35,7 @@ impl EVM {
     ///
     /// Sets the EVM and deploy and runtime bytecode.
     ///
-    pub fn modify_evm(&mut self, deploy_bytecode: String, runtime_bytecode: String) {
-        let mut bytecode = deploy_bytecode;
-        bytecode.push_str(runtime_bytecode.as_str());
+    pub fn modify_evm(&mut self, bytecode: String) {
         self.bytecode = Some(Bytecode::new(bytecode));
     }
 

llvm

@@ -11,3 +11,5 @@
 
 pub mod util;
 pub mod yul;
+
+pub use crate::yul::dependencies::Dependencies;

solx-solc/src/standard_json/input/settings/optimizer.rs

@@ -0,0 +1,42 @@
+//!
+//! Collection of Yul dependencies.
+//!
+
+///
+/// This structure represents an ordered dependency collection
+/// in the order they are encountered in Yul from the top to the bottom.
+///
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct Dependencies {
+    /// Top-level object identifier.
+    pub identifier: String,
+    /// List of EVM dependencies.
+    pub inner: Vec<String>,
+}
+
+impl Dependencies {
+    ///
+    /// Create a new instance of dependencies.
+    ///
+    pub fn new(identifier: &str) -> Self {
+        Self {
+            identifier: identifier.to_owned(),
+            inner: Vec::new(),
+        }
+    }
+
+    ///
+    /// Push a single dependency.
+    ///
+    pub fn push(&mut self, dependency: String, is_runtime_code: bool) {
+        if dependency == self.identifier || self.inner.contains(&dependency) {
+            return;
+        }
+
+        if is_runtime_code {
+            self.inner.insert(0, dependency);
+        } else {
+            self.inner.push(dependency);
+        }
+    }
+}

solx-solc/src/standard_json/output/contract/evm/mod.rs

@@ -2,6 +2,7 @@
 //! The Yul IR compiling tools.
 //!
 
+pub mod dependencies;
 pub mod error;
 pub mod lexer;
 pub mod parser;