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

src/ethereum/forks/amsterdam/fork.py

@@ -77,7 +77,6 @@
     set_account_balance,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -86,6 +85,7 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
@@ -998,15 +998,7 @@ def process_transaction(
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:

src/ethereum/forks/amsterdam/transactions.py

@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -481,6 +481,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -622,15 +639,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
@@ -891,3 +900,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )

src/ethereum/forks/bpo1/fork.py

@@ -63,7 +63,6 @@
     state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -72,6 +71,7 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
@@ -916,15 +916,7 @@ def process_transaction(
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:

src/ethereum/forks/bpo1/transactions.py

@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -481,6 +481,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -615,15 +632,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
@@ -884,3 +893,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )

src/ethereum/forks/bpo2/fork.py

@@ -63,7 +63,6 @@
     state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -72,6 +71,7 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
@@ -916,15 +916,7 @@ def process_transaction(
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:

src/ethereum/forks/bpo2/transactions.py

@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -481,6 +481,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -615,15 +632,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
@@ -884,3 +893,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )

src/ethereum/forks/bpo3/fork.py

@@ -63,7 +63,6 @@
     state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -72,6 +71,7 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
@@ -916,15 +916,7 @@ def process_transaction(
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots: