Merge branch 'ethereum:main' into souradeep/custom_exc

Author: souradeep-das

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

@@ -34,7 +34,7 @@ runs:
     - name: Generate fixtures using fill
       shell: bash
       run: |
-        uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} --solc-version=${{ steps.properties.outputs.solc }} ${{ steps.properties.outputs.fill-params }} --output=fixtures_${{ inputs.release_name }}.tar.gz --build-name ${{ inputs.release_name }}
+        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 }}
     - name: Wrap ethereum/tests fixtures with eofwrap tool
       shell: bash
       if: ${{ steps.properties.outputs.eofwrap }}

.github/configs/feature.yaml

@@ -2,49 +2,19 @@
 stable:
   evm-type: stable
   fill-params: --until=Prague
-  solc: 0.8.21
 develop:
   evm-type: develop
   fill-params: --until=Osaka
-  solc: 0.8.21
 static:
   evm-type: static
   fill-params: --until=Osaka --fill-static-tests ./tests/static
-  solc: 0.8.21
-benchmark_1M:
+benchmark_test:
   evm-type: benchmark
-  fill-params: --from=Cancun --until=Prague --block-gas-limit 1000000 -m benchmark ./tests
-  solc: 0.8.21
-  feature_only: true
-benchmark_10M:
-  evm-type: benchmark
-  fill-params: --from=Cancun --until=Prague --block-gas-limit 10000000 -m benchmark ./tests
-  solc: 0.8.21
-  feature_only: true
-benchmark_30M:
-  evm-type: benchmark
-  fill-params: --from=Cancun --until=Prague --block-gas-limit 30000000 -m benchmark ./tests
-  solc: 0.8.21
-  feature_only: true
-benchmark_60M:
-  evm-type: benchmark
-  fill-params: --from=Cancun --until=Prague --block-gas-limit 60000000 -m benchmark ./tests
-  solc: 0.8.21
-  feature_only: true
-benchmark_90M:
-  evm-type: benchmark
-  fill-params: --from=Cancun --until=Prague --block-gas-limit 90000000 -m benchmark ./tests
-  solc: 0.8.21
-  feature_only: true
-benchmark_120M:
-  evm-type: benchmark
-  fill-params: --from=Cancun --until=Prague --block-gas-limit 120000000 -m benchmark ./tests
-  solc: 0.8.21
+  fill-params: --from=Cancun --until=Prague --gas-benchmark-values 1,10,30,45,60,90,120 -m benchmark --generate-all-formats ./tests
   feature_only: true
 eip7692:
   evm-type: eip7692
   fill-params: --fork=EOFv1 ./tests/unscheduled
-  solc: 0.8.21
   eofwrap: true
   feature_only: true
 fusaka-devnet-2:

.github/workflows/tox_verify.yaml

@@ -111,8 +111,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-latest
+          - os: macos-15
             python: "3.11"
+          - os: macos-15
+            python: "pypy3.11"
           - os: ubuntu-latest
             python: "3.12"
     steps:
@@ -155,8 +157,8 @@ jobs:
           - os: [self-hosted-ghr, size-xl-x64]
             name: self-hosted-ghr-xl-x64
             python: "3.11"
-          - os: macos-latest
-            name: macos-latest
+          - os: macos-15
+            name: macos-15
             python: "3.12"
     steps:
       - name: Checkout ethereum/execution-spec-tests
@@ -190,8 +192,10 @@ jobs:
         include:
           - os: ubuntu-latest
             python: "3.11"
-          - os: macos-latest
+          - os: macos-15
             python: "3.12"
+          - os: ubuntu-latest
+            python: "pypy3.11"
     steps:
       - name: Checkout ethereum/execution-spec-tests
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

docs/CHANGELOG.md

