@@ -39,14 +39,7 @@ use alloy_consensus::{
39
39
Account , BlockHeader , EnvKzgSettings , Header , Receipt , ReceiptWithBloom , Signed ,
40
40
Transaction as TransactionTrait , TxEnvelope ,
41
41
} ;
42
- use alloy_eips:: {
43
- eip1559:: BaseFeeParams ,
44
- eip2718:: {
45
- EIP1559_TX_TYPE_ID , EIP2930_TX_TYPE_ID , EIP4844_TX_TYPE_ID , EIP7702_TX_TYPE_ID ,
46
- LEGACY_TX_TYPE_ID ,
47
- } ,
48
- eip7840:: BlobParams ,
49
- } ;
42
+ use alloy_eips:: { eip1559:: BaseFeeParams , eip7840:: BlobParams } ;
50
43
use alloy_evm:: { eth:: EthEvmContext , precompiles:: PrecompilesMap , Database , Evm } ;
51
44
use alloy_network:: {
52
45
AnyHeader , AnyRpcBlock , AnyRpcHeader , AnyRpcTransaction , AnyTxEnvelope , AnyTxType ,
@@ -1443,6 +1436,8 @@ impl Backend {
1443
1436
fee_details : FeeDetails ,
1444
1437
block_env : BlockEnv ,
1445
1438
) -> Env {
1439
+ let tx_type = request. minimal_tx_type ( ) as u8 ;
1440
+
1446
1441
let WithOtherFields :: < TransactionRequest > {
1447
1442
inner :
1448
1443
TransactionRequest {
@@ -1458,27 +1453,11 @@ impl Backend {
1458
1453
sidecar : _,
1459
1454
chain_id,
1460
1455
transaction_type,
1461
- max_fee_per_gas,
1462
- max_priority_fee_per_gas,
1463
1456
.. // Rest of the gas fees related fields are taken from `fee_details`
1464
1457
} ,
1465
1458
other,
1466
1459
} = request;
1467
1460
1468
- let tx_type = transaction_type. unwrap_or_else ( || {
1469
- if authorization_list. is_some ( ) {
1470
- EIP7702_TX_TYPE_ID
1471
- } else if blob_versioned_hashes. is_some ( ) {
1472
- EIP4844_TX_TYPE_ID
1473
- } else if max_fee_per_gas. is_some ( ) || max_priority_fee_per_gas. is_some ( ) {
1474
- EIP1559_TX_TYPE_ID
1475
- } else if access_list. is_some ( ) {
1476
- EIP2930_TX_TYPE_ID
1477
- } else {
1478
- LEGACY_TX_TYPE_ID
1479
- }
1480
- } ) ;
1481
-
1482
1461
let FeeDetails {
1483
1462
gas_price,
1484
1463
max_fee_per_gas,
0 commit comments