xync-client 0.0.57.dev20__tar.gz → 0.0.57.dev21__tar.gz

{xync_client-0.0.57.dev20/xync_client.egg-info → xync_client-0.0.57.dev21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.57.dev20
+Version: 0.0.57.dev21
 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.57.dev20 → xync_client-0.0.57.dev21}/xync_client/Bybit/agent.py

@@ -395,8 +395,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 size=30,
                 # status=status,  # 50 - завершено
                 # tokenId=token_id,
-                # beginTime=begin_time,
-                # endTime=end_time,
+                beginTime=begin_time,
+                endTime=end_time,
                 # side=side,  # 1 - продажа, 0 - покупка
             )
         except FailedRequestError as e:
@@ -443,12 +443,14 @@ class AgentClient(BaseAgentClient):  # Bybit client
                             pmcur=pmcur, person=seller_person, detail=ecredex.accountNo
                         )
                     ):
-                        extr = (
-                            ecredex.bankName
-                            or ecredex.branchName
-                            or ecredex.qrcode
-                            or ecredex.payMessage
-                            or ecredex.paymentExt1
+                        extr = ", ".join(
+                            [
+                                ecredex.bankName,
+                                ecredex.branchName,
+                                ecredex.qrcode,
+                                ecredex.payMessage,
+                                ecredex.paymentExt1,
+                            ]
                         )
                         crd = await models.Cred.create(
                             detail=ecredex.accountNo,
@@ -542,17 +544,17 @@ class AgentClient(BaseAgentClient):  # Bybit client
         self,
         coinex: models.Coinex,
         curex: models.Curex,
-        is_sell: bool,
+        taker_side: bool,
         pms: list[str],
         ceil: float,
         volume: float = None,
         place: int = 0,
     ):
-        k = (-1) ** int(is_sell)  # on_buy=1, on_sell=-1
+        k = (-1) ** int(taker_side)  # on_buy=1, on_sell=-1
 
         creds: dict[models.Pmex, models.CredEx] = await self.get_credexs_by_norms(pms, curex.cur_id)
         if not volume:
-            if is_sell:  # гонка в стакане продажи - мы покупаем монету за ФИАТ
+            if taker_side:  # гонка в стакане продажи - мы покупаем монету за ФИАТ
                 # 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
@@ -565,14 +567,14 @@ class AgentClient(BaseAgentClient):  # Bybit client
         credex_ids = [str(p.exid) for p in creds.values()]
 
         while self.actor.person.user.status > 0:
-            ads: list[Ad] = await self.ads(coinex, curex, is_sell, list(creds.keys()))
+            ads: list[Ad] = await self.ads(coinex, curex, taker_side, list(creds.keys()))
             self.overprice_filter(ads, ceil, k)
             if not ads:
-                print(coinex.exid, curex.exid, is_sell, "no ads!")
+                print(coinex.exid, curex.exid, taker_side, "no ads!")
                 await sleep(15)
                 continue
             if not (cur_plc := [i for i, ad in enumerate(ads) if int(ad.userId) == self.actor.exid]):
-                logging.warning(f"No racing in {'-' if is_sell else '+'}{coinex.exid}/{curex.exid}")
+                logging.warning(f"No racing in {'-' if taker_side else '+'}{coinex.exid}/{curex.exid}")
                 await sleep(15)
                 continue
             (cur_plc,) = cur_plc
@@ -583,13 +585,13 @@ class AgentClient(BaseAgentClient):  # Bybit client
             cad = self.get_cad(ads, ceil, k, place, cur_plc)
             new_price = f"%.{curex.cur.scale}f" % round(float(cad.price) - k * step(mad, cad), curex.cur.scale)
             if mad.price == new_price:  # Если нужная цена и так уже стоит
-                print(end="v" if is_sell else "^", flush=True)
+                print(end="v" if taker_side else "^", flush=True)
                 await sleep(3)
                 continue
             if cad.priceType:  # Если цена конкурента плавающая, то повышаем себе не цену, а %
                 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)
+                    print(end="v" if taker_side else "^", flush=True)
                     await sleep(3)
                     continue
                 mad.premium = new_premium
@@ -599,14 +601,14 @@ class AgentClient(BaseAgentClient):  # Bybit client
             req = AdUpdateRequest.model_validate({**mad.model_dump(), "price": new_price, "paymentIds": credex_ids})
             try:
                 _res = self.ad_upd(req)
