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

perf(rpc): add optional block hash arg (#1502)

Browse Source
This commit is contained in:
Matthias Seitz
2023-02-22 14:56:21 +01:00
committed by GitHub
parent 81fec4b375
commit 281f139b0d
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crates/rpc/rpc-types/src/eth/block.rs
View File

@ -73,16 +73,21 @@ pub struct Block {
impl Block {
/// Converts the given primitive block into a [Block] response with the given
/// [BlockTransactionsKind]
///
/// If a `block_hash` is provided, then this is used, otherwise the block hash is computed.
pub fn from_block(
block: PrimitiveBlock,
total_difficulty: U256,
kind: BlockTransactionsKind,
block_hash: Option<H256>,
) -> Result<Self, BlockError> {
match kind {
BlockTransactionsKind::Hashes => {
Ok(Self::from_block_hashes_only(block, total_difficulty))
Ok(Self::from_block_with_tx_hashes(block, total_difficulty, block_hash))
}
BlockTransactionsKind::Full => {
Self::from_block_full(block, total_difficulty, block_hash)
}
BlockTransactionsKind::Full => Self::from_block_full(block, total_difficulty),
}
}
@ -91,8 +96,12 @@ impl Block {
///
/// This will populate the `transactions` field with only the hashes of the transactions in the
/// block: [BlockTransactions::Hashes]
pub fn from_block_hashes_only(block: PrimitiveBlock, total_difficulty: U256) -> Self {
let block_hash = block.header.hash_slow();
pub fn from_block_with_tx_hashes(
block: PrimitiveBlock,
total_difficulty: U256,
block_hash: Option<H256>,
) -> Self {
let block_hash = block_hash.unwrap_or_else(|| block.header.hash_slow());
let transactions = block.body.iter().map(|tx| tx.hash).collect();
Self::from_block_with_transactions(
@ -111,8 +120,9 @@ impl Block {
pub fn from_block_full(
block: PrimitiveBlock,
total_difficulty: U256,
block_hash: Option<H256>,
) -> Result<Self, BlockError> {
let block_hash = block.header.hash_slow();
let block_hash = block_hash.unwrap_or_else(|| block.header.hash_slow());
let block_number = block.number;
let mut transactions = Vec::with_capacity(block.body.len());
for (idx, tx) in block.body.iter().enumerate() {

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

@ -43,7 +43,7 @@ where
.client()
.header_td(&block_hash)?
.ok_or_else(|| EthApiError::UnknownBlockNumber)?;
let block = Block::from_block(block, total_difficulty, full.into())?;
let block = Block::from_block(block, total_difficulty, full.into(), Some(block_hash))?;
Ok(Some(block.into()))
} else {
Ok(None)