Merge branch 'main' into phoenix

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,9 +7,8 @@
 ## ✅ Checklist
 - [ ] All: Set appropriate labels for the changes.
 - [ ] All: Considered squashing commits to improve commit history.
-
-
-- [ ] All: Added an entry to [CHANGELOG.md](../docs/CHANGELOG.md).
-- [ ] All: Considered updating the online docs in the [./docs/](../docs/) directory.
+- [ ] All: Added an entry to [CHANGELOG.md](/ethereum/execution-spec-tests/blob/main/docs/CHANGELOG.md).
+- [ ] All: Considered updating the online docs in the [./docs/](/ethereum/execution-spec-tests/blob/main/docs/) directory.
+- [ ] Tests: All converted JSON/YML tests from [ethereum/tests](/ethereum/tests) have been added to [converted-ethereum-tests.txt](/ethereum/execution-spec-tests/blob/main/converted-ethereum-tests.txt).
 - [ ] Tests: Included the type and version of evm t8n tool used to locally execute test cases:  e.g., ref with commit hash or geth 1.13.1-stable-3f40e65.
 - [ ] Tests: Ran `mkdocs serve` locally and verified the auto-generated docs for new tests in the [Test Case Reference](https://ethereum.github.io/execution-spec-tests/main/tests/) are correctly formatted.

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

@@ -12,7 +12,7 @@ inputs:
   golang:
     description: 'Golang version to use to build Geth'
     required: false
-    default: '1.20.5'
+    default: '1.21.x'
 runs:
   using: "composite"
   steps:

.github/workflows/fixtures.yaml

@@ -19,21 +19,11 @@ jobs:
             fill-params: ''
             solc: '0.8.21'
             python: '3.11'
-          - name: 'fixtures_hive'
-            evm-type: 'main'
-            fill-params: '--enable-hive --from=Merge'
-            solc: '0.8.21'
-            python: '3.11'
           - name: 'fixtures_develop'
             evm-type: 'develop'
             fill-params: '--until=Cancun'
             solc: '0.8.21'
             python: '3.11'
-          - name: 'fixtures_develop_hive'
-            evm-type: 'develop'
-            fill-params: '--enable-hive --from=Merge --until=Cancun'
-            solc: '0.8.21'
-            python: '3.11'
     steps:
       - uses: actions/checkout@v3
         with:

.github/workflows/test.yaml

@@ -12,22 +12,22 @@ jobs:
             python: '3.10'
             solc: '0.8.20'
             evm-type: 'main'
-            tox-cmd: 'tox'
+            tox-cmd: 'tox run-parallel --parallel-no-spinner'
           - os: ubuntu-latest
             python: '3.12'
-            solc: '0.8.21'
+            solc: '0.8.23'
             evm-type: 'main'
-            tox-cmd: 'tox'
+            tox-cmd: 'tox run-parallel --parallel-no-spinner'
           - os: ubuntu-latest
             python: '3.11'
             solc: '0.8.21'
             evm-type: 'develop'
             tox-cmd: 'tox -e tests-develop'
           - os: macos-latest
             python: '3.11'
-            solc: '0.8.21'
+            solc: '0.8.22'
             evm-type: 'main'
-            tox-cmd: 'tox'
+            tox-cmd: 'tox run-parallel --parallel-no-spinner'
     steps:
       - uses: actions/checkout@v3
         with:

.markdownlint.yaml

@@ -4,3 +4,4 @@ MD013: false  # line-length: We don't fill paragaraphs/limit line length
 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.

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
     hooks:
       - id: tox
         name: tox
-        entry: tox
+        entry: tox run-parallel
         language: system
         types: [python]
         pass_filenames: false

.vscode/extensions.json

@@ -6,6 +6,7 @@
 		"ms-python.python",
 		"ms-python.isort",
 		"ms-python.flake8",
+		"ms-python.mypy-type-checker",
 		"ms-python.black-formatter",
 		"esbenp.prettier-vscode",
 		"njpwerner.autodocstring",  // https://marketplace.visualstudio.com/items?itemName=njpwerner.autodocstring

.vscode/launch.recommended.json

@@ -2,7 +2,6 @@
   // Use IntelliSense to learn about possible attributes.
   // Hover to view descriptions of existing attributes.
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-
   // If the VS Code "Run and Debug" button, respecively launch selector are not visible, see this answer:
   // https://stackoverflow.com/a/74245823
   // 
@@ -41,7 +40,7 @@
         "${input:testPathOrId}"
       ],
       "cwd": "${workspaceFolder}"
