xync-client 0.0.11.dev14__tar.gz → 0.0.11.dev18__tar.gz

{xync_client-0.0.11.dev14/xync_client.egg-info → xync_client-0.0.11.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev14
+Version: 0.0.11.dev18
 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.11.dev14 → xync_client-0.0.11.dev18}/README.md

@@ -159,3 +159,5 @@ classDef red stroke:#f00
 - 36N: Получение сообщения от юзера `get_user_msg => (msg:str, file=None)`
 - 37N: Получение уведомления о (раз)блокировке юзером `got_blocked => is_blocked:bool`
 - 38N: Получение уведомления о полученном отзыве `got_rated => (user_id:int, order_id:int)`
+
+- 39: Получить балансы моих монет: `my_assets() => list[Asset]`

{xync_client-0.0.11.dev14 → xync_client-0.0.11.dev18}/pyproject.toml

@@ -44,4 +44,4 @@ line-length = 120
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
-asyncio_default_fixture_loop_scope = "class"  # , "session", "module", "package", "function"
+asyncio_default_fixture_loop_scope = "session"  # , "class", "module", "package", "function"

{xync_client-0.0.11.dev14 → xync_client-0.0.11.dev18}/tests/Abc/BaseTest.py

@@ -1,8 +1,11 @@
 from abc import abstractmethod
-from asyncio import AbstractEventLoop
+
+# from asyncio import AbstractEventLoop
 from typing import TypeGuard
 
 import pytest
+
+# import uvloop
 from tortoise.backends.asyncpg import AsyncpgDBClient
 from x_model import init_db
 from xync_client.Abc.Base import BaseClient, DictOfDicts, ListOfDicts, FlatDict, MapOfIdsList
@@ -12,20 +15,20 @@ from xync_client.loader import PG_DSN
 
 
 class BaseTest:
-    loop: AbstractEventLoop
+    # loop: AbstractEventLoop
 
-    # @pytest.fixture(scope="class", autouse=True)
+    # @pytest.fixture(scope="session", autouse=True)
     # def event_loop_policy(self):
     #     return uvloop.EventLoopPolicy()
 
-    @pytest.fixture(scope="class", autouse=True)
+    @pytest.fixture(scope="session", autouse=True)
     async def cn(self) -> AsyncpgDBClient:
         cn: AsyncpgDBClient = await init_db(PG_DSN, models, True)
         yield cn
         await cn.close()
 
     @abstractmethod
-    @pytest.fixture(scope="class")
+    @pytest.fixture(scope="session")
     async def clients(self) -> list[BaseClient]: ...
 
     @staticmethod

{xync_client-0.0.11.dev14 → xync_client-0.0.11.dev18}/tests/TestEx.py

@@ -2,15 +2,16 @@ import logging
 
 import pytest
 from xync_schema.enums import ExStatus, ExType, ExAction
-from xync_schema.models import Ex, TestEx as TestExs
+from xync_schema.models import Ex, TestEx as ExTest
 
 from tests.Abc.BaseTest import BaseTest
 from xync_client.Abc.Base import BaseClient, DictOfDicts, FlatDict
 from xync_client.Abc.Ex import BaseExClient
 
 
+@pytest.mark.asyncio(loop_scope="session")
 class TestEx(BaseTest):
-    @pytest.fixture(scope="class")
+    @pytest.fixture
     async def clients(self) -> list[BaseClient]:
         exs = await Ex.filter(status__gt=ExStatus.plan)
         [await ex.fetch_related("agents") for ex in exs if ex.type_ == ExType.tg]
@@ -22,7 +23,7 @@ class TestEx(BaseTest):
     async def test_pms(self, clients: list[BaseExClient]):
         for client in clients:
             pms: DictOfDicts = await client.pms()
-            t, _ = await TestExs.update_or_create({"ok": self.is_dict_of_dicts(pms)}, ex=client.ex, action=ExAction.pms)
+            t, _ = await ExTest.update_or_create({"ok": self.is_dict_of_dicts(pms)}, ex=client.ex, action=ExAction.pms)
             assert t.ok, "No pms"
             logging.info(f"{client.ex.name}:{ExAction.pms.name} - ok")
 
