xync-client 0.0.120__tar.gz → 0.0.124__tar.gz

{xync_client-0.0.120/xync_client.egg-info → xync_client-0.0.124}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.120
+Version: 0.0.124
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
@@ -13,7 +13,8 @@ Requires-Dist: msgspec
 Requires-Dist: python-binance
 Requires-Dist: pybit
 Requires-Dist: pyotp
-Requires-Dist: kurigram
+Requires-Dist: pypng
+Requires-Dist: kurigram<2.2.10
 Requires-Dist: payeer-api
 Requires-Dist: playwright
 Requires-Dist: python-dotenv

{xync_client-0.0.120 → xync_client-0.0.124}/pyproject.toml

@@ -15,8 +15,9 @@ dependencies = [
     "python-binance",
     "pybit",
     "pyotp",
+    "pypng",
 #    "kurigram @ git+https://github.com/mixartemev/pyrogram.git",
-    "kurigram",
+    "kurigram<2.2.10",
     "payeer-api",
     "playwright",
     "python-dotenv",

{xync_client-0.0.120 → xync_client-0.0.124}/xync_client/Bybit/InAgent.py

@@ -87,9 +87,11 @@ class InAgentClient(BaseInAgentClient):
                                     match upd.status:
                                         case StatusApi.created:
                                             logging.info(f"Order {order.id} created at {order.createDate}")
-                                            if upd.side == 1:  # я покупатель - ждем мою оплату
+                                            # сразу уменьшаем доступный остаток монеты/валюты
+                                            await self.money_upd(order_db)
+                                            if upd.side:  # я покупатель - ждем мою оплату
                                                 dest = order.paymentTermList[0].accountNo
-                                                if not re.match(r"^P\d{8,10}$", dest):
+                                                if not re.match(r"^([Pp])\d{8,10}$", dest):
                                                     continue
                                                 await order_db.fetch_related("ad__pair_side__pair", "cred__pmcur__cur")
                                                 await self.send_payment(order_db, dest)
@@ -114,34 +116,17 @@ class InAgentClient(BaseInAgentClient):
                                                         accepted_at=datetime.now(timezone.utc),
                                                     ),
                                                     order=order_db,
+                                                    # pm_id=order_db.cred.pmcur.pm_id,
                                                     pmid=tid,
                                                 )
                                                 if not is_new:
                                                     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,
-                                                    )
-                                                    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)
-                                                    fiat.amount += order_db.amount
-                                                    await fiat.save(update_fields=["amount"])
-                                                    # отправляем деньги
-                                                    self.agent_client.api.release_assets(orderId=upd.id)
-                                                    logging.info(
-                                                        f"Order {order.id} created, paid before #{tid}:{am} at {order.createDate}, and RELEASED at {datetime.now()}"
-                                                    )
+
+                                                # !!! ОТПРАВЛЯЕМ ДЕНЬГИ !!!
+                                                self.agent_client.api.release_assets(orderId=upd.id)
+                                                logging.info(
+                                                    f"Order {order.id} created, paid before #{tid}:{am} at {order.createDate}, and RELEASED at {datetime.now()}"
+                                                )
                                             elif upd.side == 1:  # я покупатель - ждем мою оплату
                                                 continue  # logging.warning(f"Order {order.id} PAID at {datetime.now()}: {int_am}")
                                             else:
@@ -149,6 +134,20 @@ class InAgentClient(BaseInAgentClient):
                                             # todo: check is always canceling
                                             # await order_db.update_from_dict({"status": OrderStatus.canceled}).save()
                                             # logging.info(f"Order {order.id} canceled at {datetime.now()}")
+
+                                        case StatusApi.wait_for_seller:
+                                            if order_db.status == OrderStatus.paid:
+                                                continue
+                                            await order_db.update_from_dict(
+                                                {
+                                                    "status": OrderStatus.paid,
+                                                    "payed_at": datetime.fromtimestamp(
+                                                        float(order.transferDate) / 1000
+                                                    ),
+                                                }
+                                            ).save()
+                                            logging.info(f"Order {order.id} payed at {order_db.payed_at}")
+
                                         case StatusApi.appealed:
                                             # todo: appealed by WHO? щас наугад стоит by_seller
                                             await order_db.update_from_dict(
@@ -160,19 +159,13 @@ class InAgentClient(BaseInAgentClient):
                                                 }
                                             ).save()
                                             logging.info(f"Order {order.id} appealed at {order_db.appealed_at}")
+
                                         case StatusApi.canceled:
                                             await order_db.update_from_dict({"status": OrderStatus.canceled}).save()
                                             logging.info(f"Order {order.id} canceled at {datetime.now()}")
+                                            await self.money_upd(order_db)
+
                                         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,
@@ -181,19 +174,8 @@ class InAgentClient(BaseInAgentClient):
                                                     ),
                                                 }
                                             ).save()
-                                            logging.info(f"Order {order.id} completed at {order_db.confirmed_at}")
-                                        case StatusApi.wait_for_seller:
-                                            if order_db.status == OrderStatus.paid:
-                                                continue
-                                            await order_db.update_from_dict(
-                                                {
-                                                    "status": OrderStatus.paid,
-                                                    "payed_at": datetime.fromtimestamp(
-                                                        float(order.transferDate) / 1000
-                                                    ),
-                                                }
-                                            ).save()
-                                            logging.info(f"Order {order.id} payed at {order_db.payed_at}")
+                                            await self.money_upd(order_db)
+
                                         case _:
                                             logging.warning(f"Order {order.id} UNKNOWN STATUS {datetime.now()}")
                                 case "COUNT_DOWN":
@@ -258,8 +240,45 @@ class InAgentClient(BaseInAgentClient):
                     if not upd:
                         logging.warning(data, "NOT PROCESSED UPDATE")
 
+    async def money_upd(self, order_db: models.Order):
+        # обновляем остаток монеты
+        await order_db.fetch_related("ad__pair_side__pair", "cred")
+        ass = await models.Asset.get(
+            addr__coin_id=order_db.ad.pair_side.pair.coin_id, addr__actor=self.agent_client.actor
+        )
+        # обновляем остаток валюты
+        fiat = await models.Fiat.get(
+            cred__person_id=self.agent_client.actor.person_id, cred__pmcur_id=order_db.cred.pmcur_id
+        ).prefetch_related("cred__pmcur__pm")
+        fee = round(order_db.amount * (fiat.cred.pmcur.pm.fee or 0) * 0.0001)
+        im_seller = order_db.ad.pair_side.is_sell == (_im_maker := order_db.ad.maker_id == self.agent_client.actor.id)
+        # k = int(im_seller) * 2 - 1  # im_seller: 1, im_buyer: -1
+        if order_db.status == OrderStatus.created:
+            if im_seller:
+                ass.free -= order_db.quantity
+                ass.freeze += order_db.quantity
+            else:  # я покупатель
+                fiat.amount -= order_db.amount + fee
+        elif order_db.status == OrderStatus.completed:
+            if im_seller:
+                fiat.amount += order_db.amount
+            else:  # я покупатель
+                ass.free += order_db.quantity
+                ass.freeze -= order_db.quantity
+        elif order_db.status == OrderStatus.canceled:
+            if im_seller:
+                ass.free += order_db.quantity
+                ass.freeze -= order_db.quantity
+            else:  # я покупатель
+                fiat.amount += order_db.amount + fee
+        else:
+            logging.exception(order_db.id, f"STATUS: {order_db.status.name}")
+        await ass.save(update_fields=["free", "freeze"])
+        await fiat.save(update_fields=["amount"])
+        logging.info(f"Order #{order_db.id} {order_db.status.name}. Fiat: {fiat.amount}, Asset: {ass.free}")
+
     async def send_payment(self, order_db: models.Order, dest):
-        if order_db.status not in (OrderStatus.created, OrderStatus.requested):
+        if order_db.status != OrderStatus.created:
             return
         fmt_am = round(order_db.amount * 10**-2, 2)
         pma, cur = await self.get_pma_by_pmex(order_db)