@@ -72,6 +72,8 @@ Users can select any of the artifacts depending on their testing needs for their
 - ✨ Field `postStateHash` is now added to all `blockchain_test` and `blockchain_test_engine` tests that use `exclude_full_post_state_in_output` in place of `postState`. Fixes `evmone-blockchaintest` test consumption and indirectly fixes coverage runs for these tests ([#1667](https://github.com/ethereum/execution-spec-tests/pull/1667)).
 - 🔀 Changed INVALID_DEPOSIT_EVENT_LAYOUT to a BlockException instead of a TransactionException ([#1773](https://github.com/ethereum/execution-spec-tests/pull/1773)).
 - 🔀 Disabled writing debugging information to the EVM "dump directory" to improve performance. To obtain debug output, the `--evm-dump-dir` flag must now be explicitly set. As a consequence, the now redundant `--skip-evm-dump` option was removed ([#1874](https://github.com/ethereum/execution-spec-tests/pull/1874)).
+- ✨ Generate unique addresses with Python for compatible static tests, instead of using hard-coded addresses from legacy static test fillers ([#1781](https://github.com/ethereum/execution-spec-tests/pull/1781)).
+- ✨ Added support for the `--benchmark-gas-values` flag in the `fill` command, allowing a single genesis file to be used across different gas limit settings when generating fixtures. ([#1895](https://github.com/ethereum/execution-spec-tests/pull/1895)).
 
 #### `consume`
 
@@ -88,7 +90,9 @@ Users can select any of the artifacts depending on their testing needs for their
 
 ### 📋 Misc
 
+- ✨ Add pypy3.11 support ([#1854](https://github.com/ethereum/execution-spec-tests/pull/1854)).
 - 🔀 Use only relative imports in `tests/` directory ([#1848](https://github.com/ethereum/execution-spec-tests/pull/1848)).
+- 🔀 Convert absolute imports to relative imports in `src/` directory for better code maintainability ([#1907](https://github.com/ethereum/execution-spec-tests/pull/1907)).
 - 🔀 Misc. doc updates, including a navigation footer ([#1846](https://github.com/ethereum/execution-spec-tests/pull/1846)).
 - 🔀 Remove Python 3.10 support ([#1808](https://github.com/ethereum/execution-spec-tests/pull/1808)).
 - 🔀 Modernize codebase with Python 3.11 language features ([#1812](https://github.com/ethereum/execution-spec-tests/pull/1812)).
@@ -114,6 +118,7 @@ Users can select any of the artifacts depending on their testing needs for their
 - ✨ Opcode classes now validate keyword arguments and raise `ValueError` with clear error messages ([#1739](https://github.com/ethereum/execution-spec-tests/pull/1739), [#1856](https://github.com/ethereum/execution-spec-tests/pull/1856)).
 - ✨ All commands (`fill`, `consume`, `execute`) now work without having to clone the repository, e.g. `uv run --with git+https://github.com/ethereum/execution-spec-tests.git consume` now works from any folder ([#1863](https://github.com/ethereum/execution-spec-tests/pull/1863)).
 - 🔀 Move Prague to stable and Osaka to develop ([#1573](https://github.com/ethereum/execution-spec-tests/pull/1573)).
+- ✨ Add a `pytest.mark.with_all_typed_transactions` marker that creates default typed transactions for each `tx_type` supported by the current `fork` ([#1890](https://github.com/ethereum/execution-spec-tests/pull/1890)).
 
 ### 🧪 Test Cases
 
@@ -128,6 +133,7 @@ Users can select any of the artifacts depending on their testing needs for their
 - ✨ [EIP-7934](https://eips.ethereum.org/EIPS/eip-7934): Add test cases for the block RLP max limit of 10MiB ([#1730](https://github.com/ethereum/execution-spec-tests/pull/1730)).
 - ✨ [EIP-7939](https://eips.ethereum.org/EIPS/eip-7939) Add count leading zeros (CLZ) opcode tests for Osaka ([#1733](https://github.com/ethereum/execution-spec-tests/pull/1733)).
 - ✨ [EIP-7918](https://eips.ethereum.org/EIPS/eip-7918): Blob base fee bounded by execution cost test cases (initial), includes some adjustments to [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844) tests ([#1685](https://github.com/ethereum/execution-spec-tests/pull/1685)). Update the blob_base_cost ([#1915](https://github.com/ethereum/EIPs/pull/1915)).
+- ✨ [EIP-7934](https://eips.ethereum.org/EIPS/eip-7934): Add additional test cases for block RLP max limit with all typed transactions and for a log-creating transactions ([#1890](https://github.com/ethereum/execution-spec-tests/pull/1890)).
 
 ## [v4.5.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v4.5.0) - 2025-05-14
 

docs/running_tests/releases.md

@@ -54,7 +54,7 @@ These releases are tagged using the format `<pre_release_name>@vX.Y.Z`.
 Examples:
 
 - [`[email protected]`](https://github.com/ethereum/execution-spec-tests/releases/tag/fusaka-devnet-1%40v1.0.0) - this fixture release contains tests adhering to the [Fusaka Devnet 1 spec](https://notes.ethereum.org/@ethpandaops/fusaka-devnet-1).
-- [`benchmark@v1.0.0`](https://github.com/ethereum/execution-spec-tests/releases/tag/benchmark%40v1.0.0) - this fixture release contains tests specifically aimed at benchmarking EVMs.
+- [`benchmark@v0.0.3`](https://github.com/ethereum/execution-spec-tests/releases/tag/benchmark%40v0.0.3) - this fixture release contains tests specifically aimed at benchmarking EVMs.
 
 Devnet releases should be treated as WIP and may not yet contain full test coverage (or even coverage for all EIPs). The coverage provided by these releases is detailed in the corresponding release notes.
 

docs/writing_tests/test_markers.md

@@ -55,6 +55,59 @@ This marker is used to automatically parameterize a test with all contract creat
 
 This marker only differs from `pytest.mark.with_all_tx_types` in that it does not include transaction type 3 (Blob Transaction type) on fork Cancun and after.
 
+### `@pytest.mark.with_all_typed_transactions`
+
+This marker is used to automatically parameterize a test with all typed transactions, including `type=0` (legacy transaction), that are valid for the fork being tested.
+This marker is an indirect marker that utilizes the `tx_type` values from the `pytest.mark.with_all_tx_types` marker to build default typed transactions for each `tx_type`.
+
+Optional: Default typed transactions used as values for `typed_transaction` exist in `src/pytest_plugins/shared/transaction_fixtures.py` and can be overridden for the scope of
+the test by re-defining the appropriate `pytest.fixture` for that transaction type.
+
+```python
+import pytest
+
+from ethereum_test_tools import Account, Alloc, StateTestFiller
+from ethereum_test_types import Transaction
+
+# Optional override for type 2 transaction
+@pytest.fixture
+def type_2_default_transaction(sender: Account):
+  return Transaction(
+    ty=2,
+    sender=sender,
+    max_fee_per_gas=0x1337,
+    max_priority_fee_per_gas=0x1337,
+    ...
+  )
+
+# Optional override for type 4 transaction
+@pytest.fixture
+def type_4_default_transaction(sender: Account, pre: Alloc):
+  return Transaction(
+    ty=4,
+    sender=sender,
+    ...,
+    authorization_list=[
+      AuthorizationTuple(
+        address=Address(1234),
+        nonce=0,
+        chain_id=1,
+        signer=pre.fund_eoa(),
+      )
+    ]
+  )
+
+
+@pytest.mark.with_all_typed_transactions
+@pytest.mark.valid_from("Prague")
+def test_something_with_all_tx_types(
+    state_test: StateTestFiller, 
+    pre: Alloc,
+    typed_transaction: Transaction
+):
+    pass
+```
+
 ### `@pytest.mark.with_all_precompiles`
 
 This marker is used to automatically parameterize a test with all precompiles that are valid for the fork being tested.

pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
     "coincurve>=20.0.0,<21",
     "trie>=3.1.0,<4",
     "semver>=3.0.1,<4",
-    "pydantic>=2.10.0,<3",
+    "pydantic>=2.11.0,<3",
     "rich>=13.7.0,<14",
     "filelock>=3.15.1,<4",
     "ethereum-types>=0.2.1,<0.3",
@@ -79,6 +79,7 @@ docs = [
     "mkdocstrings-python>=1.0.0,<2",
     "pillow>=10.0.1,<11",
     "pyspelling>=2.8.2,<3",
+    "lxml>=6.0.0,<7",  # needs to be >= 6.0 for pypy
     "setuptools==78.0.2",
 ]
 
@@ -131,6 +132,7 @@ fixable = ["I", "B", "E", "F", "W", "D", "C"]
 ignore = ["D205", "D203", "D212", "D415", "C901", "A005", "C420"]
 
 [tool.mypy]
+disable_error_code = ["import-untyped"]
 mypy_path = ["src", "$MYPY_CONFIG_FILE_DIR/stubs"]
 files = ["src", "tests"]
 exclude = [