Merge upstream changes until 2026-03-16

.claude/commands/write-test.md

@@ -42,7 +42,7 @@ Conventions and patterns for writing consensus tests. Run this skill before writ
 ## Fork-Aware Logic
 
 - `fork >= Cancun` for conditional behavior based on fork
-- `fork.gas_costs()` returns `GasCosts` dataclass with constants like `G_WARM_SLOAD`, `G_COLD_ACCOUNT_ACCESS`, `G_BASE`, etc.
+- `fork.gas_costs()` returns `GasCosts` dataclass with constants like `G_WARM_SLOAD`, `GAS_COLD_ACCOUNT_ACCESS`, `G_BASE`, etc.
 - `fork.transaction_intrinsic_cost_calculator()` for computing tx intrinsic gas
 
 ## Exception Testing
@@ -61,6 +61,10 @@ Conventions and patterns for writing consensus tests. Run this skill before writ
 - `@pytest.mark.parametrize("name", [pytest.param(val, id="label"), ...])` with descriptive `id=` strings
 - Stack parametrize decorators for multiple dimensions
 
+## After Writing Tests
+
+After writing or modifying tests, ask the user: "Would you like me to load the `/fill-tests` skill to verify the new tests fill correctly? (This loads an additional skill into context.)" If they agree, run `/fill-tests`, fill the new tests, then inspect the generated fixture JSON to verify the fixture contents match what the test intends.
+
 ## References
 
 See `docs/writing_tests/` and `docs/writing_tests/opcode_metadata.md` for detailed documentation.

.codecov.yaml

@@ -0,0 +1,16 @@
+# The project check compares overall repo coverage against the base branch.
+# When the base branch moves ahead (new merges), the comparison becomes stale
+# and causes false failures on PRs — this is why we've been seeing codecov/project
+# failures across multiple PRs despite all modified lines being fully covered.
+#
+# Tradeoff: making project informational means we won't block on indirect coverage
+# loss (e.g. control flow changes that make existing covered lines unreachable).
+# The patch check still enforces that all new/modified lines are covered.
+coverage:
+  status:
+    project:
+      default:
+        informational: true
+    patch:
+      default:
+        target: auto

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

@@ -4,21 +4,13 @@ inputs:
   release_name:
     description: "Name of the fixture release"
     required: true
-  uv_version:
-    description: "Version of UV to install"
-    required: true
-  python_version:
-    description: "Version of Python to install"
-    required: true
 runs:
   using: "composite"
   steps:
-    - name: Install uv ${{ inputs.uv_version }} and python ${{ inputs.python_version }}
-      uses: astral-sh/setup-uv@0c5e2b8115b80b4c7c5ddf6ffdd634974642d182
+    - uses: ./.github/actions/setup-uv
       with:
-        enable-cache: false
-        version: ${{ inputs.uv_version }}
-        python-version: ${{ inputs.python_version }}
+        enable-cache: "false"
+    - uses: ./.github/actions/setup-env
     - name: Install EEST
       shell: bash
       run: uv sync --no-progress
@@ -43,7 +35,7 @@ runs:
         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
         fi
-    - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
+    - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       with:
         name: fixtures_${{ inputs.release_name }}
         path: fixtures_${{ inputs.release_name }}.tar.gz

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

@@ -4,8 +4,6 @@ runs:
   using: "composite"
   steps:
 
-    - name: Install Tox and any other packages
+    - name: Install build dependencies
       shell: bash
-      run: |
-        sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes build-essential pkg-config
-        pip install 'tox>=4.11,<5' requests
+      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

@@ -0,0 +1,28 @@
+name: Setup uv and tox
+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.13"
+  enable-cache:
+    description: Enable uv dependency cache
+    default: "true"
+  cache-dependency-glob:
+    description: Glob for cache invalidation
+    default: "uv.lock"
+runs:
+  using: "composite"
+  steps:
+    - name: Install uv and python ${{ inputs.python-version }}
+      uses: astral-sh/setup-uv@e06108dd0aef18192324c70427afc47652e63a82  # v7.5.0
+      with:
+        enable-cache: ${{ inputs.enable-cache }}
+        cache-dependency-glob: ${{ inputs.cache-dependency-glob }}
+        version: "0.10.4"
+        python-version: ${{ inputs.python-version }}
+    - name: Prefer uv-managed Python over system Python
+      shell: bash
+      run: echo "UV_PYTHON_PREFERENCE=only-managed" >> "$GITHUB_ENV"
+    - name: Install tox
+      shell: bash
+      run: uv tool install tox

