Fix safe optimistic import #4340
Merged
Conversation
This file contains 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
This was referenced Jul 23, 2022
Closed
Performance Report✔️ no performance regression detected Full benchmark results
|
dapplion
reviewed
Jul 26, 2022
| // It becomes optimistically safefor following blocks if a post-merge block is deemed fit | ||
| // for import. If it would not have been safe verifyBlockExecutionPayload would throw error | ||
| // and we would not be here. | ||
| isOptimisticallySafe ||= executionStatus !== ExecutionStatus.PreMerge; |
There was a problem hiding this comment.
While the ||= operand is pretty cool, can you use a regular if statement since it's more readable?
dapplion
reviewed
Jul 26, 2022
packages/beacon-node/src/chain/blocks/verifyBlocksExecutionPayloads.ts
Outdated
Show resolved
Hide resolved
dapplion
reviewed
Jul 26, 2022
| // - we have transitioned to post-merge world or | ||
| // - all the blocks are way behind the current slot | ||
| // - or we have already imported a post-merge parent of first block of this chain in forkchoice | ||
| const lastBlock = blocks[blocks.length - 1]; |
There was a problem hiding this comment.
Does this function ensure that there are more than 0 blocks?
There was a problem hiding this comment.
may be somewhere from where its called? because it didn't give any type issues, but will return early to be safe
There was a problem hiding this comment.
added a throw just to be safe
dapplion
reviewed
Jul 26, 2022
| if (!isOptimisticallySafe) { | ||
| const firstBlock = blocks[0]; | ||
| const parentRoot = toHexString(firstBlock.message.parentRoot); | ||
| const parentBlock = chain.forkChoice.getBlockHex(parentRoot); |
There was a problem hiding this comment.
You could return the parent block of the segment in sanity checks
and re-use here
Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com>
dapplion
approved these changes
Jul 26, 2022
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.
Motivation
The safe optimistic import got broken with the PR to optimize the sync speed:
because in safe optimistic import, we used to check if are we syncing near head and the block's parent in forkchoice is not post merge then its not safe to import block with optimistic status.
But this was giving error (EL still syncing and spinned up the lodestar on kiln with weak subjectivity sync, so we are syncing near head), as the parent block would not be found in the forkchoice as we no longer verify then import block by block, now we verify a segment and then import
So updated verification to where the segment's safeness is evaluated and updated and based on that the block import is accepted if its safe.
Also removes the check for justified block being post-merge for safe import as it was a redundant check, as removed in this PR: ethereum/consensus-specs#2881