Merge remote-tracking branch 'origin/dev' into distributed-blob-publishing

# Conflicts:
#	specs/deneb/p2p-interface.md

Author: jimmygchen

.circleci/config.yml

@@ -35,14 +35,14 @@ commands:
     description: "Restore the cache with pyspec keys"
     steps:
       - restore_cached_venv:
-          venv_name: v33-pyspec
-          reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "pyproject.toml" }}-{{ python3 --version }}
+          venv_name: v34-pyspec
+          reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "pyproject.toml" }}
   save_pyspec_cached_venv:
-    description: Save a venv into a cache with pyspec keys"
+    description: "Save a venv into a cache with pyspec keys"
     steps:
       - save_cached_venv:
-          venv_name: v33-pyspec
-          reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "pyproject.toml" }}-{{ python3 --version }}
+          venv_name: v34-pyspec
+          reqs_checksum: cache-{{ checksum "setup.py" }}-{{ checksum "pyproject.toml" }}
           venv_path: ./venv
 jobs:
   checkout_specs:
@@ -168,7 +168,7 @@ jobs:
           command: make test fork=fulu
       - store_test_results:
           path: tests/core/pyspec/test-reports
-  test-whisk:
+  test-eip7441:
     docker:
       - image: cimg/python:3.12-node
     working_directory: ~/specs-repo
@@ -178,7 +178,20 @@ jobs:
       - restore_pyspec_cached_venv
       - run:
           name: Run py-tests
-          command: make test fork=whisk
+          command: make test fork=eip7441
+      - store_test_results:
+          path: tests/core/pyspec/test-reports
+  test-eip7732:
+    docker:
+      - image: cimg/python:3.12-node
+    working_directory: ~/specs-repo
+    steps:
+      - restore_cache:
+          key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_pyspec_cached_venv
+      - run:
+          name: Run py-tests
+          command: make test fork=eip7732
       - store_test_results:
           path: tests/core/pyspec/test-reports
   lint:
@@ -224,7 +237,10 @@ workflows:
       - test-fulu:
           requires:
             - install_pyspec_test
-      - test-whisk:
+      - test-eip7441:
+          requires:
+            - install_pyspec_test
+      - test-eip7732:
           requires:
             - install_pyspec_test
       - lint:

.dockerignore

@@ -61,7 +61,7 @@ jobs:
     needs: [lint]
     strategy:
       matrix:
-        version: ["phase0", "altair", "bellatrix", "capella", "deneb", "electra", "fulu", "whisk"]
+        version: ["phase0", "altair", "bellatrix", "capella", "deneb", "electra", "fulu", "eip7441", "eip7732"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/run-tests.yml

@@ -24,9 +24,10 @@ tests/core/pyspec/eth2spec/capella/
 tests/core/pyspec/eth2spec/deneb/
 tests/core/pyspec/eth2spec/electra/
 tests/core/pyspec/eth2spec/fulu/
-tests/core/pyspec/eth2spec/whisk/
 tests/core/pyspec/eth2spec/eip6800/
+tests/core/pyspec/eth2spec/eip7441/
 tests/core/pyspec/eth2spec/eip7732/
+tests/core/pyspec/eth2spec/eip7805/
 
 # coverage reports
 .htmlcov

.gitignore

@@ -10,9 +10,10 @@ ALL_EXECUTABLE_SPEC_NAMES = \
 	deneb     \
 	electra   \
 	fulu      \
-	whisk     \
 	eip6800   \
-	eip7732
+	eip7441   \
+	eip7732   \
+  eip7805
 
 # A list of fake targets.
 .PHONY: \
@@ -73,10 +74,12 @@ PYSPEC_DIR = $(TEST_LIBS_DIR)/pyspec
 
 # Create the pyspec for all phases.
 pyspec: $(VENV) setup.py pyproject.toml
-	@echo "Building eth2spec"
 	@$(PYTHON_VENV) -m uv pip install --reinstall-package=eth2spec .[docs,lint,test,generator]
-	@echo "Building all pyspecs"
-	@$(PYTHON_VENV) setup.py pyspecdev
+	@for dir in $(ALL_EXECUTABLE_SPEC_NAMES); do \
+	    mkdir -p "./tests/core/pyspec/eth2spec/$$dir"; \
+	    cp "./build/lib/eth2spec/$$dir/mainnet.py" "./tests/core/pyspec/eth2spec/$$dir/mainnet.py"; \
+	    cp "./build/lib/eth2spec/$$dir/minimal.py" "./tests/core/pyspec/eth2spec/$$dir/minimal.py"; \
+	done
 
 ###############################################################################
 # Testing
@@ -240,12 +243,16 @@ gen_all: $(GENERATOR_TARGETS)
 
 # Detect errors in generators.
 detect_errors: $(TEST_VECTOR_DIR)
-	@find $(TEST_VECTOR_DIR) -name "INCOMPLETE"
+	@incomplete_files=$$(find $(TEST_VECTOR_DIR) -name "INCOMPLETE"); \
+	if [ -n "$$incomplete_files" ]; then \
+		echo "[ERROR] incomplete detected"; \
+		exit 1; \
+	fi
 	@if [ -f $(GENERATOR_ERROR_LOG_FILE) ]; then \
 		echo "[ERROR] $(GENERATOR_ERROR_LOG_FILE) file exists"; \
-	else \
-		echo "[PASSED] error log file does not exist"; \
+		exit 1; \
 	fi
+	@echo "[PASSED] no errors detected"
 
 # Generate KZG trusted setups for testing.
 kzg_setups: pyspec
@@ -263,4 +270,4 @@ kzg_setups: pyspec
 
 # Delete all untracked files.
 clean:
-	@git clean -fdx
+	@git clean -fdx

Makefile

@@ -18,7 +18,7 @@ Features are researched and developed in parallel, and then consolidated into se
 | Seq. | Code Name | Fork Epoch | Specs |
 | - | - | - | - |
 | 0 | **Phase0** |`0` | <ul><li>Core</li><ul><li>[The beacon chain](specs/phase0/beacon-chain.md)</li><li>[Deposit contract](specs/phase0/deposit-contract.md)</li><li>[Beacon chain fork choice](specs/phase0/fork-choice.md)</li></ul><li>Additions</li><ul><li>[Honest validator guide](specs/phase0/validator.md)</li><li>[P2P networking](specs/phase0/p2p-interface.md)</li><li>[Weak subjectivity](specs/phase0/weak-subjectivity.md)</li></ul></ul> |
-| 1 |  **Altair** | `74240` | <ul><li>Core</li><ul><li>[Beacon chain changes](specs/altair/beacon-chain.md)</li><li>[Altair fork](specs/altair/fork.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol](specs/altair/light-client/sync-protocol.md) ([full node](specs/altair/light-client/full-node.md), [light client](specs/altair/light-client/light-client.md), [networking](specs/altair/light-client/p2p-interface.md))</li><li>[Honest validator guide changes](specs/altair/validator.md)</li><li>[P2P networking](specs/altair/p2p-interface.md)</li></ul></ul> |
+| 1 | **Altair** | `74240` | <ul><li>Core</li><ul><li>[Beacon chain changes](specs/altair/beacon-chain.md)</li><li>[Altair fork](specs/altair/fork.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol](specs/altair/light-client/sync-protocol.md) ([full node](specs/altair/light-client/full-node.md), [light client](specs/altair/light-client/light-client.md), [networking](specs/altair/light-client/p2p-interface.md))</li><li>[Honest validator guide changes](specs/altair/validator.md)</li><li>[P2P networking](specs/altair/p2p-interface.md)</li></ul></ul> |
 | 2 | **Bellatrix** <br/> (["The Merge"](https://ethereum.org/en/upgrades/merge/)) | `144896` | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/bellatrix/beacon-chain.md)</li><li>[Bellatrix fork](specs/bellatrix/fork.md)</li><li>[Fork choice changes](specs/bellatrix/fork-choice.md)</li></ul><li>Additions</li><ul><li>[Honest validator guide changes](specs/bellatrix/validator.md)</li><li>[P2P networking](specs/bellatrix/p2p-interface.md)</li></ul></ul> |
 | 3 | **Capella** | `194048` | <ul><li>Core</li><ul><li>[Beacon chain changes](specs/capella/beacon-chain.md)</li><li>[Capella fork](specs/capella/fork.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol changes](specs/capella/light-client/sync-protocol.md) ([fork](specs/capella/light-client/fork.md), [full node](specs/capella/light-client/full-node.md), [networking](specs/capella/light-client/p2p-interface.md))</li><li>[Validator additions](specs/capella/validator.md)</li><li>[P2P networking](specs/capella/p2p-interface.md)</li></ul></ul> |
 | 4 | **Deneb** | `269568` | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/deneb/beacon-chain.md)</li><li>[Deneb fork](specs/deneb/fork.md)</li><li>[Polynomial commitments](specs/deneb/polynomial-commitments.md)</li><li>[Fork choice changes](specs/deneb/fork-choice.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol changes](specs/deneb/light-client/sync-protocol.md) ([fork](specs/deneb/light-client/fork.md), [full node](specs/deneb/light-client/full-node.md), [networking](specs/deneb/light-client/p2p-interface.md))</li><li>[Honest validator guide changes](specs/deneb/validator.md)</li><li>[P2P networking](specs/deneb/p2p-interface.md)</li></ul></ul> |
@@ -28,7 +28,7 @@ Features are researched and developed in parallel, and then consolidated into se
 | Seq. | Code Name | Fork Epoch | Specs |
 | - | - | - | - |
 | 5 | **Electra** | TBD | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/electra/beacon-chain.md)</li><li>[Electra fork](specs/electra/fork.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol changes](specs/electra/light-client/sync-protocol.md) ([fork](specs/electra/light-client/fork.md), [networking](specs/electra/light-client/p2p-interface.md))</li><li>[Honest validator guide changes](specs/electra/validator.md)</li><li>[P2P networking](specs/electra/p2p-interface.md)</li></ul></ul> |
-| 6 | **Fulu** | TBD | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/fulu/beacon-chain.md)</li><li>[Fulu fork](specs/fulu/fork.md)</li><li>[Data availability sampling core](specs/fulu/das-core.md)</li><li>[Polynomial commitments sampling](specs/fulu/polynomial-commitments-sampling.md)</li><li>[Fork choice changes](specs/fulu/fork-choice.md)</li></ul><li>Additions</li><ul><li>[P2P networking](specs/fulu/p2p-interface.md)</li><li>[Peer sampling](specs/fulu/peer-sampling.md)</li></ul></ul> |
+| 6 | **Fulu** | TBD | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/fulu/beacon-chain.md)</li><li>[Fulu fork](specs/fulu/fork.md)</li><li>[Data availability sampling core](specs/fulu/das-core.md)</li><li>[Polynomial commitments sampling](specs/fulu/polynomial-commitments-sampling.md)</li><li>[Fork choice changes](specs/fulu/fork-choice.md)</li></ul><li>Additions</li><ul><li>[Honest validator guide changes](specs/fulu/validator.md)</li><li>[P2P networking](specs/fulu/p2p-interface.md)</li><li>[Peer sampling](specs/fulu/peer-sampling.md)</li></ul></ul> |
 
 ### Accompanying documents can be found in [specs](specs) and include:
 
