charli3_dendrite 1.3.4.dev0__tar.gz → 1.3.4.dev2__tar.gz

{charli3_dendrite-1.3.4.dev0 → charli3_dendrite-1.3.4.dev2}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: charli3_dendrite
-Version: 1.3.4.dev0
+Version: 1.3.4.dev2
 Summary: 
+License-File: LICENSE
 Author: Elder Millenial
 Author-email: eldermillenial@protonmail.com
 Requires-Python: >=3.10,<4.0
@@ -10,6 +11,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 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.3.4.dev0 → charli3_dendrite-1.3.4.dev2}/pyproject.toml

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

{charli3_dendrite-1.3.4.dev0 → charli3_dendrite-1.3.4.dev2}/src/charli3_dendrite/dexs/amm/splash.py

@@ -373,7 +373,7 @@ class SplashBaseState(AbstractPairState):
                 raise NotAPoolError("Invalid LP tokens")
 
             values["assets"] = Assets.model_validate(values["assets"])
-            if len(values["assets"]) == 3:
+            if len(values["assets"]) == 3:  # noqa: PLR2004
                 lovelace = values["assets"].root.pop("lovelace")
                 values["assets"].root["lovelace"] = lovelace
 
@@ -459,13 +459,19 @@ class SplashSSPState(SplashBaseState, AbstractCommonStableSwapPoolState):
         values["fee"] = datum.lp_fee_num + datum.protocol_fee_num
 
         assets = values["assets"]
-        assets.root[assets.unit(0)] -= datum.protocol_fee_x
-        assets.root[assets.unit(1)] -= datum.protocol_fee_y
-
-        cls.asset_mulitipliers = [
-            datum.multiplier_x,
-            datum.multiplier_y,
-        ]
+        assets.root[datum.asset_x.assets.unit()] -= datum.protocol_fee_x
+        assets.root[datum.asset_y.assets.unit()] -= datum.protocol_fee_y
+
+        if datum.asset_x.assets.unit() == assets.unit():
+            cls.asset_mulitipliers = [
+                datum.multiplier_x,
+                datum.multiplier_y,
+            ]
+        else:
+            cls.asset_mulitipliers = [
+                datum.multiplier_y,
+                datum.multiplier_x,
+            ]
 
         # Verify pool is active
         # TODO: should be updated to match the validator:
@@ -543,7 +549,6 @@ class SplashSSPState(SplashBaseState, AbstractCommonStableSwapPoolState):
         )
 
         # Create the pool output UTxO
-        # TODO: add protocol and fees
         assets.root[in_assets.unit()] += in_assets.quantity()
         assets.root[out_assets.unit()] -= out_assets.quantity()
         txo = TransactionOutput(
@@ -601,8 +606,8 @@ class SplashCPPState(SplashBaseState, AbstractConstantProductPoolState):
         values["fee"] = 100000 - datum.pool_fee + datum.treasury_fee
 
         assets = values["assets"]
-        assets.root[assets.unit(0)] -= datum.treasury_x
-        assets.root[assets.unit(1)] -= datum.treasury_y
+        assets.root[datum.asset_x.assets.unit()] -= datum.treasury_x
+        assets.root[datum.asset_y.assets.unit()] -= datum.treasury_y
 
         # Verify pool is active
         # TODO: should be updated to match the validator:
@@ -708,8 +713,8 @@ class SplashCPPState(SplashBaseState, AbstractConstantProductPoolState):
             self.pool_datum.to_cbor(),
         )
         assets = self.assets + self.pool_nft + self.lp_tokens
-        assets.root[self.assets.unit()] += pool_datum.treasury_x
-        assets.root[self.assets.unit(1)] += pool_datum.treasury_y
+        assets.root[pool_datum.asset_x.assets.unit()] += pool_datum.treasury_x
+        assets.root[pool_datum.asset_y.assets.unit()] += pool_datum.treasury_y
         input_utxo = UTxO(
             TransactionInput(
                 transaction_id=TransactionId(bytes.fromhex(self.tx_hash)),
@@ -790,14 +795,20 @@ class SplashCPPBidirState(SplashCPPState):
             values["datum_cbor"],
         )
 
-        values["fee"] = [
-            (100000 - datum.pool_fee_x + datum.treasury_fee),
-            (100000 - datum.pool_fee_y + datum.treasury_fee),
-        ]
+        if datum.asset_x.assets.unit() == values["assets"].unit():
+            values["fee"] = [
+                (100000 - datum.pool_fee_x + datum.treasury_fee),
+                (100000 - datum.pool_fee_y + datum.treasury_fee),
+            ]
+        else:
+            values["fee"] = [
+                (100000 - datum.pool_fee_y + datum.treasury_fee),
+                (100000 - datum.pool_fee_x + datum.treasury_fee),
+            ]
 
         assets = values["assets"]
-        assets.root[assets.unit(0)] -= datum.treasury_x
-        assets.root[assets.unit(1)] -= datum.treasury_y
+        assets.root[datum.asset_x.assets.unit()] -= datum.treasury_x
+        assets.root[datum.asset_y.assets.unit()] -= datum.treasury_y
 
         # Verify pool is active
         values["inactive"] = assets.quantity() < LIQUIDITY_THRESHOLD
@@ -841,8 +852,8 @@ class SplashCPPRoyaltyState(SplashCPPState):
         values["fee"] += datum.royalty_fee
 
         assets = values["assets"]
-        assets.root[assets.unit(0)] -= datum.royalty_x
-        assets.root[assets.unit(1)] -= datum.royalty_y
+        assets.root[datum.asset_x.assets.unit()] -= datum.royalty_x
+        assets.root[datum.asset_y.assets.unit()] -= datum.royalty_y
 
     def swap_utxo(
         self,
@@ -887,10 +898,10 @@ class SplashCPPRoyaltyState(SplashCPPState):
             self.pool_datum.to_cbor(),
         )
         assets = self.assets + self.pool_nft + self.lp_tokens
-        assets.root[self.assets.unit()] += (
+        assets.root[pool_datum.asset_x.assets.unit()] += (
             pool_datum.treasury_x + self.pool_datum.royalty_x
         )
-        assets.root[self.assets.unit(1)] += (
+        assets.root[pool_datum.asset_y.assets.unit()] += (
             pool_datum.treasury_y + self.pool_datum.royalty_y
         )
         input_utxo = UTxO(