Skip to content
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

Jump to bottom

validate_merge_block uses correct block hash #2710

Merged
merged 3 commits into from
Nov 4, 2021
Merged

validate_merge_block uses correct block hash #2710

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9d7b85
Use correct payload block hash
terencechain Nov 4, 2021
c144844
Lint fails, it should be assert?
terencechain Nov 4, 2021
0ae9a10
Proper return after second assertion
terencechain Nov 4, 2021
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
3 changes: 2 additions & 1 deletion specs/merge/fork-choice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ 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
assert block.body.execution_payload.parent_hash == TERMINAL_BLOCK_HASH
djrtwo marked this conversation as resolved.
Show resolved Hide resolved
return

djrtwo marked this conversation as resolved.
Show resolved Hide resolved
pow_block = get_pow_block(block.body.execution_payload.parent_hash)
# Check if `pow_block` is available
Expand Down