Merge branch 'forks/amsterdam' into projects/zkevm

Author: jsign

.github/actions/setup-env/action.yaml

@@ -11,11 +11,4 @@ runs:
 
     - name: Install build dependencies
       shell: bash
-      run: sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes build-essential pkg-config
-
-    - name: Download Geth and add to $PATH
-      shell: bash
-      run: |
-        mkdir -p $GITHUB_WORKSPACE/bin
-        $GITHUB_WORKSPACE/scripts/download_geth_linux.py --dir $GITHUB_WORKSPACE/bin
-        echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH
+      run: sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes build-essential pkg-config libsecp256k1-dev

.github/actions/setup-geth/action.yaml

@@ -0,0 +1,11 @@
+name: Setup Geth
+description: Download Geth and add to $PATH
+runs:
+  using: "composite"
+  steps:
+    - name: Download Geth and add to $PATH
+      shell: bash
+      run: |
+        mkdir -p $GITHUB_WORKSPACE/bin
+        $GITHUB_WORKSPACE/scripts/download_geth_linux.py --dir $GITHUB_WORKSPACE/bin
+        echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH

.github/actions/setup-uv/action.yaml

@@ -3,7 +3,7 @@ description: Install uv, Python, and tox for CI jobs
 inputs:
   python-version:
     description: Python version to install (e.g. "3.14", "pypy3.11")
-    default: "3.14"
+    default: "3.13"
   enable-cache:
     description: Enable uv dependency cache
     default: "true"

.github/workflows/test.yaml

@@ -63,6 +63,9 @@ jobs:
         with:
           submodules: recursive
       - uses: ./.github/actions/setup-uv
+        with:
+          python-version: "3.14"
+      - uses: ./.github/actions/setup-env
       - name: Run py3 tests
         run: tox -e py3
         env:
@@ -84,6 +87,7 @@ jobs:
       - uses: ./.github/actions/setup-uv
         with:
           python-version: "pypy3.11"
+      - uses: ./.github/actions/setup-env
       - name: Run pypy3 tests
         run: tox -e pypy3
         env:
@@ -102,6 +106,7 @@ jobs:
         with:
           python-version: "3.11"
       - uses: ./.github/actions/setup-env
+      - uses: ./.github/actions/setup-geth
       - uses: ./.github/actions/get-changed-files
         id: get-changed-files
       - name: Run json infra tests
@@ -115,6 +120,7 @@ jobs:
         with:
           submodules: recursive
       - uses: ./.github/actions/setup-uv
+      - uses: ./.github/actions/setup-env
       - uses: ./.github/actions/build-evmone
       - name: Run py3 tests
         run: tox -e tests_pytest_py3
@@ -131,6 +137,7 @@ jobs:
       - uses: ./.github/actions/setup-uv
         with:
           python-version: "pypy3.11"
+      - uses: ./.github/actions/setup-env
       - uses: ./.github/actions/build-evmone
       - name: Run pypy3 tests
         run: tox -e tests_pytest_pypy3

docs/getting_started/code_standards_details.md

@@ -163,3 +163,20 @@ For a granular comparison:
 ```console
 diff <(hasher --tests fixtures/) <(hasher --tests fixtures_new/)
 ```
+
+#### The `compare` Subcommand
+
+The `hasher compare` subcommand directly compares two fixture directories
+and shows only the differences:
+
+```console
+hasher compare fixtures/ fixtures_new/
+```
+
+| Flag                | Description                                               |
+| ------------------- | --------------------------------------------------------- |
+| `--depth N` / `-d`  | Limit to N levels (0=root, 1=folders, 2=files, 3=tests).  |
+| `--files` / `-f`    | Show differences at file level.                           |
+| `--tests` / `-t`    | Show differences at individual test level.                |
+| `--root` / `-r`     | Show only the root-level hash difference.                 |
+| `--ignore-missing`  | Hide entries that exist in only one directory.             |

packages/testing/src/execution_testing/cli/hasher.py

@@ -311,17 +311,22 @@ def display_diff(
     *,
     left_label: str,
     right_label: str,
+    ignore_missing: bool = False,
 ) -> None:
     """Render diff showing only changed hashes."""
     differences: List[tuple[str, str, str]] = []
 
     for path in left:
         right_hash = right.get(path, "<missing>")
         if left[path] != right_hash:
+            if ignore_missing and right_hash == "<missing>":
+                continue
             differences.append((path, left[path], right_hash))
 
     for path in right:
         if path not in left:
+            if ignore_missing:
+                continue
             differences.append((path, "<missing>", right[path]))
 
     if not differences:
@@ -433,6 +438,12 @@ def hash_cmd(
     default=None,
     help="Limit to N levels (0=root, 1=folders, 2=files, 3=tests).",
 )
+@click.option(
+    "--ignore-missing",
+    is_flag=True,
+    default=False,
+    help="Hide entries that exist in only one directory.",
+)
 @hash_options
 def compare_cmd(
     left_folder: str,
@@ -441,6 +452,7 @@ def compare_cmd(
     tests: bool,
     root: bool,
     depth: Optional[int],
+    ignore_missing: bool,
 ) -> None:
     """Compare two fixture directories and show differences."""
     try:
@@ -474,6 +486,7 @@ def compare_cmd(
             right_hashes,
             left_label=left_folder,
             right_label=right_folder,
+            ignore_missing=ignore_missing,
         )
         sys.exit(1)
     except PermissionError as e: