Merge branch 'main' into fix-invalid-payload-tests

Author: mpaulucci

.github/workflows/pr-main_l2_contracts.yaml

@@ -24,6 +24,8 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
       - name: Install solc
         uses: pontem-network/get-solc@master
+        with:
+          version: v0.8.29
       - name: Caching
         uses: Swatinem/rust-cache@v2
       - name: Run test of deployer.rs

.github/workflows/pr-main_levm.yaml

@@ -322,6 +322,8 @@ jobs:
 
       - name: Install solc
         uses: pontem-network/get-solc@master
+        with:
+          version: v0.8.29
 
       - name: Run benchmarks
         run: |

.github/workflows/pr_perf_levm.yaml

@@ -35,6 +35,8 @@ jobs:
 
       - name: Install solc
         uses: pontem-network/get-solc@master
+        with:
+          version: v0.8.29
 
       - name: Run PR benchmarks
         run: |
@@ -89,6 +91,8 @@ jobs:
 
       - name: Install solc
         uses: pontem-network/get-solc@master
+        with:
+          version: v0.8.29
 
       - name: Run main benchmarks
         run: |

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ### 2025-04-11
 
+- Removed some unnecessary clones and made some functions const: [2438](https://github.com/lambdaclass/ethrex/pull/2438)
+
 - Asyncify some DB read APIs, as well as its users [#2430](https://github.com/lambdaclass/ethrex/pull/2430)
 
 ### 2025-04-09

README.md

@@ -205,7 +205,7 @@ Options:
 
 Node options:
       --network <GENESIS_FILE_PATH>
-          Alternatively, the name of a known network can be provided instead to use its preset genesis file and include its preset bootnodes. The networks currently supported include holesky, sepolia and hoodi.
+          Alternatively, the name of a known network can be provided instead to use its preset genesis file and include its preset bootnodes. The networks currently supported include holesky, sepolia, hoodi and mainnet.
 
       --datadir <DATABASE_DIRECTORY>
           If the datadir is the word `memory`, ethrex will use the `InMemory Engine`.
@@ -314,7 +314,7 @@ At a high level, the following new parts are added to the node:
 
 - [Rust (explained in L1 requirements section above)](#build)
 - [Docker](https://docs.docker.com/engine/install/) (with [Docker Compose](https://docs.docker.com/compose/install/))
-- [The Solidity Compiler](https://docs.soliditylang.org/en/latest/installing-solidity.html) (solc)
+- [The Solidity Compiler](https://docs.soliditylang.org/en/latest/installing-solidity.html) (solc v0.8.29)
 
 ## How to run
 

cmd/ethrex/cli.rs

@@ -36,8 +36,9 @@ pub struct Options {
         long = "network",
         value_name = "GENESIS_FILE_PATH",
         help = "Receives a `Genesis` struct in json format. This is the only argument which is required. You can look at some example genesis files at `test_data/genesis*`.",
-        long_help = "Alternatively, the name of a known network can be provided instead to use its preset genesis file and include its preset bootnodes. The networks currently supported include holesky, sepolia and hoodi.",
-        help_heading = "Node options"
+        long_help = "Alternatively, the name of a known network can be provided instead to use its preset genesis file and include its preset bootnodes. The networks currently supported include holesky, sepolia, hoodi and mainnet.",
+        help_heading = "Node options",
+        env = "ETHREX_NETWORK"
     )]
     pub network: Option<String>,
     #[arg(long = "bootnodes", value_parser = clap::value_parser!(Node), value_name = "BOOTNODE_LIST", value_delimiter = ',', num_args = 1.., help = "Comma separated enode URLs for P2P discovery bootstrap.", help_heading = "P2P options")]
@@ -49,7 +50,8 @@ pub struct Options {
         default_value = DEFAULT_DATADIR,
         help = "Receives the name of the directory where the Database is located.",
         long_help = "If the datadir is the word `memory`, ethrex will use the `InMemory Engine`.",
-        help_heading = "Node options"
+        help_heading = "Node options",
+        env = "ETHREX_DATADIR"
     )]
     pub datadir: String,
     #[arg(
@@ -73,7 +75,8 @@ pub struct Options {
         long = "metrics.port",
         value_name = "PROMETHEUS_METRICS_PORT",
         default_value = "9090", // Default Prometheus port (https://prometheus.io/docs/tutorials/getting_started/#show-me-how-it-is-done).
-        help_heading = "Node options"
+        help_heading = "Node options",
+        env = "ETHREX_METRICS_PORT"
     )]
     pub metrics_port: String,
     #[arg(
@@ -90,25 +93,33 @@ pub struct Options {
         value_name = "EVM_BACKEND",
         help = "Has to be `levm` or `revm`",
         value_parser = utils::parse_evm_engine,
-        help_heading = "Node options"
-    )]
+        help_heading = "Node options",
+        env = "ETHREX_EVM")]
     pub evm: EvmEngine,
