chore(ci): extra clean up

Author: spencer-tb

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

@@ -4,16 +4,24 @@ inputs:
   type:
     description: 'Type of EVM binary to build (key in .github/configs/evm.yaml)'
     required: true
+  repo_override:
+    description: 'Override the repo from evm.yaml (e.g. ethereum/go-ethereum)'
+    required: false
+    default: ''
+  ref_override:
+    description: 'Override the ref/branch/commit from evm.yaml'
+    required: false
+    default: ''
 outputs:
   impl:
     description: "Implementation of EVM binary to build"
-    value: ${{ inputs.type }}
+    value: ${{ steps.config-evm-reader.outputs.impl }}
   repo:
     description: "Repository to use to build the EVM binary"
-    value: ${{ steps.config-evm-reader.outputs.repo }}
+    value: ${{ steps.resolved.outputs.repo }}
   ref:
     description: "Reference to branch, commit, or tag to use to build the EVM binary"
-    value: ${{ steps.config-evm-reader.outputs.ref }}
+    value: ${{ steps.resolved.outputs.ref }}
   evm-bin:
     description: "Binary name of the evm tool to use"
     value: ${{ steps.config-evm-reader.outputs.evm-bin }}
@@ -29,35 +37,47 @@ runs:
       run: |
         awk "/^${{ inputs.type }}:/{flag=1; next} /^[[:alnum:]]/{flag=0} flag" ./.github/configs/evm.yaml \
         | sed 's/ //g' | sed 's/:/=/g' >> "$GITHUB_OUTPUT"
+    - name: Apply repo/ref overrides
+      id: resolved
+      shell: bash
+      env:
+        DEFAULT_REPO: ${{ steps.config-evm-reader.outputs.repo }}
+        DEFAULT_REF: ${{ steps.config-evm-reader.outputs.ref }}
+        REPO_OVERRIDE: ${{ inputs.repo_override }}
+        REF_OVERRIDE: ${{ inputs.ref_override }}
+      run: |
+        echo "repo=${REPO_OVERRIDE:-$DEFAULT_REPO}" >> "$GITHUB_OUTPUT"
+        echo "ref=${REF_OVERRIDE:-$DEFAULT_REF}" >> "$GITHUB_OUTPUT"
     - name: Print Variables for the selected EVM type
       shell: bash
       run: |
-        echo "Implementation: ${{ inputs.type }}"
-        echo "Repository: ${{ steps.config-evm-reader.outputs.repo }}"
-        echo "Reference: ${{ steps.config-evm-reader.outputs.ref }}"
+        echo "Type: ${{ inputs.type }}"
+        echo "Implementation: ${{ steps.config-evm-reader.outputs.impl }}"
+        echo "Repository: ${{ steps.resolved.outputs.repo }}"
+        echo "Reference: ${{ steps.resolved.outputs.ref }}"
         echo "EVM Binary: ${{ steps.config-evm-reader.outputs.evm-bin }}"
         echo "X-Dist parameter: ${{ steps.config-evm-reader.outputs.x-dist }}"
     - name: Skip building for EELS
-      if: inputs.type == '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: inputs.type == 'geth'
+      if: steps.config-evm-reader.outputs.impl == 'geth'
       uses: ./.github/actions/build-evm-client/geth
       with:
-        repo: ${{ steps.config-evm-reader.outputs.repo }}
-        ref: ${{ steps.config-evm-reader.outputs.ref }}
+        repo: ${{ steps.resolved.outputs.repo }}
+        ref: ${{ steps.resolved.outputs.ref }}
     - name: Build the EVM using EVMONE action
-      if: inputs.type == 'evmone'
+      if: steps.config-evm-reader.outputs.impl == 'evmone'
       uses: ./.github/actions/build-evm-client/evmone
       with:
-        repo: ${{ steps.config-evm-reader.outputs.repo }}
-        ref: ${{ steps.config-evm-reader.outputs.ref }}
+        repo: ${{ steps.resolved.outputs.repo }}
+        ref: ${{ steps.resolved.outputs.ref }}
         # `targets` in evm.yaml must be an inline array to not interfere with `config-evm-reader`'s parsing
         targets: ${{ join(fromJSON(steps.config-evm-reader.outputs.targets), ' ') }}
     - name: Build the EVM using Besu action
-      if: inputs.type == 'besu'
+      if: steps.config-evm-reader.outputs.impl == 'besu'
       uses: ./.github/actions/build-evm-client/besu
       with:
-        repo: ${{ steps.config-evm-reader.outputs.repo }}
-        ref: ${{ steps.config-evm-reader.outputs.ref }}
+        repo: ${{ steps.resolved.outputs.repo }}
+        ref: ${{ steps.resolved.outputs.ref }}

.github/actions/build-fixtures/action.yaml

@@ -13,6 +13,15 @@ inputs:
   split_label:
     description: "Label for this fork-range split. Empty for unsplit builds."
     default: ""
+  evm:
+    description: "Override the evm impl. Defaults to the feature's evm-type."
+    default: ""
+  evm_repo:
+    description: "Override the t8n tool repo (e.g. ethereum/go-ethereum)"
+    default: ""
+  evm_ref:
+    description: "Override the t8n tool branch / tag / commit"
+    default: ""
 runs:
   using: "composite"
   steps:
@@ -32,7 +41,9 @@ runs:
     - uses: ./.github/actions/build-evm-base
       id: evm-builder
       with:
-        type: ${{ steps.properties.outputs.evm-type }}
+        type: ${{ inputs.evm != '' && inputs.evm || steps.properties.outputs.evm-type }}
+        repo_override: ${{ inputs.evm_repo }}
+        ref_override: ${{ inputs.evm_ref }}
     - name: Install pigz for parallel tarball compression
       if: inputs.split_label == ''
       shell: bash

.github/configs/evm.yaml

@@ -1,20 +1,38 @@
+# Client aliases
+benchmark:
+  impl: geth
+  repo: ethereum/go-ethereum
+  ref: master
+  evm-bin: evm
+  x-dist: auto
+consensus:
+  impl: eels
+  repo: null
+  ref: null
+  evm-bin: null
+  x-dist: auto
+
 eels:
+  impl: eels
   repo: null
   ref: null
   evm-bin: null
   x-dist: auto
 evmone:
+  impl: evmone
   repo: ethereum/evmone
   ref: master
   targets: ["evmone-t8n"]
   evm-bin: evmone-t8n
   x-dist: auto
 geth:
+  impl: geth
   repo: ethereum/go-ethereum
   ref: master
   evm-bin: evm
   x-dist: auto
 besu:
+  impl: besu
   repo: hyperledger/besu
   ref: main
   evm-bin: evmtool

.github/configs/feature.yaml

@@ -1,11 +1,11 @@
 # Unless filling for special features, all features should fill for previous forks (starting from Frontier) too
 consensus:
-  evm-type: eels
+  evm-type: consensus
   fill-params: --until=BPO4
 
 benchmark:
-  evm-type: evmone
-  fill-params: --fork=Amsterdam --gas-benchmark-values 1,10,30,60,100,150 -m "benchmark and not state_test" ./tests/benchmark
+  evm-type: benchmark
+  fill-params: --fork=Amsterdam --gas-benchmark-values 1,10,30,60,100,150 ./tests/benchmark
 
 devnet:
   evm-type: eels

.github/configs/fork-ranges.yaml

@@ -12,10 +12,7 @@
   until: Prague
 - label: osaka
   from: Osaka
-  until: Osaka
-- label: bpo
-  from: BPO1
-  until: BPO2
+  until: BPO5
 - label: amsterdam
   from: Amsterdam
   until: Amsterdam

.github/scripts/generate_build_matrix.py

@@ -49,6 +49,9 @@
     "Osaka",
     "BPO1",
     "BPO2",
+    "BPO3",
+    "BPO4",
+    "BPO5",
     "Amsterdam",
 ]
 
