Add EIP4844 testgen

tests/core/pyspec/eth2spec/test/capella/fork/test_capella_fork_random.py

@@ -0,0 +1 @@
+# TODO

tests/core/pyspec/eth2spec/test/eip4844/fork/test_eip4844_fork_basic.py

@@ -0,0 +1,82 @@
+from eth2spec.test.context import (
+    with_phases,
+    with_custom_state,
+    with_presets,
+    spec_test, with_state,
+    low_balances, misc_balances, large_validator_set,
+)
+from eth2spec.test.utils import with_meta_tags
+from eth2spec.test.helpers.constants import (
+    CAPELLA, EIP4844,
+    MINIMAL,
+)
+from eth2spec.test.helpers.state import (
+    next_epoch,
+    next_epoch_via_block,
+)
+from eth2spec.test.helpers.eip4844.fork import (
+    EIP4844_FORK_TEST_META_TAGS,
+    run_fork_test,
+)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@spec_test
+@with_state
+@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+def test_fork_base_state(spec, phases, state):
+    yield from run_fork_test(phases[EIP4844], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@spec_test
+@with_state
+@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+def test_fork_next_epoch(spec, phases, state):
+    next_epoch(spec, state)
+    yield from run_fork_test(phases[EIP4844], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@spec_test
+@with_state
+@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+def test_fork_next_epoch_with_block(spec, phases, state):
+    next_epoch_via_block(spec, state)
+    yield from run_fork_test(phases[EIP4844], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@spec_test
+@with_state
+@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+def test_fork_many_next_epoch(spec, phases, state):
+    for _ in range(3):
+        next_epoch(spec, state)
+    yield from run_fork_test(phases[EIP4844], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@with_custom_state(balances_fn=low_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
+@spec_test
+@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+def test_fork_random_low_balances(spec, phases, state):
+    yield from run_fork_test(phases[EIP4844], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@with_custom_state(balances_fn=misc_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
+@spec_test
+@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+def test_fork_random_misc_balances(spec, phases, state):
+    yield from run_fork_test(phases[EIP4844], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@with_presets([MINIMAL],
+              reason="mainnet config leads to larger validator set than limit of public/private keys pre-generated")
+@with_custom_state(balances_fn=large_validator_set, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
+@spec_test
+@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+def test_fork_random_large_validator_set(spec, phases, state):
+    yield from run_fork_test(phases[EIP4844], state)

tests/core/pyspec/eth2spec/test/eip4844/fork/test_eip4844_fork_random.py

@@ -0,0 +1 @@
+# TODO

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

@@ -0,0 +1,63 @@
+from eth2spec.test.helpers.constants import (
+    EIP4844,
+)
+
+
+EIP4844_FORK_TEST_META_TAGS = {
+    'fork': EIP4844,
+}
+
+
+def run_fork_test(post_spec, pre_state):
+    yield 'pre', pre_state
+
+    post_state = post_spec.upgrade_to_eip4844(pre_state)
+
+    # Stable fields
+    stable_fields = [
+        'genesis_time', 'genesis_validators_root', 'slot',
+        # History
+        'latest_block_header', 'block_roots', 'state_roots', 'historical_roots',
+        # Eth1
+        'eth1_data', 'eth1_data_votes', 'eth1_deposit_index',
+        # Registry
+        'validators', 'balances',
+        # Randomness
+        'randao_mixes',
+        # Slashings
+        'slashings',
+        # Participation
+        'previous_epoch_participation', 'current_epoch_participation',
+        # Finality
+        'justification_bits', 'previous_justified_checkpoint', 'current_justified_checkpoint', 'finalized_checkpoint',
+        # Inactivity
+        'inactivity_scores',
+        # Sync
+        'current_sync_committee', 'next_sync_committee',
+        # Execution
+        'latest_execution_payload_header',
+    ]
+    for field in stable_fields:
+        assert getattr(pre_state, field) == getattr(post_state, field)
+
+    # Modified fields
+    modified_fields = ['fork']
+    for field in modified_fields:
+        assert getattr(pre_state, field) != getattr(post_state, field)
+
+    assert len(pre_state.validators) == len(post_state.validators)
+    for pre_validator, post_validator in zip(pre_state.validators, post_state.validators):
+        stable_validator_fields = [
+            'pubkey', 'withdrawal_credentials',
+            'effective_balance',
+            'slashed',
+            'activation_eligibility_epoch', 'activation_epoch', 'exit_epoch', 'withdrawable_epoch',
+        ]
+        for field in stable_validator_fields:
+            assert getattr(pre_validator, field) == getattr(post_validator, field)
+
+    assert pre_state.fork.current_version == post_state.fork.previous_version
+    assert post_state.fork.current_version == post_spec.config.EIP4844_FORK_VERSION
+    assert post_state.fork.epoch == post_spec.get_current_epoch(post_state)
+
+    yield 'post', post_state

tests/generators/epoch_processing/main.py

@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
 
 
 if __name__ == "__main__":
@@ -31,6 +31,10 @@ if __name__ == "__main__":
     # so no additional tests required.
     capella_mods = bellatrix_mods
 
+    # No epoch-processing changes in EIP4844 and previous testing repeats with new types,
+    # so no additional tests required.
+    eip4844_mods = capella_mods
+
     # TODO Custody Game testgen is disabled for now
     # custody_game_mods = {**{key: 'eth2spec.test.custody_game.epoch_processing.test_process_' + key for key in [
     #     'reveal_deadlines',
@@ -43,6 +47,7 @@ if __name__ == "__main__":
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
+        EIP4844: eip4844_mods,
     }
 
     run_state_test_generators(runner_name="epoch_processing", all_mods=all_mods)

tests/generators/finality/main.py

@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
 
 
 if __name__ == "__main__":
@@ -7,12 +7,14 @@ if __name__ == "__main__":
     altair_mods = phase_0_mods  # No additional Altair specific finality tests
     bellatrix_mods = altair_mods  # No additional Bellatrix specific finality tests
     capella_mods = bellatrix_mods  # No additional Capella specific finality tests
+    eip4844_mods = capella_mods  # No additional EIP4844 specific finality tests
 
     all_mods = {
         PHASE0: phase_0_mods,
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
+        EIP4844: eip4844_mods,
     }
 
     run_state_test_generators(runner_name="finality", all_mods=all_mods)

tests/generators/fork_choice/main.py

@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
 
 
 if __name__ == "__main__":
@@ -18,11 +18,14 @@ if __name__ == "__main__":
     ]}
     bellatrix_mods = combine_mods(_new_bellatrix_mods, altair_mods)
     capella_mods = bellatrix_mods  # No additional Capella specific fork choice tests
+    eip4844_mods = capella_mods  # No additional Capella specific fork choice tests
+
     all_mods = {
         PHASE0: phase_0_mods,
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
+        EIP4844: eip4844_mods,
     }
 
     run_state_test_generators(runner_name="fork_choice", all_mods=all_mods)

tests/generators/forks/main.py

@@ -1,13 +1,14 @@
 from typing import Iterable
 
 from eth2spec.test.helpers.constants import (
-    PHASE0, ALTAIR, BELLATRIX, CAPELLA,
+    PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844,
     MINIMAL, MAINNET,
 )
 from eth2spec.test.helpers.typing import SpecForkName, PresetBaseName
 from eth2spec.test.altair.fork import test_altair_fork_basic, test_altair_fork_random
 from eth2spec.test.bellatrix.fork import test_bellatrix_fork_basic, test_bellatrix_fork_random
 from eth2spec.test.capella.fork import test_capella_fork_basic, test_capella_fork_random
+from eth2spec.test.eip4844.fork import test_eip4844_fork_basic, test_eip4844_fork_random
 from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 from eth2spec.gen_helpers.gen_from_tests.gen import generate_from_tests
 
@@ -39,6 +40,8 @@ def _get_fork_tests_providers():
         yield create_provider(test_bellatrix_fork_random, preset, ALTAIR, BELLATRIX)
         yield create_provider(test_capella_fork_basic, preset, BELLATRIX, CAPELLA)
         yield create_provider(test_capella_fork_random, preset, BELLATRIX, CAPELLA)
+        yield create_provider(test_eip4844_fork_basic, preset, CAPELLA, EIP4844)
+        yield create_provider(test_eip4844_fork_random, preset, CAPELLA, EIP4844)
 
 
 if __name__ == "__main__":

tests/generators/genesis/main.py

@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
 
 
 if __name__ == "__main__":
@@ -16,11 +16,13 @@ if __name__ == "__main__":
     ]}
     bellatrix_mods = combine_mods(_new_bellatrix_mods, altair_mods)
     capella_mods = bellatrix_mods  # No additional Capella specific genesis tests
+    eip4844_mods = capella_mods  # No additional EIP4844 specific genesis tests
     all_mods = {
         PHASE0: phase_0_mods,
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
+        EIP4844: eip4844_mods,
     }
 
     run_state_test_generators(runner_name="genesis", all_mods=all_mods)

tests/generators/light_client/main.py

@@ -1,4 +1,4 @@
-from eth2spec.test.helpers.constants import ALTAIR, BELLATRIX, CAPELLA
+from eth2spec.test.helpers.constants import ALTAIR, BELLATRIX, CAPELLA, EIP4844
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
 
 
@@ -10,11 +10,13 @@ if __name__ == "__main__":
     ]}
     bellatrix_mods = altair_mods
     capella_mods = bellatrix_mods
+    eip4844_mods = capella_mods
 
     all_mods = {
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
+        EIP4844: eip4844_mods,
     }
 
     run_state_test_generators(runner_name="light_client", all_mods=all_mods)

tests/generators/operations/main.py

@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
 
 
 if __name__ == "__main__":
@@ -31,6 +31,13 @@ if __name__ == "__main__":
     ]}
     capella_mods = combine_mods(_new_capella_mods, bellatrix_mods)
 
