Merge EIP-7549 into Electra

ethereum · Apr 5, 2024 · a8aab51 · a8aab51
1 parent 4287340
commit a8aab51
Show file tree

Hide file tree

Showing 26 changed files with 245 additions and 476 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-eip7549:
-    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=eip7549
-      - 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-eip7549:
-          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", "whisk", "eip7549", "eip7594"]
+        version: ["phase0", "altair", "bellatrix", "capella", "deneb", "electra", "whisk", "eip7594"]
     steps:
       - name: Checkout this repo
         uses: actions/checkout@v3.2.0

diff --git a/.gitignore b/.gitignore
@@ -24,7 +24,6 @@ tests/core/pyspec/eth2spec/deneb/
 tests/core/pyspec/eth2spec/electra/
 tests/core/pyspec/eth2spec/whisk/
 tests/core/pyspec/eth2spec/eip7251/
-tests/core/pyspec/eth2spec/eip7549/
 tests/core/pyspec/eth2spec/eip7594/
 
 # coverage reports

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 eip7549 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
@@ -56,9 +56,6 @@ ELECTRA_FORK_EPOCH: 18446744073709551615
 # EIP7251
 EIP7251_FORK_VERSION: 0x06000000  # temporary stub
 EIP7251_FORK_EPOCH: 18446744073709551615
-# EIP7549
-EIP7549_FORK_VERSION: 0x06000000  # temporary stub
-EIP7549_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x08000000  # temporary stub
 WHISK_FORK_EPOCH: 18446744073709551615

diff --git a/configs/minimal.yaml b/configs/minimal.yaml
@@ -55,9 +55,6 @@ ELECTRA_FORK_EPOCH: 18446744073709551615
 # EIP7251
 EIP7251_FORK_VERSION: 0x06000001  # temporary stub
 EIP7251_FORK_EPOCH: 18446744073709551615
-# EIP7549
-EIP7549_FORK_VERSION: 0x06000001  # temporary stub
-EIP7549_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x08000001
 WHISK_FORK_EPOCH: 18446744073709551615

diff --git a/presets/mainnet/eip7549.yaml b/presets/mainnet/eip7549.yaml
diff --git a/presets/mainnet/electra.yaml b/presets/mainnet/electra.yaml
@@ -1,5 +1,12 @@
 # Mainnet preset - Electra
 
+# # Max operations per block
+# ---------------------------------------------------------------
+# `uint64(2**0)` (= 1)
+MAX_ATTESTER_SLASHINGS_ELECTRA: 1
+# `uint64(2 * 3)` (= 8)
+MAX_ATTESTATIONS_ELECTRA: 8
+
 # Execution
 # ---------------------------------------------------------------
 # 2**13 (= 8192) receipts

diff --git a/presets/minimal/eip7549.yaml b/presets/minimal/eip7549.yaml
diff --git a/presets/minimal/electra.yaml b/presets/minimal/electra.yaml
@@ -1,5 +1,12 @@
 # Minimal preset - Electra
 
+# # Max operations per block
+# ---------------------------------------------------------------
+# `uint64(2**0)` (= 1)
+MAX_ATTESTER_SLASHINGS_ELECTRA: 1
+# `uint64(2 * 3)` (= 8)
+MAX_ATTESTATIONS_ELECTRA: 8
+
 # Execution
 # ---------------------------------------------------------------
 # [customized]

diff --git a/pysetup/constants.py b/pysetup/constants.py
@@ -7,7 +7,6 @@
 ELECTRA = 'electra'
 EIP7594 = 'eip7594'
 EIP7251 = 'eip7251'
-EIP7549 = 'eip7549'
 WHISK = 'whisk'
 
 

diff --git a/pysetup/md_doc_paths.py b/pysetup/md_doc_paths.py
@@ -10,7 +10,6 @@
     WHISK,
     EIP7594,
     EIP7251,
-    EIP7549,
 )
 
 
@@ -23,7 +22,6 @@
     ELECTRA: DENEB,
     WHISK: CAPELLA,
     EIP7251: DENEB,
-    EIP7549: DENEB,
     EIP7594: DENEB,
 }
 

diff --git a/pysetup/spec_builders/__init__.py b/pysetup/spec_builders/__init__.py
@@ -6,14 +6,13 @@
 from .electra import ElectraSpecBuilder
 from .whisk import WhiskSpecBuilder
 from .eip7251 import EIP7251SpecBuilder
-from .eip7549 import EIP7549SpecBuilder
 from .eip7594 import EIP7594SpecBuilder
 
 
 spec_builders = {
     builder.fork: builder
     for builder in (
         Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder, DenebSpecBuilder,
-        ElectraSpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder, EIP7549SpecBuilder, EIP7251SpecBuilder,
+        ElectraSpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder, EIP7251SpecBuilder,
     )
 }
diff --git a/pysetup/spec_builders/eip7549.py b/pysetup/spec_builders/eip7549.py
diff --git a/specs/_features/eip7549/beacon-chain.md b/specs/_features/eip7549/beacon-chain.md