fix: correctly set txtype when setting up TxEnv

Author: klkvr

crates/anvil/src/eth/backend/mem/mod.rs

@@ -42,7 +42,14 @@ use alloy_consensus::{
     Account, BlockHeader, EnvKzgSettings, Header, Receipt, ReceiptWithBloom, Signed,
     Transaction as TransactionTrait, TxEnvelope,
 };
-use alloy_eips::{eip1559::BaseFeeParams, eip4844::MAX_BLOBS_PER_BLOCK};
+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,
+    },
+    eip4844::MAX_BLOBS_PER_BLOCK,
+};
 use alloy_evm::{eth::EthEvmContext, Database, Evm};
 use alloy_network::{
     AnyHeader, AnyRpcBlock, AnyRpcHeader, AnyRpcTransaction, AnyTxEnvelope, AnyTxType,
@@ -1410,7 +1417,7 @@ impl Backend {
                     authorization_list,
                     nonce,
                     sidecar: _,
-                    chain_id: _,
+                    chain_id,
                     transaction_type,
                     .. // Rest of the gas fees related fields are taken from `fee_details`
                 },
@@ -1424,6 +1431,20 @@ impl Backend {
             max_fee_per_blob_gas,
         } = fee_details;
 
+        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 gas_limit = gas.unwrap_or(block_env.gas_limit);
         let mut env = self.env.read().clone();
         env.evm_env.block_env = block_env;
@@ -1463,10 +1484,10 @@ impl Backend {
                     Some(addr) => TxKind::Call(*addr),
                     None => TxKind::Create,
                 },
-                tx_type: transaction_type.unwrap_or_default(),
+                tx_type,
                 value: value.unwrap_or_default(),
                 data: input.into_input().unwrap_or_default(),
-                chain_id: None,
+                chain_id: Some(chain_id.unwrap_or(self.env.read().evm_env.cfg_env.chain_id)),
                 access_list: access_list.unwrap_or_default(),
                 blob_hashes,
                 authorization_list: authorization_list.unwrap_or_default(),

crates/evm/evm/src/executors/mod.rs

@@ -438,6 +438,7 @@ impl Executor {
     ) -> eyre::Result<RawCallResult> {
         let mut env = self.build_test_env(from, to.into(), calldata, value);
         env.tx.authorization_list = authorization_list;
+        env.tx.tx_type = 4;
         self.call_with_env(env)
     }