Merge branch 'main' into feat/list_plutusdata

Author: nielstron

docs/source/guides/transaction.rst

@@ -147,7 +147,7 @@ Step 6
 Add additional transaction information as needed:
 
     >>> builder.ttl = 3600
-    >>> builder.reference_inputs.add(tx_in)
+    >>> builder.reference_inputs.add(utxo)
 
 Step 7
 

integration-test/test/test_certificate.py

@@ -11,7 +11,6 @@
 class TestDelegation(TestBase):
     @retry(tries=TEST_RETRIES, backoff=1.5, delay=6, jitter=(0, 4))
     def test_stake_delegation(self):
-
         address = Address(
             self.payment_key_pair.verification_key.hash(),
             self.stake_key_pair.verification_key.hash(),

integration-test/test/test_plutus.py

@@ -12,7 +12,6 @@
 class TestPlutus(TestBase):
     @retry(tries=TEST_RETRIES, backoff=1.5, delay=6, jitter=(0, 4))
     def test_plutus_v1(self):
-
         # ----------- Giver give ---------------
 
         with open("./plutus_scripts/fortytwo.plutus", "r") as f:
@@ -97,7 +96,6 @@ def test_plutus_v1(self):
     @retry(tries=TEST_RETRIES, backoff=1.5, delay=6, jitter=(0, 4))
     @pytest.mark.post_alonzo
     def test_plutus_v2_datum_hash(self):
-
         # ----------- Giver give ---------------
 
         with open("./plutus_scripts/fortytwoV2.plutus", "r") as f:
@@ -173,7 +171,6 @@ def test_plutus_v2_datum_hash(self):
     @retry(tries=TEST_RETRIES, backoff=1.5, delay=6, jitter=(0, 4))
     @pytest.mark.post_alonzo
     def test_plutus_v2_inline_script_inline_datum(self):
-
         # ----------- Giver give ---------------
 
         with open("./plutus_scripts/fortytwoV2.plutus", "r") as f:
@@ -237,7 +234,6 @@ def test_plutus_v2_inline_script_inline_datum(self):
     @retry(tries=TEST_RETRIES, backoff=1.5, delay=6, jitter=(0, 4))
     @pytest.mark.post_alonzo
     def test_plutus_v2_ref_script(self):
-
         # ----------- Create a reference script ---------------
 
         with open("./plutus_scripts/fortytwoV2.plutus", "r") as f:

poetry.lock

@@ -15,7 +15,6 @@
 
 @dataclass(repr=False)
 class StakeCredential(ArrayCBORSerializable):
-
     _CODE: Optional[int] = field(init=False, default=None)
 
     credential: Union[VerificationKeyHash, ScriptHash]
@@ -29,23 +28,20 @@ def __post_init__(self):
 
 @dataclass(repr=False)
 class StakeRegistration(ArrayCBORSerializable):
-
     _CODE: int = field(init=False, default=0)
 
     stake_credential: StakeCredential
 
 
 @dataclass(repr=False)
 class StakeDeregistration(ArrayCBORSerializable):
-
     _CODE: int = field(init=False, default=1)
 
     stake_credential: StakeCredential
 
 
 @dataclass(repr=False)
 class StakeDelegation(ArrayCBORSerializable):
-
     _CODE: int = field(init=False, default=2)
 
     stake_credential: StakeCredential

pycardano/certificate.py

@@ -151,7 +151,6 @@ def verify(
 
     # generate/extract the cose key
     if not attach_cose_key:
-
         # get the verification key from the headers
         verification_key = decoded_message.phdr[KID]
 

pycardano/cip/cip8.py

@@ -84,7 +84,6 @@ def select(
         include_max_fee: Optional[bool] = True,
         respect_min_utxo: Optional[bool] = True,
     ) -> Tuple[List[UTxO], Value]:
-
         available: List[UTxO] = sorted(utxos, key=lambda utxo: utxo.output.lovelace)
         max_fee = max_tx_fee(context) if include_max_fee else 0
         total_requested = Value(max_fee)

pycardano/coinselection.py

@@ -148,6 +148,9 @@ def __eq__(self, other):
     def __repr__(self) -> str:
         return self.to_json()
 
+    def __hash__(self):
+        return hash(self.payload)
+
 
 class SigningKey(Key):
     def sign(self, data: bytes) -> bytes:

pycardano/key.py

@@ -605,6 +605,36 @@ def _dfs(obj):
                                 converted_fields.append(t.from_dict(f))
                             else:
                                 converted_fields.append(_dfs(f))
+
+                        elif (
+                            hasattr(f_info.type, "__origin__")
+                            and f_info.type.__origin__ is dict
+                        ):
+                            t_args = f_info.type.__args__
+                            if len(t_args) != 2:
+                                raise DeserializeException(
+                                    "Dict type with wrong number of arguments"
+                                )
+                            if "map" not in f:
+                                raise DeserializeException(
+                                    f'Expected type "map" in object but got "{f}"'
+                                )
+                            key_t = t_args[0]
+                            val_t = t_args[1]
+                            if inspect.isclass(key_t) and issubclass(key_t, PlutusData):
+                                key_convert = key_t.from_dict
+                            else:
+                                key_convert = _dfs
+                            if inspect.isclass(val_t) and issubclass(val_t, PlutusData):
+                                val_convert = val_t.from_dict
+                            else:
+                                val_convert = _dfs
+                            converted_fields.append(
+                                {
+                                    key_convert(pair["k"]): val_convert(pair["v"])
+                                    for pair in f["map"]
+                                }
+                            )
                         else:
                             converted_fields.append(_dfs(f))
                     return cls(*converted_fields)
@@ -639,7 +669,6 @@ def from_json(cls: Type[PlutusData], data: str) -> PlutusData:
 
 @dataclass
 class RawPlutusData(CBORSerializable):
-
     data: CBORTag
 
     def to_primitive(self) -> CBORTag:

pycardano/plutus.py

@@ -37,6 +37,10 @@
 ]
 
 
+def _identity(x):
+    return x
+
+
 class IndefiniteList(UserList):
     def __init__(self, li: Primitive):  # type: ignore
         super().__init__(li)  # type: ignore
@@ -428,6 +432,25 @@ def _restore_dataclass_field(
             return IndefiniteList(v)
     elif isclass(f.type) and issubclass(f.type, IndefiniteList):
         return IndefiniteList(v)
+    elif hasattr(f.type, "__origin__") and (f.type.__origin__ is dict):
+        t_args = f.type.__args__
+        if len(t_args) != 2:
+            raise DeserializeException(
+                f"Dict types need exactly two type arguments, but got {t_args}"
+            )
+        key_t = t_args[0]
+        val_t = t_args[1]
+        if isclass(key_t) and issubclass(key_t, CBORSerializable):
+            key_converter = key_t.from_primitive
+        else:
+            key_converter = _identity
+        if isclass(val_t) and issubclass(val_t, CBORSerializable):
+            val_converter = val_t.from_primitive
+        else:
+            val_converter = _identity
+        if not isinstance(v, dict):
+            raise DeserializeException(f"Expected dict type but got {type(v)}")
+        return {key_converter(key): val_converter(val) for key, val in v.items()}
     elif hasattr(f.type, "__origin__") and (
         f.type.__origin__ is Union or f.type.__origin__ is Optional
     ):

pycardano/serialization.py

@@ -267,7 +267,6 @@ def to_shallow_primitive(self):
 
 @dataclass(repr=False)
 class _Script(ArrayCBORSerializable):
-
     _TYPE: int = field(init=False, default=0)
 
     script: Union[NativeScript, PlutusV1Script, PlutusV2Script]
@@ -293,7 +292,6 @@ def from_primitive(cls: Type[_Script], values: List[Primitive]) -> _Script:
 
 @dataclass(repr=False)
 class _DatumOption(ArrayCBORSerializable):
-
     _TYPE: int = field(init=False, default=0)
 
     datum: Union[DatumHash, Any]
@@ -329,7 +327,6 @@ def from_primitive(
 
 @dataclass(repr=False)
 class _ScriptRef(CBORSerializable):
-
     script: _Script
 
     def to_primitive(self) -> Primitive:
@@ -374,7 +371,6 @@ class _TransactionOutputLegacy(ArrayCBORSerializable):
 
 @dataclass(repr=False)
 class TransactionOutput(CBORSerializable):
-
     address: Address
 
     amount: Union[Value]