From 82540f7938b7f195cf7f5d3b8373d9640735dba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=BCndler?= Date: Thu, 8 Jun 2023 11:37:34 +0900 Subject: [PATCH 1/4] Fix kupo plutusv2 script from kupo --- pycardano/backend/ogmios.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pycardano/backend/ogmios.py b/pycardano/backend/ogmios.py index 29aa4c41..994daa50 100644 --- a/pycardano/backend/ogmios.py +++ b/pycardano/backend/ogmios.py @@ -297,11 +297,11 @@ def _utxos_kupo(self, address: str) -> List[UTxO]: script = requests.get(kupo_script_url).json() if script["language"] == "plutus:v2": script = PlutusV2Script( - cbor2.loads(bytes.fromhex(script["script"])) + bytes.fromhex(script["script"]) ) elif script["language"] == "plutus:v1": script = PlutusV1Script( - cbor2.loads(bytes.fromhex(script["script"])) + bytes.fromhex(script["script"]) ) else: raise ValueError("Unknown plutus script type") From 2a81545ab3104557e8bb4ab6c38e10c73a6167b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=BCndler?= Date: Thu, 8 Jun 2023 11:53:51 +0900 Subject: [PATCH 2/4] Formatting --- pycardano/backend/ogmios.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pycardano/backend/ogmios.py b/pycardano/backend/ogmios.py index dfc567cf..8b35c53c 100644 --- a/pycardano/backend/ogmios.py +++ b/pycardano/backend/ogmios.py @@ -343,13 +343,9 @@ def _utxos_kupo(self, address: str) -> List[UTxO]: kupo_script_url = self._kupo_url + "/scripts/" + script_hash script = requests.get(kupo_script_url).json() if script["language"] == "plutus:v2": - script = PlutusV2Script( - bytes.fromhex(script["script"]) - ) + script = PlutusV2Script(bytes.fromhex(script["script"])) elif script["language"] == "plutus:v1": - script = PlutusV1Script( - bytes.fromhex(script["script"]) - ) + script = PlutusV1Script(bytes.fromhex(script["script"])) else: raise ValueError("Unknown plutus script type") From f6adcf999a1f85f8d7d65e079cf92d66298770cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=BCndler?= Date: Fri, 9 Jun 2023 18:42:17 +0900 Subject: [PATCH 3/4] Apply try_fix_hash procedure if kupo is available --- pycardano/backend/ogmios.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pycardano/backend/ogmios.py b/pycardano/backend/ogmios.py index 8b35c53c..cf5809cf 100644 --- a/pycardano/backend/ogmios.py +++ b/pycardano/backend/ogmios.py @@ -344,8 +344,10 @@ def _utxos_kupo(self, address: str) -> List[UTxO]: script = requests.get(kupo_script_url).json() if script["language"] == "plutus:v2": script = PlutusV2Script(bytes.fromhex(script["script"])) + script = _try_fix_script(script_hash, script) elif script["language"] == "plutus:v1": script = PlutusV1Script(bytes.fromhex(script["script"])) + script = _try_fix_script(script_hash, script) else: raise ValueError("Unknown plutus script type") From 9bfaf13b07410bba544bf5435580272e6d4af368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=BCndler?= Date: Sun, 11 Jun 2023 10:18:46 +0900 Subject: [PATCH 4/4] Fix import --- pycardano/backend/ogmios.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pycardano/backend/ogmios.py b/pycardano/backend/ogmios.py index cf5809cf..c2b10ca8 100644 --- a/pycardano/backend/ogmios.py +++ b/pycardano/backend/ogmios.py @@ -16,6 +16,7 @@ GenesisParameters, ProtocolParameters, ) +from pycardano.backend.blockfrost import _try_fix_script from pycardano.exception import TransactionFailedException from pycardano.hash import DatumHash, ScriptHash from pycardano.network import Network