xync-client 0.0.150__py3-none-any.whl → 0.0.152__py3-none-any.whl

xync_client/Abc/AdLoader.py

@@ -57,7 +57,6 @@ class AdLoader:
         coinex: models.CoinEx = None,
         curex: models.CurEx = None,
         rname: str = None,
-        pms_from_cond: bool = False,
     ) -> models.Ad:
         if not maker:
             if not (maker := await models.Actor.get_or_none(exid=pad.userId, ex=self.ex)):
@@ -87,13 +86,13 @@ class AdLoader:
             price=int(float(pad.price) * cur_scale),
             premium=int(float(pad.premium) * 100),
             cond_id=cid,
+            status=self.ad_status(ad_upd.status),
         )
         try:
             ad_db, _ = await models.Ad.update_or_create(**df_unq)
         except OperationalError as e:
             raise e
-        if not pms_from_cond:
-            await ad_db.pms.add(*(await models.Pm.filter(pmexs__ex=self.ex, pmexs__exid__in=pad.payments)))
+        await ad_db.pms.add(*(await models.Pm.filter(pmexs__ex=self.ex, pmexs__exid__in=pad.payments)))
         return ad_db
 
     async def cond_load(  # todo: refact from Bybit Ad format to universal
@@ -120,13 +119,7 @@ class AdLoader:
                 # if not len((old_cond := await Cond.get(id=old_cid).prefetch_related('ads')).ads):
                 #     await old_cond.delete()
                 #     logging.warning(f"Cond#{old_cid} deleted!")
-            return (
-                ad_db
-                or force
-                and await self.ad_load(
-                    ad, cid, ps, coinex=coinex, curex=curex, rname=rname, pms_from_cond=pms_from_cond
-                )
-            ), False
+            return (ad_db or force and await self.ad_load(ad, cid, ps, coinex=coinex, curex=curex, rname=rname)), False
         # если эта объява в таким ид уже есть в бд, но с другим условием (или без), а текущего условия еще нет в бд
         if ad_db:
             await ad_db.fetch_related("cond__ads", "maker")
@@ -154,9 +147,7 @@ class AdLoader:
             return ad_db, False
 
         cond = await self.cond_new(cleaned, {int(ad.userId)})
-        ad_db = await self.ad_load(
-            ad, cond.id, ps, coinex=coinex, curex=curex, rname=rname, pms_from_cond=pms_from_cond
-        )
+        ad_db = await self.ad_load(ad, cond.id, ps, coinex=coinex, curex=curex, rname=rname)
         ad_db.cond = cond
         return ad_db, True
 

xync_client/Abc/Agent.py

@@ -1,10 +1,13 @@
 from abc import abstractmethod
+from asyncio.tasks import gather
 
 from pydantic import BaseModel
 from pyro_client.client.file import FileClient
 from x_client import df_hdrs
 from x_client.aiohttp import Client as HttpClient
 from xync_bot import XyncBot
+from xync_client.Abc.InAgent import BaseInAgentClient
+
 from xync_client.Bybit.etype.order import TakeAdReq
 from xync_schema import models
 from xync_schema.models import OrderStatus, Coin, Cur, Ad, AdStatus, Actor, Agent
@@ -15,13 +18,14 @@ from xync_client.Abc.xtype import CredExOut, BaseOrderReq, BaseAdUpdate
 from xync_client.Gmail import GmClient
 
 
-class BaseAgentClient(HttpClient):
+class BaseAgentClient(HttpClient, BaseInAgentClient):
     bbot: XyncBot
     fbot: FileClient
 
     def __init__(
         self,
         agent: Agent,
+        ex_client: BaseExClient,
         fbot: FileClient,
         bbot: XyncBot,
         headers: dict[str, str] = df_hdrs,
@@ -32,8 +36,20 @@ class BaseAgentClient(HttpClient):
         self.agent: Agent = agent
         self.actor: Actor = agent.actor
         self.gmail = GmClient(agent.actor.person.user)
+        self.ex_client: BaseExClient = ex_client
         super().__init__(self.actor.ex.host_p2p, headers, cookies)
-        self.ex_client: BaseExClient = self.actor.ex.client(fbot)
+
+    async def start(self):
+        tasks = []
+        if not self.is_started:
+            if self.agent.status & 1:  # race
+                tasks.append(self.start_race())
+            if self.agent.status & 2:  # in agent
+                tasks.append(self.start_listen())
+            if self.agent.status & 4:  # for further
+                ...
+            self.is_started = True
+        return await gather(*tasks)
 
     # 0: Получшение ордеров в статусе status, по монете coin, в валюте coin, в направлении is_sell: bool
     @abstractmethod
@@ -134,21 +150,7 @@ class BaseAgentClient(HttpClient):
     async def my_assets(self) -> dict: ...
 
     @abstractmethod
-    async def _take_ad(self, req: TakeAdReq): ...
-
-    async def take_ad(self, req: TakeAdReq):
-        if req.is_sell:
-            fltr = dict(ex_id=self.actor.ex_id, cred__pmcur__pm_id=req.pm_id, cred__person_id=self.actor.person.id)
-            if req.cur_:
-                fltr |= dict(cred__pmcur__cur__ticker=req.cur_)
-            pmexs = await models.CredEx.filter(**fltr)
-        else:
-            pmexs = await models.PmEx.filter(ex_id=self.actor.ex_id, pm_id=req.pm_id)
-            if len(pmexs) > 1:
-                pmexs = [p for p in pmexs if p.name.endswith(f" ({req.cur_})")]
-        req.pm_id = pmexs[0].exid
-        req.quantity = round(req.amount / req.price, 4)  # todo: to get the scale from coinEx
-        return await self._take_ad(req)
+    async def take_ad(self, req: TakeAdReq): ...
 
     # Сохранение объявления (с Pm/Cred-ами) в бд
     # async def ad_pydin2db(self, ad_pydin: AdSaleIn | AdBuyIn) -> Ad:

xync_client/Abc/Ex.py

@@ -17,6 +17,7 @@ from xync_client.pm_unifier import PmUnifier, PmUni
 
 
 class BaseExClient(HttpClient, AdLoader):
+    host: str = None
     cur_map: dict[int, str] = {}
     unifier_class: type = PmUnifier
     logo_pre_url: str
@@ -34,7 +35,7 @@ class BaseExClient(HttpClient, AdLoader):
     ):
         self.ex = ex
         self.bot = bot
-        super().__init__(getattr(ex, attr), headers, cookies, proxy and proxy.str())
+        super().__init__(self.host or getattr(ex, attr), headers, cookies, proxy and proxy.str())
 
     @abstractmethod
     def pm_type_map(self, typ: models.PmEx) -> str: ...

xync_client/Abc/InAgent.py

@@ -1,20 +1,7 @@
 from abc import abstractmethod
 
-from pyro_client.client.file import FileClient
-from xync_bot import XyncBot
-
-from xync_client.Abc.PmAgent import PmAgentClient
-from xync_schema.models import Agent
-
-from xync_client.Abc.Agent import BaseAgentClient
-
 
 class BaseInAgentClient:
-    pmacs: dict[int, PmAgentClient] = {}
-
-    def __init__(self, agent: Agent, fbot: FileClient, bbot: XyncBot):
-        self.agent_client: BaseAgentClient = agent.client(fbot, bbot)
-
     @abstractmethod
     async def start_listen(self) -> bool: ...
 

xync_client/Abc/xtype.py

@@ -53,7 +53,7 @@ class BaseOrderReq(BaseModel):
     asset_amount: float | None = None
     fiat_amount: float | None = None
 
-    pm_id: int = (None,)
+    pmex_exid: str = None  # int
 
     # todo: mv from base to special ex class
     amount_is_fiat: bool = True

xync_client/Bybit/InAgent.py

@@ -9,6 +9,7 @@ import websockets
 from asyncio import run, sleep
 from decimal import Decimal
 
+from bybit_p2p import P2P
 from playwright.async_api import async_playwright
 from pydantic import ValidationError
 from pyro_client.client.file import FileClient
@@ -16,6 +17,7 @@ from tortoise.exceptions import IntegrityError
 from tortoise.timezone import now
 from tortoise.transactions import in_transaction
 from xync_bot import XyncBot
+from xync_client.Bybit.ex import ExClient
 
 from xync_client.Abc.PmAgent import PmAgentClient
 from xync_schema import models
@@ -32,16 +34,17 @@ from xync_client.Bybit.etype.order import (
 )
 from xync_client.loader import NET_TOKEN, PAY_TOKEN
 from xync_client.Abc.InAgent import BaseInAgentClient
-from xync_client.Bybit.agent import AgentClient
 
 
 class InAgentClient(BaseInAgentClient):
-    agent_client: AgentClient
+    actor: models.Actor
+    api: P2P
+    ex_client: ExClient
 
     async def start_listen(self):
-        t = await self.agent_client.ott()
+        t = await self.ott()
         ts = int(float(t["time_now"]) * 1000)
-        await self.ws_prv(self.agent_client.agent.auth["deviceId"], t["result"], ts)
+        await self.ws_prv(self.actor.agent.auth["deviceId"], t["result"], ts)
 
     # 3N: [T] - Уведомление об одобрении запроса на сделку
     async def request_accepted_notify(self) -> int: ...  # id
@@ -87,11 +90,11 @@ class InAgentClient(BaseInAgentClient):
                                     except ValidationError as e:
                                         logging.error(e)
                                         logging.error(data["data"])
-                                    order = self.agent_client.api.get_order_details(orderId=upd.id)
+                                    order = self.api.get_order_details(orderId=upd.id)
                                     order = OrderFull.model_validate(order["result"])
                                     order_db = await models.Order.get_or_none(
                                         exid=order.id, ad__exid=order.itemId
-                                    ) or await self.agent_client.create_order(order)
+                                    ) or await self.create_order(order)
                                     match upd.status:
                                         case StatusApi.created:
                                             logging.info(f"Order {order.id} created at {order.createDate}")
