Skip to content

fix(beacon-node): improve importBlock code clarity and correctness #8

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

Open
twoeths wants to merge 1 commit into
base: unstable
Choose a base branch
from
Open

fix(beacon-node): improve importBlock code clarity and correctness #8

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: 8 additions & 4 deletions packages/beacon-node/src/chain/blocks/importBlock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export async function importBlock(
const prevFinalizedEpoch = this.forkChoice.getFinalizedCheckpoint().epoch;
const blockDelaySec =
fullyVerifiedBlock.seenTimestampSec - computeTimeAtSlot(this.config, blockSlot, postState.genesisTime);
const recvToValLatency = Date.now() / 1000 - (opts.seenTimestampSec ?? Date.now() / 1000);
const recvToValLatency = opts.seenTimestampSec !== undefined ? Date.now() / 1000 - opts.seenTimestampSec : 0;
const fork = this.config.getForkSeq(blockSlot);

// this is just a type assertion since blockinput with dataPromise type will not end up here
Expand Down Expand Up @@ -422,7 +422,11 @@ export async function importBlock(
this.logger.verbose("After importBlock caching postState without SSZ cache", {slot: postState.slot});
}

// Cache shufflings when crossing an epoch boundary
// Cache shufflings when crossing an epoch boundary.
// Note: this triggers on any block that crosses an epoch boundary (e.g. parent at slot 31, block at slot 32),
// not just the first slot of the epoch. The checkpoint state cache below uses `blockSlot % SLOTS_PER_EPOCH === 0`
// because checkpoint states are only meaningful at epoch-start slots, whereas shufflings must be cached as soon
// as the boundary is crossed so the next block can reference them.
const parentEpoch = computeEpochAtSlot(parentBlockSlot);
if (parentEpoch < blockEpoch) {
this.shufflingCache.processState(postState);
Expand All @@ -437,7 +441,7 @@ export async function importBlock(
// consumers should not mutate state ever
this.emitter.emit(ChainEvent.checkpoint, cp, checkpointState);

// Note: in-lined code from previos handler of ChainEvent.checkpoint
// Note: in-lined code from previous handler of ChainEvent.checkpoint
this.logger.verbose("Checkpoint processed", toCheckpointHex(cp));

const activeValidatorsCount = checkpointState.epochCtx.currentShuffling.activeIndices.length;
Expand Down Expand Up @@ -481,7 +485,7 @@ export async function importBlock(
this.emitter.emit(routes.events.EventType.block, {
block: blockRootHex,
slot: blockSlot,
executionOptimistic: blockSummary != null && isOptimisticBlock(blockSummary),
executionOptimistic: isOptimisticBlock(blockSummary),
});
}
if (this.emitter.listenerCount(routes.events.EventType.voluntaryExit)) {
Expand Down
Loading