xync-client 0.0.127__py3-none-any.whl → 0.0.128__py3-none-any.whl

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/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/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.dist-info → xync_client-0.0.128.dist-info}/METADATA

@@ -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.dist-info → xync_client-0.0.128.dist-info}/RECORD

@@ -33,8 +33,8 @@ xync_client/BitGet/agent.py,sha256=YVs3bDY0OcEJGU7m2A8chzO6PFhWDnQQrA-E6MVkBBg,3
 xync_client/BitGet/ex.py,sha256=nAexKRkguIhq4fYP1tkIaou6oBFjjV2xwlajlJ-9DAE,3757
 xync_client/BitGet/etype/ad.py,sha256=fysSW47wGYjSOPUqY864z857AJz4gjN-nOkI1Jxd27U,1838
 xync_client/BitPapa/ex.py,sha256=U-RRB_RSOtErfRgxOZYWegZ_td_uZO37YKo3Jxchf_w,912
-xync_client/Bybit/InAgent.py,sha256=4eNowULa3rjhLpZnOYGgXr2ZyfT8DSmUTctBJqKfRyg,21330
-xync_client/Bybit/agent.py,sha256=L9edvv-8QxdmDagmQlw32fIWbeFDBOXD5gfufXojbHc,58686
+xync_client/Bybit/InAgent.py,sha256=YPAFmEzseB-balGuiqkZOECvvdQRQD6K6auv1rEkauY,22052
+xync_client/Bybit/agent.py,sha256=lYbdFDkySZqetPw9RiXArQU6GZ_mtOqMF0fbYb8EOP4,58747
 xync_client/Bybit/ex.py,sha256=DgPOmnjphcSCSsO4ZQjnIlWICNzdtKhNIpVsU93s99k,4707
 xync_client/Bybit/order.py,sha256=H4UIb8hxFGnw1hZuSbr0yZ4qeaCOIZOMc6jEst0ycBs,1713
 xync_client/Bybit/web_earn.py,sha256=qjqS10xlFc8r40IhDdPZ0LxA2dFEGbvBGXdsrUUJCMo,3019
@@ -42,7 +42,7 @@ xync_client/Bybit/web_p2p.py,sha256=sAXzK03t6jwDnz4rrvP2IzI0KxfKa7C_5GuzH1HwLuA,
 xync_client/Bybit/ws.py,sha256=OQjZHo_MiAH1dlOs3c-aUZBKyqToNTmH560udh6RYDE,1431
 xync_client/Bybit/etype/ad.py,sha256=HJOHi9KrbLQMpwEyd4oA8436QTNRqrd2HWFF-JNZGDo,8066
 xync_client/Bybit/etype/cred.py,sha256=dgFExLB4e5Wf6SqfU9SOdeooHQa84DRbTGm_OJhNw_o,1354
-xync_client/Bybit/etype/order.py,sha256=R8GoTzsWvt7zI6yveSFkeWHEfGcGUCAmVSX18HgVjy4,8106
+xync_client/Bybit/etype/order.py,sha256=1DzPrhwFCEgVcJ10eEbXcdjlDcp8Bic5wt7DWHERA1Q,8113
 xync_client/Gate/ex.py,sha256=1vSXctCOyZfYDojkHU6u4YSXwYTLg-e7BfAdGKvZ_UM,3727
 xync_client/Gate/premarket.py,sha256=IW-CgkmNJePJR2j_NRfULNKTePMX35XlhldqdiO76zY,2138
 xync_client/Gate/etype/ad.py,sha256=-EwtFcOWWvtE6UjaOdsuXWDTCVjAIRK0kSEsqPP4Yls,1296
@@ -94,7 +94,7 @@ xync_client/TgWallet/order.py,sha256=BOmBx5WWfJv0-_-A8DcR-Xd8utqO_VTmSqSegm0cteQ
 xync_client/TgWallet/pyd.py,sha256=Ys3E8b3RLuyQ26frWT0F0BorkNxVpxnd18tY4Gp9dik,5636
 xync_client/TgWallet/pyro.py,sha256=2K7QWdo48k4MbbgQt90gdz_HiPck69Njm4xaMjIVgoo,1440
 xync_client/TgWallet/web.py,sha256=kDcv9SKKQPe91mw1qJBpbuyKYCAmZdfdHJylHumLBVU,1608
-xync_client-0.0.127.dist-info/METADATA,sha256=Fnl05gD99tNl6RBHR1FlDP50EbXcZZfSgZDH-883P78,1044
-xync_client-0.0.127.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_client-0.0.127.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
-xync_client-0.0.127.dist-info/RECORD,,
+xync_client-0.0.128.dist-info/METADATA,sha256=XFAj6YNqn-jye15Qs1tFyqTs85EO8w-pa6fhC2NcSTo,1044
+xync_client-0.0.128.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.128.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.128.dist-info/RECORD,,