xync-client 0.0.43.dev17__tar.gz → 0.0.43.dev24__tar.gz

{xync_client-0.0.43.dev17/xync_client.egg-info → xync_client-0.0.43.dev24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.43.dev17
+Version: 0.0.43.dev24
 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.43.dev17 → xync_client-0.0.43.dev24}/xync_client/Abc/Ex.py

@@ -7,7 +7,7 @@ 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, df_curs
+from xync_schema.enums import FileType
 from xync_schema.types import CurEx, CoinEx, BaseAd, BaseAdIn
 
 from xync_client.Abc.Base import BaseClient, MapOfIdsList

{xync_client-0.0.43.dev17 → xync_client-0.0.43.dev24}/xync_client/Bybit/agent.py

@@ -364,47 +364,67 @@ class AgentClient(BaseAgentClient):  # Bybit client
         coin: models.Coin,
         cur: models.Cur,
         is_sell: bool,
-        pms: dict[models.Pmex, models.CredEx],
-        amount: float,
+        pms: list[str],
         ceil: float,
-        place: int = 1,
+        volume: float = None,
+        place: int = 0,
     ):
         k = (-1) ** int(is_sell)  # on_buy=1, on_sell=-1
+
+        creds: dict[models.Pmex, models.CredEx] = await get_creds(pms, self.ex)
+        if not volume:
+            if is_sell:  # гонка в стакане продажи - мы покупаем монету за ФИАТ
+                # todo: we using the only one fiat exactly from THE FIRST cred
+                fiat = await models.Fiat.get(cred_id=list(creds.values())[0].cred_id)
+                volume = fiat.amount / ceil
+            else:  # гонка в стакане покупки - мы продаем МОНЕТУ за фиат
+                asset = await models.Asset.get(addr__actor=self.actor, addr__coin=coin)
+                volume = asset.free - (asset.freeze or 0) - (asset.lock or 0)
+
+        volume = str(round(volume, coin.scale))
+
+        credex_ids = [str(p.exid) for p in creds.values()]
+
         while self.actor.person.user.status > 0:
-            ads: list[Ad] = await self.ads(coin, cur, is_sell, list(pms.keys()))
+            ads: list[Ad] = await self.ads(coin, cur, is_sell, list(creds.keys()))
             idiot_maker_filter(ads, ceil, k)
             cur_plc = [i for i, ad in enumerate(ads) if int(ad.accountId) == self.actor.exid][0]
             mad: Ad = ads.pop(cur_plc)
+            if not ads:
+                await sleep(60)
+                continue
             # чью цену будем обгонять, предыдущей или слещующей объявы?
             cad: Ad = ads[place] if cur_plc > place else ads[cur_plc]
             # а цена обгоняемой объявы не выше нашего потолка?
             if (float(cad.price) - ceil) * k < 0:
                 # тогда берем следующую
                 cad = ads[cur_plc]
-            cprice = float(cad.price)
-            new_price = round(cprice - k * step(mad, cad), cur.scale)
-            if mad.price == f"%.{cur.scale}f" % new_price:
+            new_price = round(float(cad.price) - k * step(mad, cad), cur.scale)
+            if mad.price == f"%.{cur.scale}f" % new_price:  # Если нужная цена и так уже стоит
                 print(end="v" if is_sell else "^", flush=True)
                 await sleep(2)
                 continue
             if cad.priceType:  # Если цена конкурента плавающая, то повышаем себе не цену, а %
-                mad.premium = str(round(float(cad.premium) - k * step(mad, cad), 2))
+                new_premium = str(round(float(cad.premium) - k * step(mad, cad), 2))
+                if mad.premium == new_premium:  # Если нужный % и так уже стоит
+                    print(end="v" if is_sell else "^", flush=True)
+                    await sleep(2)
+                    continue
+                mad.premium = new_premium
             mad.priceType = cad.priceType
             mad.price = str(new_price)
-            mad.quantity = str(round(amount, coin.scale))
+            mad.quantity = volume
             mad.maxAmount = str(2_000_000)
-            req = AdUpdateRequest.model_validate(
-                {**mad.model_dump(), "paymentIds": [str(p.exid) for p in pms.values()]}
-            )
+            req = AdUpdateRequest.model_validate({**mad.model_dump(), "paymentIds": credex_ids})
             try:
                 _res = self.ad_upd(req)
             except FailedRequestError:
                 # logging.error(e.message)
-                await sleep(51)
+                await sleep(49)
             except (ReadTimeoutError, ConnectionDoesNotExistError):
                 logging.warning("Connection failed. Restarting..")
             print("-" if is_sell else "+", end=req.price, flush=True)
