refactor: make submission impl non blocking (#24)

Cargo.toml

@@ -30,6 +30,7 @@ secp256k1 = { version = "0.28.0", features = ["rand-std"] }
 serde = "1.0.188"
 serde_json = "1.0.107"
 serde_with = "3.3.0"
+tokio = "1.35"
 uuid = "1.6.1"
 
 [dev-dependencies]

src/lib.rs

@@ -1,12 +1,5 @@
-use std::sync::Arc;
-
-pub mod cli_ext;
 pub use cli_ext::ValidationCliExt;
 
+pub mod cli_ext;
 pub mod rpc;
-use rpc::ValidationApiInner;
-
-/// The type that implements the `validation` rpc namespace trait
-pub struct ValidationApi<Provider> {
-    inner: Arc<ValidationApiInner<Provider>>,
-}
+pub use rpc::ValidationApi;

src/rpc/api.rs

@@ -0,0 +1,16 @@
+use crate::rpc::ValidationRequestBody;
+use jsonrpsee::core::RpcResult;
+use jsonrpsee::proc_macros::rpc;
+
+/// trait interface for a custom rpc namespace: `validation`
+///
+/// This defines an additional namespace where all methods are configured as trait functions.
+#[rpc(client, server, namespace = "flashbots")]
+pub trait ValidationApi {
+    /// Validates a block submitted to the relay
+    #[method(name = "validateBuilderSubmissionV2")]
+    async fn validate_builder_submission_v2(
+        &self,
+        request_body: ValidationRequestBody,
+    ) -> RpcResult<()>;
+}

src/rpc/mod.rs

@@ -1,33 +1,24 @@
+pub use crate::rpc::api::{ValidationApiClient, ValidationApiServer};
 use async_trait::async_trait;
-use jsonrpsee::{core::RpcResult, proc_macros::rpc};
-
-use crate::ValidationApi;
+use jsonrpsee::core::RpcResult;
+use jsonrpsee::types::error::ErrorCode;
 use reth::providers::{
     AccountReader, BlockReaderIdExt, ChainSpecProvider, HeaderProvider, StateProviderFactory,
     WithdrawalsProvider,
 };
 use std::sync::Arc;
-
-mod types;
 pub use types::*;
+use validation::ValidationRequest;
 
+mod api;
 mod result;
+mod types;
 mod utils;
 mod validation;
-use validation::ValidationRequest;
 
-/// trait interface for a custom rpc namespace: `validation`
-///
-/// This defines an additional namespace where all methods are configured as trait functions.
-#[rpc(client, server, namespace = "flashbots")]
-#[async_trait]
-pub trait ValidationApi {
-    /// Validates a block submitted to the relay
-    #[method(name = "validateBuilderSubmissionV2")]
-    async fn validate_builder_submission_v2(
-        &self,
-        request_body: ValidationRequestBody,
-    ) -> RpcResult<()>;
+/// The type that implements the `validation` rpc namespace trait
+pub struct ValidationApi<Provider> {
+    inner: Arc<ValidationApiInner<Provider>>,
 }
 
 impl<Provider> ValidationApi<Provider>
@@ -38,11 +29,12 @@ where
         + HeaderProvider
         + AccountReader
         + WithdrawalsProvider
+        + Clone
         + 'static,
 {
     /// The provider that can interact with the chain.
-    pub fn provider(&self) -> &Provider {
-        &self.inner.provider
+    pub fn provider(&self) -> Provider {
+        self.inner.provider.clone()
     }
 
     /// Create a new instance of the [ValidationApi]
@@ -61,6 +53,7 @@ where
         + HeaderProvider
         + AccountReader
         + WithdrawalsProvider
+        + Clone
         + 'static,
 {
     /// Validates a block submitted to the relay
@@ -69,7 +62,9 @@ where
         request_body: ValidationRequestBody,
     ) -> RpcResult<()> {
         let request = ValidationRequest::new(request_body, self.provider());
-        request.validate().await
+        tokio::task::spawn_blocking(move || request.validate())
+            .await
+            .map_err(|_| ErrorCode::InternalError)?
     }
 }
 

src/rpc/validation.rs

@@ -1,5 +1,7 @@
+use crate::rpc::result::internal_rpc_err;
+use crate::rpc::types::*;
+use crate::rpc::utils::*;
 use jsonrpsee::core::RpcResult;
-
 use reth::consensus_common::validation::full_validation;
 use reth::primitives::{
     revm_primitives::AccountInfo, Address, Receipts, SealedBlock, TransactionSigned, U256,
@@ -11,28 +13,22 @@ use reth::providers::{
 use reth::revm::{database::StateProviderDatabase, db::BundleState, processor::EVMProcessor};
 use reth::rpc::compat::engine::payload::try_into_sealed_block;
 use reth::rpc::result::ToRpcResult;
-
 use reth_tracing::tracing;
-use uuid::Uuid;
-
-use crate::rpc::result::internal_rpc_err;
-use crate::rpc::types::*;
-use crate::rpc::utils::*;
-
 use std::time::Instant;
+use uuid::Uuid;
 
-pub struct ValidationRequest<'a, Provider> {
+pub struct ValidationRequest<Provider> {
     request_id: Uuid,
     start_time: Instant,
     request_body: ValidationRequestBody,
-    provider: &'a Provider,
+    provider: Provider,
 }
 
-impl<'a, Provider> ValidationRequest<'a, Provider> {
+impl<Provider> ValidationRequest<Provider> {
     pub fn new(
         request_body: ValidationRequestBody,
-        provider: &'a Provider,
-    ) -> ValidationRequest<'a, Provider> {
+        provider: Provider,
+    ) -> ValidationRequest<Provider> {
         let request_id = Uuid::new_v4();
         let start_time = Instant::now();
         tracing::info!(block_hash = ?request_body.message.block_hash, ?request_id, "Received Validation Request");
@@ -45,7 +41,7 @@ impl<'a, Provider> ValidationRequest<'a, Provider> {
     }
 }
 
-impl<Provider> ValidationRequest<'_, Provider>
+impl<Provider> ValidationRequest<Provider>
 where
     Provider: BlockReaderIdExt
         + ChainSpecProvider
@@ -55,9 +51,8 @@ where
         + WithdrawalsProvider
         + 'static,
 {
-    pub async fn validate(&self) -> RpcResult<()> {
+    pub fn validate(&self) -> RpcResult<()> {
         self.validate_inner()
-            .await
             .inspect_err(|error| {
                 tracing::warn!(
                     request_id = self.request_id.to_string(),
@@ -74,7 +69,8 @@ where
                 );
             })
     }
-    async fn validate_inner(&self) -> RpcResult<()> {
+
+    fn validate_inner(&self) -> RpcResult<()> {
         self.trace_validation_step(self.check_gas_limit(), "Check Gas Limit")?;
 
         self.trace_validation_step(
@@ -148,7 +144,7 @@ where
     }
 
     fn validate_header(&self, block: &SealedBlock) -> RpcResult<()> {
-        full_validation(block, self.provider, &self.provider.chain_spec()).to_rpc_result()
+        full_validation(block, &self.provider, &self.provider.chain_spec()).to_rpc_result()
     }
 
     fn execute_and_verify_block(&self, block: &SealedBlock) -> RpcResult<BundleStateWithReceipts> {