fix: blob gas price base fee

Author: MarcosNicolau

aggregation_mode/src/backend/mod.rs

@@ -17,12 +17,20 @@ use alloy::{
 };
 use config::Config;
 use ethrex_common::{
-    types::{BlobsBundle, Fork},
-    H256,
+    constants::MIN_BASE_FEE_PER_BLOB_GAS,
+    types::{fake_exponential_checked, BlobsBundle, Fork, BLOB_BASE_FEE_UPDATE_FRACTION},
+    H256, U256,
 };
 use ethrex_l2_rpc::signer::LocalSigner as EthrexLocalSigner;
-use ethrex_rpc::{clients::Overrides, EthClient};
-use ethrex_sdk::{build_generic_tx, calldata::encode_calldata, send_generic_transaction};
+use ethrex_rpc::{
+    clients::{
+        eth::{BACKOFF_FACTOR, MAX_NUMBER_OF_RETRIES, MAX_RETRY_DELAY, MIN_RETRY_DELAY},
+        Overrides,
+    },
+    types::block_identifier::{BlockIdentifier, BlockTag},
+    EthClient,
+};
+use ethrex_sdk::{build_generic_tx, calldata::encode_calldata, send_generic_transaction, transfer};
 use fetcher::{ProofsFetcher, ProofsFetcherError};
 use merkle_tree::compute_proofs_merkle_root;
 use risc0_ethereum_contracts::encode_seal;
@@ -56,6 +64,41 @@ pub struct ProofAggregator {
     ethrex_signer: ethrex_l2_rpc::signer::Signer,
 }
 
+async fn estimate_blob_gas(
+    eth_client: &EthClient,
+    arbitrary_base_blob_gas_price: u64,
+    headroom: u64,
+) -> u64 {
+    let latest_block = eth_client
+        .get_block_by_number(BlockIdentifier::Tag(BlockTag::Latest), false)
+        .await
+        .unwrap();
+
+    let blob_gas_used = latest_block.header.blob_gas_used.unwrap_or(0);
+    let excess_blob_gas = latest_block.header.excess_blob_gas.unwrap_or(0);
+
+    // Check if adding the blob gas used and excess blob gas would overflow
+    let total_blob_gas = excess_blob_gas.checked_add(blob_gas_used).unwrap();
+
+    // If the blob's market is in high demand, the equation may give a really big number.
+    // This function doesn't panic, it performs checked/saturating operations.
+    let blob_gas = fake_exponential_checked(
+        MIN_BASE_FEE_PER_BLOB_GAS,
+        total_blob_gas,
+        BLOB_BASE_FEE_UPDATE_FRACTION,
+    )
+    .unwrap();
+
+    let gas_with_headroom = (blob_gas * (100 + headroom)) / 100;
+
+    // Check if we have an overflow when we take the headroom into account.
+    let blob_gas = arbitrary_base_blob_gas_price
+        .checked_add(gas_with_headroom)
+        .unwrap();
+
+    blob_gas
+}
+
 impl ProofAggregator {
     pub fn new(config: Config) -> Self {
         let rpc_url = config.eth_rpc_url.parse().expect("RPC URL should be valid");
@@ -75,8 +118,17 @@ impl ProofAggregator {
         let engine =
             ZKVMEngine::from_env().expect("AGGREGATOR env variable to be set to one of sp1|risc0");
         let fetcher = ProofsFetcher::new(&config);
-        let ethrex_eth_client =
-            ethrex_rpc::EthClient::new(&config.eth_rpc_url).expect("rpc url to be valid");
+        let ethrex_eth_client = ethrex_rpc::EthClient::new_with_config(
+            vec![&config.eth_rpc_url],
+            MAX_NUMBER_OF_RETRIES,
+            BACKOFF_FACTOR,
+            MIN_RETRY_DELAY,
+            MAX_RETRY_DELAY,
+            Some(10000000000),
+            Some(10000000000),
+        )
+        .expect("rpc url to be valid");
+
         let secret_key =
             SecretKey::from_str(&config.ecdsa.private_key).expect("private key to be valid");
         let ethrex_signer =
@@ -169,9 +221,6 @@ impl ProofAggregator {
         blob_versioned_hash: [u8; 32],
         aggregated_proof: AlignedProof,
     ) -> Result<H256, AggregatedProofSubmissionError> {
-        // TODO: see how to get this
-        self.ethrex_eth_client.maximum_allowed_max_fee_per_blob_gas = Some(1);
-
         match aggregated_proof {
             AlignedProof::SP1(proof) => {
                 let calldata = encode_calldata(
@@ -190,6 +239,11 @@ impl ProofAggregator {
                 )
                 .map_err(|e| AggregatedProofSubmissionError::BuildingCalldata(e.to_string()))?;
 
+                let le_bytes = estimate_blob_gas(&self.ethrex_eth_client, 1000000000, 20)
+                    .await
+                    .to_le_bytes();
+                let gas_price_per_blob = U256::from_little_endian(&le_bytes);
+
                 let tx = build_generic_tx(
                     &self.ethrex_eth_client,
                     ethrex_common::types::TxType::EIP4844,
@@ -198,6 +252,7 @@ impl ProofAggregator {
                     calldata.into(),
                     Overrides {
                         blobs_bundle: Some(blob_bundle),
+                        gas_price_per_blob: Some(gas_price_per_blob),
                         ..Default::default()
                     },
                 )
@@ -234,6 +289,11 @@ impl ProofAggregator {
                 )
                 .map_err(|e| AggregatedProofSubmissionError::BuildingCalldata(e.to_string()))?;
 
+                let le_bytes = estimate_blob_gas(&self.ethrex_eth_client, 1000000000, 20)
+                    .await
+                    .to_le_bytes();
+                let gas_price_per_blob = U256::from_little_endian(&le_bytes);
+
                 let tx = build_generic_tx(
                     &self.ethrex_eth_client,
                     ethrex_common::types::TxType::EIP4844,
@@ -242,6 +302,7 @@ impl ProofAggregator {
                     calldata.into(),
                     Overrides {
                         blobs_bundle: Some(blob_bundle),
+                        gas_price_per_blob: Some(gas_price_per_blob),
                         ..Default::default()
                     },
                 )