@@ -145,9 +148,7 @@ def main() -> None:
     # `<feat>-devnet` releases (e.g. bal-devnet) share the `devnet` entry,
     # while keeping their friendly name in the matrix and artifact outputs.
     lookup = (
-        "devnet"
-        if name.endswith("-devnet") and "devnet" in config
-        else name
+        "devnet" if name.endswith("-devnet") and "devnet" in config else name
     )
 
     if lookup not in config or not isinstance(config[lookup], dict):

.github/scripts/tests/test_release_scripts.py

@@ -43,12 +43,12 @@ class TestGenerateBuildMatrix:
 
     def test_split_feature_produces_entries_per_range(self):
         """Verify a split feature expands into one entry per range."""
-        result = run_script(BUILD_MATRIX_SCRIPT, "mainnet")
+        result = run_script(BUILD_MATRIX_SCRIPT, "consensus")
         assert result.returncode == 0
         out = parse_matrix_output(result.stdout)
         matrix = json.loads(out["build_matrix"])
         assert len(matrix) > 1
-        assert out["feature_name"] == "mainnet"
+        assert out["feature_name"] == "consensus"
         assert out["combine_labels"] != ""
         labels = [e["label"] for e in matrix]
         assert all(lbl != "" for lbl in labels)
@@ -68,15 +68,15 @@ def test_unsplit_feature_produces_single_entry(self):
         assert matrix[0]["from_fork"] == ""
         assert matrix[0]["until_fork"] == ""
 
-    def test_feature_only_can_be_requested_explicitly(self):
-        """Verify feature_only entries work when named directly."""
-        result = run_script(BUILD_MATRIX_SCRIPT, "bal")
+    def test_devnet_name_resolves_to_shared_feature(self):
+        """Verify a <feat>-devnet name resolves to the devnet feature."""
+        result = run_script(BUILD_MATRIX_SCRIPT, "bal-devnet")
         assert result.returncode == 0
         out = parse_matrix_output(result.stdout)
         matrix = json.loads(out["build_matrix"])
-        assert len(matrix) == 1
-        assert matrix[0]["feature"] == "bal"
-        assert out["combine_labels"] == ""
+        assert out["feature_name"] == "bal-devnet"
+        # Entries keep the friendly name, not the shared "devnet" key.
+        assert all(e["feature"] == "bal-devnet" for e in matrix)
 
     def test_unknown_feature_fails(self):
         """Verify error exit for unknown feature name."""
@@ -92,7 +92,7 @@ def test_no_args_fails(self):
 
     def test_output_is_valid_github_actions_format(self):
         """Verify output lines are key=value for GITHUB_OUTPUT."""
-        result = run_script(BUILD_MATRIX_SCRIPT, "mainnet")
+        result = run_script(BUILD_MATRIX_SCRIPT, "consensus")
         assert result.returncode == 0
         lines = result.stdout.strip().splitlines()
         assert len(lines) == 3

.github/workflows/benchmark.yaml

@@ -83,18 +83,3 @@ jobs:
 
   # TODO: Add execute remote tests with --gas-benchmark-values
   # TODO: Add execute remote tests with --fixed-opcode-count
-
-  build-artifact:
-    name: Build Benchmark Fixture Artifact
-    needs: [sanity-checks] # TODO: Add execute remote jobs when implemented
-    if: github.event_name == 'push'
-    runs-on: [self-hosted-ghr, size-gigachungus-x64]
-    timeout-minutes: 720
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          submodules: true
-
-      - uses: ./.github/actions/build-fixtures
-        with:
-          release_name: benchmark_fast

.github/workflows/release_fixtures.yaml

@@ -4,13 +4,29 @@ on:
   workflow_dispatch:
     inputs:
       feature:
-        description: "Feature release, e.g. consensus@v1.2.3 or bal-devnet@v1.0.0 (tests- prefix optional)"
+        description: "Feature name, e.g. consensus, benchmark, bal-devnet"
+        required: true
+        type: string
+      version:
+        description: "Release version, e.g. v20.0.0"
         required: true
         type: string
       branch:
         description: "Branch to release from (required for *-devnet features)"
         required: false
         type: string