@@ -136,7 +139,7 @@ class InAgentClient(BaseInAgentClient):
                                                     continue
 
                                                 # если висят незавершенные продажи с такой же суммой
-                                                pos = (await self.agent_client.get_orders_active(1))["result"]
+                                                pos = (await self.get_orders_active(1))["result"]
                                                 pos = [
                                                     o
                                                     for o in pos.get("items", [])
@@ -146,14 +149,14 @@ class InAgentClient(BaseInAgentClient):
                                                         and int(order.createDate)
                                                         < int(o["createDate"]) + 15 * 60 * 1000
                                                         # get full_order from o, and cred or pm from full_order:
-                                                        and self.agent_client.api.get_order_details(orderId=o["id"])[
-                                                            "result"
-                                                        ]["paymentTermList"][0]["accountNo"]
+                                                        and self.api.get_order_details(orderId=o["id"])["result"][
+                                                            "paymentTermList"
+                                                        ][0]["accountNo"]
                                                         == order.paymentTermList[0].accountNo
                                                     )
                                                 ]
                                                 curex = await models.CurEx.get(
-                                                    cur__ticker=order.currencyId, ex=self.agent_client.ex_client.ex
+                                                    cur__ticker=order.currencyId, ex=self.ex_client.ex
                                                 )
                                                 pos_db = await models.Order.filter(
                                                     exid__not=order.id,
@@ -163,16 +166,16 @@ class InAgentClient(BaseInAgentClient):
                                                     created_at__gt=now() - timedelta(minutes=15),
                                                 )
                                                 if pos or pos_db:
