xync-client 0.0.25.dev110__tar.gz → 0.0.25.dev112__tar.gz

{xync_client-0.0.25.dev110/xync_client.egg-info → xync_client-0.0.25.dev112}/PKG-INFO

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

@@ -11,9 +11,9 @@ from xync_client.Abc.types import CredExOut
 
 
 class BaseAgentClient(BaseClient):
-    def __init__(self, agent: Agent):
+    def __init__(self, agent: Agent, headers: dict[str, str] = None, cookies: dict[str, str] = None):
         self.agent: Agent = agent
-        super().__init__(self.agent.actor.ex)  # , "host_p2p"
+        super().__init__(self.agent.actor.ex, "host_p2p", headers, cookies)
         self.ex_client: BaseExClient = self.ex.client()
 
     # 0: Получшение ордеров в статусе status, по монете coin, в валюте coin, в направлении is_sell: bool

{xync_client-0.0.25.dev110 → xync_client-0.0.25.dev112}/xync_client/Abc/Base.py

@@ -10,6 +10,6 @@ MapOfIdsList = dict[int | str, list[int | str]]
 class BaseClient(Client):
     ex: Ex
 
-    def __init__(self, ex: Ex, attr: str = "host_p2p"):
+    def __init__(self, ex: Ex, attr: str = "host_p2p", headers: dict[str, str] = None, cookies: dict[str, str] = None):
         self.ex = ex
-        super().__init__(getattr(ex, attr))
+        super().__init__(getattr(ex, attr), headers, cookies)

{xync_client-0.0.25.dev110 → xync_client-0.0.25.dev112}/xync_client/Abc/Ex.py

@@ -1,10 +1,13 @@
 import logging
 from abc import abstractmethod
+from asyncio import sleep
 
 import msgspec
+from aiohttp import ClientSession
 from msgspec import Struct
 from tortoise.exceptions import MultipleObjectsReturned, IntegrityError
 from xync_schema import models
+from xync_schema.enums import FileType
 from xync_schema.types import CurEx, CoinEx, BaseAd, BaseAdIn
 
 from xync_client.Abc.Base import BaseClient, MapOfIdsList
@@ -66,7 +69,7 @@ class BaseExClient(BaseClient):
 
     # Импорт Pm-ов (с Pmcur-, Pmex- и Pmcurex-ами) и валют (с Curex-ами) с биржи в бд
     async def set_pmcurexs(self):
