Merge branch 'master' into feature/manifest_file_for_tests_vectors

Author: Sandijigs

.codespell-whitelist

@@ -1,4 +1,4 @@
-name: Run tests
+name: Checks
 
 defaults:
   run:
@@ -23,7 +23,7 @@ jobs:
         with:
           python-version-file: "pyproject.toml"
       - name: Install uv ${{ vars.UV_VERSION }}
-        uses: astral-sh/setup-uv@3259c6206f993105e3a61b142c2d97bf4b9ef83d # v7.1.0
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           enable-cache: true
           version: ${{ vars.UV_VERSION }}
@@ -66,7 +66,7 @@ jobs:
         with:
           python-version-file: "pyproject.toml"
       - name: Install uv ${{ vars.UV_VERSION }}
-        uses: astral-sh/setup-uv@3259c6206f993105e3a61b142c2d97bf4b9ef83d # v7.1.0
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           enable-cache: true
           version: ${{ vars.UV_VERSION }}
@@ -76,7 +76,7 @@ jobs:
         if: always()
         run: cp -r ./tests/core/pyspec/test-reports ./tests/core/pyspec/test-results-framework-${{ github.run_number }}
       - name: Upload framework test results
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: always()
         with:
           name: test-results-framework-${{ github.run_number }}
@@ -106,7 +106,7 @@ jobs:
         with:
           python-version-file: "pyproject.toml"
       - name: Install uv ${{ vars.UV_VERSION }}
-        uses: astral-sh/setup-uv@3259c6206f993105e3a61b142c2d97bf4b9ef83d # v7.1.0
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           enable-cache: true
           version: ${{ vars.UV_VERSION }}
@@ -116,7 +116,7 @@ jobs:
         if: always()
         run: cp -r ./tests/core/pyspec/test-reports ./tests/core/pyspec/test-results-minimal-${{ matrix.fork }}-${{ github.run_number }}
       - name: Upload ${{ matrix.fork }} test results
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: always()
         with:
           name: test-results-minimal-${{ matrix.fork }}-${{ github.run_number }}

.github/workflows/run-tests.yml renamed to .github/workflows/checks.yml

@@ -1,4 +1,4 @@
-name: Generate reference tests
+name: Nightly Reference Tests
 
 defaults:
   run:
@@ -36,7 +36,7 @@ jobs:
         with:
           python-version-file: "consensus-specs/pyproject.toml"
       - name: Install uv ${{ vars.UV_VERSION }}
-        uses: astral-sh/setup-uv@3259c6206f993105e3a61b142c2d97bf4b9ef83d # v7.1.0
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           enable-cache: true
           version: ${{ vars.UV_VERSION }}
@@ -54,22 +54,22 @@ jobs:
           tar -czvf minimal.tar.gz tests/minimal
           tar -czvf mainnet.tar.gz tests/mainnet
       - name: Upload general.tar.gz
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: General Test Configuration
           path: consensus-spec-tests/general.tar.gz
       - name: Upload minimal.tar.gz
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Minimal Test Configuration
           path: consensus-spec-tests/minimal.tar.gz
       - name: Upload mainnet.tar.gz
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: Mainnet Test Configuration
           path: consensus-spec-tests/mainnet.tar.gz
       - name: Upload consensustestgen
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: consensustestgen.log
           path: consensustestgen.log

.github/workflows/generate_vectors.yml renamed to .github/workflows/nightly-reftests.yml

@@ -1,4 +1,4 @@
-name: Nightly mainnet tests
+name: Nightly Mainnet Tests
 
 defaults:
   run:
@@ -42,7 +42,7 @@ jobs:
         with:
           python-version-file: "pyproject.toml"
       - name: Install uv ${{ vars.UV_VERSION }}
-        uses: astral-sh/setup-uv@3259c6206f993105e3a61b142c2d97bf4b9ef83d # v7.1.0
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           enable-cache: true
           version: ${{ vars.UV_VERSION }}
@@ -52,7 +52,7 @@ jobs:
         if: always()
         run: cp -r ./tests/core/pyspec/test-reports ./tests/core/pyspec/test-results-mainnet-${{ matrix.fork }}-${{ github.run_number }}
       - name: Upload ${{ matrix.fork }} test results
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: always()
         with:
           name: test-results-mainnet-${{ matrix.fork }}-${{ github.run_number }}

.github/workflows/nightly-tests.yml

@@ -28,7 +28,7 @@ jobs:
           python-version-file: "consensus-specs/pyproject.toml"
 
       - name: Install uv ${{ vars.UV_VERSION }}
-        uses: astral-sh/setup-uv@3259c6206f993105e3a61b142c2d97bf4b9ef83d # v7.1.0
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           enable-cache: true
           version: ${{ vars.UV_VERSION }}
@@ -43,27 +43,23 @@ jobs:
             exit 1
           fi
 
-      # Add support for large files
-      - name: Install Git LFS
+      # Ensure framework tests pass
+      - name: Run tests for framework
         run: |
-          sudo apt-get update
-          sudo apt-get install -y git-lfs
-          git lfs install
+          cd consensus-specs
+          make test component=fw
 
-      # Clone the repo with our PAT and delete old files
-      - name: Clone spec tests repo
+      # Ensure minimal tests pass
+      - name: Run tests for minimal
         run: |
-          rm -rf consensus-spec-tests
-          git clone https://x-access-token:${{ secrets.CONSENSUS_SPEC_TESTS_PAT }}@github.com/ethereum/consensus-spec-tests.git --branch=master --single-branch --depth=1 --no-tags
-          cd consensus-spec-tests
-          rm -rf configs presets tests
+          cd consensus-specs
+          make test component=pyspec preset=minimal
 
-      # Write presets/configs to the spec tests repo
-      - name: Copy presets/configs
+      # Ensure mainnet tests pass
+      - name: Run tests for mainnet
         run: |
           cd consensus-specs
-          cp -r presets/ ../consensus-spec-tests/presets
-          cp -r configs/ ../consensus-spec-tests/configs
+          make test component=pyspec preset=mainnet
 
       # Write reference tests to the spec tests repo
       - name: Generate reference tests
@@ -79,21 +75,6 @@ jobs:
           tar -czvf minimal.tar.gz tests/minimal
           tar -czvf mainnet.tar.gz tests/mainnet
 
-      # Commit the tests to the spec tests repo
-      # Cloned with PAT, so don't need to specify it here
-      - name: Push spec tests
-        run: |
-          cd consensus-spec-tests
-          git config user.name "github-actions"
-          git config user.email "[email protected]"
-          git add -A
-          if ! git diff --cached --quiet; then
-            git commit -m "release ${{ github.ref_name }} tests"
-            git push origin HEAD:refs/heads/master
-          else
-            echo "No changes to commit"
-          fi
-
       # Publish the specs release. We use release-drafter to
       # organize PRs into the appropriate section based on PR labels
       - name: Publish specs release
@@ -106,23 +87,14 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # Finally, publish the spec tests release
-      # Requires a personal access token (PAT) with contents:read-write
-      - name: Publish spec tests release
+      # Upload spec test tarballs to the specs release
+      - name: Upload spec test tarballs
         uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
         with:
           tag_name: ${{ github.ref_name }}
