feat(l2): pay base fee to fee vault

.github/workflows/main_prover.yaml

@@ -79,6 +79,7 @@ jobs:
           ETHREX_PROPOSER_BLOCK_TIME=12000 \
           ETHREX_COMMITTER_COMMIT_TIME=30000 \
           ETHREX_WATCHER_WATCH_INTERVAL=1000 \
+          ETHREX_BLOCK_PRODUCER_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127 \
           docker compose up --build --detach --no-deps ethrex_l2
 
       - name: Copy env to host

.github/workflows/pr-main_l2.yaml

@@ -169,6 +169,7 @@ jobs:
           ETHREX_WATCHER_BLOCK_DELAY=0 \
           ETHREX_COMMITTER_COMMIT_TIME=15000 \
           ETHREX_WATCHER_WATCH_INTERVAL=1000 \
+          ETHREX_BLOCK_PRODUCER_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127 \
           docker compose -f ${{ join(matrix.compose_targets, ' -f ') }} up --detach --no-deps ethrex_l2
 
       - name: Run test
@@ -275,7 +276,9 @@ jobs:
           cd crates/l2
           RUST_LOG=info,ethrex_prover_lib=debug make init-prover &
           docker logs --follow ethrex_l2 &
-          PROPOSER_COINBASE_ADDRESS=0x0007a881CD95B1484fca47615B64803dad620C8d cargo test l2 --release -- --nocapture --test-threads=1
+          PROPOSER_COINBASE_ADDRESS=0x0007a881CD95B1484fca47615B64803dad620C8d \
+          INTEGRATION_TEST_SKIP_FEE_VAULT_CHECK=true \
+          cargo test l2 --release -- --nocapture --test-threads=1
           killall ethrex -s SIGINT
 
   integration-test-tdx:
@@ -352,6 +355,7 @@ jobs:
           ETHREX_WATCHER_WATCH_INTERVAL=1000 \
           DOCKER_ETHREX_WORKDIR=/usr/local/bin \
           ETHREX_COMMITTER_COMMIT_TIME=15000 \
+          ETHREX_BLOCK_PRODUCER_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127 \
           ETHREX_PROOF_COORDINATOR_ADDRESS=0.0.0.0 \
           docker compose -f docker-compose.yaml -f docker-compose-l2-tdx.yaml up --detach --no-deps ethrex_l2
 

cmd/ethrex/cli.rs

@@ -7,7 +7,7 @@ use std::{
 
 use clap::{ArgAction, Parser as ClapParser, Subcommand as ClapSubcommand};
 use ethrex_blockchain::{BlockchainOptions, BlockchainType, error::ChainError};
-use ethrex_common::types::{Block, Genesis};
+use ethrex_common::types::{Block, Genesis, fee_config::FeeConfig};
 use ethrex_p2p::sync::SyncMode;
 use ethrex_p2p::types::Node;
 use ethrex_rlp::encode::RLPEncode;
@@ -336,7 +336,7 @@ impl Subcommand {
                 let network = get_network(opts);
                 let genesis = network.get_genesis()?;
                 let blockchain_type = if l2 {
-                    BlockchainType::L2
+                    BlockchainType::L2(FeeConfig::default())
                 } else {
                     BlockchainType::L1
                 };

cmd/ethrex/l2/initializers.rs

@@ -8,6 +8,7 @@ use crate::utils::{
     NodeConfigFile, get_client_version, init_datadir, read_jwtsecret_file, store_node_config_file,
 };
 use ethrex_blockchain::{Blockchain, BlockchainType};
+use ethrex_common::types::fee_config::FeeConfig;
 use ethrex_common::{Address, types::DEFAULT_BUILDER_GAS_CEIL};
 use ethrex_l2::SequencerConfig;
 use ethrex_p2p::{
@@ -155,9 +156,14 @@ pub async fn init_l2(
     let store = init_store(&datadir, genesis).await;
     let rollup_store = init_rollup_store(&rollup_store_dir).await;
 
+    let fee_config = FeeConfig {
+        fee_vault: opts.sequencer_opts.block_producer_opts.fee_vault_address,
+        ..Default::default()
+    };
+
     let blockchain_opts = ethrex_blockchain::BlockchainOptions {
         max_mempool_size: opts.node_opts.mempool_max_size,
-        r#type: BlockchainType::L2,
+        r#type: BlockchainType::L2(fee_config),
         perf_logs_enabled: true,
     };
 

cmd/ethrex/l2/options.rs

@@ -160,6 +160,7 @@ impl TryFrom<SequencerOptions> for SequencerConfig {
                     .block_producer_opts
                     .coinbase_address
                     .ok_or(SequencerOptionsError::NoCoinbaseAddress)?,
+                fee_vault_address: opts.block_producer_opts.fee_vault_address,
                 elasticity_multiplier: opts.block_producer_opts.elasticity_multiplier,
                 block_gas_limit: opts.block_producer_opts.block_gas_limit,
             },
@@ -387,6 +388,13 @@ pub struct BlockProducerOptions {
         required_unless_present = "dev"
     )]
     pub coinbase_address: Option<Address>,
+    #[arg(
+        long = "block-producer.fee-vault-address",
+        value_name = "ADDRESS",
+        env = "ETHREX_BLOCK_PRODUCER_FEE_VAULT_ADDRESS",
+        help_heading = "Block producer options"
+    )]
+    pub fee_vault_address: Option<Address>,
     #[arg(
         long,
         default_value = "2",
@@ -415,6 +423,7 @@ impl Default for BlockProducerOptions {
                     .parse()
                     .unwrap(),
             ),
+            fee_vault_address: None,
             elasticity_multiplier: 2,
             block_gas_limit: DEFAULT_BUILDER_GAS_CEIL,
         }

crates/blockchain/blockchain.rs

@@ -13,6 +13,7 @@ use error::MempoolError;
 use error::{ChainError, InvalidBlockError};
 use ethrex_common::constants::{GAS_PER_BLOB, MAX_RLP_BLOCK_SIZE, MIN_BASE_FEE_PER_BLOB_GAS};
 use ethrex_common::types::block_execution_witness::ExecutionWitness;
+use ethrex_common::types::fee_config::FeeConfig;
 use ethrex_common::types::requests::{EncodedRequests, Requests, compute_requests_hash};
 use ethrex_common::types::{
     AccountUpdate, Block, BlockHash, BlockHeader, BlockNumber, ChainConfig, EIP4844Transaction,
@@ -48,7 +49,7 @@ use ethrex_metrics::metrics_blocks::METRICS_BLOCKS;
 use ethrex_common::types::BlobsBundle;
 
 const MAX_PAYLOADS: usize = 10;
-const MAX_MEMPOOL_SIZE_DEFAULT: usize = 10_000;
+pub const MAX_MEMPOOL_SIZE_DEFAULT: usize = 10_000;
 
 //TODO: Implement a struct Chain or BlockChain to encapsulate
 //functionality and canonical chain state and config
@@ -57,7 +58,7 @@ const MAX_MEMPOOL_SIZE_DEFAULT: usize = 10_000;
 pub enum BlockchainType {
     #[default]
     L1,
-    L2,
+    L2(FeeConfig),
 }
 
 #[derive(Debug)]
@@ -221,7 +222,9 @@ impl Blockchain {
             let logger = Arc::new(DatabaseLogger::new(Arc::new(Mutex::new(Box::new(vm_db)))));
             let mut vm = match self.options.r#type {
                 BlockchainType::L1 => Evm::new_from_db_for_l1(logger.clone()),
-                BlockchainType::L2 => Evm::new_from_db_for_l2(logger.clone()),
+                BlockchainType::L2(fee_config) => {
+                    Evm::new_from_db_for_l2(logger.clone(), fee_config)
+                }
             };
 
             // Re-execute block with logger
@@ -901,7 +904,7 @@ impl Blockchain {
     pub fn new_evm(&self, vm_db: StoreVmDatabase) -> Result<Evm, EvmError> {
         let evm = match self.options.r#type {
             BlockchainType::L1 => Evm::new_for_l1(vm_db),
-            BlockchainType::L2 => Evm::new_for_l2(vm_db)?,
+            BlockchainType::L2(fee_config) => Evm::new_for_l2(vm_db, fee_config)?,
         };
         Ok(evm)
     }

crates/blockchain/payload.rs

@@ -236,7 +236,7 @@ impl PayloadBuildContext {
         let vm_db = StoreVmDatabase::new(storage.clone(), payload.header.parent_hash);
         let vm = match blockchain_type {
             BlockchainType::L1 => Evm::new_for_l1(vm_db),
-            BlockchainType::L2 => Evm::new_for_l2(vm_db)?,
+            BlockchainType::L2(fee_config) => Evm::new_for_l2(vm_db, fee_config)?,
         };
 
         Ok(PayloadBuildContext {

crates/common/rkyv_utils.rs

@@ -63,6 +63,23 @@ impl Hash for ArchivedH160Wrapper {
     }
 }
 
+#[derive(Archive, Serialize, Deserialize)]
+#[rkyv(remote = Option<H160>)]
+pub enum OptionH160Wrapper {
+    Some(#[rkyv(with = H160Wrapper)] H160),
+    None,
+}
+
+impl From<OptionH160Wrapper> for Option<H160> {
+    fn from(value: OptionH160Wrapper) -> Self {
+        if let OptionH160Wrapper::Some(x) = value {
+            Some(x)
+        } else {
+            None
+        }
+    }
+}
+
 #[derive(
     Archive, Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord,
 )]

crates/common/types/l2.rs

@@ -0,0 +1,2 @@
+pub mod batch;
+pub mod fee_config;

crates/common/types/batch.rs → crates/common/types/l2/batch.rs

@@ -1,9 +1,6 @@
+use crate::{H256, types::BlobsBundle};
 use serde::{Deserialize, Serialize};
 
-use crate::H256;
-
-use super::BlobsBundle;
-
 #[derive(Clone, Serialize, Deserialize, Debug, Default)]
 pub struct Batch {
     pub number: u64,

crates/common/types/l2/fee_config.rs

@@ -0,0 +1,26 @@
+use ethereum_types::Address;
+use rkyv::{Archive, Deserialize as RDeserialize, Serialize as RSerialize};
+use serde::{Deserialize, Serialize};
+
+use crate::rkyv_utils::{H160Wrapper, OptionH160Wrapper};
+
+#[derive(
+    Serialize, Deserialize, RDeserialize, RSerialize, Archive, Clone, Copy, Debug, Default,
+)]
+pub struct FeeConfig {
+    /// If set, the base fee is sent to this address instead of being burned.
+    #[rkyv(with=OptionH160Wrapper)]
+    pub fee_vault: Option<Address>,
+    pub operator_fee_config: Option<OperatorFeeConfig>,
+}
+
+/// Configuration for operator fees on L2
+/// The operator fee is an additional fee on top of the base fee
+/// that is sent to the operator fee vault.
+/// This is used to pay for the cost of running the L2 network.
+#[derive(Serialize, Deserialize, RDeserialize, RSerialize, Archive, Clone, Copy, Debug)]
+pub struct OperatorFeeConfig {
+    #[rkyv(with=H160Wrapper)]
+    pub operator_fee_vault: Address,
+    pub operator_fee: u64,
+}

crates/common/types/mod.rs

@@ -1,12 +1,12 @@
 mod account;
 mod account_update;
-pub mod batch;
 pub mod blobs_bundle;
 mod block;
 pub mod block_execution_witness;
 mod constants;
 mod fork_id;
 mod genesis;
+pub mod l2;
 pub mod payload;
 mod receipt;
 pub mod requests;
@@ -20,6 +20,7 @@ pub use block::*;
 pub use constants::*;
 pub use fork_id::*;
 pub use genesis::*;
+pub use l2::*;
 pub use receipt::*;
 pub use transaction::*;
 pub use tx_fields::*;

crates/l2/Makefile

@@ -132,6 +132,7 @@ init-l2: ## 🚀 Initializes an L2 Lambda ethrex Client
 	--l1.on-chain-proposer-address ${DEFAULT_ON_CHAIN_PROPOSER_ADDRESS} \
 	--eth.rpc-url ${L1_RPC_URL} \
 	--block-producer.coinbase-address 0x0007a881CD95B1484fca47615B64803dad620C8d \
+	--block-producer.fee-vault-address 0x000c0d6b7c4516a5b274c51ea331a9410fe69127 \
 	--committer.l1-private-key 0x385c546456b6a603a1cfcaa9ec9494ba4832da08dd6bcf4de9a71e4a01b74924 \
 	--proof-coordinator.l1-private-key 0x39725efee3fb28614de3bacaffe4cc4bd8c436257e2c8bb887c4b5c4be45e76d \
 	--proof-coordinator.addr ${PROOF_COORDINATOR_ADDRESS}

crates/l2/docker-compose-l2-store.overrides.yaml

@@ -11,6 +11,7 @@ services:
       --datadir /store
       --proof-coordinator.addr 0.0.0.0
       --block-producer.coinbase-address 0x0007a881CD95B1484fca47615B64803dad620C8d
+      --block-producer.fee-vault-address 0x000c0d6b7c4516a5b274c51ea331a9410fe69127
       --committer.l1-private-key 0x385c546456b6a603a1cfcaa9ec9494ba4832da08dd6bcf4de9a71e4a01b74924
       --proof-coordinator.l1-private-key 0x39725efee3fb28614de3bacaffe4cc4bd8c436257e2c8bb887c4b5c4be45e76d
       --no-monitor

crates/l2/docker-compose-l2-web3signer.yaml

@@ -18,6 +18,7 @@ services:
       --authrpc.port 8552
       --proof-coordinator.addr 0.0.0.0
       --block-producer.coinbase-address 0x0007a881CD95B1484fca47615B64803dad620C8d
+      --block-producer.fee-vault-address 0x000c0d6b7c4516a5b274c51ea331a9410fe69127
       --committer.remote-signer-url http://web3signer:9000
       --committer.remote-signer-public-key 02eadbea0cdb17fda8d56fc9c51df8a6158c2ab157aabf2ca57c3a32cd69f98bbc
       --proof-coordinator.remote-signer-url http://web3signer:9000

crates/l2/docker-compose.yaml

@@ -78,6 +78,7 @@ services:
       - ETHREX_DEPLOYER_PICO_DEPLOY_VERIFIER=${ETHREX_DEPLOYER_PICO_DEPLOY_VERIFIER:-false}
       - ETHREX_WATCHER_BLOCK_DELAY=${ETHREX_WATCHER_BLOCK_DELAY:-0}
       - ETHREX_BASED=${ETHREX_BASED:-false}
+      - ETHREX_BLOCK_PRODUCER_FEE_VAULT_ADDRESS
       - ETHREX_STATE_UPDATER_SEQUENCER_REGISTRY=${ETHREX_STATE_UPDATER_SEQUENCER_REGISTRY:-0x0000000000000000000000000000000000000000}
       - ETHREX_COMMITTER_COMMIT_TIME=${ETHREX_COMMITTER_COMMIT_TIME:-60000}
       - ETHREX_WATCHER_WATCH_INTERVAL=${ETHREX_WATCHER_WATCH_INTERVAL:-12000}

crates/l2/networking/rpc/clients.rs

@@ -1,4 +1,5 @@
 use crate::l2::batch::RpcBatch;
+use ethrex_common::Address;
 use ethrex_common::H256;
 use ethrex_l2_common::l1_messages::L1MessageProof;
 use ethrex_rpc::{
@@ -7,7 +8,7 @@ use ethrex_rpc::{
         EthClientError,
         eth::{
             RpcResponse,
-            errors::{GetBatchByNumberError, GetMessageProofError},
+            errors::{GetBatchByNumberError, GetFeeVaultAddressError, GetMessageProofError},
         },
     },
     utils::RpcRequest,
@@ -47,3 +48,16 @@ pub async fn get_batch_by_number(
         }
     }
 }
+
+pub async fn get_fee_vault_address(client: &EthClient) -> Result<Option<Address>, EthClientError> {
+    let request = RpcRequest::new("ethrex_getFeeVaultAddress", None);
+
+    match client.send_request(request).await? {
+        RpcResponse::Success(result) => serde_json::from_value(result.result)
+            .map_err(GetFeeVaultAddressError::SerdeJSONError)
+            .map_err(EthClientError::from),
+        RpcResponse::Error(error_response) => {
+            Err(GetFeeVaultAddressError::RPCError(error_response.error.message).into())
+        }
+    }
+}

crates/l2/networking/rpc/l2/fee_vault.rs

@@ -0,0 +1,32 @@
+use serde_json::Value;
+
+use crate::{
+    rpc::{RpcApiContext, RpcHandler},
+    utils::RpcErr,
+};
+
+pub struct GetFeeVaultAddress;
+
+impl RpcHandler for GetFeeVaultAddress {
+    fn parse(_params: &Option<Vec<Value>>) -> Result<GetFeeVaultAddress, RpcErr> {
+        Ok(GetFeeVaultAddress)
+    }
+
+    async fn handle(&self, context: RpcApiContext) -> Result<Value, RpcErr> {
+        let fee_vault_address = match context.l1_ctx.blockchain.options.r#type {
+            ethrex_blockchain::BlockchainType::L1 => None,
+            ethrex_blockchain::BlockchainType::L2(fee_config) => fee_config.fee_vault,
+        };
+
+        Ok(
+            serde_json::to_value(fee_vault_address.map(|addr| format!("{:#x}", addr))).map_err(
+                |e| {
+                    ethrex_rpc::RpcErr::Internal(format!(
+                        "Failed to serialize fee vault address: {}",
+                        e
+                    ))
+                },
+            )?,
+        )
+    }
+}

