From 59993b974a544a403ae471ba6414dbfa3d74cffa Mon Sep 17 00:00:00 2001 From: MergeBot Date: Tue, 17 Feb 2026 21:15:33 +0100 Subject: [PATCH] fix(rpc): resolve `AtBlockHash` to single block in `eth_getFilterChanges` (#22283) Co-authored-by: Amp --- crates/rpc/rpc/src/eth/filter.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/crates/rpc/rpc/src/eth/filter.rs b/crates/rpc/rpc/src/eth/filter.rs index aab0fa32df..f77315c573 100644 --- a/crates/rpc/rpc/src/eth/filter.rs +++ b/crates/rpc/rpc/src/eth/filter.rs @@ -271,11 +271,15 @@ where .flatten(); logs_utils::get_filter_block_range(from, to, start_block, info)? } - FilterBlockOption::AtBlockHash(_) => { + FilterBlockOption::AtBlockHash(block_hash) => { // blockHash is equivalent to fromBlock = toBlock = the block number with // hash blockHash // get_logs_in_block_range is inclusive - (start_block, best_number) + let block_number = self + .provider() + .block_number(block_hash)? + .ok_or(ProviderError::HeaderNotFound(block_hash.into()))?; + (block_number, block_number) } }; let logs = self