Skip to content

fix: skip tipset if it's part of current chain in chain follower #7019

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
hanabi1224 merged 1 commit into from
May 7, 2026
Merged

fix: skip tipset if it's part of current chain in chain follower #7019

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
12 changes: 11 additions & 1 deletion src/chain_sync/chain_follower.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
use super::network_context::SyncNetworkContext;
use crate::{
blocks::{Block, FullTipset, Tipset, TipsetKey},
chain::ChainStore,
chain::{ChainStore, index::ResolveNullTipset},
chain_sync::{
ForkSyncInfo, ForkSyncStage, SyncStatus, SyncStatusReport, TipsetValidator,
bad_block_cache::{BadBlockCache, SeenBlockCache},
Expand Down Expand Up @@ -698,6 +698,16 @@ impl<DB: Blockstore> SyncStateMachine<DB> {
return;
}

// Skip if tipset is part of the current chain.
if let Ok(Some(ts)) = self.cs.chain_index().tipset_by_height(
tipset.epoch(),
self.cs.heaviest_tipset(),
ResolveNullTipset::TakeOlder,
) && ts.key() == tipset.key()
{
return;
}

// Find any existing tipsets with same epoch and parents
let mut to_remove = Vec::new();
#[allow(clippy::mutable_key_type)]
Expand Down
Loading