fix(archiver): handle duplicate checkpoint from L1 reorg (backport #22252)#22257
Merged
PhilWindle merged 2 commits intoApr 2, 2026
Merged
Conversation
Adapted block_store.ts for v4 branch structure: - Kept v4's inline previous-checkpoint-block extraction (no getPreviousCheckpointBlock helper) - Used checkpoints[0] reference instead of firstCheckpointNumber for post-skip correctness - Only included skipOrUpdateAlreadyStoredCheckpoints method (the actual fix) - Dropped getPreviousCheckpointBlock and validateCheckpointBlocks refactors from next
PhilWindle
approved these changes
Apr 2, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Backport of #22252 to v4.
Fixes a mainnet issue where an L1 reorg moved a checkpoint to a different L1 block, causing the archiver to re-discover it and crash with
InitialCheckpointNumberNotSequentialErrorin an infinite loop.When
addCheckpointsreceives a checkpoint that's already stored, it now:Conflict Resolution
Cherry-pick had one conflict in
block_store.ts:nextrefactored this into agetPreviousCheckpointBlock()helper. Kept v4's inline approach but updated to usecheckpoints[0]reference (correct after potential skip of already-stored checkpoints).skipOrUpdateAlreadyStoredCheckpointsmethod (the fix). DroppedgetPreviousCheckpointBlockandvalidateCheckpointBlocksrefactors that exist onnextbut not v4.Test Results
kv_archiver_store.test.tsarchiver-sync.test.ts(includes newhandles L1 reorg that moves a checkpoint to a later L1 blocktest)ClaudeBox log: https://claudebox.work/s/21a4c138364df1ef?run=1