Merge tag 'tests-bal@v5.6.1' into projects/zkevm-bal-devnet-3

Author: jsign

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

@@ -4,6 +4,15 @@ inputs:
   release_name:
     description: "Name of the fixture release"
     required: true
+  from_fork:
+    description: "Fill from this fork (inclusive). Empty for unsplit builds."
+    default: ""
+  until_fork:
+    description: "Fill until this fork (inclusive). Empty for unsplit builds."
+    default: ""
+  split_label:
+    description: "Label for this fork-range split. Empty for unsplit builds."
+    default: ""
 runs:
   using: "composite"
   steps:
@@ -25,28 +34,53 @@ runs:
       with:
         type: ${{ steps.properties.outputs.evm-type }}
     - name: Install pigz for parallel tarball compression
+      if: inputs.split_label == ''
       shell: bash
       run: sudo apt-get install -y pigz
     - name: Generate fixtures using fill
       shell: bash
       run: |
+        IS_SPLIT="${{ inputs.split_label }}"
+
+        if [ -n "$IS_SPLIT" ]; then
+          OUTPUT_ARG="--output=fixtures_${{ inputs.release_name }}"
+          FORK_ARGS="--generate-all-formats --from=${{ inputs.from_fork }} --until=${{ inputs.until_fork }}"
+        else
+          OUTPUT_ARG="--output=fixtures_${{ inputs.release_name }}.tar.gz"
+          FORK_ARGS=""
+        fi
+
+        # Allow exit code 5 (NO_TESTS_COLLECTED) for fork ranges with no tests.
+        EXIT_CODE=0
         if [ "${{ steps.evm-builder.outputs.impl }}" = "eels" ]; then
-          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} ${{ steps.properties.outputs.fill-params }} --output=fixtures_${{ inputs.release_name }}.tar.gz --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG
+          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} ${{ steps.properties.outputs.fill-params }} $FORK_ARGS $OUTPUT_ARG --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG || EXIT_CODE=$?
         else
-          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} ${{ steps.properties.outputs.fill-params }} --output=fixtures_${{ inputs.release_name }}.tar.gz --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG
+          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} ${{ steps.properties.outputs.fill-params }} $FORK_ARGS $OUTPUT_ARG --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG || EXIT_CODE=$?
+        fi
+        if [ "$EXIT_CODE" -ne 0 ] && [ "$EXIT_CODE" -ne 5 ]; then
+          exit "$EXIT_CODE"
         fi
     - name: Generate Benchmark Genesis Files
-      if: contains(inputs.release_name, 'benchmark')
+      if: inputs.split_label == '' && contains(inputs.release_name, 'benchmark')
       uses: ./.github/actions/build-benchmark-genesis
       with:
         fixtures_path: fixtures_${{ inputs.release_name }}.tar.gz
     - name: Upload Benchmark Genesis Artifact
-      if: contains(inputs.release_name, 'benchmark')
+      if: inputs.split_label == '' && contains(inputs.release_name, 'benchmark')
       uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       with:
         name: benchmark_genesis_${{ inputs.release_name }}
         path: benchmark_genesis.tar.gz
-    - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+    - name: Upload fixture tarball (unsplit)
+      if: inputs.split_label == ''
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       with:
         name: fixtures_${{ inputs.release_name }}
         path: fixtures_${{ inputs.release_name }}.tar.gz
+    - name: Upload fixture directory (split)
+      if: inputs.split_label != ''
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+      with:
+        name: fixtures__${{ inputs.split_label }}
+        path: fixtures_${{ inputs.release_name }}/
+        if-no-files-found: ignore

.github/configs/evm.yaml

@@ -1,8 +1,4 @@
-stable:
-  impl: eels
-  repo: null
-  ref: null
-develop:
+eels:
   impl: eels
   repo: null
   ref: null

.github/configs/feature.yaml

@@ -1,24 +1,45 @@
 # Unless filling for special features, all features should fill for previous forks (starting from Frontier) too