-            await sleep(40)
+            await sleep(42)
 
 
 def step(mad, cad) -> float:
@@ -418,7 +438,7 @@ def step(mad, cad) -> float:
 
 def idiot_maker_filter(ads: list[Ad], ceil: float, k: Literal[-1, 1]):
     # игнорим ads с ценами >+5% моего страховочного потолка
-    if (ceil * (1 - k * 0.04) - float(ads[0].price)) * k > 0:
+    if ads and (ceil * (1 - k * 0.04) - float(ads[0].price)) * k > 0:
         ads.pop(0)
         idiot_maker_filter(ads, ceil, k)
 
@@ -427,10 +447,9 @@ def listen(data: dict):
     print(data)
 
 
-async def get_creds(norms: list[str], ex_id: int) -> dict[models.Pmex, models.CredEx]:
+async def get_creds(norms: list[str], ex: models.Ex) -> dict[models.Pmex, models.CredEx]:
     return {
-        await models.Pmex.get(ex_id=ex_id, pm__norm=n): await models.CredEx.get(ex_id=ex_id, cred__pmcur__pm__norm=n)
-        for n in norms
+        await models.Pmex.get(ex=ex, pm__norm=n): await models.CredEx.get(ex=ex, cred__pmcur__pm__norm=n) for n in norms
     }
 
 
@@ -444,24 +463,21 @@ async def main():
     usdt = await models.Coin.get(ticker="USDT")
     btc = await models.Coin.get(ticker="BTC")
     eth = await models.Coin.get(ticker="ETH")
+    usdc = await models.Coin.get(ticker="USDC")
     rub = await models.Cur.get(ticker="RUB")
     # await models.Direction.get(
     #     pairex__ex=cl.ex, pairex__pair__coin__ticker="USDT", pairex__pair__cur__ticker="RUB", sell=True
     # )