-        PyroClient(bot)
+        pbot = PyroClient(bot)
         # Curs
         cur_pyds: dict[str, CurEx] = await self.curs()
         curs: dict[int | str, models.Cur] = {
@@ -154,33 +157,33 @@ class BaseExClient(BaseClient):
                 await models.Pmex.update_or_create({"pm": pm_}, ex=self.ex, exid=k, name=pm.name)
             else:
                 pmin = models.Pm.validate({**pmu.model_dump(), "country_id": country_id, "typ": pm.typ})
-                # # logo
-                # if pm.logo and not await models.File.exists(name=pm.logo):
-                #     if not pm.logo.startswith("https:"):
-                #         if not pm.logo.startswith("/"):
-                #             pm.logo = "/" + pm.logo
-                #         pm.logo = "https://" + pm.logo
-                #     async with ClientSession() as ss:
-                #         resp = await ss.get(pm.logo)
-                #         if resp.ok:
-                #             byts = await resp.read()
-                #             upf, ref = await pyro.save_file(byts, resp.content_type)
-                #             await sleep(1)
-                #             typ = FileType[resp.content_type.split("/")[-1]]
-                #             file, _ = await models.File.update_or_create(
-                #                 {"ref": ref, "size": len(byts), "typ": typ}, name=pm.logo
-                #             )
-                #             # fil = await pyro.get_file(file.ref)  # check
-                #             pmin.logo_id = file.id
-                # # /logo
+                # logo
+                if pm.logo or (file := None):
+                    if not (file := await models.File.get_or_none(name=pm.logo)):
+                        if not pm.logo.startswith("https:"):
+                            if not pm.logo.startswith("/"):
+                                pm.logo = "/" + pm.logo
+                            pm.logo = "https://" + pm.logo
+                        async with ClientSession() as ss:
+                            resp = await ss.get(pm.logo)
+                            if resp.ok:
+                                byts = await resp.read()
+                                upf, ref = await pbot.save_file(byts, resp.content_type)
+                                await sleep(1)
+                                typ = FileType[resp.content_type.split("/")[-1]]
+                                file, _ = await models.File.update_or_create(
+                                    {"ref": ref, "size": len(byts), "typ": typ}, name=pm.logo
+                                )
+                                await pbot.get_file(file.ref)  # check
+                # /logo
                 try:
                     pms[k], _ = await models.Pm.update_or_create(**pmin.df_unq())
                 except (MultipleObjectsReturned, IntegrityError) as e:
                     raise e
             prev = k, pmu.norm, pm.name, pmu.country
         # Pmexs
-        pmexs = [models.Pmex(exid=k, ex=self.ex, pm=pm, name=pms_epyds[k].name) for k, pm in pms.items()]
-        await models.Pmex.bulk_create(pmexs, on_conflict=["ex_id", "exid"], update_fields=["pm_id", "name", "name_"])
+        pmexs = [models.Pmex(exid=k, ex=self.ex, pm=pm, name=pms_epyds[k].name, logo=file) for k, pm in pms.items()]
+        await models.Pmex.bulk_create(pmexs, on_conflict=["ex_id", "exid"], update_fields=["pm_id", "logo_id", "name"])
         # Pmex banks
         for k, pm in pms_epyds.items():
             if banks := pm.banks:

{xync_client-0.0.25.dev110 → xync_client-0.0.25.dev112}/xync_client/Binance/ex.py

@@ -20,7 +20,10 @@ class ExClient(BaseExClient):
         super().__init__(ex)
 
     class BinanceUnifier(PmUnifier):
-        pm_map = {"Banque de développement local (BDL)": "Banque de développement local (BDL)"}
+        pm_map = {
+            "Banque de développement local (BDL)": "Banque de développement local (BDL)",
+            "Viettel Money": "ViettelPay"
+        }
 
     unifier_class = BinanceUnifier
 

{xync_client-0.0.25.dev110 → xync_client-0.0.25.dev112}/xync_client/BingX/ex.py

@@ -18,8 +18,8 @@ class ExClient(BaseExClient, BaseBingXClient):
     class BingUnifier(PmUnifier):
         pm_map = {
             "СБП": "SBP",
-            "Touch n Go": "Touch 'n Go",
-            "Transfer with Specific Bank": "Transfers with specific bank"
+            "Transfer with Specific Bank": "Transfers with specific bank",
+            "Al-Rafidain Qi Services": "Al-Rafidain QiServices",
         }
 
     unifier_class = BingUnifier

{xync_client-0.0.25.dev110 → xync_client-0.0.25.dev112}/xync_client/BitGet/ex.py

@@ -21,6 +21,9 @@ class ExClient(BaseExClient):
         pm_map = {
             "Philippine National Bank": "Philippines National Bank",
             "Banque du Developpement Local BDL": "Banque de développement local (BDL)",
+            "ADCB Abu Dhabi Commercial Bank": "ADCB",
+            "BDO": "Banco De Oro (BDO)",
+            "Touch 'n Go": "Touch n Go"
         }
 
     unifier_class = BitGetUnifier

{xync_client-0.0.25.dev110 → xync_client-0.0.25.dev112}/xync_client/Bybit/agent.py

@@ -1,12 +1,17 @@
+from asyncio import run
 from enum import IntEnum
 from time import sleep
 
 import pyotp
+from x_model import init_db
+from xync_schema import models
+
 from xync_client.Abc.Base import FlatDict
 from xync_schema.models import Cur
 
 from xync_client.Abc.Agent import BaseAgentClient
-from xync_client.loader import BYT2FA
+from xync_client.Bybit.ws import prv
+from xync_client.loader import BYT2FA, PG_DSN
 
 
 class NoMakerException(Exception):
@@ -18,7 +23,7 @@ class AdsStatus(IntEnum):
     WORKING = 1
 
 
-class ExClient(BaseAgentClient):  # Bybit client
+class AgentClient(BaseAgentClient):  # Bybit client
     host = "api2.bybit.com"
     headers = {"cookie": ";"}  # rewrite token for public methods
 
@@ -109,31 +114,35 @@ class ExClient(BaseAgentClient):  # Bybit client
             return fiat
         return list_methods[1]
 
+    async def ott(self):
+        t = await self._post("/user/private/ott")
+        return t
+
     # 27
-    def fiat_upd(self, fiat_id: int, detail: str, name: str = None) -> dict:
+    async def fiat_upd(self, fiat_id: int, detail: str, name: str = None) -> dict:
         fiat = self.get_payment_method(fiat_id)
         fiat["realName"] = name
         fiat["accountNo"] = detail
         result = await self._post("/fiat/otc/user/payment/new_update", fiat)
         srt = result["result"]["securityRiskToken"]
-        self._check_2fa(srt)
+        await self._check_2fa(srt)
         fiat["securityRiskToken"] = srt
         result2 = await self._post("/fiat/otc/user/payment/new_update", fiat)
         return result2
 
     # 28
-    def fiat_del(self, fiat_id: int) -> dict:
+    async def fiat_del(self, fiat_id: int) -> dict | str:
         data = {"id": fiat_id, "securityRiskToken": ""}
         method = await self._post("/fiat/otc/user/payment/new_delete", data)
         srt = method["result"]["securityRiskToken"]
-        self._check_2fa(srt)
+        await self._check_2fa(srt)
         data["securityRiskToken"] = srt
         delete = await self._post("/fiat/otc/user/payment/new_delete", data)
         return delete
 
-    def switch_ads(self, new_status: AdsStatus) -> dict:
+    async def switch_ads(self, new_status: AdsStatus) -> dict:
         data = {"workStatus": new_status.name}
-        res = self._post("/fiat/otc/maker/work-config/switch", data)
+        res = await self._post("/fiat/otc/maker/work-config/switch", data)
         return res
 
     def online_ads(self) -> str:
@@ -145,7 +154,7 @@ class ExClient(BaseAgentClient):  # Bybit client
         ads = [ad for ad in list_ads if set(ad["payments"]) - {"5", "51"}]
         return float(ads[0]["price"])
 
-    def my_fiats(self, cur: Cur = None):
+    async def my_fiats(self, cur: Cur = None):
         upm = await self._post("/fiat/otc/user/payment/list")
         return upm["result"]
 
@@ -296,3 +305,21 @@ class ExClient(BaseAgentClient):  # Bybit client
                 "size": 10,
             },
         )
