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

@@ -6,6 +6,7 @@ use std::time::Duration;
 use ethrex_blockchain::{Blockchain, BlockchainType};
 use ethrex_common::Address;
 use ethrex_common::types::DEFAULT_BUILDER_GAS_CEIL;
+use ethrex_common::types::fee_config::FeeConfig;
 use ethrex_l2::SequencerConfig;
 use ethrex_p2p::kademlia::Kademlia;
 use ethrex_p2p::network::peer_table;
@@ -167,9 +168,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,
         }

cmd/ethrex_replay/src/cache.rs

@@ -1,6 +1,7 @@
 use ethrex_common::types::Block;
 use ethrex_common::types::ChainConfig;
 use ethrex_common::types::blobs_bundle;
+use ethrex_common::types::fee_config::FeeConfig;
 use ethrex_config::networks::Network;
 use ethrex_rpc::debug::execution_witness::RpcExecutionWitness;
 use eyre::OptionExt;
@@ -22,6 +23,7 @@ pub struct L2Fields {
     pub blob_commitment: blobs_bundle::Commitment,
     #[serde_as(as = "[_; 48]")]
     pub blob_proof: blobs_bundle::Proof,
+    pub fee_config: FeeConfig,
 }
 /// Structure holding input data needed to execute or prove blocks.
 /// Optional fields are included only when relevant (e.g. L2 or custom chain).
