Merge branch 'main' into feat/multi-opcode-bloatnet-bench

Author: CPerezz

.github/configs/eels_resolutions.json

@@ -33,8 +33,25 @@
         "path": "$GITHUB_WORKSPACE/execution-specs/"
     },
     "Osaka": {
-        "git_url": "https://github.com/spencer-tb/execution-specs.git",
-        "branch": "forks/osaka",
-        "commit": "0e97247a9022b8c04c01e22cae6ec95d1b590838"
+        "git_url": "https://github.com/marioevz/execution-specs.git",
+        "branch": "forks/bpo1",
+        "commit": "3387e5f4aedfe99becfdc39b444d6371e25e0924"
+    },
+    "BPO1": {
+        "same_as": "Osaka"
+    },
+    "BPO2": {
+        "same_as": "Osaka"
+    },
+    "BPO3": {
+        "same_as": "Osaka"
+    },
+    "BPO4": {
+        "same_as": "Osaka"
+    },
+    "Amsterdam": {
+        "git_url": "https://github.com/fselmo/execution-specs.git",
+        "branch": "feat/amsterdam-fork-and-block-access-lists",
+        "commit": "39e0b59613be4100d2efc86702ff594c54e5bd81"
     }
 }

.github/configs/feature.yaml

@@ -5,7 +5,7 @@ stable:
 
 develop:
   evm-type: develop 
-  fill-params: --until=Osaka --fill-static-tests --ignore=tests/static/state_tests/stQuadraticComplexityTest
+  fill-params: --until=BPO4 --fill-static-tests --ignore=tests/static/state_tests/stQuadraticComplexityTest
 
 benchmark:
   evm-type: benchmark # Evmone only fully supports up to Prague
@@ -15,3 +15,8 @@ benchmark_develop:
   evm-type: develop
   fill-params: --fork=Osaka --gas-benchmark-values 1,10,30,45,60,100,150 -m "benchmark and not state_test" ./tests/benchmark
   feature_only: true
+
+bal:
+  evm-type: develop
+  fill-params: --fork=Amsterdam ./tests/amsterdam/eip7928_block_level_access_lists
+  feature_only: true

.github/scripts/fill_prepatched_tests.sh

@@ -25,16 +25,15 @@ echo "Select files that were changed and exist on the main branch:"
 echo "$MODIFIED_DELETED_FILES"
 
 rm -rf fixtures
-rm -f filloutput.log
 
-uv run fill $MODIFIED_DELETED_FILES --clean --until=$FILL_UNTIL --evm-bin evmone-t8n --block-gas-limit $BLOCK_GAS_LIMIT -m "state_test or blockchain_test" --output $BASE_TEST_PATH > >(tee -a filloutput.log) 2> >(tee -a filloutput.log >&2)
-
-if grep -q "FAILURES" filloutput.log; then
-    echo "Error: failed to generate .py tests from before the PR."
-    exit 1
-fi
-
-if grep -q "ERROR collecting test session" filloutput.log; then
+set +e
+uv run fill $MODIFIED_DELETED_FILES --clean --until=$FILL_UNTIL --evm-bin evmone-t8n --block-gas-limit $BLOCK_GAS_LIMIT -m "state_test or blockchain_test" --output $BASE_TEST_PATH
+FILL_RETURN_CODE=$?
+set -e
+if [ $FILL_RETURN_CODE -eq 5 ]; then
+    echo "any_modified_fixtures=false" >> "$GITHUB_OUTPUT"
+    exit 0
+elif [ $FILL_RETURN_CODE -ne 0 ]; then
     echo "Error: failed to generate .py tests from before the PR."
     exit 1
 fi

.github/scripts/parse_ported_tests.sh

@@ -12,8 +12,20 @@ WORKSPACE_PATH="${2:-$GITHUB_WORKSPACE}"
 
 echo "Changed or new test files: $CHANGED_TEST_FILES"
 
