charli3_dendrite 1.3.3.dev0__tar.gz → 1.3.4.dev1__tar.gz

{charli3_dendrite-1.3.3.dev0 → charli3_dendrite-1.3.4.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: charli3_dendrite
-Version: 1.3.3.dev0
+Version: 1.3.4.dev1
 Summary: 
 Author: Elder Millenial
 Author-email: eldermillenial@protonmail.com

{charli3_dendrite-1.3.3.dev0 → charli3_dendrite-1.3.4.dev1}/pyproject.toml

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

{charli3_dendrite-1.3.3.dev0 → charli3_dendrite-1.3.4.dev1}/src/charli3_dendrite/dataclasses/datums.py

@@ -1,4 +1,5 @@
 """Dataclasses for the different datums used in the Charli3 Dendrite project."""
+
 from abc import ABC
 from abc import abstractmethod
 from dataclasses import dataclass

{charli3_dendrite-1.3.3.dev0 → charli3_dendrite-1.3.4.dev1}/src/charli3_dendrite/dataclasses/models.py

@@ -151,12 +151,16 @@ class ScriptReference(DendriteBaseModel):
                 output=TransactionOutput(
                     address=Address.decode(self.address),
                     amount=Value(coin=self.assets["lovelace"]),
-                    script=None
-                    if self.script is None
-                    else PlutusV2Script(bytes.fromhex(self.script)),
-                    datum=None
-                    if self.datum_cbor is None
-                    else RawPlutusData.from_cbor(self.datum_cbor),
+                    script=(
+                        None
+                        if self.script is None
+                        else PlutusV2Script(bytes.fromhex(self.script))
+                    ),
+                    datum=(
+                        None
+                        if self.datum_cbor is None
+                        else RawPlutusData.from_cbor(self.datum_cbor)
+                    ),
                 ),
             )
         else:

{charli3_dendrite-1.3.3.dev0 → charli3_dendrite-1.3.4.dev1}/src/charli3_dendrite/dexs/amm/amm_types.py

@@ -1,4 +1,5 @@
 """Module providing types and state classes for AMM pools."""
+
 import math
 from typing import ClassVar
 

{charli3_dendrite-1.3.3.dev0 → charli3_dendrite-1.3.4.dev1}/src/charli3_dendrite/dexs/amm/spectrum.py

@@ -391,9 +391,11 @@ class SpectrumCPPState(AbstractConstantProductPoolState):
             raise ValueError("pool_nft is required but is None")
 
         volume_fee = int(
-            self.volume_fee[0]
-            if isinstance(self.volume_fee, list)
-            else self.volume_fee or 0,
+            (
+                self.volume_fee[0]
+                if isinstance(self.volume_fee, list)
+                else self.volume_fee or 0
+            ),
         )
         return SpectrumOrderDatum.create_datum(
             address_source=address_source,

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

@@ -356,7 +356,12 @@ class SplashBaseState(AbstractPairState):
         if "pool_nft" in values and "lp_tokens" in values:
             order_class = cls.pool_datum_class()
             try:
-                datum: SplashSSPPoolDatum | SplashCPPPoolDatum = order_class.from_cbor(
+                datum: (
+                    SplashSSPPoolDatum
+                    | SplashCPPPoolDatum
+                    | SplashCPPRoyaltyPoolDatum
+                    | SplashCPPBidirPoolDatum
+                ) = order_class.from_cbor(
                     values["datum_cbor"],
                 )
             except DeserializeException as err:
@@ -368,6 +373,10 @@ class SplashBaseState(AbstractPairState):
                 raise NotAPoolError("Invalid LP tokens")
 
             values["assets"] = Assets.model_validate(values["assets"])
+            if len(values["assets"]) == 3:  # noqa: PLR2004
+                lovelace = values["assets"].root.pop("lovelace")
+                values["assets"].root["lovelace"] = lovelace
+
             return True
 
         return False
@@ -450,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:
@@ -534,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(
@@ -592,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:
@@ -699,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)),
@@ -781,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
@@ -832,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,
@@ -878,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(

{charli3_dendrite-1.3.3.dev0 → charli3_dendrite-1.3.4.dev1}/src/charli3_dendrite/dexs/amm/sundae.py

@@ -1,4 +1,5 @@
 """SundaeSwap DEX module."""
+
 import time
 from dataclasses import dataclass
 from functools import lru_cache

{charli3_dendrite-1.3.3.dev0 → charli3_dendrite-1.3.4.dev1}/src/charli3_dendrite/utility.py

@@ -1,4 +1,5 @@
 """Utility functions for handling asset information."""
+
 import json
 from datetime import datetime
 from datetime import timedelta