Added support for ScriptHash and AssetName

Author: theeldermillenial

pycardano/cip/cip14.py

@@ -3,9 +3,13 @@
 from nacl.encoding import RawEncoder
 from nacl.hash import blake2b
 from pycardano.crypto.bech32 import encode
+from pycardano.hash import ScriptHash
+from pycardano.transaction import AssetName
 
 
-def encode_asset(policy_id: Union[bytes, str], asset_name: Union[bytes, str]) -> str:
+def encode_asset(
+    policy_id: Union[ScriptHash, bytes, str], asset_name: Union[AssetName, bytes, str]
+) -> str:
     """Implementation of CIP14 asset fingerprinting
 
     This function encodes the asset policy and name into an asset fingerprint, which is
@@ -15,14 +19,18 @@ def encode_asset(policy_id: Union[bytes, str], asset_name: Union[bytes, str]) ->
     https://developers.cardano.org/docs/governance/cardano-improvement-proposals/cip-0014/
 
     Args:
-        policy_id: The asset policy as `bytes` or a hex `str`
-        asset_name: The asset name as `bytes` or a hex `str`
+        policy_id: The asset policy as `ScriptHash`, `bytes`, or a hex `str`
+        asset_name: The asset name as `AssetName`, `bytes`, or a hex `str`
     """
     if isinstance(policy_id, str):
         policy_id = bytes.fromhex(policy_id)
+    elif isinstance(policy_id, ScriptHash):
+        policy_id = policy_id.payload
 
     if isinstance(asset_name, str):
         asset_name = bytes.fromhex(asset_name)
+    elif isinstance(asset_name, AssetName):
+        asset_name = asset_name.payload
 
     asset_hash = blake2b(
         policy_id + asset_name,

test/pycardano/test_cip14.py

@@ -1,8 +1,13 @@
 import pytest
 
 from pycardano.cip.cip14 import encode_asset
+from pycardano.hash import ScriptHash
+from pycardano.transaction import AssetName
 
 
+@pytest.mark.parametrize(
+    "input_types", [(str, str), (bytes, bytes), (ScriptHash, AssetName)]
+)
 @pytest.mark.parametrize(
     "asset",
     [
@@ -48,7 +53,18 @@
         },
     ],
 )
-def test_encode_asset(asset):
+def test_encode_asset(asset, input_types):
+    if isinstance(input_types[0], bytes):
+        policy_id = bytes.fromhex(asset["policy_id"])
+        asset_name = bytes.fromhex(asset["asset_name"])
+    elif isinstance(input_types[0], str):
+        policy_id = asset["policy_id"]
+        asset_name = asset["asset_name"]
+
+    if isinstance(input_types[0], ScriptHash):
+        policy_id = ScriptHash(policy_id)
+        asset_name = AssetName(asset_name)
+
     fingerprint = encode_asset(
         policy_id=asset["policy_id"], asset_name=asset["asset_name"]
     )