.github/configs/feature.yaml

@@ -12,11 +12,4 @@ monad:
   # --suppress-no-test-exit-code works around a problem where multi-phase fill
   # (triggered by tarball output) fails to proceed on no tests processed
   # in 1st phase (exit code 5)
-  fill-params: --suppress-no-test-exit-code -m blockchain_test --from=MONAD_EIGHT --until=MONAD_NINE --chain-id=143 -k "not eip4844 and not eip7002 and not eip7251 and not eip7685 and not eip6110 and not eip7594 and not eip7918 and not eip7610 and not eip7934 and not invalid_header"
-
-mip3:
-  evm-type: develop
-  # --suppress-no-test-exit-code works around a problem where multi-phase fill
-  # (triggered by tarball output) fails to proceed on no tests processed
-  # in 1st phase (exit code 5)
-  fill-params: --suppress-no-test-exit-code -m blockchain_test --from=MONAD_EIGHT --until=MONAD_NINE --chain-id=143 -k "not eip4844 and not eip7002 and not eip7251 and not eip7685 and not eip6110 and not eip7594 and not eip7918 and not eip7610 and not eip7934 and not invalid_header"
+  fill-params: --suppress-no-test-exit-code -m blockchain_test --from=MONAD_EIGHT --until=MONAD_NINE --chain-id=143 -k "not eip4844 and not eip7002 and not eip7251 and not eip7685 and not eip6110 and not eip7594 and not eip7918 and not eip7610 and not eip7934 and not invalid_header and not ported_static"

.github/workflows/release_fixture_feature.yaml

@@ -12,7 +12,7 @@ jobs:
     outputs:
       names: ${{ steps.feature-name.outputs.names }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           submodules: false
 
@@ -34,22 +34,20 @@ jobs:
       matrix:
         feature: ${{ fromJSON(needs.feature-names.outputs.names) }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           submodules: true
 
       - uses: ./.github/actions/build-fixtures
         with:
           release_name: ${{ matrix.feature }}
-          uv_version: ${{ vars.UV_VERSION }}
-          python_version: ${{ vars.DEFAULT_PYTHON_VERSION }}
 
   release:
     runs-on: ubuntu-24.04
     needs: build
     if: startsWith(github.ref, 'refs/tags/tests-')
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           submodules: false
 

.github/workflows/stale.yml

@@ -0,0 +1,30 @@
+name: Manage stale issues and PRs
+on:
+  schedule:
+    - cron: '0 0 * * *'  # runs daily
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f  # v10.2.0
+        with:
+          # --- Stale settings ---
+          days-before-stale: 60
+
+          # raise this from the default 30
+          operations-per-run: 200
+
+          # process oldest first
+          ascending: true
+
+          # --- PR settings ---
+          days-before-pr-close: -1      # Never auto-close PRs
+          stale-pr-label: 'stale'
+          stale-pr-message: 'This PR has had no recent activity and has been marked as stale.'
+          close-pr-message: 'Closing this PR due to inactivity.'
+
+          # --- Issue settings ---
+          days-before-issue-close: -1   # Never auto-close issues
+          stale-issue-label: 'stale'
+          stale-issue-message: 'This issue has had no recent activity and has been marked as stale.'

.github/workflows/test.yaml

@@ -27,30 +27,23 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch }}
 
 jobs:
   static:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           submodules: recursive
       - name: Ensure SHA pinned actions
-        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@6124774845927d14c601359ab8138699fa5b70c3 # v4.0.1
-      - name: Setup Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
-        with:
-          python-version: "3.11"
-      - name: Install Tox and any other packages
+        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@70c4af2ed5282c51ba40566d026d6647852ffa3e # v5.0.1
+      - uses: ./.github/actions/setup-uv
+      - name: Install build dependencies
         shell: bash
