Skip to content

refactor: defer fc store mutations after protoarray block import #9581

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
ensi321 merged 1 commit into from
Jul 3, 2026
Merged

refactor: defer fc store mutations after protoarray block import #9581

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
60 changes: 32 additions & 28 deletions packages/fork-choice/src/forkChoice/forkChoice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,32 +698,27 @@ export class ForkChoice implements IForkChoice {
const blockRoot = this.config.getForkTypes(slot).BeaconBlock.hashTreeRoot(block);
const blockRootHex = toRootHex(blockRoot);

// Assign proposer score boost if the block is timely
// before attesting interval = before 1st interval
// Decide whether this block should receive proposer boost, and whether the block is timely.
// The store field `this.proposerBoostRoot` and `updateCheckpoints()` are mutated only after
// `protoArray.onBlock()` succeeds
const isTimely = this.isBlockTimely(block, blockDelaySec);
if (
this.opts?.proposerBoost &&
const isProposerBoostBlock =
this.opts?.proposerBoost === true &&
isTimely &&
// only boost the first block we see
this.proposerBoostRoot === null &&
expectedProposerIndex !== null &&
block.proposerIndex === expectedProposerIndex &&
this.isProposerBoostSameDependentRoot(this.head.blockRoot, parentRootHex)
) {
this.proposerBoostRoot = blockRootHex;
}
this.isProposerBoostSameDependentRoot(this.head.blockRoot, parentRootHex);
// Candidate boost root used for protoArray.onBlock's best-child weighting. Committed to the
// store only after the insertion succeeds.
const proposerBoostRoot = isProposerBoostBlock ? blockRootHex : this.proposerBoostRoot;

const justifiedCheckpoint = toCheckpointWithHex(state.currentJustifiedCheckpoint);
const stateJustifiedEpoch = justifiedCheckpoint.epoch;

const finalizedCheckpoint = toCheckpointWithHex(state.finalizedCheckpoint);

// Justified balances for `justifiedCheckpoint` are new to the fork-choice. Compute them on demand only if
// the justified checkpoint changes
this.updateCheckpoints(justifiedCheckpoint, finalizedCheckpoint, () =>
this.fcStore.justifiedBalancesGetter(justifiedCheckpoint, state)
);

const blockEpoch = computeEpochAtSlot(slot);

// same logic to compute_pulled_up_tip in the spec, making it inline because of reusing variables
Expand Down Expand Up @@ -767,19 +762,6 @@ export class ForkChoice implements IForkChoice {
unrealizedFinalizedCheckpoint = finalizedCheckpoint;
}

// Un-realized checkpoints
// Update best known unrealized justified & finalized checkpoints
this.updateUnrealizedCheckpoints(unrealizedJustifiedCheckpoint, unrealizedFinalizedCheckpoint, () =>
this.fcStore.justifiedBalancesGetter(unrealizedJustifiedCheckpoint, state)
);

// If block is from past epochs, try to update store's justified & finalized checkpoints right away
if (blockEpoch < computeEpochAtSlot(currentSlot)) {
this.updateCheckpoints(unrealizedJustifiedCheckpoint, unrealizedFinalizedCheckpoint, () =>
this.fcStore.justifiedBalancesGetter(unrealizedJustifiedCheckpoint, state)
);
}

const targetSlot = computeStartSlotAtEpoch(blockEpoch);
const targetRoot = slot === targetSlot ? blockRoot : state.getBlockRootAtSlot(targetSlot);

Expand Down Expand Up @@ -850,7 +832,29 @@ export class ForkChoice implements IForkChoice {
parentBlockHash: parentHashHex,
};

this.protoArray.onBlock(protoBlock, currentSlot, this.proposerBoostRoot);
this.protoArray.onBlock(protoBlock, currentSlot, proposerBoostRoot);

if (isProposerBoostBlock) {
this.proposerBoostRoot = blockRootHex;
}

// Justified balances for `justifiedCheckpoint` are new to the fork-choice. Compute them on
// demand only if the justified checkpoint changes.
this.updateCheckpoints(justifiedCheckpoint, finalizedCheckpoint, () =>
this.fcStore.justifiedBalancesGetter(justifiedCheckpoint, state)
);

// Un-realized checkpoints. Update best known unrealized justified & finalized checkpoints
this.updateUnrealizedCheckpoints(unrealizedJustifiedCheckpoint, unrealizedFinalizedCheckpoint, () =>
this.fcStore.justifiedBalancesGetter(unrealizedJustifiedCheckpoint, state)
);

// If block is from past epochs, try to update store's justified & finalized checkpoints right away
if (blockEpoch < computeEpochAtSlot(currentSlot)) {
this.updateCheckpoints(unrealizedJustifiedCheckpoint, unrealizedFinalizedCheckpoint, () =>
this.fcStore.justifiedBalancesGetter(unrealizedJustifiedCheckpoint, state)
);
}

return protoBlock;
}
Expand Down
Loading