charli3_dendrite 1.1.3.dev2__tar.gz → 1.1.4.dev0__tar.gz

{charli3_dendrite-1.1.3.dev2 → charli3_dendrite-1.1.4.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: charli3_dendrite
-Version: 1.1.3.dev2
+Version: 1.1.4.dev0
 Summary: 
 Author: Elder Millenial
 Author-email: eldermillenial@protonmail.com

{charli3_dendrite-1.1.3.dev2 → charli3_dendrite-1.1.4.dev0}/pyproject.toml

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

{charli3_dendrite-1.1.3.dev2 → charli3_dendrite-1.1.4.dev0}/src/charli3_dendrite/dexs/amm/cswap.py

@@ -352,14 +352,14 @@ class CSwapCPPState(AbstractConstantProductPoolState):
         if len(assets) == 2:
             assets.root["lovelace"] -= 2000000  # 2 ADA maintenance
 
-        # Parse datum if available
+        # Parse datum if available, add in 15 basis points for platform fee
         if "datum_cbor" in values:
             try:
                 datum = CSwapPoolDatum.from_cbor(values["datum_cbor"])
-                values["fee"] = datum.pool_fee
+                values["fee"] = datum.pool_fee + 15
             except Exception:
                 # If datum parsing fails, use default fee
-                values["fee"] = 85
+                values["fee"] = 85 + 15
 
         return values
 

{charli3_dendrite-1.1.3.dev2 → charli3_dendrite-1.1.4.dev0}/src/charli3_dendrite/dexs/amm/minswap.py

@@ -425,12 +425,22 @@ class WithdrawImbalanceV2(PlutusData):
     killable: Union[BoolTrue, BoolFalse]
 
 
+@dataclass
+class Route(PlutusData):
+    """Route."""
+
+    CONSTR_ID = 0
+
+    pool: AssetClass
+    a_to_b_direction: Union[BoolTrue, BoolFalse]
+
+
 @dataclass
 class SwapMultiRoutingV2(PlutusData):
     """SwapMultiRoutingV2 order datum."""
 
     CONSTR_ID = 9
-    routings: List[Datum]
+    routings: List[Route]
     swap_amount_option: Union[SAOSpecificAmount, SAOAll]
     minimum_receive: int
 
@@ -1248,6 +1258,7 @@ class MinswapiUSDUSDMStableState(MinswapDJEDiUSDStableState):
 
 
 class MinswapUSDAUSDMStableState(MinswapDJEDiUSDStableState):
+    fee: float = 5
     _stake_address: ClassVar[Address] = [
         Address.from_primitive(
             "addr1w8cafpjmeer4j8t8aseqayhwkf4ezuufue0clvfthxecsacv83rt0",
@@ -1275,6 +1286,7 @@ class MinswapUSDAUSDMStableState(MinswapDJEDiUSDStableState):
 
 
 class MinswapiUSDUSDCStableState(MinswapDJEDiUSDStableState):
+    fee: float = 10
     asset_mulitipliers: ClassVar[list[int]] = [1, 100]
 
     _stake_address: ClassVar[Address] = [