Merge branch 'dev' into pr3656

Author: hwwhww

.circleci/config.yml

@@ -155,7 +155,7 @@ jobs:
           command: make citest fork=deneb
       - store_test_results:
           path: tests/core/pyspec/test-reports
-  test-eip6110:
+  test-electra:
     docker:
       - image: circleci/python:3.9
     working_directory: ~/specs-repo
@@ -165,46 +165,7 @@ jobs:
       - restore_pyspec_cached_venv
       - run:
           name: Run py-tests
-          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
-  test-eip7251:
-    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=eip7251
-      - 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
+          command: make citest fork=electra
       - store_test_results:
           path: tests/core/pyspec/test-reports
   test-whisk:
@@ -353,16 +314,7 @@ workflows:
       - test-deneb:
           requires:
             - install_pyspec_test
-      - test-eip6110:
-          requires:
-            - install_pyspec_test
-      - test-eip7002:
-          requires:
-            - install_pyspec_test
-      - test-eip7251:
-          requires:
-            - install_pyspec_test
-      - test-eip7549:
+      - test-electra:
           requires:
             - install_pyspec_test
       - test-whisk:
@@ -376,7 +328,7 @@ workflows:
       - lint:
           requires:
             - install_pyspec_test
-      # NOTE: Since phase 0 has been launched, we disabled the deposit contract tests. 
+      # NOTE: Since phase 0 has been launched, we disabled the deposit contract tests.
       # - install_deposit_contract_web3_tester:
       #     requires:
       #       - checkout_specs

.github/workflows/run-tests.yml

@@ -10,9 +10,9 @@ env:
 on:
   push:
     branches:
-      - dev 
+      - dev
       - master
-  pull_request:    
+  pull_request:
   workflow_dispatch:
     inputs:
       test_preset_type:
@@ -71,22 +71,22 @@ jobs:
     needs: [preclear,lint,codespell,table_of_contents]
     strategy:
       matrix:
-        version: ["phase0", "altair", "bellatrix", "capella", "deneb", "eip6110", "eip7002", "eip7251", "eip7549", "whisk", "eip7594"]
+        version: ["phase0", "altair", "bellatrix", "capella", "deneb", "electra", "whisk", "eip7594"]
     steps:
       - name: Checkout this repo
         uses: actions/[email protected]
       - name: set TEST_PRESET_TYPE
-        if: github.event.inputs.test_preset_type != ''        
+        if: github.event.inputs.test_preset_type != ''
         run: |
           echo "spec_test_preset_type=${{ github.event.inputs.test_preset_type || env.TEST_PRESET_TYPE }}" >> $GITHUB_ENV
       - name: set TEST_PRESET_TYPE
         if: ${{ (github.event_name == 'push' && github.ref_name != 'master') || github.event_name == 'pull_request' }}
         run: |
-          echo "spec_test_preset_type=${{ env.TEST_PRESET_TYPE}}" >> $GITHUB_ENV    
+          echo "spec_test_preset_type=${{ env.TEST_PRESET_TYPE}}" >> $GITHUB_ENV
       - name: set TEST_PRESET_TYPE
         if: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
         run: |
-          echo "spec_test_preset_type=mainnet" >> $GITHUB_ENV    
+          echo "spec_test_preset_type=mainnet" >> $GITHUB_ENV
       - name: set TEST_PRESET_TYPE
         if: github.event.schedule=='0 0 * * *'
         run: |

.gitignore

@@ -21,9 +21,7 @@ tests/core/pyspec/eth2spec/altair/
 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/eip7549/
+tests/core/pyspec/eth2spec/electra/
 tests/core/pyspec/eth2spec/whisk/
 tests/core/pyspec/eth2spec/eip7251/
 tests/core/pyspec/eth2spec/eip7594/

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 eip6110 eip7002 eip7251 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)
@@ -244,5 +244,5 @@ build_docs: copy_docs
 	mkdocs build
 
 serve_docs:
-	. venv/bin/activate; 
+	. venv/bin/activate;
 	mkdocs serve

README.md

@@ -26,10 +26,10 @@ Features are researched and developed in parallel, and then consolidated into se
 ### In-development Specifications
 | Code Name or Topic | Specs | Notes |
 | - | - | - |
+| Electra | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/electra/beacon-chain.md)</li><li>[EIP-6110 fork](specs/electra/fork.md)</li></ul><li>Additions</li><ul><li>[Honest validator guide changes](specs/electra/validator.md)</li></ul></ul> |
 | Sharding (outdated) | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/_features/sharding/beacon-chain.md)</li></ul><li>Additions</li><ul><li>[P2P networking](specs/_features/sharding/p2p-interface.md)</li></ul></ul> |
 | Custody Game (outdated) | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/_features/custody_game/beacon-chain.md)</li></ul><li>Additions</li><ul><li>[Honest validator guide changes](specs/_features/custody_game/validator.md)</li></ul></ul> | Dependent on sharding |
 | Data Availability Sampling (outdated) | <ul><li>Core</li><ul><li>[Core types and functions](specs/_features/das/das-core.md)</li><li>[Fork choice changes](specs/_features/das/fork-choice.md)</li></ul><li>Additions</li><ul><li>[P2P Networking](specs/_features/das/p2p-interface.md)</li><li>[Sampling process](specs/_features/das/sampling.md)</li></ul></ul> | <ul><li> Dependent on sharding</li><li>[Technical explainer](https://hackmd.io/@HWeNw8hNRimMm2m2GH56Cw/B1YJPGkpD)</li></ul> |
-| EIP-6110 | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/_features/eip6110//beacon-chain.md)</li><li>[EIP-6110 fork](specs/_features/eip6110/fork.md)</li></ul><li>Additions</li><ul><li>[Honest validator guide changes](specs/_features/eip6110/validator.md)</li></ul></ul> |
 
 ### Accompanying documents can be found in [specs](specs) and include:
 

configs/mainnet.yaml

@@ -53,18 +53,9 @@ DENEB_FORK_EPOCH: 269568  # March 13, 2024, 01:55:35pm UTC
 # Electra
 ELECTRA_FORK_VERSION: 0x05000000
 ELECTRA_FORK_EPOCH: 18446744073709551615
-# EIP6110
-EIP6110_FORK_VERSION: 0x06000000  # temporary stub
-EIP6110_FORK_EPOCH: 18446744073709551615
-# EIP7002
-EIP7002_FORK_VERSION: 0x07000000  # temporary stub
-EIP7002_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

configs/minimal.yaml

@@ -52,18 +52,9 @@ DENEB_FORK_EPOCH: 18446744073709551615
 # Electra
 ELECTRA_FORK_VERSION: 0x05000001
 ELECTRA_FORK_EPOCH: 18446744073709551615
-# EIP6110
-EIP6110_FORK_VERSION: 0x06000001
-EIP6110_FORK_EPOCH: 18446744073709551615
-# EIP7002
-EIP7002_FORK_VERSION: 0x07000001
-EIP7002_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

presets/mainnet/eip6110.yaml

@@ -0,0 +1,15 @@
+# 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
+MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: 8192
+# 2**4 (= 16) exits
+MAX_EXECUTION_LAYER_EXITS: 16