fixup: Correctly decode London dynamic-fee txns

Author: carver

tests/core/transaction-utils/test_receipt_encoding.py

@@ -16,7 +16,12 @@
     TypedReceipt,
 )
 
-RECOGNIZED_TRANSACTION_TYPES = {1}
+# The type of receipt is based on the type of the transaction. So we are
+#   checking the type of the receipt against known transaction types.
+# Add recognized types here if any fork knows about it. Then,
+#   add manual unrecognized types for older forks. For example,
+#   (BerlinVM, to_bytes(2), UnrecognizedTransactionType) should be added explicitly.
+RECOGNIZED_TRANSACTION_TYPES = {1, 2}
 
 UNRECOGNIZED_TRANSACTION_TYPES = tuple(
     (to_bytes(val), UnrecognizedTransactionType)
@@ -62,7 +67,7 @@
         ),
     )
 )
-def test_transaction_decode(vm_class, encoded, expected):
+def test_receipt_decode(vm_class, encoded, expected):
     expected_encoding = expected.encode()
     assert encoded == expected_encoding
 
@@ -83,8 +88,24 @@ def test_transaction_decode(vm_class, encoded, expected):
     + UNRECOGNIZED_TRANSACTION_TYPES
     + INVALID_TRANSACTION_TYPES
 )
-def test_transaction_decode_failure(vm_class, encoded, expected_failure):
-    sedes = vm_class.get_transaction_builder()
+def test_receipt_decode_failure(vm_class, encoded, expected_failure):
+    sedes = vm_class.get_receipt_builder()
+    with pytest.raises(expected_failure):
+        rlp.decode(encoded, sedes=sedes)
+
+
+@pytest.mark.parametrize(
+    'vm_class, encoded, expected_failure',
+    (
+        (
+            BerlinVM,
+            to_bytes(2),
+            UnrecognizedTransactionType,
+        ),
+    )
+)
+def test_receipt_decode_failure_by_vm(vm_class, encoded, expected_failure):
+    sedes = vm_class.get_receipt_builder()
     with pytest.raises(expected_failure):
         rlp.decode(encoded, sedes=sedes)
 

tests/core/transaction-utils/test_transaction_encoding.py

@@ -13,7 +13,10 @@
     LondonVM,
 )
 
-RECOGNIZED_TRANSACTION_TYPES = {1}
+# Add recognized types here if any fork knows about it. Then,
+#   add manual unrecognized types for older forks. For example,
+#   (BerlinVM, to_bytes(2), UnrecognizedTransactionType) should be added explicitly.
+RECOGNIZED_TRANSACTION_TYPES = {1, 2}
 
 UNRECOGNIZED_TRANSACTION_TYPES = tuple(
     (to_bytes(val), UnrecognizedTransactionType)
@@ -70,6 +73,22 @@ def test_transaction_decode(vm_class, encoded, expected):
         assert decoded == expected_txn
 
 
+@pytest.mark.parametrize(
+    'vm_class, encoded, expected_failure',
+    (
+        (
+            BerlinVM,
+            to_bytes(2),
+            UnrecognizedTransactionType,
+        ),
+    )
+)
+def test_transaction_decode_failure_by_vm(vm_class, encoded, expected_failure):
+    sedes = vm_class.get_transaction_builder()
+    with pytest.raises(expected_failure):
+        rlp.decode(encoded, sedes=sedes)
+
+
 @pytest.mark.parametrize('is_rlp_encoded', (True, False))
 def test_EIP2930_transaction_decode(typed_txn_fixture, is_rlp_encoded):
     signed_txn = decode_hex(typed_txn_fixture['signed'])