xync-client 0.0.25.dev57__tar.gz → 0.0.25.dev59__tar.gz

{xync_client-0.0.25.dev57/xync_client.egg-info → xync_client-0.0.25.dev59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xync-client
-Version: 0.0.25.dev57
+Version: 0.0.25.dev59
 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.dev57 → xync_client-0.0.25.dev59}/xync_client/BingX/etype/ad.py

@@ -60,4 +60,4 @@ class Ad(BaseAd):
     merchantKycType: int
     merchantVerificationType: int
     isUserMatchCondition: bool
-    notMatchConditionReason: str
+    notMatchConditionReason: str

{xync_client-0.0.25.dev57 → xync_client-0.0.25.dev59}/xync_client/BingX/ex.py

@@ -74,7 +74,7 @@ class ExClient(BaseExClient, BaseBingXClient):
 
     # 24: ads
     async def ads(
-        self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
+            self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
     ) -> list[ad.Ad]:
         params = {
             "type": 1,
@@ -87,7 +87,7 @@ class ExClient(BaseExClient, BaseBingXClient):
         }
 
         ads = await self._get("/api/c2c/v1/advert/list", params=params)
-        return [ad.Ad(**_ad) for _ad in ads["data"]["dataList"]]
+        return [ad.Ad(id=_ad["orderNo"], **_ad) for _ad in ads["data"]["dataList"]]
 
 
 async def main():

{xync_client-0.0.25.dev57 → xync_client-0.0.25.dev59}/xync_client/KuCoin/ex.py

@@ -14,41 +14,39 @@ from xync_client.Abc.types import PmEx
 class ExClient(BaseExClient):
     async def _pms(self, cur) -> list[pm.PmE]:
         params = {
-            "legal": cur,
-            "lang": "ru_RU",
+            'legal': cur,
+            'lang': 'ru_RU',
         }
         pms = await self._get("/_api/otc/legal/payTypes", params=params)
         return [pm.PmE(**_pm) for _pm in pms["data"]]
 
     async def curs(self) -> list[types.CurEx]:
         curs = (await self._get("/_api/otc/dictionary/getData", {"type": "LEGAL"}))["data"]
-        return {cur["typeCode"]: types.CurEx(exid=cur["typeCode"], ticker=cur["typeCode"]) for cur in curs}
+        return {
+            cur["typeCode"]:types.CurEx(exid=cur["typeCode"], ticker=cur["typeCode"]) for cur in curs
+        }
 
     async def pms(self, cur: models.Cur = None) -> dict[int | str, PmEx]:
         all_pms = {}
         for cur_obj in (await self.curs()).values():
             pms = await self._pms(cur_obj.ticker)
-            for p in pms:
-                all_pms[p.payTypeCode] = PmEx(exid=p.payTypeCode, name=p.payTypeName)
+            for pm in pms:
+                all_pms[pm.payTypeCode] = PmEx(exid=pm.payTypeCode, name=pm.payTypeName)
         return all_pms
 
     async def cur_pms_map(self) -> MapOfIdsList:
-        return {
-            cur.exid: [pm.payTypeCode for pm in await self._pms(cur.ticker)] for cur in (await self.curs()).values()
-        }
+        return {cur.exid: [pm.payTypeCode for pm in await self._pms(cur.ticker)] for cur in (await self.curs()).values()}
 
     async def coins(self) -> list[types.CoinEx]:
         all_coins = {}
         for cur in (await self.curs()).keys():
             params = {
-                "legal": cur,
-                "lang": "ru_RU",
+                'legal': cur,
+                'lang': 'ru_RU',
             }
             coins = await self._get("/_api/otc/symbol/support", params=params)
             for coin in coins["data"]:
-                all_coins[coin["currency"]] = types.CoinEx(
-                    exid=coin["currency"], ticker=coin["currency"], scale=coin["currencyPrecision"]
-                )
+                all_coins[coin["currency"]] = types.CoinEx(exid=coin["currency"] ,ticker=coin["currency"], scale=coin["currencyPrecision"])
         return all_coins
 
     async def pairs(self) -> MapOfIdsList:
@@ -58,24 +56,18 @@ class ExClient(BaseExClient):
         return s, s
 
     async def ads(
-        self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
+            self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
     ) -> list[ad.Ad]:
         pass
 
 
 async def main():
     _ = await init_db(PG_DSN, models, True)
-    bg = await models.Ex.get(name="KuCoin")
+    bg = await Ex.get(name="KuCoin")
     cl = ExClient(bg)
-    await cl.curs()
-    await cl.coins()
-    await cl.cur_pms_map()
-    await cl.pairs()
-    await cl.set_coinexs()
-    await cl.set_pmcurexs()
-    await cl.ads("USDT", "THB", False)
-    # pms = await cl.pms()
-    await cl.close()
+    # await cl.curs()
+    # await cl.coins()
+    await cl.pms()
 
 
 if __name__ == "__main__":

{xync_client-0.0.25.dev57 → xync_client-0.0.25.dev59}/xync_client/Okx/ex.py

@@ -14,17 +14,17 @@ from xync_client.Abc.types import PmEx
 class ExClient(BaseExClient):
     async def _pms(self, cur) -> list[pm.PmE]:
         params = {
-            "quoteCurrency": f"{cur}",
+            "quoteCurrency": cur,
             "needField": "false",
         }
         pms = await self._get("/v3/c2c/configs/receipt/templates", params=params)
-        return [pm.PmE(**_pm) for _pm in pms["data"] if _pm["paymentMethod"]]
+        return [pm.PmE(**_pm) for _pm in pms["data"]]
 
     # 19: Список поддерживаемых валют тейкера
     async def curs(self) -> dict[int, types.CurEx]:  # {cur.exid: cur.ticker}
         curs = await self._get("/v3/users/common/list/currencies")
         return {
-            cur["displayName"]: types.CurEx(exid=cur["currencyId"], ticker=cur["displayName"], scale=cur["precision"])
+            cur["displayName"]: types.CurEx(exid=cur["displayName"], ticker=cur["displayName"], scale=cur["precision"])
             for cur in curs["data"]
         }
 
@@ -48,7 +48,9 @@ class ExClient(BaseExClient):
         for cur in (await self.curs()).keys():
             coins = await self._get("/v3/c2c/currency/pairs", {"type": 2, "quote": cur})
             return {
-                coin["baseCurrency"]: types.CoinEx(exid=coin["baseCurrencyId"], ticker=coin["baseCurrency"])
+                coin["baseCurrency"]: types.CoinEx(
+                    exid=coin["baseCurrency"], ticker=coin["baseCurrency"], scale=coin["baseScale"]
+                )
                 for coin in coins["data"]
             }
 
@@ -76,7 +78,7 @@ class ExClient(BaseExClient):
             "numberPerPage": "5",
         }
         ads = await self._get("/v3/c2c/tradingOrders/getMarketplaceAdsPrelogin", params=params)
-        return [ad.Ads(**ad) for ad in ads["data"]["sell"]]
+        return [ad.Ads(**a) for a in ads["data"]["sell"]]
 
     # 42: Чужая объява по id
     async def ad(self, ad_id: int) -> ad.Ad:
@@ -92,14 +94,14 @@ async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await models.Ex.get(name="Okx")
     cl = ExClient(bg)
+    await cl.ads("USDT", "THB", False)
     # curs = await cl.curs()
     # coins = await cl.coins()
-    # await cl.pms()
-    # await cl.cur_pms_map()
-    # await cl.pairs()
-    # await cl.set_coinexs()
+    await cl.pms()
+    await cl.cur_pms_map()
+    await cl.pairs()
+    await cl.set_coinexs()
     await cl.set_pmcurexs()
-    await cl.ads("USDT", "THB", False)
     await cl.close()
 
 

{xync_client-0.0.25.dev57 → xync_client-0.0.25.dev59/xync_client.egg-info}/PKG-INFO

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