xync-client 0.0.155__py3-none-any.whl → 0.0.162__py3-none-any.whl

xync_client/Bybit/etype/ad.py

@@ -13,9 +13,21 @@ class AdStatus(StrEnum):
 
 
 class AdsReq(BaseModel):
-    tokenId: str
-    currencyId: str
-    side: Literal["0", "1"]  # 0 покупка, # 1 продажа
+    tokenId: str = Field(validation_alias="coin_id")
+    currencyId: str = Field(validation_alias="cur_id")
+    side: Literal["0", "1"] = Field(validation_alias="is_sell")  # 0 покупка, # 1 продажа
+    payment: list[str] = Field([], validation_alias="pm_ids")  # int
+    size: str = Field("20", validation_alias="limit")  # int
+    page: str = "1"  # int
+    amount: str = ""  # float
+    vaMaker: bool = Field(False, validation_alias="vm_only")
+    canTrade: bool = False
+    userId: str = ""  # int
+    verificationFilter: Literal[0, 1, 2] = 0
+    sortType: Literal["OVERALL_RANKING", "TRADE_VOLUME", "TRADE_COMPLETION_RATE", "TRADE_PRICE"] = "OVERALL_RANKING"
+    paymentPeriod: Literal[[], [15], [30], [60]] = []
+    itemRegion: int = 1
+    bulkMaker: bool = False
 
 
 class Currency(BaseModel):
@@ -79,7 +91,39 @@ class TradingPreferenceSet(BaseModel):
     registerTimeThreshold: int
 
 
+class AdPostRequest(BaseModel):
+    tokenId: str
+    currencyId: str
+    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: TradingPreferenceSet
+    paymentIds: list[str]  # list[int]
+    quantity: str  # float
+    paymentPeriod: int = 15
+    itemType: Literal["ORIGIN", "BULK"] = "ORIGIN"
+
+
+class AdUpdateRequest(AdPostRequest, BaseAdUpdate):
+    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
@@ -87,7 +131,6 @@ class Ad(BaseAd):
     baned: bool = None  # for initial actualize
     blocked: str = None  # for initial actualize
     createDate: str = None  # for initial actualize
-    currencyId: str = None  # for initial actualize
     executedQuantity: str = None  # for initial actualize
     fee: str = None  # for initial actualize
     finishNum: int = None  # for initial actualize
@@ -98,27 +141,18 @@ class Ad(BaseAd):
     lastLogoutTime: str = None  # for initial actualize
     lastQuantity: str = Field(serialization_alias="quantity")
     makerContact: bool = None  # for initial actualize
-    maxAmount: str = Field(serialization_alias="max_fiat")
-    minAmount: str = Field(serialization_alias="min_fiat")
     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
-    premium: str = None  # for initial actualize
-    price: str = None  # for initial actualize
-    priceType: Literal[0, 1] = None  # for initial actualize  # 0 - fix rate, 1 - floating
     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
-    remark: str = Field(serialization_alias="auto_msg")
-    side: Literal[0, 1] = None  # for initial actualize # 0 - покупка, 1 - продажа (для мейкера, т.е КАКАЯ объява)
     status: Literal[10, 20, 30]  # 10: online; 20: offline; 30: completed
     symbolInfo: SymbolInfo = None  # for initial actualize
-    tokenId: str = None  # for initial actualize
     tokenName: str = None  # for initial actualize
-    tradingPreferenceSet: TradingPreferenceSet | None = None  # for initial actualize
     userId: str
     userMaskId: str = None  # for initial actualize
     userType: str = None  # for initial actualize
@@ -134,24 +168,3 @@ class Ad(BaseAd):
 
 class MyAd(Ad):
     paymentTerms: List[MyPaymentTerm]
