Skip to content

Fix reorg safe range calculations #337

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
merged 2 commits into from
Oct 27, 2025
Merged

Fix reorg safe range calculations #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
337abcd
Fix reorg safe range calculations
desfero Oct 24, 2025
9f79b88
Add changelog
desfero Oct 24, 2025
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
8 changes: 4 additions & 4 deletions core/src/indexer/fetch_logs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,23 +468,23 @@ async fn live_indexing_stream(
let from_block = current_filter.from_block();
if from_block > safe_block_number {
if reorg_safe_distance.is_zero() {
let block_distance = latest_block_number - from_block;
let block_distance = from_block - latest_block_number;
let is_outside_reorg_range = block_distance
> reorg_safe_distance_for_chain(cached_provider.chain.id());

// it should never get under normal conditions outside the reorg range,
// therefore, we log an error as means RCP state is not in sync with the blockchain
if is_outside_reorg_range {
error!(
"{} - {} - LIVE INDEXING STEAM - RPC has gone back on latest block: rpc returned {}, last seen: {}",
"{} - {} - LIVE INDEXING STREAM - RPC has gone back on latest block: rpc returned {}, last seen: {}",
info_log_name,
IndexingEventProgressStatus::Live.log(),
latest_block_number,
from_block
);
} else {
info!(
"{} - {} - LIVE INDEXING STEAM - RPC has gone back on latest block: rpc returned {}, last seen: {}",
"{} - {} - LIVE INDEXING STREAM - RPC has gone back on latest block: rpc returned {}, last seen: {}",
info_log_name,
IndexingEventProgressStatus::Live.log(),
latest_block_number,
Expand All @@ -493,7 +493,7 @@ async fn live_indexing_stream(
}
} else {
info!(
"{} - {} - LIVE INDEXING STEAM - not in safe reorg block range yet block: {} > range: {}",
"{} - {} - LIVE INDEXING STREAM - not in safe reorg block range yet block: {} > range: {}",
info_log_name,
IndexingEventProgressStatus::Live.log(),
from_block,
Expand Down
2 changes: 1 addition & 1 deletion core/src/indexer/process.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ async fn live_indexing_for_contract_event_dependencies(
// check reorg distance and skip if not safe
if from_block > safe_block_number {
if reorg_safe_distance.is_zero() {
let block_distance = latest_block_number - from_block;
let block_distance = from_block - latest_block_number;
let is_outside_reorg_range =
block_distance > reorg_safe_distance_for_chain(cached_provider.chain.id());

Expand Down
1 change: 1 addition & 0 deletions documentation/docs/pages/docs/changelog.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

### Bug fixes
-------------------------------------------------
fix: reorg safe range calculation for out-of-range an error message

### Breaking changes
-------------------------------------------------
Expand Down
Loading