diff --git a/crates/anvil/src/eth/backend/mem/mod.rs b/crates/anvil/src/eth/backend/mem/mod.rs index ea783ce7d0377..beeb6087777aa 100644 --- a/crates/anvil/src/eth/backend/mem/mod.rs +++ b/crates/anvil/src/eth/backend/mem/mod.rs @@ -39,14 +39,7 @@ use alloy_consensus::{ Account, BlockHeader, EnvKzgSettings, Header, Receipt, ReceiptWithBloom, Signed, Transaction as TransactionTrait, TxEnvelope, }; -use alloy_eips::{ - eip1559::BaseFeeParams, - eip2718::{ - EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, EIP7702_TX_TYPE_ID, - LEGACY_TX_TYPE_ID, - }, - eip7840::BlobParams, -}; +use alloy_eips::{eip1559::BaseFeeParams, eip7840::BlobParams}; use alloy_evm::{eth::EthEvmContext, precompiles::PrecompilesMap, Database, Evm}; use alloy_network::{ AnyHeader, AnyRpcBlock, AnyRpcHeader, AnyRpcTransaction, AnyTxEnvelope, AnyTxType, @@ -1443,6 +1436,8 @@ impl Backend { fee_details: FeeDetails, block_env: BlockEnv, ) -> Env { + let tx_type = request.minimal_tx_type() as u8; + let WithOtherFields:: { inner: TransactionRequest { @@ -1458,27 +1453,11 @@ impl Backend { sidecar: _, chain_id, transaction_type, - max_fee_per_gas, - max_priority_fee_per_gas, .. // Rest of the gas fees related fields are taken from `fee_details` }, other, } = request; - let tx_type = transaction_type.unwrap_or_else(|| { - if authorization_list.is_some() { - EIP7702_TX_TYPE_ID - } else if blob_versioned_hashes.is_some() { - EIP4844_TX_TYPE_ID - } else if max_fee_per_gas.is_some() || max_priority_fee_per_gas.is_some() { - EIP1559_TX_TYPE_ID - } else if access_list.is_some() { - EIP2930_TX_TYPE_ID - } else { - LEGACY_TX_TYPE_ID - } - }); - let FeeDetails { gas_price, max_fee_per_gas,