Fix static typing

Fixed the following files:

pycardano/plutus.py
pycardano/serialization.py
pycardano/transaction.py
pycardano/txbuilder.py
pycardano/witness.py

Author: cffls

pycardano/plutus.py

@@ -21,6 +21,7 @@
     CBORSerializable,
     DictCBORSerializable,
     IndefiniteList,
+    Primitive,
     RawCBOR,
     default_encoder,
     limit_primitive_type,
@@ -39,6 +40,7 @@
     "PlutusV2Script",
     "RawPlutusData",
     "Redeemer",
+    "ScriptType",
     "datum_hash",
     "plutus_script_hash",
     "script_hash",
@@ -471,7 +473,7 @@ def __post_init__(self):
                 )
 
     def to_shallow_primitive(self) -> CBORTag:
-        primitives = super().to_shallow_primitive()
+        primitives: Primitive = super().to_shallow_primitive()
         if primitives:
             primitives = IndefiniteList(primitives)
         tag = get_tag(self.CONSTR_ID)
@@ -544,7 +546,7 @@ def _dfs(obj):
         return json.dumps(_dfs(self), **kwargs)
 
     @classmethod
-    def from_dict(cls: PlutusData, data: dict) -> PlutusData:
+    def from_dict(cls: Type[PlutusData], data: dict) -> PlutusData:
         """Convert a dictionary to PlutusData
 
         Args:
@@ -606,7 +608,7 @@ def _dfs(obj):
         return _dfs(data)
 
     @classmethod
-    def from_json(cls: PlutusData, data: str) -> PlutusData:
+    def from_json(cls: Type[PlutusData], data: str) -> PlutusData:
         """Restore a json encoded string to a PlutusData.
 
         Args:
@@ -701,7 +703,7 @@ class Redeemer(ArrayCBORSerializable):
 
     data: Any
 
-    ex_units: ExecutionUnits = None
+    ex_units: Optional[ExecutionUnits] = None
 
     @classmethod
     @limit_primitive_type(list)
