diff --git a/Cargo.lock b/Cargo.lock index 855ec1286..5c5966d43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7553,13 +7553,13 @@ dependencies = [ "reth-basic-payload-builder", "reth-chainspec", "reth-errors", + "reth-ethereum-primitives", "reth-evm", "reth-evm-ethereum", "reth-execution-types", "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", "reth-primitives-traits", "reth-revm", "reth-storage-api", diff --git a/crates/ethereum/payload/Cargo.toml b/crates/ethereum/payload/Cargo.toml index baa9db306..6bf9c812f 100644 --- a/crates/ethereum/payload/Cargo.toml +++ b/crates/ethereum/payload/Cargo.toml @@ -13,7 +13,7 @@ workspace = true [dependencies] # reth -reth-primitives.workspace = true +reth-ethereum-primitives.workspace = true reth-primitives-traits.workspace = true reth-revm.workspace = true reth-transaction-pool.workspace = true diff --git a/crates/ethereum/payload/src/lib.rs b/crates/ethereum/payload/src/lib.rs index 7f0d770c1..568307c2a 100644 --- a/crates/ethereum/payload/src/lib.rs +++ b/crates/ethereum/payload/src/lib.rs @@ -16,8 +16,9 @@ use reth_basic_payload_builder::{ commit_withdrawals, is_better_payload, BuildArguments, BuildOutcome, PayloadBuilder, PayloadConfig, }; -use reth_chainspec::{ChainSpec, ChainSpecProvider, EthChainSpec}; +use reth_chainspec::{ChainSpec, ChainSpecProvider, EthChainSpec, EthereumHardforks}; use reth_errors::RethError; +use reth_ethereum_primitives::{Block, BlockBody, Receipt, TransactionSigned}; use reth_evm::{ env::EvmEnv, system_calls::SystemCaller, ConfigureEvm, Evm, EvmError, InvalidTxError, NextBlockEnvAttributes, @@ -27,9 +28,6 @@ use reth_execution_types::ExecutionOutcome; use reth_payload_builder::{EthBuiltPayload, EthPayloadBuilderAttributes}; use reth_payload_builder_primitives::PayloadBuilderError; use reth_payload_primitives::PayloadBuilderAttributes; -use reth_primitives::{ - Block, BlockBody, EthereumHardforks, InvalidTransactionError, Receipt, TransactionSigned, -}; use reth_primitives_traits::{ proofs::{self}, Block as _, SignedTransaction, @@ -50,6 +48,7 @@ use tracing::{debug, trace, warn}; mod config; pub use config::*; +use reth_primitives_traits::transaction::error::InvalidTransactionError; use reth_transaction_pool::error::Eip4844PoolTransactionError; type BestTransactionsIter = Box<