diff --git a/crates/storage/provider/src/providers/blockchain_provider.rs b/crates/storage/provider/src/providers/blockchain_provider.rs index 935522fa31..335377ace2 100644 --- a/crates/storage/provider/src/providers/blockchain_provider.rs +++ b/crates/storage/provider/src/providers/blockchain_provider.rs @@ -832,7 +832,15 @@ where id: BlockHashOrNumber, timestamp: u64, ) -> ProviderResult> { - self.database.requests_by_block(id, timestamp) + if !self.database.chain_spec().is_prague_active_at_timestamp(timestamp) { + return Ok(None) + } + let Some(number) = self.convert_hash_or_number(id)? else { return Ok(None) }; + if let Some(block) = self.canonical_in_memory_state.state_by_number(number) { + Ok(block.block().block().requests.clone()) + } else { + self.database.requests_by_block(id, timestamp) + } } }