Deserialize CBORTag inline datum into RawPlutusData, so when the tx output is re-serialized, its cbor will match the original one.

Author: cffls

pycardano/transaction.py

@@ -29,7 +29,7 @@
 from pycardano.metadata import AuxiliaryData
 from pycardano.nativescript import NativeScript
 from pycardano.network import Network
-from pycardano.plutus import Datum, PlutusV1Script, PlutusV2Script
+from pycardano.plutus import Datum, PlutusV1Script, PlutusV2Script, RawPlutusData
 from pycardano.serialization import (
     ArrayCBORSerializable,
     CBORSerializable,
@@ -317,7 +317,11 @@ def from_primitive(
         if values[0] == 0:
             return _DatumOption(DatumHash(values[1]))
         else:
-            return _DatumOption(cbor2.loads(values[1].value))
+            v = cbor2.loads(values[1].value)
+            if isinstance(v, CBORTag):
+                return _DatumOption(RawPlutusData.from_primitive(v))
+            else:
+                return _DatumOption(v)
 
 
 @dataclass(repr=False)

test/pycardano/test_transaction.py

@@ -1,3 +1,5 @@
+from dataclasses import dataclass
+
 from test.pycardano.util import check_two_way_cbor
 
 import pytest
@@ -7,7 +9,7 @@
 from pycardano.hash import SCRIPT_HASH_SIZE, ScriptHash, TransactionId
 from pycardano.key import PaymentKeyPair, PaymentSigningKey, VerificationKey
 from pycardano.nativescript import ScriptPubkey
-from pycardano.plutus import PlutusV1Script, PlutusV2Script, datum_hash
+from pycardano.plutus import PlutusData, PlutusV1Script, PlutusV2Script, datum_hash
 from pycardano.transaction import (
     Asset,
     AssetName,
@@ -421,3 +423,20 @@ def test_values():
 
     with pytest.raises(InvalidOperationException):
         b - c
+
+
+def test_inline_datum_serdes():
+    @dataclass
+    class TestDatum(PlutusData):
+        a: int
+        b: bytes
+
+    output = TransactionOutput(
+        Address.from_primitive("addr_test1vrm9x2zsux7va6w892g38tvchnzahvcd9tykqf3ygnmwtaqyfg52x"),
+        1000000,
+        datum=TestDatum(1, b"test"),
+    )
+
+    cbor = output.to_cbor()
+
+    assert cbor == TransactionOutput.from_cbor(cbor).to_cbor()