Generate EIP-1559 receipts with type 2

Plus, a bunch of related generalization to work with future forks.

Author: carver

eth/vm/forks/berlin/receipts.py

@@ -43,6 +43,7 @@ class TypedReceipt(ReceiptAPI, ReceiptDecoderAPI):
     type_id: int
     rlp_type = Binary(min_length=1)  # must have at least one byte for the type
     _inner: ReceiptAPI
+    codecs = TYPED_RECEIPT_BODY_CODECS
 
     def __init__(self, type_id: int, proxy_target: ReceiptAPI) -> None:
         self.type_id = type_id
@@ -69,8 +70,8 @@ def encode(self) -> bytes:
 
     @classmethod
     def get_payload_codec(cls, type_id: int) -> Type[ReceiptDecoderAPI]:
-        if type_id in TYPED_RECEIPT_BODY_CODECS:
-            return TYPED_RECEIPT_BODY_CODECS[type_id]
+        if type_id in cls.codecs:
+            return cls.codecs[type_id]
         elif type_id in VALID_TRANSACTION_TYPES:
             raise UnrecognizedTransactionType(type_id, "Unknown receipt type")
         else:
@@ -124,23 +125,23 @@ def __eq__(self, other: Any) -> bool:
 
 class BerlinReceiptBuilder(ReceiptBuilderAPI):
     legacy_sedes = Receipt
-    codecs = TYPED_RECEIPT_BODY_CODECS
+    typed_receipt_class = TypedReceipt
 
     @classmethod
     def decode(cls, encoded: bytes) -> ReceiptAPI:
         if len(encoded) == 0:
             raise ValidationError("Encoded receipt was empty, which makes it invalid")
 
         type_id = to_int(encoded[0])
-        if type_id in cls.codecs:
-            return TypedReceipt.decode(encoded)
+        if type_id in cls.typed_receipt_class.codecs:
+            return cls.typed_receipt_class.decode(encoded)
         else:
             return rlp.decode(encoded, sedes=cls.legacy_sedes)
 
     @classmethod
     def deserialize(cls, encoded: DecodedZeroOrOneLayerRLP) -> ReceiptAPI:
         if isinstance(encoded, bytes):
-            return TypedReceipt.deserialize(encoded)
+            return cls.typed_receipt_class.deserialize(encoded)
         else:
             return cls.legacy_sedes.deserialize(encoded)
 

eth/vm/forks/berlin/transactions.py

@@ -63,7 +63,7 @@
     VALID_TRANSACTION_TYPES,
 )
 from .receipts import (
-    TypedReceipt,
+    BerlinReceiptBuilder,
 )
 
 
@@ -246,6 +246,7 @@ class TypedTransaction(SignedTransactionMethods, SignedTransactionAPI, Transacti
     decoders: Dict[int, Type[TransactionDecoderAPI]] = {
         ACCESS_LIST_TRANSACTION_TYPE: AccessListPayloadDecoder,
     }
+    receipt_builder = BerlinReceiptBuilder
 
     def __init__(self, type_id: int, proxy_target: SignedTransactionAPI) -> None:
         self.type_id = type_id
@@ -373,7 +374,7 @@ def make_receipt(
 
         inner_receipt = self._inner.make_receipt(status, gas_used, log_entries)
 
-        return TypedReceipt(ACCESS_LIST_TRANSACTION_TYPE, inner_receipt)
+        return self.receipt_builder.typed_receipt_class(self.type_id, inner_receipt)
 
     def __hash__(self) -> int:
         return hash((self.type_id, self._inner))

eth/vm/forks/london/blocks.py

@@ -144,7 +144,8 @@ def hash(self) -> Hash32:
 
     @property
     def mining_hash(self) -> Hash32:
-        result = keccak(rlp.encode(self[:-2], LondonMiningHeader))
+        non_pow_fields = self[:-3] + self[-1:]
+        result = keccak(rlp.encode(non_pow_fields, LondonMiningHeader))
         return cast(Hash32, result)
 
     @property

eth/vm/forks/london/receipts.py

@@ -7,7 +7,8 @@
     Receipt,
 )
 from eth.vm.forks.berlin.receipts import (
-    BerlinReceiptBuilder
+    BerlinReceiptBuilder,
+    TypedReceipt as BerlinTypedReceipt,
 )
 from eth.vm.forks.berlin.constants import (
     ACCESS_LIST_TRANSACTION_TYPE,
@@ -16,8 +17,12 @@
 from .constants import DYNAMIC_FEE_TRANSACTION_TYPE
 
 
-class LondonReceiptBuilder(BerlinReceiptBuilder):
+class LondonTypedReceipt(BerlinTypedReceipt):
     codecs: Dict[int, Type[Receipt]] = {
         ACCESS_LIST_TRANSACTION_TYPE: Receipt,
         DYNAMIC_FEE_TRANSACTION_TYPE: Receipt,
     }
+
+
+class LondonReceiptBuilder(BerlinReceiptBuilder):
+    typed_receipt_class = LondonTypedReceipt

eth/vm/forks/london/transactions.py

@@ -54,6 +54,7 @@
 )
 
 from .constants import DYNAMIC_FEE_TRANSACTION_TYPE
+from .receipts import LondonReceiptBuilder
 
 
 class LondonLegacyTransaction(BerlinLegacyTransaction):
@@ -218,6 +219,7 @@ class LondonTypedTransaction(TypedTransaction):
         ACCESS_LIST_TRANSACTION_TYPE: AccessListPayloadDecoder,
         DYNAMIC_FEE_TRANSACTION_TYPE: DynamicFeePayloadDecoder,
     }
+    receipt_builder = LondonReceiptBuilder
 
 
 class LondonTransactionBuilder(BerlinTransactionBuilder):