diff --git a/Cargo.lock b/Cargo.lock index 0057a70c2ad5..2f27f3b8e7ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7720,6 +7720,7 @@ name = "reth-node-builder" version = "1.0.7" dependencies = [ "alloy-primitives", + "alloy-rpc-types", "aquamarine", "eyre", "fdlimit", @@ -7764,7 +7765,6 @@ dependencies = [ "reth-rpc-engine-api", "reth-rpc-eth-types", "reth-rpc-layer", - "reth-rpc-types", "reth-stages", "reth-static-file", "reth-tasks", diff --git a/crates/node/builder/Cargo.toml b/crates/node/builder/Cargo.toml index d5468f741d5b..c23dd1f8f3bf 100644 --- a/crates/node/builder/Cargo.toml +++ b/crates/node/builder/Cargo.toml @@ -50,7 +50,6 @@ reth-rpc-builder.workspace = true reth-rpc-engine-api.workspace = true reth-rpc-eth-types.workspace = true reth-rpc-layer.workspace = true -reth-rpc-types.workspace = true reth-rpc.workspace = true reth-stages.workspace = true reth-static-file.workspace = true @@ -61,6 +60,7 @@ reth-transaction-pool.workspace = true ## ethereum alloy-primitives.workspace = true +alloy-rpc-types = { workspace = true, features = ["engine"] } ## async futures.workspace = true diff --git a/crates/node/builder/src/launch/common.rs b/crates/node/builder/src/launch/common.rs index 27b4eb90be3a..37bb4cc5b7d8 100644 --- a/crates/node/builder/src/launch/common.rs +++ b/crates/node/builder/src/launch/common.rs @@ -925,9 +925,9 @@ where // Verify that the healthy node is running the same chain as the current node. let chain_id = futures::executor::block_on(async { EthApiClient::< - reth_rpc_types::Transaction, - reth_rpc_types::Block, - reth_rpc_types::Receipt, + alloy_rpc_types::Transaction, + alloy_rpc_types::Block, + alloy_rpc_types::Receipt, >::chain_id(&client) .await })? diff --git a/crates/node/builder/src/launch/engine.rs b/crates/node/builder/src/launch/engine.rs index d5f9e7673e85..e8c5f7818ef1 100644 --- a/crates/node/builder/src/launch/engine.rs +++ b/crates/node/builder/src/launch/engine.rs @@ -1,5 +1,6 @@ //! Engine node related functionality. +use alloy_rpc_types::engine::ClientVersionV1; use futures::{future::Either, stream, stream_select, StreamExt}; use reth_beacon_consensus::{ hooks::{EngineHooks, StaticFileHook}, @@ -31,7 +32,6 @@ use reth_node_events::{cl::ConsensusLayerHealthEvents, node}; use reth_payload_primitives::PayloadBuilder; use reth_provider::providers::BlockchainProvider2; use reth_rpc_engine_api::{capabilities::EngineCapabilities, EngineApi}; -use reth_rpc_types::engine::ClientVersionV1; use reth_tasks::TaskExecutor; use reth_tokio_util::EventSender; use reth_tracing::tracing::{debug, error, info}; diff --git a/crates/node/builder/src/launch/mod.rs b/crates/node/builder/src/launch/mod.rs index a0114bdad447..ee0215e08bb1 100644 --- a/crates/node/builder/src/launch/mod.rs +++ b/crates/node/builder/src/launch/mod.rs @@ -11,6 +11,7 @@ pub use exex::ExExLauncher; use std::{future::Future, sync::Arc}; +use alloy_rpc_types::engine::ClientVersionV1; use futures::{future::Either, stream, stream_select, StreamExt}; use reth_beacon_consensus::{ hooks::{EngineHooks, PruneHook, StaticFileHook}, @@ -35,7 +36,6 @@ use reth_node_events::{cl::ConsensusLayerHealthEvents, node}; use reth_primitives::format_ether; use reth_provider::providers::BlockchainProvider; use reth_rpc_engine_api::{capabilities::EngineCapabilities, EngineApi}; -use reth_rpc_types::engine::ClientVersionV1; use reth_tasks::TaskExecutor; use reth_tracing::tracing::{debug, info}; use reth_transaction_pool::TransactionPool;