-stable:
-  evm-type: stable
-  fill-params: --until=Prague --fill-static-tests --ignore=tests/static/state_tests/stQuadraticComplexityTest
+#
+# Shared fork ranges for splitting multi-fork releases across parallel runners.
+# Features using --until are automatically split using applicable ranges.
+# Features using --fork (single fork) are never split.
+fork-ranges:
+  - label: pre-cancun
+    from: Frontier
+    until: Shanghai
+  - label: cancun
+    from: Cancun
+    until: Cancun
+  - label: prague
+    from: Prague
+    until: Prague
+  - label: osaka
+    from: Osaka
+    until: Osaka
+  - label: bpo
+    from: BPO1
+    until: BPO2
+  - label: amsterdam
+    from: Amsterdam
+    until: Amsterdam
 
-develop:
-  evm-type: develop
-  fill-params: --until=BPO4 --fill-static-tests --ignore=tests/static/state_tests/stQuadraticComplexityTest
+mainnet:
+  evm-type: eels
+  fill-params: --until=BPO2 --fill-static-tests --ignore=tests/static/state_tests/stQuadraticComplexityTest
 
 benchmark:
   evm-type: benchmark
   fill-params: --fork=Osaka --gas-benchmark-values 1,5,10,30,60,100,150 ./tests/benchmark/compute --maxprocesses=30 --dist=worksteal
+  feature_only: true
 
 benchmark_fast:
   evm-type: benchmark
   fill-params: --fork=Osaka --gas-benchmark-values 100 ./tests/benchmark/compute
   feature_only: true
 
 bal:
-  evm-type: develop
-  fill-params: --fork=Amsterdam --fill-static-tests
+  evm-type: eels
+  fill-params: --until=Amsterdam -x
   feature_only: true
 
 zkevm:

.github/scripts/create_release_tarball.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env -S uv run --script
+#
+# /// script
+# requires-python = ">=3.12"
+# dependencies = []
+# ///
+"""
+Create a release tarball from a merged fixture directory.
+
+Archive all ``.json`` and ``.ini`` files under a ``fixtures/`` prefix,
+matching the structure produced by
+``execution_testing.cli.pytest_commands.plugins.shared.fixture_output``.
+
+Use ``pigz`` for parallel compression when available, otherwise fall
+back to Python's built-in gzip.
+"""
+
+import shutil
+import subprocess
+import sys
+import tarfile
+import warnings
+from pathlib import Path
+
+
+def create_tarball_with_pigz(source_dir: Path, output_path: Path) -> None:
+    """Create tarball using Python tarfile + pigz for parallel compression."""
+    temp_tar = output_path.with_suffix("")  # strip .gz
+
+    with tarfile.open(temp_tar, "w") as tar:
+        for file in sorted(source_dir.rglob("*")):
+            if file.is_file() and file.suffix in {".json", ".ini"}:
+                arcname = Path("fixtures") / file.relative_to(source_dir)
+                tar.add(file, arcname=str(arcname))
+
+    subprocess.run(
+        ["pigz", "-f", str(temp_tar)],
+        check=True,
+        capture_output=True,
+    )
+
+
+def create_tarball_standard(source_dir: Path, output_path: Path) -> None:
+    """Create tarball using Python's tarfile module (single-threaded)."""
+    with tarfile.open(output_path, "w:gz") as tar:
+        for file in sorted(source_dir.rglob("*")):
+            if file.is_file() and file.suffix in {".json", ".ini"}:
+                arcname = Path("fixtures") / file.relative_to(source_dir)
+                tar.add(file, arcname=str(arcname))
+
+
+def main() -> None:
+    """Entry point."""
+    if len(sys.argv) != 3:
+        print(
+            "Usage: create_release_tarball.py <source_dir> <output.tar.gz>",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
+    source_dir = Path(sys.argv[1])
+    output_path = Path(sys.argv[2])
+
+    if not source_dir.is_dir():
+        print(f"Error: '{source_dir}' is not a directory.", file=sys.stderr)
+        sys.exit(1)
+
+    if shutil.which("pigz"):
+        try:
+            create_tarball_with_pigz(source_dir, output_path)
+        except (subprocess.CalledProcessError, OSError) as e:
+            warnings.warn(
+                f"pigz failed ({type(e).__name__}: {e}), falling back to gzip",
+                stacklevel=2,
+            )
+            create_tarball_standard(source_dir, output_path)
+    else:
+        create_tarball_standard(source_dir, output_path)
+
+    print(f"Created {output_path}")
+
+
+if __name__ == "__main__":
+    main()