From 87f328f957d3d9be478286b8e74314a5d5fabc13 Mon Sep 17 00:00:00 2001
From: Steven <112043913+stevencartavia@users.noreply.github.com>
Date: Thu, 7 Nov 2024 23:33:30 -0600
Subject: [PATCH] replace BuilderBlockValidationRequestV3 with alloy type
 (#12396)

---
 Cargo.lock                            |  2 --
 crates/ethereum/node/tests/e2e/rpc.rs |  6 +++--
 crates/rpc/rpc-api/Cargo.toml         |  2 --
 crates/rpc/rpc-api/src/lib.rs         |  5 +---
 crates/rpc/rpc-api/src/validation.rs  | 39 ++-------------------------
 crates/rpc/rpc/src/validation.rs      |  6 ++---
 6 files changed, 9 insertions(+), 51 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4fb7b26f2..809d4be31 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8701,8 +8701,6 @@ dependencies = [
  "reth-engine-primitives",
  "reth-network-peers",
  "reth-rpc-eth-api",
- "serde",
- "serde_with",
 ]
 
 [[package]]
diff --git a/crates/ethereum/node/tests/e2e/rpc.rs b/crates/ethereum/node/tests/e2e/rpc.rs
index 94ae997ee..b1a11b1b5 100644
--- a/crates/ethereum/node/tests/e2e/rpc.rs
+++ b/crates/ethereum/node/tests/e2e/rpc.rs
@@ -2,12 +2,14 @@ use crate::utils::eth_payload_attributes;
 use alloy_eips::{calc_next_block_base_fee, eip2718::Encodable2718};
 use alloy_primitives::{Address, B256, U256};
 use alloy_provider::{network::EthereumWallet, Provider, ProviderBuilder, SendableTx};
-use alloy_rpc_types_beacon::relay::{BidTrace, SignedBidSubmissionV3, SignedBidSubmissionV4};
+use alloy_rpc_types_beacon::relay::{
+    BidTrace, BuilderBlockValidationRequestV3, BuilderBlockValidationRequestV4,
+    SignedBidSubmissionV3, SignedBidSubmissionV4,
+};
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use reth::{
     payload::BuiltPayload,
     rpc::{
-        api::{BuilderBlockValidationRequestV3, BuilderBlockValidationRequestV4},
         compat::engine::payload::block_to_payload_v3,
         types::{engine::BlobsBundleV1, TransactionRequest},
     },
diff --git a/crates/rpc/rpc-api/Cargo.toml b/crates/rpc/rpc-api/Cargo.toml
index 75c06a255..abcdf98b5 100644
--- a/crates/rpc/rpc-api/Cargo.toml
+++ b/crates/rpc/rpc-api/Cargo.toml
@@ -35,8 +35,6 @@ alloy-rpc-types-engine.workspace = true
 
 # misc
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
-serde.workspace = true
-serde_with.workspace = true
 
 [features]
 client = [
diff --git a/crates/rpc/rpc-api/src/lib.rs b/crates/rpc/rpc-api/src/lib.rs
index 0a4fa9f66..73775112d 100644
--- a/crates/rpc/rpc-api/src/lib.rs
+++ b/crates/rpc/rpc-api/src/lib.rs
@@ -46,10 +46,7 @@ pub mod servers {
         rpc::RpcApiServer,
         trace::TraceApiServer,
         txpool::TxPoolApiServer,
-        validation::{
-            BlockSubmissionValidationApiServer, BuilderBlockValidationRequestV3,
-            BuilderBlockValidationRequestV4,
-        },
+        validation::BlockSubmissionValidationApiServer,
         web3::Web3ApiServer,
     };
     pub use reth_rpc_eth_api::{
diff --git a/crates/rpc/rpc-api/src/validation.rs b/crates/rpc/rpc-api/src/validation.rs
index 797eee7ae..5e4f2e261 100644
--- a/crates/rpc/rpc-api/src/validation.rs
+++ b/crates/rpc/rpc-api/src/validation.rs
@@ -1,45 +1,10 @@
 //! API for block submission validation.
 
-use alloy_primitives::B256;
 use alloy_rpc_types_beacon::relay::{
-    BuilderBlockValidationRequest, BuilderBlockValidationRequestV2, SignedBidSubmissionV3,
-    SignedBidSubmissionV4,
+    BuilderBlockValidationRequest, BuilderBlockValidationRequestV2,
+    BuilderBlockValidationRequestV3, BuilderBlockValidationRequestV4,
 };
 use jsonrpsee::proc_macros::rpc;
-use serde::{Deserialize, Serialize};
-use serde_with::{serde_as, DisplayFromStr};
-
-/// A Request to validate a [`SignedBidSubmissionV3`]
-///
-/// <https://github.com/flashbots/builder/blob/7577ac81da21e760ec6693637ce2a81fe58ac9f8/eth/block-validation/api.go#L198-L202>
-#[serde_as]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct BuilderBlockValidationRequestV3 {
-    /// The request to be validated.
-    #[serde(flatten)]
-    pub request: SignedBidSubmissionV3,
-    /// The registered gas limit for the validation request.
-    #[serde_as(as = "DisplayFromStr")]
-    pub registered_gas_limit: u64,
-    /// The parent beacon block root for the validation request.
-    pub parent_beacon_block_root: B256,
-}
-
-/// A Request to validate a [`SignedBidSubmissionV4`]
-///
-/// <https://github.com/flashbots/builder/blob/7577ac81da21e760ec6693637ce2a81fe58ac9f8/eth/block-validation/api.go#L198-L202>
-#[serde_as]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct BuilderBlockValidationRequestV4 {
-    /// The request to be validated.
-    #[serde(flatten)]
-    pub request: SignedBidSubmissionV4,
-    /// The registered gas limit for the validation request.
-    #[serde_as(as = "DisplayFromStr")]
-    pub registered_gas_limit: u64,
-    /// The parent beacon block root for the validation request.
-    pub parent_beacon_block_root: B256,
-}
 
 /// Block validation rpc interface.
 #[cfg_attr(not(feature = "client"), rpc(server, namespace = "flashbots"))]
diff --git a/crates/rpc/rpc/src/validation.rs b/crates/rpc/rpc/src/validation.rs
index 1476180d4..5d7d00f35 100644
--- a/crates/rpc/rpc/src/validation.rs
+++ b/crates/rpc/rpc/src/validation.rs
@@ -5,6 +5,7 @@ use alloy_rpc_types::engine::{
 };
 use alloy_rpc_types_beacon::relay::{
     BidTrace, BuilderBlockValidationRequest, BuilderBlockValidationRequestV2,
+    BuilderBlockValidationRequestV3, BuilderBlockValidationRequestV4,
 };
 use async_trait::async_trait;
 use jsonrpsee::core::RpcResult;
@@ -20,10 +21,7 @@ use reth_provider::{
     StateProviderFactory, WithdrawalsProvider,
 };
 use reth_revm::database::StateProviderDatabase;
-use reth_rpc_api::{
-    BlockSubmissionValidationApiServer, BuilderBlockValidationRequestV3,
-    BuilderBlockValidationRequestV4,
-};
+use reth_rpc_api::BlockSubmissionValidationApiServer;
 use reth_rpc_eth_types::EthApiError;
 use reth_rpc_server_types::{result::internal_rpc_err, ToRpcResult};
 use reth_trie::HashedPostState;