fix: gas price (#638)

* fix gas price

* check that only one of gas price and max fee are set

* fix on max_fee_per_gas

* renaming

crates/ef-testing/src/models/case.rs

@@ -15,7 +15,7 @@ use ef_tests::models::{RootOrState, State};
 use ethers_signers::{LocalWallet, Signer};
 use reth_primitives::{sign_message, SealedBlock};
 use reth_rlp::Decodable as _;
-use revm_primitives::B256;
+use revm_primitives::{B256, U256};
 
 #[derive(Debug)]
 pub struct BlockchainTestCase {
@@ -123,6 +123,24 @@ impl BlockchainTestCase {
             .and_then(|transaction| transaction.gas_price)
             .map(|gas_price| gas_price.0)
             .unwrap_or_default();
+        let max_priority_fee_per_gas = maybe_transaction
+            .and_then(|transaction| transaction.max_priority_fee_per_gas)
+            .map(|max_priority_fee_per_gas| max_priority_fee_per_gas.0)
+            .unwrap_or_default();
+        let effective_gas_price = maybe_transaction
+            .and_then(|transaction| transaction.max_fee_per_gas)
+            .map(|max_fee_per_gas| {
+                max_priority_fee_per_gas.min(max_fee_per_gas.0 - base_fee_per_gas)
+                    + base_fee_per_gas
+            })
+            .unwrap_or_default();
+        // <https://eips.ethereum.org/EIPS/eip-1559>: priority fee is capped because the base fee is filled first
+        if gas_price != U256::ZERO && effective_gas_price != U256::ZERO {
+            return Err(RunnerError::Other(
+                vec!["max_fee_per_gas and gas_price are both set".to_string()].into(),
+            ));
+        }
+        let gas_price = gas_price | effective_gas_price;
         let transaction_cost = gas_price * gas_used;
 
         let post_state = match self.post.clone() {