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

fix(provider): fix pending block retrieval in find_block_by_hash (#14303)

Browse Source
This commit is contained in:
Roman Krasiuk
2025-02-07 15:30:32 +01:00
committed by GitHub
parent 5a714cda79
commit d147a2093e
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/storage/provider/src/providers/consistent.rs
View File

@ -797,22 +797,21 @@ impl<N: ProviderNodeTypes> BlockReader for ConsistentProvider<N> {
source: BlockSource,
) -> ProviderResult<Option<Self::Block>> {
if matches!(source, BlockSource::Canonical | BlockSource::Any) {
return self.get_in_memory_or_storage_by_block(
if let Some(block) = self.get_in_memory_or_storage_by_block(
hash.into(),
|db_provider| db_provider.find_block_by_hash(hash, BlockSource::Canonical),
|block_state| Ok(Some(block_state.block_ref().recovered_block().clone_block())),
)
)? {
return Ok(Some(block))
}
}
if matches!(source, BlockSource::Pending | BlockSource::Any) {
if let Some(block) = self
return Ok(self
.canonical_in_memory_state
.pending_block()
.filter(|b| b.hash() == hash)
.map(|b| b.into_block())
{
return Ok(Some(block))
}
.map(|b| b.into_block()))
}
Ok(None)