-                                                    await self.agent_client.ex_client.bot.send(
+                                                    await self.ex_client.bot.send(
                                                         f"[Duplicate amount!]"
                                                         f"(https://www.bybit.com/ru-RU/p2p/orderList/{order.id})",
-                                                        self.agent_client.actor.person.user.username_id,
+                                                        self.actor.person.user.username_id,
                                                     )
                                                     logging.warning("Duplicate amount!")
                                                     continue
 
                                                 # !!! ОТПРАВЛЯЕМ ДЕНЬГИ !!!
-                                                self.agent_client.api.release_assets(orderId=upd.id)
+                                                self.api.release_assets(orderId=upd.id)
                                                 logging.info(
                                                     f"Order {order.id} created, paid before #{tid}:{am} at {order.createDate}, and RELEASED at {now()}"
                                                 )
@@ -236,14 +239,14 @@ class InAgentClient(BaseInAgentClient):
                                 case "RECEIVE":
                                     upd = Receive.model_validate(data["data"])
                                     if order_db := await models.Order.get_or_none(
-                                        exid=upd.orderId, ad__maker__ex=self.agent_client.actor.ex
+                                        exid=upd.orderId, ad__maker__ex=self.actor.ex
                                     ).prefetch_related("ad__pair_side__pair", "cred__pmcur__cur"):
-                                        im_taker = order_db.taker_id == self.agent_client.actor.id
+                                        im_taker = order_db.taker_id == self.actor.id
                                         im_buyer = order_db.ad.pair_side.is_sell == im_taker
                                         if order_db.ad.auto_msg != upd.message and upd.roleType == "user":
                                             msg, _ = await models.Msg.update_or_create(
                                                 {
-                                                    "to_maker": upd.userId == self.agent_client.actor.exid and im_taker,
+                                                    "to_maker": upd.userId == self.actor.exid and im_taker,
                                                     "sent_at": datetime.fromtimestamp(float(upd.createDate) / 1000),
                                                 },
                                                 txt=upd.message,
@@ -262,7 +265,7 @@ class InAgentClient(BaseInAgentClient):
                                     if upd.orderStatus in (
                                         StatusApi.wait_for_buyer,
                                     ):  # todo: тут приходит ордер.статус=10, хотя покупатель еще не нажал оплачено
-                                        order = self.agent_client.api.get_order_details(orderId=upd.orderId)["result"]
+                                        order = self.api.get_order_details(orderId=upd.orderId)["result"]
                                         order = OrderFull.model_validate(order)
 
                                 case "CLEAR":
@@ -295,15 +298,13 @@ class InAgentClient(BaseInAgentClient):
     async def money_upd(self, order_db: models.Order):
         # обновляем остаток монеты
         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
-        )
+        ass = await models.Asset.get(addr__coin_id=order_db.ad.pair_side.pair.coin_id, addr__actor=self.actor)
         # обновляем остаток валюты
         fiat = await models.Fiat.get(
-            cred__person_id=self.agent_client.actor.person_id, cred__pmcur_id=order_db.cred.pmcur_id
+            cred__person_id=self.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)
+        im_seller = order_db.ad.pair_side.is_sell == (_im_maker := order_db.ad.maker_id == self.actor.id)
         # k = int(im_seller) * 2 - 1  # im_seller: 1, im_buyer: -1
         if order_db.status == OrderStatus.created:
             if im_seller:
@@ -335,9 +336,9 @@ class InAgentClient(BaseInAgentClient):
         pma, cur = await self.get_pma_by_pmex(order_db)
         async with in_transaction():
             # отмечаем ордер на бирже "оплачен"
-            pmex = await models.PmEx.get(pm_id=order_db.cred.pmcur.pm_id, ex=self.agent_client.actor.ex)
-            credex = await models.CredEx.get(cred=order_db.cred, ex=self.agent_client.actor.ex)
-            self.agent_client.api.mark_as_paid(
+            pmex = await models.PmEx.get(pm_id=order_db.cred.pmcur.pmex_exid, ex=self.actor.ex)
+            credex = await models.CredEx.get(cred=order_db.cred, ex=self.actor.ex)
+            self.api.mark_as_paid(
                 orderId=str(order_db.exid),
                 paymentType=pmex.exid,  # pmex.exid
                 paymentId=str(credex.exid),  # credex.exid
@@ -346,7 +347,7 @@ class InAgentClient(BaseInAgentClient):
             if t := await models.Transfer.get_or_none(order=order_db, amount=order_db.amount):
                 await pma.bot.send(
                     f"Order# {order_db.exid}: Double send {fmt_am}{cur} to {order_db.cred.detail} #{t.pmid}!",
-                    self.agent_client.actor.person.user.username_id,
+                    self.actor.person.user.username_id,
                 )
                 raise Exception(
                     f"Order# {order_db.exid}: Double send {fmt_am}{cur} to {order_db.cred.detail} #{t.pmid}!"
@@ -367,38 +368,34 @@ class InAgentClient(BaseInAgentClient):
 
     async def send_receipt(self, oexid: str, tid: int) -> tuple[PmAgentClient | None, models.CredEx] | None:
         try:
-            if res := self.agent_client.api.upload_chat_file(upload_file=f"tmp/{tid}.png").get("result"):
+            if res := self.api.upload_chat_file(upload_file=f"tmp/{tid}.png").get("result"):
                 await sleep(0.5)
-                self.agent_client.api.send_chat_message(
-                    orderId=oexid, contentType="pic", message=res["url"], msgUuid=uuid4().hex
-                )
+                self.api.send_chat_message(orderId=oexid, contentType="pic", message=res["url"], msgUuid=uuid4().hex)
         except Exception as e:
             logging.error(e)
         await sleep(0.5)
-        self.agent_client.api.send_chat_message(
-            orderId=oexid, contentType="str", message=f"#{tid}", msgUuid=uuid4().hex
-        )
+        self.api.send_chat_message(orderId=oexid, contentType="str", message=f"#{tid}", msgUuid=uuid4().hex)
 
     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,
+            ex=self.ex_client.ex,
             exid__in=[ptl.id for ptl in order.paymentTermList],
-            cred__person=self.agent_client.actor.person,
+            cred__person=self.actor.person,
         ).prefetch_related("cred__pmcur__cur")
-        pmas = [pma for cdx in cdxs if (pma := self.pmacs.get(cdx.cred.pmcur.pm_id))]
+        pmas = [pma for cdx in cdxs if (pma := self.pmacs.get(cdx.cred.pmcur.pmex_exid))]
         if not len(pmas):
             # raise ValueError(order.paymentTermList, f"No pm_agents for {order.paymentTermList[0].paymentType}")
             return None
         elif len(pmas) > 1:
-            logging.error(order.paymentTermList, f">1 pm_agents for {cdxs[0].cred.pmcur.pm_id}")
+            logging.error(order.paymentTermList, f">1 pm_agents for {cdxs[0].cred.pmcur.pmex_exid}")
         else:
             return pmas[0], cdxs[0]
 
     async def get_pma_by_pmex(self, order_db: models.Order) -> tuple[PmAgentClient, str]:
-        pma = self.pmacs.get(order_db.cred.pmcur.pm_id)
+        pma = self.pmacs.get(order_db.cred.pmcur.pmex_exid)
         if pma:
             return pma, order_db.cred.pmcur.cur.ticker
-        logging.error(f"No pm_agents for {order_db.cred.pmcur.pm_id}")
+        logging.error(f"No pm_agents for {order_db.cred.pmcur.pmex_exid}")
 
     @staticmethod
     def listen(data: dict | None):
@@ -445,7 +442,7 @@ async def main():
         except Exception as e:
             await b.send("😱Bybit InAgent CRASHED!!!😱", agent.actor.person.user.username_id)
             await b.send(f"```\n{''.join(traceback.format_exception(e))}\n```", agent.actor.person.user.username_id)
-        await cl.agent_client.close()
+        await cl.close()
 
 
 if __name__ == "__main__":

xync_client/Bybit/agent.py

@@ -22,17 +22,19 @@ from tortoise.expressions import Q
 from tortoise.functions import Count
 from tortoise.signals import post_save
 from urllib3.exceptions import ReadTimeoutError
+from x_client import df_hdrs
 from x_model import init_db
 from x_model.func import ArrayAgg
 from xync_bot import XyncBot
+from xync_client.Bybit.ex import ExClient
 from xync_schema import models
-from xync_schema.enums import OrderStatus
+from xync_schema.enums import OrderStatus, AgentStatus
 
 from xync_schema.models import Actor, PmCur, Agent
 
 from xync_client.Abc.Agent import BaseAgentClient
 from xync_client.Abc.xtype import FlatDict, BaseOrderReq
-from xync_client.Bybit.etype.ad import AdPostRequest, AdUpdateRequest, Ad, AdStatus
+from xync_client.Bybit.etype.ad import AdPostRequest, AdUpdateRequest, Ad, AdStatus, MyAd
 from xync_client.Bybit.etype.cred import CredEpyd
 from xync_client.Bybit.etype.order import (
     OrderRequest,
@@ -54,10 +56,8 @@ class NoMakerException(Exception):
 
 
 class AgentClient(BaseAgentClient):  # Bybit client
-    headers = {
-        # "accept": "application/json",
-        "Cookie": ";",
-    }
+    headers = df_hdrs | {"accept-language": "ru-RU"}
+    sec_hdrs: dict[str, str]
     # rewrite token for public methods
     api: P2P
     last_ad_id: list[str] = []
@@ -89,8 +89,13 @@ class AgentClient(BaseAgentClient):  # Bybit client
         "securityRiskToken": "",
     }
 
-    def __init__(self, agent: Agent, fbot: FileClient, bbot: XyncBot, **kwargs):
-        super().__init__(agent, fbot, bbot, **kwargs)
+    def __init__(self, agent: Agent, ex_client: ExClient, fbot: FileClient, bbot: XyncBot, **kwargs):
+        super().__init__(agent, ex_client, fbot, bbot, **kwargs)
+        self.sec_hdrs = {
+            "accept-language": "ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7",
+            "gdfp": agent.auth["Risktoken"],
+            "tx-id": agent.auth["Risktoken"],
+        }
         self.api = P2P(testnet=False, api_key=agent.auth["key"], api_secret=agent.auth["sec"])
         self.hist: dict | None = None
         self.completed_orders: list[int] | None = None
@@ -150,15 +155,24 @@ class AgentClient(BaseAgentClient):  # Bybit client
             raise Exception(f"Set default cur for {pmex.name}")
         if not (pmcur := await models.PmCur.get_or_none(cur_id=cur_id, pm_id=pmex.pm_id)):
             raise HTTPException(f"No PmCur with cur#{ecdx.currencyBalance} and pm#{ecdx.paymentType}", 404)
-        dct = {
-            "pmcur_id": pmcur.id,
-            "name": ecdx.realName,
-            "person_id": pers_id or self.actor.person_id,
-            "detail": ecdx.accountNo,
-            "extra": ecdx.branchName or ecdx.bankName or ecdx.qrcode or ecdx.payMessage or ecdx.paymentExt1,
-        }  # todo: WTD with multicur pms?
-        cred_in = models.Cred.validate(dct, False)
-        cred_db, _ = await models.Cred.update_or_create(**cred_in.df_unq())
+        xtr = ecdx.branchName
+        if ecdx.bankName:
+            xtr += (" | " if xtr else "") + ecdx.bankName
+        elif ecdx.payMessage:
+            xtr += (" | " if xtr else "") + ecdx.payMessage
+        elif ecdx.qrcode:
+            xtr += (" | " if xtr else "") + ecdx.qrcode
+        elif ecdx.paymentExt1:
+            xtr += (" | " if xtr else "") + ecdx.paymentExt1
+        cred_db, _ = await models.Cred.update_or_create(
+            {
+                "name": ecdx.realName,
+                "extra": xtr,
+            },
+            pmcur=pmcur,
+            person_id=pers_id or self.actor.person_id,
+            detail=ecdx.accountNo,
+        )
         credex_in = models.CredEx.validate({"exid": ecdx.id, "cred_id": cred_db.id, "ex_id": self.actor.ex.id})
         credex_db, _ = await models.CredEx.update_or_create(**credex_in.df_unq())
         return credex_db
@@ -245,9 +259,9 @@ class AgentClient(BaseAgentClient):  # Bybit client
         ads = [ad for ad in list_ads if set(ad["payments"]) - {"5", "51"}]
         return float(ads[0]["price"])
 
-    def my_ads(self, active: bool = True, page: int = 1) -> list[Ad]:
+    def my_ads(self, active: bool = True, page: int = 1) -> list[MyAd]:
         resp = self.api.get_ads_list(size="30", page=str(page), status=AdStatus.active if active else AdStatus.sold_out)
-        ads = [Ad.model_validate(ad) for ad in resp["result"]["items"]]
+        ads = [MyAd.model_validate(ad) for ad in resp["result"]["items"]]
         if resp["result"]["count"] > 30 * page:
             ads.extend(self.my_ads(active, page + 1))
         return ads
@@ -256,9 +270,13 @@ class AgentClient(BaseAgentClient):  # Bybit client
         ads = self.my_ads(True)
         if not active:
             ads += self.my_ads(False)
-        res = [await self.ex_client.ad_load(ad, maker=self.actor) for ad in ads]
-        res = [await models.MyAd.update_or_create(ad=ad) for ad in res]
-        return len(res)
+        for ad in ads:
+            ad_db = await self.ex_client.ad_load(ad, maker=self.actor)
+            mad_db, _ = await models.MyAd.update_or_create(ad=ad_db)
+            exids = [pt.id for pt in ad.paymentTerms]
+            credexs = await models.CredEx.filter(ex_id=self.actor.ex_id, exid__in=exids)
+            await mad_db.creds.add(*credexs)
+        return len(ads)
 
     def get_security_token_create(self):
         data = self._post("/x-api/fiat/otc/item/create", self.create_ad_body)
@@ -268,46 +286,29 @@ class AgentClient(BaseAgentClient):  # Bybit client
         return security_risk_token
 
     async def _check_2fa(self, risk_token) -> int:
-        res = await self._post(
-            "/x-api/user/public/risk/components",
-            {"risk_token": risk_token},
-            hdrs={
-                # "Accept-Language": "ru,en;q=0.9",
-            },
-        )
+        data = {"risk_token": risk_token}
+        res = await self._post("/x-api/user/public/risk/components", data, hdrs=self.sec_hdrs)
         if res["ret_msg"] != "success":
             raise HTTPException("get")
         cres = sorted(res["result"]["component_list"], key=lambda c: c["component_id"], reverse=True)
-        # cres = [{"component_id": "payment_password_verify"}]
         vdata = {
             "risk_token": risk_token,
             "component_list": {c["component_id"]: await self.__get_2fa(c["component_id"], risk_token) for c in cres},
         }
-        res = await self._post(
-            "/x-api/user/public/risk/verify",
-            vdata,
-            hdrs={
-                "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36",
-                "accept-language": "ru,en;q=0.9",
-                # "accept-language": "ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7",
-                "accept-encoding": "gzip, deflate, br, zstd",
-                "accept": "application/json",
-            },
-        )
-        if res["ret_msg"] != "success":
+        res = await self._post("/x-api/user/public/risk/verify", vdata, hdrs=self.sec_hdrs)
+        if er_code := res["ret_code"] or res["result"]["ret_code"]:  # если код не 0, значит ошибка
             logging.error("Wrong 2fa, wait 5 secs and retry..")
             await sleep(5)
-            await self._check_2fa(risk_token)
-        return res["ret_code"]
+            return await self._check_2fa(risk_token)
+        return er_code
 
     async def __get_2fa(
         self, typ: Literal["google2fa", "email_verify", "payment_password_verify", "phone_verify"], rt: str = None
     ):
         res = {"ret_msg": "success"}
         if typ != "google2fa":
-            #     "accept-language": "ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7",
-            #     "accept": "application/json"
-            res = await self._post("/x-api/user/public/risk/send/code", {"risk_token": rt, "component_id": typ})
+            data = {"risk_token": rt, "component_id": typ}
+            res = await self._post("/x-api/user/public/risk/send/code", data, hdrs=self.sec_hdrs)
         if res["ret_msg"] == "success":
             if typ == "google2fa":
                 bybit_secret = self.agent.auth["2fa"]
@@ -381,36 +382,33 @@ class AgentClient(BaseAgentClient):  # Bybit client
             res = res["result"]
         return PreOrderResp.model_validate(res)
 
-    async def __order_request_build(self, por: PreOrderResp, br: BaseOrderReq) -> OrderRequest:
+    async def _order_request(self, bor: BaseOrderReq) -> OrderResp:
+        por: PreOrderResp = await self.__preorder_request(bor.ad_id)
         req = OrderRequest(
             itemId=por.id,
-            tokenId=br.coin_exid,
-            currencyId=br.cur_exid,
-            side="1" if br.is_sell else "0",
-            amount=f"{br.fiat_amount:.2f}".rstrip("0").rstrip("."),
+            tokenId=bor.coin_exid,
+            currencyId=bor.cur_exid,
+            side="1" if bor.is_sell else "0",
+            amount=f"{bor.fiat_amount:.2f}".rstrip("0").rstrip("."),
             curPrice=por.curPrice,
-            quantity=str(round(br.fiat_amount / float(por.price), br.coin_scale)),
+            quantity=str(round(bor.fiat_amount / float(por.price), bor.coin_scale)),
             flag="amount",
             # online="0"
         )
-        if br.is_sell:
+        if bor.is_sell:
             credex = await models.CredEx.get(
                 cred__person_id=self.actor.person_id,
-                cred__pmcur__pm__pmexs__exid=por.payments[0],
+                cred__pmcur__pm__pmexs__exid=[pp for pp in por.payments if pp == bor.pmex_exid][0],  # bor.pmex_exid
                 cred__pmcur__pm__pmexs__ex_id=self.ex_client.ex.id,
-                cred__pmcur__cur__ticker=br.cur_exid,
+                cred__pmcur__cur__ticker=bor.cur_exid,
             )
-            req = OrderSellRequest(**req.model_dump(), paymentType=por.payments[0], paymentId=str(credex.exid))
-        return req
-
-    async def _order_request(self, bor: BaseOrderReq) -> OrderResp:
-        por: PreOrderResp = await self.__preorder_request(bor.ad_id)
-        req: OrderRequest | OrderSellRequest = await self.__order_request_build(por, bor)
+            req = OrderSellRequest(**req.model_dump(), paymentType=bor.pmex_exid, paymentId=str(credex.exid))
         # вот непосредственно сам запрос на ордер
         return await self.__order_create(req, bor)
 
     async def __order_create(self, req: OrderRequest | OrderSellRequest, bor: BaseOrderReq) -> OrderResp:
-        res: dict = await self._post("/x-api/fiat/otc/order/create", json=req.model_dump())
+        hdrs = {"Risktoken": self.sec_hdrs["gdfp"]}
+        res: dict = await self._post("/x-api/fiat/otc/order/create", json=req.model_dump(), hdrs=hdrs)
         if res["ret_code"] == 0:
             resp = OrderResp.model_validate(res["result"])
         elif res["ret_code"] == 10001:
@@ -757,10 +755,15 @@ class AgentClient(BaseAgentClient):  # Bybit client
     #     if round(cpc * new_premium / cpm, 2) == m
     #     mad.premium = new_premium.to_eng_string()
 
-    async def racing(
-        self,
-        race: models.Race,
-    ):
+    async def start_race(self):
+        races = await models.Race.filter(started=True, road__ad__maker_id=self.actor.id).prefetch_related(
+            "road__ad__pair_side__pair__cur",
+            "road__ad__pms",
+        )
+        tasks = [asyncio.create_task(self.racing(race), name=f"Rc{race.id}") for race in races]
+        return await gather(*tasks)
+
+    async def racing(self, race: models.Race):
         coinex: models.CoinEx = await models.CoinEx.get(
             coin_id=race.road.ad.pair_side.pair.coin_id, ex=self.actor.ex
         ).prefetch_related("coin")
@@ -972,9 +975,25 @@ class AgentClient(BaseAgentClient):  # Bybit client
         bc, sc = mdl + mdl * (perc / 2), mdl - mdl * (perc / 2)
         return (bc, sc), hp, vmf, zplace
 
-    async def _take_ad(self, req: TakeAdReq):
+    async def take_ad(self, req: TakeAdReq):
+        if req.price and req.is_sell and req.cur_:
+            ...  # todo call the get_ad_details() only if lack of data
         res = self.api.get_ad_details(itemId=req.ad_id)["result"]
         ad: Ad = Ad.model_validate(res)
+        pmexs = await models.PmEx.filter(ex_id=self.actor.ex_id, pm_id=req.pm_id)
+        if len(pmexs) > 1:
+            pmexs = [p for p in pmexs if p.exid in ad.payments]
+        # if ad.side: # продажа, я (тейкер) покупатель
+        #     pmexs = await models.PmEx.filter(ex_id=self.actor.ex_id, pm_id=req.pm_id)
+        #     if len(pmexs) > 1:
+        #         pmexs = [p for p in pmexs if p.name.endswith(f" ({ad.currencyId})")]
+        # else:
+        #     pmexs = await models.CredEx.filter(
+        #         ex_id=self.actor.ex_id, cred__person_id=self.actor.person_id,
+        #         cred__pmcur__pm_id=req.pm_id, cred__pmcur__cur__ticker=ad.currencyId
+        #    )
+        # req.pm_id = pmexs[0].exid
+        # req.quantity = round(req.amount / float(ad.price) - 0.00005, 4)  # todo: to get the scale from coinEx
 
         bor = BaseOrderReq(
             ad_id=str(ad.id),
@@ -983,7 +1002,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
             cur_exid=ad.currencyId,
             coin_exid=ad.tokenId,
             coin_scale=ad.symbolInfo.token.scale,
-            pm_id=req.pm_id,
+            pmex_exid=pmexs[0].exid,
         )
         resp: OrderResp = await self._order_request(bor)
         return resp
@@ -1099,36 +1118,56 @@ class ExcCode(IntEnum):
     Unknown = 912300014
 
 
+@post_save(models.Race)
+async def race_upserted(
+    _cls: type[models.Race], race: models.Race, created: bool, _db: BaseDBAsyncClient, _updated: list[str]
+):
+    logging.warning(f"Race {race.id} is now upserted")
+    asyncio.all_tasks()
+    if created:
+        ...
+    else:  # параметры гонки изменены
+        ...
+
+
 async def main():
     logging.basicConfig(level=logging.INFO)
     cn = await init_db(TORM)
 
-    @post_save(models.Race)
-    async def race_upserted(
-        _cls: type[models.Race], race: models.Race, created: bool, _db: BaseDBAsyncClient, _updated: list[str]
-    ):
-        logging.warning(f"Race {race.id} is now upserted")
-        asyncio.all_tasks()
-        if created:
-            ...
-        else:  # параметры гонки изменены
-            ...
-
     agent = (
-        await models.Agent.filter(actor__ex_id=4, auth__isnull=False, active=True)
-        .prefetch_related("actor__ex", "actor__person__user__gmail")
+        await models.Agent.filter(
+            actor__ex_id=4, auth__isnull=False, status__gt=AgentStatus.off, actor__person__user__id=1
+        )
+        .prefetch_related(
+            "actor__ex",
+            "actor__person__user__gmail",
+            "actor__my_ads__my_ad__race",
+            "actor__my_ads__pair_side__pair__cur",
+            "actor__my_ads__pms",
+        )
         .first()
     )
     filebot = FileClient(NET_TOKEN)
-    await filebot.start()
+    # await filebot.start()
     # b.add_handler(MessageHandler(cond_start_handler, command("cond")))
-    cl: AgentClient = agent.client(filebot, XyncBot(PAY_TOKEN, cn))
+    ex = await models.Ex.get(name="Bybit")
+    ecl: ExClient = ex.client(filebot)
+    cl: AgentClient = agent.client(ecl, filebot, XyncBot(PAY_TOKEN, cn))
+
+    # req = TakeAdReq(ad_id=1955696985964089344, amount=504, pm_id=128)
+    # await cl.take_ad(req)
+
+    # await cl.actual_cond()
+    # cl.get_api_orders(),  # 10, 1738357200000, 1742504399999
 
     # await cl.ex_client.set_pairs()
     # await cl.ex_client.set_pms()
-    await cl.set_creds()
+
+    # await cl.set_creds()
     await cl.export_my_ads()
 
+    await cl.start()
+
     # создание гонок по мои активным объявам:
     # for ma in cl.my_ads():
     #     my_ad = await models.MyAd.get(ad__exid=ma.id).prefetch_related('ad__pms', 'ad__pair_side__pair')
@@ -1153,22 +1192,6 @@ async def main():
     # )
     # await cl.get_api_orders()  # 43, 1741294800000, 1749157199999)
 
-    races = await models.Race.filter(started=True, road__ad__maker_id=agent.actor_id).prefetch_related(
-        "road__ad__pair_side__pair__cur",
-        "road__ad__pms",
-    )
-    tasks = [asyncio.create_task(cl.racing(race), name=f"Rc{race.id}") for race in races]
-    # await cl.actual_cond()
-    try:
-        await gather(
-            *tasks
-            # cl.get_api_orders(),  # 10, 1738357200000, 1742504399999
-        )
-    except Exception as e:
-        await filebot.send("🤬Bybit agent CRASHED!!!🤬", agent.actor.person.user.username_id)
-        await filebot.send(e.__repr__(), agent.actor.person.user.username_id)
-        raise e
-
     # await cl.cancel_order(res.orderId)
     await filebot.stop()
     await cl.close()

xync_client/Bybit/etype/ad.py

@@ -1,7 +1,7 @@
 from enum import StrEnum
 from typing import List, Optional, Any, Literal
-from pydantic import BaseModel, Field, field_serializer
-from xync_schema import xtype
+from pydantic import BaseModel, Field
+from xync_client.Bybit.etype.cred import MyPaymentTerm
 from xync_schema.xtype import BaseAd
 
 from xync_client.Abc.xtype import BaseAdUpdate
@@ -126,59 +126,14 @@ class Ad(BaseAd):
     verificationOrderLabels: List[Any] = None  # for initial actualize
     verificationOrderSwitch: bool = None  # for initial actualize
     version: int = None  # for initial actualize
-    #
-    #
-    # class Ad(BaseAd):
-    #     accountId: str = None  # for initial actualize
-    #     authStatus: int = None  # for initial actualize
-    #     authTag: List[str] = None  # for initial actualize
-    #     ban: bool = None  # for initial actualize
-    #     baned: bool = None  # for initial actualize
-    #     blocked: str = None  # for initial actualize
-    #     createDate: str = None  # for initial actualize
-    #     currencyId: str = None  # for initial actualize
-    #     executedQuantity: str = None  # for initial actualize
-    #     fee: str = None  # for initial actualize
-    #     finishNum: int = None  # for initial actualize
-    #     frozenQuantity: str = None  # for initial actualize
-    #     exid: str = Field(serialization_alias="id")
-    #     isOnline: bool = None  # for initial actualize
-    #     itemType: str = None  # for initial actualize
-    #     lastLogoutTime: str = None  # for initial actualize
-    #     quantity: str = Field(serialization_alias="lastQuantity")
-    #     makerContact: bool = None  # for initial actualize
-    #     max_fiat: str = Field(serialization_alias="maxAmount")
-    #     min_fiat: str = Field(serialization_alias="minAmount")
-    #     nickName: str = None  # for initial actualize
-    #     orderNum: int = None  # for initial actualize
-    #     paymentPeriod: int = None  # for initial actualize
-    #     payments: List[str] = None  # for initial actualize
-    #     premium: str = None  # for initial actualize
-    #     price: str = None  # for initial actualize
-    #     priceType: Literal[0, 1] = None  # for initial actualize  # 0 - fix rate, 1 - floating
-    #     allQuantity: str = Field(serialization_alias="quantity")  # for initial actualize
-    #     recentExecuteRate: int = None  # for initial actualize
-    #     recentOrderNum: int = None  # for initial actualize
-    #     recommend: bool = None  # for initial actualize
-    #     recommendTag: str = None  # for initial actualize
-    #     auto_msg: str = Field(serialization_alias="remark")
-    #     is_sell: Literal[0, 1] = Field(serialization_alias="side")  # for initial actualize # 0 - покупка, 1 - продажа (для мейкера, т.е КАКАЯ объява)
-    #     status: Literal[10, 20, 30]  # 10: online; 20: offline; 30: completed
-    #     symbolInfo: SymbolInfo = None  # for initial actualize
-    #     tokenId: str = None  # for initial actualize
-    #     tokenName: str = None  # for initial actualize
-    #     tradingPreferenceSet: TradingPreferenceSet | None = None  # for initial actualize
-    #     userId: str = Field(serialization_alias="maker__exid")
-    #     userMaskId: str = None  # for initial actualize
-    #     userType: str = None  # for initial actualize
-    #     verificationOrderAmount: str = None  # for initial actualize
-    #     verificationOrderLabels: List[Any] = None  # for initial actualize
-    #     verificationOrderSwitch: bool = None  # for initial actualize
-    #     version: int = None  # for initial actualize
-
-    @field_serializer("status")
-    def status(self, status, _info) -> xtype.AdStatus:
-        return {10: xtype.AdStatus.active, 20: xtype.AdStatus.defActive, 30: xtype.AdStatus.soldOut}[status]
+
+    # @field_serializer("status")
+    # def status(self, status, _info) -> xtype.AdStatus:
+    #     return {10: xtype.AdStatus.active, 20: xtype.AdStatus.defActive, 30: xtype.AdStatus.soldOut}[status]
+
+
+class MyAd(Ad):
+    paymentTerms: List[MyPaymentTerm]
 
 
 class AdPostRequest(BaseModel):

xync_client/Bybit/etype/cred.py

@@ -1,5 +1,3 @@
-from typing import Literal
-
 from pydantic import BaseModel
 
 from xync_client.Abc.xtype import CredExOut
@@ -15,18 +13,31 @@ class PaymentItem(BaseModel):
     required: bool
 
 
-class PaymentConfigVo(BaseModel):
-    paymentType: str
+class BasePaymentConf(BaseModel):
+    paymentType: int
+    paymentName: str
+
+
+class PaymentConfig(BasePaymentConf):
+    class PaymentTemplateItem(BaseModel):
+        labelDialect: str
+        placeholderDialect: str
+        fieldName: str
+
+    paymentDialect: str
+    paymentTemplateItem: list[PaymentTemplateItem]
+
+
+class PaymentConfigVo(BasePaymentConf):
     checkType: int
     sort: int
-    paymentName: str
     addTips: str
     itemTips: str
-    online: Literal[0, 1]  # Non-balance coin purchase (0 Offline), balance coin purchase (1 Online)
-    items: list[PaymentItem]
+    online: int
+    items: list[dict[str, str | bool]]
 
 
-class CredEpyd(CredExOut):
+class PaymentTerm(CredExOut):
     id: str  # int
     realName: str
     paymentType: int  # int
@@ -44,7 +55,7 @@ class CredEpyd(CredExOut):
     mobile: str
     businessName: str
     concept: str
-    online: str
+    online: str = None
     paymentExt1: str
     paymentExt2: str
     paymentExt3: str
@@ -52,6 +63,14 @@ class CredEpyd(CredExOut):
     paymentExt5: str
     paymentExt6: str
     paymentTemplateVersion: int
+
+
+class MyPaymentTerm(PaymentTerm):
+    paymentConfig: PaymentConfig
+    realNameVerified: bool
+
+
+class CredEpyd(PaymentTerm):
     securityRiskToken: str = ""
 
 

xync_client/Bybit/etype/order.py

@@ -3,7 +3,7 @@ from typing import Literal
 
 from pydantic import BaseModel
 
-from xync_client.Bybit.etype.cred import CredEpyd
+from xync_client.Bybit.etype.cred import CredEpyd, PaymentTerm as CredPaymentTerm, PaymentConfigVo
 
 
 class Topic(IntEnum):
@@ -47,9 +47,9 @@ class StatusApi(IntEnum):
 class TakeAdReq(BaseModel):
     ad_id: int | str
     amount: float
-    quantity: float = None
-    is_sell: bool
-    price: float
+    quantity: float | None = None
+    is_sell: bool | None = None
+    price: float | None = None
     pm_id: int | str = None
     cur_: str | None = None
 
@@ -106,8 +106,8 @@ class OrderResp(BaseModel):
     confirmId: str = ""
     success: bool
     securityRiskToken: str = ""
-    riskTokenType: Literal["challenge"] = None
-    riskVersion: Literal["1", "2"] = None
+    riskTokenType: Literal["challenge", ""] = ""
+    riskVersion: Literal["1", "2", ""] = ""
     needSecurityRisk: bool
     isBulkOrder: bool
     confirmed: str = None
@@ -143,43 +143,7 @@ class AppraiseInfo(BaseModel):
     updateDate: str
 
 
-class PaymentConfigVo(BaseModel):
-    paymentType: str
-    checkType: int
-    sort: int
-    paymentName: str
-    addTips: str
-    itemTips: str
-    online: int
-    items: list[dict[str, str | bool]]
-
-
-class PaymentTerm(BaseModel):
-    id: str
-    realName: str
-    paymentType: int
-    bankName: str
-    branchName: str
-    accountNo: str
-    qrcode: str
-    visible: int
-    payMessage: str
-    firstName: str
-    lastName: str
-    secondLastName: str
-    clabe: str
-    debitCardNumber: str
-    mobile: str
-    businessName: str
-    concept: str
-    online: str
-    paymentExt1: str
-    paymentExt2: str
-    paymentExt3: str
-    paymentExt4: str
-    paymentExt5: str
-    paymentExt6: str
-    paymentTemplateVersion: int
+class PaymentTerm(CredPaymentTerm):
     paymentConfigVo: PaymentConfigVo
     ruPaymentPrompt: bool
 

xync_client/Bybit/ex.py

@@ -2,8 +2,10 @@ import json
 from asyncio import run
 
 from pyro_client.client.file import FileClient
+from x_client import df_hdrs
 from x_model import init_db
 from xync_schema import models, xtype
+from xync_schema.enums import AdStatus
 from xync_schema.models import Ex, Agent
 
 from xync_client.Abc.Ex import BaseExClient
@@ -14,7 +16,8 @@ from xync_client.loader import TORM
 
 
 class ExClient(BaseExClient):  # Bybit client
-    headers = {"cookie": ";"}  # rewrite token for public methods
+    host = "api2.bybit.com"
+    headers = df_hdrs  # rewrite token for public methods
     agent: Agent = None
 
     async def _get_auth_cks(self) -> dict[str, str]:
@@ -22,6 +25,14 @@ class ExClient(BaseExClient):  # Bybit client
             self.agent = await Agent.get(actor__ex=self.ex).prefetch_related("actor")
         return self.agent.auth["cookies"]
 
+    @staticmethod
+    def ad_status(status: int) -> AdStatus:
+        return {
+            10: AdStatus.active,
+            20: AdStatus.defActive,
+            30: AdStatus.soldOut,
+        }[status]
+
     async def _get_config(self):
         resp = await self._get("/fiat/p2p/config/initial")
         return resp["result"]  # todo: tokens, pairs, ...

xync_client/Htx/agent.py

@@ -46,7 +46,7 @@ class AgentClient(BaseAgentClient):
 
     async def cred_new(self, cred: models.Cred) -> models.CredEx:
         pmcur = await cred.pmcur
-        exid = str(await models.PmEx.get(pm_id=pmcur.pm_id, ex=self.ex_client.ex).values_list("exid", flat=True))
+        exid = str(await models.PmEx.get(pm_id=pmcur.pmex_exid, ex=self.ex_client.ex).values_list("exid", flat=True))
         field_map = {
             "payee": "name",
             "bank": "extra",
@@ -71,7 +71,7 @@ class AgentClient(BaseAgentClient):
 
     async def cred_upd(self, cred: models.Cred, exid: int) -> models.CredEx:
         pmcur = await cred.pmcur
-        _exid = str(await models.PmEx.get(pm_id=pmcur.pm_id, ex=self.ex_client.ex).values_list("exid", flat=True))
+        _exid = str(await models.PmEx.get(pm_id=pmcur.pmex_exid, ex=self.ex_client.ex).values_list("exid", flat=True))
         field_map = {
             "payee": "name",
             "bank": "extra",

xync_client/Mexc/agent.py

@@ -1,4 +1,5 @@
 from asyncio import run
+from hashlib import md5
 from uuid import uuid4
 
 from pyro_client.client.file import FileClient
@@ -24,11 +25,11 @@ class AgentClient(BaseAgentClient):
         self.i = 33 if self.i > 9998 else self.i + 2
         hdrs = self.headers | {"trochilus-trace-id": f"{uuid4()}-{self.i:04d}"}
         auth = {
-            "p0": "hzE/loX7MBr0j8vnx7n5qY72DCChDHOiNG/ZAXbc0BrKIiwLc7cqg0vDdK15x/qArCO1xCX2jNqmtGO0aUxa0yrspnh2xX8tJnZ1oDbvkqPjcJuKdnvehVL2rMHVXOtC0ImfcZ++zfmIXrNFchhC+u2O9LqyjiHw8F5XNtdkMVWzcgs2tNAZmZiyliHDQso3WslCuRyp0iAogxT99DdP2A5bNoqOFvcurk0+/mMFskoeGwykq7OBVAGKhHwr4jbFFURGE5DYN1tKHUtIYkDaul5b+wpLn83IEYSEhwwxfSE+cy3VvKE7xPiAOf/ptmZa9s0FyALNb8jCeTLwa8Wh4stO0qM/flL0oOHXXA+dxiQtQIDOdFqOIKoDhPrZ9nnqq0V/UyhACk4Omf7dc9ElVtbNuX4Q/bgZefAE674y+IXvBHl9ss36kVOImui2xpT0lH+sc35pR8xht5SndOTz6+oiHLIr+z850DYSVpj06i343sSjTfQxNj1bKATpRTXgOVwPTUO67hMFSFFpNLQ7Mxl5IeKEXI7dZjud1qlxIVSPJAYe6m3vomY6jm4U50C11Nh9CXC9p9TcD0e7QPfchzoSiFjzkwCxfOjAsxWzKkSpSnoaQTHO58c6RieHszMsahazVqCQ9rtLJV4kJ65lKLPegKrBY/yI4gXQs0NdvtdFjdGd5EBTC1inr3g7PeSvNZc9PzN5y/x0oC5r2KGBY4CdxqWxzAnr7Tvnl2sL8MPZ6WDcizCnK6aegfl0Kk976MOlC221ZfPutfYTuyB4d1utADE82g2X63idNtF/h6iUl9bIsAKisoNzgUz26MCzkG/K++Cm/0/Sip40znh4lmT0z6XNhA4GiXmjbkxrhUsI4M8HiVRjuNWvrdq7D2l81j5K+JYHFWOaAUQuDNx+bB4eB9KJnHX03hxkJYfhYQtxr+X1LAPITWWfb+qmFy8x4+mWP1TVTBl27j7FAqWXnCL8FeJQ4sSP7Xphj3t7Fd62RtQewiq5L/BYegJGD3c9NvQBvC2gOXMuhTIE9RcQAUdXDsKKizZ4mXpXTvcGYXwednrVwz1SaLe8WhEe54e6tSLRf5Or3pce/7epsDqrKQXDeKugo6so//SN8y7wPsd8xpGeBtUjhvrESwNcRp305pYm4f+2A4lF71a92P6PHSOQm5ruGT7qB+9uwvzXIoFY985dI8aRq7g7GbAyQ1z7LhhjJzS11xUEpekunxdAxySl6OOFcAlTjnx8FgGBl2xiP+KtTJeSVB4b07OsqoUmAS54I0Sj19Tm8WQz+FKbKZ0eReApT+gyyqFJBSRcJYIyA3dLL/fYSNfNmNUu76KGR+o3xMHTSb8V/kVHmgWs6qmE98NE1BcXWnABiHVkqZU0lU/R0b9jhuUaYXB0md0VjyY61MztgfEk6VQnWfPQT/POuic6lBf4UJ3IWolsGttYlLo9sa9mAUqLXuDeSo+mTs7nDECVyYGZK/E+BCG+eEnhmwKB8dvY500kE/0Megf4i4Ymi0GG0jjy3z8VLsjP2cnUGrQHfe8d/etqgPN0CFI7crxEFoAeo8fl9VfEyr+ug61MWt+jcFtU2wfK66A75iPHobQpZVxW1tOv72PhiKTDWjgsLifJlYmFG1Eoadq8kiSEgkldsSCEYPTSjj4anXGSVBicRiaNliyQTuDT8DOjKmv3jGgu7opv/wKQ8Lz1FZDwL6i9WJExFzebdgJn+RNRZjpjWWKH0A9c0ZTd0Xa9q9WZyxEe8bycEkf4e4jnoalL4w==",
-            "k0": "Dt/l/MGcXIAOoCeR1L1VW5vTgqRcc4qqXzXrb6O+/a/2c9pHywRAVhPZZm46Us91VyNi2zg3S6Dzpe3FiwnC/NC1zwFAfKLIcKYgnDxTHesv5jUEYghDFlDsZFzCeY6b0TJ6ZlNr7+/NOQ4Hx1gbCsOlO0BrcMJ+DlqJlR7KM0od2SBWmbmJO1Dh25H/PzKnPhzq4NDuzHGcsDMrlkqmsKFHvkF01IiPVOCMFMdOWfCy3O4HGsSu3r9b/JvhxsC8hdfOZg1JKKDtKOGaHo8Fmajqozp39akG8EKk4C27hf2qDT2zh0LLrb3ZL0Gnd0y33LJTvUbYBSfFK1b7xv0i0A==",
-            "chash": "ccef0ebde038ce0e7cb086851c51781c498a429be65ab70bf4f46671c637516e",
-            "mtoken": "9482d04a3235e3090e954d3b6a8871e1",
-            "mhash": "06cabb6939e0262495aa5d55e44dfc27",
+            "p0": self.actor.agent.auth["p0"],
+            "k0": self.actor.agent.auth["k0"],
+            "chash": self.actor.agent.auth["chash"],
+            "mtoken": self.actor.agent.auth["deviceId"],
+            "mhash": md5(self.actor.agent.auth["deviceId"].encode()).hexdigest(),
         }
         data = {
             "scene": "TRADE_BUY",

xync_client/Pms/Volet/__init__.py

@@ -273,7 +273,7 @@ async def _test():
         pma = await models.PmAgent.get(
             active=True,
             auth__isnull=False,
-            pm_id=o.cred.pmcur.pm_id,
+            pm_id=o.cred.pmcur.pmex_exid,
             user__person__actors=o.ad.maker_id,
             user__status=UserStatus.ACTIVE,
         ).prefetch_related("pm", "user__gmail", "user__username__session")

{xync_client-0.0.150.dist-info → xync_client-0.0.152.dist-info}/METADATA

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

@@ -2,18 +2,18 @@ xync_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_client/details.py,sha256=21itVPCgAtaYRR1H9J9oYudj95gafcFjExUN6QL17OI,1330
 xync_client/loader.py,sha256=hxf8ob50DO7r_qjr2qBoO7IyjkXeHHzVQ63YjXerjoU,600
 xync_client/pm_unifier.py,sha256=T2Xh-tvcu114P2YBI6RK_XDiaIhyq6ABMrXDuXPlx7A,6541
-xync_client/Abc/AdLoader.py,sha256=VgT6y1b2icFSm4-pjpA2H5WUXjlRf7acBxBR9t9Tips,13701
-xync_client/Abc/Agent.py,sha256=IiDjtm5UckYIr6HTPEvSq9b_hbWjR8GCsfYlwthgJ9s,6591
+xync_client/Abc/AdLoader.py,sha256=fUHYwa8U0sCV3hTq2DjREt6RclxJelHB9b-mCD4HSnE,13500
+xync_client/Abc/Agent.py,sha256=bvD3lGJMcOLY14dyz8in6PqNuTkz_MAdHinTUYvTePs,6421
 xync_client/Abc/Asset.py,sha256=hlgyFaU9byr2N2r8Heh-_ICx49SKuKxfRTUA4yQWmEw,454
 xync_client/Abc/Auth.py,sha256=OPQXN7_XYQZP9431ylFksd6JDusbKG8N_1g6CXTZ6yY,1495
 xync_client/Abc/BaseTest.py,sha256=vaAs5Z4HYV7k_C3zQz6JKO75s2hXtVbBI3-0Srkzv5Q,2388
-xync_client/Abc/Ex.py,sha256=6i78hduLVULyaTYlKbu7hsSrCIWVGrFB0HMll0TeSxM,13091
+xync_client/Abc/Ex.py,sha256=PxB_s4pGSAcR5oraZxml749NH4sHS07VMv6eIq2ivt8,13125
 xync_client/Abc/Exception.py,sha256=Sts7RpP370NBdjaH_cyXDdHtjge8zXNUGWCrKw49Zyk,482
 xync_client/Abc/HasAbotUid.py,sha256=LsTHHjMHBauCwJoqgDa9Lx4R6xsDOHfsN4jM539Bpqg,279
-xync_client/Abc/InAgent.py,sha256=XLf5czbxxEimsIIe653buoP7OsWZD6mc2w37q4TkNd0,703
+xync_client/Abc/InAgent.py,sha256=8BnZ7VzWLIJY93xnNTqlpY3JdarQkkpRRjDDEALaVAA,303
 xync_client/Abc/Order.py,sha256=7-FGIJu5z9aYi0A_eJV4F-cp_6Mz_izNpefexDQZvHw,2428
 xync_client/Abc/PmAgent.py,sha256=8ozQDxriAwtU2cNsJleuWcZ2ZdNeZPhgwO6l6jvi0MY,4350
-xync_client/Abc/xtype.py,sha256=FRvYm_VeQiCNOzjw2Ey1iwl9PC8hfjcAqKEEpU5_7Fc,2607
+xync_client/Abc/xtype.py,sha256=SnzcFm6muyaNXc2qRKub9nRnkaslD19wU-eAK3HbRMA,2615
 xync_client/Binance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_client/Binance/binance_async.py,sha256=LP2DZaHwkfsp_4Tjvetb-1ntjQtJfODF0OgZpoPx4KU,2688
 xync_client/Binance/earn_api.py,sha256=hvk0MaVTLszIglQXVhbUjGcaHfbF9Ul7FFXmy94U2so,4411
@@ -36,21 +36,21 @@ xync_client/BitGet/agent.py,sha256=YVs3bDY0OcEJGU7m2A8chzO6PFhWDnQQrA-E6MVkBBg,3
 xync_client/BitGet/ex.py,sha256=uEvvXuLaJv8o8BFi0bMA3XyBuTfVDWagAjLOHZl-xlE,3765
 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=1Y4ZyxqAY8xbAflku48fJjjlSs4pOz2mFFJSO9iWg8w,26405
-xync_client/Bybit/agent.py,sha256=gejZk59WhhBOPPdzmGk2UIoNyKj-bfsJnz18jCa2Pto,53407
-xync_client/Bybit/ex.py,sha256=3oARvReBoDs90FzQY31-L-q_YU-TIRbvWB7z4lwESsA,4715
+xync_client/Bybit/InAgent.py,sha256=X-35twM8kftkFFB1fBSbU2aWGBkU1wrkMQ0tejX84S0,26049
+xync_client/Bybit/agent.py,sha256=En7hYrMbIqHZJYnncrX0EhjKXlO6sQBF_lytWA8jaKs,54632
+xync_client/Bybit/ex.py,sha256=UgtTE42nmJ2y5fMB2xwsr90wXOS_0qzBSPGdjo4z1pI,5004
 xync_client/Bybit/order.py,sha256=H4UIb8hxFGnw1hZuSbr0yZ4qeaCOIZOMc6jEst0ycBs,1713
 xync_client/Bybit/web_earn.py,sha256=qjqS10xlFc8r40IhDdPZ0LxA2dFEGbvBGXdsrUUJCMo,3019
 xync_client/Bybit/web_p2p.py,sha256=sAXzK03t6jwDnz4rrvP2IzI0KxfKa7C_5GuzH1HwLuA,11768
 xync_client/Bybit/ws.py,sha256=OQjZHo_MiAH1dlOs3c-aUZBKyqToNTmH560udh6RYDE,1431
-xync_client/Bybit/etype/ad.py,sha256=pCD0I9SL4Paaegs85fHGtvZ-7Cm917AQXYel0k1MbY0,8065
-xync_client/Bybit/etype/cred.py,sha256=qDQUsMqLV4XtXKYWZV4f805kLDf7AdcPYscHRA-IMBo,1386
-xync_client/Bybit/etype/order.py,sha256=EuBZPS_mkGgoEF9kSne3g-BpopBD6io8XPs5Uxbyx_U,8970
+xync_client/Bybit/etype/ad.py,sha256=r356t4Kmho5Q6BAS0JWyRmsxui427W9O2Y1glUU6l3g,5091
+xync_client/Bybit/etype/cred.py,sha256=CH6xqHh1214bLhHy_K9eVBb1SJVhWBfGb0l3LtBf3fU,1701
+xync_client/Bybit/etype/order.py,sha256=wkePjjMXZcc2Nqbp8RU-HVruIV3qD1Ki4YrT4VOlBZc,8372
 xync_client/Gate/ex.py,sha256=QbhB3u7TWnvVGD-AknB2nay6KZjEXQ-1JT9UacX4sWI,3735
 xync_client/Gate/premarket.py,sha256=IW-CgkmNJePJR2j_NRfULNKTePMX35XlhldqdiO76zY,2138
 xync_client/Gate/etype/ad.py,sha256=-EwtFcOWWvtE6UjaOdsuXWDTCVjAIRK0kSEsqPP4Yls,1296
 xync_client/Gmail/__init__.py,sha256=9JGT8PyzJaOTVvaFV0Gki3Fdo6Bp6m6DnWOPGZJ-eAA,5436
-xync_client/Htx/agent.py,sha256=rOURgTeY9TsA-IzT78l5-Ze91i0x1PY683mrX38MSgs,7356
+xync_client/Htx/agent.py,sha256=RzDgs5HSIoyoCsPjNcbmI1GyXjq8AzTXbUpi5jcyBZY,7364
 xync_client/Htx/earn.py,sha256=jL6eRwytZEMRom_3bFm1DYthi_GFg-E1Mm3ZDXENHSg,2386
 xync_client/Htx/ex.py,sha256=GuWK5lA_MvtSd-0DhKf2MAstKvZMHhc3BIiZSgdwZv4,6074
 xync_client/Htx/etype/__init__.py,sha256=sZIhFOxj2dRQRmMe86-y9vlzOGAPo1qoOi6u1qVxWr0,123
@@ -62,7 +62,7 @@ xync_client/KuCoin/ex.py,sha256=w-6-aedlC1mYf8LShMv6pOrQzqMR9E6yIyXGUHQP888,3237
 xync_client/KuCoin/web.py,sha256=--OHS0Z29xjfNUjdTL7K0EDmU4dwej95OJ8Sv4PsxLI,920
 xync_client/KuCoin/etype/ad.py,sha256=MTx90Qo2xFKvfgIr4_qMowjwO23HVpFCD6J7INNFDuQ,1223
 xync_client/KuCoin/etype/pm.py,sha256=S50S5fyY5YeWlcPwO66o-GsPcdqgoeXuxvmEIy6Zqvs,130
-xync_client/Mexc/agent.py,sha256=htJm-FSrKGJ0i3E169Ji901yxUItI6QtjalgRqHR3rA,4905
+xync_client/Mexc/agent.py,sha256=7xhT-UH3aLFAVAfnGUhHqOauNeADNt84ifsT-x3ydq4,2843
 xync_client/Mexc/ex.py,sha256=jpITGa2GTeYayMVStQOomBW-P0YQoXjKExKZi_kS-2A,4295
 xync_client/Mexc/etype/ad.py,sha256=GUgvylx_z64CXNcw0YejUQJHg9F59eRo5v0zU7DRrAM,1434
 xync_client/Mexc/etype/pm.py,sha256=m5kCoMx9IEKUPB-z7YwwymQhASkv2npC4-Z_ePYeeRY,453
@@ -81,7 +81,7 @@ xync_client/Pms/Payeer/login.py,sha256=GyNwB-GKE_1nlkbZJ0KNI-EnCT0j_S9ogFdn-ufb-
 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
-xync_client/Pms/Volet/__init__.py,sha256=JGd1QDn_H-tqck932cbARGLSOCHmnHKIns05Ll8dowA,12048
+xync_client/Pms/Volet/__init__.py,sha256=lAvGjcdL7xpUmXYRaNqZP7MWvVnmzcJ_frEQaedJMJ8,12052
 xync_client/Pms/Volet/api.py,sha256=6_dH2rzmyyvha3PeoiZdSltiAzKDWn8roSUJOAErX4M,3673
 xync_client/Pms/Volet/pl.py,sha256=l7lvUrpjFoObXPHaseOIAcSbkNqJdpy6OLDutxYJH3U,2451
 xync_client/Pms/Volet/_todo_req/req.mjs,sha256=ut3Jw37rL5lY7SskjZ9f1l0VE33tuP-PZEYUTcJMc2I,817
@@ -98,7 +98,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.150.dist-info/METADATA,sha256=MYF6WFaa4ISVIDcRTVfwr4fLGEWSmFz-ZnqLbGOH6DI,1149
-xync_client-0.0.150.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_client-0.0.150.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
-xync_client-0.0.150.dist-info/RECORD,,
+xync_client-0.0.152.dist-info/METADATA,sha256=cv_7YQL73atQmcBt1w7E4VY-6ZI8lOkMrmZwxDMF_6M,1149
+xync_client-0.0.152.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.152.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.152.dist-info/RECORD,,