diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs index 6b61beeea..6aadae208 100644 --- a/crates/primitives/src/lib.rs +++ b/crates/primitives/src/lib.rs @@ -75,7 +75,7 @@ pub use alloy_primitives::{ eip191_hash_message, hex, hex_literal, keccak256, ruint, utils::format_ether, Address, BlockHash, BlockNumber, Bloom, BloomInput, Bytes, ChainId, Selector, StorageKey, - StorageValue, TxHash, TxIndex, TxKind, TxNumber, B128, B256, B512, B64, U128, U256, U64, U8, + StorageValue, TxHash, TxIndex, TxNumber, B128, B256, B512, B64, U128, U256, U64, U8, }; pub use reth_ethereum_forks::*; pub use revm_primitives::{self, JumpTable}; diff --git a/crates/primitives/src/transaction/compat.rs b/crates/primitives/src/transaction/compat.rs index f54e55372..319ae55b1 100644 --- a/crates/primitives/src/transaction/compat.rs +++ b/crates/primitives/src/transaction/compat.rs @@ -1,4 +1,5 @@ -use crate::{Address, Transaction, TransactionSigned, TxKind, U256}; +use crate::{Address, Transaction, TransactionSigned, U256}; +use alloy_primitives::TxKind; use revm_primitives::{AuthorizationList, TxEnv}; /// Implements behaviour to fill a [`TxEnv`] from another transaction. diff --git a/crates/primitives/src/transaction/mod.rs b/crates/primitives/src/transaction/mod.rs index bca8a6956..01c290a0f 100644 --- a/crates/primitives/src/transaction/mod.rs +++ b/crates/primitives/src/transaction/mod.rs @@ -1,7 +1,8 @@ //! Transaction types. -use crate::{keccak256, Address, BlockHashOrNumber, Bytes, TxHash, TxKind, B256, U256}; +use crate::{keccak256, Address, BlockHashOrNumber, Bytes, TxHash, B256, U256}; use alloy_eips::eip7702::SignedAuthorization; +use alloy_primitives::TxKind; use alloy_consensus::SignableTransaction; use alloy_eips::eip2930::AccessList; diff --git a/crates/rpc/rpc/src/eth/helpers/types.rs b/crates/rpc/rpc/src/eth/helpers/types.rs index ae188e0c7..8cd659bb8 100644 --- a/crates/rpc/rpc/src/eth/helpers/types.rs +++ b/crates/rpc/rpc/src/eth/helpers/types.rs @@ -1,9 +1,10 @@ //! L1 `eth` API types. use alloy_network::{AnyNetwork, Network}; +use alloy_primitives::TxKind; use alloy_rpc_types::{Transaction, TransactionInfo}; use alloy_serde::WithOtherFields; -use reth_primitives::{Address, TransactionSignedEcRecovered, TxKind}; +use reth_primitives::{Address, TransactionSignedEcRecovered}; use reth_rpc_types_compat::{ transaction::{from_primitive_signature, GasPrice}, TransactionCompat, diff --git a/crates/storage/provider/src/test_utils/blocks.rs b/crates/storage/provider/src/test_utils/blocks.rs index 43df70f5c..237fc8e34 100644 --- a/crates/storage/provider/src/test_utils/blocks.rs +++ b/crates/storage/provider/src/test_utils/blocks.rs @@ -1,13 +1,13 @@ //! Dummy blocks and data for tests use crate::{DatabaseProviderRW, ExecutionOutcome}; -use alloy_primitives::{Log, Parity, Sealable}; +use alloy_primitives::{Log, Parity, Sealable, TxKind}; use once_cell::sync::Lazy; use reth_db::tables; use reth_db_api::{database::Database, models::StoredBlockBodyIndices}; use reth_primitives::{ alloy_primitives, b256, hex_literal::hex, Account, Address, BlockBody, BlockNumber, Bytes, Header, Receipt, SealedBlock, SealedBlockWithSenders, SealedHeader, Signature, Transaction, - TransactionSigned, TxKind, TxLegacy, TxType, Withdrawal, Withdrawals, B256, U256, + TransactionSigned, TxLegacy, TxType, Withdrawal, Withdrawals, B256, U256, }; use reth_trie::root::{state_root_unhashed, storage_root_unhashed}; use revm::{ diff --git a/crates/transaction-pool/src/test_utils/gen.rs b/crates/transaction-pool/src/test_utils/gen.rs index 227a8f80b..f87083f16 100644 --- a/crates/transaction-pool/src/test_utils/gen.rs +++ b/crates/transaction-pool/src/test_utils/gen.rs @@ -1,11 +1,11 @@ use crate::EthPooledTransaction; use alloy_eips::eip2930::AccessList; -use alloy_primitives::{Address, B256, U256}; +use alloy_primitives::{Address, TxKind, B256, U256}; use rand::Rng; use reth_chainspec::MAINNET; use reth_primitives::{ constants::MIN_PROTOCOL_BASE_FEE, sign_message, Bytes, Transaction, TransactionSigned, - TxEip1559, TxEip4844, TxKind, TxLegacy, + TxEip1559, TxEip4844, TxLegacy, }; /// A generator for transactions for testing purposes.