Skip to content

hotfix(provider): historical state update not being fetched correctly from forked provider #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kariy merged 1 commit into from
Nov 29, 2025
Merged

hotfix(provider): historical state update not being fetched correctly from forked provider #371

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions crates/storage/provider/provider/src/providers/fork/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ use katana_provider_api::transaction::{
};
use katana_provider_api::ProviderError;
use katana_rpc_types::{GetBlockWithReceiptsResponse, RpcTxWithReceipt, StateUpdate};
use tracing::trace;

use super::db::{self, DbProvider};
use crate::{DbProviderFactory, MutableProvider, ProviderFactory, ProviderResult};
Expand Down Expand Up @@ -68,6 +69,8 @@ impl ForkedDb {

/// Fetches historical blocks before the fork point.
fn fetch_historical_blocks(&self, block_id: BlockHashOrNumber) -> ProviderResult<bool> {
trace!(%block_id, "Fetching historical block from the forked network");

let block = match block_id {
BlockHashOrNumber::Num(number) => {
if !self.should_fetch_externally(number) {
Expand Down Expand Up @@ -353,8 +356,18 @@ impl<Tx1: DbTx> BlockStatusProvider for ForkedProvider<Tx1> {

impl<Tx1: DbTx> StateUpdateProvider for ForkedProvider<Tx1> {
fn state_update(&self, block_id: BlockHashOrNumber) -> ProviderResult<Option<StateUpdates>> {
if let Some(value) = self.local_db.state_update(block_id)? {
return Ok(Some(value));
// hotfix: because of how `self.local_db.state_update` is implemented (ie the tables may or
// may not have the values):
//
// `if let Some(value) = self.local_db.state_update(block_id)?` will always return Some even
// for fork block.
//
// it's because of the call to `let block_num = self.block_number_by_id(block_id)?;` inside
// of it.
if self.local_db.header(block_id)?.is_some() {
if let Some(value) = self.local_db.state_update(block_id)? {
return Ok(Some(value));
}
}

if let Some(value) = self.fork_db.db.provider().state_update(block_id)? {
Expand Down
Loading