-
-
-class AdPostRequest(BaseModel):
-    tokenId: str
-    currencyId: str
-    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: TradingPreferenceSet
-    paymentIds: list[str]
-    quantity: str
-    paymentPeriod: int
-    itemType: str
-
-
-class AdUpdateRequest(AdPostRequest, BaseAdUpdate):
-    actionType: Literal["MODIFY", "ACTIVE"] = "MODIFY"

xync_client/Bybit/etype/order.py

@@ -1,8 +1,9 @@
 from enum import IntEnum
-from typing import Literal
+from typing import Literal, ClassVar
 
 from pydantic import BaseModel
 
+from xync_client.Abc.xtype import RemapBase
 from xync_client.Bybit.etype.cred import CredEpyd, PaymentTerm as CredPaymentTerm, PaymentConfigVo
 
 
@@ -14,34 +15,20 @@ class Topic(IntEnum):
 
 
 class Status(IntEnum):
-    deleted = 40  # order canceled
-    created = 10
-    appealable = 20  # waiting for seller to release
-    canceled = 40
+    ws_new = 1
+    # 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_by_buyer = 30  # the same appealing
+    canceled = 40  # order cancelled
     completed = 50  # order finished
-    appealed_by_buyer = 30  # appealing
-    appealed_by_seller = 30
-    buyer_appeal_disputed_by_seller = 30
-    paid = 50
-    rejected = 40
-    request_canceled = 40
-    seller_appeal_disputed_by_buyer = 30
-
-
-class StatusApi(IntEnum):
-    created = 1
-    _web3 = 5
-    wait_for_buyer = 10  # ws_canceled
-    wait_for_seller = 20
-    appealed = 30
-    canceled = 40
-    completed = 50
-    _paying_online = 60
-    _pay_fail_online = 70
-    hotswap_cancelled = 80
-    _buyer_sel_tokenId = 90
-    objectioning = 100
-    waiting_for_objection = 110
+    # a = 60  # paying (only when paying online)
+    # a = 70  # pay fail (only when paying online)
+    # a = 80  # exception cancelled (the coin convert to other coin only hotswap)
+    # a = 90  # waiting for buyer to select tokenId
+    appeal_disputed = 100  # objectioning
+    appeal_dispute_disputed = 110  # waiting for the user to raise an objection
 
 
 class TakeAdReq(BaseModel):
@@ -149,9 +136,23 @@ class PaymentTerm(CredPaymentTerm):
     ruPaymentPrompt: bool
 
 
