github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-28 16:48:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

perf(rpc): use block hash or number (#2892)

Browse Source
This commit is contained in:
Matthias Seitz
2023-05-29 16:11:37 +02:00
committed by GitHub
parent 223f5cb9cc
commit e848dcd675
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crates/rpc/rpc/src/eth/filter.rs
View File

@@ -9,7 +9,7 @@ use crate::{
};
use async_trait::async_trait;
use jsonrpsee::{core::RpcResult, server::IdProvider};
use reth_primitives::{Receipt, SealedBlock, H256};
use reth_primitives::{BlockHashOrNumber, Receipt, SealedBlock, H256};
use reth_provider::{BlockIdProvider, BlockProvider, EvmEnvProvider};
use reth_rpc_api::EthFilterApiServer;
use reth_rpc_types::{Filter, FilterBlockOption, FilterChanges, FilterId, FilteredParams, Log};
@@ -336,9 +336,9 @@ where
/// Fetches both receipts and block for the given block number.
async fn block_and_receipts_by_number(
&self,
block_number: u64,
hash_or_number: BlockHashOrNumber,
) -> EthResult<Option<(SealedBlock, Vec<Receipt>)>> {
let block_hash = match self.client.block_hash(block_number)? {
let block_hash = match self.client.convert_block_hash(hash_or_number)? {
Some(hash) => hash,
None => return Ok(None),
};
@@ -388,13 +388,20 @@ where
{
let headers = self.client.headers_range(from..=to)?;
for header in headers {
for (idx, header) in headers.iter().enumerate() {
// these are consecutive headers, so we can use the parent hash of the next block to
// get the current header's hash
let num_hash: BlockHashOrNumber = headers
.get(idx + 1)
.map(|h| h.parent_hash.into())
.unwrap_or_else(|| header.number.into());
// only if filter matches
if FilteredParams::matches_address(header.logs_bloom, &address_filter) &&
FilteredParams::matches_topics(header.logs_bloom, &topics_filter)
{
if let Some((block, receipts)) =
self.block_and_receipts_by_number(header.number).await?
self.block_and_receipts_by_number(num_hash).await?
{
let block_hash = block.hash;

11
crates/storage/provider/src/traits/block_hash.rs
View File

@@ -1,6 +1,6 @@
use auto_impl::auto_impl;
use reth_interfaces::Result;
use reth_primitives::{BlockNumber, H256};
use reth_primitives::{BlockHashOrNumber, BlockNumber, H256};
/// Client trait for fetching block hashes by number.
#[auto_impl(&, Arc, Box)]
@@ -9,6 +9,15 @@ pub trait BlockHashProvider: Send + Sync {
/// exists.
fn block_hash(&self, number: BlockNumber) -> Result<Option<H256>>;
/// Get the hash of the block with the given number. Returns `None` if no block with this number
/// exists.
fn convert_block_hash(&self, hash_or_number: BlockHashOrNumber) -> Result<Option<H256>> {
match hash_or_number {
BlockHashOrNumber::Hash(hash) => Ok(Some(hash)),
BlockHashOrNumber::Number(num) => self.block_hash(num),
}
}
/// Get headers in range of block hashes or numbers
fn canonical_hashes_range(&self, start: BlockNumber, end: BlockNumber) -> Result<Vec<H256>>;
}