From c9d7b8533c05aded559acf2208ec74f864b4d76c Mon Sep 17 00:00:00 2001 From: terence tsao Date: Wed, 3 Nov 2021 20:13:18 -0700 Subject: [PATCH 1/3] Use correct payload block hash --- specs/merge/fork-choice.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs/merge/fork-choice.md b/specs/merge/fork-choice.md index bf1634de4f..a013f426be 100644 --- a/specs/merge/fork-choice.md +++ b/specs/merge/fork-choice.md @@ -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 pow_block = get_pow_block(block.body.execution_payload.parent_hash) # Check if `pow_block` is available From c144844279ce9d0065d00f0b234e6b321b1d48fb Mon Sep 17 00:00:00 2001 From: terence tsao Date: Wed, 3 Nov 2021 20:31:31 -0700 Subject: [PATCH 2/3] Lint fails, it should be assert? --- specs/merge/fork-choice.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs/merge/fork-choice.md b/specs/merge/fork-choice.md index a013f426be..11ddd5ac31 100644 --- a/specs/merge/fork-choice.md +++ b/specs/merge/fork-choice.md @@ -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.body.execution_payload.parent_hash == TERMINAL_BLOCK_HASH + assert block.body.execution_payload.parent_hash == TERMINAL_BLOCK_HASH pow_block = get_pow_block(block.body.execution_payload.parent_hash) # Check if `pow_block` is available From 0ae9a10123560465823688d92223834b93d1ea6d Mon Sep 17 00:00:00 2001 From: terence tsao Date: Thu, 4 Nov 2021 06:59:13 -0700 Subject: [PATCH 3/3] Proper return after second assertion --- specs/merge/fork-choice.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specs/merge/fork-choice.md b/specs/merge/fork-choice.md index 11ddd5ac31..9fd16089ce 100644 --- a/specs/merge/fork-choice.md +++ b/specs/merge/fork-choice.md @@ -116,6 +116,7 @@ def validate_merge_block(block: BeaconBlock) -> None: # 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 assert block.body.execution_payload.parent_hash == TERMINAL_BLOCK_HASH + return pow_block = get_pow_block(block.body.execution_payload.parent_hash) # Check if `pow_block` is available