xync-client 0.0.115__py3-none-any.whl → 0.0.117__py3-none-any.whl

xync_client/Bybit/InAgent.py

@@ -11,7 +11,6 @@ from decimal import Decimal
 from playwright.async_api import async_playwright
 from pyro_client.client.file import FileClient
 from tortoise.transactions import in_transaction
-from xync_schema.models import CredEx
 
 from xync_client.Abc.PmAgent import PmAgentClient
 from xync_schema import models
@@ -121,12 +120,18 @@ class InAgentClient(BaseInAgentClient):
                                                     continue
                                                 await order_db.fetch_related("ad__pair_side__pair")
                                                 async with in_transaction():
-                                                    # добавляем остаток монеты
+                                                    # уменьшаем остаток монеты
                                                     ass = await models.Asset.get(
                                                         addr__coin_id=order_db.ad.pair_side.pair.coin_id,
                                                         addr__actor=self.agent_client.actor,
                                                     )
-                                                    ass.free -= int(order_db.amount / order_db.ad.price)
+                                                    coinex = await models.CoinEx.get(
+                                                        coin_id=order_db.ad.pair_side.pair.coin_id,
+                                                        ex=self.agent_client.ex_client.ex,
+                                                    )
+                                                    ass.free -= (
+                                                        int(order_db.amount / order_db.ad.price) * 10**coinex.scale
+                                                    )
                                                     await ass.save(update_fields=["free"])
                                                     # обновляем остаток валюты
                                                     fiat = await models.Fiat.get(cred_id=order_db.cred_id)
@@ -159,6 +164,15 @@ class InAgentClient(BaseInAgentClient):
                                             await order_db.update_from_dict({"status": OrderStatus.canceled}).save()
                                             logging.info(f"Order {order.id} canceled at {datetime.now()}")
                                         case StatusApi.completed:
