diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs index 5f65eb4d6f1f..4996cff67f82 100644 --- a/crates/primitives/src/lib.rs +++ b/crates/primitives/src/lib.rs @@ -63,11 +63,10 @@ pub use transaction::BlobTransactionValidationError; pub use transaction::{ util::secp256k1::{public_key_to_address, recover_signer_unchecked, sign_message}, - AccessList, AccessListItem, IntoRecoveredTransaction, InvalidTransactionError, Signature, - Transaction, TransactionMeta, TransactionSigned, TransactionSignedEcRecovered, - TransactionSignedNoHash, TxEip1559, TxEip2930, TxEip4844, TxEip7702, TxHashOrNumber, TxLegacy, - TxType, EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, EIP7702_TX_TYPE_ID, - LEGACY_TX_TYPE_ID, + IntoRecoveredTransaction, InvalidTransactionError, Signature, Transaction, TransactionMeta, + TransactionSigned, TransactionSignedEcRecovered, TransactionSignedNoHash, TxEip1559, TxEip2930, + TxEip4844, TxEip7702, TxHashOrNumber, TxLegacy, TxType, EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, + EIP4844_TX_TYPE_ID, EIP7702_TX_TYPE_ID, LEGACY_TX_TYPE_ID, }; // Re-exports diff --git a/crates/primitives/src/transaction/access_list.rs b/crates/primitives/src/transaction/access_list.rs index 81c1adec28ac..7a0782bef761 100644 --- a/crates/primitives/src/transaction/access_list.rs +++ b/crates/primitives/src/transaction/access_list.rs @@ -1,13 +1,9 @@ //! [EIP-2930](https://eips.ethereum.org/EIPS/eip-2930): Access List types -/// Re-export from `alloy_eips`. -#[doc(inline)] -pub use alloy_eips::eip2930::{AccessList, AccessListItem, AccessListResult}; - #[cfg(test)] mod tests { - use super::*; use crate::{Address, B256}; + use alloy_eips::eip2930::{AccessList, AccessListItem}; use alloy_rlp::{RlpDecodable, RlpDecodableWrapper, RlpEncodable, RlpEncodableWrapper}; use proptest::proptest; use proptest_arbitrary_interop::arb; diff --git a/crates/primitives/src/transaction/mod.rs b/crates/primitives/src/transaction/mod.rs index bc0579ca6625..bca8a6956bcb 100644 --- a/crates/primitives/src/transaction/mod.rs +++ b/crates/primitives/src/transaction/mod.rs @@ -4,6 +4,7 @@ use crate::{keccak256, Address, BlockHashOrNumber, Bytes, TxHash, TxKind, B256, use alloy_eips::eip7702::SignedAuthorization; use alloy_consensus::SignableTransaction; +use alloy_eips::eip2930::AccessList; use alloy_primitives::Parity; use alloy_rlp::{ Decodable, Encodable, Error as RlpError, Header, EMPTY_LIST_CODE, EMPTY_STRING_CODE, @@ -16,8 +17,6 @@ use rayon::prelude::{IntoParallelIterator, ParallelIterator}; use serde::{Deserialize, Serialize}; use signature::{decode_with_eip155_chain_id, with_eip155_parity}; -pub use access_list::{AccessList, AccessListItem, AccessListResult}; - pub use alloy_consensus::{TxEip1559, TxEip2930, TxEip4844, TxEip7702, TxLegacy}; pub use error::{ diff --git a/crates/rpc/rpc-eth-api/src/core.rs b/crates/rpc/rpc-eth-api/src/core.rs index 3a8b08428075..20edf96d810d 100644 --- a/crates/rpc/rpc-eth-api/src/core.rs +++ b/crates/rpc/rpc-eth-api/src/core.rs @@ -1,6 +1,7 @@ //! Implementation of the [`jsonrpsee`] generated [`EthApiServer`] trait. Handles RPC requests for //! the `eth_` namespace. use alloy_dyn_abi::TypedData; +use alloy_eips::eip2930::AccessListResult; use alloy_json_rpc::RpcObject; use alloy_primitives::{Address, Bytes, B256, B64, U256, U64}; use alloy_rpc_types::{ @@ -12,7 +13,7 @@ use alloy_rpc_types::{ }; use alloy_rpc_types_eth::transaction::TransactionRequest; use jsonrpsee::{core::RpcResult, proc_macros::rpc}; -use reth_primitives::{transaction::AccessListResult, BlockId, BlockNumberOrTag}; +use reth_primitives::{BlockId, BlockNumberOrTag}; use reth_rpc_server_types::{result::internal_rpc_err, ToRpcResult}; use tracing::trace; diff --git a/crates/rpc/rpc-eth-api/src/helpers/call.rs b/crates/rpc/rpc-eth-api/src/helpers/call.rs index b9b7e45a7c56..94eaeb52d45f 100644 --- a/crates/rpc/rpc-eth-api/src/helpers/call.rs +++ b/crates/rpc/rpc-eth-api/src/helpers/call.rs @@ -4,7 +4,7 @@ use crate::{ AsEthApiError, FromEthApiError, FromEvmError, FullEthApiTypes, IntoEthApiError, RpcBlock, }; -use alloy_eips::eip1559::calc_next_block_base_fee; +use alloy_eips::{eip1559::calc_next_block_base_fee, eip2930::AccessListResult}; use alloy_primitives::{Bytes, TxKind, B256, U256}; use alloy_rpc_types::{ simulate::{SimBlock, SimulatePayload, SimulatedBlock}, @@ -20,7 +20,6 @@ use reth_primitives::{ BlockEnv, CfgEnvWithHandlerCfg, EnvWithHandlerCfg, ExecutionResult, HaltReason, ResultAndState, TransactTo, TxEnv, }, - transaction::AccessListResult, Header, TransactionSignedEcRecovered, }; use reth_provider::{ChainSpecProvider, HeaderProvider, StateProvider}; diff --git a/crates/transaction-pool/src/test_utils/gen.rs b/crates/transaction-pool/src/test_utils/gen.rs index 50182b0ddcf5..227a8f80b0e8 100644 --- a/crates/transaction-pool/src/test_utils/gen.rs +++ b/crates/transaction-pool/src/test_utils/gen.rs @@ -1,10 +1,11 @@ use crate::EthPooledTransaction; +use alloy_eips::eip2930::AccessList; use alloy_primitives::{Address, B256, U256}; use rand::Rng; use reth_chainspec::MAINNET; use reth_primitives::{ - constants::MIN_PROTOCOL_BASE_FEE, sign_message, AccessList, Bytes, Transaction, - TransactionSigned, TxEip1559, TxEip4844, TxKind, TxLegacy, + constants::MIN_PROTOCOL_BASE_FEE, sign_message, Bytes, Transaction, TransactionSigned, + TxEip1559, TxEip4844, TxKind, TxLegacy, }; /// A generator for transactions for testing purposes. diff --git a/crates/transaction-pool/src/test_utils/mock.rs b/crates/transaction-pool/src/test_utils/mock.rs index 783cab1e620a..604f4ffefbfc 100644 --- a/crates/transaction-pool/src/test_utils/mock.rs +++ b/crates/transaction-pool/src/test_utils/mock.rs @@ -7,6 +7,7 @@ use crate::{ CoinbaseTipOrdering, EthBlobTransactionSidecar, EthPoolTransaction, PoolTransaction, ValidPoolTransaction, }; +use alloy_eips::eip2930::AccessList; use alloy_primitives::{Address, Bytes, ChainId, TxHash, TxKind, B256, U256}; use paste::paste; use rand::{ @@ -16,10 +17,10 @@ use rand::{ use reth_primitives::{ constants::{eip4844::DATA_GAS_PER_BLOB, MIN_PROTOCOL_BASE_FEE}, transaction::TryFromRecoveredTransactionError, - AccessList, BlobTransactionSidecar, BlobTransactionValidationError, - PooledTransactionsElementEcRecovered, Signature, Transaction, TransactionSigned, - TransactionSignedEcRecovered, TxEip1559, TxEip2930, TxEip4844, TxLegacy, TxType, - EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, LEGACY_TX_TYPE_ID, + BlobTransactionSidecar, BlobTransactionValidationError, PooledTransactionsElementEcRecovered, + Signature, Transaction, TransactionSigned, TransactionSignedEcRecovered, TxEip1559, TxEip2930, + TxEip4844, TxLegacy, TxType, EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, + LEGACY_TX_TYPE_ID, }; use std::{ops::Range, sync::Arc, time::Instant, vec::IntoIter}; diff --git a/crates/transaction-pool/src/traits.rs b/crates/transaction-pool/src/traits.rs index 117ea6b32141..cef776aab320 100644 --- a/crates/transaction-pool/src/traits.rs +++ b/crates/transaction-pool/src/traits.rs @@ -7,14 +7,14 @@ use crate::{ validate::ValidPoolTransaction, AllTransactionsEvents, }; -use alloy_eips::eip4844::BlobAndProofV1; +use alloy_eips::{eip2930::AccessList, eip4844::BlobAndProofV1}; use alloy_primitives::{Address, TxHash, TxKind, B256, U256}; use futures_util::{ready, Stream}; use reth_eth_wire_types::HandleMempoolData; use reth_execution_types::ChangedAccount; use reth_primitives::{ - kzg::KzgSettings, transaction::TryFromRecoveredTransactionError, AccessList, - BlobTransactionSidecar, BlobTransactionValidationError, PooledTransactionsElement, + kzg::KzgSettings, transaction::TryFromRecoveredTransactionError, BlobTransactionSidecar, + BlobTransactionValidationError, PooledTransactionsElement, PooledTransactionsElementEcRecovered, SealedBlock, Transaction, TransactionSignedEcRecovered, EIP1559_TX_TYPE_ID, EIP4844_TX_TYPE_ID, EIP7702_TX_TYPE_ID, }; diff --git a/testing/testing-utils/src/generators.rs b/testing/testing-utils/src/generators.rs index a83e97aac28b..46930a5dd9ef 100644 --- a/testing/testing-utils/src/generators.rs +++ b/testing/testing-utils/src/generators.rs @@ -497,8 +497,9 @@ pub fn random_request(rng: &mut R) -> Request { #[cfg(test)] mod tests { use super::*; + use alloy_eips::eip2930::AccessList; use alloy_primitives::Parity; - use reth_primitives::{hex, public_key_to_address, AccessList, Signature, TxEip1559}; + use reth_primitives::{hex, public_key_to_address, Signature, TxEip1559}; use std::str::FromStr; #[test]