charli3_dendrite 1.4.4.dev0__tar.gz → 1.4.5.dev0__tar.gz

{charli3_dendrite-1.4.4.dev0 → charli3_dendrite-1.4.5.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: charli3_dendrite
-Version: 1.4.4.dev0
+Version: 1.4.5.dev0
 Summary: 
 License-File: LICENSE
 Author: Elder Millenial

{charli3_dendrite-1.4.4.dev0 → charli3_dendrite-1.4.5.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "charli3_dendrite"
-version = "1.4.4-dev0"
+version = "1.4.5-dev0"
 description = ""
 authors = ["Elder Millenial <eldermillenial@protonmail.com>"]
 readme = "README.md"
@@ -49,7 +49,7 @@ module = ["pycardano", "pycardano.*", "dotenv", "nox"]
 ignore_missing_imports = true
 
 [tool.bumpversion]
-current_version = "1.4.4-dev0"
+current_version = "1.4.5-dev0"
 parse = """(?x)
     (?P<major>\\d+)\\.
     (?P<minor>\\d+)\\.

{charli3_dendrite-1.4.4.dev0 → charli3_dendrite-1.4.5.dev0}/src/charli3_dendrite/__init__.py

@@ -23,6 +23,14 @@ from charli3_dendrite.dexs.amm.wingriders import WingRidersCPPState
 from charli3_dendrite.dexs.amm.wingriders import WingRidersSSPState
 from charli3_dendrite.dexs.amm.wingriders import WingRidersV2CPPState
 from charli3_dendrite.dexs.amm.wingriders import WingRidersV2SSPState
+from charli3_dendrite.dexs.ob.chadswap import ChadSwapOrderBook
+from charli3_dendrite.dexs.ob.chadswap import ChadSwapOrderState
+from charli3_dendrite.dexs.ob.djed import DjedOrderBook
+from charli3_dendrite.dexs.ob.djed import ShenOrderBook
 from charli3_dendrite.dexs.ob.geniusyield import GeniusYieldOrderBook
 from charli3_dendrite.dexs.ob.geniusyield import GeniusYieldOrderState
+from charli3_dendrite.dexs.ob.saturnswap import SaturnSwapOrderBook
+from charli3_dendrite.dexs.ob.saturnswap import SaturnSwapOrderState
 from charli3_dendrite.utility import Assets
+
+# from charli3_dendrite.dexs.ob.axo import AxoOBMarketState  # noqa: ERA001

{charli3_dendrite-1.4.4.dev0 → charli3_dendrite-1.4.5.dev0}/src/charli3_dendrite/dataclasses/datums.py

@@ -8,6 +8,7 @@ from typing import Union
 from pycardano import Address  # type: ignore
 from pycardano import DatumHash
 from pycardano import PlutusData
+from pycardano import ScriptHash
 from pycardano import VerificationKeyHash
 
 from charli3_dendrite.dataclasses.models import Assets
@@ -68,24 +69,40 @@ class PlutusFullAddress(PlutusData):
             raise ValueError(error_msg)
         stake: _PlutusConstrWrapper | PlutusNone = PlutusNone()
         if address.staking_part is not None:
-            stake = _PlutusConstrWrapper(
-                _PlutusConstrWrapper(
-                    PlutusPartAddress(bytes.fromhex(str(address.staking_part))),
-                ),
+            if isinstance(address.staking_part, ScriptHash):
+                stake_part = PlutusScriptPartAddress(
+                    bytes.fromhex(str(address.staking_part)),
+                )
+            else:
+                stake_part = PlutusPartAddress(bytes.fromhex(str(address.staking_part)))
+            stake = _PlutusConstrWrapper(_PlutusConstrWrapper(stake_part))
+
+        if isinstance(address.payment_part, ScriptHash):
+            payment_part = PlutusScriptPartAddress(
+                bytes.fromhex(str(address.payment_part)),
             )
+        else:
+            payment_part = PlutusPartAddress(bytes.fromhex(str(address.payment_part)))
 
         return PlutusFullAddress(
-            PlutusPartAddress(bytes.fromhex(str(address.payment_part))),
+            payment_part,
             stake=stake,
         )
 
     def to_address(self) -> Address:
         """Convert back to an address."""
-        payment_part = VerificationKeyHash(self.payment.address[:28])
+        if isinstance(self.payment, PlutusScriptPartAddress):
+            payment_part = ScriptHash(self.payment.address[:28])
+        else:
+            payment_part = VerificationKeyHash(self.payment.address[:28])
         if isinstance(self.stake, PlutusNone) or self.stake is None:
             stake_part = None
         else:
-            stake_part = VerificationKeyHash(self.stake.wrapped.wrapped.address[:28])
+            stake_cred = self.stake.wrapped.wrapped
+            if isinstance(stake_cred, PlutusScriptPartAddress):
+                stake_part = ScriptHash(stake_cred.address[:28])
+            else:
+                stake_part = VerificationKeyHash(stake_cred.address[:28])
         return Address(payment_part=payment_part, staking_part=stake_part)