+                                            if upd.side:  # я покупатель, продавец подтвердил получение
+                                                # добавляем остаток монеты
+                                                await order_db.fetch_related("ad__pair_side__pair")  # todo: refact
+                                                ass = await models.Asset.get(
+                                                    addr__coin_id=order_db.ad.pair_side.pair.coin_id,
+                                                    addr__actor=self.agent_client.actor,
+                                                )
+                                                ass.free += order_db.quantity
+                                                await ass.save(update_fields=["free"])
                                             await order_db.update_from_dict(
                                                 {
                                                     "status": OrderStatus.completed,
@@ -267,12 +281,6 @@ class InAgentClient(BaseInAgentClient):
             order_db.status = OrderStatus.paid
             order_db.payed_at = datetime.now(timezone.utc)
             await order_db.save()
-            # добавляем остаток монеты
-            ass = await models.Asset.get(
-                addr__coin_id=order_db.ad.pair_side.pair.coin_id, addr__actor=self.agent_client.actor
-            )
-            ass.free += int(order_db.amount / order_db.ad.price)
-            await ass.save(update_fields=["free"])
             # отправляем деньги
             tid, img, rest_amount = await pma.send(dest=dest, amount=fmt_am, cur=cur)
             # создаем перевод в бд
@@ -299,7 +307,7 @@ class InAgentClient(BaseInAgentClient):
                 )
             logging.info(f"Order {order_db.exid} PAID at {datetime.now()}: {fmt_am}!")
 
-    async def get_pma_by_cdex(self, order: OrderFull) -> tuple[PmAgentClient | None, CredEx] | None:
+    async def get_pma_by_cdex(self, order: OrderFull) -> tuple[PmAgentClient | None, models.CredEx] | None:
         cdxs = await models.CredEx.filter(
             ex=self.agent_client.ex_client.ex,
             exid__in=[ptl.id for ptl in order.paymentTermList],

xync_client/Bybit/agent.py

@@ -1141,7 +1141,7 @@ def clean(s) -> str:
 
 def step_is_need(mad, cad) -> bool:
     # todo: пока не решен непонятный кейс, почему то конкурент по всем параметрам слабже, но в списке ранжируется выше.
-    #  текущая версия: recentExecuteRate округляется до целого, но на бэке его дробная часть больше
+    #  текущая версия: recentExecuteRate округляется до целого, но на бэке байбита его дробная часть больше
     return (
         bool(set(cad.authTag) & {"VA2", "BA"})
         or cad.recentExecuteRate > mad.recentExecuteRate

xync_client/Bybit/etype/order.py

@@ -37,6 +37,9 @@ class StatusApi(IntEnum):
     appealed = 30
     canceled = 40
     completed = 50
+    hotswap_cancelled = 80
+    objectioning = 100
+    waiting_for_objection = 110
 
 
 class OrderRequest(BaseModel):

xync_client/Pms/Payeer/__init__.py

@@ -51,15 +51,11 @@ class Client(PmAgentClient):
                     await page.context.add_cookies([cookie])
                 sleep(0.5)
                 await page.goto("https://payeer.com/en/account/send/")
-        fiat_accounts = await page.locator(
-            f".balance-item.balance-item--green.balance-item--{cur.lower()}"
-        ).all_text_contents()
-        has_amount = float(fiat_accounts[0].replace(",", "").strip())
+        has_amount = float(self.api.get_balance()[cur]["DOSTUPNO"])
         if float(amount) <= has_amount:
-            sleep(0.1)
             await page.locator('input[name="param_ACCOUNT_NUMBER"]').fill(dest)
             await page.locator("select[name=curr_receive]").select_option(value=cur)
-            sleep(0.9)
+            sleep(0.8)
             await page.locator('input[name="sum_receive"]').fill(str(amount))
             sleep(0.1)
             # await page.locator("div.n-form--title").first.click()
@@ -67,7 +63,7 @@ class Client(PmAgentClient):
             await page.click(".btn.n-form--btn.n-form--btn-mod")
             sleep(0.5)
             await page.click(".btn.n-form--btn.n-form--btn-mod")
-            sleep(1.2)
+            sleep(1.1)
             if await page.locator(".input4").count():
                 await page.locator(".input4").fill(self.agent.auth.get("master_key"))
                 await page.click(".ok.button_green2")

xync_client/Pms/Payeer/login.py

@@ -8,7 +8,7 @@ import time
 
 
 async def login(agent: PmAgent):
-    driver = uc.Chrome(no_sandbox=False, headless=True)
+    driver = uc.Chrome(no_sandbox=False, headless=False)
     wait = WebDriverWait(driver, timeout=10)
     try:
         driver.get("https://payeer.com/en/auth")

{xync_client-0.0.115.dist-info → xync_client-0.0.117.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.115
+Version: 0.0.117
 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.115.dist-info → xync_client-0.0.117.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=XmrMMNlP7VriNFllF1VvLOwdYTn8rFE0CFUCIK2leYk,21154
-xync_client/Bybit/agent.py,sha256=ypo2MXLP5IAjJto1r0WXu1bLYgyON7mXE0XBL95LeDg,58801
+xync_client/Bybit/InAgent.py,sha256=EiP3dMN9rhDfCUSEeXPTkOKRZlhpPeMUheL14vQjG1c,22089
+xync_client/Bybit/agent.py,sha256=7BOxzqTVAtzPOabwXMaUOPRF_Zi9kV6CO99lHNbWCjE,58816
 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=M9hxHCELTb2llz2c8q0QrfG-lCxuUb-Zwmag82ggXn0,8073
+xync_client/Bybit/etype/order.py,sha256=ujPNZdWilPapJlu5j33j8vloSIWezAlvhJXKqddQLqE,8155
 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
@@ -71,9 +71,9 @@ xync_client/Pms/Alfa/state.json,sha256=MKE6vl-JsJO9PNCVqoQgBgYZTgYkHCas7USwl8QFt
 xync_client/Pms/MTS/__init__.py,sha256=P_E7W46IZEk8RsEgl7H1xV3JplMT5l9vYQYTYyNbyQ8,2101
 xync_client/Pms/Ozon/__init__.py,sha256=EvQZDSPv0fOT2hNCTP44nXHOIEQvP5bQf_7HVLiZc2I,4123
 xync_client/Pms/Payeer/.gitignore,sha256=sWORdRp8ROppV2CsMEDJ3M_SokrNWCf8b1hlaNs64hg,12
-xync_client/Pms/Payeer/__init__.py,sha256=ztnwyUStySTla3AtGNYh3TNf1cMQDiHmgjzRHaL_Z0I,6244
+xync_client/Pms/Payeer/__init__.py,sha256=oW_ePLkZyplrUCJaAJuQ2Jp-oZmylw99pwVcha3LZUs,6068
 xync_client/Pms/Payeer/api.py,sha256=bb8qrlPYyWafel1VR-2nate6xBeRZAVciFJblHygfAs,549
-xync_client/Pms/Payeer/login.py,sha256=FQ5JoeIKE6vu75H2HAq1hFvO6-wn_quc8Op_qta60cQ,1796
+xync_client/Pms/Payeer/login.py,sha256=USn7x9b8rNZiMH3rKttGEMHv1DEvbLYrQM6GNvODvUE,1797
 xync_client/Pms/Sber/__init__.py,sha256=dxQfd9ZPhFTc_C4xrwaxrV6p0SijDCLNzBeUv3oQG38,4926
 xync_client/Pms/Sber/utils.py,sha256=gIeJspwvoBbOBt-fjxwW4WDHPoL2Evs8LVufsjrFOfo,1870
 xync_client/Pms/Tinkoff/__init__.py,sha256=ZyLvBEUn-vh-85oPUUDS586AHgvx3c-mkQE3yBQtbw8,5580
@@ -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.115.dist-info/METADATA,sha256=bBr1dSe5cyvvjTisa4_SPIh6arG4lwuZXLlOR3sLUEY,990
-xync_client-0.0.115.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_client-0.0.115.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
-xync_client-0.0.115.dist-info/RECORD,,
+xync_client-0.0.117.dist-info/METADATA,sha256=dHXPl-GkgdlOhwrKfbZb3o46zCTWxS5PL2iXhqZPk3A,990
+xync_client-0.0.117.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.117.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.117.dist-info/RECORD,,