xync-client 0.0.72.dev0__tar.gz → 0.0.74.dev0__tar.gz

{xync_client-0.0.72.dev0/xync_client.egg-info → xync_client-0.0.74.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.72.dev0
+Version: 0.0.74.dev0
 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.72.dev0 → xync_client-0.0.74.dev0}/xync_client/Abc/Ex.py

@@ -295,7 +295,7 @@ class BaseExClient(HttpClient):
         return file
 
     async def _proc(self, resp: ClientResponse, data_key: str = None, bp: dict | str = None) -> dict | str:
-        if resp.status in (401, 403):
+        if resp.status in (403,):
             proxy = await models.Proxy.filter(valid=True, country__short__not="US").order_by("-updated_at").first()
             cookies = self.session.cookie_jar.filter_cookies(self.session._base_url)
             self.session = ClientSession(

{xync_client-0.0.72.dev0 → xync_client-0.0.74.dev0}/xync_client/BingX/ex.py

@@ -1,3 +1,4 @@
+import logging
 from asyncio import run
 
 from pyro_client.client.file import FileClient
@@ -67,15 +68,21 @@ 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 = ""
     ) -> list[ad.Ad]:
+        if len(pm_exids):
+            if len(pm_exids) > 1:
+                logging.error("BingX принимает только 1 платежный метод!")
+            pm_exid = pm_exids[0]
+        else:
+            pm_exid = ""
         params = {
             "type": 1,
             "fiat": cur_exid,
             "asset": coin_exid,
-            "amount": amount or "",
+            "amount": amount,
             "hidePaymentInfo": "",
-            "payMethodId": pm_exids or "",
+            "payMethodId": pm_exid,
             "isUserMatchCondition": "true" if is_sell else "false",
         }
 
@@ -89,7 +96,11 @@ async def main():
     async with FileClient(TOKEN) as b:
         b: FileClient
         cl = ExClient(bg, b)
-        _ads = await cl.ads("USDT", "RUB", False)
+        _ads = await cl.ads(
+            "USDT",
+            "RUB",
+            True,
+        )
         await cl.set_pairs()
         await cl.set_coins()
         await cl.set_pmcurs()

{xync_client-0.0.72.dev0 → xync_client-0.0.74.dev0}/xync_client/BitGet/ex.py

@@ -78,7 +78,7 @@ class ExClient(BaseExClient):
             "pageSize": 10,
             "coinCode": coin_exid,
             "fiatCode": cur_exid,
-            "paymethodId": pm_exids or "",
+            "paymethodIds": pm_exids or "",
             "languageType": 6,
         }
         resp = await self.session.post("/v1/p2p/pub/adv/queryAdvList", json=request_data, headers=self.headers)
@@ -95,7 +95,7 @@ async def main():
     _ = await init_db(TORM, True)
     bg = await Ex.get(name="BitGet")
     cl = ExClient(bg, FileClient(TOKEN))
-    # _ads = await cl.ads("USDT", "IDR", False)
+    _ads = await cl.ads("USDT", "RUB", False, [])
     await cl.curs()
     await cl.coins()
     await cl.pms()

{xync_client-0.0.72.dev0 → xync_client-0.0.74.dev0}/xync_client/Bybit/agent.py

@@ -1023,8 +1023,8 @@ async def main():
             # cl.get_api_orders(11),  # 10, 1738357200000, 1742504399999
             cl.battle(usdt, rub, False, ["volet"], 80.44),  # гонка в стакане покупки - мы продаем
             # cl.battle(usdt, rub, True, ["volet"], 78.9),  # гонка в стакане продажи - мы покупаем
-            cl.battle(usdt, rub, False, ["payeer"], 80.73),  # гонка в стакане покупки - мы продаем
-            cl.battle(usdt, rub, True, ["payeer"], 79.76),  # гонка в стакане продажи - мы покупаем
+            cl.battle(usdt, rub, False, ["payeer"], 81.2),  # гонка в стакане покупки - мы продаем
+            cl.battle(usdt, rub, True, ["payeer"], 80.12),  # гонка в стакане продажи - мы покупаем
             cl.battle(eth, rub, False, ["volet"], 300_000),
             cl.battle(eth, rub, True, ["volet"], 296_000),
             cl.battle(eth, rub, False, ["payeer"], 300_000),

{xync_client-0.0.72.dev0 → xync_client-0.0.74.dev0}/xync_client/Gate/ex.py

@@ -74,9 +74,9 @@ class ExClient(BaseExClient):
             "type": "push_order_list",
             "symbol": f"{coin_exid}_{cur_exid}",
             "big_trade": "0",
-            "fiat_amount": "",
-            "amount": amount or "",
-            "pay_type": pm_exids or "",
+            "fiat_amount": amount or "",
+            "amount": "",
+            "pay_type": pm_exids and ",".join(pm_exids) or "",
             "is_blue": "0",
             "is_crown": "0",
             "is_follow": "0",
@@ -93,10 +93,10 @@ class ExClient(BaseExClient):
 
 async def main():
     _ = await init_db(TORM, True)
-    bg = await Ex.get(name="Gate")
+    gt = await Ex.get(name="Gate")
     async with FileClient(TOKEN) as b:
-        cl = ExClient(bg, b)
-        _ads = await cl.ads("USDT", "RUB", False)
+        cl = ExClient(gt, b)
+        _ads = await cl.ads("USDT", "RUB", True, ["payeer"], 1000)
         # curs = await cl.curs()
         # await cl.coins()
         pms = await cl.set_pmcurs()

{xync_client-0.0.72.dev0 → xync_client-0.0.74.dev0}/xync_client/KuCoin/ex.py

@@ -1,6 +1,6 @@
 from asyncio import run
 
-from pyro_client.client.filler import FillerClient
+from pyro_client.client.filler import FileClient
 from x_model import init_db
 from xync_client.loader import TORM, TOKEN
 from xync_schema import models
@@ -80,7 +80,7 @@ class ExClient(BaseExClient):
 async def main():
     _ = await init_db(TORM, True)
     bg = await models.Ex.get(name="KuCoin")
-    async with FillerClient(TOKEN) as b:
+    async with FileClient(TOKEN) as b:
         cl: ExClient = bg.client(b)
         await cl.set_pmcurs()
         await cl.set_coins()

{xync_client-0.0.72.dev0 → xync_client-0.0.74.dev0}/xync_client/Mexc/ex.py

@@ -1,6 +1,6 @@
 from asyncio import run
 
-from pyro_client.client.filler import FillerClient
+from pyro_client.client.filler import FileClient
 from x_model import init_db
 import requests
 from xync_client.loader import TORM, TOKEN
@@ -90,7 +90,7 @@ class ExClient(BaseExClient):
 
 async def main():
     _ = await init_db(TORM)
-    async with FillerClient(TOKEN) as b:
+    async with FileClient(TOKEN) as b:
         ex = await Ex.get(name="Mexc")
         cl = ex.client(b)
         # await ex.curexs.filter(cur__ticker="EUR")

{xync_client-0.0.72.dev0 → xync_client-0.0.74.dev0}/xync_client/Okx/ex.py

@@ -3,6 +3,8 @@ from asyncio import run
 from pyro_client.client.file import FileClient
 from pyro_client.loader import TOKEN
 from x_model import init_db
+
+from xync_client.Abc.Exception import NoPairOnEx
 from xync_client.loader import TORM
 from xync_schema import models
 from xync_schema import xtype
@@ -79,6 +81,12 @@ class ExClient(BaseExClient):
             "numberPerPage": "5",
         }
         ads = await self._get("/v3/c2c/tradingOrders/getMarketplaceAdsPrelogin", params=params)
+        if not ads["data"]:
+            match ads["code"]:
+                case 17007:
+                    raise NoPairOnEx(ex=self.ex, coinex=coin_exid, curex=cur_exid)
+                case _:
+                    raise Exception(f"Unknown {self.ex.name} err: {ads['code']}: {ads['msg']}")
         return [ad.Ads(**a) for a in ads["data"]["sell"]]
 
     # 42: Чужая объява по id

{xync_client-0.0.72.dev0 → xync_client-0.0.74.dev0}/xync_client/TgWallet/ex.py

@@ -150,10 +150,6 @@ async def _test():
     tgex = await models.Ex.get(name="TgWallet")
     async with FileClient(TOKEN) as b:
         cl: ExClient = tgex.client(b)
-        await cl.pms()
-        await cl.pairs()
-        await cl.set_pmcurs()
-        await cl.set_coins()
 
         # # # SALE # # #
         # get ads list

{xync_client-0.0.72.dev0 → xync_client-0.0.74.dev0/xync_client.egg-info}/PKG-INFO

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