charli3_dendrite 1.4.5.dev0__tar.gz → 1.4.6.dev0__tar.gz

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

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "charli3_dendrite"
-version = "1.4.5-dev0"
+version = "1.4.6-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.5-dev0"
+current_version = "1.4.6-dev0"
 parse = """(?x)
     (?P<major>\\d+)\\.
     (?P<minor>\\d+)\\.

{charli3_dendrite-1.4.5.dev0 → charli3_dendrite-1.4.6.dev0}/src/charli3_dendrite/dexs/amm/minswap.py

@@ -618,6 +618,41 @@ class MinswapV2OrderDatum(OrderDatum):
                 return Assets({"asset_b": self.step.minimum_receive})
             else:
                 return Assets({"asset_a": self.step.minimum_receive})
+        elif isinstance(self.step, StopLossV2):
+            if isinstance(self.step.a_to_b_direction, BoolTrue):
+                return Assets({"asset_b": self.step.stop_loss_receive})
+            else:
+                return Assets({"asset_a": self.step.stop_loss_receive})
+        elif isinstance(self.step, OCOV2):
+            # OCO carries a take-profit (minimum_receive) and a stop-loss
+            # (stop_loss_receive); report the take-profit limit as the requested
+            # amount, mirroring the minimum_receive used for SwapExactInV2.
+            if isinstance(self.step.a_to_b_direction, BoolTrue):
+                return Assets({"asset_b": self.step.minimum_receive})
+            else:
+                return Assets({"asset_a": self.step.minimum_receive})
+        elif isinstance(self.step, ZapOutV2):
+            if isinstance(self.step.a_to_b_direction, BoolTrue):
+                return Assets({"asset_b": self.step.minimum_receive})
+            else:
+                return Assets({"asset_a": self.step.minimum_receive})
+        elif isinstance(self.step, PartialSwapV2):
+            # PartialSwap has no minimum_receive field; io_ratio is the limit
+            # price, so the requested output is total_swap_amount scaled by
+            # io_ratio_numerator / io_ratio_denominator.
+            requested = (
+                self.step.total_swap_amount
+                * self.step.io_ratio_numerator
+                // self.step.io_ratio_denominator
+            )
+            if isinstance(self.step.a_to_b_direction, BoolTrue):
+                return Assets({"asset_b": requested})
+            else:
+                return Assets({"asset_a": requested})
+        elif isinstance(self.step, WithdrawImbalanceV2):
+            # Only asset_a carries a guaranteed minimum (minimum_asset_a); the
+            # asset_b amount is governed by the withdrawal ratio, not a floor.
+            return Assets({"asset_a": self.step.minimum_asset_a})
         else:
             return Assets({})
 

{charli3_dendrite-1.4.5.dev0 → charli3_dendrite-1.4.6.dev0}/src/charli3_dendrite/dexs/amm/vyfi.py

@@ -324,7 +324,26 @@ class VyFiCPPState(AbstractConstantProductPoolState):
 
     @staticmethod
     def _encode_asset(policy_id: str, asset_name: str) -> str:
-        """Encode an asset by combining policy ID and hex-encoded asset name."""
+        r"""Encode an asset by combining policy ID and the on-chain asset name.
+
+        VyFi's API returns ``token_name`` in two forms: a human-readable string
+        (e.g. ``"PUDGY"``), or the on-chain asset name *already hex-encoded* and
+        marked with a ``"0x"`` prefix, optionally preceded by a NUL byte
+        (e.g. ``"\x000x55534441"`` for ``"USDA"``). For the latter the hex is
+        the real on-chain asset name and must be used verbatim -- re-encoding it
+        as UTF-8 double-encodes the name and corrupts the unit, frequently
+        pushing it past the 32-byte asset-name limit (and mangling names with
+        non-UTF-8 bytes, e.g. ``"\x000xf6..."``).
+        """
+        marked = asset_name.lstrip("\x00")
+        if marked.startswith("0x"):
+            hex_name = marked[2:]
+            try:
+                bytes.fromhex(hex_name)
+            except ValueError:
+                pass
+            else:
+                return policy_id + hex_name.lower()
         encoded_name = asset_name.encode("utf-8").hex()
         return policy_id + encoded_name