fix effective gas price calculation to be backward compatible with le…

…gacy txs
lambdaclass · Feb 28, 2024 · 8525ce9 · 8525ce9
1 parent 82efd79
commit 8525ce9
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/core/lib/types/src/fee.rs b/core/lib/types/src/fee.rs
@@ -74,8 +74,14 @@ impl Fee {
         assert!(block_base_fee_per_gas <= self.max_fee_per_gas);
         assert!(self.max_priority_fee_per_gas <= self.max_fee_per_gas);
 
-        // For now, we charge only for base fee.
-        block_base_fee_per_gas
+        // The following calculation is based on the EIP-1559 formula:
+        // https://eips.ethereum.org/EIPS/eip-1559
+        let priority_fee_per_gas = std::cmp::min(
+            self.max_priority_fee_per_gas,
+            self.max_fee_per_gas - block_base_fee_per_gas,
+        );
+
+        block_base_fee_per_gas + priority_fee_per_gas
     }
 }