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: Run test

.github/workflows/pr-main_l2.yaml

@@ -159,6 +159,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
@@ -260,7 +261,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:
@@ -336,6 +339,7 @@ jobs:
           ETHREX_WATCHER_BLOCK_DELAY=0 \
           PROOF_COORDINATOR_ADDRESS=0.0.0.0 \
           ETHREX_COMMITTER_COMMIT_TIME=15000 \
+          ETHREX_BLOCK_PRODUCER_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127 \
           ETHREX_PROOF_COORDINATOR_TDX_PRIVATE_KEY=0x39725efee3fb28614de3bacaffe4cc4bd8c436257e2c8bb887c4b5c4be45e76d \
           make init-l2 &
           sleep 30

cmd/ethrex/bench/build_block_benchmark.rs

@@ -201,7 +201,7 @@ pub async fn bench_payload(input: &(Arc<Blockchain>, Block, &Store)) -> (Duratio
     // 3. engine_newPayload is called, this eventually calls Blockchain::add_block
     // which takes transactions from the mempool and fills the block with them.
     let since = Instant::now();
-    blockchain.add_block(&block).await.unwrap();
+    blockchain.add_block(&block, None).await.unwrap();
     let executed = Instant::now();
     // EXTRA: Sanity check to not benchmark n empty block.
     let hash = &block.hash();

cmd/ethrex/build.rs

@@ -224,7 +224,7 @@ fn download_contract_deps(contracts_path: &Path) {
         &contracts_path
             .join("lib/openzeppelin-contracts-upgradeable")
             .to_string_lossy(),
-        None,
+        Some("release-v5.4"),
         true,
     )
     .expect("Failed to clone openzeppelin-contracts-upgradeable");

cmd/ethrex/cli.rs

@@ -435,7 +435,7 @@ pub async fn import_blocks(
             }
 
             blockchain
-                .add_block(block)
+                .add_block(block, None)
                 .await
                 .inspect_err(|err| match err {
                     // Block number 1's parent not found, the chain must not belong to the same network as the genesis file

cmd/ethrex/initializers.rs

@@ -164,6 +164,7 @@ pub async fn init_rpc_api(
         get_client_version(),
         log_filter_handler,
         gas_ceil,
+        None,
     );
 
     tracker.spawn(rpc_api);

cmd/ethrex/l2/initializers.rs

@@ -49,6 +49,7 @@ async fn init_rpc_api(
     rollup_store: StoreRollup,
     log_filter_handler: Option<reload::Handle<EnvFilter, Registry>>,
     gas_ceil: Option<u64>,
+    fee_vault: Option<Address>,
 ) {
     let peer_handler = PeerHandler::new(peer_table);
 
@@ -81,6 +82,7 @@ async fn init_rpc_api(
         rollup_store,
         log_filter_handler,
         gas_ceil.unwrap_or(DEFAULT_BUILDER_GAS_CEIL),
+        fee_vault,
     );
 
     tracker.spawn(rpc_api);
@@ -203,6 +205,7 @@ pub async fn init_l2(
         rollup_store.clone(),
         log_filter_handler,
         Some(opts.sequencer_opts.block_producer_opts.block_gas_limit),
+        opts.sequencer_opts.block_producer_opts.fee_vault_address,
     )
     .await;
 

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,
             },
@@ -386,6 +387,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",
@@ -414,6 +422,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,3 +1,4 @@
+use ethrex_common::Address;
 use ethrex_common::types::Block;
 use ethrex_common::types::ChainConfig;
 use ethrex_common::types::blobs_bundle;
@@ -21,6 +22,7 @@ pub struct L2Fields {
     pub blob_commitment: blobs_bundle::Commitment,
     #[serde_as(as = "[_; 48]")]
     pub blob_proof: blobs_bundle::Proof,
+    pub fee_vault: Option<Address>,
 }
 /// Structure holding input data needed to execute or prove blocks.
 /// Optional fields are included only when relevant (e.g. L2 or custom chain).
@@ -70,12 +72,14 @@ impl Cache {
         blocks: Vec<Block>,
         witness: RpcExecutionWitness,
         chain_config: ChainConfig,
+        fee_vault: Option<Address>,
     ) -> 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],
+            fee_vault,
         });
         #[cfg(feature = "l2")]
         let chain_config = Some(chain_config);
@@ -84,6 +88,8 @@ impl Cache {
         let l2_fields = None;
         #[cfg(not(feature = "l2"))]
         let chain_config = None;
+        #[cfg(not(feature = "l2"))]
+        let _ = fee_vault; // avoid unused variable warning
         Self {
             blocks,
             witness,