+    _new_eip4844_mods = {key: 'eth2spec.test.eip4844.block_processing.test_process_' + key for key in [
+        'bls_to_execution_change',
+        'withdrawals',
+    ]}
+    eip4844_mods = combine_mods(_new_eip4844_mods, capella_mods)
+
+
     # TODO Custody Game testgen is disabled for now
     # _new_custody_game_mods = {key: 'eth2spec.test.custody_game.block_processing.test_process_' + key for key in [
     #     'attestation',
@@ -46,6 +53,7 @@ if __name__ == "__main__":
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
+        EIP4844: eip4844_mods,
     }
 
     run_state_test_generators(runner_name="operations", all_mods=all_mods)

tests/generators/rewards/main.py

@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
 
 
 if __name__ == "__main__":
@@ -16,12 +16,14 @@ if __name__ == "__main__":
     # Transaction fees are part of the execution-layer.
     bellatrix_mods = altair_mods
     capella_mods = bellatrix_mods
+    eip4844_mods = capella_mods
 
     all_mods = {
         PHASE0: phase_0_mods,
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
+        EIP4844: eip4844_mods,
     }
 
     run_state_test_generators(runner_name="rewards", all_mods=all_mods)

tests/generators/sanity/main.py

@@ -1,4 +1,4 @@
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods
 
 
@@ -23,11 +23,17 @@ if __name__ == "__main__":
     ]}
     capella_mods = combine_mods(_new_capella_mods, bellatrix_mods)
 
+    _new_eip4844_mods = {key: 'eth2spec.test.eip4844.sanity.test_' + key for key in [
+        'blocks',
+    ]}
+    eip4844_mods = combine_mods(_new_eip4844_mods, capella_mods)
+
     all_mods = {
         PHASE0: phase_0_mods,
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
+        EIP4844: eip4844_mods,
     }
 
     run_state_test_generators(runner_name="sanity", all_mods=all_mods)