+
+
+def listen(data: dict):
+    print(data)
+
+
+async def main():
+    _ = await init_db(PG_DSN, models, True)
+    agent = await models.Agent.filter(actor__ex_id=9, auth__isnull=False).prefetch_related("actor__ex").first()
+    cl: AgentClient = agent.client()
+    t = await cl.ott()
+    ts = int(float(t["time_now"]) * 1000)
+    await prv(agent.auth["deviceId"], t["result"], ts, listen)
+    await cl.close()
+
+
+if __name__ == "__main__":
+    run(main())

{xync_client-0.0.25.dev110 → xync_client-0.0.25.dev112}/xync_client/Bybit/ex.py

@@ -24,6 +24,8 @@ class ExClient(BaseExClient):  # Bybit client
             "Local Card-Green": "Sberbank",
             "Local Card-Yellow": "T-Bank",
             "Banque de développement local (BDL)": "Banque de développement local (BDL)",
+            "Al-Rajhi Bank": "Al Rajhi Bank",
+            "BDO": "Banco De Oro (BDO)"
         }
 
     host = "api2.bybit.com"

xync_client-0.0.25.dev112/xync_client/Bybit/ws.py

@@ -0,0 +1,37 @@
+import json
+
+import websockets
+
+
+async def prv(did: str, tok: str, ts: int, cb: callable):
+    u = f"wss://ws2.bybit.com/private?appid=bybit&os=web&deviceid={did}&timestamp={ts}"
+    async with websockets.connect(u) as websocket:
+        auth_msg = json.dumps({"req_id": did, "op": "login", "args": [tok]})
+        await websocket.send(auth_msg)
+
+        sub_msg = json.dumps({"op": "subscribe", "args": ["FIAT_OTC_TOPIC", "FIAT_OTC_ONLINE_TOPIC"]})
+        await websocket.send(sub_msg)
+        sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"SUPER_DEAL"}']})
+        await websocket.send(sub_msg)
+        sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"OTC_ORDER_STATUS"}']})
+        await websocket.send(sub_msg)
+        sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"WEB_THREE_SELL"}']})
+        await websocket.send(sub_msg)
+        sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"APPEALED_CHANGE"}']})
+        await websocket.send(sub_msg)
+
+        sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.cashier.order"]})
+        await websocket.send(sub_msg)
+        sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.cashier.order-eftd-complete-privilege-event"]})
+        await websocket.send(sub_msg)
+        sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.cashier.order-savings-product-event"]})
+        await websocket.send(sub_msg)
+        sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.deal-core.order-savings-complete-event"]})
+        await websocket.send(sub_msg)
+
+        sub_msg = json.dumps({"op": "subscribe", "args": ["FIAT_OTC_TOPIC", "FIAT_OTC_ONLINE_TOPIC"]})
+        await websocket.send(sub_msg)
+
+        while resp := await websocket.recv():
+            if data := json.loads(resp).get("data"):
+                cb(data)

