xync-client 0.0.115__tar.gz → 0.0.117__tar.gz

{xync_client-0.0.115/xync_client.egg-info → xync_client-0.0.117}/PKG-INFO

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

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