ethereum · djrtwo · May 10, 2021 · May 4, 2021 · May 4, 2021 · May 4, 2021
diff --git a/setup.py b/setup.py
@@ -441,7 +441,7 @@ def sundry_functions(cls) -> str:
 
 
 def get_pow_block(hash: Bytes32) -> PowBlock:
-    pass
+    return PowBlock(block_hash=hash, is_valid=True, is_processed=True, total_difficulty=TRANSITION_TOTAL_DIFFICULTY)
 
 
 def get_execution_state(execution_state_root: Bytes32) -> ExecutionState:

diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md
@@ -13,8 +13,8 @@
 - [Introduction](#introduction)
 - [Custom types](#custom-types)
 - [Constants](#constants)
-  - [Transition](#transition)
   - [Execution](#execution)
+- [Configuration](#configuration)
 - [Containers](#containers)
   - [Extended containers](#extended-containers)
     - [`BeaconBlockBody`](#beaconblockbody)
@@ -24,6 +24,7 @@
     - [`ExecutionPayloadHeader`](#executionpayloadheader)
 - [Helper functions](#helper-functions)
   - [Misc](#misc)
+    - [`is_execution_enabled`](#is_execution_enabled)
     - [`is_transition_completed`](#is_transition_completed)
     - [`is_transition_block`](#is_transition_block)
     - [`compute_time_at_slot`](#compute_time_at_slot)
@@ -50,12 +51,6 @@ We define the following Python custom types for type hinting and readability:
 
 ## Constants
 
-### Transition
-
-| Name | Value |
-| - | - |
-| `TRANSITION_TOTAL_DIFFICULTY` | **TBD** |
-
 ### Execution
 
 | Name | Value |
@@ -64,6 +59,16 @@ We define the following Python custom types for type hinting and readability:
 | `MAX_EXECUTION_TRANSACTIONS` | `uint64(2**14)` (= 16,384) |
 | `BYTES_PER_LOGS_BLOOM` | `uint64(2**8)` (= 256) |
 
+## Configuration
+
+Warning: this configuration is not definitive.
+
+| Name | Value |
+| - | - |
+| `MERGE_FORK_VERSION` | `Version('0x02000000')` |
+| `MERGE_FORK_EPOCH` | `Epoch(18446744073709551615)` **TBD** |
+| `TRANSITION_TOTAL_DIFFICULTY` | **TBD** |
+
 ## Containers
 
 ### Extended containers
@@ -136,6 +141,13 @@ class ExecutionPayloadHeader(Container):
 
 ### Misc
 
+#### `is_execution_enabled`
+
+```python
+def is_execution_enabled(state: BeaconState, block: BeaconBlock) -> bool:
+    return is_transition_completed(state) or is_transition_block(state, block)
+```
+
 #### `is_transition_completed`
 
 ```python
@@ -146,8 +158,8 @@ def is_transition_completed(state: BeaconState) -> bool:
 #### `is_transition_block`
 
 ```python
-def is_transition_block(state: BeaconState, block_body: BeaconBlockBody) -> bool:
-    return not is_transition_completed(state) and block_body.execution_payload != ExecutionPayload()
+def is_transition_block(state: BeaconState, block: BeaconBlock) -> bool:
+    return not is_transition_completed(state) and block.body.execution_payload != ExecutionPayload()
 ```
 
 #### `compute_time_at_slot`
@@ -168,7 +180,9 @@ def process_block(state: BeaconState, block: BeaconBlock) -> None:
     process_randao(state, block.body)
     process_eth1_data(state, block.body)
     process_operations(state, block.body)
-    process_execution_payload(state, block.body)  # [New in Merge]
+    # Pre-merge, skip execution payload processing
+    if is_execution_enabled(state, block):
+        process_execution_payload(state, block.body.execution_payload)  # [New in Merge]
 ```
 
 #### Execution payload processing
@@ -181,16 +195,10 @@ The body of the function is implementation dependent.
 ##### `process_execution_payload`
 
 ```python
-def process_execution_payload(state: BeaconState, body: BeaconBlockBody) -> None:
+def process_execution_payload(state: BeaconState, execution_payload: ExecutionPayload) -> None:
     """
     Note: This function is designed to be able to be run in parallel with the other `process_block` sub-functions
     """
-    # Pre-merge, skip processing
-    if not is_transition_completed(state) and not is_transition_block(state, body):
-        return
-
-    execution_payload = body.execution_payload
-
     if is_transition_completed(state):
         assert execution_payload.parent_hash == state.latest_execution_payload_header.block_hash
         assert execution_payload.number == state.latest_execution_payload_header.number + 1

diff --git a/specs/merge/fork-choice.md b/specs/merge/fork-choice.md
@@ -75,7 +75,7 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
     assert get_ancestor(store, block.parent_root, finalized_slot) == store.finalized_checkpoint.root
 
     # [New in Merge]
-    if is_transition_block(pre_state, block.body):
+    if is_transition_block(pre_state, block):
         # Delay consideration of block until PoW block is processed by the PoW node
         pow_block = get_pow_block(block.body.execution_payload.parent_hash)
         assert pow_block.is_processed

diff --git a/tests/core/pyspec/eth2spec/test/altair/block_processing/test_process_sync_committee.py b/tests/core/pyspec/eth2spec/test/altair/block_processing/test_process_sync_committee.py
@@ -9,15 +9,14 @@
     transition_to,
 )
 from eth2spec.test.helpers.constants import (
-    PHASE0,
     MAINNET, MINIMAL,
 )
 from eth2spec.test.helpers.sync_committee import (
     compute_aggregate_sync_committee_signature,
 )
 from eth2spec.test.context import (
     expect_assertion_error,
-    with_all_phases_except,
+    with_altair_and_later,
     with_configs,
     spec_state_test,
     always_bls,
@@ -62,7 +61,7 @@ def get_committee_indices(spec, state, duplicates=False):
         state.randao_mixes[randao_index] = hash(state.randao_mixes[randao_index])
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 @always_bls
 def test_invalid_signature_missing_participant(spec, state):
@@ -84,7 +83,7 @@ def test_invalid_signature_missing_participant(spec, state):
     yield from run_sync_committee_processing(spec, state, block, expect_exception=True)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 @always_bls
 def test_invalid_signature_extra_participant(spec, state):
@@ -197,7 +196,7 @@ def run_successful_sync_committee_test(spec, state, committee, committee_bits):
     )
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @with_configs([MINIMAL], reason="to create nonduplicate committee")
 @spec_state_test
 def test_sync_committee_rewards_nonduplicate_committee(spec, state):
@@ -213,7 +212,7 @@ def test_sync_committee_rewards_nonduplicate_committee(spec, state):
     yield from run_successful_sync_committee_test(spec, state, committee, committee_bits)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @with_configs([MAINNET], reason="to create duplicate committee")
 @spec_state_test
 def test_sync_committee_rewards_duplicate_committee(spec, state):
@@ -229,7 +228,7 @@ def test_sync_committee_rewards_duplicate_committee(spec, state):
     yield from run_successful_sync_committee_test(spec, state, committee, committee_bits)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 @always_bls
 def test_sync_committee_rewards_not_full_participants(spec, state):
@@ -240,7 +239,7 @@ def test_sync_committee_rewards_not_full_participants(spec, state):
     yield from run_successful_sync_committee_test(spec, state, committee, committee_bits)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 @always_bls
 def test_sync_committee_rewards_empty_participants(spec, state):
@@ -250,7 +249,7 @@ def test_sync_committee_rewards_empty_participants(spec, state):
     yield from run_successful_sync_committee_test(spec, state, committee, committee_bits)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 @always_bls
 def test_invalid_signature_past_block(spec, state):
@@ -289,7 +288,7 @@ def test_invalid_signature_past_block(spec, state):
     yield from run_sync_committee_processing(spec, state, invalid_block, expect_exception=True)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @with_configs([MINIMAL], reason="to produce different committee sets")
 @spec_state_test
 @always_bls
@@ -326,7 +325,7 @@ def test_invalid_signature_previous_committee(spec, state):
     yield from run_sync_committee_processing(spec, state, block, expect_exception=True)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 @always_bls
 @with_configs([MINIMAL], reason="too slow")

diff --git a/.../core/pyspec/eth2spec/test/altair/epoch_processing/test_process_sync_committee_updates.py b/.../core/pyspec/eth2spec/test/altair/epoch_processing/test_process_sync_committee_updates.py
@@ -2,16 +2,13 @@
     always_bls,
     spec_state_test,
     spec_test,
-    with_all_phases_except,
+    with_altair_and_later,
     with_configs,
     with_custom_state,
     single_phase,
     misc_balances,
 )
-from eth2spec.test.helpers.constants import (
-    PHASE0,
-    MINIMAL,
-)
+from eth2spec.test.helpers.constants import MINIMAL
 from eth2spec.test.helpers.state import transition_to
 from eth2spec.test.helpers.epoch_processing import (
     run_epoch_processing_with,
@@ -49,7 +46,7 @@ def run_sync_committees_progress_test(spec, state):
     assert state.next_sync_committee == third_sync_committee
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 @always_bls
 @with_configs([MINIMAL], reason="too slow")
@@ -60,7 +57,7 @@ def test_sync_committees_progress_genesis(spec, state):
     yield from run_sync_committees_progress_test(spec, state)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 @always_bls
 @with_configs([MINIMAL], reason="too slow")
@@ -73,7 +70,7 @@ def test_sync_committees_progress_not_genesis(spec, state):
     yield from run_sync_committees_progress_test(spec, state)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @with_custom_state(balances_fn=misc_balances, threshold_fn=lambda spec: spec.EJECTION_BALANCE)
 @spec_test
 @single_phase

diff --git a/tests/core/pyspec/eth2spec/test/altair/sanity/test_blocks.py b/tests/core/pyspec/eth2spec/test/altair/sanity/test_blocks.py
@@ -11,9 +11,8 @@
 from eth2spec.test.helpers.sync_committee import (
     compute_aggregate_sync_committee_signature,
 )
-from eth2spec.test.helpers.constants import PHASE0
 from eth2spec.test.context import (
-    with_all_phases_except,
+    with_altair_and_later,
     spec_state_test,
 )
 
@@ -40,46 +39,46 @@ def run_sync_committee_sanity_test(spec, state, fraction_full=1.0):
     yield 'post', state
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 def test_full_sync_committee_committee(spec, state):
     next_epoch(spec, state)
     yield from run_sync_committee_sanity_test(spec, state, fraction_full=1.0)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 def test_half_sync_committee_committee(spec, state):
     next_epoch(spec, state)
     yield from run_sync_committee_sanity_test(spec, state, fraction_full=0.5)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 def test_empty_sync_committee_committee(spec, state):
     next_epoch(spec, state)
     yield from run_sync_committee_sanity_test(spec, state, fraction_full=0.0)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 def test_full_sync_committee_committee_genesis(spec, state):
     yield from run_sync_committee_sanity_test(spec, state, fraction_full=1.0)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 def test_half_sync_committee_committee_genesis(spec, state):
     yield from run_sync_committee_sanity_test(spec, state, fraction_full=0.5)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 def test_empty_sync_committee_committee_genesis(spec, state):
     yield from run_sync_committee_sanity_test(spec, state, fraction_full=0.0)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 def test_inactivity_scores(spec, state):
     for _ in range(spec.MIN_EPOCHS_TO_INACTIVITY_PENALTY + 2):

diff --git a/tests/core/pyspec/eth2spec/test/altair/unittests/validator/test_validator.py b/tests/core/pyspec/eth2spec/test/altair/unittests/validator/test_validator.py
@@ -7,8 +7,7 @@
 from eth2spec.utils import bls
 from eth2spec.utils.bls import only_with_bls
 from eth2spec.test.context import (
-    PHASE0,
-    with_all_phases_except,
+    with_altair_and_later,
     with_state,
 )
 
@@ -25,7 +24,7 @@ def ensure_assignments_in_sync_committee(
         assert spec.is_assigned_to_sync_committee(state, epoch, validator_index)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @with_state
 def test_is_assigned_to_sync_committee(phases, spec, state):
     epoch = spec.get_current_epoch(state)
@@ -91,7 +90,7 @@ def _get_sync_committee_signature(
 
 
 @only_with_bls()
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @with_state
 def test_process_sync_committee_contributions(phases, spec, state):
     # skip over slots at genesis
@@ -144,7 +143,7 @@ def _subnet_for_sync_committee_index(spec, i):
     return i // (spec.SYNC_COMMITTEE_SIZE // spec.SYNC_COMMITTEE_SUBNET_COUNT)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @with_state
 def test_compute_subnets_for_sync_committee(state, spec, phases):
     some_sync_committee_members = list(
-Original file line number
+Diff line change
@@ Expand Up / @@ -441,7 +441,7 @@ def sundry_functions(cls) -> str: @@
     def get_pow_block(hash: Bytes32) -> PowBlock:
-        pass
+        return PowBlock(block_hash=hash, is_valid=True, is_processed=True, total_difficulty=TRANSITION_TOTAL_DIFFICULTY)
     def get_execution_state(execution_state_root: Bytes32) -> ExecutionState:
@@ Expand Down @@