@@ -729,13 +731,23 @@ def plutus_script_hash(
     return script_hash(script)
 
 
-def script_hash(
-    script: Union[bytes, NativeScript, PlutusV1Script, PlutusV2Script]
-) -> ScriptHash:
+class PlutusV1Script(bytes):
+    pass
+
+
+class PlutusV2Script(bytes):
+    pass
+
+
+ScriptType = Union[bytes, NativeScript, PlutusV1Script, PlutusV2Script]
+"""Script type. A Union type that contains all valid script types."""
+
+
+def script_hash(script: ScriptType) -> ScriptHash:
     """Calculates the hash of a script, which could be either native script or plutus script.
 
     Args:
-        script (Union[bytes, NativeScript, PlutusV1Script, PlutusV2Script]): A script.
+        script (ScriptType): A script.
 
     Returns:
         ScriptHash: blake2b hash of the script.
@@ -752,11 +764,3 @@ def script_hash(
         )
     else:
         raise TypeError(f"Unexpected script type: {type(script)}")
-
-
-class PlutusV1Script(bytes):
-    pass
-
-
-class PlutusV2Script(bytes):
-    pass

pycardano/serialization.py

@@ -33,12 +33,13 @@
     "DictCBORSerializable",
     "RawCBOR",
     "list_hook",
+    "limit_primitive_type",
 ]
 
 
 class IndefiniteList(UserList):
-    def __init__(self, list: [Primitive]):  # type: ignore
-        super().__init__(list)
+    def __init__(self, li: Primitive):  # type: ignore
+        super().__init__(li)  # type: ignore
 
 
 @dataclass

pycardano/transaction.py

@@ -284,7 +284,8 @@ def __post_init__(self):
     def from_primitive(cls: Type[_Script], values: List[Primitive]) -> _Script:
         if values[0] == 0:
             return cls(NativeScript.from_primitive(values[1]))
-        elif values[0] == 1:
+        assert isinstance(values[1], bytes)
+        if values[0] == 1:
             return cls(PlutusV1Script(values[1]))
         else:
             return cls(PlutusV2Script(values[1]))
@@ -315,8 +316,10 @@ def from_primitive(
         cls: Type[_DatumOption], values: List[Primitive]
     ) -> _DatumOption:
         if values[0] == 0:
+            assert isinstance(values[1], bytes)
             return _DatumOption(DatumHash(values[1]))
         else:
+            assert isinstance(values[1], CBORTag)
             v = cbor2.loads(values[1].value)
             if isinstance(v, CBORTag):
                 return _DatumOption(RawPlutusData.from_primitive(v))
@@ -334,6 +337,7 @@ def to_primitive(self) -> Primitive:
 
     @classmethod
     def from_primitive(cls: Type[_ScriptRef], value: Primitive) -> _ScriptRef:
+        assert isinstance(value, CBORTag)
         return cls(_Script.from_primitive(cbor2.loads(value.value)))
 
 
@@ -343,9 +347,13 @@ class _TransactionOutputPostAlonzo(MapCBORSerializable):
 
     amount: Union[int, Value] = field(metadata={"key": 1})
 
-    datum: _DatumOption = field(default=None, metadata={"key": 2, "optional": True})
+    datum: Optional[_DatumOption] = field(
+        default=None, metadata={"key": 2, "optional": True}
+    )
 
-    script_ref: _ScriptRef = field(default=None, metadata={"key": 3, "optional": True})
+    script_ref: Optional[_ScriptRef] = field(
+        default=None, metadata={"key": 3, "optional": True}
+    )
 
     @property
     def script(self) -> Optional[Union[NativeScript, PlutusV1Script, PlutusV2Script]]:
@@ -361,15 +369,15 @@ class _TransactionOutputLegacy(ArrayCBORSerializable):
 
     amount: Union[int, Value]
 
-    datum_hash: DatumHash = field(default=None, metadata={"optional": True})
+    datum_hash: Optional[DatumHash] = field(default=None, metadata={"optional": True})
 
 
 @dataclass(repr=False)
 class TransactionOutput(CBORSerializable):
 
     address: Address
 
-    amount: Union[int, Value]
+    amount: Union[Value]
 
     datum_hash: Optional[DatumHash] = None
 
@@ -496,30 +504,36 @@ class TransactionBody(MapCBORSerializable):
 
     fee: int = field(default=0, metadata={"key": 2})
 
-    ttl: int = field(default=None, metadata={"key": 3, "optional": True})
+    ttl: Optional[int] = field(default=None, metadata={"key": 3, "optional": True})
 
-    certificates: List[Certificate] = field(
+    certificates: Optional[List[Certificate]] = field(
         default=None, metadata={"key": 4, "optional": True}
     )
 
-    withdraws: Withdrawals = field(default=None, metadata={"key": 5, "optional": True})
+    withdraws: Optional[Withdrawals] = field(
+        default=None, metadata={"key": 5, "optional": True}
+    )
 
     # TODO: Add proposal update support
     update: Any = field(default=None, metadata={"key": 6, "optional": True})
 
-    auxiliary_data_hash: AuxiliaryDataHash = field(
+    auxiliary_data_hash: Optional[AuxiliaryDataHash] = field(
         default=None, metadata={"key": 7, "optional": True}
     )
 
-    validity_start: int = field(default=None, metadata={"key": 8, "optional": True})
+    validity_start: Optional[int] = field(
+        default=None, metadata={"key": 8, "optional": True}
+    )
 
-    mint: MultiAsset = field(default=None, metadata={"key": 9, "optional": True})
+    mint: Optional[MultiAsset] = field(
+        default=None, metadata={"key": 9, "optional": True}
+    )
 
-    script_data_hash: ScriptDataHash = field(
+    script_data_hash: Optional[ScriptDataHash] = field(
         default=None, metadata={"key": 11, "optional": True}
     )
 
-    collateral: List[TransactionInput] = field(
+    collateral: Optional[List[TransactionInput]] = field(
         default=None,
         metadata={
             "key": 13,
@@ -528,7 +542,7 @@ class TransactionBody(MapCBORSerializable):
         },
     )
 
-    required_signers: List[VerificationKeyHash] = field(
+    required_signers: Optional[List[VerificationKeyHash]] = field(
         default=None,
         metadata={
             "key": 14,
@@ -537,15 +551,19 @@ class TransactionBody(MapCBORSerializable):
         },
     )
 
-    network_id: Network = field(default=None, metadata={"key": 15, "optional": True})
+    network_id: Optional[Network] = field(
+        default=None, metadata={"key": 15, "optional": True}
+    )
 
-    collateral_return: TransactionOutput = field(
+    collateral_return: Optional[TransactionOutput] = field(
         default=None, metadata={"key": 16, "optional": True}
     )
 
-    total_collateral: int = field(default=None, metadata={"key": 17, "optional": True})
+    total_collateral: Optional[int] = field(
+        default=None, metadata={"key": 17, "optional": True}
+    )
 
-    reference_inputs: List[TransactionInput] = field(
+    reference_inputs: Optional[List[TransactionInput]] = field(
         default=None,
         metadata={
             "key": 18,
@@ -555,9 +573,9 @@ class TransactionBody(MapCBORSerializable):
     )
 
     def hash(self) -> bytes:
-        return blake2b(
-            self.to_cbor(encoding="bytes"), TRANSACTION_HASH_SIZE, encoder=RawEncoder
-        )
+        h = self.to_cbor(encoding="bytes")
+        assert isinstance(h, bytes)
+        return blake2b(h, TRANSACTION_HASH_SIZE, encoder=RawEncoder)
 
     @property
     def id(self) -> TransactionId:
@@ -572,7 +590,7 @@ class Transaction(ArrayCBORSerializable):
 
     valid: bool = True
 
-    auxiliary_data: Union[AuxiliaryData, type(None)] = None
+    auxiliary_data: Optional[AuxiliaryData] = None
 
     @property
     def id(self) -> TransactionId: