WIP

Author: shousper

Cargo.toml

@@ -11,34 +11,40 @@ members = [
   "relay-server",
   "searcher-api-types",
   "searcher-client",
-  "common"
+  "common",
 ]
 
 [workspace.dependencies]
 async-trait = "0.1"
 axum = { version = "0.8", features = ["ws"] }
 bytes = "1.6"
-eth2 = { git = "https://github.com/cakevm/lighthouse", rev="68776b6" }
+eth2 = { git = "https://github.com/cakevm/lighthouse", rev = "68776b6" }
 ethereum_serde_utils = "0.8.0"
 ethereum_ssz = "0.9.0"
 ethereum_ssz_derive = "0.9.0"
 eyre = "0.6.12"
 flate2 = "1.0"
 futures = "0.3.30"
-http = "1.2"
-jsonrpsee = "0.24.9"
-jsonrpsee-core = "0.24.9"
+http = "1.3"
+jsonrpsee = "0.25.1"
+jsonrpsee-core = "0.25.1"
 mediatype = "0.19.13"
-reqwest = { version = "0.12.12", features = ["json"] }
+reqwest = { version = "0.12.19", features = ["json"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1", features = ["raw_value"] }
 serde_with = "3.12.0"
 superstruct = "0.9.0"
-tokio = { version = "1", default-features = false, features = ["signal", "rt-multi-thread", "macros"] }
-tokio-tungstenite = "0.24.0"
+tokio = { version = "1", default-features = false, features = [
+  "signal",
+  "rt-multi-thread",
+  "macros",
+] }
+tokio-tungstenite = "0.26.2"
 tracing = { version = "0.1", features = ["attributes"] }
 url = "2.5.4"
 
 alloy-primitives = "1.0.0"
 alloy-rlp = "0.3.11"
-alloy-rpc-types-mev = "0.14.0"
+alloy-rpc-types-mev = "1.0.9"
+alloy-rpc-types-beacon = "1.0.9"
+alloy-rpc-types-engine = "1.0.9"

relay-api-types/Cargo.toml

@@ -10,3 +10,9 @@ ethereum_ssz.workspace = true
 ethereum_ssz_derive.workspace = true
 serde.workspace = true
 superstruct.workspace = true
+
+# Alloy dependencies
+alloy-primitives.workspace = true
+alloy-rpc-types-mev.workspace = true
+alloy-rpc-types-beacon = { workspace = true, features = ["ssz"] }
+alloy-rpc-types-engine.workspace = true

relay-api-types/src/lib.rs

@@ -103,7 +103,7 @@ impl RelayClient {
     pub async fn submit_block<E>(
         &self,
         query_params: &SubmitBlockQueryParams,
-        body: &SubmitBlockRequest<E>,
+        body: &SubmitBlockRequest,
         content_type: ContentType,
         content_encoding: ContentEncoding,
     ) -> Result<(), Error>
@@ -219,7 +219,7 @@ impl RelayClient {
     pub async fn submit_block_optimistic_v2<E>(
         &self,
         query_params: &SubmitBlockQueryParams,
-        body: &SubmitBlockRequest<E>,
+        body: &SubmitBlockRequest,
         content_type: ContentType,
         content_encoding: ContentEncoding,
     ) -> Result<(), Error>
@@ -281,7 +281,7 @@ impl RelayClient {
             match message {
                 Ok(Message::Text(text)) => match serde_json::from_str::<TopBidUpdate>(&text) {
                     Ok(update) => Some(Ok(update)),
-                    Err(e) => Some(Err(Error::InvalidJson(e, text))),
+                    Err(e) => Some(Err(Error::InvalidJson(e, text.as_str().to_string()))),
                 },
                 Ok(Message::Binary(bin)) => match serde_json::from_slice::<TopBidUpdate>(&bin) {
                     Ok(update) => Some(Ok(update)),

relay-client/src/lib.rs

@@ -22,7 +22,7 @@ pub trait Builder<E: EthSpec> {
     async fn submit_block(
         &self,
         query_params: SubmitBlockQueryParams,
-        body: SubmitBlockRequest<E>,
+        body: SubmitBlockRequest,
     ) -> Result<(), ErrorResponse>;
     /// Submit a new block header to the relay.
     ///
@@ -39,7 +39,7 @@ pub trait Builder<E: EthSpec> {
     async fn submit_block_optimistic_v2(
         &self,
         query_params: SubmitBlockQueryParams,
-        body: SubmitBlockRequest<E>,
+        body: SubmitBlockRequest,
     ) -> Result<(), ErrorResponse>;
 
     /// Submit a cancellation for all bids.

relay-server/src/builder.rs

@@ -62,7 +62,7 @@ where
 async fn submit_block<I, A, E>(
     Query(query_params): Query<SubmitBlockQueryParams>,
     State(api_impl): State<I>,
-    JsonOrSszMaybeGzipped(body): JsonOrSszMaybeGzipped<SubmitBlockRequest<E>>,
+    JsonOrSszMaybeGzipped(body): JsonOrSszMaybeGzipped<SubmitBlockRequest>,
 ) -> Result<Response<Body>, StatusCode>
 where
     E: EthSpec,
@@ -78,7 +78,7 @@ where
 async fn submit_block_optimistic_v2<I, A, E>(
     Query(query_params): Query<SubmitBlockQueryParams>,
     State(api_impl): State<I>,
-    JsonOrSszMaybeGzipped(body): JsonOrSszMaybeGzipped<SubmitBlockRequest<E>>,
+    JsonOrSszMaybeGzipped(body): JsonOrSszMaybeGzipped<SubmitBlockRequest>,
 ) -> Result<Response<Body>, StatusCode>
 where
     E: EthSpec,