xync-client 0.0.43.dev15__tar.gz → 0.0.43.dev16__tar.gz

{xync_client-0.0.43.dev15/xync_client.egg-info → xync_client-0.0.43.dev16}/PKG-INFO

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

@@ -367,38 +367,42 @@ class AgentClient(BaseAgentClient):  # Bybit client
         ceil: float,
         place: int = 1,
     ):
-        k = (-1) ** int(is_sell)
+        k = (-1) ** int(is_sell)  # on_buy=1, on_sell=-1
         pays: list[str] = []
         while self.actor.person.user.status > 0:
             ads: list[Ad] = await self.ads(coin, cur, is_sell, pms)
             idiot_maker_filter(ads, ceil, k)
             cur_plc = [i for i, ad in enumerate(ads) if int(ad.accountId) == self.actor.exid][0]
-            if cur_plc > place:
-                cad: Ad = ads[place]
-                mad: Ad = ads.pop(cur_plc)
-                if not pays:  # cached
-                    pays += await models.CredEx.filter(
-                        cred__pmcur__pm__pmexs__exid__in=mad.payments, cred__pmcur__pm__pmexs__ex_id=self.ex.id
-                    ).values_list("exid", flat=True)
-                cprice = float(cad.price)
-                if (cprice - ceil) * k > 0:
-                    rprice = cprice
-                else:
-                    rprice = float(ads[cur_plc].price)
-                step = 0.01 if cad.recentExecuteRate > mad.recentExecuteRate else 0
-                mew_price = str(round(rprice - k * step, cur.scale))
-                if mad.price == mew_price:
-                    print(end="V" if is_sell else "A", flush=True)
-                    await sleep(2)
-                    continue
-                mad.price = mew_price
-                mad.quantity = str(floor(amount))
-                req = AdUpdateRequest.model_validate({**mad.model_dump(), "paymentIds": [str(p) for p in pays]})
-                _res = self.ad_upd(req)
-                print("-" if is_sell else "+", end=req.price, flush=True)
-            else:
+            mad: Ad = ads.pop(cur_plc)
+            mprice = float(mad.price)
+            if not pays:  # cached
+                pays += await models.CredEx.filter(
+                    cred__pmcur__pm__pmexs__exid__in=mad.payments, cred__pmcur__pm__pmexs__ex_id=self.ex.id
+                ).values_list("exid", flat=True)
+            cad: Ad = ads[place] if cur_plc > place else ads[cur_plc]
+            cprice = float(cad.price)
+            rprice = cprice if (cprice - ceil) * k > 0 else mprice
+            mew_price = str(round(rprice - k * step(mad, cad), cur.scale))
+            if mad.price == mew_price:
                 print(end="v" if is_sell else "^", flush=True)
-            await sleep(3)
+                await sleep(2)
+                continue
+            mad.price = mew_price
+            mad.quantity = str(floor(amount))
+            mad.maxAmount = str(3_500_000)
+            req = AdUpdateRequest.model_validate({**mad.model_dump(), "paymentIds": [str(p) for p in pays]})
+            _res = self.ad_upd(req)
+            print("-" if is_sell else "+", end=req.price, flush=True)
+            await sleep(36)
+
+
+def step(mad, cad) -> float:
+    return (
+        0.01
+        if cad.recentExecuteRate > mad.recentExecuteRate
+        or (cad.recentExecuteRate == mad.recentExecuteRate and cad.orderNum > mad.orderNum)
+        else 0
+    )
 
 
 def idiot_maker_filter(ads: list[Ad], ceil: float, k: Literal[-1, 1]):
@@ -421,12 +425,15 @@ async def main():
     # await cl.ex_client.set_pmcurexs(cookies=actor.agent.auth["cookies"])  # 607 -> 629
     coin = await models.Coin.get(ticker="USDT")
     cur = 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
+    )
     volet = await models.Pm.get(norm="volet")
     asset = await models.Asset.filter(addr__actor=actor, addr__coin=coin).first()
     asset.free - (asset.freeze or 0) - (asset.lock or 0)
     # await cl.set_creds()
     await gather(
-        cl.battle(coin, cur, False, [volet], 235, 86.9, 0),
+        cl.battle(coin, cur, False, [volet], 500, 86.9, 0),
         cl.battle(coin, cur, True, [volet], 65, 82.1, 0),
     )
 

xync_client-0.0.43.dev15/xync_client/Pms/Volet/volet.py → xync_client-0.0.43.dev16/xync_client/Pms/Volet/__init__.py

@@ -55,7 +55,7 @@ async def report(uid: int, byts: bytes, msg: str, exc: bool = True):
         raise Exception(msg)
 
 
-class VoletAgent:
+class Client:
     agent: PmAgent
     pbot: PyroClient
     page: Page
@@ -246,7 +246,7 @@ async def _test(uid: int, dest: str, amount):
     from xync_schema import models
 
     _ = await init_db(PG_DSN, models, True)
-    va = VoletAgent(uid)
+    va = Client(uid)
     try:
         await va.start(True)
         await va.send(dest, amount)

{xync_client-0.0.43.dev15 → xync_client-0.0.43.dev16/xync_client.egg-info}/PKG-INFO

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

@@ -87,8 +87,8 @@ xync_client/Mexc/etype/pm.py
 xync_client/Okx/ex.py
 xync_client/Okx/etype/ad.py
 xync_client/Okx/etype/pm.py
+xync_client/Pms/Volet/__init__.py
 xync_client/Pms/Volet/api.py
-xync_client/Pms/Volet/volet.py
 xync_client/Pms/Volet/_todo_req/req.mjs
 xync_client/Pms/Volet/_todo_req/req.py
 xync_client/TgWallet/agent.py