xync-client 0.0.43.dev4__tar.gz → 0.0.43.dev11__tar.gz

{xync_client-0.0.43.dev4/xync_client.egg-info → xync_client-0.0.43.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.43.dev4
+Version: 0.0.43.dev11
 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.dev4 → xync_client-0.0.43.dev11}/tests/TestAgent.py

@@ -33,9 +33,9 @@ class TestAgent(BaseTest):
     # 26
     async def test_cred_new(self, clients: list[tuple[BaseAgentClient, BaseAgentClient]]):
         for maker, taker in clients:
-            pmcur = await Pmcur.filter(pm__pmexs__ex=taker.ex, cur__ticker="RUB", pm__norm="sbp").first()
+            pmcur = await Pmcur.filter(pm__pmexs__ex=taker.ex, cur__ticker="RUB", pm__norm="payeer").first()
             cred = await Cred.create(person_id=taker.actor.person_id, name="Tst", detail="79990001234", pmcur=pmcur)
-            await cred.banks.add(await PmexBank.get(exid="mts"), await PmexBank.get(exid="sberbankru"))
+            # await cred.banks.add(await PmexBank.get(exid="mts"), await PmexBank.get(exid="sberbankru"))
             cred_new: CredEx = await taker.cred_new(cred)
             ok = isinstance(cred_new, CredEx)
             t, _ = await TestEx.update_or_create({"ok": ok}, ex=taker.ex, action=ExAction.cred_new)

{xync_client-0.0.43.dev4 → xync_client-0.0.43.dev11}/xync_client/Abc/Ex.py

@@ -73,7 +73,9 @@ class BaseExClient(BaseClient):
         return []
 
     # Импорт Pm-ов (с Pmcur-, Pmex- и Pmcurex-ами) и валют (с Curex-ами) с биржи в бд
-    async def set_pmcurexs(self):
+    async def set_pmcurexs(self, cookies: dict = None):
+        if cookies:
+            self.session.cookie_jar.update_cookies(cookies)
         # Curs
         cur_pyds: dict[str, CurEx] = await self.curs()
         curs: dict[int | str, models.Cur] = {

{xync_client-0.0.43.dev4 → xync_client-0.0.43.dev11}/xync_client/BitGet/ex.py

@@ -23,7 +23,8 @@ class ExClient(BaseExClient):
             "Banque du Developpement Local BDL": "Banque de développement local (BDL)",
             "ADCB Abu Dhabi Commercial Bank": "ADCB",
             "BDO": "Banco De Oro (BDO)",
-            "Touch 'n Go": "Touch n Go"
+            "Touch 'n Go": "Touch n Go",
+            "LINE Bank by Hana Bank": "LINE Pay"
         }
 
     unifier_class = BitGetUnifier

{xync_client-0.0.43.dev4 → xync_client-0.0.43.dev11}/xync_client/Bybit/agent.py

@@ -1,6 +1,6 @@
-from asyncio import run
+from asyncio import run, sleep
 from enum import IntEnum
-from time import sleep
+from http.client import HTTPException
 
 import pyotp
 from bybit_p2p import P2P
@@ -12,7 +12,8 @@ from xync_schema.models import Cur, Actor
 
 from xync_client.Abc.Agent import BaseAgentClient
 from xync_client.Abc.types import BaseOrderReq
-from xync_client.Bybit.etype.ad import AdPostRequest, AdUpdateRequest, AdDeleteRequest
+from xync_client.Bybit.etype.ad import AdPostRequest, AdUpdateRequest, AdDeleteRequest, Ad
+from xync_client.Bybit.etype.cred import CredEpyd
 from xync_client.Bybit.etype.order import OrderRequest, PreOrderResp, OrderResp, CancelOrderReq
 from xync_client.loader import PG_DSN
 
@@ -92,8 +93,42 @@ class AgentClient(BaseAgentClient):  # Bybit client
             return fiat
         return list_methods[1]
 
-    def creds(self):
+    def creds(self) -> list[CredEpyd]:
         data = self.api.get_user_payment_types()
