charli3_dendrite 1.5.11.dev1__tar.gz → 1.5.12.dev0__tar.gz

{charli3_dendrite-1.5.11.dev1 → charli3_dendrite-1.5.12.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: charli3_dendrite
-Version: 1.5.11.dev1
+Version: 1.5.12.dev0
 Summary: 
 License-File: LICENSE
 Author: Elder Millenial
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Requires-Dist: blockfrost-python (>=0.6.0,<0.7.0)
 Requires-Dist: bump-my-version (>=1.1.4,<2.0.0)
 Requires-Dist: psycopg[binary,pool] (>=3.1.13,<4.0.0)

{charli3_dendrite-1.5.11.dev1 → charli3_dendrite-1.5.12.dev0}/pyproject.toml

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

{charli3_dendrite-1.5.11.dev1 → charli3_dendrite-1.5.12.dev0}/src/charli3_dendrite/dexs/amm/vyfi.py

@@ -458,5 +458,32 @@ class VyFiCPPState(AbstractConstantProductPoolState):
             if assets["lovelace"] == 0:
                 assets.pop("lovelace")
 
-        assets.root[assets.unit(0)] -= datum.token_a_fees
-        assets.root[assets.unit(1)] -= datum.token_b_fees
+        # Subtract each accumulated fee from the reserve of VyFi's own
+        # a_asset / b_asset (from the pool definition), not the canonical sort
+        # position: VyFi's a/b order need not match the sorted asset order, and
+        # a mismatch lands the fee on the wrong reserve (underflowing negative).
+        pool_def = cls.pools()[values["pool_nft"].unit()]
+        unit_a = (
+            cls._encode_asset(
+                pool_def.json_.a_asset.currency_symbol,
+                pool_def.json_.a_asset.token_name,
+            )
+            or "lovelace"
+        )
+        unit_b = (
+            cls._encode_asset(
+                pool_def.json_.b_asset.currency_symbol,
+                pool_def.json_.b_asset.token_name,
+            )
+            or "lovelace"
+        )
+        fees = {unit_a: datum.token_a_fees, unit_b: datum.token_b_fees}
+        for unit in list(assets.root):
+            assets.root[unit] -= fees.get(unit, 0)
+        for unit, qty in assets.root.items():
+            if qty < 0:
+                msg = (
+                    f"{cls.__name__}: negative reserve after fee "
+                    f"subtraction ({unit}={qty})"
+                )
+                raise NotAPoolError(msg)