xync-client 0.0.134__py3-none-any.whl → 0.0.135__py3-none-any.whl

xync_client/Bybit/InAgent.py

@@ -1,7 +1,7 @@
 import json
 import logging
 import re
-from datetime import datetime, timezone
+from datetime import datetime, timezone, timedelta
 from uuid import uuid4
 
 import websockets
@@ -11,6 +11,7 @@ from decimal import Decimal
 from playwright.async_api import async_playwright
 from pydantic import ValidationError
 from pyro_client.client.file import FileClient
+from tortoise.timezone import now
 from tortoise.transactions import in_transaction
 
 from xync_client.Abc.PmAgent import PmAgentClient
@@ -130,7 +131,7 @@ class InAgentClient(BaseInAgentClient):
 
                                                 # если висят незавершенные продажи с такой же суммой
                                                 pos = (await self.agent_client.get_orders_active(1))["result"]
-                                                if [
+                                                pos = [
                                                     o
                                                     for o in pos.get("items", [])
                                                     if (
@@ -138,7 +139,17 @@ class InAgentClient(BaseInAgentClient):
                                                         and o["id"] != upd.id
                                                         and int(order.createDate) < int(o["createDate"]) + 3600 * 000
                                                     )
-                                                ]:
+                                                ]
+                                                curex = await models.CurEx.get(
+                                                    cur__ticker=order.currencyId, ex=self.agent_client.ex_client.ex
+                                                )
+                                                pos_db = await models.Order.filter(
+                                                    exid__not=order.id,
+                                                    amount=int(float(order.amount) * 10**curex.scale),
+                                                    status__not_in=[OrderStatus.completed, OrderStatus.canceled],
+                                                    created_at__gt=now() - timedelta(hours=1),
+                                                )
+                                                if pos or pos_db:
                                                     await self.agent_client.ex_client.bot.send(
                                                         f"[Duplicate amount!]"
                                                         f"(https://www.bybit.com/ru-RU/p2p/orderList/{order.id})",

xync_client/Bybit/etype/order.py

@@ -335,7 +335,7 @@ class Receive(_BaseMsg):
 
 class Read(_BaseMsg):
     readAmount: int
-    read: Literal["101", "110", "111"]
+    read: Literal["101", "110", "11", "111"]
     orderStatus: StatusApi
 
 

{xync_client-0.0.134.dist-info → xync_client-0.0.135.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.134
+Version: 0.0.135
 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.134.dist-info → xync_client-0.0.135.dist-info}/RECORD

@@ -34,7 +34,7 @@ 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=v1HbpbZv2U2DQCRwXEyxAAxA0nePVtljnAF_0_O2mWE,23960
+xync_client/Bybit/InAgent.py,sha256=sbJSgqtVTuATUsEx_4vK4Du62LvodDNS8kGrLJUZBBs,24837
 xync_client/Bybit/agent.py,sha256=5nAKd3yiIq1NJ6gI8CDacrk0CIeaWCxu0oWu5Lbx4nM,57384
 xync_client/Bybit/ex.py,sha256=DgPOmnjphcSCSsO4ZQjnIlWICNzdtKhNIpVsU93s99k,4707
 xync_client/Bybit/order.py,sha256=H4UIb8hxFGnw1hZuSbr0yZ4qeaCOIZOMc6jEst0ycBs,1713
@@ -43,7 +43,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=c71gfdZDJ0gSoDYLLWv2pEYwap5aV4rjjFnnA0F9lcA,8267
+xync_client/Bybit/etype/order.py,sha256=rPXw9eHJW3afVPQDRiooUkHfQhmqJ5fTdZ4vKdO6uHQ,8273
 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
@@ -95,7 +95,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.134.dist-info/METADATA,sha256=Sm8MPNOELx828d8yU1KeGQ8bm4kPqPMh6tXRffEIARQ,1037
-xync_client-0.0.134.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_client-0.0.134.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
-xync_client-0.0.134.dist-info/RECORD,,
+xync_client-0.0.135.dist-info/METADATA,sha256=JXBmzFXZmopOYvy9hpXKuIfFTo-jOXrx-_ZquCH36nU,1037
+xync_client-0.0.135.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.135.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.135.dist-info/RECORD,,