fix eth_blobBaseFee

anylots · anylots · commit c79f5876c1bb · 2025-12-08T10:13:04.000+08:00
diff --git a/gas-oracle/app/src/l1_base_fee.rs b/gas-oracle/app/src/l1_base_fee.rs
@@ -1,7 +1,8 @@
 use std::{str::FromStr, sync::Arc};
 
 use crate::{
-    abi::gas_price_oracle_abi::GasPriceOracle, calc_blob_basefee, external_sign::ExternalSign, metrics::ORACLE_SERVICE_METRICS, signer::send_transaction, OracleError
+    abi::gas_price_oracle_abi::GasPriceOracle, external_sign::ExternalSign,
+    metrics::ORACLE_SERVICE_METRICS, signer::send_transaction, OracleError,
 };
 use ethers::prelude::*;
 use eyre::anyhow;
@@ -210,8 +211,14 @@ async fn query_l1_base_fee(
         })?;
 
     let l1_base_fee = latest_block.base_fee_per_gas.unwrap_or_default();
-    let excess_blob_gas = latest_block.excess_blob_gas.unwrap_or_default();
-    let latest_blob_fee = calc_blob_basefee(excess_blob_gas.as_u64());
+
+    // Use the Blob blobBaseFee provided by the L1 node.
+    // We no longer compute it locally (e.g. via `calc_blob_basefee`) to avoid
+    // depending on future L1 config changes.
+    let latest_blob_fee = l1_provider
+        .request::<(), U256>("eth_blobBaseFee", ())
+        .await
+        .map_err(|e| OracleError::L1BaseFeeError(anyhow!(format!("eth_blobBaseFee: {:#?}", e))))?;
 
     let gas_price = match l1_provider.get_gas_price().await {
         Ok(gp) => gp,
@@ -226,3 +233,15 @@ async fn query_l1_base_fee(
 
     Ok((l1_base_fee, U256::from(latest_blob_fee), gas_price))
 }
+
+#[tokio::test]
+async fn test_eth_blob_base_fee() -> Result<(), OracleError> {
+    let l1_provider = Provider::<Http>::try_from("https://ethereum-rpc.publicnode.com").unwrap();
+    let blob_base_fee = l1_provider
+        .request::<(), U256>("eth_blobBaseFee", ())
+        .await
+        .map_err(|e| OracleError::L1BaseFeeError(anyhow!(format!("eth_blobBaseFee: {:#?}", e))))?;
+
+    println!("eth_blobBaseFee: {:?}", blob_base_fee);
+    Ok(())
+}
diff --git a/gas-oracle/app/src/lib.rs b/gas-oracle/app/src/lib.rs
@@ -39,33 +39,4 @@ pub fn contract_error<M: Middleware>(e: ContractError<M>) -> String {
         format!("error: {:#?}", e)
     };
     error_msg
-}
-
-/// Minimum gas price for data blobs.
-pub const MIN_BLOB_GASPRICE: u64 = 1;
-
-/// Controls the maximum rate of change for blob gas price.
-pub const BLOB_GASPRICE_UPDATE_FRACTION: u64 = 3338477;
-
-pub fn calc_blob_basefee(excess_blob_gas: u64) -> u128 {
-    fake_exponential(MIN_BLOB_GASPRICE, excess_blob_gas, BLOB_GASPRICE_UPDATE_FRACTION)
-}
-
-fn fake_exponential(factor: u64, numerator: u64, denominator: u64) -> u128 {
-    assert_ne!(denominator, 0, "attempt to divide by zero");
-    let factor = factor as u128;
-    let numerator = numerator as u128;
-    let denominator = denominator as u128;
-
-    let mut i = 1;
-    let mut output = 0;
-    let mut numerator_accum = factor * denominator;
-    while numerator_accum > 0 {
-        output += numerator_accum;
-
-        // Denominator is asserted as not zero at the start of the function.
-        numerator_accum = (numerator_accum * numerator) / (denominator * i);
-        i += 1;
-    }
-    output / denominator
-}
+}