-class OrderItem(BaseModel):
-    id: str
+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
+    appealedTimes: int
+    totalAppealedTimes: int
+
+
+class OrderItem(_BaseOrder):
     tokenId: str
     orderType: Literal[
         "ORIGIN", "SMALL_COIN", "WEB3"
@@ -164,14 +165,9 @@ class OrderItem(BaseModel):
     fee: str
     targetNickName: str
     targetUserId: str  # не я
-    status: Literal[
-        5, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110
-    ]  # 5: waiting for chain (only web3), 10: waiting for buyer to pay, 20: waiting for seller to release, 30: appealing, 40: order cancelled, 50: order finished, 60: paying (only when paying online), 70: pay fail (only when paying online), 80: exception cancelled (the coin convert to other coin, only hotswap), 90: waiting for buyer to select tokenId, 100: objectioning, 110: waiting for the user to raise an objection
     selfUnreadMsgCount: str
-    createDate: str
     transferLastSeconds: str
     appealLastSeconds: str
-    userId: str  # я
     sellerRealName: str
     buyerRealName: str
     judgeInfo: JudgeInfo
@@ -181,7 +177,7 @@ class OrderItem(BaseModel):
 
 
 class OrderFull(OrderItem):
-    itemId: str
+    itemId: int
     makerUserId: str
     targetAccountId: str
     targetFirstName: str
@@ -284,17 +280,6 @@ class Message(BaseModel):
     onlyForCustomer: int | None = None
 
 
-class _BaseChange(BaseModel):
-    userId: int
-    makerUserId: int
-    id: str
-    createDate: int
-    side: int
-    appealedTimes: int
-    totalAppealedTimes: int
-    status: StatusApi | None = None
-
-
 class StatusChange(_BaseChange):
     appealVersion: int = None
 
@@ -305,7 +290,7 @@ class CountDown(_BaseChange):
 
 class _BaseMsg(BaseModel):
     userId: int
-    orderId: str
+    orderId: int
     message: str = None
     msgUuid: str
     msgUuId: str
@@ -323,7 +308,7 @@ class Receive(_BaseMsg):
 class Read(_BaseMsg):
     readAmount: int
     read: Literal["101", "110", "11", "111"]
-    orderStatus: StatusApi
+    orderStatus: Status
 
 
 class SellerCancelChange(BaseModel):

xync_client/Bybit/ex.py

@@ -11,7 +11,7 @@ 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
+from xync_client.Abc.xtype import PmEx, MapOfIdsList, GetAds
 from xync_client.loader import TORM
 
 
@@ -81,47 +81,20 @@ class ExClient(BaseExClient):  # Bybit client
         return cc, cc
 
     # 24: Список объяв по (buy/sell, cur, coin, pm)
-    async def ads(
-        self,
-        coin_exid: str,
-        cur_exid: str,
-        is_sell: bool,
-        pm_exids: list[str | int] = None,
-        amount: int = None,
-        lim: int = 50,
-        vm_filter: bool = False,
-    ) -> list[ad.Ad]:
-        data = {
-            "userId": "",
-            "tokenId": coin_exid,
-            "currencyId": cur_exid,
-            "payment": pm_exids or [],
-            "side": "0" if is_sell else "1",
-            "size": str(lim) if lim else "20",
-            "page": "1",
-            "amount": str(amount) if amount else "",
-            "vaMaker": vm_filter,
-            "bulkMaker": False,
-            "canTrade": False,
-            "verificationFilter": 0,
-            "sortType": "OVERALL_RANKING",
-            "paymentPeriod": [],
-            "itemRegion": 1,
-        }
-        # {
-        #     "userId": "",
-        #     "tokenId": coin_exid,
-        #     "currencyId": cur_exid,
-        #     "payment": pm_exids or [],
-        #     "side": "0" if is_sell else "1",
-        #     "size": lim and str(lim) or "200",
-        #     "page": "1",
-        #     "amount": str(amount) if amount else "",
-        #     "authMaker": False,
-        #     "canTrade": False,
-        # }
-        ads = await self._post("/fiat/otc/item/online/", data)
-        return [ad.Ad(**_ad) for _ad in ads["result"]["items"]]
+    async def _ads(self, req: ad.AdsReq, post_pmexs: set[models.PmEx] = None) -> list[ad.Ad]:
+        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())
+        ads = [ad.Ad(**_ad) for _ad in res["result"]["items"]]
+        if post_pmexs:
+            post_pmexids = {p.exid for p in post_pmexs}
+            ads = [
+                ad
+                for ad in ads
+                if (set(ad.payments) & post_pmexids or [True for px in post_pmexs if px.pm.norm in ad.remark.lower()])
+            ]
+        return ads
 
 
 async def main():
@@ -130,10 +103,11 @@ async def main():
     bot: FileClient = FileClient(NET_TOKEN)
     # await bot.start()
     cl = ExClient(ex, bot)
-    await cl.set_pms()
-    await cl.set_coins()
-    await cl.set_pairs()
-    _ads = await cl.ads("USDT", "GEL", False)
+    # 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)
+    _ads = await cl.ads(x_ads_req)
     # await bot.stop()
     await cl.close()
 

xync_client/Bybit/order.py

@@ -1,26 +1,28 @@
-from xync_schema.models import Order
+from xync_client.Bybit.etype.cred import PaymentTerm
+from xync_schema.models import CredEx, PmEx
 
 from xync_client.Abc.Order import BaseOrderClient
 
 
 class OrderClient(BaseOrderClient):