-                print("-" if is_sell else "+", end=req.price, flush=True)
+                print("-" if taker_side else "+", end=req.price, flush=True)
             except FailedRequestError as e:
                 if ExcCode(e.status_code) == ExcCode.FixPriceLimit:
                     if limits := re.search(
                         r"The fixed price set is lower than ([0-9]+\.?[0-9]{0,2}) or higher than ([0-9]+\.?[0-9]{0,2})",
                         e.message,
                     ):
-                        req.price = limits.group(1 if is_sell else 2)
+                        req.price = limits.group(1 if taker_side else 2)
                         if req.price != mad.price:
                             _res = self.ad_upd(req)
                     else:
@@ -629,20 +631,20 @@ class AgentClient(BaseAgentClient):  # Bybit client
         self,
         coinex: models.Coinex,
         curex: models.Curex,
-        is_sell: bool,
+        taker_side: bool,
         pms: list[str] = None,
         ceil: float = None,
         volume: float = 9000,
         min_fiat: int = None,
         max_fiat: int = None,
     ):
-        k = (-1) ** int(is_sell)  # on_buy=1, on_sell=-1
+        k = (-1) ** int(taker_side)  # on_buy=1, on_sell=-1
 
         if pms:
             creds: dict[models.Pmex, models.CredEx] = await self.get_credexs_by_norms(pms, curex.cur_id)
             [str(p.exid) for p in creds.values()]
 
-            if is_sell:  # гонка в стакане продажи - мы покупаем монету за ФИАТ
+            if taker_side:  # гонка в стакане продажи - мы покупаем монету за ФИАТ
                 fiats = await models.Fiat.filter(
                     cred_id__in=[cx.cred_id for cx in creds.values()], amount__not=F("target")
                 )
@@ -655,13 +657,13 @@ class AgentClient(BaseAgentClient):  # Bybit client
             pairex__ex=self.ex_client.ex,
             pairex__pair__coin_id=coinex.coin_id,
             pairex__pair__cur_id=curex.cur_id,
-            sell=is_sell,
+            sell=taker_side,
         )
         while self.actor.person.user.status > 0:  # todo: depends on rest asset/fiat
-            ads: list[Ad] = await self.ads(coinex, curex, is_sell, pms and list(creds.keys()))
+            ads: list[Ad] = await self.ads(coinex, curex, taker_side, pms and list(creds.keys()))
 
             if not ads:
-                print(coinex.exid, curex.exid, is_sell, "no ads!")
+                print(coinex.exid, curex.exid, taker_side, "no ads!")
                 await sleep(300)
                 continue
 
@@ -669,11 +671,11 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 if (ceil - float(ad.price)) * k < 0:
                     break
                 if int(ad.userId) == self.actor.exid:
-                    logging.info(f"My ad {'-' if is_sell else '+'}{coinex.exid}/{curex.exid} on place#{i}")
+                    logging.info(f"My ad {'-' if taker_side else '+'}{coinex.exid}/{curex.exid} on place#{i}")
                     continue
                 ad_db, isnew = await self.cond_upsert(ad, dr=dr)
                 if isnew:
-                    s = f"{'-' if is_sell else '+'}{ad.price}[{ad.minAmount}-{ad.maxAmount}]{coinex.exid}/{curex.exid}"
+                    s = f"{'-' if taker_side else '+'}{ad.price}[{ad.minAmount}-{ad.maxAmount}]{coinex.exid}/{curex.exid}"
                     print(s, end=" | ", flush=True)
                 elif not isnew and ad_db and ad_db.cond.raw_txt != clean(ad.remark):
                     # ad_db.cond.parsed = False
@@ -901,6 +903,7 @@ async def main():
         cl: AgentClient = actor.client(b)
         # await cl.ex_client.set_pmcurexs(cookies=actor.agent.auth["cookies"])  # 617 -> 639
         # await cl.set_creds()
+        # await cl.ex_client.set_pairs()
         usdt = await models.Coinex.get(coin__ticker="USDT", ex=cl.actor.ex).prefetch_related("coin")
         btc = await models.Coinex.get(coin__ticker="BTC", ex=cl.actor.ex).prefetch_related("coin")
         eth = await models.Coinex.get(coin__ticker="ETH", ex=cl.actor.ex).prefetch_related("coin")
@@ -926,7 +929,7 @@ async def main():
             cl.battle(usdc, rub, True, ["volet"], 79),
             cl.take(usdt, rub, False, ceil=80.5, volume=360),
             cl.take(usdt, rub, True, ceil=80.5, volume=360),
-            cl.get_api_orders(67),
+            # cl.get_api_orders(), # 10, 1738357200000, 1742504399999
         )
 
         bor = BaseOrderReq(

{xync_client-0.0.57.dev20 → xync_client-0.0.57.dev21/xync_client.egg-info}/PKG-INFO

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