new(tests): EIP-7702: Updates for Devnet-3

docs/CHANGELOG.md

@@ -11,6 +11,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - ✨ EIP-4844 test `tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py` includes an EOF test case ([#610](https://github.com/ethereum/execution-spec-tests/pull/610)).
 - ✨ Example test `tests/frontier/opcodes/test_dup.py` now includes EOF parametrization ([#610](https://github.com/ethereum/execution-spec-tests/pull/610)).
 - ✨ Convert all opcodes validation test `tests/frontier/opcodes/test_all_opcodes.py` ([#748](https://github.com/ethereum/execution-spec-tests/pull/748)).
+- ✨ Update [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) tests for Devnet-3 ([#733](https://github.com/ethereum/execution-spec-tests/pull/733))
 
 ### 🛠️ Framework
 

src/ethereum_test_base_types/base_types.py

@@ -4,6 +4,7 @@
 
 from typing import Any, ClassVar, SupportsBytes, Type, TypeVar
 
+from Crypto.Hash import keccak
 from pydantic import GetCoreSchemaHandler
 from pydantic_core.core_schema import (
     PlainValidatorFunctionSchema,
@@ -146,6 +147,13 @@ def or_none(cls, input: "Bytes | BytesConvertible | None") -> "Bytes | None":
             return input
         return cls(input)
 
+    def keccak256(self) -> "Bytes":
+        """
+        Return the keccak256 hash of the opcode byte representation.
+        """
+        k = keccak.new(digest_bits=256)
+        return Bytes(k.update(bytes(self)).digest())
+
 
 S = TypeVar("S", bound="FixedSizeHexNumber")
 

src/ethereum_test_exceptions/exceptions.py

@@ -354,6 +354,14 @@ class TransactionException(ExceptionBase):
     """
     Transaction is type 3, but has no blobs.
     """
+    TYPE_4_EMPTY_AUTHORIZATION_LIST = auto()
+    """
+    Transaction is type 4, but has an empty authorization list.
+    """
+    TYPE_4_INVALID_AUTHORITY_SIGNATURE = auto()
+    """
+    Transaction is type 4, but has an empty authorization list.
+    """
 
 
 @unique

src/ethereum_test_fixtures/tests/test_blockchain.py

@@ -191,7 +191,7 @@
                         AuthorizationTuple(
                             chain_id=1,
                             address=2,
-                            nonce=[3],
+                            nonce=3,
                             signer=EOA(key=TestPrivateKey),
                         )
                     ],
@@ -212,16 +212,16 @@
                     {
                         "chainId": "0x01",
                         "address": Address(2).hex(),
-                        "nonce": ["0x03"],
+                        "nonce": "0x03",
                         "v": "0x00",
-                        "r": "0x796b0a59fe796b5aab79259988f4b18bb7966dc9aa0a01d226859057f539d8f6",
-                        "s": "0x7456ad9b8b4e157d8a150ae7d568bb93e668bf1d5970756f7fe7b7f2472235fe",
+                        "r": "0xda29c3bd0304ae475b06d1a11344e0b6d75590f2c23138c9507f4b5bedde3c79",
+                        "s": "0x3e1fb143ae0460373d567cf901645757b321e42c423a53b2d46ed13c9ef0a9ab",
                         "signer": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     }
                 ],
                 "v": "0x01",
-                "r": "0xb9f3ad929ffdb846cbe357fa25e6ab93cc6e10e76da170a12baf03f8a34ba141",
-                "s": "0x04992060cfa252f5ac18ac1ccb340a821497d50812a225646094d2ad08b8eeaa",
+                "r": "0xe7da7f244c95cea73ac6316971139ac0eb8fad455d9a25e1c134d7a157c38ff9",
+                "s": "0x1939185d2e2a2b3375183e42b5755d695efbd72e186cf9a3e6958a3fb84cc709",
                 "sender": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             },
             id="fixture_transaction_type_4",

src/ethereum_test_types/types.py

@@ -4,7 +4,7 @@
 
 from dataclasses import dataclass
 from functools import cached_property
-from typing import Any, ClassVar, Dict, Generic, List, Sequence, Tuple
+from typing import Any, ClassVar, Dict, Generic, List, Literal, Sequence, Tuple
 
 from coincurve.keys import PrivateKey, PublicKey
 from ethereum import rlp as eth_rlp
@@ -283,6 +283,7 @@ def fund_eoa(
         amount: NumberConvertible = 10**21,
         label: str | None = None,
         storage: Storage | None = None,
+        delegation: Address | Literal["Self"] | None = None,
     ) -> EOA:
         """
         Add a previously unused EOA to the pre-alloc with the balance specified by `amount`.
@@ -469,34 +470,24 @@ class AuthorizationTupleGeneric(CamelModel, Generic[NumberBoundTypeVar]):
     Authorization tuple for transactions.
     """
 
-    chain_id: NumberBoundTypeVar = Field(1)  # type: ignore
+    chain_id: NumberBoundTypeVar = Field(0)  # type: ignore
     address: Address
-    nonce: List[NumberBoundTypeVar] = Field(default_factory=list)
+    nonce: NumberBoundTypeVar = Field(0)  # type: ignore
 
     v: NumberBoundTypeVar = Field(0)  # type: ignore
     r: NumberBoundTypeVar = Field(0)  # type: ignore
     s: NumberBoundTypeVar = Field(0)  # type: ignore
 
     magic: ClassVar[int] = 0x05
 
-    @model_validator(mode="before")
-    @classmethod
-    def convert_nonce_information(cls, data: Any) -> Any:
-        """
-        Automatically converts the nonce to a list if it is not already.
-        """
-        if "nonce" in data and not isinstance(data["nonce"], list):
-            data["nonce"] = [data["nonce"]]
-        return data
-
     def to_list(self) -> List[Any]:
         """
         Returns the authorization tuple as a list of serializable elements.
         """
         return [
             Uint(self.chain_id),
             self.address,
-            [Uint(n) for n in self.nonce],
+            Uint(self.nonce),
             Uint(self.v),
             Uint(self.r),
             Uint(self.s),
@@ -511,7 +502,7 @@ def signing_bytes(self) -> bytes:
             [
                 Uint(self.chain_id),
                 self.address,
-                [Uint(n) for n in self.nonce],
+                Uint(self.nonce),
             ]
         )
 
@@ -548,6 +539,27 @@ def model_post_init(self, __context: Any) -> None:
         elif self.signer is not None:
             assert self.signer.key is not None, "signer must have a key"
             self.sign(self.signer.key)
+        else:
+            assert self.v is not None, "v must be set"
+            assert self.r is not None, "r must be set"
+            assert self.s is not None, "s must be set"
+
+            # Calculate the address from the signature
+            try:
+                signature_bytes = (
+                    int(self.r).to_bytes(32, byteorder="big")
+                    + int(self.s).to_bytes(32, byteorder="big")
+                    + bytes([self.v])
+                )
+                public_key = PublicKey.from_signature_and_message(
+                    signature_bytes, keccak256(self.signing_bytes), hasher=None
+                )
+                self.signer = EOA(
+                    address=Address(keccak256(public_key.format(compressed=False)[1:])[32 - 20 :])
+                )
+            except Exception:
+                # Signer remains `None` in this case
+                pass
 
     def sign(self, private_key: Hash) -> None:
         """

src/evm_transition_tool/types.py

@@ -33,6 +33,16 @@ class TransactionLog(CamelModel):
     removed: bool
 
 
+class SetCodeDelegation(CamelModel):
+    """
+    Set code delegation
+    """
+
+    from_address: Address = Field(..., alias="from")
+    nonce: HexNumber
+    target: Address
+
+
 class TransactionReceipt(CamelModel):
     """
     Transaction receipt
@@ -51,6 +61,7 @@ class TransactionReceipt(CamelModel):
     transaction_index: HexNumber | None = None
     blob_gas_used: HexNumber | None = None
     blob_gas_price: HexNumber | None = None
+    delegations: List[SetCodeDelegation] | None = None
 
 
 class RejectedTransaction(CamelModel):

src/pytest_plugins/filler/pre_alloc.py

@@ -6,7 +6,7 @@
 from enum import IntEnum
 from functools import cache
 from itertools import count
-from typing import Iterator
+from typing import Iterator, Literal
 
 import pytest
 from pydantic import PrivateAttr
@@ -86,6 +86,9 @@ class AllocMode(IntEnum):
     STRICT = 1
 
 
+DELEGATION_DESIGNATION = b"\xef\x01\x00"
+
+
 class Alloc(BaseAlloc):
     """
     Allocation of accounts in the state, pre and post test execution.
@@ -193,6 +196,7 @@ def fund_eoa(
         amount: NumberConvertible = 10**21,
         label: str | None = None,
         storage: Storage | None = None,
+        delegation: Address | Literal["Self"] | None = None,
     ) -> EOA:
         """
         Add a previously unused EOA to the pre-alloc with the balance specified by `amount`.
@@ -201,18 +205,23 @@ def fund_eoa(
         returned.
         """
         eoa = next(self._eoa_iterator)
-        if Number(amount) > 0 or storage is not None:
-            if storage is None:
+        if Number(amount) > 0 or storage is not None or delegation is not None:
+            if storage is None and delegation is None:
                 account = Account(
                     nonce=0,
                     balance=amount,
                 )
             else:
                 # Type-4 transaction is sent to the EOA to set the storage, so the nonce must be 1
+                if not isinstance(delegation, Address) and delegation == "Self":
+                    delegation = eoa
                 account = Account(
                     nonce=1,
                     balance=amount,
-                    storage=storage,
+                    storage=storage if storage is not None else {},
+                    code=DELEGATION_DESIGNATION + bytes(delegation)  # type: ignore
+                    if delegation is not None
+                    else b"",
                 )
                 eoa.nonce = Number(1)