refactor(l2): replace sequencer config toml with CLI flags

.github/workflows/main_prover.yaml

@@ -69,11 +69,9 @@ jobs:
           cp configs/prover_client_config_example.toml configs/prover_client_config.toml
           cp configs/sequencer_config_example.toml configs/sequencer_config.toml
 
-          sed -i 's/sp1_deploy_verifier = false/sp1_deploy_verifier = true/' configs/sequencer_config.toml
-          sed -i 's/block_time_ms = 5000/block_time_ms = 12000/' configs/sequencer_config.toml
-          sed -i 's/listen_ip = "127.0.0.1"/listen_ip = "0.0.0.0"/' configs/sequencer_config.toml
-          sed -i 's/dev_mode = true/dev_mode = false/' configs/sequencer_config.toml
-
+          ETHREX_PROOF_COORDINATOR_DEV_MODE=false \
+          ETHREX_PROPOSER_BLOCK_TIME_MS=12000 \
+          ETHREX_DEPLOYER_PICO_DEPLOY_VERIFIER=true \
           make integration-test-gpu
 
       - name: Ensure admin permissions in _work

.github/workflows/pr-main_l2.yaml

@@ -123,16 +123,28 @@ jobs:
         run: |
           cargo test l2 --no-run --release
 
-      - name: Run test
+      - name: Deploy L1 Contracts
         run: |
           cd crates/l2
           cp configs/prover_client_config_example.toml configs/prover_client_config.toml
           cp configs/sequencer_config_example.toml configs/sequencer_config.toml
-          sed -i 's/listen_ip = "127.0.0.1"/listen_ip = "0.0.0.0"/' configs/sequencer_config.toml
-          if [ "${{ matrix.validium }}" = "true" ]; then
-            sed -i.bak 's/^validium = false$/validium = true/' configs/sequencer_config.toml && rm configs/sequencer_config.toml.bak
-          fi
-          make integration-test
+          touch .env
+          CI_ETHREX_WORKDIR=/usr/local/bin docker compose -f docker-compose-l2.yaml up --detach contract_deployer
+
+      - name: Start Sequencer
+        run: |
+          sleep 30
+          cd crates/l2
+          CI_ETHREX_WORKDIR=/usr/local/bin \
+          ETHREX_COMMITTER_VALIDIUM=${{ matrix.validium }} \
+          docker compose -f docker-compose-l2.yaml up --detach ethrex_l2
+
+      - name: Run test
+        run: |
+          cd crates/l2
+          RUST_LOG=info,ethrex_prover_lib=debug make init-prover &
+          PROPOSER_COINBASE_ADDRESS=0x0007a881CD95B1484fca47615B64803dad620C8d cargo test l2 --release -- --nocapture --test-threads=1
+          killall ethrex_prover
 
   state-diff-test:
     name: State Reconstruction Tests
@@ -173,13 +185,18 @@ jobs:
           sudo add-apt-repository ppa:ethereum/ethereum
           sudo apt-get update && sudo apt-get -y install solc
 
+      - name: Deploy L1 Contracts
+        run: |
+          cd crates/l2
+          cp configs/prover_client_config_example.toml configs/prover_client_config.toml
+          touch .env
+          CI_ETHREX_WORKDIR=/usr/local/bin docker compose -f docker-compose-l2.yaml up --detach contract_deployer
+
       - name: Run tests
         run: |
           cd crates/l2
           cp configs/prover_client_config_example.toml configs/prover_client_config.toml
           cp configs/sequencer_config_example.toml configs/sequencer_config.toml
-          sed -i 's/listen_ip = "127.0.0.1"/listen_ip = "0.0.0.0"/' configs/sequencer_config.toml
-
           make state-diff-test
 
   # The purpose of this job is to add it as a required check in GitHub so that we don't have to add every individual job as a required check

cmd/ethrex/initializers.rs

@@ -35,7 +35,6 @@ use crate::l2::L2Options;
 #[cfg(feature = "l2")]
 use ::{
     ethrex_common::Address,
-    ethrex_l2::utils::config::{read_env_file_by_config, ConfigMode},
     ethrex_storage_rollup::{EngineTypeRollup, StoreRollup},
     secp256k1::SecretKey,
 };
@@ -424,15 +423,5 @@ pub fn get_sponsor_pk(opts: &L2Options) -> SecretKey {
     if let Some(pk) = opts.sponsor_private_key {
         return pk;
     }
-
-    warn!("Sponsor private key not provided. Trying to read from the .env file.");
-
-    if let Err(e) = read_env_file_by_config(ConfigMode::Sequencer) {
-        panic!("Failed to read .env file: {e}");
-    }
-    let pk = std::env::var("L1_WATCHER_L2_PROPOSER_PRIVATE_KEY").unwrap_or_default();
-    pk.strip_prefix("0x")
-        .unwrap_or(&pk)
-        .parse::<SecretKey>()
-        .expect("Failed to parse a secret key to sponsor transactions")
+    opts.sequencer_opts.watcher_opts.l2_proposer_private_key
 }

cmd/ethrex/l2.rs → cmd/ethrex/l2/command.rs

