use unwrap_or_default to cover non-blob txs

bluealloy · Jan 16, 2024 · e522f14 · e522f14
1 parent d3988d7
commit e522f14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/crates/primitives/src/env.rs b/crates/primitives/src/env.rs
@@ -231,7 +231,8 @@ impl Env {
             .ok_or(InvalidTransaction::OverflowPaymentInTransaction)?;
 
         if SPEC::enabled(SpecId::CANCUN) {
-            let data_fee = self.calc_data_fee().expect("already checked");
+            // if the tx is not a blob tx, this will be None, so we add zero
+            let data_fee = self.calc_max_data_fee().unwrap_or_default();
             balance_check = balance_check
                 .checked_add(U256::from(data_fee))
                 .ok_or(InvalidTransaction::OverflowPaymentInTransaction)?;

diff --git a/crates/revm/src/handler/mainnet/pre_execution.rs b/crates/revm/src/handler/mainnet/pre_execution.rs
@@ -60,7 +60,8 @@ pub fn deduct_caller_inner<SPEC: Spec>(caller_account: &mut Account, env: &Env)
 
     // EIP-4844
     if SPEC::enabled(CANCUN) {
-        let data_fee = env.calc_max_data_fee().expect("already checked");
+        // if the tx is not a blob tx, this will be None, so we add zero
+        let data_fee = env.calc_max_data_fee().unwrap_or_default();
         gas_cost = gas_cost.saturating_add(data_fee);
     }