fix: only trigger reorg on actual conflicts, not generic errors#18
Closed
opsuperchain wants to merge 1 commit intokarlfloersch/catchup-refactorfrom
Closed
fix: only trigger reorg on actual conflicts, not generic errors#18opsuperchain wants to merge 1 commit intokarlfloersch/catchup-refactorfrom
opsuperchain wants to merge 1 commit intokarlfloersch/catchup-refactorfrom
Conversation
Previously, any backfill error (including RPC failures) would trigger the failsafe reorg callback. This was incorrect because transient errors like network timeouts are not reorgs. Reorg detection now only happens on actual conflicts: - Parent hash mismatch in ingestBlock (line 536-543) - ErrConflict in processBlockLogs (lines 608-610, 620-622) Generic errors like RPC failures just return the error without triggering failsafe. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
karlfloersch
pushed a commit
that referenced
this pull request
Mar 5, 2026
…thereum-optimism#19272) * contracts: implement audit code fixes and add tests Add onlyDelegateCall enforcement to upgradeSuperchain, upgrade, and migrate functions (#17). Include msg.sender in deploy salt to prevent cross-caller CREATE2 collisions (#17). Add duplicate instruction key detection in upgrade validation (#9). Validate startingRespectedGameType against enabled game configs (#10). Add code-existence check in loadBytes (#18). Add setUp guard to VerifyOPCM.runSingle (#4). Remove unused _findChar function (#5). Pass real AddressManager in migrator proxy deploy args (#11). Add tests covering all audit fix behaviors. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * contracts: regenerate semver-lock.json for OPContractsManagerV2 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * contracts: bump OPContractsManagerV2 version to 7.0.10 Semver-diff requires a patch version bump when bytecode changes. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
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
1 participant
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
Previously, any backfill error (including RPC failures) would trigger the failsafe reorg callback. This was incorrect because transient errors like network timeouts are not reorgs.
Changes
Reorg detection now only happens on actual conflicts:
ingestBlock(line 536-543)ErrConflictinprocessBlockLogs(lines 608-610, 620-622)Generic errors like RPC failures just return the error without triggering failsafe.
Test plan
🤖 Generated with Claude Code