@@ -30,7 +31,8 @@ class TestEx(BaseTest):
     async def test_curs(self, clients: list[BaseExClient]):
         for client in clients:
             curs: FlatDict = await client.curs()
-            t, _ = await TestExs.update_or_create({"ok": self.is_flat_dict(curs)}, ex=client.ex, action=ExAction.curs)
+            ok = self.is_flat_dict(curs)
+            t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.curs)
             assert t.ok, "No curs"
             logging.info(f"{client.ex.name}:{ExAction.pms.name} - ok")
 
@@ -39,6 +41,6 @@ class TestEx(BaseTest):
         for client in clients:
             cur_pms: DictOfDicts = await client.cur_pms_map()
             ok = self.is_dict_of_dicts(cur_pms)
-            t, _ = await TestExs.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.cur_pms_map)
+            t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.cur_pms_map)
             assert t.ok, "No pms for cur"
             logging.info(f"{client.ex.name}:{ExAction.pms.name} - ok")

{xync_client-0.0.11.dev14 → xync_client-0.0.11.dev18}/xync_client/Abc/Agent.py

@@ -1,7 +1,8 @@
 from abc import abstractmethod
 
+from xync_client.Abc.Base import ListOfDicts
+
 from xync_client.Abc.Auth import BaseAuthClient
-from xync_schema.enums import PmType
 from xync_schema.models import OrderStatus, Coin, Cur, Order, Pm, Ad, AdStatus, Fiat
 from xync_schema.pydantic import FiatNew
 
@@ -23,7 +24,7 @@ class BaseAgentClient(BaseAuthClient):
     # # # Fiat
     # 25: Список реквизитов моих платежных методов
     @abstractmethod
-    async def my_fiats(self, cur: Cur = None) -> list[dict]: ...
+    async def my_fiats(self, cur: Cur = None) -> ListOfDicts: ...
 
     # 26: Создание
     @abstractmethod
@@ -31,7 +32,7 @@ class BaseAgentClient(BaseAuthClient):
 
     # 27: Редактирование
     @abstractmethod
-    async def fiat_upd(self, detail: str = None, type_: PmType = None) -> bool: ...
+    async def fiat_upd(self, fiat_id: int, detail: str, name: str = None) -> bool: ...
 
     # 28: Удаление
     @abstractmethod
@@ -99,3 +100,7 @@ class BaseAgentClient(BaseAuthClient):
     # 38: Поставить отзыв юзеру
     @abstractmethod
     async def rate_user(self, positive: bool) -> bool: ...
+
+    # 39: Балансы моих монет
+    @abstractmethod
+    async def my_assets(self) -> dict: ...

{xync_client-0.0.11.dev14 → xync_client-0.0.11.dev18}/xync_client/BingX/base.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 from datetime import datetime
 from json import dumps
@@ -11,7 +12,8 @@ class BaseBingXClient(BaseClient):
         traceid = str(uuid4()).replace("-", "")
         now = str(int(datetime.now().timestamp() * 1000))
         payload = dumps(_payload, separators=(",", ":"), sort_keys=True) if _payload else "{}"