+        if data["ret_code"] > 0:
+            return data
+        return [CredEpyd.model_validate(credex) for credex in data["result"]]
+
+    async def cred_epyd2db(self, cred: CredEpyd) -> models.CredEx:
+        if cred.paymentType not in (416,):
+            if not (
+                pmex := await models.Pmex.get_or_none(exid=cred.paymentType, ex=self.ex_client.ex).prefetch_related(
+                    "pm__curs"
+                )
+            ):
+                raise HTTPException(f"No Pmex {cred.paymentType} on ex#{self.ex_client.ex.name}", 404)
+            curs = cred.currencyBalance or {c.ticker for c in pmex.pm.curs}
+            if not (pmcurs := await models.Pmcur.filter(cur__ticker__in=curs, pm_id=pmex.pm_id)):
+                raise HTTPException(f"No Pmcur with cur#{cred.currencyBalance} and pm#{cred.paymentType}", 404)
+            if not (person := await models.Person.get_or_none(actors__exid=self.actor.exid)):
+                raise HTTPException(f"No Pmcur with cur#{cred.currencyBalance} and pm#{cred.paymentType}", 404)
+            dct = {
+                "pmcur_id": pmcurs[0].id,
+                "name": cred.paymentConfigVo.paymentName,
+                "person_id": person.id,
+            }  # todo: WTD with multicur pms?
+            cred_in = models.Cred.validate(dct, False)
+            cred_db, _ = await models.Cred.update_or_create(**cred_in.df_unq())
+            credex_in = models.CredEx.validate({"exid": cred.paymentType, "cred_id": cred_db.id, "ex_id": self.ex.id})
+            credex_db, _ = await models.CredEx.update_or_create(**credex_in.df_unq())
+            return credex_db
+
+    # 25: Список реквизитов моих платежных методов
+    async def set_creds(self) -> list[models.CredEx]:
+        credexs_epyd: list[CredEpyd] = self.creds()
+        credexs: list[models.CredEx] = [await self.cred_epyd2db(f) for f in credexs_epyd]
+        return credexs
+
         return data["result"] if data["ret_code"] == 0 else data
 
     async def ott(self):
@@ -127,6 +162,12 @@ class AgentClient(BaseAgentClient):  # Bybit client
         res = await self._post("/fiat/otc/maker/work-config/switch", data)
         return res
 
+    async def ads(self, coin: models.Coin, cur: models.Cur, is_sell: bool, pms: list[models.Pm]) -> list[Ad]:
+        coinex = await models.Coinex.get(ex=self.ex, coin=coin)
+        curex = await models.Curex.get(ex=self.ex, cur=cur)
+        pmexs = await models.Pmex.filter(ex=self.ex, pm_id__in=[pm.id for pm in pms])
+        return await self.ex_client.ads(coinex.exid, curex.exid, is_sell, [pmex.exid for pmex in pmexs])
+
     def online_ads(self) -> str:
         online = self._get("/fiat/otc/maker/work-config/get")
         return online["result"]["workStatus"]
@@ -188,7 +229,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
         return data["result"]["itemId"] if data["ret_code"] == 0 else data
 
     def ad_upd(self, upd: AdUpdateRequest):
-        data = self.api.update_ad(**upd.model_dump())
+        params = upd.model_dump()
+        data = self.api.update_ad(**params)
         return data["result"] if data["ret_code"] == 0 else data
 
     def get_security_token_update(self) -> str:
@@ -303,6 +345,18 @@ class AgentClient(BaseAgentClient):  # Bybit client
             },
         )
 
+    async def battle(self, coin: models.Coin, cur: models.Cur, is_sell: bool, pms: list[models.Pm], place: int = 1):
+        while self.actor.person.user.status > 0:
+            ads: list[Ad] = await self.ads(coin, cur, is_sell, pms)
+            cur_plc = [i for i, ad in enumerate(ads) if int(ad.accountId) == self.actor.exid][0]
+            if cur_plc > place:
+                mad: Ad = ads[cur_plc]
+                mad.price = str(float(ads[place].price) - 0.01 * (-1) ** int(is_sell))
+                req = AdUpdateRequest.model_validate(mad.model_dump())
+                res = self.ad_upd(req)
+                print(res)
+            await sleep(5)
+
 
 def listen(data: dict):
     print(data)
@@ -310,16 +364,24 @@ def listen(data: dict):
 
 async def main():
     _ = await init_db(PG_DSN, models, True)
-    actor = await models.Actor.filter(ex_id=9, agent__isnull=False).prefetch_related("ex", "agent").first()
+    actor = (
+        await models.Actor.filter(ex_id=9, agent__isnull=False).prefetch_related("ex", "agent", "person__user").first()
+    )
     cl: AgentClient = actor.client()
     coin = await models.Coin.get(ticker="USDT")
