charli3_dendrite 0.2.0.dev117__tar.gz → 1.0.0.dev1__tar.gz

{charli3_dendrite-0.2.0.dev117 → charli3_dendrite-1.0.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: charli3_dendrite
-Version: 0.2.0.dev117
+Version: 1.0.0.dev1
 Summary: 
 Author: Elder Millenial
 Author-email: eldermillenial@protonmail.com

{charli3_dendrite-0.2.0.dev117 → charli3_dendrite-1.0.0.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "charli3_dendrite"
-version = "0.2.0-dev117"
+version = "1.0.0-dev1"
 description = ""
 authors = ["Elder Millenial <eldermillenial@protonmail.com>"]
 readme = "README.md"

{charli3_dendrite-0.2.0.dev117 → charli3_dendrite-1.0.0.dev1}/src/charli3_dendrite/dexs/amm/minswap.py

@@ -252,17 +252,20 @@ class MinswapOrderDatum(OrderDatum):
         elif isinstance(self.step, ZapIn):
             return Assets({self.step.desired_coin.assets.unit(): self.step.minimum_lp})
 
-    def order_type(self) -> OrderType:
+    def order_type(self) -> OrderType | None:
         """The order type."""
+        order_type = None
         if isinstance(self.step, (SwapExactIn, SwapExactOut, StableSwapExactIn)):
-            return OrderType.swap
+            order_type = OrderType.swap
         elif isinstance(self.step, (Deposit, StableSwapDeposit, ZapIn)):
-            return OrderType.deposit
+            order_type = OrderType.deposit
         elif isinstance(
             self.step,
             (Withdraw, StableSwapWithdraw, StableSwapWithdrawOneCoin),
         ):
-            return OrderType.withdraw
+            order_type = OrderType.withdraw
+
+        return order_type
 
 
 @dataclass
@@ -598,8 +601,9 @@ class MinswapV2OrderDatum(OrderDatum):
         else:
             return Assets({})
 
-    def order_type(self) -> OrderType:
+    def order_type(self) -> OrderType | None:
         """The order type."""
+        order_type = None
         if isinstance(
             self.step,
             (
@@ -611,11 +615,13 @@ class MinswapV2OrderDatum(OrderDatum):
                 SwapMultiRoutingV2,
             ),
         ):
-            return OrderType.swap
+            order_type = OrderType.swap
         elif isinstance(self.step, (DepositV2, DonationV2)):
-            return OrderType.deposit
+            order_type = OrderType.deposit
         elif isinstance(self.step, (WithdrawV2, ZapOutV2, WithdrawImbalanceV2)):
-            return OrderType.withdraw
+            order_type = OrderType.withdraw
+
+        return order_type
 
 
 @dataclass

{charli3_dendrite-0.2.0.dev117 → charli3_dendrite-1.0.0.dev1}/src/charli3_dendrite/dexs/amm/sundae.py

@@ -218,14 +218,17 @@ class SundaeOrderDatum(OrderDatum):
         else:
             return Assets({})
 
-    def order_type(self) -> OrderType:
+    def order_type(self) -> OrderType | None:
         """Get the order type."""
+        order_type = None
         if isinstance(self.swap, SwapConfig):
-            return OrderType.swap
+            order_type = OrderType.swap
         elif isinstance(self.swap, DepositConfig):
-            return OrderType.deposit
+            order_type = OrderType.deposit
         elif isinstance(self.swap, WithdrawConfig):
-            return OrderType.withdraw
+            order_type = OrderType.withdraw
+
+        return order_type
 
 
 @dataclass
@@ -361,12 +364,15 @@ class SundaeV3OrderDatum(OrderDatum):
             return Assets({})
 
     def order_type(self) -> OrderType:
+        order_type = None
         if isinstance(self.swap, SwapV3Config):
-            return OrderType.swap
+            order_type = OrderType.swap
         elif isinstance(self.swap, DepositV3Config):
-            return OrderType.deposit
+            order_type = OrderType.deposit
         elif isinstance(self.swap, WithdrawV3Config):
-            return OrderType.withdraw
+            order_type = OrderType.withdraw
+
+        return order_type
 
 
 @dataclass

{charli3_dendrite-0.2.0.dev117 → charli3_dendrite-1.0.0.dev1}/src/charli3_dendrite/dexs/amm/vyfi.py

@@ -28,9 +28,9 @@ from charli3_dendrite.utility import Assets
 class VyFiPoolDatum(PoolDatum):
     """TODO: Figure out what each of these numbers mean."""
 
-    a: int
-    b: int
-    c: int
+    token_a_fees: int
+    token_b_fees: int
+    lp_tokens: int
 
     def pool_pair(self) -> Assets | None:
         return None
@@ -167,13 +167,16 @@ class VyFiOrderDatum(OrderDatum):
                 },
             )
 
-    def order_type(self) -> OrderType:
+    def order_type(self) -> OrderType | None:
+        order_type = None
         if isinstance(self.order, (BtoA, AtoB, ZapInA, ZapInB)):
-            return OrderType.swap
+            order_type = OrderType.swap
         elif isinstance(self.order, Deposit):
-            return OrderType.deposit
+            order_type = OrderType.deposit
         elif isinstance(self.order, Withdraw):
-            return OrderType.withdraw
+            order_type = OrderType.withdraw
+
+        return order_type
 
 
 class VyFiTokenDefinition(BaseModel):
@@ -328,3 +331,13 @@ class VyFiCPPState(AbstractConstantProductPoolState):
         values["bar_fee"] = cls.pools[pool_nft.unit()].json_.feesSettings.barFee
 
         return pool_nft
+
+    @classmethod
+    def post_init(cls, values):
+        super().post_init(values)
+
+        assets = values["assets"]
+        datum = VyFiPoolDatum.from_cbor(values["datum_cbor"])
+
+        assets.root[assets.unit(0)] -= datum.token_a_fees
+        assets.root[assets.unit(1)] -= datum.token_b_fees

{charli3_dendrite-0.2.0.dev117 → charli3_dendrite-1.0.0.dev1}/src/charli3_dendrite/dexs/amm/wingriders.py

@@ -228,15 +228,16 @@ class WingRidersOrderDatum(OrderDatum):
         elif isinstance(self.detail, WingRidersMaybeFeeClaimDetail):
             return Assets({})
 
-    def order_type(self) -> OrderType:
+    def order_type(self) -> OrderType | None:
+        order_type = None
         if isinstance(self.detail, WingRidersOrderDetail):
-            return OrderType.swap
+            order_type = OrderType.swap
         elif isinstance(self.detail, WingRidersDepositDetail):
-            return OrderType.deposit
+            order_type = OrderType.deposit
         elif isinstance(self.detail, WingRidersWithdrawDetail):
-            return OrderType.withdraw
-        if isinstance(self.detail, WingRidersMaybeFeeClaimDetail):
-            return OrderType.withdraw
+            order_type = OrderType.withdraw
+
+        return order_type
 
 
 @dataclass

{charli3_dendrite-0.2.0.dev117 → charli3_dendrite-1.0.0.dev1}/src/charli3_dendrite/dexs/ob/geniusyield.py

@@ -120,8 +120,14 @@ class GeniusYieldOrder(OrderDatum):
         asset = self.offered_asset.assets
         return asset
 
-    def order_type(self) -> OrderType:
-        return OrderType.swap
+    def order_type(self) -> OrderType | None:
+        order_type = None
+        if self.offered_original_amount == self.offered_amount:
+            order_type = OrderType.deposit
+        else:
+            order_type = OrderType.swap
+
+        return order_type
 
 
 @dataclass