crates/l2/networking/rpc/l2/mod.rs

@@ -1,3 +1,4 @@
 pub mod batch;
+pub mod fee_vault;
 pub mod l1_message;
 pub mod transaction;

crates/l2/networking/rpc/rpc.rs

@@ -1,4 +1,5 @@
 use crate::l2::batch::{BatchNumberRequest, GetBatchByBatchNumberRequest};
+use crate::l2::fee_vault::GetFeeVaultAddress;
 use crate::l2::l1_message::GetL1MessageProof;
 use crate::utils::{RpcErr, RpcNamespace, resolve_namespace};
 use axum::extract::State;
@@ -216,6 +217,7 @@ pub async fn map_l2_requests(req: &RpcRequest, context: RpcApiContext) -> Result
         "ethrex_getMessageProof" => GetL1MessageProof::call(req, context).await,
         "ethrex_batchNumber" => BatchNumberRequest::call(req, context).await,
         "ethrex_getBatchByNumber" => GetBatchByBatchNumberRequest::call(req, context).await,
+        "ethrex_getFeeVaultAddress" => GetFeeVaultAddress::call(req, context).await,
         unknown_ethrex_l2_method => {
             Err(ethrex_rpc::RpcErr::MethodNotFound(unknown_ethrex_l2_method.to_owned()).into())
         }