From 7e3ccb706d74a1447963167efae1a91a37b23eee Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Mon, 1 Nov 2021 07:57:49 -0600 Subject: [PATCH] remove block_number validation from CL --- specs/merge/beacon-chain.md | 4 +--- .../test_process_execution_payload.py | 17 ++--------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index fefe0eefa..f8b9a8378 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -348,11 +348,9 @@ def process_block(state: BeaconState, block: BeaconBlock) -> None: ```python def process_execution_payload(state: BeaconState, payload: ExecutionPayload, execution_engine: ExecutionEngine) -> None: - # Verify consistency of the parent hash and block number - # with respect to the previous execution payload header + # Verify consistency of the parent hash with respect to the previous execution payload header if is_merge_complete(state): assert payload.parent_hash == state.latest_execution_payload_header.block_hash - assert payload.block_number == state.latest_execution_payload_header.block_number + uint64(1) # Verify random assert payload.random == get_randao_mix(state, get_current_epoch(state)) # Verify timestamp diff --git a/tests/core/pyspec/eth2spec/test/merge/block_processing/test_process_execution_payload.py b/tests/core/pyspec/eth2spec/test/merge/block_processing/test_process_execution_payload.py index d44bad58c..d12a68bf5 100644 --- a/tests/core/pyspec/eth2spec/test/merge/block_processing/test_process_execution_payload.py +++ b/tests/core/pyspec/eth2spec/test/merge/block_processing/test_process_execution_payload.py @@ -172,20 +172,6 @@ def test_bad_random_regular_payload(spec, state): yield from run_execution_payload_processing(spec, state, execution_payload, valid=False) -@with_merge_and_later -@spec_state_test -def test_bad_number_regular_payload(spec, state): - # pre-state - state = build_state_with_complete_transition(spec, state) - next_slot(spec, state) - - # execution payload - execution_payload = build_empty_execution_payload(spec, state) - execution_payload.block_number = execution_payload.block_number + 1 - - yield from run_execution_payload_processing(spec, state, execution_payload, valid=False) - - @with_merge_and_later @spec_state_test def test_bad_everything_regular_payload(spec, state): @@ -196,7 +182,8 @@ def test_bad_everything_regular_payload(spec, state): # execution payload execution_payload = build_empty_execution_payload(spec, state) execution_payload.parent_hash = spec.Hash32() - execution_payload.block_number = execution_payload.block_number + 1 + execution_payload.random = spec.Bytes32() + execution_payload.timestamp = 0 yield from run_execution_payload_processing(spec, state, execution_payload, valid=False)