Tracking PR for projects/zkEVM

.github/actions/build-evm-client/geth/action.yaml

@@ -6,7 +6,7 @@ inputs:
     required: true
     default: 'ethereum/go-ethereum'
   ref:
-    description: 'Reference to branch, commit, or tag to use to build the EVM binary'
+    description: 'Branch or full commit SHA to use to build the EVM binary'
     required: true
     default: 'master'
   golang:
@@ -16,13 +16,16 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Get latest geth commit
+    - name: Resolve geth commit
       id: geth-sha
       shell: bash
+      env:
+        GETH_REPOSITORY: ${{ inputs.repo }}
+        GETH_REF: ${{ inputs.ref }}
       run: |
-        SHA=$(git ls-remote https://github.com/${{ inputs.repo }}.git refs/heads/${{ inputs.ref }} | cut -f1)
-        echo "sha=$SHA" >> $GITHUB_OUTPUT
-        echo "Latest geth commit: $SHA"
+        SHA=$(python3 .github/scripts/resolve_git_ref.py "$GETH_REPOSITORY" "$GETH_REF")
+        echo "sha=$SHA" >> "$GITHUB_OUTPUT"
+        echo "Resolved geth commit: $SHA"
     - name: Prepare cache target dir
       shell: bash
       run: mkdir -p "$GITHUB_WORKSPACE/go-ethereum/cmd/evm"

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

@@ -76,13 +76,19 @@ runs:
         if [ "$EXIT_CODE" -ne 0 ] && [ "$EXIT_CODE" -ne 5 ]; then
           exit "$EXIT_CODE"
         fi
+    - name: Validate zkEVM Benchmark Fixtures
+      if: inputs.split_label == '' && inputs.release_name == 'zkevm-benchmark'
+      shell: bash
+      run: |
+        uv run -q .github/scripts/validate_zkevm_benchmark_fixtures.py \
+          fixtures_${{ inputs.release_name }}.tar.gz
     - name: Generate Benchmark Genesis Files
-      if: inputs.split_label == '' && contains(inputs.release_name, 'benchmark')
+      if: inputs.split_label == '' && inputs.release_name != 'zkevm-benchmark' && 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: inputs.split_label == '' && contains(inputs.release_name, 'benchmark')
+      if: inputs.split_label == '' && inputs.release_name != 'zkevm-benchmark' && contains(inputs.release_name, 'benchmark')
       uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       with:
         name: benchmark_genesis_${{ inputs.release_name }}

.github/configs/evm.yaml

@@ -4,6 +4,12 @@ benchmark:
   ref: glamsterdam-devnet-7
   evm-bin: evm
   xdist: auto
+zkevm-benchmark:
+  impl: geth
+  repo: jsign/go-ethereum
+  ref: df17b59f9dfd731f0b7da0a85c30548f3db45b0b
+  evm-bin: evm
+  xdist: auto
 eels:
   impl: eels
   repo: null

.github/configs/feature.yaml

@@ -22,7 +22,17 @@ benchmark_fast:
   fill-params: --fork=Amsterdam --generate-all-formats --gas-benchmark-values 100 ./tests/benchmark/compute
   feature_only: true
 
+zkevm-benchmark:
+  evm-type: zkevm-benchmark
+  fill-params: --fork=Amsterdam --gas-benchmark-values=10,30,60 -m blockchain_test ./tests/benchmark/compute --maxprocesses=30 --dist=worksteal
+  feature_only: true
+
 # Shared entry for all `<feat>-devnet` releases; matched by `-devnet` suffix.
 devnet:
   evm-type: eels
   fill-params: --until=Amsterdam --generate-all-formats
+
+zkevm:
+  evm-type: eels
+  fill-params: -m "blockchain_test or blockchain_test_engine" --fork=Amsterdam ./tests/
+  feature_only: true

.github/scripts/check_zkevm_benchmark_release.py

@@ -0,0 +1,98 @@
+#!/usr/bin/env -S uv run --script
+"""Check a zkEVM benchmark release request against GitHub state."""
+
+import json
+import os
+import subprocess
+import sys
+from typing import Any, NoReturn
+
+
+def fail(message: str) -> NoReturn:
+    """Print an error and stop the request."""
+    print(f"Error: {message}", file=sys.stderr)
+    sys.exit(1)
+
+
+def github_api(path: str) -> Any:
+    """Return all pages from a GitHub API request."""
+    result = subprocess.run(
+        ["gh", "api", "--paginate", "--slurp", path],
+        capture_output=True,
+        text=True,
+    )
+    if result.returncode != 0:
+        fail(f"gh api failed for {path}: {result.stderr.strip()}")
+    try:
+        return json.loads(result.stdout)
+    except json.JSONDecodeError as error:
+        fail(f"gh api returned invalid JSON for {path}: {error}")
+
+
+def flatten_pages(response: Any) -> list[dict[str, Any]]:
+    """Flatten the page list returned by ``gh api --slurp``."""
+    if not isinstance(response, list):
+        fail("gh api returned an invalid paginated response")
+    items: list[dict[str, Any]] = []
+    for page in response:
+        if not isinstance(page, list):
+            fail("gh api returned an invalid page")
+        for item in page:
+            if not isinstance(item, dict):
+                fail("gh api returned an invalid item")
+            items.append(item)
+    return items
+
+
+def matching_refs(repository: str, tag: str) -> list[dict[str, Any]]:
+    """Return refs that match *tag*."""
+    path = f"repos/{repository}/git/matching-refs/tags/{tag}"
+    return flatten_pages(github_api(path))
+
+
+def check_release(version: str, source_ref: str) -> None:
+    """Check the source input and destination release state."""
+    repository = os.environ.get("GITHUB_REPOSITORY", "")
+    if not repository:
+        fail("GITHUB_REPOSITORY is empty")
+
+    source_tag = f"tests-zkevm@{version}"
+    destination_tag = f"tests-zkevm-benchmark@{version}"
+    if source_ref != source_tag:
+        fail(
+            f"source ref must be '{source_tag}' for version '{version}', "
+            f"got '{source_ref}'"
+        )
+
+    destination_refs = matching_refs(repository, destination_tag)
+    if any(
+        ref.get("ref") == f"refs/tags/{destination_tag}"
+        for ref in destination_refs
+    ):
+        fail(f"destination tag '{destination_tag}' already exists")
+
+    releases = flatten_pages(
+        github_api(f"repos/{repository}/releases?per_page=100")
+    )
+    if any(release.get("tag_name") == destination_tag for release in releases):
+        fail(
+            f"destination release or draft '{destination_tag}' already exists"
+        )
+
+    print(f"Source tag: {source_tag}")
+    print(f"Destination release: {destination_tag}")
+
+
+def main() -> None:
+    """Check the command-line release request."""
+    if len(sys.argv) != 3:
+        print(
+            "Usage: check_zkevm_benchmark_release.py <version> <source-ref>",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+    check_release(sys.argv[1], sys.argv[2])
+
+
+if __name__ == "__main__":
+    main()

.github/scripts/resolve_git_ref.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env -S uv run --script
+"""Resolve a GitHub repository branch or full commit SHA."""
+
+import re
+import subprocess
+import sys
+
+FULL_COMMIT_RE = re.compile(r"^[0-9a-fA-F]{40}$")
+
+
+def resolve_git_ref(repository: str, ref: str) -> str:
+    """Return the commit SHA for a branch name or full commit SHA."""
+    if not repository:
+        raise ValueError("repository is empty")
+    if not ref:
+        raise ValueError("ref is empty")
+    if FULL_COMMIT_RE.fullmatch(ref):
+        return ref.lower()
+
+    branch_ref = ref if ref.startswith("refs/heads/") else f"refs/heads/{ref}"
+    result = subprocess.run(
+        [
+            "git",
+            "ls-remote",
+            "--exit-code",
+            f"https://github.com/{repository}.git",
+            branch_ref,
+        ],
+        capture_output=True,
+        text=True,
+    )
+    if result.returncode != 0:
+        raise ValueError(
+            f"could not resolve branch '{ref}' in repository '{repository}'"
+        )
+
+    lines = [line for line in result.stdout.splitlines() if line.strip()]
+    if len(lines) != 1:
+        raise ValueError(
+            f"branch '{ref}' in repository '{repository}' resolved to "
+            f"{len(lines)} commits"
+        )
+    sha = lines[0].split(maxsplit=1)[0]
+    if not FULL_COMMIT_RE.fullmatch(sha):
+        raise ValueError(
+            f"branch '{ref}' in repository '{repository}' returned an "
+            "invalid commit SHA"
+        )
+    return sha.lower()
+
+
+def main() -> None:
+    """Resolve the command-line repository and ref."""
+    if len(sys.argv) != 3:
+        print(
+            "Usage: resolve_git_ref.py <owner/repository> <branch-or-sha>",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+    try:
+        print(resolve_git_ref(sys.argv[1], sys.argv[2]))
+    except ValueError as error:
+        print(f"Error: {error}", file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()