feat(l2): implement operator fee

.github/workflows/main_prover.yaml

@@ -86,7 +86,9 @@ jobs:
           ETHREX_PROPOSER_BLOCK_TIME=12000 \
           ETHREX_COMMITTER_COMMIT_TIME=30000 \
           ETHREX_WATCHER_WATCH_INTERVAL=1000 \
-          ETHREX_BLOCK_PRODUCER_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127 \
+          ETHREX_BLOCK_PRODUCER_BASE_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127 \
+          ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_VAULT_ADDRESS=0xd5d2a85751b6F158e5b9B8cD509206A865672362 \
+          ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_PER_GAS=1000000000 \
           docker compose up --build --detach --no-deps ethrex_l2
 
       - name: Copy env to host

.github/workflows/pr-main_l2.yaml

@@ -281,7 +281,9 @@ jobs:
             export ETHREX_BASED=true
             cd ..
           else
-           export ETHREX_BLOCK_PRODUCER_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127
+            export ETHREX_BLOCK_PRODUCER_BASE_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127
+            export ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_VAULT_ADDRESS=0xd5d2a85751b6F158e5b9B8cD509206A865672362
+            export ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_PER_GAS=1000000000
           fi
           cd crates/l2
           DOCKER_ETHREX_WORKDIR=/usr/local/bin \
@@ -294,7 +296,7 @@ jobs:
       - name: Run test
         run: |
           if  [ "${{ matrix.based }}" = true ]; then
-            export INTEGRATION_TEST_SKIP_FEE_VAULT_CHECK=true
+            export INTEGRATION_TEST_SKIP_BASE_FEE_VAULT_CHECK=true
           fi
           sudo chmod -R a+rw crates/l2
           cd crates/l2
@@ -388,7 +390,9 @@ 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_BLOCK_PRODUCER_BASE_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127 \
+          ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_VAULT_ADDRESS=0xd5d2a85751b6F158e5b9B8cD509206A865672362 \
+          ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_PER_GAS=1000000000 \
           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
 
@@ -521,7 +525,7 @@ jobs:
       - name: Run test
         run: |
           cd crates/l2
-          INTEGRATION_TEST_SKIP_FEE_VAULT_CHECK=true \
+          INTEGRATION_TEST_SKIP_BASE_FEE_VAULT_CHECK=true \
           PROPOSER_COINBASE_ADDRESS=0x0007a881CD95B1484fca47615B64803dad620C8d \
           cargo test l2 --release -- --nocapture --test-threads=1
 

cmd/ethrex/l2/command.rs

@@ -345,10 +345,7 @@ impl Command {
                                     "Transaction {:#x} not found",
                                     log.transaction_hash
                                 ))?;
-                            l2_blob_hashes.extend(tx.blob_versioned_hashes.ok_or_eyre(format!(
-                                "Blobs not found in transaction {:#x}",
-                                log.transaction_hash
-                            ))?);
+                            l2_blob_hashes.extend(tx.tx.blob_versioned_hashes());
                         }
 
                         // Get blobs from block's slot and only keep L2 commitment's blobs

cmd/ethrex/l2/initializers.rs

@@ -3,12 +3,12 @@ use crate::initializers::{
     self, get_authrpc_socket_addr, get_http_socket_addr, get_local_node_record, get_local_p2p_node,
     get_network, get_signer, init_blockchain, init_network, init_store, regenerate_head_state,
 };
-use crate::l2::L2Options;
+use crate::l2::{L2Options, SequencerOptions};
 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::types::fee_config::{FeeConfig, OperatorFeeConfig};
 use ethrex_common::{Address, types::DEFAULT_BUILDER_GAS_CEIL};
 use ethrex_l2::SequencerConfig;
 use ethrex_p2p::{
@@ -156,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 operator_fee_config = get_operator_fee_config(&opts.sequencer_opts).await?;
+
     let fee_config = FeeConfig {
-        fee_vault: opts.sequencer_opts.block_producer_opts.fee_vault_address,
-        ..Default::default()
+        base_fee_vault: opts
+            .sequencer_opts
+            .block_producer_opts
+            .base_fee_vault_address,
+        operator_fee_config,
     };
 
     let blockchain_opts = ethrex_blockchain::BlockchainOptions {
@@ -290,3 +295,29 @@ pub async fn init_l2(
     info!("Server shutting down!");
     Ok(())
 }
+
+pub async fn get_operator_fee_config(
+    sequencer_opts: &SequencerOptions,
+) -> eyre::Result<Option<OperatorFeeConfig>> {
+    if sequencer_opts.based {
+        // If based is enabled, operator fee is not applicable
+        return Ok(None);
+    }
+
+    let fee = sequencer_opts.block_producer_opts.operator_fee_per_gas;
+
+    let address = sequencer_opts
+        .block_producer_opts
+        .operator_fee_vault_address;
+
+    let operator_fee_config =
+        if let (Some(operator_fee_vault), Some(operator_fee_per_gas)) = (address, fee) {
+            Some(OperatorFeeConfig {
+                operator_fee_vault,
+                operator_fee_per_gas,
+            })
+        } else {
+            None
+        };
+    Ok(operator_fee_config)
+}

cmd/ethrex/l2/options.rs

@@ -162,7 +162,8 @@ impl TryFrom<SequencerOptions> for SequencerConfig {
                     .block_producer_opts
                     .coinbase_address
                     .ok_or(SequencerOptionsError::NoCoinbaseAddress)?,
-                fee_vault_address: opts.block_producer_opts.fee_vault_address,
+                base_fee_vault_address: opts.block_producer_opts.base_fee_vault_address,
+                operator_fee_vault_address: opts.block_producer_opts.operator_fee_vault_address,
                 elasticity_multiplier: opts.block_producer_opts.elasticity_multiplier,
                 block_gas_limit: opts.block_producer_opts.block_gas_limit,
             },
@@ -437,12 +438,29 @@ pub struct BlockProducerOptions {
     )]
     pub coinbase_address: Option<Address>,
     #[arg(
-        long = "block-producer.fee-vault-address",
+        long = "block-producer.base-fee-vault-address",
         value_name = "ADDRESS",
-        env = "ETHREX_BLOCK_PRODUCER_FEE_VAULT_ADDRESS",
+        env = "ETHREX_BLOCK_PRODUCER_BASE_FEE_VAULT_ADDRESS",
         help_heading = "Block producer options"
     )]
-    pub fee_vault_address: Option<Address>,
+    pub base_fee_vault_address: Option<Address>,
+    #[arg(
+        long = "block-producer.operator-fee-vault-address",
+        value_name = "ADDRESS",
+        requires = "operator_fee_per_gas",
+        env = "ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_VAULT_ADDRESS",
+        help_heading = "Block producer options"
+    )]
+    pub operator_fee_vault_address: Option<Address>,
+    #[arg(
+        long,
+        value_name = "UINT64",
+        env = "ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_PER_GAS",
+        requires = "operator_fee_vault_address",
+        help_heading = "Block producer options",
+        help = "Fee that the operator will receive for each unit of gas consumed in a block."
+    )]
+    pub operator_fee_per_gas: Option<u64>,
     #[arg(
         long,
         default_value = "2",
@@ -471,7 +489,9 @@ impl Default for BlockProducerOptions {
                     .parse()
                     .unwrap(),
             ),
-            fee_vault_address: None,
+            base_fee_vault_address: None,
+            operator_fee_vault_address: None,
+            operator_fee_per_gas: None,
             elasticity_multiplier: 2,
             block_gas_limit: DEFAULT_BUILDER_GAS_CEIL,
         }

crates/common/types/l2/fee_config.rs

@@ -10,7 +10,7 @@ use crate::rkyv_utils::{H160Wrapper, OptionH160Wrapper};
 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 base_fee_vault: Option<Address>,
     pub operator_fee_config: Option<OperatorFeeConfig>,
 }
 
@@ -22,5 +22,5 @@ pub struct FeeConfig {
 pub struct OperatorFeeConfig {
     #[rkyv(with=H160Wrapper)]
     pub operator_fee_vault: Address,
-    pub operator_fee: u64,
+    pub operator_fee_per_gas: u64,
 }

crates/l2/Makefile

@@ -45,6 +45,7 @@ L1_AUTH_PORT=8551
 L1_RPC_ADDRESS=0.0.0.0
 L2_RPC_ADDRESS=0.0.0.0
 PROOF_COORDINATOR_ADDRESS?=127.0.0.1
+ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_PER_GAS?=1000000000 \
 
 # Matches the ports used by the blockchain/metrics dir
 L2_PROMETHEUS_METRICS_PORT = 3702
@@ -132,7 +133,9 @@ 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 \
+	--block-producer.base-fee-vault-address 0x000c0d6b7c4516a5b274c51ea331a9410fe69127 \
+	--block-producer.operator-fee-vault-address 0xd5d2a85751b6F158e5b9B8cD509206A865672362 \
+	--block-producer.operator-fee ${ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_PER_GAS} \
 	--committer.l1-private-key 0x385c546456b6a603a1cfcaa9ec9494ba4832da08dd6bcf4de9a71e4a01b74924 \
 	--proof-coordinator.l1-private-key 0x39725efee3fb28614de3bacaffe4cc4bd8c436257e2c8bb887c4b5c4be45e76d \
 	--proof-coordinator.addr ${PROOF_COORDINATOR_ADDRESS}
@@ -181,7 +184,7 @@ build-prover:
 ../../target/release/ethrex: $(PROVER_SRC_FILES)
 	@if [ -z "$$PROVER" ]; then \
 		echo "Warn: ProverType (PROVER) is missing. Building only with exec mode."; \
-		echo "Please provide it as an argument:"; \
+		echo "You can provide it as an argument:"; \
 		echo "make init-prover PROVER=<prover_type: (risc0, sp1)> G=<true>"; \
 		echo "The prover can also be run with GPU (G)"; \
 	fi; \

crates/l2/based/block_fetcher.rs

@@ -247,17 +247,17 @@ impl BlockFetcher {
         missing_batches_logs.sort_by_key(|(_log, batch_number)| *batch_number);
 
         for (batch_committed_log, batch_number) in missing_batches_logs {
-            let batch_commit_tx_calldata = self
+            let tx = self
                 .eth_client
                 .get_transaction_by_hash(batch_committed_log.transaction_hash)
                 .await?
                 .ok_or(BlockFetcherError::RetrievalError(format!(
                     "Failed to get the receipt for transaction {:x}",
                     batch_committed_log.transaction_hash
                 )))?
-                .data;
+                .tx;
 
-            let batch = decode_batch_from_calldata(&batch_commit_tx_calldata)?;
+            let batch = decode_batch_from_calldata(tx.data())?;
 
             self.store_batch(&batch).await?;
 

crates/l2/common/src/prover.rs

@@ -18,7 +18,7 @@ pub struct ProverInputData {
     pub blob_commitment: blobs_bundle::Commitment,
     #[serde_as(as = "[_; 48]")]
     pub blob_proof: blobs_bundle::Proof,
-    pub fee_config: FeeConfig,
+    pub fee_configs: Vec<FeeConfig>,
 }
 
 /// Enum used to identify the different proving systems.

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

@@ -11,7 +11,7 @@ services:
       --datadir /store
       --proof-coordinator.addr 0.0.0.0
       --block-producer.coinbase-address 0x0007a881CD95B1484fca47615B64803dad620C8d
-      --block-producer.fee-vault-address 0x000c0d6b7c4516a5b274c51ea331a9410fe69127
+      --block-producer.base-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,7 +18,7 @@ services:
       --authrpc.port 8552
       --proof-coordinator.addr 0.0.0.0
       --block-producer.coinbase-address 0x0007a881CD95B1484fca47615B64803dad620C8d
-      --block-producer.fee-vault-address 0x000c0d6b7c4516a5b274c51ea331a9410fe69127
+      --block-producer.base-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

@@ -86,7 +86,9 @@ 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_BLOCK_PRODUCER_BASE_FEE_VAULT_ADDRESS
+      - ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_VAULT_ADDRESS
+      - ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_PER_GAS
       - 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,14 +1,18 @@
 use crate::l2::batch::RpcBatch;
 use ethrex_common::Address;
 use ethrex_common::H256;
+use ethrex_common::U256;
 use ethrex_l2_common::l1_messages::L1MessageProof;
+use ethrex_rpc::clients::eth::errors::GetOperatorFeeError;
+use ethrex_rpc::clients::eth::errors::GetOperatorFeeVaultAddressError;
+use ethrex_rpc::types::block_identifier::BlockIdentifier;
 use ethrex_rpc::{
     EthClient,
     clients::{
         EthClientError,
         eth::{
             RpcResponse,
-            errors::{GetBatchByNumberError, GetFeeVaultAddressError, GetMessageProofError},
+            errors::{GetBaseFeeVaultAddressError, GetBatchByNumberError, GetMessageProofError},
         },
     },
     utils::RpcRequest,
@@ -49,15 +53,53 @@ 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);
+pub async fn get_base_fee_vault_address(
+    client: &EthClient,
+    block: BlockIdentifier,
+) -> Result<Address, EthClientError> {
+    let params = Some(vec![block.into()]);
+    let request = RpcRequest::new("ethrex_getBaseFeeVaultAddress", params);
+
+    match client.send_request(request).await? {
+        RpcResponse::Success(result) => serde_json::from_value(result.result)
+            .map_err(GetBaseFeeVaultAddressError::SerdeJSONError)
+            .map_err(EthClientError::from),
+        RpcResponse::Error(error_response) => {
+            Err(GetBaseFeeVaultAddressError::RPCError(error_response.error.message).into())
+        }
+    }
+}
+
+pub async fn get_operator_fee_vault_address(
+    client: &EthClient,
+    block: BlockIdentifier,
+) -> Result<Address, EthClientError> {
+    let params = Some(vec![block.into()]);
+    let request = RpcRequest::new("ethrex_getOperatorFeeVaultAddress", params);
+
+    match client.send_request(request).await? {
+        RpcResponse::Success(result) => serde_json::from_value(result.result)
+            .map_err(GetOperatorFeeVaultAddressError::SerdeJSONError)
+            .map_err(EthClientError::from),
+        RpcResponse::Error(error_response) => {
+            Err(GetOperatorFeeVaultAddressError::RPCError(error_response.error.message).into())
+        }
+    }
+}
+
+pub async fn get_operator_fee(
+    client: &EthClient,
+    block: BlockIdentifier,
+) -> Result<U256, EthClientError> {
+    let params = Some(vec![block.into()]);
+    let request = RpcRequest::new("ethrex_getOperatorFee", params);
 
     match client.send_request(request).await? {
         RpcResponse::Success(result) => serde_json::from_value(result.result)
-            .map_err(GetFeeVaultAddressError::SerdeJSONError)
+            .map_err(GetOperatorFeeError::SerdeJSONError)
             .map_err(EthClientError::from),
         RpcResponse::Error(error_response) => {
-            Err(GetFeeVaultAddressError::RPCError(error_response.error.message).into())
+            Err(GetOperatorFeeError::RPCError(error_response.error.message).into())
         }
     }
 }