-          name: "Spec tests for ${{ github.ref_name }}"
-          body: |
-            Spec tests for `${{ github.ref_name }}`.
-
-            Detailed changelog can be found in [`${{ github.ref_name }}` specs release](https://github.com/ethereum/consensus-specs/releases/tag/${{ github.ref_name }}).
-          prerelease: ${{ contains(github.ref_name, '-') }}
-          draft: false
-          repository: ethereum/consensus-spec-tests
           files: |
             consensus-spec-tests/general.tar.gz
             consensus-spec-tests/minimal.tar.gz
             consensus-spec-tests/mainnet.tar.gz
         env:
-          GITHUB_TOKEN: ${{ secrets.CONSENSUS_SPEC_TESTS_PAT }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Close stale issues and PRs
+name: Close Stale Issues and PRs
 
 on:
   schedule:

.github/workflows/stale.yml

@@ -1,4 +1,4 @@
-name: Publish docs
+name: Update Website
 
 on:
   push:
@@ -21,7 +21,7 @@ jobs:
           python-version-file: "pyproject.toml"
 
       - name: Install uv ${{ vars.UV_VERSION }}
-        uses: astral-sh/setup-uv@3259c6206f993105e3a61b142c2d97bf4b9ef83d # v7.1.0
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
         with:
           enable-cache: true
           version: ${{ vars.UV_VERSION }}

.github/workflows/docs.yml renamed to .github/workflows/website.yml

@@ -11,8 +11,6 @@ build/
 output/
 dist/
 
-consensus-spec-tests/
-
 .pytest_cache
 .mypy_cache
 
@@ -25,10 +23,7 @@ tests/core/pyspec/eth2spec/deneb/
 tests/core/pyspec/eth2spec/electra/
 tests/core/pyspec/eth2spec/fulu/
 tests/core/pyspec/eth2spec/gloas/
-tests/core/pyspec/eth2spec/eip6800/
-tests/core/pyspec/eth2spec/eip7441/
-tests/core/pyspec/eth2spec/eip7805/
-tests/core/pyspec/eth2spec/eip7928/
+tests/core/pyspec/eth2spec/eip*/
 
 # coverage reports
 .htmlcov

.gitignore

@@ -193,7 +193,7 @@ VENV = .venv
 # Use editable installs for all non-generation targets, but use non-editable
 # installs for generators. More details: ethereum/consensus-specs#4633.
 UV_RUN    = uv run
-UV_RUN_NE = uv run --no-editable
+UV_RUN_NE = uv run --no-editable --reinstall-package=eth2spec
 
 # Sync dependencies using uv.
 _sync: MAYBE_VERBOSE := $(if $(filter true,$(verbose)),--verbose)
@@ -225,7 +225,7 @@ TEST_REPORT_DIR = $(PYSPEC_DIR)/test-reports
 
 # Run pyspec tests.
 test: MAYBE_TEST := $(if $(k),-k=$(k))
-# Disable parallelism which running a specific test.
+# Disable parallelism when running a specific test.
 # Parallelism makes debugging difficult (print doesn't work).
 test: MAYBE_PARALLEL := $(if $(k),,-n auto)
 test: MAYBE_FORK := $(if $(fork),--fork=$(fork))
@@ -313,7 +313,7 @@ MYPY_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), -p $(MYPY_PACKAGE_BASE).
 lint: _pyspec
 	@uv --quiet lock --check
 	@$(UV_RUN) mdformat --number --wrap=80 $(MARKDOWN_FILES)
-	@$(UV_RUN) codespell . --skip "./.git,$(VENV),$(PYSPEC_DIR)/.mypy_cache" -I .codespell-whitelist
+	@$(UV_RUN) codespell
 	@$(UV_RUN) ruff check --fix --quiet $(CURDIR)/tests $(CURDIR)/pysetup $(CURDIR)/setup.py
 	@$(UV_RUN) ruff format --quiet $(CURDIR)/tests $(CURDIR)/pysetup $(CURDIR)/setup.py
 	@$(UV_RUN) mypy $(MYPY_SCOPE)

Makefile

@@ -1,7 +1,8 @@
 # Ethereum Proof-of-Stake Consensus Specifications
 
 [![Join the chat at https://discord.gg/qGpsxSA](https://img.shields.io/badge/chat-on%20discord-blue.svg)](https://discord.gg/qGpsxSA)
-[![testgen](https://github.com/ethereum/consensus-specs/actions/workflows/generate_vectors.yml/badge.svg?branch=dev&event=schedule)](https://github.com/ethereum/consensus-specs/actions/workflows/generate_vectors.yml)
+[![nightly-tests](https://github.com/ethereum/consensus-specs/actions/workflows/nightly-tests.yml/badge.svg?branch=master&event=schedule)](https://github.com/ethereum/consensus-specs/actions/workflows/nightly-tests.yml)
+[![nightly-reftests](https://github.com/ethereum/consensus-specs/actions/workflows/nightly-reftests.yml/badge.svg?branch=master&event=schedule)](https://github.com/ethereum/consensus-specs/actions/workflows/nightly-reftests.yml)
 
 This repository hosts the current Ethereum
 [proof-of-stake](https://ethereum.org/en/developers/docs/consensus-mechanisms/pos/)
@@ -52,12 +53,10 @@ functionality can be found in the following repositories:
 
 ### Reference tests
 
-Reference tests built from the executable Python spec are available in the
-[Ethereum Proof-of-Stake Consensus Spec Tests](https://github.com/ethereum/consensus-spec-tests)
-repository. Compressed tarballs are available for each release
-[here](https://github.com/ethereum/consensus-spec-tests/releases). Nightly
-reference tests are available
-[here](https://github.com/ethereum/consensus-specs/actions/workflows/generate_vectors.yml).
+Reference tests built from the executable Python specifications are available in
+the release assets for each release in this repository. There are also *nightly*
+reference tests which are built from the latest version of the specifications
+[here](https://github.com/ethereum/consensus-specs/actions/workflows/nightly-reftests.yml).
 
 ## Contributors