chore(rpc): move message signing to EthTransactions

crates/optimism/rpc/Cargo.toml

@@ -23,9 +23,11 @@ reth-rpc-types.workspace = true
 reth-primitives = { workspace = true, features = ["optimism"] }
 reth-provider.workspace = true
 reth-transaction-pool.workspace = true
+reth-tasks.workspace = true
 
 # async
 futures.workspace = true
+tokio = { workspace = true, features = ["sync"] }
 
 # rpc
 jsonrpsee.workspace = true

crates/optimism/rpc/src/block.rs

@@ -1,13 +1,21 @@
 //! Loads and formats OP block RPC response.   
 
+use reth_evm::ConfigureEvm;
 use reth_primitives::TransactionMeta;
-use reth_provider::{BlockReaderIdExt, ChainSpecProvider};
+use reth_provider::{
+    BlockReaderIdExt, ChainSpecProvider, EvmEnvProvider, HeaderProvider, StateProviderFactory,
+};
 use reth_rpc::eth::{
-    api::{BuildReceipt, EthBlocks, LoadBlock, ReceiptBuilder},
+    api::{
+        EthBlocks, LoadBlock, LoadPendingBlock, LoadReceipt, PendingBlock, ReceiptBuilder,
+        SpawnBlocking,
+    },
     cache::EthStateCache,
     error::EthResult,
 };
 use reth_rpc_types::{AnyTransactionReceipt, BlockId};
+use reth_transaction_pool::TransactionPool;
+use tokio::sync::Mutex;
 
 use crate::receipt::op_receipt_fields;
 
@@ -16,14 +24,19 @@ use super::OptimismApi;
 impl<Provider, Pool, Network, EvmConfig> EthBlocks
     for OptimismApi<Provider, Pool, Network, EvmConfig>
 where