-    },   
+    },
     {
       "name": "Launch fill --until Shanghai",
       "type": "python",
@@ -80,7 +79,11 @@
       "type": "python",
       "request": "launch",
       "module": "pytest",
-      "args": ["-c", "pytest.ini", "--test-help"],
+      "args": [
+        "-c",
+        "pytest.ini",
+        "--test-help"
+      ],
       "cwd": "/home/dtopz/code/github/danceratopz/execution-spec-tests"
     },
   ],
@@ -118,15 +121,15 @@
       "id": "fork",
       "description": "Which fork do you want to use?",
       "options": [
-        "Frontier", 
-        "Homestead", 
+        "Frontier",
+        "Homestead",
         "Byzantium",
         "Constantinople",
         "ConstantinopleFix",
         "Istanbul",
         "Berlin",
         "London",
-        "Merge",
+        "Paris",
         "Shanghai",
         "Cancun",
       ],
@@ -139,4 +142,4 @@
       "default": "test_"
     }
   ]
-}
+}

.vscode/settings.recommended.json

@@ -18,8 +18,6 @@
         }
     },
     "python.analysis.autoFormatStrings": true,
-    "python.linting.mypyEnabled": true,
-    "python.linting.flake8Enabled": true,
     "python.testing.promptToConfigure": false,
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,

README.md

@@ -68,10 +68,11 @@ The following transition tools are supported by the framework:
 
 ### Upcoming EIP Development
 
-Generally, specific `t8n` implementations and branches must be used when developing tests for upcoming EIPs (last updated 2023-09-07):
+Generally, specific `t8n` implementations and branches must be used when developing tests for upcoming EIPs.
 
-- Cancun related EIPs (4844, 4788, 1153, 6780) - [marioevz/go-ethereum@cancun-t8n](https://github.com/marioevz/go-ethereum/tree/cancun-t8n)
-- EOF tests - [ethereum/evmone@master](https://github.com/ethereum/evmone)
+We use named reference tags to point to the specific version of the `t8n` implementation that needs to be used fill the tests.
+
+All current tags, their t8n implementation and branch they point to, are listed in [evm-config.yaml](evm-config.yaml).
 
 ## Getting Started
 
@@ -83,7 +84,7 @@ The following requires a Python 3.10, 3.11 or 3.12 installation.
 
 This guide installs stable versions of the required external (go-ethereum) `evm` and `solc` executables and will only enable generation of test fixtures for features deployed to mainnet. In order to generate fixtures for features under active development, you can follow the steps below and then follow the [additional steps in the online doc](https://ethereum.github.io/execution-spec-tests/getting_started/executing_tests_dev_fork/).
 
-1. Ensure go-ethereum's `evm` tool and `solc` ([0.8.20](https://github.com/ethereum/solidity/releases/tag/v0.8.20) or [0.8.21](https://github.com/ethereum/solidity/releases/tag/v0.8.21)) are in your path. Either build the required versions, or alternatively:
+1. Ensure go-ethereum's `evm` tool and `solc` ([0.8.20](https://github.com/ethereum/solidity/releases/tag/v0.8.20), [0.8.21](https://github.com/ethereum/solidity/releases/tag/v0.8.21), [0.8.22](https://github.com/ethereum/solidity/releases/tag/v0.8.22), [0.8.23](https://github.com/ethereum/solidity/releases/tag/v0.8.23)  supported) are in your path. Either build the required versions, or alternatively:
 
     ```console
     sudo add-apt-repository -y ppa:ethereum/ethereum
@@ -132,12 +133,14 @@ This guide installs stable versions of the required external (go-ethereum) `evm`
         2. The corresponding fixture file has been generated:
 
            ```console
-           head fixtures/berlin/eip2930_access_list/acl/access_list.json
+           head fixtures/blockchain_tests/berlin/eip2930_access_list/acl/access_list.json
            ```
 
 ## Usage
 
-See the [online documentation](https://ethereum.github.io/execution-spec-tests/) for further help with working with this codebase:
+More information on how to obtain and consume the [released test fixtures](https://github.com/ethereum/execution-spec-tests/releases) can be found in the [documentation](https://ethereum.github.io/execution-spec-tests/main/consuming_tests/).
+
+For further help with working with this codebase, see the [online documentation](https://ethereum.github.io/execution-spec-tests/):
 
 1. Learn [useful command-line flags](https://ethereum.github.io/execution-spec-tests/getting_started/executing_tests_command_line/).
 2. [Execute tests for features under development](https://ethereum.github.io/execution-spec-tests/getting_started/executing_tests_dev_fork/) via the `--from=FORK1` and `--until=FORK2` flags.