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

feat: move mev rpc types to alloy #9108

Merged
merged 7 commits into from Jul 8, 2024
Merged

feat: move mev rpc types to alloy #9108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4db1b97
dev: move mev rpc types to alloy
Jun 25, 2024
c1f58f8
dev: change ns and remove unused dep
Jun 26, 2024
890c2e2
dev: move serde_json to dev workspace
Jun 26, 2024
a47d6b9
dev: add alloy-rpc-types-mev
Jun 26, 2024
740a439
dev: use mev ns
Jun 26, 2024
0f120c3
Merge branch 'main' into feat-move-mev-types-to-alloy
mattsse Jul 8, 2024
c088d52
chore: update alloy
mattsse Jul 8, 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
14 changes: 14 additions & 0 deletions 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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ alloy-rpc-types-txpool = { version = "0.1", default-features = false }
alloy-serde = { version = "0.1", default-features = false }
alloy-rpc-types-engine = { version = "0.1", default-features = false }
alloy-rpc-types-eth = { version = "0.1", default-features = false }
alloy-rpc-types-mev = { version = "0.1", default-features = false }
alloy-rpc-types-trace = { version = "0.1", default-features = false }
alloy-genesis = { version = "0.1", default-features = false }
alloy-node-bindings = { version = "0.1", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion crates/rpc/rpc-api/src/mev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use jsonrpsee::proc_macros::rpc;
use reth_rpc_types::{
use reth_rpc_types::mev::{
SendBundleRequest, SendBundleResponse, SimBundleOverrides, SimBundleResponse,
};

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -4,7 +4,7 @@

use jsonrpsee::proc_macros::rpc;
use reth_primitives::{Bytes, B256};
use reth_rpc_types::{
use reth_rpc_types::mev::{
CancelBundleRequest, CancelPrivateTransactionRequest, EthBundleHash, EthCallBundle,
EthCallBundleResponse, EthSendBundle, PrivateTransactionRequest,
};
Expand Down
7 changes: 4 additions & 3 deletions crates/rpc/rpc-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ workspace = true
# ethereum
alloy-primitives = { workspace = true, features = ["rand", "rlp", "serde"] }
alloy-rpc-types = { workspace = true, features = ["jsonrpsee-types"] }
alloy-rpc-types-admin.workspace = true
alloy-rpc-types-anvil.workspace = true
alloy-rpc-types-trace.workspace = true
alloy-rpc-types-beacon.workspace = true
alloy-rpc-types-admin.workspace = true
alloy-rpc-types-mev.workspace = true
alloy-rpc-types-trace.workspace = true
alloy-rpc-types-txpool.workspace = true
alloy-serde.workspace = true
alloy-rpc-types-engine = { workspace = true, features = ["jsonrpsee-types"] }

# misc
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
jsonrpsee-types = { workspace = true, optional = true }

[dev-dependencies]
Expand All @@ -38,6 +38,7 @@ proptest-derive.workspace = true
rand.workspace = true
similar-asserts.workspace = true
bytes.workspace = true
serde_json.workspace = true

[features]
default = ["jsonrpsee-types"]
Expand Down
11 changes: 6 additions & 5 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 @@ -11,7 +11,6 @@
#![cfg_attr(not(test), warn(unused_crate_dependencies))]
#[allow(hidden_glob_reexports)]
mod eth;
mod mev;
mod peer;
mod rpc;

Expand All @@ -29,15 +28,18 @@ pub mod trace {
pub use alloy_rpc_types_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 mev
pub use alloy_rpc_types_mev as mev;

// re-export beacon
pub use alloy_rpc_types_beacon as beacon;

// re-export admin
pub use alloy_rpc_types_admin as admin;

// re-export txpool
pub use alloy_rpc_types_txpool as txpool;

Expand All @@ -51,6 +53,5 @@ pub use eth::{
transaction::{self, TransactionRequest, TypedTransactionRequest},
};

pub use mev::*;
pub use peer::*;
pub use rpc::*;
Loading
Loading