-    Provider: BlockReaderIdExt + ChainSpecProvider,
+    Self: LoadBlock,
+    Provider: BlockReaderIdExt + ChainSpecProvider + HeaderProvider,
 {
+    fn provider(&self) -> impl HeaderProvider {
+        self.inner.provider()
+    }
+
     async fn block_receipts(
         &self,
         block_id: BlockId,
     ) -> EthResult<Option<Vec<AnyTransactionReceipt>>>
     where
-        Self: BuildReceipt,
+        Self: LoadReceipt,
     {
         if let Some((block, receipts)) = self.load_block_and_receipts(block_id).await? {
             let block_number = block.number;
@@ -69,6 +82,7 @@ where
 impl<Provider, Pool, Network, EvmConfig> LoadBlock
     for OptimismApi<Provider, Pool, Network, EvmConfig>
 where
+    Self: LoadPendingBlock + SpawnBlocking,
     Provider: BlockReaderIdExt,
 {
     #[inline]
@@ -81,3 +95,33 @@ where
         self.inner.cache()
     }
 }
+
+impl<Provider, Pool, Network, EvmConfig> LoadPendingBlock
+    for OptimismApi<Provider, Pool, Network, EvmConfig>
+where
+    Provider: BlockReaderIdExt + EvmEnvProvider + ChainSpecProvider + StateProviderFactory,
+    Pool: TransactionPool,
+    EvmConfig: ConfigureEvm,
+{
+    #[inline]
+    fn provider(
+        &self,
+    ) -> impl BlockReaderIdExt + EvmEnvProvider + ChainSpecProvider + StateProviderFactory {
+        self.inner.provider()
+    }
+
+    #[inline]
+    fn pool(&self) -> impl TransactionPool {
+        self.inner.pool()
+    }
+
+    #[inline]
+    fn pending_block(&self) -> &Mutex<Option<PendingBlock>> {
+        self.inner.pending_block()
+    }
+
+    #[inline]
+    fn evm_config(&self) -> &impl ConfigureEvm {
+        self.inner.evm_config()
+    }
+}

crates/optimism/rpc/src/lib.rs

@@ -9,7 +9,8 @@
 
 use std::sync::Arc;
 
-use reth_rpc::eth::api::EthApiInner;
+use reth_rpc::eth::api::{EthApiInner, SpawnBlocking};
+use reth_tasks::{pool::BlockingTaskPool, TaskSpawner};
 
 pub mod block;
 pub mod error;
@@ -22,16 +23,22 @@ pub mod transaction;
 /// requests. See [`EthApi`](reth_rpc::EthApi) for the default L1 implementation.
 #[allow(missing_debug_implementations)]
 #[allow(dead_code)]
+#[derive(Clone)]
 pub struct OptimismApi<Provider, Pool, Network, EvmConfig> {
     /// All nested fields bundled together.
     inner: Arc<EthApiInner<Provider, Pool, Network, EvmConfig>>,
 }
 
-unsafe impl<Provider, Pool, Network, EvmConfig> Send
-    for OptimismApi<Provider, Pool, Network, EvmConfig>
-{
-}
-unsafe impl<Provider, Pool, Network, EvmConfig> Sync
+impl<Provider, Pool, Network, EvmConfig> SpawnBlocking
     for OptimismApi<Provider, Pool, Network, EvmConfig>
+where
+    Self: Clone + Send + Sync + 'static,
 {
+    fn io_task_spawner(&self) -> impl TaskSpawner {
+        self.inner.task_spawner()
+    }
+
+    fn tracing_task_pool(&self) -> &BlockingTaskPool {
+        self.inner.blocking_task_pool()
+    }
 }

crates/optimism/rpc/src/receipt.rs

@@ -4,15 +4,16 @@ use crate::{transaction::OptimismTxMeta, OptimismApi};
 use reth_primitives::{Receipt, TransactionMeta, TransactionSigned};
 use reth_provider::{BlockIdReader, ChainSpecProvider};
 use reth_rpc::eth::{
-    api::{BuildReceipt, ReceiptBuilder},
+    api::{LoadReceipt, ReceiptBuilder},
     cache::EthStateCache,
     error::{EthApiError, EthResult},
 };
 use reth_rpc_types::{AnyTransactionReceipt, OptimismTransactionReceiptFields};
 
-impl<Provider, Pool, Network, EvmConfig> BuildReceipt
+impl<Provider, Pool, Network, EvmConfig> LoadReceipt
     for OptimismApi<Provider, Pool, Network, EvmConfig>
 where
+    Self: Send + Sync,
     Provider: BlockIdReader + ChainSpecProvider,
 {
     #[inline]
@@ -25,10 +26,7 @@ where
         tx: TransactionSigned,
         meta: TransactionMeta,
         receipt: Receipt,
-    ) -> EthResult<AnyTransactionReceipt>
-    where
-        Self: Send + Sync,
-    {
+    ) -> EthResult<AnyTransactionReceipt> {
         let (block, receipts) = self
             .cache()
             .get_block_and_receipts(meta.block_hash)

crates/rpc/rpc/src/debug.rs

@@ -33,7 +33,7 @@ use tokio::sync::{AcquireError, OwnedSemaphorePermit};
 
 use crate::{
     eth::{
-        api::{LoadBlock, LoadTransaction, StateCacheDB, TraceExt},
+        api::{EthTransactions, LoadBlock, LoadTransaction, StateCacheDB, TraceExt},
         error::{EthApiError, EthResult},
         revm_utils::{prepare_call_env, EvmOverrides},
     },
@@ -639,7 +639,7 @@ where
         + StateProviderFactory
         + EvmEnvProvider
         + 'static,
-    Eth: EthApiSpec + LoadBlock + TraceExt + 'static,
+    Eth: EthApiSpec + EthTransactions + LoadBlock + TraceExt + 'static,
 {
     /// Handler for `debug_getRawHeader`
     async fn raw_header(&self, block_id: BlockId) -> RpcResult<Bytes> {