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

xync_client/Bybit/InAgent.py

@@ -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.exceptions import IntegrityError
 from tortoise.timezone import now
 from tortoise.transactions import in_transaction
 
@@ -116,15 +117,18 @@ 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
@@ -137,6 +141,8 @@ class InAgentClient(BaseInAgentClient):
                                                     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
                                                     )
                                                 ]
@@ -145,6 +151,7 @@ class InAgentClient(BaseInAgentClient):
                                                 )
                                                 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),
@@ -278,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
         )
@@ -341,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/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.135.dist-info → xync_client-0.0.136.dist-info}/METADATA

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

@@ -34,8 +34,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=sbJSgqtVTuATUsEx_4vK4Du62LvodDNS8kGrLJUZBBs,24837
-xync_client/Bybit/agent.py,sha256=5nAKd3yiIq1NJ6gI8CDacrk0CIeaWCxu0oWu5Lbx4nM,57384
+xync_client/Bybit/InAgent.py,sha256=qinC4f5Zk2FsL-EluRkEOSyEU22r4AIMjw93QxUFOjo,25290
+xync_client/Bybit/agent.py,sha256=VGPW7ibNMbO6OLyl68uYw6MJmRFr-FZdkB-GizQwUg8,57605
 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
@@ -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.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,,
+xync_client-0.0.136.dist-info/METADATA,sha256=FZV6NGtgHsCVK3K-wDDJS2xkRGIaLzGTlrRqNPfpRm0,1037
+xync_client-0.0.136.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.136.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.136.dist-info/RECORD,,