-    usdt_asset = await models.Asset.get(addr__actor=actor, addr__coin=usdt)
-    btc_asset = await models.Asset.get(addr__actor=actor, addr__coin=btc)
-    eth_asset = await models.Asset.get(addr__actor=actor, addr__coin=eth)
-    creds = await get_creds(["volet"], 9)
-    volet = await models.Fiat.get(cred_id=list(creds.values())[0].cred_id)
-    usdt_amount = usdt_asset.free - (usdt_asset.freeze or 0) - (usdt_asset.lock or 0)
-    btc_asset.free - (btc_asset.freeze or 0) - (btc_asset.lock or 0)
-    eth_asset.free - (eth_asset.freeze or 0) - (eth_asset.lock or 0)
     # await cl.set_creds()
     await gather(
-        cl.battle(usdt, rub, False, creds, usdt_amount, 85.39, 0),  # гонка в стакане покупки - мы продаем
-        cl.battle(usdt, rub, True, creds, volet.amount / 82, 82, 0),  # гонка в стакане продажи - мы покупаем
-        cl.battle(eth, rub, True, creds, volet.amount / 144_000, 144_000, 0),
-        cl.battle(btc, rub, True, creds, volet.amount / 7_600_000, 7_600_000, 0),
+        cl.battle(usdt, rub, False, ["volet"], 85.39),  # гонка в стакане покупки - мы продаем
+        cl.battle(usdt, rub, True, ["volet"], 82),  # гонка в стакане продажи - мы покупаем
+        cl.battle(eth, rub, False, ["volet"], 160_000),
+        cl.battle(eth, rub, True, ["volet"], 144_000),
+        cl.battle(btc, rub, False, ["volet"], 8_700_000),
+        cl.battle(btc, rub, True, ["volet"], 7_600_000),
+        cl.battle(usdc, rub, True, ["volet"], 82),
+        cl.battle(usdc, rub, False, ["volet"], 86),
     )
 
     bor = BaseOrderReq(

{xync_client-0.0.43.dev17 → xync_client-0.0.43.dev24}/xync_client/Htx/agent.py

@@ -1,10 +1,13 @@
+from json import dumps
+
 from x_client.aiohttp import Client
 from xync_schema.enums import AdStatus, PmType, OrderStatus
 from xync_schema.models import Pm, Coin, Cur, Ad, Order
-
+from xync_schema import models
 from xync_client.Abc.Agent import BaseAgentClient
 from xync_client.Htx.etype import test
 
+import logging
 
 url_ads_req = "https://otc-cf.huobi.com/v1/data/trade-market"
 url_ads_web = "https://www.huobi.com/en-us/fiat-crypto/trade/"
@@ -19,11 +22,52 @@ class Public(Client):
 
 
 class AgentClient(BaseAgentClient):
+    headers = {
+        "portal": "web",
+    }
+
     async def creds(self) -> list[test.CredEpyd]:
         resp = await self._get("/-/x/otc/v1/user/receipt-account")
         return [test.CredEpyd(**cred) for cred in resp["data"]]
 
-    async def cred_del(self, cred_id: int) -> int: ...
+    async def cred_del(self, cred_id: int) -> int:
+        data = {"id": str(cred_id), "password": self.actor.agent.auth["password"]}
+
+        cred_del = await self._post("/-/x/otc/v1/user/receipt-account/remove", data=data)
+        if cred_del["message"] == "Success":
+            await (await models.CredEx.get(exid=cred_id)).delete()
+            return cred_id
+        else:
+            logging.error(cred_del)
+
+    async def dynamicModelInfo(self, pids: str):
+        resp = await self._get("/-/x/otc/v1/user/receipt-account/dynamicModelInfo", {"payMethodIds": pids})
+        return resp["data"]["modelFields"]
+
+    async def cred_new(self, cred: models.Cred) -> models.CredEx:
+        pmcur = await cred.pmcur
+        exid = str(await models.Pmex.get(pm_id=pmcur.pm_id, ex=self.ex_client.ex).values_list("exid", flat=True))
+        field_map = {
+            "payee": "name",
+            "bank": "extra",
+            "sub_bank": "extra",
+            "pay_account": "detail",
+        }
+        fields = {f["fieldType"]: f["fieldId"] for f in await self.dynamicModelInfo(exid)}
+        # Данные, где modelFields теперь список ModelField
+        data = {
+            "payMethod": exid,
+            "password": self.actor.agent.auth["password"],
+            "modelFields": dumps(
+                [{"fieldId": fid, "fieldType": ft, "value": getattr(cred, field_map[ft])} for ft, fid in fields.items()]
+            ),
+        }
+        resp = await self._post("/-/x/otc/v1/user/receipt-account/addByDynamicModel", data=data)
+        if not resp["success"]:
+            logging.exception(resp["message"])
+        res = test.Result(**resp)
+        credex, _ = await models.CredEx.update_or_create({"cred": cred, "ex": self.ex}, exid=res.data.id)
+        return credex
 
     # 0
     async def get_orders(
@@ -133,9 +177,10 @@ async def _test():
         await models.Actor.filter(ex_id=15, agent__isnull=False).prefetch_related("ex", "agent", "person__user").first()
     )
     cl: AgentClient = actor.client()
-    await cl.creds()
-    await models.Coin.get(ticker="USDT")
-    await models.Cur.get(ticker="RUB")
+    cred = await models.Cred[89]
+    _ = await cl.cred_new(cred)
+    _creds = await cl.creds()
+    # _ = await cl.cred_del(16984748)
     await cl.close()
 
 

{xync_client-0.0.43.dev17 → xync_client-0.0.43.dev24}/xync_client/Htx/etype/test.py

@@ -1,7 +1,7 @@
-from typing import List, Optional, Dict, Any
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 from xync_client.Abc.types import CredExOut
 
+
 class ModelField(BaseModel):
     fieldId: str
     name: str
@@ -11,8 +11,9 @@ class ModelField(BaseModel):
     required: bool
     copyable: bool
     remindWord: str
-    valueType: str
-    value: str
+    valueType: str | None
+    value: str | None
+
 
 class CredEpyd(CredExOut):
     id: int
@@ -21,13 +22,25 @@ class CredEpyd(CredExOut):
     bankType: int
     bankNumber: str
     bankName: str
-    bankAddress: Optional[str] = None
-    qrCode: Optional[str] = None
+    bankAddress: str | None = None
+    qrCode: str | None = None
     isShow: int
     buyingEnable: bool
     sellingEnable: bool
-    disabledCurrencyList: List[int]
+    disabledCurrencyList: list[int]
     modelFields: str
-    modelFieldsList: List[ModelField]
+    modelFieldsList: list[ModelField]
     color: str
     payMethodName: str
+
+
+class CredExId(CredExOut):
+    id: int = Field(validation_alias="bankId")
+
+
+class Result(BaseModel):
+    code: int
+    data: CredExId
+    extend: str | None = None
+    message: str
+    success: bool

{xync_client-0.0.43.dev17 → xync_client-0.0.43.dev24/xync_client.egg-info}/PKG-INFO

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