-    # 2: Отмена своего запроса на сделку
-    async def cancel_request(self) -> Order: ...
-
-    # 3: Одобрить запрос на сделку
-    async def accept_request(self) -> bool: ...
-
-    # 4: Отклонить чужой запрос на сделку
-    async def reject_request(self) -> bool: ...
-
     # 5: Перевод сделки в состояние "оплачено", c отправкой чека
-    async def mark_payed(self, receipt): ...
+    async def mark_payed(self, payterm: PaymentTerm = None, receipt: bytes = None):
+        if payterm:
+            pt = str(payterm.paymentType)
+            pid = payterm.id
+        else:
+            pmx = await PmEx.get(pm__pmcurs__id=self.order.cred.pmcur_id, ex=self.agent_client.ex_client.ex)
+            pt = pmx.exid
+            cdx = await CredEx.get(cred_id=self.order.cred_id, ex=self.agent_client.ex_client.ex)
+            pid = str(cdx.exid)
+        self.agent_client.api.mark_as_paid(orderId=str(self.order.exid), paymentType=pt, paymentId=pid)
 
     # 6: Отмена одобренной сделки
     async def cancel_order(self) -> bool: ...
 
     # 7: Подтвердить получение оплаты
-    async def confirm(self) -> bool: ...
+    async def confirm(self):
+        self.agent_client.api.release_assets(orderId=str(self.order.exid))
 
     # 9, 10: Подать аппеляцию cо скриншотом/видео/файлом
     async def start_appeal(self, file) -> bool: ...

xync_client/Htx/agent.py

@@ -10,11 +10,10 @@ from x_client.aiohttp import Client
 from xync_bot import XyncBot
 
 from xync_client.Abc.xtype import AdUpd, GetAds
+from xync_client.Htx.etype.order import OrderItem, OrderFull
 from xync_client.loader import NET_TOKEN, PAY_TOKEN, TORM
 
-from xync_client.Htx.etype.ad import Req, TradeRule, TradeRulesV2
 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, ad
@@ -39,6 +38,8 @@ class AgentClient(BaseAgentClient):
     async def login(self):
         t = int(time() * 1000)
         resp = await self._get("/-/x/uc/uc/open/ticket/get", {"t": t})
+        if resp.get("data") is None:
+            ...
         if ticket := resp["data"].get("ticket"):
             resp = await self._post("/-/x/otc/v1/user/login", form_data={"ticket": ticket, "type": "WEB"})
             if resp["success"]:
@@ -115,14 +116,40 @@ class AgentClient(BaseAgentClient):
 
     # 0
     async def get_orders(
-        self, stauts: OrderStatus = OrderStatus.created, coin: Coin = None, cur: Cur = None, is_sell: bool = None
-    ) -> list[Order]:
-        pass
+        self,
+        stauts: OrderStatus = OrderStatus.created,
+        coin: models.Coin = None,
+        cur: models.Cur = None,
+        is_sell: bool = None,
+    ) -> list[OrderItem]:
+        resp = await self._get("/-/x/otc/v1/trade/order/process", {"needTradeCount": "true"})
+        if resp["success"]:
+            return [OrderItem(**o) for o in resp["data"]]
+        return []
+
+    async def get_order(self, oid: int) -> OrderFull | None:
+        resp = await self._get("/-/x/otc/v1/trade/order", {"orderId": oid})
+        if resp["success"]:
+            o = OrderFull(**resp["data"])
+            return o
+        return None
+
+    async def recv(self, order: OrderItem):
+        if order.orderStatus:
+            ...
+        else:
+            ...
+
+    async def start_listen(self):
+        """Фоновая задача для ловли входящих ордеров"""
+        while True:
+            [await self.recv(o) for o in await self.get_orders()]
+            await sleep(9)
 
     async def order_request(self, ad_id: int, amount: float) -> dict:
         pass
 
-    async def my_fiats(self, cur: Cur = None) -> list[dict]:
+    async def my_fiats(self, cur: models.Cur = None) -> list[dict]:
         pass
 
     # async def fiat_new(self, fiat: FiatNew) -> Fiat.pyd():
@@ -144,22 +171,22 @@ class AgentClient(BaseAgentClient):
 
     async def ad_new(
         self,
-        coin: Coin,
-        cur: Cur,
+        coin: models.Coin,
+        cur: models.Cur,
         is_sell: bool,
-        pms: list[Pm],
+        pms: list[models.Pm],
         price: float,
         is_float: bool = True,
         min_fiat: int = None,
         details: str = None,
         autoreply: str = None,
         status: AdStatus = AdStatus.active,
-    ) -> Ad:
+    ) -> models.Ad:
         pass
 
-    async def _ad_upd(self, ad_upd: AdUpd, hdrs: dict[str, str] = None) -> dict:
+    async def x2e_req_ad_upd(self, xreq: AdUpd) -> ad.AdsUpd:
         creds = [
-            TradeRule(
+            ad.TradeRule(
                 content="Payment method-%s",
                 contentCode="PAY",
                 hint="Please enter",
@@ -167,16 +194,14 @@ class AgentClient(BaseAgentClient):
                 inputValue=cx.cred.detail,
                 sort=1,
                 title="【Payment related】",
-                titleValue=await models.PmEx.get(pm_id=cx.cred.pmcur.pm_id, ex=self.ex_client.ex).values_list(
-                    "name", flat=True
-                ),
+                titleValue=(await models.PmEx.get(pm_id=cx.cred.pmcur.pm_id, ex=self.ex_client.ex)).name,
             )
-            for cx in ad_upd.credexs
+            for cx in xreq.credexs
         ]
-        trs = TradeRulesV2(
+        trade_rules = ad.TradeRulesV2(
             [
                 *creds,
-                TradeRule(
+                ad.TradeRule(
                     content="",
                     contentCode="MERCHANT",
                     hint="Please enter",
@@ -187,22 +212,25 @@ class AgentClient(BaseAgentClient):
                 ),
             ]
         ).model_dump_json(exclude_none=True)
-        req = Req(
-            tradeType=int(ad_upd.is_sell),
-            coinId=2,
-            currency=11,
-            minTradeLimit=500.00,
-            maxTradeLimit=ad_upd.amount,
-            tradeCount=ad_upd.quantity,
+        coin_id, coin_scale = await self.ex_client.x2e_coin(xreq.coin_id)
+        cur_id, cur_scale, minimum = await self.ex_client.x2e_cur(xreq.cur_id)
+        return ad.AdsUpd(
+            id=xreq.id,
+            tradeType=int(xreq.is_sell),
+            coinId=int(coin_id),
+            currency=int(cur_id),
+            minTradeLimit=minimum,
+            maxTradeLimit=round(xreq.amount - 10**-cur_scale, cur_scale),
+            tradeCount=round(xreq.quantity or xreq.amount / xreq.price, coin_scale),
             password=self.agent.auth["pass"],
             payTerm=15,
             premium=0.00,
             isFixed="on",
-            fixedPrice=ad_upd.price,
+            fixedPrice=round(xreq.price, cur_scale),
             isAutoReply="off",
             takerAcceptOrder=0,
             isPayCode="off",
-            receiveAccounts=ad_upd.credexs[0].exid,
+            receiveAccounts=",".join([str(cx.exid) for cx in xreq.credexs]),
             deviation=0,
             isTakerLimit="on",
             takerIsMerchant="on",
@@ -214,19 +242,20 @@ class AgentClient(BaseAgentClient):
             chargeType=False,
             apiVersion=4,
             channel="web",
-            tradeRulesV2=quote(trs),
+            tradeRulesV2=quote(trade_rules),
         )
-        res = await self._post(self.url_my_ad + str(ad_upd.id), form_data=req.model_dump(exclude_none=True), hdrs=hdrs)
+
+    async def _ad_upd(self, req: ad.AdsUpd, hdrs: dict[str, str] = None) -> dict:
+        res = await self._post(self.url_my_ad + str(req.id), form_data=req.model_dump(exclude_none=True), hdrs=hdrs)
         if res["code"] == 200:
             return res["data"]
         elif res["code"] == 605:
             hdrs = {"x-dialog-trace-id": res["extend"]["traceId"]}
-            return await self._ad_upd(ad_upd, hdrs)
+            return await self._ad_upd(req, hdrs)
         elif res["code"] == 1010:
             if (match := re.search(r"Available amount ([\d.]+)", res["message"])) and (qty := match.group(1)):
-                ad_upd.quantity = float(qty)
-                ad_upd.amount = round(ad_upd.quantity * ad_upd.price, 2)
-                return await self._ad_upd(ad_upd, hdrs)
+                req.tradeCount = float(qty)
+                return await self._ad_upd(req, hdrs)
         elif res["code"] == 401:
             raise Exception(res)
         raise BaseException(res)
@@ -304,36 +333,49 @@ async def _test():
     while True:
         breq = GetAds(coin_id=1, cur_id=1, is_sell=False, pm_ids=[366])
         sreq = GetAds(coin_id=1, cur_id=1, is_sell=True, pm_ids=[366])
-        breq_upd = AdUpd(id=1185713, price=87.01, **{**breq.model_dump(), "amount": 80001})
-        sreq_upd = AdUpd(id=1188929, price=92.99, **{**sreq.model_dump(), "amount": 65001})
+        breq_upd = AdUpd(id=1185713, price=87.01, **{**breq.model_dump(), "amount": 100000.01})
+        sreq_upd = AdUpd(id=1188929, price=98.99, **{**sreq.model_dump(), "amount": 200000.01})
 
         bads: list[ad.Resp] = await cl.ex_client.ads(breq)
         sads: list[ad.Resp] = await cl.ex_client.ads(sreq)
+        bceil = 101.11
+        sceil = 151
+        bads = [a for a in bads if a.price < bceil and a.tradeCount > 10 and (a.maxTradeLimit - a.minTradeLimit > 800)]
+        sads = [a for a in sads if a.price > sceil and a.tradeCount > 10 and (a.maxTradeLimit - a.minTradeLimit > 800)]
 
-        if bads:
+        if len(bads) > 1:
             if bads[0].uid == cl.actor.exid:
                 if round(bads[0].price - bads[1].price, 2) > 0.01:
                     breq_upd.price = bads[1].price + 0.01
                     await cl.ad_upd(breq_upd)
                     print(end="!", flush=True)
-            elif bads[0].price < 89:
+            elif bads[0].price < bceil:
                 breq_upd.price = bads[0].price + 0.01
                 await cl.ad_upd(breq_upd)
                 print(end="!", flush=True)
 
-        if sads:
+        if len(sads) > 1:
             if sads[0].uid == cl.actor.exid:
                 if round(sads[1].price - sads[0].price, 2) > 0.01:
                     sreq_upd.price = sads[1].price - 0.01
                     await cl.ad_upd(sreq_upd)
                     print(end="!", flush=True)
-            elif sads[0].price > 91:
+            elif sads[0].price > sceil:
                 sreq_upd.price = sads[0].price - 0.01
                 await cl.ad_upd(sreq_upd)
                 print(end="!", flush=True)
 
+        if (pos := await cl.get_orders()) and (po := pos.pop(0)):
+            if po.side:  # is_sell
+                po.amount  # check
+            else:  # buy
+                order: OrderFull = await cl.get_order(po.orderId)
+                if ps := [pm.bankNumber for pm in order.paymentMethod if pm.bankType in [24]]:
+                    if match := re.search(r"^[PpРр]\d{7,10}\b", ps[0]):
+                        match.group()
+
         print(end=".", flush=True)
-        await sleep(15)
+        await sleep(9)
 
     await cl.stop()