github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-29 17:18:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

perf: fetch receipts and transactions concurrently (#3406)

Browse Source
This commit is contained in:
Matthias Seitz
2023-06-26 19:20:28 +02:00
committed by GitHub
parent 6d4fe271fc
commit 28897d7c1c
2 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
crates/rpc/rpc/src/eth/api/fees.rs
View File

@@ -131,36 +131,31 @@ where
percentiles: &[f64],
header: &SealedHeader,
) -> Result<Vec<U256>, EthApiError> {
let Some(receipts) =
self.cache().get_receipts(header.hash).await? else {
// If there are no receipts, then we do not have all info on the block
return Err(EthApiError::InvalidBlockRange)
};
let Some(mut transactions): Option<Vec<_>> = self
let (transactions, receipts) = self
.cache()
.get_block_transactions(header.hash).await?
.map(|txs|txs
.into_iter()
.zip(receipts.into_iter())
.scan(0, |previous_gas, (tx, receipt)| {
// Convert the cumulative gas used in the receipts
// to the gas usage by the transaction
//
// While we will sum up the gas again later, it is worth
// noting that the order of the transactions will be different,
// so the sum will also be different for each receipt.
let gas_used = receipt.cumulative_gas_used - *previous_gas;
*previous_gas = receipt.cumulative_gas_used;
.get_transactions_and_receipts(header.hash)
.await?
.ok_or(EthApiError::InvalidBlockRange)?;
Some(TxGasAndReward {
gas_used,
reward: tx.effective_gas_tip(header.base_fee_per_gas).unwrap_or_default(),
})
let mut transactions = transactions
.into_iter()
.zip(receipts.into_iter())
.scan(0, |previous_gas, (tx, receipt)| {
// Convert the cumulative gas used in the receipts
// to the gas usage by the transaction
//
// While we will sum up the gas again later, it is worth
// noting that the order of the transactions will be different,
// so the sum will also be different for each receipt.
let gas_used = receipt.cumulative_gas_used - *previous_gas;
*previous_gas = receipt.cumulative_gas_used;
Some(TxGasAndReward {
gas_used,
reward: tx.effective_gas_tip(header.base_fee_per_gas).unwrap_or_default(),
})
.collect()) else {
// If there are no transactions, then we do not have all info on the block
return Err(EthApiError::InvalidBlockRange)
};
})
.collect::<Vec<_>>();
// Sort the transactions by their rewards in ascending order
transactions.sort_by_key(|tx| tx.reward);

13
crates/rpc/rpc/src/eth/cache.rs
View File

@@ -179,6 +179,19 @@ impl EthStateCache {
rx.await.map_err(|_| ProviderError::CacheServiceUnavailable)?
}
/// Fetches both transactions and receipts for the given block hash.
pub(crate) async fn get_transactions_and_receipts(
&self,
block_hash: H256,
) -> Result<Option<(Vec<TransactionSigned>, Vec<Receipt>)>> {
let transactions = self.get_block_transactions(block_hash);
let receipts = self.get_receipts(block_hash);
let (transactions, receipts) = futures::try_join!(transactions, receipts)?;
Ok(transactions.zip(receipts))
}
/// Requests the [Receipt] for the block hash
///
/// Returns `None` if the block was not found.