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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.134
+Version: 0.0.136
 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.136}/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,8 @@ from decimal import Decimal
 from playwright.async_api import async_playwright
 from pydantic import ValidationError
 from pyro_client.client.file import FileClient
+from tortoise.exceptions import IntegrityError
+from tortoise.timezone import now
 from tortoise.transactions import in_transaction
 
 from xync_client.Abc.PmAgent import PmAgentClient
@@ -115,30 +117,46 @@ class InAgentClient(BaseInAgentClient):
                                                         f"Order {order.id} created at {order.createDate}, not paid yet"
                                                     )
                                                     continue
-                                                t, is_new = await models.Transfer.update_or_create(
-                                                    dict(
-                                                        amount=int(float(order.amount) * 100),
-                                                        accepted_at=datetime.now(timezone.utc),
-                                                        order=order_db,
-                                                    ),
-                                                    # pm_id=order_db.cred.pmcur.pm_id,
-                                                    pmid=tid,
-                                                )
+                                                try:
+                                                    t, is_new = await models.Transfer.update_or_create(
+                                                        dict(
+                                                            amount=int(float(order.amount) * 100),
+                                                            order=order_db,
+                                                        ),
+                                                        pmid=tid,
+                                                    )
+                                                except IntegrityError as e:
+                                                    logging.error(tid)
+                                                    logging.error(order)
+                                                    logging.exception(e)
 
                                                 if not is_new:  # если по этому платежу уже отпущен другая продажа
                                                     continue
 
                                                 # если висят незавершенные продажи с такой же суммой
                                                 pos = (await self.agent_client.get_orders_active(1))["result"]
-                                                if [
+                                                pos = [
                                                     o
                                                     for o in pos.get("items", [])
                                                     if (
                                                         o["amount"] == order.amount
                                                         and o["id"] != upd.id
+                                                        and o.paymentTermList[0].accountNo
+                                                        == order.paymentTermList[0].accountNo
                                                         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,
+                                                    cred_id=order_db.cred_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})",
@@ -267,7 +285,7 @@ class InAgentClient(BaseInAgentClient):
 
     async def money_upd(self, order_db: models.Order):
         # обновляем остаток монеты
-        await order_db.fetch_related("ad__pair_side__pair", "cred")
+        await order_db.fetch_related("ad__pair_side__pair", "cred", "transfer")
         ass = await models.Asset.get(
             addr__coin_id=order_db.ad.pair_side.pair.coin_id, addr__actor=self.agent_client.actor
         )
@@ -330,11 +348,7 @@ class InAgentClient(BaseInAgentClient):
             # отправляем деньги
             tid, img, rest_amount = await pma.send(dest=dest, amount=fmt_am, cur=cur)
             # создаем перевод в бд
-            t, _ = await models.Transfer.update_or_create(
-                {"amount": order_db.amount},
-                order=order_db,
-                pmid=tid,
-            )
+            t, _ = await models.Transfer.update_or_create({"order": order_db, "amount": order_db.amount}, pmid=tid)
             await self.send_receipt(str(order_db.exid), tid)  # отправляем продавцу чек
             logging.info(f"Order {order_db.exid} PAID at {datetime.now()}: {fmt_am}!")
 

{xync_client-0.0.134 → xync_client-0.0.136}/xync_client/Bybit/agent.py

@@ -393,6 +393,12 @@ class AgentClient(BaseAgentClient):  # Bybit client
             },
         )
 
+    def my_reviews(self):
+        return self._post(
+            "/x-api/fiat/otc/order/appraiseList",
+            {"makerUserId": self.actor.exid, "page": "1", "size": "10", "appraiseType": "1"},  # "0" - bad
+        )
+
     async def get_orders_active(
         self, side: int = None, status: int = None, begin_time: int = None, end_time: int = None, token_id: str = None
     ):

{xync_client-0.0.134 → xync_client-0.0.136}/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.136/xync_client.egg-info}/PKG-INFO

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