Merge pull request #3786 from ethereum/dev

release v1.5.0-alpha.3

.github/workflows/generate_vectors.yml

@@ -0,0 +1,78 @@
+name: Run test vector generation
+
+defaults:
+  run:
+    shell: zsh {0}
+
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: The branch, tag or SHA to checkout and build from
+        default: dev
+        type: string
+        required: true
+
+jobs:
+  generate-tests:
+    runs-on: [self-hosted-ghr-custom, size-chungus-x64, profile-consensusSpecs]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          repository: 'ethereum/consensus-specs'
+          path: 'consensus-specs'
+          ref: ${{ inputs.source_ref }}
+      - name: Checkout consensus-spec-tests repository
+        uses: actions/checkout@v4
+        with:
+          repository: 'ethereum/consensus-spec-tests'
+          path: 'consensus-spec-tests'
+          fetch-depth: 1
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+          cache: ''
+      - name: Clean up Spec Repository
+        run: |
+          cd consensus-specs
+          make clean
+      - name: Install dependencies and generate pyspec
+        run: |
+          cd consensus-specs
+          make install_test
+          make -B pyspec
+      - name: Generate tests
+        run: |
+          cd consensus-specs
+          make -j 16 generate_tests 2>&1 | tee ../consensustestgen.log
+          cp -r presets/ ../consensus-spec-tests/presets
+          cp -r configs/ ../consensus-spec-tests/configs
+          find . -type d -empty -delete
+      - name: Archive configurations
+        run: |
+          cd consensus-spec-tests
+          tar -czvf general.tar.gz tests/general
+          tar -czvf minimal.tar.gz tests/minimal
+          tar -czvf mainnet.tar.gz tests/mainnet
+      - name: Upload general.tar.gz
+        uses: actions/upload-artifact@v4
+        with:
+          name: General Test Configuration
+          path: consensus-spec-tests/general.tar.gz
+      - name: Upload minimal.tar.gz
+        uses: actions/upload-artifact@v4
+        with:
+          name: Minimal Test Configuration
+          path: consensus-spec-tests/minimal.tar.gz
+      - name: Upload mainnet.tar.gz
+        uses: actions/upload-artifact@v4
+        with:
+          name: Mainnet Test Configuration
+          path: consensus-spec-tests/mainnet.tar.gz
+      - name: Upload consensustestgen
+        uses: actions/upload-artifact@v4
+        with:
+          name: consensustestgen.log
+          path: consensustestgen.log

.gitignore

@@ -24,6 +24,7 @@ tests/core/pyspec/eth2spec/deneb/
 tests/core/pyspec/eth2spec/electra/
 tests/core/pyspec/eth2spec/whisk/
 tests/core/pyspec/eth2spec/eip7594/
+tests/core/pyspec/eth2spec/eip6800/
 
 # coverage reports
 .htmlcov

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 whisk
+ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb electra whisk eip6800
 # 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)

configs/mainnet.yaml

@@ -159,6 +159,9 @@ NUMBER_OF_COLUMNS: 128
 MAX_CELLS_IN_EXTENDED_MATRIX: 768
 DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
+SAMPLES_PER_SLOT: 8
+CUSTODY_REQUIREMENT: 1
+TARGET_NUMBER_OF_PEERS: 70
 
 # [New in Electra:EIP7251]
 MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 128000000000 # 2**7 * 10**9 (= 128,000,000,000)

configs/minimal.yaml

@@ -158,6 +158,9 @@ NUMBER_OF_COLUMNS: 128
 MAX_CELLS_IN_EXTENDED_MATRIX: 768
 DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
+SAMPLES_PER_SLOT: 8
+CUSTODY_REQUIREMENT: 1
+TARGET_NUMBER_OF_PEERS: 70
 
 # [New in Electra:EIP7251]
 MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA: 64000000000 # 2**6 * 10**9 (= 64,000,000,000)

docs/docs/new-feature.md

@@ -54,10 +54,10 @@ You can refer to the previous fork's `fork.md` file.
 ### 5. Make it executable
 - Update Pyspec [`constants.py`](https://github.com/ethereum/consensus-specs/blob/dev/tests/core/pyspec/eth2spec/test/helpers/constants.py) with the new feature name.
 - Update helpers for [`setup.py`](https://github.com/ethereum/consensus-specs/blob/dev/setup.py) for building the spec:
-    - Update [`pysetup/constants.py`](https://github.com/ethereum/consensus-specs/blob/dev/constants.py) with the new feature name as Pyspec `constants.py` defined.
+    - Update [`pysetup/constants.py`](https://github.com/ethereum/consensus-specs/blob/dev/pysetup/constants.py) with the new feature name as Pyspec `constants.py` defined.
     - Update [`pysetup/spec_builders/__init__.py`](https://github.com/ethereum/consensus-specs/blob/dev/pysetup/spec_builders/__init__.py). Implement a new `<FEATURE_NAME>SpecBuilder` in `pysetup/spec_builders/<FEATURE_NAME>.py` with the new feature name. e.g., `EIP9999SpecBuilder`. Append it to the `spec_builders` list.
     - Update [`pysetup/md_doc_paths.py`](https://github.com/ethereum/consensus-specs/blob/dev/pysetup/md_doc_paths.py): add the path of the new markdown files in `get_md_doc_paths` function if needed.
-- Update `PREVIOUS_FORK_OF` setting in both [`test/helpers/constants.py`](https://github.com/ethereum/consensus-specs/blob/dev/constants.py) and [`pysetup/md_doc_paths.py`](https://github.com/ethereum/consensus-specs/blob/dev/pysetup/md_doc_paths.py).
+- Update `PREVIOUS_FORK_OF` setting in both [`test/helpers/constants.py`](https://github.com/ethereum/consensus-specs/blob/dev/tests/core/pyspec/eth2spec/test/helpers/constants.py) and [`pysetup/md_doc_paths.py`](https://github.com/ethereum/consensus-specs/blob/dev/pysetup/md_doc_paths.py).
     - NOTE: since these two modules (the pyspec itself and the spec builder tool) must be separate, the fork sequence setting has to be defined again.
 
 ## B: Make it executable for pytest and test generator

presets/mainnet/eip6800.yaml

@@ -0,0 +1,12 @@
+# Mainnet preset - EIP6800
+
+# Misc
+# ---------------------------------------------------------------
+# `uint64(2**16)` (= 65,536) 
+MAX_STEMS: 65536
+# `uint64(33)`
+MAX_COMMITMENTS_PER_STEM: 33
+# `uint64(2**8)` (= 256)
+VERKLE_WIDTH: 256
+# `uint64(2**3)` (= 8)
+IPA_PROOF_DEPTH: 8

presets/mainnet/electra.yaml

@@ -30,12 +30,12 @@ MAX_ATTESTER_SLASHINGS_ELECTRA: 1
 # `uint64(2**3)` (= 8)
 MAX_ATTESTATIONS_ELECTRA: 8
 # `uint64(2**0)` (= 1)
-MAX_CONSOLIDATIONS: 1
+MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 1
 
 # Execution
 # ---------------------------------------------------------------
-# 2**13 (= 8192) receipts
-MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: 8192
+# 2**13 (= 8192) deposit requests
+MAX_DEPOSIT_REQUESTS_PER_PAYLOAD: 8192
 # 2**4 (= 16) withdrawal requests
 MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: 16
 

presets/minimal/eip6800.yaml

@@ -0,0 +1,12 @@
+# Minimal preset - EIP6800
+
+# Execution
+# ---------------------------------------------------------------
+# `uint64(2**16)` (= 65,536) 
+MAX_STEMS: 65536
+# `uint64(33)`
+MAX_COMMITMENTS_PER_STEM: 33
+# `uint64(2**8)` (= 256)
+VERKLE_WIDTH: 256
+# `uint64(2**3)` (= 8)
+IPA_PROOF_DEPTH: 8

presets/minimal/electra.yaml

@@ -30,12 +30,12 @@ MAX_ATTESTER_SLASHINGS_ELECTRA: 1
 # `uint64(2**3)` (= 8)
 MAX_ATTESTATIONS_ELECTRA: 8
 # `uint64(2**0)` (= 1)
-MAX_CONSOLIDATIONS: 1
+MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 1
 
 # Execution
 # ---------------------------------------------------------------
 # [customized]
-MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD: 4
+MAX_DEPOSIT_REQUESTS_PER_PAYLOAD: 4
 # [customized] 2**1 (= 2) withdrawal requests
 MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: 2
 

pysetup/constants.py

@@ -6,10 +6,10 @@
 DENEB = 'deneb'
 ELECTRA = 'electra'
 EIP7594 = 'eip7594'
+EIP6800 = 'eip6800'
 WHISK = 'whisk'
 
 
-
 # The helper functions that are used when defining constants
 CONSTANT_DEP_SUNDRY_CONSTANTS_FUNCTIONS = '''
 def ceillog2(x: int) -> uint64:

pysetup/helpers.py

@@ -178,7 +178,7 @@ def combine_dicts(old_dict: Dict[str, T], new_dict: Dict[str, T]) -> Dict[str, T
 
 ignored_dependencies = [
     'bit', 'boolean', 'Vector', 'List', 'Container', 'BLSPubkey', 'BLSSignature',
-    'Bytes1', 'Bytes4', 'Bytes8', 'Bytes20', 'Bytes32', 'Bytes48', 'Bytes96', 'Bitlist', 'Bitvector',
+    'Bytes1', 'Bytes4', 'Bytes8', 'Bytes20', 'Bytes31', 'Bytes32', 'Bytes48', 'Bytes96', 'Bitlist', 'Bitvector',
     'uint8', 'uint16', 'uint32', 'uint64', 'uint128', 'uint256',
     'bytes', 'byte', 'ByteList', 'ByteVector',
     'Dict', 'dict', 'field', 'ceillog2', 'floorlog2', 'Set',

pysetup/md_doc_paths.py

@@ -9,6 +9,7 @@
     ELECTRA,
     WHISK,
     EIP7594,
+    EIP6800,
 )
 
 
@@ -21,6 +22,7 @@
     ELECTRA: DENEB,
     WHISK: CAPELLA,
     EIP7594: DENEB,
+    EIP6800: DENEB,
 }
 
 ALL_FORKS = list(PREVIOUS_FORK_OF.keys())

pysetup/spec_builders/__init__.py

@@ -6,12 +6,13 @@
 from .electra import ElectraSpecBuilder
 from .whisk import WhiskSpecBuilder
 from .eip7594 import EIP7594SpecBuilder
+from .eip6800 import EIP6800SpecBuilder
 
 
 spec_builders = {
     builder.fork: builder
     for builder in (
         Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder, DenebSpecBuilder,
-        ElectraSpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder,
+        ElectraSpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder, EIP6800SpecBuilder,
     )
 }

pysetup/spec_builders/eip6800.py

@@ -0,0 +1,21 @@
+from typing import Dict
+
+from .base import BaseSpecBuilder
+from ..constants import EIP6800
+
+
+class EIP6800SpecBuilder(BaseSpecBuilder):
+    fork: str = EIP6800
+
+    @classmethod
+    def imports(cls, preset_name: str):
+        return f'''
+from eth2spec.deneb import {preset_name} as deneb
+from eth2spec.utils.ssz.ssz_typing import Bytes31
+'''
+
+    @classmethod
+    def hardcoded_custom_type_dep_constants(cls, spec_object) -> str:
+        return {
+            'MAX_STEMS': spec_object.preset_vars['MAX_STEMS'].value,
+        }

scripts/build_run_docker_tests.sh

@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 # Run 'consensus-specs' tests from a docker container instance.
 # *Be sure to launch Docker before running this script.*

setup.py

@@ -219,7 +219,13 @@ def get_spec(file_name: Path, preset: Dict[str, str], config: Dict[str, str], pr
             elif source.startswith("class"):
                 class_name, parent_class = _get_class_info_from_source(source)
                 # check consistency with spec
-                assert class_name == current_name
+                try:
+                    assert class_name == current_name
+                except Exception:
+                    print('class_name', class_name)
+                    print('current_name', current_name)
+                    raise
+
                 if parent_class:
                     assert parent_class == "Container"
                 # NOTE: trim whitespace from spec