[pull] forks/amsterdam from ethereum:forks/amsterdam

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

@@ -16,21 +16,51 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Get latest geth commit
+      id: geth-sha
+      shell: bash
+      run: |
+        SHA=$(git ls-remote https://github.com/${{ inputs.repo }}.git refs/heads/${{ inputs.ref }} | cut -f1)
+        echo "sha=$SHA" >> $GITHUB_OUTPUT
+        echo "Latest geth commit: $SHA"
+    - name: Prepare cache target dir
+      shell: bash
+      run: mkdir -p "$GITHUB_WORKSPACE/go-ethereum/cmd/evm"
+    - name: Restore build cache
+      id: cache-restore
+      uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830
+      with:
+        path: |
+          ${{ github.workspace }}/go-ethereum/cmd/evm/evm
+        key: geth-evm-build-sha=${{ steps.geth-sha.outputs.sha }}
+        restore-keys: |
+          geth-evm-build-
     - name: Checkout go-ethereum
+      if: steps.cache-restore.outputs.cache-hit != 'true'
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
         repository: ${{ inputs.repo }}
-        ref: ${{ inputs.ref }}
+        ref: ${{ steps.geth-sha.outputs.sha }}
         path: go-ethereum
     - name: Setup golang
+      if: steps.cache-restore.outputs.cache-hit != 'true'
       uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b
       with:
         go-version: ${{ inputs.golang }}
         cache-dependency-path: go-ethereum/go.sum
     - name: Build evm cmd
+      if: steps.cache-restore.outputs.cache-hit != 'true'
       shell: bash
       run: |
-        mkdir -p $GITHUB_WORKSPACE/bin
         cd $GITHUB_WORKSPACE/go-ethereum/cmd/evm
         go build .
-        echo $GITHUB_WORKSPACE/go-ethereum/cmd/evm >> $GITHUB_PATH
+    - name: Add geth evm to PATH
+      shell: bash
+      run: echo $GITHUB_WORKSPACE/go-ethereum/cmd/evm >> $GITHUB_PATH
+    - name: Save build cache
+      if: steps.cache-restore.outputs.cache-hit != 'true'
+      uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830
+      with:
+        path: |
+          ${{ github.workspace }}/go-ethereum/cmd/evm/evm
+        key: geth-evm-build-sha=${{ steps.geth-sha.outputs.sha }}

.github/configs/evm.yaml

@@ -12,7 +12,6 @@ static:
   ref: master
   targets: ["evmone-t8n"]
 benchmark:
-  impl: evmone
-  repo: ethereum/evmone
-  ref: master
-  targets: ["evmone-t8n"]
+  impl: geth
+  repo: ethereum/go-ethereum
+  ref: master

CONTRIBUTING.md

@@ -28,6 +28,7 @@ This specification aims to be:
 - Attempt to use descriptive English words (or _very common_ abbreviations) in documentation and identifiers.
 - Avoid using EIP numbers in identifiers, and prefer descriptive text instead (eg. `FeeMarketTransaction` instead of `Eip1559Transaction`).
 - If necessary, there is a custom dictionary `whitelist.txt`.
+- Avoid uninformative prefixes in identifiers (like `get_` or `compute_`). They don't add useful meaning and take up valuable real estate.
 
 #### Comments
 

packages/testing/pyproject.toml

@@ -39,13 +39,13 @@ dependencies = [
     "pydantic>=2.12.3,<3",
     "rich>=13.7.0,<14",
     "filelock>=3.15.1,<4",
-    "ethereum-types>=0.2.1,<0.3",
+    "ethereum-types>=0.3.0,<0.4",
     "pyyaml>=6.0.2,<7",
     "types-pyyaml>=6.0.12.20240917,<7",
     "pytest-json-report>=1.5.0,<2",
     "typing-extensions>=4.12.2,<5",
     "questionary>=2.1.0,<3",
-    "ethereum-rlp>=0.1.3,<0.2",
+    "ethereum-rlp>=0.1.5,<0.2",
     "pytest-regex>=0.2.0,<0.3",
     "eth-abi>=5.2.0",
     "joblib>=1.4.2",

packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute.py

@@ -649,7 +649,6 @@ def base_test_parametrizer_func(
 
         class BaseTestWrapper(cls):  # type: ignore
             def __init__(self, *args: Any, **kwargs: Any) -> None:
-                kwargs["t8n_dump_dir"] = None
                 if "pre" not in kwargs:
                     kwargs["pre"] = pre
                 elif kwargs["pre"] != pre: