xync-client 0.0.134__tar.gz → 0.0.135__tar.gz

{xync_client-0.0.134/xync_client.egg-info → xync_client-0.0.135}/PKG-INFO

@@ -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 → xync_client-0.0.135}/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-0.0.134 → xync_client-0.0.135}/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 → xync_client-0.0.135/xync_client.egg-info}/PKG-INFO

@@ -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