charli3_dendrite 1.2.5.dev7__tar.gz → 1.2.5.dev8__tar.gz

{charli3_dendrite-1.2.5.dev7 → charli3_dendrite-1.2.5.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: charli3_dendrite
-Version: 1.2.5.dev7
+Version: 1.2.5.dev8
 Summary: 
 Author: Elder Millenial
 Author-email: eldermillenial@protonmail.com

{charli3_dendrite-1.2.5.dev7 → charli3_dendrite-1.2.5.dev8}/pyproject.toml

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

{charli3_dendrite-1.2.5.dev7 → charli3_dendrite-1.2.5.dev8}/src/charli3_dendrite/dexs/amm/vyfi.py

@@ -40,7 +40,7 @@ class VyFiPoolDatum(PoolDatum):
     token_b_fees: int
     lp_tokens: int
 
-    def pool_pair(self) -> Optional[Assets]:
+    def pool_pair(self) -> Optional[Assets]:  # noqa: UP007
         """Return the pool pair assets."""
         return None
 
@@ -114,7 +114,7 @@ class VyFiOrderDatum(OrderDatum):
     """VyFi order datum."""
 
     address: bytes
-    order: Union[AtoB, BtoA, Deposit, LPFlushA, Withdraw, ZapInA, ZapInB]
+    order: Union[AtoB, BtoA, Deposit, LPFlushA, Withdraw, ZapInA, ZapInB]  # noqa: UP007
 
     @classmethod
     def create_datum(
@@ -124,8 +124,8 @@ class VyFiOrderDatum(OrderDatum):
         out_assets: Assets,
         batcher_fee: Assets,  # noqa: ARG003
         deposit: Assets,  # noqa: ARG003
-        address_target: Optional[Address] = None,  # noqa: ARG003
-        datum_target: Optional[PlutusData] = None,  # noqa: ARG003
+        address_target: Optional[Address] = None,  # noqa: ARG003,UP007
+        datum_target: Optional[PlutusData] = None,  # noqa: ARG003,UP007
     ) -> VyFiOrderDatum:
         """Create a new order datum."""
         address_hash = (
@@ -170,7 +170,7 @@ class VyFiOrderDatum(OrderDatum):
             )
         return Assets()
 
-    def order_type(self) -> Optional[OrderType]:
+    def order_type(self) -> Optional[OrderType]:  # noqa: UP007
         """Get the order type."""
         if isinstance(self.order, (BtoA, AtoB, ZapInA, ZapInB)):
             return OrderType.swap
@@ -205,7 +205,7 @@ class VyFiPoolTokens(BaseModel):
     operator_token: VyFiTokenDefinition = Field(alias="operatorToken")
     lp_token_name: dict[str, str] = Field(alias="lpTokenName")
     fees_settings: VyFiFees = Field(alias="feesSettings")
-    stake_key: Optional[str] = Field(alias="stakeKey")
+    stake_key: Optional[str] = Field(alias="stakeKey")  # noqa: UP007
 
 
 class VyFiPoolDefinition(BaseModel):
@@ -235,7 +235,7 @@ class VyFiCPPState(AbstractConstantProductPoolState):
 
     _batcher = Assets(lovelace=1900000)
     _deposit = Assets(lovelace=2000000)
-    _pools: ClassVar[Optional[dict[str, VyFiPoolDefinition]]] = None
+    _pools: ClassVar[Optional[dict[str, VyFiPoolDefinition]]] = None  # noqa: UP007
     _pools_refresh: ClassVar[float] = 0.0
     lp_fee: int = 0
     bar_fee: int = 0
@@ -261,7 +261,10 @@ class VyFiCPPState(AbstractConstantProductPoolState):
         return [p.order_validator_utxo_address for p in cls.pools().values()]
 
     @classmethod
-    def pool_selector(cls, assets: Optional[list[str]] = None) -> PoolSelector:
+    def pool_selector(
+        cls,
+        assets: Optional[list[str]] = None,  # noqa: UP007
+    ) -> PoolSelector:
         """Get a PoolSelector for VyFi pools, optionally filtered by assets."""
         asset_to_pool = cls._create_asset_to_pool_mapping()
         relevant_pools = cls._filter_relevant_pools(asset_to_pool, assets)
@@ -291,7 +294,7 @@ class VyFiCPPState(AbstractConstantProductPoolState):
     def _filter_relevant_pools(
         cls,
         asset_to_pool: defaultdict[str, list[VyFiPoolDefinition]],
-        assets: Optional[list[str]],
+        assets: Optional[list[str]],  # noqa: UP007
     ) -> set[VyFiPoolDefinition]:
         """Filter relevant pools based on assets."""
         if assets:
@@ -375,7 +378,10 @@ class VyFiCPPState(AbstractConstantProductPoolState):
         return self.lp_fee + self.bar_fee
 
     @classmethod
-    def extract_pool_nft(cls, values: dict[str, Any]) -> Optional[Assets]:
+    def extract_pool_nft(
+        cls,
+        values: dict[str, Any],
+    ) -> Optional[Assets]:  # noqa: UP007
         """Extract the dex nft from the UTXO."""
         assets = values["assets"]
 
@@ -411,5 +417,8 @@ class VyFiCPPState(AbstractConstantProductPoolState):
         assets = values["assets"]
         datum = VyFiPoolDatum.from_cbor(values["datum_cbor"])
 
+        if assets.unit() == "lovelace":
+            assets.root[assets.unit(0)] -= 2000000
+
         assets.root[assets.unit(0)] -= datum.token_a_fees
         assets.root[assets.unit(1)] -= datum.token_b_fees