validate_merge_block uses correct block hash
#2710
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
terencechain
commented
Nov 4, 2021
specs/merge/fork-choice.md
Outdated
| @@ -115,7 +115,7 @@ def validate_merge_block(block: BeaconBlock) -> None: | |||
| if TERMINAL_BLOCK_HASH != Hash32(): | |||
| # If `TERMINAL_BLOCK_HASH` is used as an override, the activation epoch must be reached. | |||
| assert compute_epoch_at_slot(block.slot) >= TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH | |||
| return block.block_hash == TERMINAL_BLOCK_HASH | |||
| return block.body.execution_payload.parent_hash == TERMINAL_BLOCK_HASH | |||
There was a problem hiding this comment.
I think this should be parent_hash and not block_hash. Please correct me if im wrong
mkalinin
approved these changes
Nov 4, 2021
mkalinin
reviewed
Nov 4, 2021
ralexstokes
reviewed
Nov 4, 2021
djrtwo
approved these changes
Nov 4, 2021
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.
block.block_hash == TERMINAL_BLOCK_HASHstill assumesblockisPowBlockbut was changed toBeaconBlock