github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-04-30 03:01:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

perf(rpc): deduplicate pending_block_env_and_cfg in local_pending_block (#22825)

Browse Source
This commit is contained in:
stevencartavia
2026-03-05 21:18:24 -06:00
committed by GitHub
parent 2f4a128112
commit e4b553563b
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/rpc/rpc-eth-api/src/helpers/pending_block.rs
View File

@@ -13,7 +13,7 @@ use reth_chainspec::{ChainSpecProvider, EthChainSpec};
use reth_errors::{BlockExecutionError, BlockValidationError, ProviderError, RethError};
use reth_evm::{
execute::{BlockBuilder, BlockBuilderOutcome, BlockExecutionOutput},
ConfigureEvm, Evm, NextBlockEnvAttributes,
ConfigureEvm, Evm, EvmEnvFor, NextBlockEnvAttributes,
};
use reth_primitives_traits::{transaction::error::InvalidTransactionError, HeaderTy, SealedHeader};
use reth_revm::{database::StateProviderDatabase, db::State};
@@ -145,6 +145,23 @@ pub trait LoadPendingBlock:
PendingBlockEnvOrigin::DerivedFromLatest(parent) => parent,
};
self.build_pool_pending_block(parent, pending.evm_env).await
}
}
/// Builds or returns a cached pending block from the transaction pool.
///
/// This is the shared implementation used by both [`Self::pool_pending_block`] and
/// [`Self::local_pending_block`] to avoid resolving the pending block environment twice.
fn build_pool_pending_block(
&self,
parent: SealedHeader<ProviderHeader<Self::Provider>>,
evm_env: EvmEnvFor<Self::Evm>,
) -> impl Future<Output = Result<Option<PendingBlock<Self::Primitives>>, Self::Error>> + Send
where
Self: SpawnBlocking,
{
async move {
// we couldn't find the real pending block, so we need to build it ourselves
let mut lock = self.pending_block().lock().await;
@@ -153,7 +170,7 @@ pub trait LoadPendingBlock:
// Is the pending block cached?
if let Some(pending_block) = lock.as_ref() {
// Is the cached block not expired and latest is its parent?
if pending.evm_env.block_env.number() == U256::from(pending_block.block().number()) &&
if evm_env.block_env.number() == U256::from(pending_block.block().number()) &&
parent.hash() == pending_block.block().parent_hash() &&
now <= pending_block.expires_at
{
@@ -206,9 +223,10 @@ pub trait LoadPendingBlock:
PendingBlockEnvOrigin::ActualPending(block, receipts) => {
Some(BlockAndReceipts { block, receipts })
}
PendingBlockEnvOrigin::DerivedFromLatest(..) => {
self.pool_pending_block().await?.map(PendingBlock::into_block_and_receipts)
}
PendingBlockEnvOrigin::DerivedFromLatest(parent) => self
.build_pool_pending_block(parent, pending.evm_env)
.await?
.map(PendingBlock::into_block_and_receipts),
})
}
}