Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rpc: rm useless alloy-rpc-types-mev reexport #11093

Merged
merged 4 commits into from
Sep 22, 2024
+11 −10
Merged

rpc: rm useless alloy-rpc-types-mev reexport #11093

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95bed89
rpc: rm useless alloy-rpc-types-mev reexport
tcoratger Sep 21, 2024
69d1888
fmt
tcoratger Sep 21, 2024
cfdfcbe
Merge branch 'main' into alloy-rpc-types-mev
tcoratger Sep 21, 2024
35d3e40
fix conflicts
tcoratger Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/rpc/rpc-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

# misc
jsonrpsee = { workspace = true, features = ["server", "macros"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/rpc/rpc-api/src/mev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"))]
Expand Down
1 change: 1 addition & 0 deletions crates/rpc/rpc-eth-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/rpc/rpc-eth-api/src/bundle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
//! See also <https://docs.flashbots.net/flashbots-auction/searchers/advanced/rpc-endpoint>

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"))]
Expand Down
1 change: 0 additions & 1 deletion crates/rpc/rpc-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-txpool.workspace = true
alloy-rpc-types-debug.workspace = true
Expand Down
3 changes: 0 additions & 3 deletions crates/rpc/rpc-types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions crates/rpc/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
revm = { workspace = true, features = [
"optional_block_gas_limit",
"optional_eip3607",
Expand Down
2 changes: 1 addition & 1 deletion crates/rpc/rpc/src/eth/bundle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand All @@ -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,
Expand Down
Loading