diff --git a/Cargo.lock b/Cargo.lock index 08da8e2bc..fceb2c06a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8241,6 +8241,7 @@ name = "reth-rpc" version = "1.0.6" dependencies = [ "alloy-dyn-abi", + "alloy-eips", "alloy-genesis", "alloy-network", "alloy-primitives", @@ -8298,6 +8299,7 @@ dependencies = [ name = "reth-rpc-api" version = "1.0.6" dependencies = [ + "alloy-eips", "alloy-json-rpc", "alloy-primitives", "jsonrpsee", diff --git a/crates/rpc/rpc-api/Cargo.toml b/crates/rpc/rpc-api/Cargo.toml index 399dfe9cc..480d06f99 100644 --- a/crates/rpc/rpc-api/Cargo.toml +++ b/crates/rpc/rpc-api/Cargo.toml @@ -21,6 +21,7 @@ reth-network-peers.workspace = true # ethereum alloy-json-rpc.workspace = true +alloy-eips.workspace = true alloy-primitives.workspace = true # misc diff --git a/crates/rpc/rpc-api/src/debug.rs b/crates/rpc/rpc-api/src/debug.rs index 0876b464c..671ec82a0 100644 --- a/crates/rpc/rpc-api/src/debug.rs +++ b/crates/rpc/rpc-api/src/debug.rs @@ -1,6 +1,6 @@ +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::{Address, Bytes, B256}; use jsonrpsee::{core::RpcResult, proc_macros::rpc}; -use reth_primitives::{BlockId, BlockNumberOrTag}; use reth_rpc_types::{ debug::ExecutionWitness, trace::geth::{ diff --git a/crates/rpc/rpc-api/src/engine.rs b/crates/rpc/rpc-api/src/engine.rs index 09993dd2f..73a6b35fb 100644 --- a/crates/rpc/rpc-api/src/engine.rs +++ b/crates/rpc/rpc-api/src/engine.rs @@ -3,11 +3,11 @@ //! This contains the `engine_` namespace and the subset of the `eth_` namespace that is exposed to //! the consensus client. +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_json_rpc::RpcObject; use alloy_primitives::{Address, BlockHash, Bytes, B256, U256, U64}; use jsonrpsee::{core::RpcResult, proc_macros::rpc}; use reth_engine_primitives::EngineTypes; -use reth_primitives::{BlockId, BlockNumberOrTag}; use reth_rpc_types::{ engine::{ ClientVersionV1, ExecutionPayloadBodiesV1, ExecutionPayloadBodiesV2, diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index b825fa8c5..028ce238f 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -38,10 +38,11 @@ reth-trie.workspace = true # ethereum alloy-dyn-abi.workspace = true -alloy-rlp.workspace = true -alloy-primitives.workspace = true +alloy-eips.workspace = true alloy-genesis.workspace = true alloy-network.workspace = true +alloy-primitives.workspace = true +alloy-rlp.workspace = true revm = { workspace = true, features = [ "optional_block_gas_limit", "optional_eip3607", diff --git a/crates/rpc/rpc/src/engine.rs b/crates/rpc/rpc/src/engine.rs index 96d4c674d..53df19ff9 100644 --- a/crates/rpc/rpc/src/engine.rs +++ b/crates/rpc/rpc/src/engine.rs @@ -1,7 +1,7 @@ +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_network::Network; use alloy_primitives::{Address, Bytes, B256, U256, U64}; use jsonrpsee::core::RpcResult as Result; -use reth_primitives::{BlockId, BlockNumberOrTag}; use reth_rpc_api::{EngineEthApiServer, EthApiServer, EthFilterApiServer}; /// Re-export for convenience pub use reth_rpc_engine_api::EngineApi; diff --git a/crates/rpc/rpc/src/otterscan.rs b/crates/rpc/rpc/src/otterscan.rs index 6062ee08d..61ff794e5 100644 --- a/crates/rpc/rpc/src/otterscan.rs +++ b/crates/rpc/rpc/src/otterscan.rs @@ -1,8 +1,8 @@ +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_network::Network; use alloy_primitives::{Address, Bytes, TxHash, B256, U256}; use async_trait::async_trait; use jsonrpsee::{core::RpcResult, types::ErrorObjectOwned}; -use reth_primitives::{BlockId, BlockNumberOrTag}; use reth_rpc_api::{EthApiServer, OtterscanServer}; use reth_rpc_eth_api::{ helpers::{EthTransactions, TraceExt},