-    #[arg(long = "log.level", default_value_t = Level::INFO, value_name = "LOG_LEVEL", help = "The verbosity level used for logs.", long_help = "Possible values: info, debug, trace, warn, error",help_heading = "Node options")]
+    #[arg(
+        long = "log.level",
+        default_value_t = Level::INFO,
+        value_name = "LOG_LEVEL",
+        help = "The verbosity level used for logs.",
+        long_help = "Possible values: info, debug, trace, warn, error",
+        help_heading = "Node options")]
     pub log_level: Level,
     #[arg(
         long = "http.addr",
         default_value = "localhost",
         value_name = "ADDRESS",
         help = "Listening address for the http rpc server.",
-        help_heading = "RPC options"
+        help_heading = "RPC options",
+        env = "ETHREX_HTTP_ADDR"
     )]
     pub http_addr: String,
     #[arg(
         long = "http.port",
         default_value = "8545",
         value_name = "PORT",
         help = "Listening port for the http rpc server.",
-        help_heading = "RPC options"
+        help_heading = "RPC options",
+        env = "ETHREX_HTTP_PORT"
     )]
     pub http_port: String,
     #[arg(

cmd/ethrex/initializers.rs

@@ -257,6 +257,9 @@ pub fn get_network(opts: &Options) -> String {
     if network == "hoodi" {
         network = String::from(networks::HOODI_GENESIS_PATH);
     }
+    if network == "mainnet" {
+        network = String::from(networks::MAINNET_GENESIS_PATH);
+    }
 
     network
 }
@@ -280,6 +283,11 @@ pub fn get_bootnodes(opts: &Options, network: &str, data_dir: &str) -> Vec<Node>
         bootnodes.extend(networks::HOODI_BOOTNODES.iter());
     }
 
+    if network == networks::MAINNET_GENESIS_PATH {
+        info!("Adding mainnet preset bootnodes");
+        bootnodes.extend(networks::MAINNET_BOOTNODES.iter());
+    }
+
     if bootnodes.is_empty() {
         warn!("No bootnodes specified. This node will not be able to connect to the network.");
     }

cmd/ethrex/networks.rs

@@ -10,6 +10,9 @@ const SEPOLIA_BOOTNODES_PATH: &str = "cmd/ethrex/networks/sepolia/bootnodes.json
 pub const HOODI_GENESIS_PATH: &str = "cmd/ethrex/networks/hoodi/genesis.json";
 const HOODI_BOOTNODES_PATH: &str = "cmd/ethrex/networks/hoodi/bootnodes.json";
 
+pub const MAINNET_GENESIS_PATH: &str = "cmd/ethrex/networks/mainnet/genesis.json";
+const MAINNET_BOOTNODES_PATH: &str = "cmd/ethrex/networks/mainnet/bootnodes.json";
+
 lazy_static! {
     pub static ref HOLESKY_BOOTNODES: Vec<Node> = serde_json::from_reader(
         std::fs::File::open(HOLESKY_BOOTNODES_PATH).expect("Failed to open holesky bootnodes file")
@@ -23,4 +26,8 @@ lazy_static! {
         std::fs::File::open(HOODI_BOOTNODES_PATH).expect("Failed to open hoodi bootnodes file")
     )
     .expect("Failed to parse hoodi bootnodes file");
+    pub static ref MAINNET_BOOTNODES: Vec<Node> = serde_json::from_reader(
+        std::fs::File::open(MAINNET_BOOTNODES_PATH).expect("Failed to open mainnet bootnodes file")
+    )
+    .expect("Failed to parse mainnet bootnodes file");
 }

cmd/ethrex/networks/mainnet/bootnodes.json

@@ -0,0 +1,6 @@
+[
+    "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303",
+    "enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303",
+    "enode://2b252ab6a1d0f971d9722cb839a42cb81db019ba44c08754628ab4a823487071b5695317c8ccd085219c3a03af063495b2f1da8d18218da2d6a82981b45e6ffc@65.108.70.101:30303",
+    "enode://4aeb4ab6c14b23e2c4cfdce879c04b0748a20d8e9b59e25ded2a08143e265c6c25936e74cbc8e641e3312ca288673d91f2f93f8e277de3cfa444ecdaaf982052@157.90.35.166:30303"
+]