diff --git a/Cargo.lock b/Cargo.lock index abda07ca05a9..b3eca8f547b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8439,6 +8439,7 @@ dependencies = [ "alloy-eips", "alloy-json-rpc", "alloy-primitives", + "alloy-rpc-types-anvil", "alloy-rpc-types-eth", "alloy-rpc-types-mev", "alloy-rpc-types-txpool", @@ -8672,7 +8673,6 @@ dependencies = [ "alloy-primitives", "alloy-rpc-types", "alloy-rpc-types-admin", - "alloy-rpc-types-anvil", "alloy-rpc-types-beacon", "alloy-rpc-types-debug", "alloy-rpc-types-engine", diff --git a/crates/rpc/rpc-api/Cargo.toml b/crates/rpc/rpc-api/Cargo.toml index b6967a36e45c..6d726ef9a241 100644 --- a/crates/rpc/rpc-api/Cargo.toml +++ b/crates/rpc/rpc-api/Cargo.toml @@ -24,6 +24,7 @@ alloy-eips.workspace = true alloy-json-rpc.workspace = true alloy-primitives.workspace = true alloy-rpc-types-eth.workspace = true +alloy-rpc-types-anvil.workspace = true alloy-rpc-types-mev.workspace = true alloy-rpc-types-txpool.workspace = true diff --git a/crates/rpc/rpc-api/src/anvil.rs b/crates/rpc/rpc-api/src/anvil.rs index e916fa8c232c..99ed3721d921 100644 --- a/crates/rpc/rpc-api/src/anvil.rs +++ b/crates/rpc/rpc-api/src/anvil.rs @@ -1,10 +1,8 @@ use jsonrpsee::{core::RpcResult, proc_macros::rpc}; use alloy_primitives::{Address, Bytes, B256, U256}; -use reth_rpc_types::{ - anvil::{Forking, Metadata, MineOptions, NodeInfo}, - Block, -}; +use alloy_rpc_types_anvil::{Forking, Metadata, MineOptions, NodeInfo}; +use reth_rpc_types::Block; /// Anvil rpc interface. /// https://book.getfoundry.sh/reference/anvil/#custom-methods diff --git a/crates/rpc/rpc-api/src/ganache.rs b/crates/rpc/rpc-api/src/ganache.rs index 99a50c0fae42..0f46b481efe2 100644 --- a/crates/rpc/rpc-api/src/ganache.rs +++ b/crates/rpc/rpc-api/src/ganache.rs @@ -1,6 +1,6 @@ use alloy_primitives::U256; +use alloy_rpc_types_anvil::MineOptions; use jsonrpsee::{core::RpcResult, proc_macros::rpc}; -use reth_rpc_types::anvil::MineOptions; /// Ganache rpc interface. /// https://github.com/trufflesuite/ganache/tree/develop/docs diff --git a/crates/rpc/rpc-api/src/hardhat.rs b/crates/rpc/rpc-api/src/hardhat.rs index c34991fd3a4f..e6c42c99b94e 100644 --- a/crates/rpc/rpc-api/src/hardhat.rs +++ b/crates/rpc/rpc-api/src/hardhat.rs @@ -1,6 +1,6 @@ use alloy_primitives::{Address, Bytes, B256, U256}; +use alloy_rpc_types_anvil::{Forking, Metadata}; use jsonrpsee::{core::RpcResult, proc_macros::rpc}; -use reth_rpc_types::anvil::{Forking, Metadata}; /// Hardhat rpc interface. /// https://hardhat.org/hardhat-network/docs/reference#hardhat-network-methods diff --git a/crates/rpc/rpc-types/Cargo.toml b/crates/rpc/rpc-types/Cargo.toml index 6119caaac1e8..481f3bf72a4c 100644 --- a/crates/rpc/rpc-types/Cargo.toml +++ b/crates/rpc/rpc-types/Cargo.toml @@ -17,7 +17,6 @@ workspace = true alloy-primitives = { workspace = true, features = ["rand", "rlp", "serde"] } alloy-rpc-types.workspace = true alloy-rpc-types-admin.workspace = true -alloy-rpc-types-anvil.workspace = true alloy-rpc-types-beacon = { workspace = true, optional = true } alloy-rpc-types-trace.workspace = true alloy-rpc-types-debug.workspace = true diff --git a/crates/rpc/rpc-types/src/lib.rs b/crates/rpc/rpc-types/src/lib.rs index d6d44485896a..885d50e9d280 100644 --- a/crates/rpc/rpc-types/src/lib.rs +++ b/crates/rpc/rpc-types/src/lib.rs @@ -33,9 +33,6 @@ pub mod trace { // re-export admin pub use alloy_rpc_types_admin as admin; -// Anvil specific rpc types coming from alloy. -pub use alloy_rpc_types_anvil as anvil; - // re-export beacon #[cfg(feature = "jsonrpsee-types")] pub use alloy_rpc_types_beacon as beacon;