Merge EIP7002 into Electra

asanso · Mar 6, 2024 · ec9bbfa · ec9bbfa
1 parent 82271d1
commit ec9bbfa
Show file tree

Hide file tree

Showing 22 changed files with 72 additions and 500 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -168,19 +168,6 @@ jobs:
           command: make citest fork=electra
       - 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
   test-whisk:
     docker:
       - image: circleci/python:3.9
@@ -330,9 +317,6 @@ workflows:
       - test-electra:
           requires:
             - install_pyspec_test
-      - test-eip7002:
-          requires:
-            - install_pyspec_test
       - test-whisk:
           requires:
             - install_pyspec_test

diff --git a/.github/workflows/run-tests.yml b/.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", "electra", "eip7002", "whisk", "eip7594"]
+        version: ["phase0", "altair", "bellatrix", "capella", "deneb", "electra", "whisk", "eip7594"]
     steps:
       - name: Checkout this repo
         uses: actions/[email protected]

diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,6 @@ tests/core/pyspec/eth2spec/bellatrix/
 tests/core/pyspec/eth2spec/capella/
 tests/core/pyspec/eth2spec/deneb/
 tests/core/pyspec/eth2spec/electra/
-tests/core/pyspec/eth2spec/eip7002/
 tests/core/pyspec/eth2spec/whisk/
 tests/core/pyspec/eth2spec/eip7594/
 

diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/*/*.md) \
                  $(wildcard $(SPEC_DIR)/_features/*/*/*.md) \
                  $(wildcard $(SSZ_DIR)/*.md)
 
-ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb electra eip7002 whisk
+ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb electra whisk
 # The parameters for commands. Use `foreach` to avoid listing specs again.
 COVERAGE_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), --cov=eth2spec.$S.$(TEST_PRESET_TYPE))
 PYLINT_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), ./eth2spec/$S)

diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml
@@ -53,9 +53,6 @@ DENEB_FORK_EPOCH: 269568  # March 13, 2024, 01:55:35pm UTC
 # Electra
 ELECTRA_FORK_VERSION: 0x05000000  # temporary stub
 ELECTRA_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

diff --git a/configs/minimal.yaml b/configs/minimal.yaml
@@ -52,9 +52,6 @@ DENEB_FORK_EPOCH: 18446744073709551615
 # ELECTRA
 ELECTRA_FORK_VERSION: 0x05000001
 ELECTRA_FORK_EPOCH: 18446744073709551615
-# EIP7002
-EIP7002_FORK_VERSION: 0x05000001
-EIP7002_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x06000001
 WHISK_FORK_EPOCH: 18446744073709551615

diff --git a/presets/mainnet/electra.yaml b/presets/mainnet/electra.yaml
@@ -4,3 +4,5 @@
 # ---------------------------------------------------------------
 # 2**13 (= 8192) receipts
 MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: 8192
+# 2**4 (= 16) exits
+MAX_EXECUTION_LAYER_EXITS: 16
diff --git a/presets/minimal/electra.yaml b/presets/minimal/electra.yaml
@@ -4,3 +4,5 @@
 # ---------------------------------------------------------------
 # [customized]
 MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: 4
+# 2**4 (= 16) exits
+MAX_EXECUTION_LAYER_EXITS: 16
diff --git a/pysetup/constants.py b/pysetup/constants.py
@@ -5,7 +5,6 @@
 CAPELLA = 'capella'
 DENEB = 'deneb'
 ELECTRA = 'electra'
-EIP7002 = 'eip7002'
 WHISK = 'whisk'
 EIP7594 = 'eip7594'
 

diff --git a/pysetup/md_doc_paths.py b/pysetup/md_doc_paths.py
@@ -8,7 +8,6 @@
     DENEB,
     ELECTRA,
     WHISK,
-    EIP7002,
     EIP7594,
 )
 
@@ -21,7 +20,6 @@
     DENEB: CAPELLA,
     ELECTRA: DENEB,
     WHISK: CAPELLA,
-    EIP7002: CAPELLA,
     EIP7594: DENEB,
 }
 

diff --git a/pysetup/spec_builders/__init__.py b/pysetup/spec_builders/__init__.py
@@ -4,7 +4,6 @@
 from .capella import CapellaSpecBuilder
 from .deneb import DenebSpecBuilder
 from .electra import ElectraSpecBuilder
-from .eip7002 import EIP7002SpecBuilder
 from .whisk import WhiskSpecBuilder
 from .eip7594 import EIP7594SpecBuilder
 
@@ -13,6 +12,6 @@
     builder.fork: builder
     for builder in (
         Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder, DenebSpecBuilder,
-        ElectraSpecBuilder, EIP7002SpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder,
+        ElectraSpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder,
     )
 }