chore:changed import for custom-engine-types (paradigmxyz#15573)

Author: Soubhik-10

Cargo.lock

@@ -7,14 +7,11 @@ license.workspace = true
 
 [dependencies]
 reth.workspace = true
-reth-chainspec.workspace = true
-reth-node-api.workspace = true
-reth-node-core.workspace = true
 reth-payload-builder.workspace = true
 reth-basic-payload-builder.workspace = true
 reth-ethereum-payload-builder.workspace = true
 reth-engine-local.workspace = true
-reth-node-ethereum = { workspace = true, features = ["test-utils"] }
+reth-ethereum = { workspace = true, features = ["test-utils", "node", "node-api", "pool"] }
 reth-tracing.workspace = true
 reth-trie-db.workspace = true
 alloy-genesis.workspace = true

examples/custom-engine-types/Cargo.toml

@@ -29,37 +29,39 @@ use alloy_rpc_types::{
     Withdrawal,
 };
 use reth::{
-    api::{InvalidPayloadAttributesError, PayloadTypes},
     builder::{
         components::{BasicPayloadServiceBuilder, ComponentsBuilder, PayloadBuilderBuilder},
         node::NodeTypes,
         rpc::{EngineValidatorBuilder, RpcAddOns},
         BuilderContext, FullNodeTypes, Node, NodeAdapter, NodeBuilder, NodeComponentsBuilder,
     },
-    primitives::{Block, EthPrimitives, RecoveredBlock, SealedBlock, TransactionSigned},
-    providers::{EthStorage, StateProviderFactory},
     rpc::types::engine::ExecutionPayload,
     tasks::TaskManager,
-    transaction_pool::{PoolTransaction, TransactionPool},
 };
 use reth_basic_payload_builder::{BuildArguments, BuildOutcome, PayloadBuilder, PayloadConfig};
-use reth_chainspec::{Chain, ChainSpec, ChainSpecProvider};
 use reth_engine_local::payload::UnsupportedLocalAttributes;
-use reth_ethereum_payload_builder::{EthereumBuilderConfig, EthereumExecutionPayloadValidator};
-use reth_node_api::{
-    payload::{EngineApiMessageVersion, EngineObjectValidationError, PayloadOrAttributes},
-    validate_version_specific_fields, AddOnsContext, EngineTypes, EngineValidator,
-    FullNodeComponents, NewPayloadError, PayloadAttributes, PayloadBuilderAttributes,
-    PayloadValidator,
-};
-use reth_node_core::{args::RpcServerArgs, node_config::NodeConfig};
-use reth_node_ethereum::{
+use reth_ethereum::{
+    chainspec::{Chain, ChainSpec, ChainSpecProvider},
     node::{
-        EthereumConsensusBuilder, EthereumExecutorBuilder, EthereumNetworkBuilder,
-        EthereumPoolBuilder,
+        api::{
+            payload::{EngineApiMessageVersion, EngineObjectValidationError, PayloadOrAttributes},
+            validate_version_specific_fields, AddOnsContext, EngineTypes, EngineValidator,
+            FullNodeComponents, InvalidPayloadAttributesError, NewPayloadError, PayloadAttributes,
+            PayloadBuilderAttributes, PayloadTypes, PayloadValidator,
+        },
+        core::{args::RpcServerArgs, node_config::NodeConfig},
+        node::{
+            EthereumConsensusBuilder, EthereumExecutorBuilder, EthereumNetworkBuilder,
+            EthereumPoolBuilder,
+        },
+        EthEvmConfig, EthereumEthApiBuilder,
     },
-    EthEvmConfig, EthereumEthApiBuilder,
+    pool::{PoolTransaction, TransactionPool},
+    primitives::{RecoveredBlock, SealedBlock},
+    provider::{EthStorage, StateProviderFactory},
+    Block, EthPrimitives, TransactionSigned,
 };
+use reth_ethereum_payload_builder::{EthereumBuilderConfig, EthereumExecutionPayloadValidator};
 use reth_payload_builder::{EthBuiltPayload, EthPayloadBuilderAttributes, PayloadBuilderError};
 use reth_tracing::{RethTracer, Tracer};
 use reth_trie_db::MerklePatriciaTrie;
@@ -160,7 +162,7 @@ impl PayloadTypes for CustomEngineTypes {
 
     fn block_to_payload(
         block: SealedBlock<
-                <<Self::BuiltPayload as reth_node_api::BuiltPayload>::Primitives as reth_node_api::NodePrimitives>::Block,
+                <<Self::BuiltPayload as reth_ethereum::node::api::BuiltPayload>::Primitives as reth_ethereum::node::api::NodePrimitives>::Block,
             >,
     ) -> ExecutionData {
         let (payload, sidecar) =