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

feat(rpc/block): simplify the block_receipts rpc (#8866)

Browse Source 
Signed-off-by: jsvisa <delweng@gmail.com>
This commit is contained in:
Delweng
2024-06-17 01:07:59 +08:00
committed by GitHub
parent 35f7e0b000
commit 0d55e5b8b2
1 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
crates/rpc/rpc/src/eth/api/block.rs
View File

@ -63,65 +63,68 @@ where
&self,
block_id: BlockId,
) -> EthResult<Option<Vec<AnyTransactionReceipt>>> {
let mut block_and_receipts = None;
if block_id.is_pending() {
block_and_receipts = self
.provider()
// Fetch block and receipts based on block_id
let block_and_receipts = if block_id.is_pending() {
self.provider()
.pending_block_and_receipts()?
.map(|(sb, receipts)| (sb, Arc::new(receipts)));
.map(|(sb, receipts)| (sb, Arc::new(receipts)))
} else if let Some(block_hash) = self.provider().block_hash_for_id(block_id)? {
block_and_receipts = self.cache().get_block_and_receipts(block_hash).await?;
}
self.cache().get_block_and_receipts(block_hash).await?
} else {
None
};
if let Some((block, receipts)) = block_and_receipts {
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();
// If no block and receipts found, return None
let Some((block, receipts)) = block_and_receipts else {
return Ok(None);
};
#[cfg(feature = "optimism")]
let (block_timestamp, l1_block_info) = {
let body = reth_evm_optimism::extract_l1_info(&block);
(block.timestamp, body.ok())
};
// Extract block details
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,
};
#[cfg(feature = "optimism")]
let (block_timestamp, l1_block_info) = {
let body = reth_evm_optimism::extract_l1_info(&block);
(block.timestamp, body.ok())
};
// Build transaction 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,
};
#[cfg(feature = "optimism")]
let op_tx_meta =
self.build_op_tx_meta(&tx, l1_block_info.clone(), block_timestamp)?;
build_transaction_receipt_with_block_receipts(
tx,
meta,
receipt.clone(),
&receipts,
#[cfg(feature = "optimism")]
let op_tx_meta =
self.build_op_tx_meta(&tx, l1_block_info.clone(), block_timestamp)?;
build_transaction_receipt_with_block_receipts(
tx,
meta,
receipt.clone(),
&receipts,
#[cfg(feature = "optimism")]
op_tx_meta,
)
})
.collect::<EthResult<Vec<_>>>();
return receipts.map(Some)
}
Ok(None)
op_tx_meta,
)
})
.collect::<EthResult<Vec<_>>>()
.map(Some)
}
/// Returns the number transactions in the given block.