fix: use next fee blob basefee for missing blob fee (#11782)

fix: use fee blob basefee for missing blob fee

Author: mattsse

crates/anvil/src/eth/api.rs

@@ -3235,10 +3235,8 @@ impl EthApi {
                             m.tx.max_fee_per_gas = self.gas_price();
                         }
                         if max_fee_per_blob_gas.is_none() {
-                            m.tx.max_fee_per_blob_gas = self
-                                .excess_blob_gas_and_price()
-                                .unwrap_or_default()
-                                .map_or(0, |g| g.blob_gasprice)
+                            m.tx.max_fee_per_blob_gas =
+                                self.backend.fees().get_next_block_blob_base_fee_per_gas();
                         }
                         TxEip4844Variant::TxEip4844WithSidecar(m)
                     }
@@ -3255,10 +3253,8 @@ impl EthApi {
                             tx.max_fee_per_gas = self.gas_price();
                         }
                         if max_fee_per_blob_gas.is_none() {
-                            tx.max_fee_per_blob_gas = self
-                                .excess_blob_gas_and_price()
-                                .unwrap_or_default()
-                                .map_or(0, |g| g.blob_gasprice)
+                            tx.max_fee_per_blob_gas =
+                                self.backend.fees().get_next_block_blob_base_fee_per_gas();
                         }
 
                         TxEip4844Variant::TxEip4844(tx)

crates/anvil/src/eth/fees.rs

@@ -156,9 +156,11 @@ impl FeeManager {
         calculate_next_block_base_fee(gas_used, gas_limit, last_fee_per_gas)
     }
 
-    /// Calculates the next block blob base fee, using the provided excess blob gas
-    pub fn get_next_block_blob_base_fee_per_gas(&self, excess_blob_gas: u128) -> u128 {
-        alloy_eips::eip4844::calc_blob_gasprice(excess_blob_gas as u64)
+    /// Calculates the next block blob base fee.
+    pub fn get_next_block_blob_base_fee_per_gas(&self) -> u128 {
+        alloy_eips::eip4844::calc_blob_gasprice(
+            self.blob_excess_gas_and_price.read().excess_blob_gas,
+        )
     }
 
     /// Calculates the next block blob excess gas, using the provided parent blob gas used and

crates/anvil/tests/it/eip4844.rs

@@ -11,6 +11,7 @@ use alloy_provider::Provider;
 use alloy_rpc_types::{BlockId, TransactionRequest};
 use alloy_serde::WithOtherFields;
 use anvil::{NodeConfig, spawn};
+use foundry_test_utils::rpc;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn can_send_eip4844_transaction() {
@@ -48,6 +49,33 @@ async fn can_send_eip4844_transaction() {
     assert_eq!(receipt.blob_gas_price, Some(0x1)); // 1 wei
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn can_send_eip4844_transaction_fork() {
+    let node_config = NodeConfig::test()
+        .with_eth_rpc_url(Some(rpc::next_http_archive_rpc_url()))
+        .with_fork_block_number(Some(23432306u64))
+        .with_hardfork(Some(EthereumHardfork::Cancun.into()));
+    let (api, handle) = spawn(node_config).await;
+    let provider = handle.http_provider();
+    let accounts = provider.get_accounts().await.unwrap();
+    let alice = accounts[0];
+    let bob = accounts[1];
+
+    let sidecar: SidecarBuilder<SimpleCoder> = SidecarBuilder::from_slice(b"Blobs are fun!");
+    let sidecar = sidecar.build().unwrap();
+
+    let tx = TransactionRequest::default()
+        .with_from(alice)
+        .with_to(bob)
+        .with_blob_sidecar(sidecar.clone());
+
+    let pending_tx = provider.send_transaction(tx.into()).await.unwrap();
+    let receipt = pending_tx.get_receipt().await.unwrap();
+    let tx_hash = receipt.transaction_hash;
+
+    let _blobs = api.anvil_get_blob_by_tx_hash(tx_hash).unwrap().unwrap();
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn can_send_multiple_blobs_in_one_tx() {
     let node_config = NodeConfig::test().with_hardfork(Some(EthereumHardfork::Cancun.into()));