Merge pull request #3349 from ethereum/eip7002

EIP-7002:  Execution layer triggerable exits

.circleci/config.yml

@@ -168,6 +168,19 @@ jobs:
  command: make citest fork=eip6110
  - store_test_results:
  path: tests/core/pyspec/test-reports
+ test-eip7002:
+ docker:
+ - image: circleci/python:3.9
+ working_directory: ~/specs-repo
+ steps:
+ - restore_cache:
+ key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
+ - restore_pyspec_cached_venv
+ - run:
+ name: Run py-tests
+ command: make citest fork=eip7002
+ - store_test_results:
+ path: tests/core/pyspec/test-reports
  table_of_contents:
  docker:
  - image: circleci/node:10.16.3
@@ -291,6 +304,9 @@ workflows:
  - test-eip6110:
  requires:
  - install_pyspec_test
+ - test-eip7002:
+ requires:
+ - install_pyspec_test
  - table_of_contents
  - codespell
  - lint:

.github/workflows/run-tests.yml

@@ -71,7 +71,7 @@ jobs:
  needs: [preclear,lint,codespell,table_of_contents]
  strategy:
  matrix:
- version: ["phase0", "altair", "bellatrix", "capella", "deneb", "eip6110"]
+ version: ["phase0", "altair", "bellatrix", "capella", "deneb", "eip6110", "eip7002"]
  steps:
  - name: Checkout this repo
  uses: actions/checkout@v3.2.0

.gitignore

@@ -22,6 +22,7 @@ tests/core/pyspec/eth2spec/bellatrix/
 tests/core/pyspec/eth2spec/capella/
 tests/core/pyspec/eth2spec/deneb/
 tests/core/pyspec/eth2spec/eip6110/
+tests/core/pyspec/eth2spec/eip7002/
 tests/core/pyspec/eth2spec/whisk/
 
 # coverage reports

configs/mainnet.yaml

@@ -53,6 +53,9 @@ DENEB_FORK_EPOCH: 18446744073709551615
 # EIP6110
 EIP6110_FORK_VERSION: 0x05000000 # temporary stub
 EIP6110_FORK_EPOCH: 18446744073709551615
+# EIP7002
+EIP7002_FORK_VERSION: 0x05000000 # temporary stub
+EIP7002_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x06000000 # temporary stub
 WHISK_FORK_EPOCH: 18446744073709551615

configs/minimal.yaml

@@ -52,6 +52,9 @@ DENEB_FORK_EPOCH: 18446744073709551615
 # EIP6110
 EIP6110_FORK_VERSION: 0x05000001
 EIP6110_FORK_EPOCH: 18446744073709551615
+# EIP7002
+EIP7002_FORK_VERSION: 0x05000001
+EIP7002_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x06000001
 WHISK_FORK_EPOCH: 18446744073709551615

pysetup/constants.py

@@ -5,9 +5,11 @@
 CAPELLA = 'capella'
 DENEB = 'deneb'
 EIP6110 = 'eip6110'
+EIP7002 = 'eip7002'
 WHISK = 'whisk'
 
 
+
 # The helper functions that are used when defining constants
 CONSTANT_DEP_SUNDRY_CONSTANTS_FUNCTIONS = '''
 def ceillog2(x: int) -> uint64:

pysetup/md_doc_paths.py

@@ -8,6 +8,7 @@
  DENEB,
  EIP6110,
  WHISK,
+ EIP7002,
 )
 
 
@@ -19,6 +20,7 @@
  DENEB: CAPELLA,
  EIP6110: DENEB,
  WHISK: CAPELLA,
+ EIP7002: CAPELLA,
 }
 
 ALL_FORKS = list(PREVIOUS_FORK_OF.keys())

pysetup/spec_builders/__init__.py

@@ -4,13 +4,14 @@
 from .capella import CapellaSpecBuilder
 from .deneb import DenebSpecBuilder
 from .eip6110 import EIP6110SpecBuilder
+from .eip7002 import EIP7002SpecBuilder
 from .whisk import WhiskSpecBuilder
 
 
 spec_builders = {
  builder.fork: builder
  for builder in (
  Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder, DenebSpecBuilder,
- EIP6110SpecBuilder, WhiskSpecBuilder,
+ EIP6110SpecBuilder, EIP7002SpecBuilder, WhiskSpecBuilder,
  )
 }

pysetup/spec_builders/eip7002.py

@@ -0,0 +1,12 @@
+from .base import BaseSpecBuilder
+from ..constants import EIP7002
+
+
+class EIP7002SpecBuilder(BaseSpecBuilder):
+ fork: str = EIP7002
+
+ @classmethod
+ def imports(cls, preset_name: str):
+ return super().imports(preset_name) + f'''
+from eth2spec.capella import {preset_name} as capella
+'''