perf: only lookup in db in cache layer (#3773)

paradigmxyz · Jul 14, 2023 · e3ac77a · e3ac77a
1 parent ad4c590
commit e3ac77a
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/crates/rpc/rpc/src/eth/cache/mod.rs b/crates/rpc/rpc/src/eth/cache/mod.rs
@@ -3,7 +3,9 @@
 use futures::{future::Either, Stream, StreamExt};
 use reth_interfaces::{provider::ProviderError, Result};
 use reth_primitives::{Block, Receipt, SealedBlock, TransactionSigned, H256};
-use reth_provider::{BlockReader, CanonStateNotification, EvmEnvProvider, StateProviderFactory};
+use reth_provider::{
+    BlockReader, BlockSource, CanonStateNotification, EvmEnvProvider, StateProviderFactory,
+};
 use reth_tasks::{TaskSpawner, TokioTaskExecutor};
 use revm::primitives::{BlockEnv, CfgEnv};
 use schnellru::{ByLength, Limiter};
@@ -307,7 +309,10 @@ where
                                 let provider = this.provider.clone();
                                 let action_tx = this.action_tx.clone();
                                 this.action_task_spawner.spawn_blocking(Box::pin(async move {
-                                    let res = provider.block_by_hash(block_hash);
+                                    // Only look in the database to prevent situations where we
+                                    // looking up the tree is blocking
+                                    let res = provider
+                                        .find_block_by_hash(block_hash, BlockSource::Database);
                                     let _ = action_tx
                                         .send(CacheAction::BlockResult { block_hash, res });
                                 }));
@@ -325,7 +330,10 @@ where
                                 let provider = this.provider.clone();
                                 let action_tx = this.action_tx.clone();
                                 this.action_task_spawner.spawn_blocking(Box::pin(async move {
-                                    let res = provider.block_by_hash(block_hash);
+                                    // Only look in the database to prevent situations where we
+                                    // looking up the tree is blocking
+                                    let res = provider
+                                        .find_block_by_hash(block_hash, BlockSource::Database);
                                     let _ = action_tx
                                         .send(CacheAction::BlockResult { block_hash, res });
                                 }));