xync-client 0.0.164__py3-none-any.whl → 0.0.172__py3-none-any.whl

xync_client/Bybit/etype/ad.py

@@ -1,13 +1,17 @@
-from enum import StrEnum
-from typing import List, Optional, Any, Literal
-from pydantic import BaseModel, Field
-from xync_client.Bybit.etype.cred import MyPaymentTerm
-from xync_schema.xtype import BaseAd
+from enum import StrEnum, IntEnum
+from typing import Optional, Any, Literal
+from pydantic import BaseModel, Field, model_validator
+from xync_client.Abc.xtype import BaseAd, AdStatus as xAdStatus, RemapBase, BaseCredexsExidsTrait
+from xync_schema.enums import Side, PriceType
 
-from xync_client.Abc.xtype import BaseAdUpdate
 
+class AdStatus(IntEnum):
+    active = 10
+    hidden = 20
+    complete = 30
 
-class AdStatus(StrEnum):
+
+class AdStatusReq(StrEnum):
     sold_out = "1"
     active = "2"
 
@@ -108,63 +112,80 @@ class AdPostRequest(BaseModel):
     itemType: Literal["ORIGIN", "BULK"] = "ORIGIN"
 
 
-class AdUpdateRequest(AdPostRequest, BaseAdUpdate):
+class AdRequest(AdPostRequest, BaseAd):
     actionType: Literal["MODIFY", "ACTIVE"] = "MODIFY"
 
 
-class Ad(BaseAd):
-    tokenId: str = None  # for initial actualize
-    currencyId: str = None  # for initial actualize
-    side: Literal[0, 1] = None  # for initial actualize # 0 - покупка, 1 - продажа (для мейкера, т.е КАКАЯ объява)
-    priceType: Literal[0, 1] = None  # for initial actualize  # 0 - fix rate, 1 - floating
-    premium: str = None  # for initial actualize
-    price: str = None  # for initial actualize
-    maxAmount: str = Field(serialization_alias="max_fiat")
-    minAmount: str = Field(serialization_alias="min_fiat")
-    remark: str = Field(serialization_alias="auto_msg")
-    tradingPreferenceSet: TradingPreferenceSet | None = None  # for initial actualize
-
-    accountId: str = None  # for initial actualize
-    authStatus: int = None  # for initial actualize
-    authTag: List[str] = None  # for initial actualize
-    ban: bool = None  # for initial actualize
-    baned: bool = None  # for initial actualize
-    blocked: str = None  # for initial actualize
-    createDate: str = None  # for initial actualize
-    executedQuantity: str = None  # for initial actualize
-    fee: str = None  # for initial actualize
-    finishNum: int = None  # for initial actualize
-    frozenQuantity: str = None  # for initial actualize
-    id: str = Field(serialization_alias="exid")
-    isOnline: bool = None  # for initial actualize
-    itemType: str = None  # for initial actualize
-    lastLogoutTime: str = None  # for initial actualize
-    lastQuantity: str = Field(serialization_alias="quantity")
-    makerContact: bool = None  # for initial actualize
-    nickName: str = None  # for initial actualize
-    orderNum: int = None  # for initial actualize
-    paymentPeriod: int = None  # for initial actualize
-    payments: List[str] = None  # for initial actualize
-    quantity: str = Field(serialization_alias="allQuantity")  # for initial actualize
-    recentExecuteRate: int = None  # for initial actualize
-    recentOrderNum: int = None  # for initial actualize
-    recommend: bool = None  # for initial actualize
-    recommendTag: str = None  # for initial actualize
-    status: Literal[10, 20, 30]  # 10: online; 20: offline; 30: completed
-    symbolInfo: SymbolInfo = None  # for initial actualize
-    tokenName: str = None  # for initial actualize
-    userId: str
-    userMaskId: str = None  # for initial actualize
-    userType: str = None  # for initial actualize
-    verificationOrderAmount: str = None  # for initial actualize
-    verificationOrderLabels: List[Any] = None  # for initial actualize
-    verificationOrderSwitch: bool = None  # for initial actualize
-    version: int = None  # for initial actualize
+class Ad(BaseAd, RemapBase):
+    _remap = {
+        "status": {
+            AdStatus.active: xAdStatus.active,
+            AdStatus.hidden: xAdStatus.defActive,
+            AdStatus.complete: xAdStatus.soldOut,
+        }
+    }
+
+    auto_msg: None = None
+    cond_txt: str = Field(alias="remark")
+    created_at: int = Field(alias="createDate")
+    coinex_exid: str = Field(alias="tokenId")  # ticker
+    curex_exid: str = Field(alias="currencyId")  # ticker
+    maker_exid: int = Field(alias="userId")
+    maker_name: str = Field(alias="nickName")
+    max_fiat: float = Field(alias="maxAmount")
+    min_fiat: float = Field(alias="minAmount")
+    # paymentPeriod: int
+    pmex_exids: list[int] = Field(alias="payments")
+    # recentOrderNum: int
+    side: Literal[Side.BUY, Side.SALE]
+    priceType: Literal[PriceType.FIX, PriceType.FLOAT]
+    # tradingPreferenceSet: TradingPreferenceSet | None = None  # for initial actualize
+
+    # accountId: str = None  # for initial actualize
+    # authStatus: int = None  # for initial actualize
+    # authTag: List[str] = None  # for initial actualize
+    # ban: bool = None  # for initial actualize
+    # baned: bool = None  # for initial actualize
+    # blocked: str = None  # for initial actualize
+    # createDate: str = None  # for initial actualize
+    # executedQuantity: str = None  # for initial actualize
+    # fee: str = None  # for initial actualize
+    # finishNum: int = None  # for initial actualize
+    # frozenQuantity: str = None  # for initial actualize
+    # isOnline: bool = None  # for initial actualize
+    # itemType: str = None  # for initial actualize
+    # lastLogoutTime: str = None  # for initial actualize
+    # lastQuantity: str = Field(serialization_alias="quantity")
+    # makerContact: bool = None  # for initial actualize
+    # nickName: str = None  # for initial actualize
+    # orderNum: int = None  # for initial actualize
+    # paymentPeriod: int = None  # for initial actualize
+    # payments: List[str] = None  # for initial actualize
+    # quantity: str = Field(serialization_alias="allQuantity")  # for initial actualize
+    # recentExecuteRate: int = None  # for initial actualize
+    # recentOrderNum: int = None  # for initial actualize
+    # recommend: bool = None  # for initial actualize
+    # recommendTag: str = None  # for initial actualize
+    # status: Literal[10, 20, 30]  # 10: online; 20: offline; 30: completed
+    # symbolInfo: SymbolInfo = None  # for initial actualize
+    # tokenName: str = None  # for initial actualize
+    # userMaskId: str = None  # for initial actualize
+    # userType: str = None  # for initial actualize
+    # verificationOrderAmount: str = None  # for initial actualize
+    # verificationOrderLabels: List[Any] = None  # for initial actualize
+    # verificationOrderSwitch: bool = None  # for initial actualize
+    # version: int = None  # for initial actualize
 
     # @field_serializer("status")
     # def status(self, status, _info) -> xtype.AdStatus:
     #     return {10: xtype.AdStatus.active, 20: xtype.AdStatus.defActive, 30: xtype.AdStatus.soldOut}[status]
 
 
-class MyAd(Ad):
-    paymentTerms: List[MyPaymentTerm]
+class MyAd(Ad, BaseCredexsExidsTrait):
+    credex_exids: list[int] = Field(alias="paymentTerms")
+    # paymentTerms: list[MyPaymentTerm]
+
+    @model_validator(mode="before")
+    def cred_exids(cls, data: "MyAd"):
+        data["paymentTerms"] = [pt["id"] for pt in data["paymentTerms"]]
+        return data

xync_client/Bybit/etype/cred.py

@@ -1,6 +1,6 @@
-from pydantic import BaseModel
+from pydantic import BaseModel, Field, model_validator
 
-from xync_client.Abc.xtype import CredExOut
+from xync_client.Abc.xtype import BaseCredEx
 
 
 class PaymentItem(BaseModel):
@@ -37,7 +37,7 @@ class PaymentConfigVo(BasePaymentConf):
     items: list[dict[str, str | bool]]
 
 
-class PaymentTerm(CredExOut):
+class PaymentTerm(BaseModel):
     id: str  # int
     realName: str
     paymentType: int  # int
@@ -81,3 +81,25 @@ class MyCredEpyd(CredEpyd):  # todo: заменить везде где надо
     realNameVerified: bool
     channel: str
     currencyBalance: list[str]
+
+
+class CredEx(BaseCredEx):
+    detail: str = Field(alias="accountNo")
+    extra: str | None = Field(alias="bankName")
+    name: str = Field(alias="realName")
+    pmex_exid: int = Field(alias="paymentType")
+
+    @model_validator(mode="before")
+    def xtr_fill(cls, data: PaymentTerm):
+        data = dict(data)
+        xtr = data["bankName"]
+        if data["branchName"]:
+            xtr += (" | " if xtr else "") + data["branchName"]
+        if data["payMessage"]:
+            xtr += (" | " if xtr else "") + data["payMessage"]
+        if data["qrcode"]:
+            xtr += (" | " if xtr else "") + data["qrcode"]
+        if data["paymentExt1"]:
+            xtr += (" | " if xtr else "") + data["paymentExt1"]
+        data["bankName"] = xtr
+        return data

xync_client/Bybit/etype/order.py

@@ -1,10 +1,11 @@
 from enum import IntEnum
 from typing import Literal, ClassVar
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field, model_validator
+from xync_schema.enums import OrderStatus
 
-from xync_client.Abc.xtype import RemapBase
-from xync_client.Bybit.etype.cred import CredEpyd, PaymentTerm as CredPaymentTerm, PaymentConfigVo
+from xync_client.Abc.xtype import RemapBase, BaseOrderItem, BaseOrderFull, BaseOrder, BaseCounteragent
+from xync_client.Bybit.etype.cred import CredEpyd, PaymentTerm as CredPaymentTerm, PaymentConfigVo, CredEx
 
 
 class Topic(IntEnum):
@@ -19,7 +20,7 @@ class Status(IntEnum):
     # chain = 5  # waiting for chain (only web3)
     created = 10  # waiting for buyer to pay
     paid = 20  # waiting for seller to release
-    appealed_by_seller = 30  # appealing
+    appealed = 30  # appealing
     # appealed_by_buyer = 30  # the same appealing
     canceled = 40  # order cancelled
     completed = 50  # order finished
@@ -43,10 +44,6 @@ class TakeAdReq(BaseModel):
 
 
 class OrderRequest(BaseModel):
-    class Side(IntEnum):
-        BUY = 0
-        SALE = 1
-
     itemId: str
     tokenId: str
     currencyId: str
@@ -137,59 +134,77 @@ class PaymentTerm(CredPaymentTerm):
 
 
 class _BaseOrder(RemapBase):
-    _remap: ClassVar[dict[str, dict]] = {"status": {}}
-
-    id: int
-    userId: int
-    createDate: int
-    side: Literal[0, 1]  # int: 0 покупка, 1 продажа (именно для меня - апи агента, и пох мейкер я или тейкер)
-    status: Literal[*[s.value for s in Status]]
-
-
-class _BaseChange(_BaseOrder):
-    makerUserId: int
+    _remap: ClassVar[dict[str, dict]] = {
+        "status": {
+            Status.ws_new: OrderStatus.created,
+            Status.created: OrderStatus.created,
+            Status.paid: OrderStatus.paid,
+            Status.appealed: OrderStatus.appealed_by_seller,  # all appeals from bybit marks as appealed_by_seller
+            Status.canceled: OrderStatus.canceled,
+            Status.completed: OrderStatus.completed,
+            Status.appeal_disputed: OrderStatus.appeal_disputed,  # appeal_disputed and appeal_dispute_disputed from bybit
+            Status.appeal_dispute_disputed: OrderStatus.appeal_disputed,  # marks as just appeal_disputed
+        }
+    }
+    ad__pair_side__is_sell: bool = Field(
+        alias="side"
+    )  # int: 0 покупка, 1 продажа (именно для меня - апи агента, и пох мейкер я или тейкер)
+    created_at: int = Field(alias="createDate")
+
+
+class _BaseChange(_BaseOrder, BaseOrder):
+    ad__pair_side__is_sell: bool  # int: 0 покупка, 1 продажа (именно для меня - апи агента, и пох мейкер я или тейкер)
+    created_at: int
+    exid: int = Field(alias="id")
+    my_exid: int | None = None  # апи агент юзер
+    status: OrderStatus | None = None
+
+    ad__maker_exid: int = Field(alias="makerUserId")
     appealedTimes: int
+    user_exid: int = Field(alias="userId")  # todo: define: is it initiator or counteragent?
     totalAppealedTimes: int
 
 
-class OrderItem(_BaseOrder):
-    tokenId: str
+class OrderItem(_BaseOrder, BaseOrderItem):
+    my_exid: int = Field(alias="userId")
+    coinex_exid: str = Field(alias="tokenId")
     orderType: Literal[
         "ORIGIN", "SMALL_COIN", "WEB3"
     ]  # str: ORIGIN: normal p2p order, SMALL_COIN: HotSwap p2p order, WEB3: web3 p2p order
-    amount: str
-    currencyId: str
-    price: str
-    notifyTokenQuantity: str
-    notifyTokenId: str
-    fee: str
-    targetNickName: str
-    targetUserId: str  # не я
+    amount: float
+    curex_exid: str = Field(alias="currencyId")
+    price: float
+    # notifyTokenQuantity: str
+    # notifyTokenId: str
+    fee: float
+    ctr_nick: str = Field(alias="targetNickName")
+    ctr_exid: int = Field(alias="targetUserId")
     selfUnreadMsgCount: str
-    transferLastSeconds: str
-    appealLastSeconds: str
-    sellerRealName: str
-    buyerRealName: str
-    judgeInfo: JudgeInfo
+    # transferLastSeconds: str
+    # appealLastSeconds: str
+    seller_name: str = Field(alias="sellerRealName")
+    buyer_name: str = Field(alias="buyerRealName")
+    # judgeInfo: JudgeInfo
     unreadMsgCount: str
-    extension: Extension
-    bulkOrderFlag: bool
+    # extension: Extension
+    # bulkOrderFlag: bool
 
 
-class OrderFull(OrderItem):
-    itemId: int
-    makerUserId: str
-    targetAccountId: str
-    targetFirstName: str
-    targetSecondName: str
+class OrderFull(OrderItem, BaseOrderFull):
+    ad_id: int = Field(alias="itemId")
+    ad__maker_exid: int = Field(alias="makerUserId")
+    my_nick: str = Field(alias="nickName")
+    # targetAccountId: str
+    # targetFirstName: str
+    # targetSecondName: str
     targetUserAuthStatus: int
     targetConnectInformation: str
-    payerRealName: str
+    # payerRealName: str  # todo: why? we have sellerRealName already
     tokenName: str
-    quantity: str
+    quantity: float
     payCode: str
     paymentType: int
-    transferDate: str
+    payed_at: int = Field(alias="transferDate")
     paymentTermList: list[CredEpyd]
     remark: str
     recentOrderNum: int
@@ -200,79 +215,109 @@ class OrderFull(OrderItem):
     canAppeal: str
     totalAppealTimes: str
     paymentTermResult: CredEpyd
-    confirmedPayTerm: CredEpyd
+    credex: CredEx = Field(alias="confirmedPayTerm")
     appealedTimes: str
     orderFinishMinute: int
     makerFee: str
     takerFee: str
     showContact: bool
     contactInfo: list[str]
-    tokenBalance: str
-    fiatBalance: str
-    updateDate: str
-    judgeType: str
-    canReport: bool
-    canReportDisagree: bool
-    canReportType: list[str]
-    canReportDisagreeType: list[str]
+    tokenBalance: float
+    fiatBalance: float
+    updateDate: int
+    # judgeType: str
+    # canReport: bool
+    # canReportDisagree: bool
+    # canReportType: list[str]
+    # canReportDisagreeType: list[str]
     appraiseStatus: str
     appraiseInfo: AppraiseInfo
-    canReportDisagreeTypes: list[str]
-    canReportTypes: list[str]
-    middleToken: str
-    beforePrice: str
-    beforeQuantity: str
-    beforeToken: str
-    alternative: str
+    # canReportDisagreeTypes: list[str]
+    # canReportTypes: list[str]
+    # middleToken: str
+    # beforePrice: str
+    # beforeQuantity: str
+    # beforeToken: str
+    # alternative: str
     appealUserId: str
     cancelResponsible: str
-    chainType: str
-    chainAddress: str
+    # chainType: str
+    # chainAddress: str
     tradeHashCode: str
-    estimatedGasFee: str
-    gasFeeTokenId: str
-    tradingFeeTokenId: str
-    onChainInfo: str
+    # estimatedGasFee: str
+    # gasFeeTokenId: str
+    # tradingFeeTokenId: str
+    # onChainInfo: str
     transactionId: str
     displayRefund: str
-    chainWithdrawLastSeconds: str
-    chainTransferLastSeconds: str
+    # chainWithdrawLastSeconds: str
+    # chainTransferLastSeconds: str
     orderSource: str
     cancelReason: str
-    sellerCancelExamineRemainTime: str
-    needSellerExamineCancel: bool
-    couponCurrencyAmount: str
-    totalCurrencyAmount: str
-    usedCoupon: bool  # bool: 1: used, 2: no used
-    couponTokenId: str
-    couponQuantity: str
-    completedOrderAppealCount: int
-    totalCompletedOrderAppealCount: int
-    realOrderStatus: int
-    appealVersion: int
-    helpType: str
-    appealFlowStatus: str
-    appealSubStatus: str
-    targetUserType: str
-    targetUserDisplays: list[str]
-    appealProcessChangeFlag: bool
-    appealNegotiationNode: int
+    # sellerCancelExamineRemainTime: str
+    # needSellerExamineCancel: bool
+    # couponCurrencyAmount: str
+    # totalCurrencyAmount: str
+    # usedCoupon: bool  # bool: 1: used, 2: no used
+    # couponTokenId: str
+    # couponQuantity: str
+    # completedOrderAppealCount: int
+    # totalCompletedOrderAppealCount: int
+    # realOrderStatus: int
+    # appealVersion: int
+    # helpType: str
+    # appealFlowStatus: str
+    # appealSubStatus: str
+    # targetUserType: str
+    # targetUserDisplays: list[str]
+    # appealProcessChangeFlag: bool
+    # appealNegotiationNode: int
+
+    @model_validator(mode="after")  # todo: separate to common part, and special bybit only part
+    def users_cred_cur(self):
+        mc_exids = self.my_exid, self.ctr_exid
+        mc_nicks = self.my_nick, self.ctr_nick
+        sb_names = self.seller_name, self.buyer_name
+        im_maker = self.ad__maker_exid == self.my_exid
+        im_seller = self.ad__pair_side__is_sell == im_maker
+        taker_exid = mc_exids[int(im_maker)]  # if im maker, then ctr(mc_exids[1]) - taker;
+        taker_nick = mc_nicks[int(im_maker)]
+        taker_name = sb_names[int(im_seller)]  # if im seller(im_maker==ad__is_sell), then taker(sb_names[1]) - buyer;
+        seller_exid = mc_exids[int(not im_seller)]  # if im buyer, then ctr(mc_exids[1]) - seller;
+        seller_nick = mc_nicks[int(not im_seller)]
+        self.taker = BaseCounteragent(
+            exid=taker_exid,
+            nick=taker_nick,
+            name=taker_name,
+        )
+        if self.credex:  # по дефолту в credex confirmedPayTerm
+            if not self.credex.pmex_exid:  # но если там пусто, берем из paymentTermResult
+                self.credex = CredEx.model_validate(self.paymentTermResult)
+            if not self.credex.pmex_exid:  # а если и там пусто, то берем первый из paymentTermList
+                self.credex = CredEx.model_validate(self.paymentTermList[0])
+        self.credex.seller = BaseCounteragent(
+            exid=seller_exid,
+            nick=seller_nick,
+            name=self.seller_name,
+        )
+        self.credex.curex_exid = self.curex_exid
+        return self
 
 
 class Message(BaseModel):
-    id: str
-    accountId: str
+    exid: int = Field(alias="id")
+    # accountId: str
     message: str
     msgType: Literal[
         0, 1, 2, 5, 6, 7, 8
     ]  # int: 0: system message, 1: text (user), 2: image (user), 5: text (admin), 6: image (admin), 7: pdf (user), 8: video (user)
     msgCode: int
-    createDate: str
+    created_at: int = Field(alias="createDate")
     isRead: Literal[0, 1]  # int: 1: read, 0: unread
     contentType: Literal["str", "pic", "pdf", "video"]
     roleType: str
-    userId: str
-    orderId: str
+    my_exid: int = Field(alias="userId")
+    order_exid: str = Field(alias="orderId")
     msgUuid: str
     nickName: str
     read: Literal[0, 1]
@@ -281,7 +326,17 @@ class Message(BaseModel):
 
 
 class StatusChange(_BaseChange):
-    appealVersion: int = None
+    status: OrderStatus | None = None
+    appealVersion: int = None  # 3 - my (seller) appeal is accepted by support # todo: выяснить другие значения
+
+    @model_validator(mode="after")
+    def amount_or_quantity_required(self):
+        if not self.status and not self.appealVersion:
+            raise ValueError("either status or appealVersion is required")
+        if not self.status:
+            if self.appealVersion == 3:
+                self.status = OrderStatus.canceled
+        return self
 
 
 class CountDown(_BaseChange):
@@ -307,12 +362,12 @@ class Receive(_BaseMsg):
 
 class Read(_BaseMsg):
     readAmount: int
-    read: Literal["101", "110", "11", "111"]
+    read: Literal["1", "101", "110", "11", "111"]
     orderStatus: Status
 
 
 class SellerCancelChange(BaseModel):
     userId: int
     makerUserId: int
-    id: str
+    id: int
     createDate: int

xync_client/Bybit/ex.py

@@ -11,12 +11,11 @@ from xync_schema.models import Ex, Agent
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import NET_TOKEN
 from xync_client.Bybit.etype import ad
-from xync_client.Abc.xtype import PmEx, MapOfIdsList, GetAds
+from xync_client.Abc.xtype import PmEx, MapOfIdsList, GetAdsReq
 from xync_client.loader import TORM
 
 
 class ExClient(BaseExClient):  # Bybit client
-    host = "api2.bybit.com"
     headers = df_hdrs  # rewrite token for public methods
     agent: Agent = None
 
@@ -36,21 +35,33 @@ class ExClient(BaseExClient):  # Bybit client
         }[status]
 
     async def _get_config(self):
-        resp = await self._get("/fiat/p2p/config/initial")
-        return resp["result"]  # todo: tokens, pairs, ...
+        hdrs = {
+            "accept-language": "en",
+            "lang": "en",
+            "platform": "PC",
+            "risktoken": "dmVyMQ|==||==",
+            "traceparent": "00-4b51509490cb5b62e83d6e4f502a48be-24cdc3508360d087-01",
+        }
+        resp = await self._get("/x-api/fiat/p2p/config/initial", hdrs=hdrs)
+        return resp["result"]["symbols"]  # todo: tokens, pairs, ...
 
     # 19: Список поддерживаемых валют тейкера
     async def curs(self) -> dict[int, xtype.CurEx]:
         config = await self._get_config()
         return {
-            c["currencyId"]: xtype.CurEx(exid=c["currencyId"], ticker=c["currencyId"], scale=c["scale"])
-            for c in config["currencies"]
+            c["currencyId"]: xtype.CurEx(
+                exid=c["currencyId"],
+                ticker=c["currencyId"],
+                scale=c["currency"]["scale"],
+                minimum=c["currencyMinQuote"],
+            )
+            for c in config
         }
 
     # 20: Список платежных методов
     async def pms(self, cur: models.Cur = None) -> dict[int | str, PmEx]:
         self.session.cookie_jar.update_cookies(await self._get_auth_cks())
-        pms = await self._post("/fiat/otc/configuration/queryAllPaymentList/")
+        pms = await self._post("/x-api/fiat/otc/configuration/queryAllPaymentList/")
         self.session.cookie_jar.clear()
 
         pms = pms["result"]["paymentConfigVo"]
@@ -59,14 +70,14 @@ class ExClient(BaseExClient):  # Bybit client
     # 21: Список платежных методов по каждой валюте
     async def cur_pms_map(self) -> MapOfIdsList:
         self.session.cookie_jar.update_cookies(await self._get_auth_cks())
-        pms = await self._post("/fiat/otc/configuration/queryAllPaymentList/")
+        pms = await self._post("/x-api/fiat/otc/configuration/queryAllPaymentList/")
         return json.loads(pms["result"]["currencyPaymentIdMap"])
 
     # 22: Список торгуемых монет (с ограничениям по валютам, если есть)
     async def coins(self) -> dict[str, xtype.CoinEx]:
         config = await self._get_config()
         coinexs = {}
-        for c in config["symbols"]:
+        for c in config:
             coinexs[c["tokenId"]] = xtype.CoinEx(
                 exid=c["tokenId"], ticker=c["tokenId"], minimum=c["tokenMinQuote"], scale=c["token"]["scale"]
             )
@@ -76,7 +87,7 @@ class ExClient(BaseExClient):  # Bybit client
     async def pairs(self) -> tuple[MapOfIdsList, MapOfIdsList]:
         config = await self._get_config()
         cc: dict[str, set[str]] = {}
-        for c in config["symbols"]:
+        for c in config:
             cc[c["currencyId"]] = cc.get(c["currencyId"], set()) | {c["tokenId"]}
         return cc, cc
 
@@ -85,7 +96,7 @@ class ExClient(BaseExClient):  # Bybit client
         if post_pmexs:
             req.payment = []
             req.size = str(min(1000, int(req.size) * 25))
-        res = await self._post("/fiat/otc/item/online/", req.model_dump())
+        res = await self._post("/x-api/fiat/otc/item/online/", req.model_dump())
         ads = [ad.Ad(**_ad) for _ad in res["result"]["items"]]
         if post_pmexs:
             post_pmexids = {p.exid for p in post_pmexs}
@@ -103,10 +114,11 @@ async def main():
     bot: FileClient = FileClient(NET_TOKEN)
     # await bot.start()
     cl = ExClient(ex, bot)
+    await cl.set_curs()
     # await cl.set_pms()
     # await cl.set_coins()
     # await cl.set_pairs()
-    x_ads_req = GetAds(coin_id=1, cur_id=1, is_sell=True, pm_ids=[330, 366, 1853], amount=1000)
+    x_ads_req = GetAdsReq(coin_id=1, cur_id=1, is_sell=True, pm_ids=[330, 366, 1853], amount=1000)
     _ads = await cl.ads(x_ads_req)
     # await bot.stop()
     await cl.close()