charli3_dendrite 1.5.7.dev0__tar.gz → 1.5.8.dev0__tar.gz

{charli3_dendrite-1.5.7.dev0 → charli3_dendrite-1.5.8.dev0}/PKG-INFO

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

{charli3_dendrite-1.5.7.dev0 → charli3_dendrite-1.5.8.dev0}/pyproject.toml

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

{charli3_dendrite-1.5.7.dev0 → charli3_dendrite-1.5.8.dev0}/src/charli3_dendrite/dexs/ob/djed.py

@@ -316,7 +316,7 @@ class DjedOrderDatum(OrderDatum):
 
     def address_source(self) -> str | None:
         """Source address (required by OrderDatum interface)."""
-        return self.owner_address.to_address().encode("bech32")
+        return self.owner_address.to_address().encode()
 
     def requested_amount(self) -> Assets:
         """Return the requested amount for this order."""
@@ -327,14 +327,14 @@ class DjedOrderDatum(OrderDatum):
             # Invert oracle rate (Djed/ADA -> ADA/Djed) and multiply
             ada_amount = (
                 self.action.djed_amount
-                * self._oracle_rate.denominator
-                // self._oracle_rate.numerator
+                * self.oracle_rate.denominator
+                // self.oracle_rate.numerator
             )
             return Assets(lovelace=ada_amount)
         if isinstance(self.action, ShenMintAction):
             return Assets(**{SHEN_TOKEN: self.action.shen_amount})
         # ShenBurnAction: exact ADA requires pool state which isn't in datum
-        return Assets(lovelace=self.action.shen_amount)
+        return Assets(**{SHEN_TOKEN: self.action.shen_amount})
 
     def order_type(self) -> OrderType | None:
         """Order type classification (required by OrderDatum interface)."""

{charli3_dendrite-1.5.7.dev0 → charli3_dendrite-1.5.8.dev0}/src/charli3_dendrite/dexs/ob/geniusyield.py

@@ -118,20 +118,15 @@ class GeniusYieldOrder(OrderDatum):
         return self.offered_asset.assets + self.asked_asset.assets
 
     def address_source(self) -> str | None:
-        return None
+        return self.owner_address.to_address().encode()
 
     def requested_amount(self) -> Assets:
-        asset = self.offered_asset.assets
-        return asset
+        unit = self.asked_asset.assets.unit()
+        amount = self.offered_amount * self.price.numerator // self.price.denominator
+        return Assets(**{unit: amount})
 
     def order_type(self) -> OrderType | None:
-        order_type = None
-        if self.offered_original_amount == self.offered_amount:
-            order_type = OrderType.deposit
-        else:
-            order_type = OrderType.swap
-
-        return order_type
+        return OrderType.swap
 
 
 @dataclass