refactor(core): remove l2 feature from cmd/ethrex achieving a single binary for both L1 and L2

cmd/ethrex/Cargo.toml

@@ -14,11 +14,11 @@ ethrex-p2p.workspace = true
 ethrex-storage.workspace = true
 ethrex-vm.workspace = true
 ethrex-rlp.workspace = true
-ethrex-storage-rollup = { workspace = true, optional = true }
-ethrex-l2 = { workspace = true, optional = true }
-ethrex-l2-common = { workspace = true, optional = true }
-ethrex-sdk = { workspace = true, optional = true }
-ethrex-l2-rpc = { workspace = true, optional = true }
+ethrex-storage-rollup.workspace = true
+ethrex-l2.workspace = true
+ethrex-l2-common.workspace = true
+ethrex-sdk.workspace = true
+ethrex-l2-rpc.workspace = true
 
 bytes.workspace = true
 hex.workspace = true
@@ -66,17 +66,10 @@ c-kzg = [
   "ethrex-blockchain/c-kzg",
   "ethrex-p2p/c-kzg",
 ]
-metrics = ["ethrex-blockchain/metrics", "ethrex-l2?/metrics"]
-libmdbx = ["ethrex-storage/libmdbx", "ethrex-storage-rollup?/libmdbx"]
+metrics = ["ethrex-blockchain/metrics", "ethrex-l2/metrics"]
+libmdbx = ["ethrex-storage/libmdbx", "ethrex-storage-rollup/libmdbx"]
 redb = ["dep:redb", "ethrex-storage/redb"]
 blst = ["ethrex-vm/blst"]
-l2 = [
-  "dep:ethrex-l2",
-  "dep:ethrex-l2-common",
-  "dep:ethrex-sdk",
-  "dep:ethrex-l2-rpc",
-  "ethrex-storage-rollup",
-]
 rollup_storage_libmdbx = ["ethrex-storage-rollup/libmdbx"]
 rollup_storage_redb = ["ethrex-storage-rollup/redb"]
 rollup_storage_sql = ["ethrex-storage-rollup/sql"]

cmd/ethrex/cli.rs

@@ -17,13 +17,11 @@ use tracing::{Level, info, warn};
 use crate::{
     DEFAULT_DATADIR,
     initializers::{init_blockchain, init_store, open_store},
+    l2,
     networks::{Network, PublicNetwork},
     utils::{self, get_client_version, set_datadir},
 };
 
-#[cfg(feature = "l2")]
-use crate::l2;
-
 #[allow(clippy::upper_case_acronyms)]
 #[derive(ClapParser)]
 #[command(name="ethrex", author = "Lambdaclass", version=get_client_version(), about = "ethrex Execution client")]
@@ -159,7 +157,7 @@ pub struct Options {
         help_heading = "RPC options"
     )]
     pub authrpc_jwtsecret: String,
-    #[arg(long = "p2p.enabled", default_value = if cfg!(feature = "l2") { "false" } else { "true" }, value_name = "P2P_ENABLED", action = ArgAction::SetTrue, help_heading = "P2P options")]
+    #[arg(long = "p2p.enabled", default_value = "true", value_name = "P2P_ENABLED", action = ArgAction::SetTrue, help_heading = "P2P options")]
     pub p2p_enabled: bool,
     #[arg(
         long = "p2p.addr",
@@ -281,7 +279,6 @@ pub enum Subcommand {
         )]
         genesis_path: PathBuf,
     },
-    #[cfg(feature = "l2")]
     #[command(subcommand)]
     L2(l2::Command),
 }
@@ -322,7 +319,6 @@ impl Subcommand {
                 let state_root = genesis.compute_state_root();
                 println!("{state_root:#x}");
             }
-            #[cfg(feature = "l2")]
             Subcommand::L2(command) => command.run().await?,
         }
         Ok(())

cmd/ethrex/l2/command.rs

@@ -175,7 +175,11 @@ impl Command {
                     l2::initializers::init_metrics(&opts.node_opts, tracker.clone());
                 }
 
-                if opts.node_opts.p2p_enabled {
+                // TODO: This should be handled differently, the current problem
+                // with using opts.node_opts.p2p_enabled is that with the removal
+                // of the l2 feature flag, p2p_enabled is set to true by default
+                // prioritizing the L1 UX.
+                if opts.sequencer_opts.based {
                     init_network(
                         &opts.node_opts,
                         &network,

cmd/ethrex/lib.rs

@@ -1,10 +1,7 @@
-pub mod initializers;
-pub mod utils;
-
 pub mod cli;
-
-#[cfg(feature = "l2")]
+pub mod initializers;
 pub mod l2;
+pub mod utils;
 
 mod decode;
 pub mod networks;

cmd/ethrex/utils.rs

@@ -10,7 +10,6 @@ use ethrex_p2p::{
 use ethrex_rlp::decode::RLPDecode;
 use ethrex_vm::EvmEngine;
 use hex::FromHexError;
-#[cfg(feature = "l2")]
 use secp256k1::SecretKey;
 use serde::{Deserialize, Serialize};
 use std::{
@@ -139,7 +138,6 @@ pub fn read_node_config_file(file_path: PathBuf) -> Result<NodeConfigFile, Strin
     }
 }
 
-#[cfg(feature = "l2")]
 pub fn parse_private_key(s: &str) -> eyre::Result<SecretKey> {
     Ok(SecretKey::from_slice(&parse_hex(s)?)?)
 }

crates/l2/Dockerfile

@@ -22,7 +22,7 @@ COPY --from=planner /ethrex/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
 
 COPY . .
-RUN cargo build --release --features "l2,rollup_storage_libmdbx"
+RUN cargo build --release --features "rollup_storage_libmdbx"
 
 FROM ubuntu:24.04
 ENV CI_ETHREX_WORKDIR=$CI_ETHREX_WORKDIR

crates/l2/Makefile

@@ -133,7 +133,7 @@ DEFAULT_ON_CHAIN_PROPOSER_ADDRESS=$$(grep ETHREX_COMMITTER_ON_CHAIN_PROPOSER_ADD
 init-l2-no-metrics: ## 🚀 Initializes an L2 Lambda ethrex Client
 	export $(shell cat .env | xargs); \
 	ETHREX_PROOF_COORDINATOR_DEV_MODE=${ETHREX_PROOF_COORDINATOR_DEV_MODE} \
-	cargo run --release --manifest-path ../../Cargo.toml --bin ethrex --features "l2,rollup_storage_sql,metrics" -- \
+	cargo run --release --manifest-path ../../Cargo.toml --bin ethrex --features "rollup_storage_sql,metrics" -- \
 	l2 init \
 	--watcher.block-delay 0 \
 	--network ${L2_GENESIS_FILE_PATH} \
@@ -230,7 +230,7 @@ integration-test-gpu: rm-db-l2 rm-db-l1
 # State reconstruction tests
 state-diff-test:
 	touch .env
-	cargo run --release --manifest-path ../../cmd/ethrex/Cargo.toml --features l2 --bin ethrex -- \
+	cargo run --release --manifest-path ../../cmd/ethrex/Cargo.toml --bin ethrex -- \
 	l2 reconstruct \
 	-g ../../fixtures/genesis/l2.json \
 	-b ../../fixtures/blobs/ \

crates/l2/tee/quote-gen/Cargo.toml

@@ -34,7 +34,6 @@ secp256k1 = { version = "0.29.1", default-features = false, features = [
 [build-dependencies]
 vergen-git2 = { version = "1.0.7" }
 
-
 [workspace]
 
 [features]

docs/l1/dev-setup-l1.md

@@ -122,14 +122,14 @@ make localnet-assertoor-blob
 
 Those are two different set of assertoor checks the details are as follows:
 
-*assertoor-tx*
+_assertoor-tx_
 
 - [eoa-transaction-test](https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/stable/eoa-transactions-test.yaml)
 
-*assertoor-blob*
+_assertoor-blob_
 
 - [blob-transaction-test](https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/master/playbooks/stable/blob-transactions-test.yaml)
-- *Custom* [el-stability-check](https://raw.githubusercontent.com/lambdaclass/ethrex/refs/heads/main/.github/config/assertoor/el-stability-check.yaml)
+- _Custom_ [el-stability-check](https://raw.githubusercontent.com/lambdaclass/ethrex/refs/heads/main/.github/config/assertoor/el-stability-check.yaml)
 
 For reference on each individual check see the [assertoor-wiki](https://github.com/ethpandaops/assertoor/wiki#supported-tasks-in-assertoor)
 
@@ -158,6 +158,7 @@ Commands:
   import    Import blocks to the database
   export    Export blocks in the current chain into a file in rlp encoding
   compute-state-root  Compute the state root from a genesis file
+  l2
   help                Print this message or the help of the given subcommand(s)
 
 Options: