feat(l2): implement operator fee

.github/workflows/main_prover.yaml

@@ -66,6 +66,7 @@ jobs:
           DOCKER_ETHREX_WORKDIR=/usr/local/bin \
           ETHREX_DEPLOYER_DEPLOY_RICH=true \
           ETHREX_DEPLOYER_SP1_DEPLOY_VERIFIER=true \
+          ETHREX_ON_CHAIN_PROPOSER_OPERATOR_FEE=0x3B9ACA00 \
           docker compose up --build contract_deployer
 
       - name: Ensure admin permissions in _work
@@ -79,7 +80,8 @@ 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 \
           docker compose up --build --detach --no-deps ethrex_l2
 
       - name: Copy env to host

.github/workflows/pr-main_l2.yaml

@@ -194,6 +194,8 @@ jobs:
           if  [ "${{ matrix.based }}" = true ]; then
             export ETHREX_DEPLOYER_DEPLOY_BASED_CONTRACTS=true
             export COMPILE_CONTRACTS=true
+          else
+            export ETHREX_ON_CHAIN_PROPOSER_OPERATOR_FEE=0x3B9ACA00
           fi
           DOCKER_ETHREX_WORKDIR=/usr/local/bin \
           ETHREX_DEPLOYER_DEPLOY_RICH=true \
@@ -233,6 +235,7 @@ jobs:
             cd ..
           else
            export ETHREX_BLOCK_PRODUCER_FEE_VAULT_ADDRESS=0x000c0d6b7c4516a5b274c51ea331a9410fe69127
+           export ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_VAULT_ADDRESS=0xd5d2a85751b6F158e5b9B8cD509206A865672362
           fi
           cd crates/l2
           DOCKER_ETHREX_WORKDIR=/usr/local/bin \
@@ -319,6 +322,7 @@ jobs:
           ETHREX_DEPLOYER_DEPLOY_RICH=true \
           ETHREX_DEPLOYER_TDX_DEPLOY_VERIFIER=true \
           ETHREX_TDX_DEV_MODE=true \
+          ETHREX_ON_CHAIN_PROPOSER_OPERATOR_FEE=0x3B9ACA00 \
           make deploy-l1
 
       - name: Start Sequencer
@@ -328,7 +332,8 @@ 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_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
 
@@ -386,6 +391,7 @@ jobs:
           ETHREX_DEPLOYER_PICO_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
           ETHREX_DEPLOYER_SP1_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
           ETHREX_DEPLOYER_RISC0_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
+          ETHREX_ON_CHAIN_PROPOSER_OPERATOR_FEE=0x0 \
           COMPILE_CONTRACTS=true \
           docker compose up contract_deployer
 

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, fee_config::FeeConfig};
+use ethrex_common::types::{Block, Genesis, fee_config::FeeConfig, fee_config::FeeConfig};
 use ethrex_p2p::{sync::SyncMode, tx_broadcaster::BROADCAST_INTERVAL_MS, types::Node};
 use ethrex_rlp::encode::RLPEncode;
 use ethrex_storage::error::StoreError;

cmd/ethrex/l2/deployer.rs

@@ -333,6 +333,14 @@ pub struct DeployerOptions {
         help = "The L1 address of the L2 native token (e.g., USDC, USDT, DAI, etc. Use address(0) for ETH)"
     )]
     pub native_token_l1_address: Address,
+    #[arg(
+        long,
+        value_name = "UINT256",
+        env = "ETHREX_ON_CHAIN_PROPOSER_OPERATOR_FEE",
+        help_heading = "Deployer options",
+        help = "Fee that the operator will receive for each transaction included in a block."
+    )]
+    pub operator_fee: U256,
 }
 
 impl Default for DeployerOptions {
@@ -416,6 +424,7 @@ impl Default for DeployerOptions {
             inclusion_max_wait: 3000,
             use_compiled_genesis: true,
             native_token_l1_address: H160::zero(),
+            operator_fee: U256::zero(),
         }
     }
 }