@@ -1,14 +1,16 @@
 use crate::{
-    cli::{self as ethrex_cli, Options},
+    cli::{self as ethrex_cli, Options as NodeOptions},
     initializers::{
         get_local_p2p_node, get_network, get_signer, init_blockchain, init_metrics, init_network,
         init_rollup_store, init_rpc_api, init_store,
     },
-    utils::{self, set_datadir, store_known_peers},
+    l2::options::Options,
+    utils::{set_datadir, store_known_peers},
     DEFAULT_L2_DATADIR,
 };
-use clap::{Parser, Subcommand};
+use clap::Subcommand;
 use ethrex_common::{Address, U256};
+use ethrex_l2::SequencerConfig;
 use ethrex_p2p::network::peer_table;
 use ethrex_rpc::{
     clients::{beacon::BeaconClient, eth::BlockByNumber},
@@ -17,7 +19,6 @@ use ethrex_rpc::{
 use eyre::OptionExt;
 use keccak_hash::keccak;
 use reqwest::Url;
-use secp256k1::SecretKey;
 use std::{fs::create_dir_all, future::IntoFuture, path::PathBuf, time::Duration};
 use tokio_util::task::TaskTracker;
 use tracing::info;
@@ -28,7 +29,7 @@ pub enum Command {
     #[clap(about = "Initialize an ethrex L2 node", visible_alias = "i")]
     Init {
         #[command(flatten)]
-        opts: L2Options,
+        opts: Options,
     },
     #[clap(name = "removedb", about = "Remove the database", visible_aliases = ["rm", "clean"])]
     RemoveDB {
@@ -54,68 +55,6 @@ pub enum Command {
     },
 }
 
-#[derive(Parser, Default)]
-pub struct L2Options {
-    #[command(flatten)]
-    pub node_opts: Options,
-    #[arg(
-        long = "sponsorable-addresses",
-        value_name = "SPONSORABLE_ADDRESSES_PATH",
-        help = "Path to a file containing addresses of contracts to which ethrex_SendTransaction should sponsor txs",
-        help_heading = "L2 options"
-    )]
-    pub sponsorable_addresses_file_path: Option<String>,
-    #[arg(long, value_parser = utils::parse_private_key, env = "SPONSOR_PRIVATE_KEY", help = "The private key of ethrex L2 transactions sponsor.", help_heading = "L2 options")]
-    pub sponsor_private_key: Option<SecretKey>,
-    #[cfg(feature = "based")]
-    #[command(flatten)]
-    pub based_opts: BasedOptions,
-}
-
-#[cfg(feature = "based")]
-#[derive(Parser, Default)]
-pub struct BasedOptions {
-    #[arg(
-        long = "gateway.addr",
-        default_value = "0.0.0.0",
-        value_name = "GATEWAY_ADDRESS",
-        env = "GATEWAY_ADDRESS",
-        help_heading = "Based options"
-    )]
-    pub gateway_addr: String,
-    #[arg(
-        long = "gateway.eth_port",
-        default_value = "8546",
-        value_name = "GATEWAY_ETH_PORT",
-        env = "GATEWAY_ETH_PORT",
-        help_heading = "Based options"
-    )]
-    pub gateway_eth_port: String,
-    #[arg(
-        long = "gateway.auth_port",
-        default_value = "8553",
-        value_name = "GATEWAY_AUTH_PORT",
-        env = "GATEWAY_AUTH_PORT",
-        help_heading = "Based options"
-    )]
-    pub gateway_auth_port: String,
-    #[arg(
-        long = "gateway.jwtsecret",
-        default_value = "jwt.hex",
-        value_name = "GATEWAY_JWTSECRET_PATH",
-        env = "GATEWAY_JWTSECRET_PATH",
-        help_heading = "Based options"
-    )]
-    pub gateway_jwtsecret: String,
-    #[arg(
-        long = "gateway.pubkey",
-        value_name = "GATEWAY_PUBKEY",
-        env = "GATEWAY_PUBKEY",
-        help_heading = "Based options"
-    )]
-    pub gateway_pubkey: String,
-}
-
 impl Command {
     pub async fn run(self) -> eyre::Result<()> {
         match self {
@@ -177,8 +116,11 @@ impl Command {
                     info!("P2P is disabled");
                 }
 
+                let l2_sequencer_cfg = SequencerConfig::from(opts.sequencer_opts);
+
                 let l2_sequencer =
-                    ethrex_l2::start_l2(store, rollup_store, blockchain).into_future();
+                    ethrex_l2::start_l2(store, rollup_store, blockchain, l2_sequencer_cfg)
+                        .into_future();
 
                 tracker.spawn(l2_sequencer);
 
@@ -197,7 +139,7 @@ impl Command {
             Self::RemoveDB { datadir, force } => {
                 Box::pin(async {
                     ethrex_cli::Subcommand::RemoveDB { datadir, force }
-                        .run(&Options::default()) // This is not used by the RemoveDB command.
+                        .run(&NodeOptions::default()) // This is not used by the RemoveDB command.
                         .await
                 })
                 .await?

cmd/ethrex/l2/mod.rs

@@ -0,0 +1,10 @@
+pub mod command;
+pub mod options;
+
+pub use command::Command;
+#[cfg(feature = "based")]
+pub use options::BasedOptions;
+pub use options::{
+    CommitterOptions, DeployerOptions, EthOptions, Options as L2Options, ProofCoordinatorOptions,
+    ProposerOptions, SequencerOptions, WatcherOptions,
+};