@@ -289,17 +308,6 @@ class InAgentClient(BaseInAgentClient):
                 order=order_db,
                 pmid=tid,
             )
-            # обновляем остаток валюты
-            await order_db.fetch_related("cred")  # todo: refact
-            await (
-                (
-                    await models.Fiat.get(
-                        cred__person_id=self.agent_client.actor.person_id, cred__pmcur_id=order_db.cred.pmcur_id
-                    )
-                )
-                .update_from_dict({"amount": rest_amount * 100})
-                .save()
-            )
             # отправляем продавцу чек
             if res := self.agent_client.api.upload_chat_file(upload_file=f"tmp/{dest}.png").get("result"):
                 self.agent_client.api.send_chat_message(

{xync_client-0.0.120 → xync_client-0.0.124}/xync_client/Bybit/etype/order.py

@@ -16,7 +16,7 @@ class Topic(IntEnum):
 
 class Status(IntEnum):
     deleted = 40  # order canceled
-    # created = 10  # waiting for buyer to pay
+    created = 10
     appealable = 20  # waiting for seller to release
     canceled = 40
     completed = 50  # order finished
@@ -26,7 +26,6 @@ class Status(IntEnum):
     paid = 50
     rejected = 40
     request_canceled = 40
-    requested = 10
     seller_appeal_disputed_by_buyer = 30
 
 

{xync_client-0.0.120 → xync_client-0.0.124}/xync_client/Pms/Payeer/__init__.py

@@ -124,7 +124,7 @@ async def main(uid: int):
     playwright: Playwright = await async_playwright().start()
     pyr = Client(uid)
     try:
-        await pyr.start(playwright, True)
+        await pyr.start(playwright, False)
 
         dest, amount, cur = "P79619335", 2, "RUB"
 
@@ -151,4 +151,4 @@ async def main(uid: int):
 
 
 if __name__ == "__main__":
-    run(main(193017646))
+    run(main(1779829771))

{xync_client-0.0.120 → xync_client-0.0.124}/xync_client/Pms/Payeer/login.py

@@ -8,7 +8,14 @@ import time
 
 
 async def login(agent: PmAgent):
-    driver = uc.Chrome(no_sandbox=False, headless=False)
+    options = uc.ChromeOptions()
+    options.add_argument("--disable-blink-features=AutomationControlled")
+    options.add_argument("--no-sandbox")
+    options.add_argument("--disable-dev-shm-usage")
+    options.add_argument("--window-size=1920,1080")
+    options.add_argument("--user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36")
+
+    driver = uc.Chrome(options=options, headless=True)
     wait = WebDriverWait(driver, timeout=10)
     try:
         driver.get("https://payeer.com/en/auth")
@@ -22,7 +29,10 @@ async def login(agent: PmAgent):
         login_button = wait.until(EC.element_to_be_clickable((By.CLASS_NAME, "login-form__login-btn.step1")))
         login_button.click()
         time.sleep(4)
-        login_button.click()
+        try:
+            login_button.click()
+        except Exception:
+            pass
         time.sleep(1)
         if (v := driver.find_elements(By.CLASS_NAME, "form-input-top")) and v[0].text == "Введите проверочный код":
             code = input("Email code: ")

{xync_client-0.0.120 → xync_client-0.0.124/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.120
+Version: 0.0.124
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
@@ -13,7 +13,8 @@ Requires-Dist: msgspec
 Requires-Dist: python-binance
 Requires-Dist: pybit
 Requires-Dist: pyotp
-Requires-Dist: kurigram
+Requires-Dist: pypng
+Requires-Dist: kurigram<2.2.10
 Requires-Dist: payeer-api
 Requires-Dist: playwright
 Requires-Dist: python-dotenv

{xync_client-0.0.120 → xync_client-0.0.124}/xync_client.egg-info/requires.txt

@@ -6,7 +6,8 @@ msgspec
 python-binance
 pybit
 pyotp
-kurigram
+pypng
+kurigram<2.2.10
 payeer-api
 playwright
 python-dotenv