Add more checks to electra fork transition tests

Author: mkalinin

specs/electra/fork.md

@@ -72,7 +72,6 @@ an irregular state change is made to upgrade to Electra.
 ```python
 def upgrade_to_electra(pre: deneb.BeaconState) -> BeaconState:
     epoch = deneb.get_current_epoch(pre)
-    latest_execution_payload_header = pre.latest_execution_payload_header
 
     exit_epochs = [v.exit_epoch for v in pre.validators if v.exit_epoch != FAR_FUTURE_EPOCH]
     if not exit_epochs:
@@ -119,7 +118,7 @@ def upgrade_to_electra(pre: deneb.BeaconState) -> BeaconState:
         current_sync_committee=pre.current_sync_committee,
         next_sync_committee=pre.next_sync_committee,
         # Execution-layer
-        latest_execution_payload_header=latest_execution_payload_header,  # [Modified in Electra:EIP6110:EIP7002]
+        latest_execution_payload_header=pre.latest_execution_payload_header,
         # Withdrawals
         next_withdrawal_index=pre.next_withdrawal_index,
         next_withdrawal_validator_index=pre.next_withdrawal_validator_index,

tests/core/pyspec/eth2spec/test/electra/fork/test_electra_fork_basic.py

@@ -87,22 +87,41 @@ def test_fork_random_large_validator_set(spec, phases, state):
 @with_state
 @with_meta_tags(ELECTRA_FORK_TEST_META_TAGS)
 def test_fork_pre_activation(spec, phases, state):
+    index = 0
     post_spec = phases[ELECTRA]
-    state.validators[0].activation_epoch = spec.FAR_FUTURE_EPOCH
+    state.validators[index].activation_epoch = spec.FAR_FUTURE_EPOCH
     post_state = yield from run_fork_test(post_spec, state)
 
-    assert len(post_state.pending_deposits) > 0
+    validator = post_state.validators[index]
+    assert post_state.balances[index] == 0
+    assert validator.effective_balance == 0
+    assert validator.activation_eligibility_epoch == spec.FAR_FUTURE_EPOCH
+    assert post_state.pending_deposits == [post_spec.PendingDeposit(
+        pubkey=validator.pubkey,
+        withdrawal_credentials=validator.withdrawal_credentials,
+        amount=state.balances[index],
+        signature=spec.bls.G2_POINT_AT_INFINITY,
+        slot=spec.GENESIS_SLOT,
+    )]
 
 
 @with_phases(phases=[DENEB], other_phases=[ELECTRA])
 @spec_test
 @with_state
 @with_meta_tags(ELECTRA_FORK_TEST_META_TAGS)
 def test_fork_has_compounding_withdrawal_credential(spec, phases, state):
+    index = 0
     post_spec = phases[ELECTRA]
-    validator = state.validators[0]
-    state.balances[0] = post_spec.MIN_ACTIVATION_BALANCE + 1
+    validator = state.validators[index]
+    state.balances[index] = post_spec.MIN_ACTIVATION_BALANCE + 1
     validator.withdrawal_credentials = post_spec.COMPOUNDING_WITHDRAWAL_PREFIX + validator.withdrawal_credentials[1:]
     post_state = yield from run_fork_test(post_spec, state)
 
-    assert len(post_state.pending_deposits) > 0
+    assert post_state.balances[index] == post_spec.MIN_ACTIVATION_BALANCE
+    assert post_state.pending_deposits == [post_spec.PendingDeposit(
+        pubkey=validator.pubkey,
+        withdrawal_credentials=validator.withdrawal_credentials,
+        amount=state.balances[index] - post_spec.MIN_ACTIVATION_BALANCE,
+        signature=spec.bls.G2_POINT_AT_INFINITY,
+        slot=spec.GENESIS_SLOT,
+    )]

tests/core/pyspec/eth2spec/test/helpers/electra/fork.py

@@ -54,7 +54,7 @@ def run_fork_test(post_spec, pre_state):
         stable_validator_fields = [
             'pubkey', 'withdrawal_credentials',
             'slashed',
-            'exit_epoch', 'withdrawable_epoch',
+            'activation_epoch', 'exit_epoch', 'withdrawable_epoch',
         ]
         for field in stable_validator_fields:
             assert getattr(pre_validator, field) == getattr(post_validator, field)