xync-client 0.0.25.dev63__tar.gz → 0.0.25.dev69__tar.gz

{xync_client-0.0.25.dev63/xync_client.egg-info → xync_client-0.0.25.dev69}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.25.dev63
+Version: 0.0.25.dev69
 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.dev63 → xync_client-0.0.25.dev69}/tests/TestEx.py

@@ -14,9 +14,6 @@ from xync_client.Abc.types import PmEx
 
 @pytest.mark.asyncio(loop_scope="session")
 class TestEx(BaseTest):
-    coins: dict[int, dict[str, CoinEx]] = {}
-    curs: dict[int, dict[str, CurEx]] = {}
-
     @pytest.fixture
     async def clients(self) -> list[BaseClient]:
         exs = await Ex.filter(status__gt=ExStatus.plan)
@@ -32,7 +29,6 @@ class TestEx(BaseTest):
             ok = self.is_dict_of_objects(curs, CurEx)
             t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.curs)
             assert t.ok, "No curs"
-            self.curs[client.ex.id] = curs
             logging.info(f"{client.ex.name}: {ExAction.curs.name} - ok")
 
     # 20
@@ -60,7 +56,6 @@ class TestEx(BaseTest):
             ok = self.is_dict_of_objects(coins, CoinEx)
             t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.coins)
             assert t.ok, "No coins"
-            self.coins[client.ex.id] = coins
             logging.info(f"{client.ex.name}: {ExAction.coins.name} - ok")
 
     # 23
@@ -75,12 +70,16 @@ class TestEx(BaseTest):
     # 24
     async def test_ads(self, clients: list[BaseExClient]):
         for client in clients:
-            self.coins[client.ex.id] = self.coins.get(client.ex.id) or await client.coins()
-            self.curs[client.ex.id] = self.curs.get(client.ex.id) or await client.curs()
-            coin: int | str = self.coins[client.ex.id]["USDT"].exid
-            cur: int | str = self.curs[client.ex.id]["EUR"].exid
+            pairs = await client.pairs()
+            cur = list(pairs[0])[0]
+            coin = list(pairs[0][cur])[0]
             ads: list[BaseAd] = await client.ads(coin, cur, False)
             ok = self.is_list_of_objects(ads, BaseAd)
+            if not ok:  # if no coin buys for this cur, try next cur
+                for coen in list(pairs[0][cur])[1:]:
+                    ads: list[BaseAd] = await client.ads(coen, cur, False)
+                    if ok := self.is_list_of_objects(ads, BaseAd):
+                        break
             t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.ads)
             assert t.ok, "No ads"
             logging.info(f"{client.ex.name}: {ExAction.ads.name} - ok")

{xync_client-0.0.25.dev63 → xync_client-0.0.25.dev69}/xync_client/Abc/Ex.py

@@ -13,6 +13,7 @@ from xync_client.pm_unifier import PmUnifier, PmUni
 
 
 class BaseExClient(BaseClient):
+    cur_map: dict[int, str] = {}
     unifier_class: type = PmUnifier
 
     @abstractmethod
@@ -66,8 +67,8 @@ class BaseExClient(BaseClient):
         # Curs
         cur_pyds: dict[str, CurEx] = await self.curs()
         curs: dict[int | str, models.Cur] = {
-            cur_pyd.exid: (await models.Cur.update_or_create({"rate": cur_pyd.rate}, ticker=tkr))[0]
-            for tkr, cur_pyd in cur_pyds.items()
+            exid: (await models.Cur.update_or_create({"rate": cur_pyd.rate}, ticker=cur_pyd.ticker))[0]
+            for exid, cur_pyd in cur_pyds.items()
         }
         curexs = [
             models.Curex(**c.model_dump(exclude_none=True), cur=curs[c.exid], ex=self.ex) for c in cur_pyds.values()
@@ -79,14 +80,10 @@ class BaseExClient(BaseClient):
 
         countries = await self.countries()
 
-        cur_map = {
-            172: "CNY",
-            8: "KRW",
-            25: "MMK",
-        }
         for c in countries:
             if c.cur_id not in curs:
-                cur, _ = await models.Cur.get_or_create(ticker=cur_map[c.cur_id])
+                cur, _ = await models.Cur.get_or_create(ticker=self.cur_map[c.cur_id])
+                curs[cur.id] = cur
                 c.cur_id = cur.id
             c.cur_id = curs[c.cur_id].id
         # Country preparing

{xync_client-0.0.25.dev63 → xync_client-0.0.25.dev69}/xync_client/BingX/ex.py

@@ -80,9 +80,9 @@ class ExClient(BaseExClient, BaseBingXClient):
             "type": 1,
             "fiat": cur_exid,
             "asset": coin_exid,
-            "amount": amount,
+            "amount": amount or "",
             "hidePaymentInfo": "",
-            "payMethodId": pm_exids if pm_exids else "",
+            "payMethodId": pm_exids or "",
             "isUserMatchCondition": "true" if is_sell else "false",
         }
 

{xync_client-0.0.25.dev63 → xync_client-0.0.25.dev69}/xync_client/BitGet/ex.py

@@ -83,21 +83,19 @@ class ExClient(BaseExClient):
         return result
 
     async def cur_pms_map(self) -> dict[str, list[int]]:
-        curs = (await self._post("/v1/p2p/pub/currency/queryAllCoinAndFiat"))["data"]["fiatInfoRespList"]
-        return {
-            cur["fiatCode"]: [int(pay_method["paymethodId"]) for pay_method in cur["paymethodInfo"]] for cur in curs
-        }
+        curs = await self.curs()
+        return {k: [int(pay_method["paymethodId"]) for pay_method in cur["paymethodInfo"]] for k, cur in curs.items()}
 
 
 async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await Ex.get(name="BitGet")
     cl = ExClient(bg)
-    # c = await cl.curs()
+    await cl.curs()
     # await cl.coins()
     # await cl.ads("BTC", "RUB", True, [1, 289, 375])
-    await cl.pms()
-    # await cl.cur_pms_map()
+    # await cl.pms()
+    await cl.cur_pms_map()
     await cl.set_pmcurexs()
     await cl.set_coinexs()
     await cl.close()

{xync_client-0.0.25.dev63 → xync_client-0.0.25.dev69}/xync_client/Htx/etype/ad.py

@@ -88,6 +88,6 @@ class Resp(BaseAd):
     tradeType: int
     uid: int
     userName: str
-    merchantTags: list[str] | None
+    merchantTags: list[int] | None
     labelName: str | None = None
     seaViewRoom: str | None = None

{xync_client-0.0.25.dev63 → xync_client-0.0.25.dev69}/xync_client/Htx/ex.py

@@ -21,8 +21,15 @@ class ExClient(BaseExClient):
             "SBP - Fast Bank Transfer": "SBP",
         }
 
+    cur_map = {
+        # 1: "CNY",
+        8: "KRW",
+        25: "MMK",
+    }
     unifier_class = BingUnifier
 
+    _data: dict = {}
+
     def pm_type_map(self, typ: models.Pmex) -> str:
         pass
 
@@ -73,7 +80,7 @@ class ExClient(BaseExClient):
             5: PmType.IFSC,
         }
 
-        pms: list[pm.Resp] = [convert(p, pm.Resp) for p in (await self._coin_curs_pms())["payMethod"]]
+        pms: list[pm.Resp] = [convert(p, pm.Resp) for p in (await self.data)["payMethod"]]
 
         pmsd = {
             p.payMethodId: PmEx(
@@ -90,7 +97,7 @@ class ExClient(BaseExClient):
     # 21: Get all: currency,pay,allCountry,coin
     async def curs(self) -> dict[int, types.CurEx]:
         self.session.headers["client-type"] = "web"
-        curs: list[dict] = (await self._coin_curs_pms())["currency"]
+        curs: list[dict] = (await self.data)["currency"]
         cmap: dict[str, int] = {c["nameShort"]: c["currencyId"] for c in curs}
         res = (await self._get("/-/x/otc/v1/trade/fast/config/list?side=sell&tradeMode=c2c_simple"))["data"]
         cursd: dict[str, float] = {}
@@ -101,53 +108,60 @@ class ExClient(BaseExClient):
 
     # 22: Список платежных методов по каждой валюте
     async def cur_pms_map(self) -> dict[int, set[int]]:
-        res = await self._coin_curs_pms()
+        res = await self.data
         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, types.CoinEx]:
         self.session.headers["client-type"] = "web"
-        coins: list[dict] = (await self._coin_curs_pms())["coin"]
-        cmap: dict[str, int] = {c["coinCode"]: c["coinId"] for c in coins}
+        coins: list[dict] = (await self.data)["coin"]
         res = (await self._get("/-/x/otc/v1/trade/fast/config/list?side=buy&tradeMode=c2c_simple"))["data"]
         coinsl: list[str] = [c["cryptoAsset"]["name"] for c in res]
-        return {cid: types.CoinEx(exid=cid, ticker=tkr, p2p=tkr in coinsl) for tkr, cid in cmap.items()}
+        return {
+            c["coinId"]: types.CoinEx(exid=c["coinId"], ticker=c["coinCode"], scale=c["showPrecision"])
+            for c in coins
+            if c["coinCode"] in coinsl
+        }
 
     # 99: Страны
     async def countries(self) -> list[Country]:
         cmap = {
             "Kazakstan": "Kazakhstan",
         }
-        res = await self._coin_curs_pms()
+        res = await self.data
         cts = [
             Country(
                 id=c["countryId"],
                 code=c["code"],
                 name=cmap.get(ct := name[:-1] if (name := c["name"].split(",")[0]).endswith(".") else name, ct),
                 short=c["appShort"],
-                cur_id=c["currencyId"],
+                cur_id=c["currencyId"] if c["currencyId"] != 1 else 172,
             )
             for c in res["country"]
         ]
         return cts
 
     # Get all: currency,pay,allCountry,coin
-    async def _coin_curs_pms(self) -> (dict, dict, dict, dict):
-        res = (await self._get("/-/x/otc/v1/data/config-list?type=currency,pay,coin,allCountry"))["data"]
-        res["currency"][0]["currencyId"] = 1
-        [c.update({"currencyId": 1, "name": ""}) for c in res["country"] if c["currencyId"] == 172]
-        return res
+    @property
+    async def data(self) -> (dict, dict, dict, dict):
+        self._data = (
+            self._data or (await self._get("/-/x/otc/v1/data/config-list?type=currency,pay,coin,allCountry"))["data"]
+        )
+        return self._data
 
 
 async def main():
     _ = await init_db(PG_DSN, models, True)
     ex = await Ex.get(name="Htx")
     cl = ExClient(ex)
-    await cl.set_pairs()
-    await cl.pms()
+    _ads = await cl.ads(2, 11, True)
     await cl.set_pmcurexs()
     await cl.set_coinexs()
+    _cr = await cl.curs()
+    _cn = await cl.coins()
+    await cl.set_pairs()
+    _pms = await cl.pms()
     await cl.close()
 
 

{xync_client-0.0.25.dev63 → xync_client-0.0.25.dev69/xync_client.egg-info}/PKG-INFO

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