fix(fw,tests): Replace ethereum.base_types with ethereum-types, replace ethereum.crypto.hash (#850)

* feat(all): Use `ethereum-types`

* refactor(fw): Replace `ethereum.crypto.hash` usages

* refactor(tests): Replace `ethereum.crypto.hash` usages

* docs: changelog

* fix(uv): Update lock

* chore(ci): bump uv version

* chore(tox): configure tox to respect uv.lock

Added in tox-uv 1.12.0: https://github.com/tox-dev/tox-uv/releases/tag/1.12.0

* fix(github): Disable 3.10 tox

* fix(github): Bump to `ubuntu-latest`

---------

Co-authored-by: danceratopz <[email protected]>

Author: marioevz

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

@@ -6,6 +6,6 @@ runs:
     - name: Install UV
       shell: bash
       run: |
-        UV_VERSION="0.4.2"
+        UV_VERSION="0.4.17"
         echo "Installing UV version $UV_VERSION..."
         curl -LsSf https://astral.sh/uv/${UV_VERSION}/install.sh | sh

.github/workflows/tox_verify.yaml

@@ -8,21 +8,22 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-24.04
-            python: "3.10"
-            evm-type: "stable"
-            tox-cmd: "uvx --with=tox-uv tox"  # run-parallel --parallel-no-spinner"  # TODO: disable parallelisation for uv testing
-          - os: ubuntu-24.04
+          # Temporarily disable
+          # - os: ubuntu-latest
+          #   python: "3.10"
+          #   evm-type: "stable"
+          #   tox-cmd: "uvx --with=tox-uv tox"  # run-parallel --parallel-no-spinner"  # TODO: disable parallelisation for uv testing
+          - os: ubuntu-latest
             python: "3.12"
             evm-type: "stable"
             tox-cmd: "uvx --with=tox-uv tox"  # run-parallel --parallel-no-spinner"
           # Disabled due to unavailable evm implementation for devnet-1
-          # - os: ubuntu-24.04
+          # - os: ubuntu-latest
           #   python: '3.11'
           #   evm-type: 'develop'
           #   tox-cmd: 'tox -e tests-develop'
           # Disabled to not be gated by evmone implementation
-          # - os: ubuntu-24.04
+          # - os: ubuntu-latest
           #   python: '3.11'
           #   evm-type: 'eip7692'
           #   tox-cmd: 'tox -e tests-eip7692'

docs/CHANGELOG.md

@@ -42,6 +42,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - 🐞 Fix `Conditional` code generator in EOF mode ([#821](https://github.com/ethereum/execution-spec-tests/pull/821))
 - 🔀 `ethereum_test_rpc` library has been created with what was previously `ethereum_test_tools.rpc` ([#822](https://github.com/ethereum/execution-spec-tests/pull/822))
 - ✨ Add `Wei` type to `ethereum_test_base_types` which allows parsing wei amounts from strings like "1 ether", "1000 wei", "10**2 gwei", etc ([#825](https://github.com/ethereum/execution-spec-tests/pull/825))
+- 🔀 Replace `ethereum.base_types` with `ethereum-types` ([#850](https://github.com/ethereum/execution-spec-tests/pull/850))
 
 ### 🔧 EVM Tools
 

pyproject.toml

@@ -39,6 +39,7 @@ dependencies = [
     "rich>=13.7.0,<14",
     "solc-select>=1.0.4,<2",
     "filelock>=3.15.1,<4",
+    "ethereum-types>=0.2.1,<0.3",
 ]
 
 [project.urls]

src/ethereum_test_base_types/base_types.py

@@ -197,12 +197,12 @@ def or_none(cls, input: "Bytes | BytesConvertible | None") -> "Bytes | None":
             return input
         return cls(input)
 
-    def keccak256(self) -> "Bytes":
+    def keccak256(self) -> "Hash":
         """
         Return the keccak256 hash of the opcode byte representation.
         """
         k = keccak.new(digest_bits=256)
-        return Bytes(k.update(bytes(self)).digest())
+        return Hash(k.update(bytes(self)).digest())
 
 
 S = TypeVar("S", bound="FixedSizeHexNumber")

src/ethereum_test_fixtures/blockchain.py

@@ -6,8 +6,7 @@
 from typing import Annotated, Any, ClassVar, List, Literal, Tuple, Union, get_args, get_type_hints
 
 from ethereum import rlp as eth_rlp
-from ethereum.base_types import Uint
-from ethereum.crypto.hash import keccak256
+from ethereum_types.numeric import Uint
 from pydantic import AliasChoices, Field, PlainSerializer, computed_field
 
 from ethereum_test_base_types import (
@@ -182,7 +181,7 @@ def block_hash(self) -> Hash:
         """
         Compute the RLP of the header
         """
-        return Hash(keccak256(self.rlp))
+        return self.rlp.keccak256()
 
 
 class FixtureExecutionPayload(CamelModel):

src/ethereum_test_fixtures/tests/test_blockchain.py

@@ -620,8 +620,7 @@
                 "excessBlobGas": hex(18),
                 "blockHash": "0xd90115b7fde329f64335763a446af150ab67e639281dccdb07a007d18bb80211",
                 "transactions": [
-                    "0x"
-                    + Transaction(
+                    Transaction(
                         to=0x1234,
                         data=b"\x01\x00",
                         access_list=[
@@ -735,8 +734,7 @@
                             "0x8eca4747db6a4b272018f2850e4208b863989ce9971bb1907467ae2204950695"
                         ),
                         "transactions": [
-                            "0x"
-                            + Transaction(
+                            Transaction(
                                 to=0x1234,
                                 data=b"\x01\x00",
                                 access_list=[
@@ -914,8 +912,7 @@
                             "0x78a4bf2520248e0b403d343c32b6746a43da1ebcf3cc8de14b959bc9f461fe76"
                         ),
                         "transactions": [
-                            "0x"
-                            + Transaction(
+                            Transaction(
                                 to=0x1234,
                                 data=b"\x01\x00",
                                 access_list=[
@@ -1082,8 +1079,7 @@ def test_json_deserialization(
                     "blockHash": "0xd90115b7fde329f64335763a446af1"
                     "50ab67e639281dccdb07a007d18bb80211",
                     "transactions": [
-                        "0x"
-                        + Transaction(
+                        Transaction(
                             to=0x1234,
                             data=b"\x01\x00",
                             access_list=[
@@ -1193,8 +1189,7 @@ def test_json_deserialization(
                     "blockHash": "0xd90115b7fde329f64335763a446af1"
                     "50ab67e639281dccdb07a007d18bb80211",
                     "transactions": [
-                        "0x"
-                        + Transaction(
+                        Transaction(
                             to=0x1234,
                             data=b"\x01\x00",
                             access_list=[

src/ethereum_test_tools/__init__.py

@@ -56,6 +56,7 @@
     copy_opcode_cost,
     cost_memory_bytes,
     eip_2028_transaction_data_cost,
+    keccak256,
 )
 from ethereum_test_vm import (
     Bytecode,
@@ -151,5 +152,6 @@
     "eip_2028_transaction_data_cost",
     "eip_2028_transaction_data_cost",
     "extend_with_defaults",
+    "keccak256",
     "vm",
 )

src/ethereum_test_types/__init__.py

@@ -29,6 +29,7 @@
     Transaction,
     Withdrawal,
     WithdrawalRequest,
+    keccak256,
 )
 
 __all__ = (
@@ -64,5 +65,6 @@
     "copy_opcode_cost",
     "cost_memory_bytes",
     "eip_2028_transaction_data_cost",
+    "keccak256",
     "to_json",
 )

src/ethereum_test_types/helpers.py

@@ -5,7 +5,6 @@
 from dataclasses import MISSING, dataclass, fields
 from typing import List, SupportsBytes
 
-from ethereum.crypto.hash import keccak256
 from ethereum.rlp import encode
 
 from ethereum_test_base_types.base_types import Address, Bytes, Hash
@@ -48,7 +47,7 @@ def compute_create_address(
         if nonce is None:
             nonce = 0
         nonce_bytes = bytes() if nonce == 0 else nonce.to_bytes(length=1, byteorder="big")
-        hash = keccak256(encode([address, nonce_bytes]))
+        hash = Bytes(encode([address, nonce_bytes])).keccak256()
         return Address(hash[-20:])
     if opcode == Op.CREATE2:
         return compute_create2_address(address, salt, initcode)
@@ -62,7 +61,7 @@ def compute_create2_address(
     Compute address of the resulting contract created using the `CREATE2`
     opcode.
     """
-    hash = keccak256(b"\xff" + Address(address) + Hash(salt) + keccak256(Bytes(initcode)))
+    hash = Bytes(b"\xff" + Address(address) + Hash(salt) + Bytes(initcode).keccak256()).keccak256()
     return Address(hash[-20:])
 
 
@@ -100,7 +99,9 @@ def compute_eofcreate_address(
     """
     Compute address of the resulting contract created using the `EOFCREATE` opcode.
     """
-    hash = keccak256(b"\xff" + Address(address) + Hash(salt) + keccak256(Bytes(init_container)))
+    hash = Bytes(
+        b"\xff" + Address(address) + Hash(salt) + Bytes(init_container).keccak256()
+    ).keccak256()
     return Address(hash[-20:])