refactor: defer fc store mutations after protoarray block import#9581
Merged
Conversation
…Block Per review on #9565. `onBlock` mutated `proposerBoostRoot` and the justified/ finalized checkpoints before `protoArray.onBlock()` inserted the block. If the insertion threw, the store was left pointing at / justified on a block that was never added. Compute the proposer-boost decision into a temp, pass the candidate root to `protoArray.onBlock()` for its best-child weighting, and commit the store mutations (proposerBoostRoot + updateCheckpoints + updateUnrealizedCheckpoints) only after the insertion succeeds — mirroring the spec's `on_block` ordering. Behavior-preserving on the happy path: ProtoArray holds its own justified/ finalized epochs and never reads fcStore, so checkpoint-update ordering does not affect insertion. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the fork-choice block processing logic to defer state mutations until after the block is successfully added to the proto-array. Specifically, the assignment of 'this.proposerBoostRoot' and the updates to checkpoints (via 'updateCheckpoints' and 'updateUnrealizedCheckpoints') are moved to execute only after 'this.protoArray.onBlock()' succeeds, using a temporary local variable for the initial call. There are no review comments, and I have no additional feedback to provide.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
Contributor
Performance Report✔️ no performance regression detected Full benchmark results
|
twoeths
approved these changes
Jul 3, 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
2 participants
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.
ProtoArray.onBlockcan potentially reject the block to be imported. So we should update our fork choice store only after the import is complete.See #9565 (review) for more context