feat(ethereum): add support for EIP-7702 (#2612)

fubuloubu · web-flow · commit 7cb52f881a96 · 2025-05-30T09:00:49.000-05:00
diff --git a/src/ape_ethereum/__init__.py b/src/ape_ethereum/__init__.py
@@ -66,9 +66,11 @@ def __getattr__(name):
 
     elif name in (
         "AccessListTransaction",
+        "Authorization",
         "BaseTransaction",
         "DynamicFeeTransaction",
         "Receipt",
+        "SetCodeTransaction",
         "SharedBlobReceipt",
         "SharedBlobTransaction",
         "StaticFeeTransaction",
@@ -90,6 +92,7 @@ def __getattr__(name):
 
 __all__ = [
     "AccessListTransaction",
+    "Authorization",
     "BaseEthereumConfig",
     "BaseTransaction",
     "Block",
@@ -101,6 +104,7 @@ def __getattr__(name):
     "ForkedNetworkConfig",
     "NetworkConfig",
     "Receipt",
+    "SetCodeTransaction",
     "SharedBlobReceipt",
     "SharedBlobTransaction",
     "SharedBlobTransaction",
diff --git a/src/ape_ethereum/ecosystem.py b/src/ape_ethereum/ecosystem.py
@@ -70,6 +70,7 @@
     BaseTransaction,
     DynamicFeeTransaction,
     Receipt,
+    SetCodeTransaction,
     SharedBlobReceipt,
     SharedBlobTransaction,
     StaticFeeTransaction,
@@ -435,9 +436,13 @@ def decode_transaction_type(self, transaction_type_id: Any) -> type["Transaction
 
         if tx_type is TransactionType.STATIC:
             return StaticFeeTransaction
+
         elif tx_type is TransactionType.ACCESS_LIST:
             return AccessListTransaction
 
+        elif tx_type is TransactionType.SET_CODE:
+            return SetCodeTransaction
+
         return DynamicFeeTransaction
 
     def encode_contract_blueprint(
@@ -898,6 +903,7 @@ def create_transaction(self, **kwargs) -> "TransactionAPI":
             TransactionType.ACCESS_LIST: AccessListTransaction,
             TransactionType.DYNAMIC: DynamicFeeTransaction,
             TransactionType.SHARED_BLOB: SharedBlobTransaction,
+            TransactionType.SET_CODE: SetCodeTransaction,
         }
         if "type" in tx_data:
             # May be None in data.
@@ -912,14 +918,17 @@ def create_transaction(self, **kwargs) -> "TransactionAPI":
                 # Using hex values or alike.
                 version = TransactionType(self.conversion_manager.convert(tx_data["type"], int))
 
-        elif "gas_price" in tx_data:
-            version = TransactionType.STATIC
+        # NOTE: Determine these in reverse order
+        elif "authorizationList" in tx_data:
+            version = TransactionType.SET_CODE
+        elif "maxFeePerBlobGas" in tx_data or "blobVersionedHashes" in tx_data:
+            version = TransactionType.SHARED_BLOB
         elif "max_fee" in tx_data or "max_priority_fee" in tx_data:
             version = TransactionType.DYNAMIC
         elif "access_list" in tx_data or "accessList" in tx_data:
             version = TransactionType.ACCESS_LIST
-        elif "maxFeePerBlobGas" in tx_data or "blobVersionedHashes" in tx_data:
-            version = TransactionType.SHARED_BLOB
+        elif "gas_price" in tx_data:
+            version = TransactionType.STATIC
         else:
             version = self.default_transaction_type
 
diff --git a/src/ape_ethereum/provider.py b/src/ape_ethereum/provider.py
@@ -1197,7 +1197,11 @@ def prepare_transaction(self, txn: TransactionAPI) -> TransactionAPI:
             and txn.gas_price is None
         ):
             txn.gas_price = self.gas_price
-        elif txn_type in (TransactionType.DYNAMIC, TransactionType.SHARED_BLOB):
+        elif txn_type in (
+            TransactionType.DYNAMIC,
+            TransactionType.SHARED_BLOB,
+            TransactionType.SET_CODE,
+        ):
             if txn.max_priority_fee is None:
                 txn.max_priority_fee = self.priority_fee
 
diff --git a/src/ape_ethereum/transactions.py b/src/ape_ethereum/transactions.py
@@ -9,17 +9,19 @@
     encode_transaction,
     serializable_unsigned_transaction_from_dict,
 )
+from eth_account.typed_transactions.set_code_transaction import Authorization as EthAcctAuth
 from eth_pydantic_types import HexBytes
-from eth_utils import decode_hex, encode_hex, keccak, to_hex, to_int
+from eth_utils import decode_hex, encode_hex, keccak, to_canonical_address, to_hex, to_int
 from ethpm_types.abi import EventABI, MethodABI
-from pydantic import BaseModel, Field, field_validator, model_validator
+from pydantic import BaseModel, Field, field_serializer, field_validator, model_validator
 
 from ape.api.transactions import ReceiptAPI, TransactionAPI
 from ape.exceptions import OutOfGasError, SignatureError, TransactionError
 from ape.logging import logger
 from ape.types.address import AddressType
 from ape.types.basic import HexInt
 from ape.types.events import ContractLog, ContractLogContainer
+from ape.types.signatures import MessageSignature
 from ape.types.trace import SourceTraceback
 from ape.utils.misc import ZERO_ADDRESS
 from ape_ethereum.trace import Trace, _events_to_trees
@@ -55,6 +57,7 @@ class TransactionType(Enum):
     ACCESS_LIST = 1  # EIP-2930
     DYNAMIC = 2  # EIP-1559
     SHARED_BLOB = 3  # EIP-4844
+    SET_CODE = 4  # EIP-7702
 
 
 class AccessList(BaseModel):
@@ -97,6 +100,17 @@ def serialize_transaction(self) -> bytes:
 
             txn_data["accessList"] = adjusted_access_list
 
+        if "authorizationList" in txn_data:
+            adjusted_auth_list = []
+
+            for item in txn_data["authorizationList"]:
+                adjusted_item = {
+                    k: to_hex(v) if isinstance(v, bytes) else v for k, v in item.items()
+                }
+                adjusted_auth_list.append(adjusted_item)
+
+            txn_data["authorizationList"] = adjusted_auth_list
+
         unsigned_txn = serializable_unsigned_transaction_from_dict(txn_data)
         signature = (self.signature.v, to_int(self.signature.r), to_int(self.signature.s))
         signed_txn = encode_transaction(unsigned_txn, signature)
@@ -186,6 +200,47 @@ class SharedBlobTransaction(DynamicFeeTransaction):
     """
 
 
+class Authorization(BaseModel):
+    """
+    `EIP-7702 <https://eips.ethereum.org/EIPS/eip-7702>`__ authorization list item.
+    """
+
+    chain_id: HexInt = Field(alias="chainId")
+    address: AddressType
+    nonce: HexInt
+    v: HexInt = Field(alias="yParity")
+    r: HexBytes
+    s: HexBytes
+
+    @field_serializer("chain_id", "nonce", "v")
+    def convert_int_to_hex(self, value: int) -> str:
+        return to_hex(value)
+
+    @property
+    def signature(self) -> MessageSignature:
+        return MessageSignature(v=self.v, r=self.r, s=self.s)
+
+    @cached_property
+    def authority(self) -> AddressType:
+        auth = EthAcctAuth(self.chain_id, to_canonical_address(self.address), self.nonce)
+        return EthAccount._recover_hash(
+            auth.hash(),
+            vrs=(self.signature.v, to_int(self.r), to_int(self.s)),
+        )
+
+
+class SetCodeTransaction(DynamicFeeTransaction):
+    """
+    `EIP-7702 <https://eips.ethereum.org/EIPS/eip-7702>`__ transactions.
+    """
+
+    authorizations: list[Authorization] = Field(default_factory=list, alias="authorizationList")
+    receiver: AddressType = Field(default=ZERO_ADDRESS, alias="to")
+    """
+    Overridden because EIP-7702 states it cannot be nil.
+    """
+
+
 class Receipt(ReceiptAPI):
     gas_limit: HexInt
     gas_price: HexInt
diff --git a/tests/functional/test_ecosystem.py b/tests/functional/test_ecosystem.py
@@ -19,6 +19,7 @@
 from ape_ethereum.transactions import (
     DynamicFeeTransaction,
     Receipt,
+    SetCodeTransaction,
     SharedBlobReceipt,
     SharedBlobTransaction,
     StaticFeeTransaction,
@@ -921,6 +922,16 @@ def test_create_transaction_blob_versioned_hashed(kwarg_name, value, ethereum):
     assert tx.blob_versioned_hashes == [HexBytes(value)]
 
 
+@pytest.mark.parametrize(
+    "tx_kwargs",
+    [{"type": 4}, {"authorizationList": []}],
+)
+def test_create_transaction_set_code(tx_kwargs, ethereum):
+    tx = ethereum.create_transaction(**tx_kwargs)
+    assert isinstance(tx, SetCodeTransaction)
+    assert tx.type == TransactionType.SET_CODE.value
+
+
 @pytest.mark.parametrize("tx_type", TransactionType)
 def test_encode_transaction(tx_type, ethereum, vyper_contract_instance, owner, eth_tester_provider):
     abi = vyper_contract_instance.contract_type.methods[0]
diff --git a/tests/functional/test_transaction.py b/tests/functional/test_transaction.py
@@ -186,6 +186,15 @@ def test_type_3_transactions(ethereum, tx_kwargs):
     assert txn.type == 3
 
 
+@pytest.mark.parametrize(
+    "tx_kwargs",
+    [{"type": 4}, {"authorizationList": []}],
+)
+def test_type_4_transactions(ethereum, tx_kwargs):
+    txn = ethereum.create_transaction(**tx_kwargs)
+    assert txn.type == 4
+
+
 @pytest.mark.parametrize(
     "fee_kwargs",
     (
