feat: remove relay types (#8314)

Cargo.lock

@@ -185,8 +185,6 @@ dependencies = [
  "arbitrary",
  "c-kzg",
  "derive_more",
- "ethereum_ssz",
- "ethereum_ssz_derive",
  "once_cell",
  "proptest",
  "proptest-derive",
@@ -458,8 +456,6 @@ dependencies = [
  "alloy-rlp",
  "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=64feb9b)",
  "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=64feb9b)",
- "ethereum_ssz",
- "ethereum_ssz_derive",
  "jsonrpsee-types",
  "jsonwebtoken 9.3.0",
  "rand 0.8.5",
@@ -2240,16 +2236,6 @@ dependencies = [
  "darling_macro 0.10.2",
 ]
 
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core 0.13.4",
- "darling_macro 0.13.4",
-]
-
 [[package]]
 name = "darling"
 version = "0.20.9"
@@ -2274,20 +2260,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "darling_core"
 version = "0.20.9"
@@ -2313,17 +2285,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core 0.13.4",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "darling_macro"
 version = "0.20.9"
@@ -2879,18 +2840,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "ethereum_ssz_derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6085d7fd3cf84bd2b8fec150d54c8467fb491d8db9c460607c5534f653a0ee38"
-dependencies = [
- "darling 0.13.4",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "event-listener"
 version = "2.5.3"
@@ -7864,17 +7813,13 @@ dependencies = [
  "alloy-rpc-types-trace",
  "arbitrary",
  "bytes",
- "ethereum_ssz",
- "ethereum_ssz_derive",
  "jsonrpsee-types",
  "proptest",
  "proptest-derive",
  "rand 0.8.5",
  "serde",
  "serde_json",
- "serde_with",
  "similar-asserts",
- "thiserror",
 ]
 
 [[package]]
@@ -8313,7 +8258,6 @@ dependencies = [
  "ark-ff 0.3.0",
  "ark-ff 0.4.2",
  "bytes",
- "ethereum_ssz",
  "fastrlp",
  "num-bigint",
  "num-traits",
@@ -9140,12 +9084,6 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"

crates/rpc/rpc-api/src/validation.rs

@@ -1,7 +1,9 @@
 //! API for block submission validation.
 
 use jsonrpsee::proc_macros::rpc;
-use reth_rpc_types::relay::{BuilderBlockValidationRequest, BuilderBlockValidationRequestV2};
+use reth_rpc_types::beacon::relay::{
+    BuilderBlockValidationRequest, BuilderBlockValidationRequestV2,
+};
 
 /// Block validation rpc interface.
 #[cfg_attr(not(feature = "client"), rpc(server, namespace = "flashbots"))]

crates/rpc/rpc-types/Cargo.toml

@@ -20,20 +20,15 @@ alloy-rpc-types-anvil.workspace = true
 alloy-rpc-types-trace.workspace = true
 alloy-rpc-types-beacon.workspace = true
 alloy-rpc-types-engine = { workspace = true, features = ["jsonrpsee-types"] }
-ethereum_ssz_derive = { version = "0.5", optional = true }
-ethereum_ssz = { version = "0.5", optional = true }
 
 # misc
-thiserror.workspace = true
 serde = { workspace = true, features = ["derive"] }
-serde_with = "3.3"
 serde_json.workspace = true
 jsonrpsee-types = { workspace = true, optional = true }
 
 [features]
 default = ["jsonrpsee-types"]
 arbitrary = ["alloy-primitives/arbitrary", "alloy-rpc-types/arbitrary"]
-ssz = ["dep:ethereum_ssz" ,"dep:ethereum_ssz_derive", "alloy-primitives/ssz", "alloy-rpc-types/ssz", "alloy-rpc-types-engine/ssz"]
 
 
 [dev-dependencies]

crates/rpc/rpc-types/src/lib.rs

@@ -14,7 +14,6 @@ mod eth;
 mod mev;
 mod net;
 mod peer;
-pub mod relay;
 mod rpc;
 
 // re-export for convenience
@@ -31,6 +30,9 @@ pub mod trace {
 // Anvil specific rpc types coming from alloy.
 pub use alloy_rpc_types_anvil as anvil;
 
+// re-export beacon
+pub use alloy_rpc_types_beacon as beacon;
+
 // Ethereum specific rpc types related to typed transaction requests and the engine API.
 pub use eth::{
     engine,

crates/rpc/rpc-types/src/relay/error.rs

@@ -1,40 +0,0 @@
-//! Error types for the relay.
-
-use alloy_primitives::B256;
-
-/// Error thrown by the `validateBuilderSubmission` endpoints if the message differs from payload.
-#[derive(Debug, thiserror::Error)]
-pub enum ValidateBuilderSubmissionEqualityError {
-    /// Thrown if parent hash mismatches
-    #[error("incorrect ParentHash {actual}, expected {expected}")]
-    IncorrectParentHash {
-        /// The expected parent hash
-        expected: B256,
-        /// The actual parent hash
-        actual: B256,
-    },
-    /// Thrown if block hash mismatches
-    #[error("incorrect BlockHash {actual}, expected {expected}")]
-    IncorrectBlockHash {
-        /// The expected block hash
-        expected: B256,
-        /// The actual block hash
-        actual: B256,
-    },
-    /// Thrown if block hash mismatches
-    #[error("incorrect GasLimit {actual}, expected {expected}")]
-    IncorrectGasLimit {
-        /// The expected gas limit
-        expected: u64,
-        /// The actual gas limit
-        actual: B256,
-    },
-    /// Thrown if block hash mismatches
-    #[error("incorrect GasUsed {actual}, expected {expected}")]
-    IncorrectGasUsed {
-        /// The expected gas used
-        expected: u64,
-        /// The actual gas used
-        actual: B256,
-    },
-}