diff --git a/Cargo.lock b/Cargo.lock index 8ad46cf8d663..422a817775ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6175,6 +6175,7 @@ name = "reth" version = "1.0.7" dependencies = [ "alloy-rlp", + "alloy-rpc-types", "aquamarine", "backon", "clap", @@ -6223,7 +6224,6 @@ dependencies = [ "reth-rpc-builder", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types", "reth-rpc-types-compat", "reth-stages", "reth-static-file", diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml index 11d1c79242df..a78f0f958695 100644 --- a/bin/reth/Cargo.toml +++ b/bin/reth/Cargo.toml @@ -37,7 +37,6 @@ reth-consensus-common.workspace = true reth-blockchain-tree.workspace = true reth-rpc-builder.workspace = true reth-rpc.workspace = true -reth-rpc-types.workspace = true reth-rpc-types-compat.workspace = true reth-rpc-api = { workspace = true, features = ["client"] } reth-rpc-eth-types.workspace = true @@ -68,6 +67,7 @@ reth-prune.workspace = true # crypto alloy-rlp.workspace = true +alloy-rpc-types = { workspace = true, features = ["engine"] } # tracing tracing.workspace = true diff --git a/bin/reth/src/commands/debug_cmd/build_block.rs b/bin/reth/src/commands/debug_cmd/build_block.rs index 09a9ae54bcb5..83f7a69cf839 100644 --- a/bin/reth/src/commands/debug_cmd/build_block.rs +++ b/bin/reth/src/commands/debug_cmd/build_block.rs @@ -1,5 +1,6 @@ //! Command for debugging block building. use alloy_rlp::Decodable; +use alloy_rpc_types::engine::{BlobsBundleV1, PayloadAttributes}; use clap::Parser; use eyre::Context; use reth_basic_payload_builder::{ @@ -31,7 +32,6 @@ use reth_provider::{ ProviderFactory, StageCheckpointReader, StateProviderFactory, }; use reth_revm::{database::StateProviderDatabase, primitives::EnvKzgSettings}; -use reth_rpc_types::engine::{BlobsBundleV1, PayloadAttributes}; use reth_stages::StageId; use reth_transaction_pool::{ blobstore::InMemoryBlobStore, BlobStore, EthPooledTransaction, PoolConfig, TransactionOrigin, diff --git a/bin/reth/src/lib.rs b/bin/reth/src/lib.rs index 9d860d3a1b9f..4ff2faa1d65f 100644 --- a/bin/reth/src/lib.rs +++ b/bin/reth/src/lib.rs @@ -151,9 +151,9 @@ pub mod rpc { pub use reth_rpc_builder::*; } - /// Re-exported from `reth_rpc_types`. + /// Re-exported from `alloy_rpc_types`. pub mod types { - pub use reth_rpc_types::*; + pub use alloy_rpc_types::*; } /// Re-exported from `reth_rpc_server_types`. diff --git a/crates/e2e-test-utils/src/network.rs b/crates/e2e-test-utils/src/network.rs index e04815700028..3f25915b35b4 100644 --- a/crates/e2e-test-utils/src/network.rs +++ b/crates/e2e-test-utils/src/network.rs @@ -1,9 +1,6 @@ use futures_util::StreamExt; -use reth::{ - network::{NetworkEvent, NetworkEventListenerProvider, PeersHandleProvider, PeersInfo}, - rpc::types::PeerId, -}; -use reth_network_peers::NodeRecord; +use reth::network::{NetworkEvent, NetworkEventListenerProvider, PeersHandleProvider, PeersInfo}; +use reth_network_peers::{NodeRecord, PeerId}; use reth_tokio_util::EventStream; use reth_tracing::tracing::info; diff --git a/crates/e2e-test-utils/src/traits.rs b/crates/e2e-test-utils/src/traits.rs index cf6cbcf6b131..7bd5a5b3222f 100644 --- a/crates/e2e-test-utils/src/traits.rs +++ b/crates/e2e-test-utils/src/traits.rs @@ -1,5 +1,5 @@ use op_alloy_rpc_types_engine::OptimismExecutionPayloadEnvelopeV3; -use reth::rpc::types::{engine::ExecutionPayloadEnvelopeV3, ExecutionPayloadV3}; +use reth::rpc::types::engine::{ExecutionPayloadEnvelopeV3, ExecutionPayloadV3}; /// The execution payload envelope type. pub trait PayloadEnvelopeExt: Send + Sync + std::fmt::Debug { diff --git a/crates/rpc/rpc-types/src/lib.rs b/crates/rpc/rpc-types/src/lib.rs index a6509c12198f..b455c0acd98d 100644 --- a/crates/rpc/rpc-types/src/lib.rs +++ b/crates/rpc/rpc-types/src/lib.rs @@ -12,9 +12,6 @@ #[allow(hidden_glob_reexports)] mod eth; -/// Alias for a peer identifier -pub type PeerId = alloy_primitives::B512; - // Ethereum specific rpc types related to typed transaction requests and the engine API. #[cfg(feature = "jsonrpsee-types")] pub use eth::error::ToRpcError; diff --git a/examples/custom-rlpx-subprotocol/src/subprotocol/connection/handler.rs b/examples/custom-rlpx-subprotocol/src/subprotocol/connection/handler.rs index dae2d5c8679e..37f374c43dc2 100644 --- a/examples/custom-rlpx-subprotocol/src/subprotocol/connection/handler.rs +++ b/examples/custom-rlpx-subprotocol/src/subprotocol/connection/handler.rs @@ -6,8 +6,7 @@ use reth_eth_wire::{ capability::SharedCapabilities, multiplex::ProtocolConnection, protocol::Protocol, }; use reth_network::protocol::{ConnectionHandler, OnNotSupported}; -use reth_network_api::Direction; -use reth_rpc_types::PeerId; +use reth_network_api::{Direction, PeerId}; use tokio::sync::mpsc; use tokio_stream::wrappers::UnboundedReceiverStream;