jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move EthBlocks::block_receipts default impl to impl for EthApi (#10785)

Browse Source
This commit is contained in:
Emilia Hane
2024-09-11 14:30:22 +02:00
committed by GitHub
parent 9aea661c94
commit c498fa6349
2 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
crates/rpc/rpc-eth-api/src/helpers/block.rs
View File

@ -3,9 +3,9 @@
use std::sync::Arc;
use futures::Future;
use reth_primitives::{BlockId, Receipt, SealedBlock, SealedBlockWithSenders, TransactionMeta};
use reth_primitives::{BlockId, Receipt, SealedBlock, SealedBlockWithSenders};
use reth_provider::{BlockIdReader, BlockReader, BlockReaderIdExt, HeaderProvider};
use reth_rpc_eth_types::{EthApiError, EthStateCache, ReceiptBuilder};
use reth_rpc_eth_types::{EthApiError, EthStateCache};
use reth_rpc_types::{AnyTransactionReceipt, Header, Index};
use reth_rpc_types_compat::block::{from_block, uncle_block_from_header};
@ -93,44 +93,7 @@ pub trait EthBlocks: LoadBlock {
block_id: BlockId,
) -> impl Future<Output = Result<Option<Vec<AnyTransactionReceipt>>, Self::Error>> + Send
where
Self: LoadReceipt,
{
async move {
if let Some((block, receipts)) = self.load_block_and_receipts(block_id).await? {
let block_number = block.number;
let base_fee = block.base_fee_per_gas;
let block_hash = block.hash();
let excess_blob_gas = block.excess_blob_gas;
let timestamp = block.timestamp;
let block = block.unseal();
let receipts = block
.body
.into_iter()
.zip(receipts.iter())
.enumerate()
.map(|(idx, (tx, receipt))| {
let meta = TransactionMeta {
tx_hash: tx.hash,
index: idx as u64,
block_hash,
block_number,
base_fee,
excess_blob_gas,
timestamp,
};
ReceiptBuilder::new(&tx, meta, receipt, &receipts)
.map(|builder| builder.build())
.map_err(Self::Error::from_eth_err)
})
.collect::<Result<Vec<_>, Self::Error>>();
return receipts.map(Some)
}
Ok(None)
}
}
Self: LoadReceipt;
/// Helper method that loads a bock and all its receipts.
fn load_block_and_receipts(

51
crates/rpc/rpc/src/eth/helpers/block.rs
View File

@ -1,8 +1,13 @@
//! Contains RPC handler implementations specific to blocks.
use reth_primitives::{BlockId, TransactionMeta};
use reth_provider::{BlockReaderIdExt, HeaderProvider};
use reth_rpc_eth_api::helpers::{EthBlocks, LoadBlock, LoadPendingBlock, SpawnBlocking};
use reth_rpc_eth_types::EthStateCache;
use reth_rpc_eth_api::{
helpers::{EthBlocks, LoadBlock, LoadPendingBlock, LoadReceipt, SpawnBlocking},
FromEthApiError,
};
use reth_rpc_eth_types::{EthStateCache, ReceiptBuilder};
use reth_rpc_types::AnyTransactionReceipt;
use crate::EthApi;
@ -15,6 +20,48 @@ where
fn provider(&self) -> impl HeaderProvider {
self.inner.provider()
}
async fn block_receipts(
&self,
block_id: BlockId,
) -> Result<Option<Vec<AnyTransactionReceipt>>, Self::Error>
where
Self: LoadReceipt,
{
if let Some((block, receipts)) = self.load_block_and_receipts(block_id).await? {
let block_number = block.number;
let base_fee = block.base_fee_per_gas;
let block_hash = block.hash();
let excess_blob_gas = block.excess_blob_gas;
let timestamp = block.timestamp;
let block = block.unseal();
let receipts = block
.body
.into_iter()
.zip(receipts.iter())
.enumerate()
.map(|(idx, (tx, receipt))| {
let meta = TransactionMeta {
tx_hash: tx.hash,
index: idx as u64,
block_hash,
block_number,
base_fee,
excess_blob_gas,
timestamp,
};
ReceiptBuilder::new(&tx, meta, receipt, &receipts)
.map(|builder| builder.build())
.map_err(Self::Error::from_eth_err)
})
.collect::<Result<Vec<_>, Self::Error>>();
return receipts.map(Some)
}
Ok(None)
}
}
impl<Provider, Pool, Network, EvmConfig> LoadBlock for EthApi<Provider, Pool, Network, EvmConfig>