Merge pull request #1996 from carver/type-id-on-legacy

Make type_id accessible on all transactions

Author: carver

eth/abc.py

@@ -534,6 +534,17 @@ def y_parity(self) -> int:
         """
         ...
 
+    type_id: Optional[int]
+    """
+    The type of EIP-2718 transaction
+
+    Each EIP-2718 transaction includes a type id (which is the leading
+    byte, as encoded).
+
+    If this transaction is a legacy transaction, that it has no type. Then,
+    type_id will be None.
+    """
+
     # +-------------------------------------------------------------+
     # | API that must be implemented by all Transaction subclasses. |
     # +-------------------------------------------------------------+

eth/rlp/transactions.py

@@ -76,6 +76,8 @@ def hash(self) -> Hash32:
 
 
 class SignedTransactionMethods(BaseTransactionMethods, SignedTransactionAPI):
+    type_id: Optional[int] = None
+
     @cached_property
     def sender(self) -> Address:
         return self.get_sender()

eth/vm/forks/berlin/transactions.py

@@ -221,7 +221,6 @@ def decode(cls, payload: bytes) -> SignedTransactionAPI:
 
 
 class TypedTransaction(SignedTransactionMethods, SignedTransactionAPI, TransactionDecoderAPI):
-    type_id: int
     rlp_type = Binary(min_length=1)  # must have at least one byte for the type
     _inner: SignedTransactionAPI
 

newsfragments/1996.feature.rst

@@ -0,0 +1 @@
+Expose a ``type_id`` on all transactions. It is ``None`` for legacy transactions.