+    cur = await models.Cur.get(ticker="RUB")
+    volet = await models.Pm.get(norm="volet")
+    # await cl.ex_client.set_pmcurexs(cookies=actor.agent.auth["cookies"]) 607 -> 629
+    await cl.set_creds()
+    await cl.battle(coin, cur, False, [volet], 1)
+
     bor = BaseOrderReq(
         ad_id="1861440060199632896",
         # asset_amount=40,
         fiat_amount=3000,
         amount_is_fiat=True,
         is_sell=False,
-        cur_exid="RUB",
+        cur_exid=cur.ticker,
         coin_exid=coin.ticker,
         coin_scale=coin.scale,
     )

{xync_client-0.0.43.dev4 → xync_client-0.0.43.dev11}/xync_client/Bybit/etype/ad.py

@@ -5,6 +5,12 @@ from xync_schema.types import BaseAd
 from xync_client.Abc.types import BaseAdUpdate
 
 
+class AdsReq(BaseModel):
+    tokenId: str
+    currencyId: str
+    side: Literal["0", "1"]  # 0 покупка, # 1 продажа
+
+
 class Currency(BaseModel):
     currencyId: str
     exchangeId: str
@@ -93,15 +99,14 @@ class Ad(BaseAd):
     payments: List[str]
     premium: str
     price: str
-    priceType: int
+    priceType: Literal[0, 1]  # 0 - fix rate, 1 - floating    status: int
     quantity: str
     recentExecuteRate: int
     recentOrderNum: int
     recommend: bool
     recommendTag: str
     remark: str
-    side: int
-    status: int
+    side: Literal[0, 1]  # 0 - покупка, 1 - продажа
     symbolInfo: SymbolInfo
     tokenId: str
     tokenName: str
@@ -118,22 +123,22 @@ class Ad(BaseAd):
 class AdPostRequest(BaseModel):
     tokenId: str
     currencyId: str
-    side: Literal["0", "1"]  # 0 - покупка, 1 - продажа
-    priceType: Literal["0", "1"]  # 0 - fix rate, 1 - floating
+    side: Literal[0, 1]  # 0 - покупка, 1 - продажа
+    priceType: Literal[0, 1]  # 0 - fix rate, 1 - floating
     premium: str
     price: str
     minAmount: str
     maxAmount: str
     remark: str
-    tradingPreferenceSet: dict[str, int | str]
+    tradingPreferenceSet: TradingPreferenceSet
     paymentIds: list[str]
     quantity: str
-    paymentPeriod: str
+    paymentPeriod: int
     itemType: str
 
 
 class AdUpdateRequest(AdPostRequest, BaseAdUpdate):
-    actionType: Literal["MODIFY", "ACTIVE"]
+    actionType: Literal["MODIFY", "ACTIVE"] = "MODIFY"
 
 
 class AdDeleteRequest(BaseModel):

xync_client-0.0.43.dev11/xync_client/Bybit/etype/cred.py

@@ -0,0 +1,60 @@
+from typing import Literal
+
+from pydantic import BaseModel
+
+from xync_client.Abc.types import CredExOut
+
+
+class PaymentItem(BaseModel):
+    view: bool
+    name: str
+    label: str
+    placeholder: str
+    type: str
+    maxLength: str
+    required: bool
+
+
+class PaymentConfigVo(BaseModel):
+    paymentType: str
+    checkType: int
+    sort: int
+    paymentName: str
+    addTips: str
+    itemTips: str
+    online: Literal[0, 1]  # Non-balance coin purchase (0 Offline), balance coin purchase (1 Online)
+    items: list[PaymentItem]
+
+
+class CredEpyd(CredExOut):
+    id: str  # int
+    realName: str
+    paymentType: int  # int
+    bankName: str
+    branchName: str
+    accountNo: str
+    qrcode: str
+    visible: int
+    payMessage: str
+    firstName: str
+    lastName: str
+    secondLastName: str
+    clabe: str
+    debitCardNumber: str
+    mobile: str
+    businessName: str
+    concept: str
+    online: str
+    countNo: str
+    paymentExt1: str
+    paymentExt2: str
+    paymentExt3: str
+    paymentExt4: str
+    paymentExt5: str
+    paymentExt6: str
+    paymentTemplateVersion: int
+    hasPaymentTemplateChanged: bool
+    paymentConfigVo: PaymentConfigVo
+    realNameVerified: bool
+    channel: str
+    currencyBalance: list[str]

{xync_client-0.0.43.dev4 → xync_client-0.0.43.dev11}/xync_client/Htx/agent.py

@@ -1,9 +1,10 @@
 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_schema.models import Pm, Coin, Cur, Ad, Order
 
 from xync_client.Abc.Agent import BaseAgentClient
+from xync_client.Htx.etype import test
+
 
 url_ads_req = "https://otc-cf.huobi.com/v1/data/trade-market"
 url_ads_web = "https://www.huobi.com/en-us/fiat-crypto/trade/"
@@ -17,7 +18,13 @@ class Public(Client):
     url_ads_web = "https://www.huobi.com/en-us/fiat-crypto/trade/"
 
 
-class Private(BaseAgentClient):
+class AgentClient(BaseAgentClient):
+    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: ...
+
     # 0
     async def get_orders(
         self, stauts: OrderStatus = OrderStatus.created, coin: Coin = None, cur: Cur = None, is_sell: bool = None
@@ -30,8 +37,8 @@ class Private(BaseAgentClient):
     async def my_fiats(self, cur: Cur = None) -> list[dict]:
         pass
 
-    async def fiat_new(self, fiat: FiatNew) -> Fiat.pyd():
-        pass
+    # async def fiat_new(self, fiat: FiatNew) -> Fiat.pyd():
+    #     pass
 
     async def fiat_upd(self, detail: str = None, typ: PmType = None) -> bool:
         pass
@@ -114,3 +121,25 @@ class Private(BaseAgentClient):
     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"
+
+
+async def _test():
+    from x_model import init_db
+    from xync_client.loader import PG_DSN
+    from xync_schema import models
+
+    _ = await init_db(PG_DSN, models, True)
+    actor = (
+        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")
+    await cl.close()
+
+
+if __name__ == "__main__":
+    from asyncio import run
+
+    run(_test())

xync_client-0.0.43.dev11/xync_client/Htx/etype/test.py

@@ -0,0 +1,33 @@
+from typing import List, Optional, Dict, Any
+from pydantic import BaseModel
+from xync_client.Abc.types import CredExOut
+
+class ModelField(BaseModel):
+    fieldId: str
+    name: str
+    fieldType: str
+    index: int
+    maxLength: int
+    required: bool
+    copyable: bool
+    remindWord: str
+    valueType: str
+    value: str
+
+class CredEpyd(CredExOut):
+    id: int
+    uid: int
+    userName: str
+    bankType: int
+    bankNumber: str
+    bankName: str
+    bankAddress: Optional[str] = None
+    qrCode: Optional[str] = None
+    isShow: int
+    buyingEnable: bool
+    sellingEnable: bool
+    disabledCurrencyList: List[int]
+    modelFields: str
+    modelFieldsList: List[ModelField]
+    color: str
+    payMethodName: str

{xync_client-0.0.43.dev4 → xync_client-0.0.43.dev11}/xync_client/TgWallet/ex.py

@@ -19,9 +19,17 @@ from xync_client.loader import PG_DSN
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.Abc.Base import MapOfIdsList
 from xync_client.TgWallet.auth import AuthClient
-
+from xync_client.pm_unifier import PmUnifier
 
 class ExClient(BaseExClient, AuthClient):
+    class TgWalletUnifier(PmUnifier):
+        pm_map = {
+            "Rabbit LINE Pay": "LINE Pay"
+        }
+
+    unifier_class = TgWalletUnifier
+
+
     def __init__(self, ex: models.Ex, actor: models.Actor = None):
         if actor:
             self.actor = actor

{xync_client-0.0.43.dev4 → xync_client-0.0.43.dev11/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.43.dev4
+Version: 0.0.43.dev11
 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.dev4 → xync_client-0.0.43.dev11}/xync_client.egg-info/SOURCES.txt

@@ -64,6 +64,7 @@ xync_client/Bybit/web_earn.py
 xync_client/Bybit/web_p2p.py
 xync_client/Bybit/ws.py
 xync_client/Bybit/etype/ad.py
+xync_client/Bybit/etype/cred.py
 xync_client/Bybit/etype/order.py
 xync_client/Gate/ex.py
 xync_client/Gate/premarket.py
@@ -75,6 +76,7 @@ xync_client/Htx/etype/__init__.py
 xync_client/Htx/etype/ad.py
 xync_client/Htx/etype/cred.py
 xync_client/Htx/etype/pm.py
+xync_client/Htx/etype/test.py
 xync_client/KuCoin/ex.py
 xync_client/KuCoin/web.py
 xync_client/KuCoin/etype/ad.py