xync-client 0.0.127__tar.gz → 0.0.128__tar.gz

{xync_client-0.0.127/xync_client.egg-info → xync_client-0.0.128}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.127
+Version: 0.0.128
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client

{xync_client-0.0.127 → xync_client-0.0.128}/xync_client/Bybit/InAgent.py

@@ -9,6 +9,7 @@ from asyncio import run
 from decimal import Decimal
 
 from playwright.async_api import async_playwright
+from pydantic import ValidationError
 from pyro_client.client.file import FileClient
 from tortoise.transactions import in_transaction
 
@@ -78,7 +79,10 @@ class InAgentClient(BaseInAgentClient):
                         case "OTC_ORDER_STATUS":
                             match data["type"]:
                                 case "STATUS_CHANGE":
-                                    upd = StatusChange.model_validate(data["data"])
+                                    try:
+                                        upd = StatusChange.model_validate(data["data"])
+                                    except ValidationError as e:
+                                        logging.error(e)
                                     order = self.agent_client.api.get_order_details(orderId=upd.id)
                                     order = OrderFull.model_validate(order["result"])
                                     order_db = await models.Order.get_or_none(
@@ -119,7 +123,13 @@ class InAgentClient(BaseInAgentClient):
                                                     # pm_id=order_db.cred.pmcur.pm_id,
                                                     pmid=tid,
                                                 )
-                                                if not is_new:
+
+                                                if not is_new:  # если по этому платежу уже отпущен другая продажа
+                                                    continue
+
+                                                # если висят незавершенные продажи с такой же суммой
+                                                pos = await self.agent_client.get_orders_active(1)
+                                                if [o for o in pos["result"]["items"] if o["amount"] == order.amount]:
                                                     continue
 
                                                 # !!! ОТПРАВЛЯЕМ ДЕНЬГИ !!!

{xync_client-0.0.127 → xync_client-0.0.128}/xync_client/Bybit/agent.py

@@ -393,8 +393,10 @@ class AgentClient(BaseAgentClient):  # Bybit client
             },
         )
 
-    def get_orders_active(self, begin_time: int, end_time: int, status: int, side: int, token_id: str):
-        return self._post(
+    async def get_orders_active(
+        self, side: int = None, status: int = None, begin_time: int = None, end_time: int = None, token_id: str = None
+    ):
+        return await self._post(
             "/fiat/otc/order/pending/simplifyList",
             {
                 "status": status,
@@ -758,7 +760,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
                     req.quantity = str(
                         round(
                             asset.free * 10**-coinex.scale,
-                            coinex.coin.scale or coinex.scale,
+                            coinex.scale or coinex.coin.scale,
                         )
                     )
                     _res = self.ad_upd(req)

{xync_client-0.0.127 → xync_client-0.0.128}/xync_client/Bybit/etype/order.py

@@ -297,11 +297,11 @@ class _BaseChange(BaseModel):
     userId: int
     makerUserId: int
     id: str
-    status: StatusApi
     createDate: int
     side: int
     appealedTimes: int
     totalAppealedTimes: int
+    status: StatusApi = None
 
 
 class StatusChange(_BaseChange):

{xync_client-0.0.127 → xync_client-0.0.128/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.127
+Version: 0.0.128
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client