-        p = subprocess.Popen(["node", "../xync_client/BingX/req.mjs", now, traceid, payload], stdout=subprocess.PIPE)
+        pref = "../xync_client/BingX/" if os.getcwd().split("/")[-1] == "tests" else ""
+        p = subprocess.Popen(["node", pref + "req.mjs", now, traceid, payload], stdout=subprocess.PIPE)
         sign = p.stdout.read().decode().strip()
         return {
             "sign": sign,

{xync_client-0.0.11.dev14 → xync_client-0.0.11.dev18}/xync_client/BingX/ex.py

@@ -54,7 +54,8 @@ async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await Ex.get(name="BingX")
     cl = ExClient(bg)
-    await cl.pms()
+    await cl.curs()
+    # pms = await cl.pms()
     await cl.close()
 
 

xync_client-0.0.11.dev14/xync_client/Bybit/ex.py → xync_client-0.0.11.dev18/xync_client/Bybit/agent.py

@@ -2,8 +2,10 @@ from enum import IntEnum
 from time import sleep
 
 import pyotp
-from x_client.aiohttp import Client
+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
 
 
@@ -16,10 +18,9 @@ class AdsStatus(IntEnum):
     WORKING = 1
 
 
-class ExClient(Client):  # Bybit client
+class ExClient(BaseAgentClient):  # Bybit client
     host = "api2.bybit.com"
-
-    pub_header = {"cookie": ";"}  # rewrite token for public methods
+    headers = {"cookie": ";"}  # rewrite token for public methods
 
     last_ad_id: list[str] = []
     create_ad_body = {
@@ -79,49 +80,15 @@ class ExClient(Client):  # Bybit client
         "securityRiskToken": "",
     }
 
-    """ PUBLIC METHS """
-
-    def get_ads(self, coin: str, cur: str, sell: bool = False, amount: int = None, payment: list[str] = None) -> list:
-        data = {
-            "userId": "",
-            "tokenId": coin,
-            "currencyId": cur,
-            "payment": payment or [],
-            "side": "0" if sell else "1",
-            "size": "10",
-            "page": "1",
-            "amount": str(amount) if amount else "",
-            "authMaker": False,
-            "canTrade": False,
-        }
-        ads = self._post("/fiat/otc/item/online/", data, self.pub_header)
-        return ads["result"]["items"]
-
-    async def get_config(self):
-        resp = await self._get("/fiat/p2p/config/initial", self.pub_header)
-        return resp["result"]  # todo: tokens, pairs, ...
-
-    async def curs(self):
-        config = await self.get_config()
-        return config["symbols"]
-
-    def get_coins(self):
-        coins = self._get("/spot/api/basic/symbol_list", self.pub_header)
-        return coins
-
-    def get_payment_methods(self):
-        pms = self._post("/fiat/otc/configuration/queryAllPaymentList/", headers=self.pub_header)
-        return pms
-
     """ Private METHs"""
 
-    def create_payment_method(self, payment_type: int, real_name: str, account_number: str) -> dict:
+    def fiat_new(self, payment_type: int, real_name: str, account_number: str) -> FlatDict:
         method1 = self._post(
             "/fiat/otc/user/payment/new_create",
             {"paymentType": payment_type, "realName": real_name, "accountNo": account_number, "securityRiskToken": ""},
         )
         if srt := method1["result"]["securityRiskToken"]:
-            self.check_2fa(srt)
+            self._check_2fa(srt)
             method2 = self._post(
                 "/fiat/otc/user/payment/new_create",
                 {
@@ -142,24 +109,26 @@ class ExClient(Client):  # Bybit client
             return fiat
         return list_methods[1]
 
-    def update_payment_method(self, real_name: str, account_number: str, fiat_id: int = None) -> dict:
+    # 27
+    def fiat_upd(self, fiat_id: int, detail: str, name: str = None) -> dict:
         fiat = self.get_payment_method(fiat_id)
-        fiat["realName"] = real_name
-        fiat["accountNo"] = account_number
-        result = self._post("/fiat/otc/user/payment/new_update", fiat)
+        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)
+        self._check_2fa(srt)
         fiat["securityRiskToken"] = srt
-        result2 = self._post("/fiat/otc/user/payment/new_update", fiat)
+        result2 = await self._post("/fiat/otc/user/payment/new_update", fiat)
         return result2
 
-    def delete_payment_method(self, ids: str) -> dict:
-        data = {"id": ids, "securityRiskToken": ""}
-        method = self._post("/fiat/otc/user/payment/new_delete", data)
+    # 28
+    def fiat_del(self, fiat_id: int) -> dict:
+        data = {"id": fiat_id, "securityRiskToken": ""}
+        method = await self._post("/fiat/otc/user/payment/new_delete", data)
         srt = method["result"]["securityRiskToken"]
-        self.check_2fa(srt)
+        self._check_2fa(srt)
         data["securityRiskToken"] = srt
-        delete = self._post("/fiat/otc/user/payment/new_delete", data)
+        delete = await self._post("/fiat/otc/user/payment/new_delete", data)
         return delete
 
     def switch_ads(self, new_status: AdsStatus) -> dict:
@@ -176,8 +145,8 @@ class ExClient(Client):  # Bybit client
         ads = [ad for ad in list_ads if set(ad["payments"]) - {"5", "51"}]
         return float(ads[0]["price"])
 
-    def get_user_pay_methods(self):
-        upm = self._post("/fiat/otc/user/payment/list")
+    def my_fiats(self, cur: Cur = None):
+        upm = await self._post("/fiat/otc/user/payment/list")
         return upm["result"]
 
     def get_user_ads(self, active: bool = True) -> list:
@@ -191,7 +160,7 @@ class ExClient(Client):  # Bybit client
         security_risk_token = data["result"]["securityRiskToken"]
         return security_risk_token
 
-    def check_2fa(self, risk_token):
+    def _check_2fa(self, risk_token):
         # 2fa code
         bybit_secret = BYT2FA
         totp = pyotp.TOTP(bybit_secret)
@@ -203,7 +172,7 @@ class ExClient(Client):  # Bybit client
         if res["ret_msg"] != "success":
             print("Wrong 2fa, wait 5 secs and retry..")
             sleep(5)
-            self.check_2fa(risk_token)
+            self._check_2fa(risk_token)
         return res
 
     def post_ad(self, risk_token: str):
@@ -213,8 +182,8 @@ class ExClient(Client):  # Bybit client
 
     # создание объявлений
     def post_create_ad(self, token: str):
-        result_check_2fa = self.check_2fa(token)
-        assert result_check_2fa["ret_msg"] == "success", "2FA code wrong"
+        result__check_2fa = self._check_2fa(token)
+        assert result__check_2fa["ret_msg"] == "success", "2FA code wrong"
 
         result_add_ad = self._post_ad(token)
         if result_add_ad["ret_msg"] != "SUCCESS":
@@ -230,8 +199,8 @@ class ExClient(Client):  # Bybit client
         return security_risk_token
 
     def post_update_ad(self, token):
-        result_check_2fa = self.check_2fa(token)
-        assert result_check_2fa["ret_msg"] == "success", "2FA code wrong"
+        result__check_2fa = self._check_2fa(token)
+        assert result__check_2fa["ret_msg"] == "success", "2FA code wrong"
 
         result_update_ad = self.update_ad(token)
         if result_update_ad["ret_msg"] != "SUCCESS":

xync_client-0.0.11.dev18/xync_client/Bybit/ex.py

@@ -0,0 +1,64 @@
+import json
+from enum import IntEnum
+
+from xync_client.Abc.Base import ListOfDicts, MapOfIdsList, DictOfDicts, FlatDict
+from xync_client.Abc.Ex import BaseExClient
+
+
+class AdsStatus(IntEnum):
+    REST = 0
+    WORKING = 1
+
+
+class ExClient(BaseExClient):  # Bybit client
+    host = "api2.bybit.com"
+    headers = {"cookie": ";"}  # rewrite token for public methods
+
+    async def _get_config(self):
+        resp = await self._get("/fiat/p2p/config/initial")
+        return resp["result"]  # todo: tokens, pairs, ...
+
+    # 20: Список всех платежных методов на бирже
+    async def pms(self) -> DictOfDicts:
+        pms = await self._post("/fiat/otc/configuration/queryAllPaymentList/")
+        pms = pms["result"]["paymentConfigVo"]
+        return {
+            pm["paymentType"]: {
+                "name": pm["paymentName"],
+            }
+            for pm in pms
+        }
+
+    # 21: Список поддерживаемых валют
+    async def curs(self) -> FlatDict:
+        config = await self._get_config()
+        return {c["id"]: c["currencyId"] for c in config["symbols"]}
+
+    # 22: Список платежных методов по каждой валюте
+    async def cur_pms_map(self) -> MapOfIdsList:
+        pms = await self._post("/fiat/otc/configuration/queryAllPaymentList/")
+        return json.loads(pms["result"]["currencyPaymentIdMap"])
+
+    # 23: Список торгуемых монет (с ограничениям по валютам, если есть)
+    async def coins(self) -> FlatDict:
+        coins = await self._get("/spot/api/basic/symbol_list")
+        return coins
+
+    # 24: Список объяв по (buy/sell, cur, coin, pm)
+    async def ads(
+        self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
+    ) -> ListOfDicts:
+        data = {
+            "userId": "",
+            "tokenId": coin_exid,
+            "currencyId": cur_exid,
+            "payment": pm_exids or [],
+            "side": "0" if is_sell else "1",
+            "size": "10",
+            "page": "1",
+            "amount": str(amount) if amount else "",
+            "authMaker": False,
+            "canTrade": False,
+        }
+        ads = await self._post("/fiat/otc/item/online/", data)
+        return ads["result"]["items"]

{xync_client-0.0.11.dev14 → xync_client-0.0.11.dev18}/xync_client/Gate/ex.py

@@ -1,13 +1,13 @@
 import re
-from asyncio import run
+from asyncio import run, sleep
 from json import JSONDecoder
 
 from bs4 import BeautifulSoup, Script
 from x_model import init_db
 from xync_schema import models
-from xync_schema.models import Coin, Cur, Pm, Ad, Ex, Curex
+from xync_schema.models import Coin, Cur, Pm, Ad, Ex
 
-from xync_client.Abc.Base import MapOfIdsList
+from xync_client.Abc.Base import MapOfIdsList, DictOfDicts, FlatDict
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
 
@@ -16,19 +16,19 @@ class ExClient(BaseExClient):
     async def cur_pms_map(self) -> MapOfIdsList:
         pass
 
-    async def curs(self) -> list[Cur]:
+    async def curs(self) -> FlatDict:
         curs = await self._post("/json_svr/buy_crypto_fiat_setting")
-        curs = [cur["fiat"] for cur in curs if cur["p2p"]]
-        curexs = [Curex(cur=c, ex=self.ex) for c in curs]
-        await Curex.bulk_create(curexs, ignore_conflicts=True)
+        curs = {cur["fiat"]: cur["fiat"] for cur in curs["datas"] if cur["p2p"]}
         return curs
 
     async def coins(self, cur: Cur = None) -> list[Coin]: ...
 
-    async def pms(self, cur: Cur = None) -> list[Pm]:
+    async def pms(self, cur: Cur = None) -> DictOfDicts:
+        await sleep(1)
         doc = await self._get("/p2p")
+        await sleep(1)
         soup = BeautifulSoup(doc, "html.parser")
-        script: Script = soup.body.find_all("script")[14]
+        script: Script = soup.body.find_all("script")[17]  # 17-th not stable
         strng = (
             script.get_text(strip=True)
             .replace("\n", "")
@@ -43,15 +43,19 @@ class ExClient(BaseExClient):
         pattern = r"payment_settings:\s{1}(\{.*?\}),paymentIdMap:"
         match = re.search(pattern, strng.replace(",}", "}").replace(",]", "]"), re.DOTALL)
         res = match.group(1)
-        _ = JSONDecoder(strict=False).decode(res)
-        pmcurs = {
-            cur.ticker: (await self._get("/v3/c2c/configs/receipt/templates", {"quoteCurrency": cur.ticker}))["data"]
-            for cur in await self.curs()
+        pms = JSONDecoder(strict=False).decode(res)
+        return {
+            pm["index"]: {"name": pm["pay_name"], "logo": pm["image"], "identifier": idf, "type_": pm["base_type"]}
+            for idf, pm in pms.items()
         }
-        pp = {}
-        [[pp.update({p["paymentMethod"]: p["paymentMethodDescription"]}) for p in ps] for ps in pmcurs.values()]
-        pp = {k: v for k, v in sorted(pp.items(), key=lambda x: x[0])}
-        return pp
+        # pmcurs = {
+        #     cur.ticker: (await self._get("/v3/c2c/configs/receipt/templates", {"quoteCurrency": cur.ticker}))["data"]
+        #     for cur in await self.curs()
+        # }
+        # pp = {}
+        # [[pp.update({p["paymentMethod"]: p["paymentMethodDescription"]}) for p in ps] for ps in pmcurs.values()]
+        # pp = {k: v for k, v in sorted(pp.items(), key=lambda x: x[0])}
+        # return pp
 
     async def ads(self, coin: Coin, cur: Cur, is_sell: bool, pms: list[Pm] = None) -> list[Ad]:
         pass
@@ -61,9 +65,10 @@ async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await Ex.get(name="Gate")
     cl = ExClient(bg)
-    # await cl.curs()
+    await cl.curs()
     # await cl.coins()
-    await cl.pms()
+    pms = await cl.pms()
+    print(pms)
 
 
 if __name__ == "__main__":

xync_client-0.0.11.dev18/xync_client/Htx/agent.py

@@ -0,0 +1,115 @@
+from x_client.aiohttp import Client
+from xync_schema.enums import AdStatus, PmType, OrderStatus
+from xync_schema.models import Pm, Coin, Cur, Ad, Fiat, Order
+from xync_schema.pydantic import FiatNew
+
+from xync_client.Abc.Agent import BaseAgentClient
+
+url_ads_req = "https://otc-cf.huobi.com/v1/data/trade-market"
+url_ads_web = "https://www.huobi.com/en-us/fiat-crypto/trade/"
+url_my_ads = "https://otc-api.trygofast.com/v1/data/trade-list?pageSize=50"
+url_my_ad = "https://www.huobi.com/-/x/otc/v1/otc/trade/"  # + id
+url_my_bals = "https://www.huobi.com/-/x/otc/v1/capital/balance"
+url_paccs = "https://www.huobi.com/-/x/otc/v1/user/receipt-account"
+
+
+class Public(Client):
+    url_ads_web = "https://www.huobi.com/en-us/fiat-crypto/trade/"
+
+
+class Private(BaseAgentClient):
+    # 0
+    async def get_orders(
+        self, stauts: OrderStatus = OrderStatus.created, coin: Coin = None, cur: Cur = None, is_sell: bool = None
+    ) -> list[Order]:
+        pass
+
+    async def order_request(self, ad_id: int, amount: float) -> dict:
+        pass
+
+    async def my_fiats(self, cur: Cur = None) -> list[dict]:
+        pass
+
+    async def fiat_new(self, fiat: FiatNew) -> Fiat.pyd():
+        pass
+
+    async def fiat_upd(self, detail: str = None, type_: PmType = None) -> bool:
+        pass
+
+    async def fiat_del(self, fiat_id: int) -> bool:
+        pass
+
+    async def my_ads(self) -> list[dict]:
+        res = await self._get(url_my_ads)
+        ads: [] = res["data"]
+        if (pages := res["totalPage"]) > 1:
+            for p in range(2, pages + 1):
+                ads += (await self._get(url_my_ads, {"currPage": p})).get("data", False)
+        return ads
+
+    async def ad_new(
+        self,
+        coin: Coin,
+        cur: Cur,
+        is_sell: bool,
+        pms: list[Pm],
+        price: float,
+        is_float: bool = True,
+        min_fiat: int = None,
+        details: str = None,
+        autoreply: str = None,
+        status: AdStatus = AdStatus.active,
+    ) -> Ad:
+        pass
+
+    async def ad_upd(
+        self,
+        pms: [Pm] = None,
+        price: float = None,
+        is_float: bool = None,
+        min_fiat: int = None,
+        details: str = None,
+        autoreply: str = None,
+        status: AdStatus = None,
+    ) -> bool:
+        pass
+
+    async def ad_del(self) -> bool:
+        pass
+
+    async def ad_switch(self) -> bool:
+        pass
+
+    async def ads_switch(self) -> bool:
+        pass
+
+    async def get_user(self, user_id) -> dict:
+        pass
+
+    async def send_user_msg(self, msg: str, file=None) -> bool:
+        pass
+
+    async def block_user(self, is_blocked: bool = True) -> bool:
+        pass
+
+    async def rate_user(self, positive: bool) -> bool:
+        pass
+
+    # 39
+    async def my_assets(self) -> dict:
+        assets = await self._get(url_my_bals)
+        return {c["coinId"]: c["total"] for c in assets["data"] if c["total"]}
+
+    async def _get_auth_hdrs(self) -> dict[str, str]:
+        pass
+
+    base_url = ""
+    middle_url = ""
+
+    htok: str = "Ev5lFfAvxDU2MA9BJ-Mc4U6zZG3Wb6qsp3Tx2fz6GIoY-uOP2m0-gvjE57ad1qDF"
+
+    url_ads_req = "https://otc-cf.huobi.com/v1/data/trade-market"
+    url_my_ads = "https://otc-api.trygofast.com/v1/data/trade-list?pageSize=50"
+    url_my_ad = "https://www.huobi.com/-/x/otc/v1/otc/trade/"  # + id
+    url_my_bals = "https://www.huobi.com/-/x/otc/v1/capital/balance"
+    url_paccs = "https://www.huobi.com/-/x/otc/v1/user/receipt-account"

{xync_client-0.0.11.dev14 → xync_client-0.0.11.dev18}/xync_client/Htx/ex.py

@@ -47,10 +47,12 @@ class ExClient(BaseExClient):
         wrong_pms = {4, 34, 498, 548, 20009, 20010}  # , 212, 239, 363  # these ids not exist in pms
         return {c["currencyId"]: set(c["supportPayments"]) - wrong_pms for c in res["currency"] if c["supportPayments"]}
 
+    # 23: Список торгуемых монет
     async def coins(self) -> dict[int, str]:
         coins: list[dict] = (await self._coin_curs_pms())["coin"]
         return {c["coinId"]: c["coinCode"] for c in coins if c["coinType"] == 2}
 
+    # 24: Список объяв
     async def ads(self, coin: Coin, cur: Cur, is_sell: bool, pms: list[Pm] = None) -> list[Ad]:
         res = await self._coin_curs_pms()
         return res["country"]
@@ -65,6 +67,7 @@ async def main():
     _ = await init_db(PG_DSN, models, True)
     ex = await Ex.get(name="Htx")
     cl = ExClient(ex)
+    await cl.curs()
     await cl.set_pmcurexs()
     await cl.set_coinexs()
     await cl.close()

{xync_client-0.0.11.dev14 → xync_client-0.0.11.dev18}/xync_client/TgWallet/auth.py

@@ -9,4 +9,6 @@ class AuthClient(BaseAuthClient):
         pyro = PyroClient(self.agent)
         init_data = await pyro.get_init_data()
         tokens = HttpClient("walletbot.me")._post("/api/v1/users/auth/", init_data)
+        self.agent.exid = tokens["user_id"]
+        await self.agent.save()
         return {"Wallet-Authorization": tokens["jwt"], "Authorization": "Bearer " + tokens["value"]}

{xync_client-0.0.11.dev14 → xync_client-0.0.11.dev18/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev14
+Version: 0.0.11.dev18
 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.11.dev14 → xync_client-0.0.11.dev18}/xync_client.egg-info/SOURCES.txt

@@ -44,6 +44,7 @@ xync_client/BitGet/__init__.py
 xync_client/BitGet/agent.py
 xync_client/BitGet/ex.py
 xync_client/BitGet/req.mjs
+xync_client/Bybit/agent.py
 xync_client/Bybit/ex.py
 xync_client/Bybit/web_earn.py
 xync_client/Bybit/web_p2p.py

xync_client-0.0.11.dev14/xync_client/Htx/agent.py

@@ -1,18 +0,0 @@
-from x_client.aiohttp import Client
-
-
-class Public(Client):
-    url_ads_web = "https://www.huobi.com/en-us/fiat-crypto/trade/"
-
-
-class Private(Client):
-    base_url = ""
-    middle_url = ""
-
-    htok: str = "Ev5lFfAvxDU2MA9BJ-Mc4U6zZG3Wb6qsp3Tx2fz6GIoY-uOP2m0-gvjE57ad1qDF"
-
-    url_ads_req = "https://otc-cf.huobi.com/v1/data/trade-market"
-    url_my_ads = "https://otc-api.trygofast.com/v1/data/trade-list?pageSize=50"
-    url_my_ad = "https://www.huobi.com/-/x/otc/v1/otc/trade/"  # + id
-    url_my_bals = "https://www.huobi.com/-/x/otc/v1/capital/balance"
-    url_paccs = "https://www.huobi.com/-/x/otc/v1/user/receipt-account"