chore(rpc): pending block helper trait

crates/rpc/rpc/Cargo.toml

@@ -75,7 +75,7 @@ tracing.workspace = true
 tracing-futures = "0.2"
 schnellru.workspace = true
 futures.workspace = true
-derive_more.workspace = true
+derive_more = { workspace = true, default-features = false, features = ["deref", "deref_mut", "constructor"] }
 dyn-clone.workspace = true
 
 [dev-dependencies]

crates/rpc/rpc/src/debug.rs

@@ -1,6 +1,6 @@
 use crate::{
     eth::{
-        api::{traits::SpawnBlocking, EthTransactions},
+        api::{EthTransactions, LoadState, SpawnBlocking},
         error::{EthApiError, EthResult},
         revm_utils::{prepare_call_env, EvmOverrides},
     },
@@ -65,7 +65,7 @@ impl<Provider, Eth> DebugApi<Provider, Eth> {
 impl<Provider, Eth> DebugApi<Provider, Eth>
 where
     Provider: BlockReaderIdExt + HeaderProvider + ChainSpecProvider + 'static,
-    Eth: EthTransactions + 'static,
+    Eth: EthTransactions + LoadState + SpawnBlocking + 'static,
 {
     /// Acquires a permit to execute a tracing call.
     async fn acquire_trace_permit(&self) -> Result<OwnedSemaphorePermit, AcquireError> {
@@ -614,7 +614,7 @@ where
 impl<Provider, Eth> DebugApiServer for DebugApi<Provider, Eth>
 where
     Provider: BlockReaderIdExt + HeaderProvider + ChainSpecProvider + 'static,
-    Eth: EthApiSpec + SpawnBlocking + 'static,
+    Eth: EthApiSpec + SpawnBlocking + LoadState + 'static,
 {
     /// Handler for `debug_getRawHeader`
     async fn raw_header(&self, block_id: BlockId) -> RpcResult<Bytes> {

crates/rpc/rpc/src/eth/api/block.rs

@@ -18,6 +18,8 @@ use reth_transaction_pool::TransactionPool;
 
 use crate::eth::api::EthBlocks;
 
+use super::traits::LoadPendingBlock;
+
 impl<Provider, Pool, Network, EvmConfig> EthBlocks for EthApi<Provider, Pool, Network, EvmConfig>
 where
     Provider: BlockReaderIdExt + BlockReader + ReceiptProvider,
@@ -94,7 +96,10 @@ where
     pub(crate) async fn block(
         &self,
         block_id: impl Into<BlockId>,
-    ) -> EthResult<Option<reth_primitives::SealedBlock>> {
+    ) -> EthResult<Option<reth_primitives::SealedBlock>>
+    where
+        Self: LoadPendingBlock,
+    {
         self.block_with_senders(block_id)
             .await
             .map(|maybe_block| maybe_block.map(|block| block.block))
@@ -104,7 +109,10 @@ where
     pub(crate) async fn block_with_senders(
         &self,
         block_id: impl Into<BlockId>,
-    ) -> EthResult<Option<reth_primitives::SealedBlockWithSenders>> {
+    ) -> EthResult<Option<reth_primitives::SealedBlockWithSenders>>
+    where
+        Self: LoadPendingBlock,
+    {
         let block_id = block_id.into();
 
         if block_id.is_pending() {
@@ -133,7 +141,10 @@ where
         &self,
         block_id: impl Into<BlockId>,
         full: bool,
-    ) -> EthResult<Option<RichBlock>> {
+    ) -> EthResult<Option<RichBlock>>
+    where
+        Self: LoadPendingBlock,
+    {
         let block = match self.block_with_senders(block_id).await? {
             Some(block) => block,
             None => return Ok(None),
@@ -151,7 +162,10 @@ where
     pub(crate) async fn rpc_block_header(
         &self,
         block_id: impl Into<BlockId>,
-    ) -> EthResult<Option<Header>> {
+    ) -> EthResult<Option<Header>>
+    where
+        Self: LoadPendingBlock,
+    {
         let header = self.rpc_block(block_id, false).await?.map(|block| block.inner.header);
         Ok(header)
     }

crates/rpc/rpc/src/eth/api/call.rs

@@ -2,7 +2,7 @@
 
 use crate::{
     eth::{
-        api::{EthTransactions, SpawnBlocking},
+        api::{EthTransactions, LoadPendingBlock, LoadState, SpawnBlocking},
         error::{ensure_success, EthApiError, EthResult, RevertError, RpcInvalidTransactionError},
         revm_utils::{
             apply_state_overrides, build_call_evm_env, caller_gas_allowance,
@@ -25,11 +25,11 @@ use reth_rpc_types::{
 };
 use reth_transaction_pool::TransactionPool;
 use revm::{
-    db::{CacheDB, DatabaseRef},
+    db::CacheDB,
     primitives::{
         BlockEnv, CfgEnvWithHandlerCfg, EnvWithHandlerCfg, ExecutionResult, HaltReason, TransactTo,
     },
-    DatabaseCommit,
+    DatabaseCommit, DatabaseRef,
 };
 use revm_inspectors::access_list::AccessListInspector;
 use tracing::trace;
@@ -43,6 +43,7 @@ const ESTIMATE_GAS_ERROR_RATIO: f64 = 0.015;
 
 impl<Provider, Pool, Network, EvmConfig> EthApi<Provider, Pool, Network, EvmConfig>
 where
+    Self: LoadState,
     Pool: TransactionPool + Clone + 'static,
     Provider:
         BlockReaderIdExt + ChainSpecProvider + StateProviderFactory + EvmEnvProvider + 'static,
@@ -59,7 +60,7 @@ where
         let (cfg, block_env, at) = self.evm_env_at(at).await?;
 
         self.spawn_blocking_io(move |this| {
-            let state = this.state_at(at)?;
+            let state = this.state_at_block_id(at)?;
             this.estimate_gas_with(cfg, block_env, request, state, state_override)
         })
         .await
@@ -85,7 +86,10 @@ where
         bundle: Bundle,
         state_context: Option<StateContext>,
         mut state_override: Option<StateOverride>,
-    ) -> EthResult<Vec<EthCallResponse>> {
+    ) -> EthResult<Vec<EthCallResponse>>
+    where
+        Self: LoadPendingBlock,
+    {
         let Bundle { transactions, block_override } = bundle;
         if transactions.is_empty() {
             return Err(EthApiError::InvalidParams(String::from("transactions are empty.")))
@@ -394,7 +398,7 @@ where
         at: BlockId,
         mut request: TransactionRequest,
     ) -> EthResult<AccessListWithGasUsed> {
-        let state = self.state_at(at)?;
+        let state = self.state_at_block_id(at)?;
 
         let mut env = build_call_evm_env(cfg, block, request.clone())?;
 

crates/rpc/rpc/src/eth/api/fees.rs

@@ -15,8 +15,11 @@ use reth_rpc_types::FeeHistory;
 use reth_transaction_pool::TransactionPool;
 use tracing::debug;
 
+use super::traits::LoadPendingBlock;
+
 impl<Provider, Pool, Network, EvmConfig> EthApi<Provider, Pool, Network, EvmConfig>
 where
+    Self: LoadPendingBlock,
     Pool: TransactionPool + Clone + 'static,
     Provider:
         BlockReaderIdExt + ChainSpecProvider + StateProviderFactory + EvmEnvProvider + 'static,