Merge pull request #42 from astrojarred/tx-output-enforce-value

Store Transaction Output amounts as Values

Author: cffls

integration-test/test/test_all.py

@@ -274,7 +274,8 @@ def test_plutus(self):
 
         non_nft_utxo = None
         for utxo in self.chain_context.utxos(str(taker_address)):
-            if isinstance(utxo.output.amount, int):
+            # multi_asset should be empty for collateral utxo
+            if not utxo.output.amount.multi_asset:
                 non_nft_utxo = utxo
                 break
 

pycardano/transaction.py

@@ -248,6 +248,12 @@ def __le__(self, other: Union[Value, int]):
     def __lt__(self, other: Union[Value, int]):
         return self <= other and self != other
 
+    def to_shallow_primitive(self):
+        if self.multi_asset:
+            return super().to_shallow_primitive()
+        else:
+            return self.coin
+
 
 @dataclass(repr=False)
 class TransactionOutput(ArrayCBORSerializable):
@@ -257,6 +263,10 @@ class TransactionOutput(ArrayCBORSerializable):
 
     datum_hash: DatumHash = field(default=None, metadata={"optional": True})
 
+    def __post_init__(self):
+        if isinstance(self.amount, int):
+            self.amount = Value(self.amount)
+
     def validate(self):
         if isinstance(self.amount, int) and self.amount < 0:
             raise InvalidDataException(

test/pycardano/test_txbuilder.py

@@ -420,7 +420,7 @@ def test_not_enough_input_amount(chain_context):
 
     # Make output amount equal to the input amount
     tx_builder.add_input(input_utxo).add_output(
-        TransactionOutput.from_primitive([sender, input_utxo.output.amount])
+        TransactionOutput(Address.from_primitive(sender), input_utxo.output.amount)
     )
 
     with pytest.raises(UTxOSelectionException):