feat(transition_tool): Support EELS resolver in daemon mode

.github/actions/build-evm-base/action.yaml

@@ -44,6 +44,10 @@ runs:
         echo "Reference: ${{ steps.config-evm-reader.outputs.ref }}"
         echo "EVM Binary: ${{ steps.config-evm-impl-config-reader.outputs.evm-bin }}"
         echo "X-Dist parameter: ${{ steps.config-evm-impl-config-reader.outputs.x-dist }}"
+    - name: Skip building for EELS
+      if: steps.config-evm-reader.outputs.impl == 'eels'
+      shell: bash
+      run: echo "Skipping build for EELS"
     - name: Build the EVM using Geth action
       if: steps.config-evm-reader.outputs.impl == 'geth'
       uses: ./.github/actions/build-evm-client/geth

.github/configs/evm-impl.yaml

@@ -1,3 +1,6 @@
+eels:
+  evm-bin: ethereum-spec-evm-resolver
+  x-dist: auto
 geth:
   evm-bin: evm
   x-dist: auto

.github/configs/evm.yaml

@@ -1,7 +1,7 @@
 stable:
-  impl: geth
-  repo: ethereum/go-ethereum
-  ref: master
+  impl: eels
+  repo: null
+  ref: null
 develop:
   impl: geth
   repo: lightclient/go-ethereum

.github/workflows/coverage.yaml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   evmone-coverage-diff:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         driver: [retesteth, native]

.github/workflows/docs_main.yaml

@@ -8,7 +8,7 @@ on:
 jobs:
   deploy:
     if: github.repository_owner == 'ethereum' # don't run on forks
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout

.github/workflows/docs_tags.yaml

@@ -8,7 +8,7 @@ on:
 jobs:
   deploy:
     if: github.repository_owner == 'ethereum' # don't run on forks
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout

.github/workflows/fixtures.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   features:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       features: ${{ steps.parse.outputs.features }}
     steps:
@@ -20,7 +20,7 @@ jobs:
           echo "features=$(grep -Po "^[0-9a-zA-Z_\-]+" ./.github/configs/feature.yaml | jq -R . | jq -cs .)" >> "$GITHUB_OUTPUT"
   build:
     needs: features
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         name: ${{ fromJson(needs.features.outputs.features) }}
@@ -32,7 +32,7 @@ jobs:
         with:
           release_name: ${{ matrix.name }}
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     if: startsWith(github.ref, 'refs/tags/')
     steps:

.github/workflows/fixtures_feature.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   feature-names:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       names: ${{ steps.feature-name.outputs.names }}
     steps:
@@ -23,7 +23,7 @@ jobs:
           echo names=${names}
           echo names=${names} >> "$GITHUB_OUTPUT"
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: feature-names
     strategy:
       matrix:
@@ -36,7 +36,7 @@ jobs:
         with:
           release_name: ${{ matrix.feature }}
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     if: startsWith(github.ref, 'refs/tags/')
     steps:

.github/workflows/tox_verify.yaml

@@ -8,28 +8,28 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-24.04
             python: "3.10"
             evm-type: "stable"
-            tox-cmd: "tox"  # run-parallel --parallel-no-spinner"  # TODO: disable parallelisation for uv testing
-          - os: ubuntu-latest
+            tox-cmd: "uvx --with=tox-uv tox"  # run-parallel --parallel-no-spinner"  # TODO: disable parallelisation for uv testing
+          - os: ubuntu-24.04
             python: "3.12"
             evm-type: "stable"
-            tox-cmd: "tox"  # run-parallel --parallel-no-spinner"
+            tox-cmd: "uvx --with=tox-uv tox"  # run-parallel --parallel-no-spinner"
           # Disabled due to unavailable evm implementation for devnet-1
-          # - os: ubuntu-latest
+          # - os: ubuntu-24.04
           #   python: '3.11'
           #   evm-type: 'develop'
           #   tox-cmd: 'tox -e tests-develop'
           # Disabled to not be gated by evmone implementation
-          # - os: ubuntu-latest
+          # - os: ubuntu-24.04
           #   python: '3.11'
           #   evm-type: 'eip7692'
           #   tox-cmd: 'tox -e tests-eip7692'
           - os: macos-latest
             python: "3.11"
             evm-type: "stable"
-            tox-cmd: "tox"  # run-parallel --parallel-no-spinner"
+            tox-cmd: "uvx --with=tox-uv tox"  # run-parallel --parallel-no-spinner"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -52,8 +52,6 @@ jobs:
           brew install aspell
           # Add additional packages on 3.11: https://github.com/ethereum/execution-spec-tests/issues/274
           if [ ${{ matrix.python }} == '3.11' ]; then brew install autoconf automake libtool; fi
-      - name: Install Tox and any other packages
-        run: pip install tox-uv
       - name: Run Tox (CPython)
         run: ${{ matrix.tox-cmd }}
       - uses: DavidAnson/markdownlint-cli2-action@v16

README.md

@@ -79,62 +79,79 @@ All current tags, their t8n implementation and branch they point to, are listed
 
 ### Prerequisites
 
-The following requires a Python 3.10, 3.11 or 3.12 installation.
+The tools provided by ethereum/execution-spec-tests use `uv` ([docs.astral.sh/uv](https://docs.astral.sh/uv/)) to manage their dependencies and virtual environment. `uv` downloads Python for your target platform if one of the required versions (Python 3.10, 3.11 or 3.12) is not available natively.
 
-### Quick Start
+`uv` can be installed via curl (recommended; can self-update):
 
-This guide installs stable versions of the external (go-ethereum) `evm` executable and will only enable generation of test fixtures for features deployed to mainnet. In order to generate fixtures for features under active development, you can follow the steps below and then follow the [additional steps in the online doc](https://ethereum.github.io/execution-spec-tests/getting_started/executing_tests_dev_fork/).
+```console
+curl -LsSf https://astral.sh/uv/install.sh | sh
+```
+
+or pip (requires Python, can't self-update):
+
+```console
+pip install uv
+```
+
+### Installation
+
+Clone [execution-spec-tests](https://github.com/ethereum/execution-spec-tests) and install its dependencies:
+
+```console
+git clone https://github.com/ethereum/execution-spec-tests
+cd execution-spec-tests
+uv sync --all-extras
+uv run solc-select use 0.8.24 --always-install
+```
+
+See [Installation Troubleshooting](./installation_troubleshooting.md) in the online docs if you encounter issues.
 
-1. Ensure go-ethereum's `evm` tool is in your path. Either build the required version, or alternatively:
+### Exploring and Filling Test Cases
+
+By default, JSON test fixtures are generated from this repository's Python test cases using the [Ethereum Execution Layer Specification](https://github.com/ethereum/execution-specs) (EELS) reference implementation. The resulting JSON fixtures can be executed against execution clients to verify consensus. The process of generating fixtures is often referred to as "filling".
+
+1. Explore test cases via `--collect-only` and search for test cases that combine `PUSH0` and `DELEGATECALL` in the EVM functionality introduced in the Shanghai hard fork:
 
     ```console
-    sudo add-apt-repository -y ppa:ethereum/ethereum
-    sudo apt-get update
-    sudo apt-get install ethereum
+    uv run fill --collect-only -k "push0 and delegatecall" tests/shanghai/
     ```
 
-    More help:
+    The `fill` command is based on [`pytest`](https://docs.pytest.org/en/stable/). The above command uses the [optional pytest arguments](https://docs.pytest.org/en/stable/how-to/usage.html):
 
-    - [geth installation doc](https://geth.ethereum.org/docs/getting-started/installing-geth#ubuntu-via-ppas).
+    - `--collect-only` only collect test cases; don't execute them.
+    - `-k <expression>` filter test cases by their test case ID based on the given expression.
+    - `tests/shanghai` the directory containing the test cases (tells `fill` to only discover test cases in this directory; default: `tests/`).
 
-    Help for other platforms is available in the [online doc](https://ethereum.github.io/execution-spec-tests/getting_started/quick_start/).
+    Expected console output:
+    ![Screenshot of pytest test collection console output](./docs/getting_started/img/pytest_collect_only.png)
 
-2. Clone the [execution-spec-tests](https://github.com/ethereum/execution-spec-tests) repo and install its dependencies ([`uv`](https://docs.astral.sh/uv/) will create and manage a virtual environment for its installation):
+2. Fill `state_test` fixtures for these test cases:
 
-   ```console
-   git clone https://github.com/ethereum/execution-spec-tests
-   cd execution-spec-tests
-   pip install uv  # or curl -LsSf https://astral.sh/uv/install.sh | sh
-   uv sync --all-extras
-   source .venv/bin/activate  # or run `uv run fill ...`
-   ```
+    ```console
+    uv run fill -k "push0 and delegatecall" tests/shanghai/ -m state_test -v
+    ```
 
-3. Verify the installation:
-    1. Explore test cases:
+    where:
 
-       ```console
-       fill --collect-only
-       ```
+    - `-m state_test` only fills test cases marked as a `state_test` (see all available markers via `uv run fill --markers`).
+    - `-v` enables verbose output.
 
-       Expected console output:
-         ![Screenshot of pytest test collection console output](docs/getting_started/img/pytest_collect_only.png)
+    Expected console output:
+    ![Screenshot of fill test collection console output](./docs/getting_started/img/pytest_run_example.png)
 
-    2. Execute the test cases (verbosely) in the `./tests/berlin/eip2930_access_list/test_acl.py` module:
+3. Verify the generated fixtures:
 
-        ```console
-        fill -v tests/berlin/eip2930_access_list/test_acl.py
-        ```
+    a. Check the corresponding fixture file has been generated:
 
-        Expected console output:
-          ![Screenshot of pytest test collection console output](docs/getting_started/img/pytest_run_example.png)
-        Check:
+    ```console
+    head fixtures/state_tests/shanghai/eip3855_push0/push0/push0_contract_during_call_contexts.json
+    ```
 
-        1. The versions of the `evm` tool is as expected (your versions may differ from those in the highlighted box).
-        2. The corresponding fixture file has been generated:
+    b. Open the generated HTML test using the link provided at the bottom of the console output. This is written to the output directory at:
 
-           ```console
-           head fixtures/blockchain_tests/berlin/eip2930_access_list/acl/access_list.json
-           ```
+    ```console
+    ./fixtures/.meta/report_fill.html
+    ```
 
 ## Usage
 

docs/CHANGELOG.md

@@ -45,6 +45,8 @@ Test fixtures for use by clients are available for each release on the [Github r
 
 ### 🔧 EVM Tools
 
+- ✨ Fill test fixtures using EELS by default. EEST now uses the [`ethereum-specs-evm-resolver`](https://github.com/petertdavies/ethereum-spec-evm-resolver) with the EELS daemon ([#792](https://github.com/ethereum/execution-spec-tests/pull/792)).
+
 ### 📋 Misc
 
 - ✨ Feature releases can now include multiple types of fixture tarball files from different releases that start with the same prefix ([#736](https://github.com/ethereum/execution-spec-tests/pull/736)).
@@ -159,8 +161,6 @@ Test fixtures for use by clients are available for each release on the [Github r
 - ✨ Adds an optional `verify_sync` field to hive blockchain tests (EngineAPI). When set to true a second client attempts to sync to the first client that executed the tests ([#431](https://github.com/ethereum/execution-spec-tests/pull/431)).
 - 🐞 Fix manually setting the gas limit in the genesis test env for post genesis blocks in blockchain tests ([#472](https://github.com/ethereum/execution-spec-tests/pull/472)).
 
-### 🔧 EVM Tools
-
 ### 📋 Misc
 
 - 🐞 Fix deprecation warnings due to outdated config in recommended VS Code project settings ([#420](https://github.com/ethereum/execution-spec-tests/pull/420)).