+      evm:
+        description: "Override the evm impl (e.g. geth, evmone). Defaults to the feature's evm-type."
+        required: false
+        type: string
+      evm_repo:
+        description: "Override the t8n tool repo (e.g. ethereum/go-ethereum)"
+        required: false
+        type: string
+      evm_ref:
+        description: "Override the t8n tool branch / tag / commit"
+        required: false
+        type: string
 
 jobs:
   setup:
@@ -31,16 +47,31 @@ jobs:
         shell: bash
         env:
           INPUT_FEATURE: ${{ inputs.feature }}
+          INPUT_VERSION: ${{ inputs.version }}
           INPUT_BRANCH: ${{ inputs.branch }}
+          INPUT_EVM: ${{ inputs.evm }}
         run: |
-          RELEASE_NAME="${INPUT_FEATURE#tests-}"
-          FEATURE_NAME="${RELEASE_NAME%%@*}"
+          FEATURE_NAME="$INPUT_FEATURE"
+          VERSION="$INPUT_VERSION"
+
+          if [ -z "$FEATURE_NAME" ]; then
+            echo "::error::feature name is empty"
+            exit 1
+          fi
+          if [[ ! "$VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "::error::version '$VERSION' must match vX.Y.Z (e.g. v20.0.0)"
+            exit 1
+          fi
+          if [ -n "$INPUT_EVM" ] && ! grep -qE "^${INPUT_EVM}:" .github/configs/evm.yaml; then
+            echo "::error::evm '$INPUT_EVM' is not a key in .github/configs/evm.yaml"
+            exit 1
+          fi
 
           # `<feat>-devnet` releases (e.g. bal-devnet) resolve to the shared
           # `devnet` feature but keep their friendly name, and must specify
           # the branch to release from.
           if [ "$FEATURE_NAME" = "devnet" ] || [ "$FEATURE_NAME" = "-devnet" ]; then
-            echo "::error::devnet releases require a <feat>- prefix, e.g. bal-devnet@v1.0.0"
+            echo "::error::devnet releases require a <feat>- prefix, e.g. bal-devnet"
             exit 1
           fi
           if [[ "$FEATURE_NAME" == *-devnet && -z "$INPUT_BRANCH" ]]; then
@@ -71,6 +102,9 @@ jobs:
           from_fork: ${{ matrix.from_fork }}
           until_fork: ${{ matrix.until_fork }}
           split_label: ${{ matrix.label }}
+          evm: ${{ inputs.evm }}
+          evm_repo: ${{ inputs.evm_repo }}
+          evm_ref: ${{ inputs.evm_ref }}
 
   combine:
     name: combine (${{ needs.setup.outputs.feature_name }})
@@ -152,18 +186,18 @@ jobs:
         shell: bash
         env:
           INPUT_FEATURE: ${{ inputs.feature }}
+          INPUT_VERSION: ${{ inputs.version }}
           INPUT_BRANCH: ${{ inputs.branch }}
           FEATURE_NAME: ${{ needs.setup.outputs.feature_name }}
           GH_TOKEN: ${{ github.token }}
         run: |
           # Release title has no "tests-" prefix; the git tag always does.
-          RELEASE_NAME="${INPUT_FEATURE#tests-}"
+          RELEASE_NAME="${INPUT_FEATURE}@${INPUT_VERSION}"
           TAG_NAME="tests-${RELEASE_NAME}"
-          FEATURE_PREFIX="${RELEASE_NAME%%@*}"
 
           # Use the prior release of the same feature as the notes baseline.
           PREV_TAG=$(
-            git tag --list "tests-${FEATURE_PREFIX}@v*" --sort=-v:refname \
+            git tag --list "tests-${INPUT_FEATURE}@v*" --sort=-v:refname \
               | grep -v "^${TAG_NAME}$" \
               | head -n 1 \
             || true