-# Extract ported_from markers
-uv run fill $CHANGED_TEST_FILES --show-ported-from --clean --quiet --links-as-filled --skip-coverage-missed-reason --ported-from-output-file ported_from_files.txt
+FILTERED_FILES=""
+for file in $CHANGED_TEST_FILES; do
+    if git diff origin/main -- "$file" | grep -q "^+.*@pytest.mark.ported_from"; then
+        FILTERED_FILES="$FILTERED_FILES $file"
+    fi
+done
+
+if [[ -z "$FILTERED_FILES" ]]; then
+    echo "No new ported_from markers found."
+    echo "any_ported=false" >> "$GITHUB_OUTPUT"
+    exit 0
+fi
+
+uv run fill $FILTERED_FILES --show-ported-from --clean --quiet --links-as-filled --skip-coverage-missed-reason --ported-from-output-file ported_from_files.txt
 files=$(cat ported_from_files.txt)
 echo "Extracted converted tests:"
 echo "$files"

.github/workflows/fixtures.yaml

@@ -29,7 +29,8 @@ jobs:
           echo "features=$(cat features.json)" >> "$GITHUB_OUTPUT"
   build:
     needs: features
-    runs-on: [self-hosted-ghr, size-chungus-x64]
+    runs-on: [self-hosted-ghr, size-gigachungus-x64]
+    timeout-minutes: 1440
     strategy:
       matrix:
         name: ${{ fromJson(needs.features.outputs.features) }}
@@ -60,7 +61,6 @@ jobs:
           release_name: ${{ matrix.name }}
           uv_version: ${{ vars.UV_VERSION }}
           python_version: ${{ vars.DEFAULT_PYTHON_VERSION }}
-        timeout-minutes: 720
   release:
     runs-on: ubuntu-latest
     needs: build

.github/workflows/fixtures_feature.yaml

@@ -23,8 +23,9 @@ jobs:
           echo names=${names}
           echo names=${names} >> "$GITHUB_OUTPUT"
   build:
-    runs-on: [self-hosted-ghr, size-chungus-x64]
     needs: feature-names
+    runs-on: [self-hosted-ghr, size-gigachungus-x64]
+    timeout-minutes: 1440
     strategy:
       matrix:
         feature: ${{ fromJSON(needs.feature-names.outputs.names) }}
@@ -55,7 +56,6 @@ jobs:
           release_name: ${{ matrix.feature }}
           uv_version: ${{ vars.UV_VERSION }}
           python_version: ${{ vars.DEFAULT_PYTHON_VERSION }}
-        timeout-minutes: 720
   release:
     runs-on: ubuntu-latest
     needs: build

.github/workflows/tox_verify.yaml

@@ -123,8 +123,8 @@ jobs:
       - name: Checkout ethereum/execution-specs for local EELS implementation
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          repository: ethereum/execution-specs
-          ref: 5a49b2f39a909be6a8c84bb70611febdc2b2fd98
+          repository: marioevz/execution-specs
+          ref: 3387e5f4aedfe99becfdc39b444d6371e25e0924
           path: execution-specs
           fetch-depth: 1
       - name: Install uv ${{ vars.UV_VERSION }} and python ${{ matrix.python }}
@@ -154,8 +154,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: [self-hosted-ghr, size-xl-x64]
-            name: self-hosted-ghr-xl-x64
+          - os: [self-hosted-ghr, size-chungus-x64]
+            name: self-hosted-ghr-chungus-x64
             python: "3.11"
           - os: macos-15
             name: macos-15
@@ -166,8 +166,8 @@ jobs:
       - name: Checkout ethereum/execution-specs for local EELS implementation
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          repository: ethereum/execution-specs
-          ref: 5a49b2f39a909be6a8c84bb70611febdc2b2fd98
+          repository: marioevz/execution-specs
+          ref: 3387e5f4aedfe99becfdc39b444d6371e25e0924
           path: execution-specs
           fetch-depth: 1
       - name: Install uv ${{ vars.UV_VERSION }} and python ${{ matrix.python }}

.gitignore

@@ -93,4 +93,7 @@ package-lock.json
 
 # temporary files
 *.tmp
-*.temp
+*.temp
+
+# ai
+.claude/