-        run: |
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes build-essential pkg-config
-          pip install 'tox>=4.11,<5' requests
+        run: sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes build-essential pkg-config
       - name: Run static checks
         run: tox -e static
-      - name: Setup uv
-        uses: astral-sh/setup-uv@0c5e2b8115b80b4c7c5ddf6ffdd634974642d182 # v5.4.1
       - name: Validate workflow config variables
         run: |
           cat >> .github/actionlint.yaml << 'EOF'
@@ -68,20 +61,19 @@ jobs:
   #   runs-on: ubuntu-24.04
   #   needs: static
   #   steps:
-  #     - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955
+  #     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
   #       with:
   #         submodules: recursive
-  #     - name: Setup Python
-  #       uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
+  #     - uses: ./.github/actions/setup-uv
   #       with:
-  #         python-version: "3.11"
+  #         python-version: "3.14"
   #     - uses: ./.github/actions/setup-env
   #     - name: Run py3 tests
   #       run: tox -e py3
   #       env:
   #         PYTEST_XDIST_AUTO_NUM_WORKERS: auto
   #     - name: Upload coverage reports to Codecov
-  #       uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7
+  #       uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
   #       with:
   #         files: .tox/coverage.xml
   #         flags: unittests
@@ -91,11 +83,10 @@ jobs:
   #   runs-on: ubuntu-24.04
   #   needs: static
   #   steps:
-  #     - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955
+  #     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
   #       with:
   #         submodules: recursive
-  #     - name: Setup Python
-  #       uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
+  #     - uses: ./.github/actions/setup-uv
   #       with:
   #         python-version: "pypy3.11"
   #     - uses: ./.github/actions/setup-env
@@ -104,3 +95,50 @@ jobs:
   #       env:
   #         PYPY_GC_MAX: "2G"
   #         PYPY_GC_MIN: "1G"
+
+  # json_loader:
+  #   runs-on: ubuntu-24.04
+  #   needs: static
+  #   steps:
+  #     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+  #       with:
+  #         submodules: recursive
+  #     - uses: ./.github/actions/setup-uv
+  #     - uses: ./.github/actions/setup-env
+  #     - name: Fill and run json_loader tests
+  #       run: tox -e json_loader
+  #       env:
+  #         PYTEST_XDIST_AUTO_NUM_WORKERS: auto
+
+  # tests_pytest_py3:
+  #   runs-on: ubuntu-24.04
+  #   needs: static
+  #   steps:
+  #     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+  #       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
+  #       env:
+  #         PYTEST_XDIST_AUTO_NUM_WORKERS: auto
+
+  # tests_pytest_pypy3:
+  #   runs-on: ubuntu-24.04
+  #   needs: static
+  #   steps:
+  #     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+  #       with:
+  #         submodules: recursive
+  #     - 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
+  #       env:
+  #         PYPY_GC_MAX: "2G"
+  #         PYPY_GC_MIN: "1G"

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "tests/benchmark/stateful/bloatnet/depth_benchmarks/.worst_case_miner"]
+    path = tests/benchmark/stateful/bloatnet/depth_benchmarks/.worst_case_miner
+    url = https://github.com/CPerezz/worst_case_miner
+    branch = master

.markdownlint.yaml

@@ -5,6 +5,7 @@ MD034: false # no-bare-urls - We use pymdownx.magiclink which allows bare urls
 MD046: false # code-block-style - This doesn't play well with material's admonitions)
 MD024: false # no-duplicate-heading - We use duplicate headings in the changelog.
 MD033: false # no-inline-html - Too strict.
+MD060: false # table-column-style - New in markdownlint v0.40.0; too strict for existing tables.
 ul-indent:
   indent: 4
   start_indent: 4

CLAUDE.md

@@ -29,6 +29,7 @@ When done with changes, ask the user if they'd like to run `/lint` before commit
 - **There is no `main` branch.** Default branch = most active fork (currently `forks/amsterdam`). Run `git remote show origin | grep HEAD` to check.
 - `mainnet` = stable specs for forks live on mainnet
 - PRs target the default branch
+- PRs strictly follow the template in `.github/PULL_REQUEST_TEMPLATE.md`. In the Checklist section, include unchecked items that don't apply — only remove them if they are truly irrelevant to the PR type.
 
 ## PR Reviews