xync-client 0.0.150__tar.gz → 0.0.151__tar.gz

{xync_client-0.0.150/xync_client.egg-info → xync_client-0.0.151}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.150
+Version: 0.0.151
 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 → xync_client-0.0.151}/xync_client/Abc/Agent.py

@@ -134,21 +134,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-0.0.150 → xync_client-0.0.151}/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-0.0.150 → xync_client-0.0.151}/xync_client/Bybit/InAgent.py

@@ -335,7 +335,7 @@ 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)
+            pmex = await models.PmEx.get(pm_id=order_db.cred.pmcur.pmex_exid, 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(
                 orderId=str(order_db.exid),
@@ -385,20 +385,20 @@ class InAgentClient(BaseInAgentClient):
             exid__in=[ptl.id for ptl in order.paymentTermList],
             cred__person=self.agent_client.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):

{xync_client-0.0.150 → xync_client-0.0.151}/xync_client/Bybit/agent.py

@@ -22,6 +22,7 @@ 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
@@ -54,10 +55,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] = []
@@ -91,6 +90,11 @@ class AgentClient(BaseAgentClient):  # Bybit client
 
     def __init__(self, agent: Agent, fbot: FileClient, bbot: XyncBot, **kwargs):
         super().__init__(agent, 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
@@ -268,46 +272,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 +368,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:
@@ -972,9 +956,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 +983,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
@@ -1115,14 +1115,22 @@ async def main():
             ...
 
     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, active=True, actor__person__user__id=2)
+        .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))
+    req = TakeAdReq(ad_id=1955696985964089344, amount=504, pm_id=128)
+    await cl.take_ad(req)
 
     # await cl.ex_client.set_pairs()
     # await cl.ex_client.set_pms()

{xync_client-0.0.150 → xync_client-0.0.151}/xync_client/Bybit/etype/order.py

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

{xync_client-0.0.150 → xync_client-0.0.151}/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-0.0.150 → xync_client-0.0.151}/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-0.0.150 → xync_client-0.0.151}/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 → xync_client-0.0.151/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.150
+Version: 0.0.151
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client