@@ -75,15 +75,20 @@ Conformance tests built from the executable python spec are available in the [Et
 
 ## Installation and usage
 
-The consensus-specs repo can be used by running the tests locally or inside a docker container.
+Clone the repository with:
 
-To run the tests locally:
-- Clone the repository with `git clone https://github.com/ethereum/consensus-specs.git`
-- Switch to the directory `cd consensus-specs`
-- Run the tests with `make test`
+```bash
+git clone https://github.com/ethereum/consensus-specs.git
+```
 
-To run the tests inside a docker container:
-- Switch to the directory with `cd scripts`
-- Run the script `./build_run_docker_tests.sh`
-- Find the results in a folder called `./testResults`
-- Find more ways to customize the script with `./build_run_docker_tests.sh --h`
+Switch to the directory:
+
+```bash
+cd consensus-specs
+```
+
+Run the tests:
+
+```bash
+make test
+```

README.md

@@ -6,7 +6,9 @@ PRESET_BASE: 'mainnet'
 # Free-form short name of the network that this configuration applies to - known
 # canonical network names include:
 # * 'mainnet' - there can be only one
-# * 'prater' - testnet
+# * 'sepolia' - testnet
+# * 'holesky' - testnet
+# * 'hoodi' - testnet
 # Must match the regex: [a-z0-9\-]
 CONFIG_NAME: 'mainnet'
 
@@ -56,9 +58,9 @@ ELECTRA_FORK_EPOCH: 18446744073709551615  # temporary stub
 # Fulu
 FULU_FORK_VERSION: 0x06000000
 FULU_FORK_EPOCH: 18446744073709551615  # temporary stub
-# WHISK
-WHISK_FORK_VERSION: 0x08000000  # temporary stub
-WHISK_FORK_EPOCH: 18446744073709551615
+# EIP7441
+EIP7441_FORK_VERSION: 0x08000000  # temporary stub
+EIP7441_FORK_EPOCH: 18446744073709551615
 # EIP7732
 EIP7732_FORK_VERSION: 0x09000000  # temporary stub
 EIP7732_FORK_EPOCH: 18446744073709551615
@@ -175,11 +177,14 @@ BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
 MAX_BLOBS_PER_BLOCK_FULU: 12
 MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
 
-# Whisk
-# `Epoch(2**8)`
-WHISK_EPOCHS_PER_SHUFFLING_PHASE: 256
-# `Epoch(2)`
-WHISK_PROPOSER_SELECTION_GAP: 2
+# EIP7441
+EPOCHS_PER_SHUFFLING_PHASE: 256
+PROPOSER_SELECTION_GAP: 2
 
 # EIP7732
 MAX_REQUEST_PAYLOADS: 128
+
+# EIP7805
+ATTESTATION_DEADLINE: 4
+PROPOSER_INCLUSION_LIST_CUT_OFF: 11
+VIEW_FREEZE_DEADLINE: 9

configs/mainnet.yaml

@@ -5,8 +5,7 @@ PRESET_BASE: 'minimal'
 
 # Free-form short name of the network that this configuration applies to - known
 # canonical network names include:
-# * 'mainnet' - there can be only one
-# * 'prater' - testnet
+# * 'minimal' - spec-testing
 # Must match the regex: [a-z0-9\-]
 CONFIG_NAME: 'minimal'
 
@@ -55,9 +54,9 @@ ELECTRA_FORK_EPOCH: 18446744073709551615
 # Fulu
 FULU_FORK_VERSION: 0x06000001
 FULU_FORK_EPOCH: 18446744073709551615
-# WHISK
-WHISK_FORK_VERSION: 0x08000001
-WHISK_FORK_EPOCH: 18446744073709551615
+# EIP7441
+EIP7441_FORK_VERSION: 0x08000001
+EIP7441_FORK_EPOCH: 18446744073709551615
 # EIP7732
 EIP7732_FORK_VERSION: 0x09000001
 EIP7732_FORK_EPOCH: 18446744073709551615
@@ -176,9 +175,14 @@ BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000
 MAX_BLOBS_PER_BLOCK_FULU: 12
 MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
 
-# Whisk
-WHISK_EPOCHS_PER_SHUFFLING_PHASE: 4
-WHISK_PROPOSER_SELECTION_GAP: 1
+# EIP7441
+EPOCHS_PER_SHUFFLING_PHASE: 4
+PROPOSER_SELECTION_GAP: 1
 
 # EIP7732
 MAX_REQUEST_PAYLOADS: 128
+
+# EIP7805
+ATTESTATION_DEADLINE: 2
+PROPOSER_INCLUSION_LIST_CUT_OFF: 5
+VIEW_FREEZE_DEADLINE: 3