@@ -75,18 +77,11 @@ impl Cache {
         witness: RpcExecutionWitness,
         chain_config: ChainConfig,
         dir: PathBuf,
+        l2_fields: Option<L2Fields>,
     ) -> Self {
         let network = network_from_chain_id(chain_config.chain_id);
         #[cfg(feature = "l2")]
-        let l2_fields = Some(L2Fields {
-            blob_commitment: [0u8; 48],
-            blob_proof: [0u8; 48],
-        });
-        #[cfg(feature = "l2")]
         let chain_config = Some(chain_config);
-
-        #[cfg(not(feature = "l2"))]
-        let l2_fields = None;
         #[cfg(not(feature = "l2"))]
         let chain_config = None;
         Self {

cmd/ethrex_replay/src/cli.rs

@@ -14,13 +14,17 @@ use ethrex_blockchain::{
     fork_choice::apply_fork_choice,
     payload::{BuildPayloadArgs, PayloadBuildResult, create_payload},
 };
+#[cfg(feature = "l2")]
+use ethrex_common::types::fee_config::FeeConfig;
 use ethrex_common::{
     Address, H256,
     types::{
         AccountState, AccountUpdate, Block, BlockHeader, DEFAULT_BUILDER_GAS_CEIL,
         ELASTICITY_MULTIPLIER, Receipt, block_execution_witness::GuestProgramState,
     },
 };
+#[cfg(feature = "l2")]
+use ethrex_l2_rpc::clients::get_fee_vault_address;
 use ethrex_prover_lib::backend::Backend;
 use ethrex_rlp::{decode::RLPDecode, encode::RLPEncode};
 use ethrex_rpc::{
@@ -355,6 +359,8 @@ pub struct BatchOptions {
 pub struct CustomBlockOptions {
     #[command(flatten)]
     common: CommonOptions,
+    #[arg(long, help = "Fee vault address to use in L2 blocks.")]
+    fee_vault: Option<Address>,
 }
 
 #[derive(Parser)]
@@ -367,6 +373,8 @@ pub struct CustomBatchOptions {
     n_blocks: u64,
     #[command(flatten)]
     common: CommonOptions,
+    #[arg(long, help = "Fee vault address to use in L2 blocks.")]
+    fee_vault: Option<Address>,
 }
 
 impl EthrexReplayCommand {
@@ -509,19 +517,24 @@ impl EthrexReplayCommand {
                 }
             }
             #[cfg(not(feature = "l2"))]
-            Self::Custom(CustomSubcommand::Block(CustomBlockOptions { common })) => {
+            Self::Custom(CustomSubcommand::Block(CustomBlockOptions { common, fee_vault })) => {
                 Box::pin(async move {
                     Self::Custom(CustomSubcommand::Batch(CustomBatchOptions {
                         n_blocks: 1,
                         common,
+                        fee_vault,
                     }))
                     .run()
                     .await
                 })
                 .await?;
             }
             #[cfg(not(feature = "l2"))]
-            Self::Custom(CustomSubcommand::Batch(CustomBatchOptions { n_blocks, common })) => {
+            Self::Custom(CustomSubcommand::Batch(CustomBatchOptions {
+                n_blocks,
+                common,
+                fee_vault: _,
+            })) => {
                 let opts = EthrexReplayOptions {
                     rpc_url: Some(Url::parse("http://localhost:8545")?),
                     cached: false,
@@ -596,7 +609,13 @@ impl EthrexReplayCommand {
 
                 let (eth_client, network) = setup_rpc(&opts).await?;
 
-                let cache = get_batchdata(eth_client, network, batch, opts.cache_dir).await?;
+                let fee_config = FeeConfig {
+                    fee_vault: get_fee_vault_address(&eth_client).await?,
+                    ..Default::default()
+                };
+
+                let cache =
+                    get_batchdata(eth_client, network, batch, opts.cache_dir, fee_config).await?;
 
                 let backend = backend(&opts.common.zkvm)?;
 
@@ -618,12 +637,14 @@ impl EthrexReplayCommand {
             #[cfg(feature = "l2")]
             Self::L2(L2Subcommand::Custom(CustomSubcommand::Block(CustomBlockOptions {
                 common,
+                fee_vault,
             }))) => {
                 Box::pin(async move {
                     Self::L2(L2Subcommand::Custom(CustomSubcommand::Batch(
                         CustomBatchOptions {
                             n_blocks: 1,
                             common,
+                            fee_vault,
                         },
                     )))
                     .run()
@@ -635,6 +656,7 @@ impl EthrexReplayCommand {
             Self::L2(L2Subcommand::Custom(CustomSubcommand::Batch(CustomBatchOptions {
                 n_blocks,
                 common,
+                fee_vault,
             }))) => {
                 let opts = EthrexReplayOptions {
                     common,
@@ -649,7 +671,12 @@ impl EthrexReplayCommand {
                     network: None,
                 };
 
-                let report = replay_custom_l2_blocks(max(1, n_blocks), opts).await?;
+                let fee_config = FeeConfig {
+                    fee_vault: fee_vault,
+                    ..Default::default()
+                };
+
+                let report = replay_custom_l2_blocks(max(1, n_blocks), fee_config, opts).await?;
 
                 println!("{report}");
             }
@@ -827,6 +854,7 @@ async fn replay_transaction(tx_opts: TransactionOpts) -> eyre::Result<()> {
             .get_transaction_by_hash(tx_hash)
             .await?
             .ok_or(eyre::Error::msg("error fetching transaction"))?;
+
         get_blockdata(tx_opts.opts, Some(tx.block_number.as_u64()))
             .await?
             .0
@@ -1042,6 +1070,7 @@ pub async fn replay_custom_l1_blocks(
         RpcExecutionWitness::from(execution_witness),
         chain_config,
         opts.cache_dir,
+        None,
     );
 
     let execution_result = exec(backend(&opts.common.zkvm)?, cache.clone()).await;
@@ -1155,9 +1184,11 @@ use ethrex_vm::BlockExecutionResult;
 #[cfg(feature = "l2")]
 pub async fn replay_custom_l2_blocks(
     n_blocks: u64,
+    fee_config: FeeConfig,
     opts: EthrexReplayOptions,
 ) -> eyre::Result<Report> {
-    use ethrex_blockchain::{BlockchainOptions, BlockchainType};
+    use crate::cache::L2Fields;
+    use ethrex_blockchain::{BlockchainOptions, BlockchainType, MAX_MEMPOOL_SIZE_DEFAULT};
 
     let network = Network::LocalDevnetL2;
 
@@ -1179,9 +1210,14 @@ pub async fn replay_custom_l2_blocks(
         rollup_store
     };
 
-    let mut blockchain_options = BlockchainOptions::default();
-    blockchain_options.r#type = BlockchainType::L2;
-    let blockchain = Arc::new(Blockchain::new(store.clone(), blockchain_options));
+    let blockchain = Arc::new(Blockchain::new(
+        store.clone(),
+        BlockchainOptions {
+            max_mempool_size: MAX_MEMPOOL_SIZE_DEFAULT,
+            r#type: BlockchainType::L2(fee_config.clone()),
+            ..Default::default()
+        },
+    ));
 
     let genesis_hash = genesis.get_block().hash();
 
@@ -1197,11 +1233,18 @@ pub async fn replay_custom_l2_blocks(
 
     let execution_witness = blockchain.generate_witness_for_blocks(&blocks).await?;
 
+    let l2_fields = Some(L2Fields {
+        blob_commitment: [0u8; 48],
+        blob_proof: [0u8; 48],
+        fee_config,
+    });
+
     let cache = Cache::new(
         blocks,
         RpcExecutionWitness::from(execution_witness),
         genesis.config,
         opts.cache_dir.clone(),
+        l2_fields,
     );
 
     let backend = backend(&opts.common.zkvm)?;