{xync_client-0.0.25.dev110 → xync_client-0.0.25.dev112}/xync_client/Mexc/ex.py

@@ -18,7 +18,8 @@ class ExClient(BaseExClient):
         pm_map = {
              "Philippine National Bank (PNB)": "Philippines National Bank (PNB)",
              "Al-Rajhi Bank": "Al Rajhi Bank",
-             "SBP - Fast Bank Transfer": "SBP"
+             "SBP - Fast Bank Transfer": "SBP",
+             "Touch 'n Go": "Touch n Go"
         }
     unifier_class = MexcUnifier
 

{xync_client-0.0.25.dev110 → xync_client-0.0.25.dev112}/xync_client/Okx/ex.py

@@ -15,7 +15,11 @@ from xync_client.pm_unifier import PmUnifier
 class ExClient(BaseExClient):
     class OkxUnifier(PmUnifier):
         pm_map = {
-            "SBP Fast Bank Transfer": "SBP"
+            "SBP Fast Bank Transfer": "SBP",
+            "ADCB": "Abu Dhabi Commercial Bank ADCB",
+            "Al-Rafdin QiServices": "Al-Rafidain QiServices",
+            "Viettel Pay": "ViettelPay",
+            "Zain Cash - Business": "ZainCash - Business"
         }
 
     unifier_class = OkxUnifier

{xync_client-0.0.25.dev110 → xync_client-0.0.25.dev112}/xync_client/TgWallet/agent.py

@@ -44,6 +44,7 @@ class Exceptions(StrEnum):
     CUR = "CURRENCY_IS_NOT_SUPPORTED_BY_PAYMENT_METHOD"
     MAX_ADS = "ACTIVE_OFFER_COUNT_LIMIT_REACHED"
     INACTIVE_AD = "OFFER_ILLEGAL_STATE"
+    FF = "CANNOT_DELETE_WHEN_USED_IN_OFFER"
 
 
 # class Status(IntEnum):

{xync_client-0.0.25.dev110 → xync_client-0.0.25.dev112/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.25.dev110
+Version: 0.0.25.dev112
 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.25.dev110 → xync_client-0.0.25.dev112}/xync_client.egg-info/SOURCES.txt

@@ -61,6 +61,7 @@ xync_client/Bybit/agent.py
 xync_client/Bybit/ex.py
 xync_client/Bybit/web_earn.py
 xync_client/Bybit/web_p2p.py
+xync_client/Bybit/ws.py
 xync_client/Bybit/etype/ad.py
 xync_client/Gate/ex.py
 xync_client/Gate/premarket.py