@@ -495,7 +504,7 @@ const SP1_VERIFIER_BYTECODE: &[u8] = include_bytes!(concat!(
 ));
 
 const INITIALIZE_ON_CHAIN_PROPOSER_SIGNATURE_BASED: &str = "initialize(bool,address,address,address,address,address,bytes32,bytes32,bytes32,address,uint256)";
-const INITIALIZE_ON_CHAIN_PROPOSER_SIGNATURE: &str = "initialize(bool,address,address,address,address,address,bytes32,bytes32,bytes32,address[],uint256)";
+const INITIALIZE_ON_CHAIN_PROPOSER_SIGNATURE: &str = "initialize(bool,address,address,address,address,address,bytes32,bytes32,bytes32,address[],uint256,uint256)";
 
 const INITIALIZE_BRIDGE_ADDRESS_SIGNATURE: &str = "initializeBridgeAddress(address)";
 const TRANSFER_OWNERSHIP_SIGNATURE: &str = "transferOwnership(address)";
@@ -850,6 +859,7 @@ async fn initialize_contracts(
                 Value::Address(opts.proof_sender_l1_address),
             ]),
             Value::Uint(genesis.config.chain_id.into()),
+            Value::Uint(opts.operator_fee),
         ];
         trace!(calldata_values = ?calldata_values, "OnChainProposer initialization calldata values");
         let on_chain_proposer_initialization_calldata =

cmd/ethrex/l2/initializers.rs

@@ -3,21 +3,25 @@ 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,
 };
-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::U256;
+use ethrex_common::types::fee_config::{FeeConfig, OperatorFeeConfig};
 use ethrex_common::{Address, types::DEFAULT_BUILDER_GAS_CEIL};
 use ethrex_l2::SequencerConfig;
+use ethrex_l2_sdk::get_operator_fee;
 use ethrex_p2p::{
     discv4::peer_table::PeerTable,
     peer_handler::PeerHandler,
     rlpx::l2::l2_connection::P2PBasedContext,
     sync_manager::SyncManager,
     types::{Node, NodeRecord},
 };
+use ethrex_rpc::EthClient;
+use ethrex_rpc::clients::EthClientError;
 use ethrex_storage::Store;
 use ethrex_storage_rollup::{EngineTypeRollup, StoreRollup};
 use secp256k1::SecretKey;
@@ -156,9 +160,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 {
@@ -288,3 +297,51 @@ 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);
+    }
+
+    // Fetch operator fee from the on-chain proposer contract
+    let operator_fee = fetch_operator_fee(
+        sequencer_opts.eth_opts.rpc_url.clone(),
+        sequencer_opts.committer_opts.on_chain_proposer_address,
+    )
+    .await?;
+
+    // Check if operator fee vault address is provided in the config
+    let operator_address = sequencer_opts
+        .block_producer_opts
+        .operator_fee_vault_address;
+
+    let operator_fee_config = if let Some(address) = operator_address {
+        Some(OperatorFeeConfig {
+            operator_fee,
+            operator_fee_vault: address,
+        })
+    } else {
+        if !operator_fee.is_zero() {
+            error!(
+                "The operator fee is set on-chain, but no operator fee vault address is provided in the configuration."
+            );
+            return Err(eyre::eyre!("Missing operator fee vault address"));
+        }
+        None
+    };
+    Ok(operator_fee_config)
+}
+
+pub async fn fetch_operator_fee(
+    rpc_urls: Vec<String>,
+    on_chain_proposer_address: Option<Address>,
+) -> Result<U256, EthClientError> {
+    let contract_address = on_chain_proposer_address.ok_or(EthClientError::Custom(
+        "on_chain_proposer_address not set in config".to_string(),
+    ))?;
+    let eth_client = EthClient::new_with_multiple_urls(rpc_urls)?;
+    get_operator_fee(&eth_client, contract_address).await
+}

cmd/ethrex/l2/options.rs

@@ -160,7 +160,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,
             },
@@ -389,12 +390,19 @@ 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",
+        env = "ETHREX_BLOCK_PRODUCER_OPERATOR_FEE_VAULT_ADDRESS",
+        help_heading = "Block producer options"
+    )]
+    pub operator_fee_vault_address: Option<Address>,
     #[arg(
         long,
         default_value = "2",
