fix: use u128 for calc data fee result (bluealloy#757)

* fix: use u128 for calc data fee result * use U256 for data fee
gr8den · Sep 28, 2023 · ea0d8d8 · ea0d8d8
1 parent 4f916be
commit ea0d8d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/crates/primitives/src/env.rs b/crates/primitives/src/env.rs
@@ -463,10 +463,10 @@ impl Env {
     ///
     /// [EIP-4844]: https://eips.ethereum.org/EIPS/eip-4844
     #[inline]
-    pub fn calc_data_fee(&self) -> Option<u64> {
-        self.block
-            .get_blob_gasprice()
-            .map(|blob_gas_price| blob_gas_price * self.tx.get_total_blob_gas())
+    pub fn calc_data_fee(&self) -> Option<U256> {
+        self.block.get_blob_gasprice().map(|blob_gas_price| {
+            U256::from(blob_gas_price).saturating_mul(U256::from(self.tx.get_total_blob_gas()))
+        })
     }
 
     /// Validate the block environment.

diff --git a/crates/revm/src/evm_impl.rs b/crates/revm/src/evm_impl.rs
@@ -275,7 +275,7 @@ impl<'a, GSPEC: Spec, DB: Database, const INSPECT: bool> Transact<DB::Error>
         // EIP-4844
         if GSPEC::enabled(CANCUN) {
             let data_fee = self.data.env.calc_data_fee().expect("already checked");
-            gas_cost = gas_cost.saturating_add(U256::from(data_fee));
+            gas_cost = gas_cost.saturating_add(data_fee);
         }
 
         caller_account.info.balance = caller_account.info.balance.saturating_sub(gas_cost);