diff --git a/Cargo.lock b/Cargo.lock index d8cb128865..abda07ca05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8381,6 +8381,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "alloy-rpc-types-eth", + "alloy-rpc-types-mev", "alloy-rpc-types-txpool", "async-trait", "derive_more", @@ -8439,6 +8440,7 @@ dependencies = [ "alloy-json-rpc", "alloy-primitives", "alloy-rpc-types-eth", + "alloy-rpc-types-mev", "alloy-rpc-types-txpool", "jsonrpsee", "reth-engine-primitives", @@ -8561,6 +8563,7 @@ dependencies = [ "alloy-network", "alloy-primitives", "alloy-rpc-types-eth", + "alloy-rpc-types-mev", "async-trait", "auto_impl", "dyn-clone", @@ -8673,7 +8676,6 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-serde", "arbitrary", diff --git a/crates/rpc/rpc-api/Cargo.toml b/crates/rpc/rpc-api/Cargo.toml index f9fce56168..b6967a36e4 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-mev.workspace = true alloy-rpc-types-txpool.workspace = true # misc diff --git a/crates/rpc/rpc-api/src/mev.rs b/crates/rpc/rpc-api/src/mev.rs index ebe6f5ee87..b53b0322d0 100644 --- a/crates/rpc/rpc-api/src/mev.rs +++ b/crates/rpc/rpc-api/src/mev.rs @@ -1,7 +1,7 @@ -use jsonrpsee::proc_macros::rpc; -use reth_rpc_types::mev::{ +use alloy_rpc_types_mev::{ SendBundleRequest, SendBundleResponse, SimBundleOverrides, SimBundleResponse, }; +use jsonrpsee::proc_macros::rpc; /// Mev rpc interface. #[cfg_attr(not(feature = "client"), rpc(server, namespace = "mev"))] diff --git a/crates/rpc/rpc-eth-api/Cargo.toml b/crates/rpc/rpc-eth-api/Cargo.toml index e008f51615..f1f8ccc98c 100644 --- a/crates/rpc/rpc-eth-api/Cargo.toml +++ b/crates/rpc/rpc-eth-api/Cargo.toml @@ -38,6 +38,7 @@ alloy-json-rpc.workspace = true alloy-network.workspace = true alloy-primitives.workspace = true alloy-rpc-types-eth.workspace = true +alloy-rpc-types-mev.workspace = true # rpc jsonrpsee = { workspace = true, features = ["server", "macros"] } diff --git a/crates/rpc/rpc-eth-api/src/bundle.rs b/crates/rpc/rpc-eth-api/src/bundle.rs index 563e6ff754..bb213c33f5 100644 --- a/crates/rpc/rpc-eth-api/src/bundle.rs +++ b/crates/rpc/rpc-eth-api/src/bundle.rs @@ -3,11 +3,11 @@ //! See also use alloy_primitives::{Bytes, B256}; -use jsonrpsee::proc_macros::rpc; -use reth_rpc_types::mev::{ +use alloy_rpc_types_mev::{ CancelBundleRequest, CancelPrivateTransactionRequest, EthBundleHash, EthCallBundle, EthCallBundleResponse, EthSendBundle, PrivateTransactionRequest, }; +use jsonrpsee::proc_macros::rpc; /// A subset of the [EthBundleApi] API interface that only supports `eth_callBundle`. #[cfg_attr(not(feature = "client"), rpc(server, namespace = "eth"))] diff --git a/crates/rpc/rpc-types/Cargo.toml b/crates/rpc/rpc-types/Cargo.toml index 17aff4ae86..6119caaac1 100644 --- a/crates/rpc/rpc-types/Cargo.toml +++ b/crates/rpc/rpc-types/Cargo.toml @@ -19,7 +19,6 @@ 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-mev.workspace = true alloy-rpc-types-trace.workspace = true alloy-rpc-types-debug.workspace = true alloy-serde.workspace = true diff --git a/crates/rpc/rpc-types/src/lib.rs b/crates/rpc/rpc-types/src/lib.rs index d8f27432fc..d6d4448589 100644 --- a/crates/rpc/rpc-types/src/lib.rs +++ b/crates/rpc/rpc-types/src/lib.rs @@ -36,9 +36,6 @@ 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 mev -pub use alloy_rpc_types_mev as mev; - // re-export beacon #[cfg(feature = "jsonrpsee-types")] pub use alloy_rpc_types_beacon as beacon; diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index d6e8c4e568..9b69448e32 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -43,6 +43,7 @@ alloy-network.workspace = true alloy-primitives.workspace = true alloy-rlp.workspace = true alloy-rpc-types-eth.workspace = true +alloy-rpc-types-mev.workspace = true alloy-rpc-types-txpool.workspace = true revm = { workspace = true, features = [ "optional_block_gas_limit", diff --git a/crates/rpc/rpc/src/eth/bundle.rs b/crates/rpc/rpc/src/eth/bundle.rs index 484b8dfe86..dd7b2c858d 100644 --- a/crates/rpc/rpc/src/eth/bundle.rs +++ b/crates/rpc/rpc/src/eth/bundle.rs @@ -3,6 +3,7 @@ use std::sync::Arc; use alloy_primitives::{keccak256, U256}; +use alloy_rpc_types_mev::{EthCallBundle, EthCallBundleResponse, EthCallBundleTransactionResult}; use jsonrpsee::core::RpcResult; use reth_evm::{ConfigureEvm, ConfigureEvmEnv}; use reth_primitives::{ @@ -11,7 +12,6 @@ use reth_primitives::{ }; use reth_revm::database::StateProviderDatabase; use reth_rpc_eth_api::{FromEthApiError, FromEvmError}; -use reth_rpc_types::mev::{EthCallBundle, EthCallBundleResponse, EthCallBundleTransactionResult}; use reth_tasks::pool::BlockingTaskGuard; use revm::{ db::CacheDB,