@@ -423,7 +431,8 @@ impl Default for BlockProducerOptions {
                     .parse()
                     .unwrap(),
             ),
-            fee_vault_address: None,
+            base_fee_vault_address: None,
+            operator_fee_vault_address: None,
             elasticity_multiplier: 2,
             block_gas_limit: DEFAULT_BUILDER_GAS_CEIL,
         }

crates/common/types/l2/fee_config.rs

@@ -1,16 +1,16 @@
-use ethereum_types::Address;
+use ethereum_types::{Address, U256};
 use rkyv::{Archive, Deserialize as RDeserialize, Serialize as RSerialize};
 use serde::{Deserialize, Serialize};
 
-use crate::rkyv_utils::{H160Wrapper, OptionH160Wrapper};
+use crate::rkyv_utils::{H160Wrapper, OptionH160Wrapper, U256Wrapper};
 
 #[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 base_fee_vault: Option<Address>,
     pub operator_fee_config: Option<OperatorFeeConfig>,
 }
 
@@ -22,5 +22,6 @@ pub struct FeeConfig {
 pub struct OperatorFeeConfig {
     #[rkyv(with=H160Wrapper)]
     pub operator_fee_vault: Address,
-    pub operator_fee: u64,
+    #[rkyv(with=U256Wrapper)]
+    pub operator_fee: U256,
 }

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_ON_CHAIN_PROPOSER_OPERATOR_FEE?=0x3B9ACA00 \
 
 # Matches the ports used by the blockchain/metrics dir
 L2_PROMETHEUS_METRICS_PORT = 3702
@@ -94,7 +95,8 @@ deploy-l1: ## 📜 Deploys the L1 contracts
 	--deposit-rich \
 	--private-keys-file-path ../../fixtures/keys/private_keys_l1.txt \
 	--genesis-l1-path ../../fixtures/genesis/l1-dev.json \
-	--genesis-l2-path ../../fixtures/genesis/l2.json
+	--genesis-l2-path ../../fixtures/genesis/l2.json \
+	--operator-fee ${ETHREX_ON_CHAIN_PROPOSER_OPERATOR_FEE}
 
 ## Same as deploy-l1 but deploys the SP1 verifier
 deploy-l1-sp1: ## 📜 Deploys the L1 contracts
@@ -132,7 +134,8 @@ 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 \
 	--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/contracts/src/l1/OnChainProposer.sol

@@ -91,6 +91,9 @@ contract OnChainProposer is
     /// @notice Chain ID of the network
     uint256 public CHAIN_ID;
 
+    /// @notice Fee in wei to be paid to the operator fee vault on each transaction
+    uint256 public OPERATOR_FEE;
+
     modifier onlySequencer() {
         require(
             authorizedSequencerAddresses[msg.sender],
@@ -117,7 +120,8 @@ contract OnChainProposer is
         bytes32 risc0Vk,
         bytes32 genesisStateRoot,
         address[] calldata sequencerAddresses,
-        uint256 chainId
+        uint256 chainId,
+        uint256 operatorFee
     ) public initializer {
         VALIDIUM = _validium;
 
@@ -166,6 +170,7 @@ contract OnChainProposer is
         }
 
         CHAIN_ID = chainId;
+        OPERATOR_FEE = operatorFee;
 
         OwnableUpgradeable.__Ownable_init(owner);
     }
@@ -471,7 +476,7 @@ contract OnChainProposer is
         uint256 batchNumber,
         bytes calldata publicData
     ) internal view returns (string memory) {
-        if (publicData.length != 256) {
+        if (publicData.length != 288) {
             return "invalid public data length";
         }
         bytes32 initialStateRoot = bytes32(publicData[0:32]);
@@ -530,6 +535,12 @@ contract OnChainProposer is
             return
                 "exceeded privileged transaction inclusion deadline, can't include non-privileged transactions";
         }
+
+        uint256 operatorFee = uint256(bytes32(publicData[256:288]));
+        if (OPERATOR_FEE != operatorFee) {
+            return
+                "operator fee public input does not match with the configured operator fee";
+        }
         return "";
     }
 

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