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

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

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

@@ -7,7 +7,7 @@ from aiohttp import ClientSession
 from msgspec import Struct
 from tortoise.exceptions import MultipleObjectsReturned, IntegrityError
 from xync_schema import models
-from xync_schema.enums import FileType
+from xync_schema.enums import FileType, df_curs
 from xync_schema.types import CurEx, CoinEx, BaseAd, BaseAdIn
 
 from xync_client.Abc.Base import BaseClient, MapOfIdsList
@@ -163,11 +163,16 @@ class BaseExClient(BaseClient):
                 await models.Pmex.update_or_create({"pm": pm_}, ex=self.ex, exid=k, name=pmex.name)
             else:
                 pmin = models.Pm.validate({**pmu.model_dump(), "country_id": country_id, "typ": pmex.typ})
+                if c := df_curs.get(pmu.norm):
+                    pmin.df_cur_id = curs[c].id
                 try:
                     pms[k], _ = await models.Pm.update_or_create(**pmin.df_unq())
                 except (MultipleObjectsReturned, IntegrityError) as e:
                     raise e
             prev = k, pmu.norm, pmex.name, pmu.country
+            await models.Pmcur.update_or_create(
+                cur=await models.Cur.get(ticker="THB"), pm=await models.Pm.get(norm="cash in person")
+            )
 
         # Pmexs
         pbot = PyroClient(bot)

{xync_client-0.0.43.dev11 → xync_client-0.0.43.dev15}/xync_client/BingX/ex.py

@@ -18,6 +18,7 @@ class ExClient(BaseExClient, BaseBingXClient):
     class BingUnifier(PmUnifier):
         pm_map = {
             "СБП": "SBP",
+            "Tinkoff Bank": "T-Bank",
             "Transfer with Specific Bank": "Transfers with specific bank",
             "Al-Rafidain Qi Services": "Al-Rafidain QiServices",
         }

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

@@ -24,25 +24,18 @@ class ExClient(BaseExClient):
             "ADCB Abu Dhabi Commercial Bank": "ADCB",
             "BDO": "Banco De Oro (BDO)",
             "Touch 'n Go": "Touch n Go",
-            "LINE Bank by Hana Bank": "LINE Pay"
+            "Local Card-Yellow": "T-Bank",
+            "Tinkoff": "T-Bank",
+            "Local Card M-redTS": "MTS-bank",
+            "Local Card-Green": "Sberbank",
+            "LINE Bank by Hana Bank": "LINE Pay",
         }
 
     unifier_class = BitGetUnifier
     _data: dict = {}
 
     headers = {
-        "accept-language": "ru,en;q=0.9",
-        "content-type": "application/json;charset=UTF-8",
-        "deviceid": "883e1394d8a2278418b6f02804df16c4",
-        "devicelanguage": "ru_RU",
-        "gaclientid": "2005612572.1744132981",
-        "securitynew": "true",
-        "terminalcode": "534488ac72b9b87c3ba87725387639ac",
-        "terminaltype": "1",
-        "timezone": "GMT+03:00",
-        "tm": "1744133012568",
-        "uhti": "w17441330126555b55e2d8627",
-        "usenewpwdversion": "true",
+        "referer": "https://www.bitget.com/ru/p2p-trade",
     }
 
     async def _coin_cur_pms(self, trying: int = 0) -> dict:
@@ -53,7 +46,7 @@ class ExClient(BaseExClient):
                 "node",
                 dirname(__file__) + "/req.mjs",
                 "pub/currency/queryAllCoinAndFiat",
-                "{}",
+                '{"languageType":6}',
                 json.dumps(self.headers, separators=(",", ":")),
             ],
             stdout=subprocess.PIPE,
@@ -137,7 +130,7 @@ async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await Ex.get(name="BitGet")
     cl = ExClient(bg)
-    _ads = await cl.ads("ETH", "PHP", False)
+    # _ads = await cl.ads("ETH", "PHP", False)
     await cl.curs()
     await cl.coins()
     await cl.pms()

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

@@ -1,6 +1,8 @@
-from asyncio import run, sleep
+from asyncio import run, sleep, gather
 from enum import IntEnum
 from http.client import HTTPException
+from math import floor
+from typing import Literal
 
 import pyotp
 from bybit_p2p import P2P
@@ -107,19 +109,31 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 )
             ):
                 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)):
+            if cred_old := await models.Cred.get_or_none(credexs__exid=cred.id, credexs__ex=self.ex).prefetch_related(
+                "pmcur"
+            ):
+                cur_id = cred_old.pmcur.cur_id
+            else:  # is new Cred
+                cur_id = (
+                    pmex.pm.df_cur_id
+                    or (pmex.pm.country_id and await pmex.pm.country.cur_id)
+                    or (cred.currencyBalance and await models.Cur.get_or_none(ticker=cred.currencyBalance[0]))
+                    or (0 < len(pmex.pm.curs) < 20 and pmex.pm.curs[-1].id)
+                )
+            if not cur_id:
+                raise Exception(f"Set default cur for {pmex.name}")
+            if not (pmcur := await models.Pmcur.get_or_none(cur_id=cur_id, pm_id=pmex.pm_id)):
                 raise HTTPException(f"No Pmcur with cur#{cred.currencyBalance} and pm#{cred.paymentType}", 404)
             dct = {
-                "pmcur_id": pmcurs[0].id,
+                "pmcur_id": pmcur.id,
                 "name": cred.paymentConfigVo.paymentName,
-                "person_id": person.id,
+                "person_id": self.actor.person_id,
+                "detail": cred.accountNo,
+                "extra": cred.branchName or cred.bankName,
             }  # 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_in = models.CredEx.validate({"exid": cred.id, "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
 
@@ -129,8 +143,6 @@ class AgentClient(BaseAgentClient):  # Bybit client
         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):
         t = await self._post("/user/private/ott")
         return t
@@ -345,17 +357,55 @@ 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):
+    async def battle(
+        self,
+        coin: models.Coin,
+        cur: models.Cur,
+        is_sell: bool,
+        pms: list[models.Pm],
+        amount: float,
+        ceil: float,
+        place: int = 1,
+    ):
+        k = (-1) ** int(is_sell)
+        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:
-                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)
+                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:
+                print(end="v" if is_sell else "^", flush=True)
+            await sleep(3)
+
+
+def idiot_maker_filter(ads: list[Ad], ceil: float, k: Literal[-1, 1]):
+    # игнорим ads с ценами >+5% моего страховочного потолка
+    if (ceil * (1 - k * 0.04) - float(ads[0].price)) * k > 0:
+        ads.pop(0)
+        idiot_maker_filter(ads, ceil, k)
 
 
 def listen(data: dict):
@@ -368,12 +418,17 @@ async def main():
         await models.Actor.filter(ex_id=9, agent__isnull=False).prefetch_related("ex", "agent", "person__user").first()
     )
     cl: AgentClient = actor.client()
+    # 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")
     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)
+    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, True, [volet], 65, 82.1, 0),
+    )
 
     bor = BaseOrderReq(
         ad_id="1861440060199632896",

{xync_client-0.0.43.dev11 → xync_client-0.0.43.dev15}/xync_client/Bybit/ex.py

@@ -19,10 +19,16 @@ class ExClient(BaseExClient):  # Bybit client
             "Local Bank (R-Green)": "Sberbank",
             "Local Bank (S-Green)": "Sberbank",
             "Local Card (Red)": "Alfa-Bank",
+            "Local Card(Red)": "Alfa-Bank",
             "Local Card (Yellow)": "T-Bank",
+            "Local Card(Yellow)": "T-Bank",
             "Local Card M-redTS": "MTS-bank",
             "Local Card-Green": "Sberbank",
+            "Local Bank(S-Green)": "Sberbank",
+            "Local Card(Green)": "Sberbank",
+            "Local Bank(R-Green)": "Sberbank",
             "Local Card-Yellow": "T-Bank",
+            "Tinkoff": "T-Bank",
             "Banque de développement local (BDL)": "Banque de développement local (BDL)",
             "Al-Rajhi Bank": "Al Rajhi Bank",
             "BDO": "Banco De Oro (BDO)",

{xync_client-0.0.43.dev11 → xync_client-0.0.43.dev15}/xync_client/Gate/ex.py

@@ -21,7 +21,11 @@ from xync_client.pm_unifier import PmUnifier
 class ExClient(BaseExClient):
     class GateUnifier(PmUnifier):
         pm_map = {
-            "SBP - Fast Bank Transfer": "SBP"
+            "SBP - Fast Bank Transfer": "SBP",
+            "Local Card (Yellow)": "T-Bank",
+            "Local Bank (R-Green)": "Sberbank",
+            "Local Bank (S-Green)": "Sberbank",
+            "Local Card (Red)": "Alfa-bank",
         }
 
     unifier_class = GateUnifier

{xync_client-0.0.43.dev11 → xync_client-0.0.43.dev15}/xync_client/Htx/ex.py

@@ -17,10 +17,7 @@ from xync_client.pm_unifier import PmUnifier
 
 class ExClient(BaseExClient):
     class HtxUnifier(PmUnifier):
-        pm_map = {
-            "SBP - Fast Bank Transfer": "SBP",
-            "Sovkombank": "Sovcombank"
-        }
+        pm_map = {"SBP - Fast Bank Transfer": "SBP", "Tinkoff": "T-Bank", "Sovkombank": "Sovcombank"}
 
     cur_map = {
         # 1: "CNY",

{xync_client-0.0.43.dev11 → xync_client-0.0.43.dev15}/xync_client/Pms/Volet/volet.py

@@ -79,7 +79,7 @@ class VoletAgent:
         browser = await playwright.chromium.launch(
             channel="chrome",
             headless=not headed,
-            timeout=3000,
+            timeout=5000,
             args=[
                 "--disable-blink-features=AutomationControlled",
                 "--no-sandbox",
@@ -89,12 +89,12 @@ class VoletAgent:
                 "--start-maximized",
             ],
         )
-        context = await browser.new_context(storage_state=self.agent.auth.get("state", {}), locale="en-US")
-        context.set_default_navigation_timeout(9000)
-        context.set_default_timeout(5000)
+        context = await browser.new_context(storage_state=self.agent.auth.get("state", {}), locale="en")
+        context.set_default_navigation_timeout(15000)
+        context.set_default_timeout(12000)
         self.page = await context.new_page()
 
-        # await self.gmail_page()
+        await self.gmail_page()
         await self.go(Pages.HOME)
         if self.page.url == Pages.LOGIN:
             await self.login()
@@ -159,16 +159,30 @@ class VoletAgent:
         gp = await self.page.context.new_page()
         await gp.goto(Pages.GMH, timeout=20000)
         if not gp.url.startswith(Pages.GMH):
+            # ваще с 0 заходим
+            if await (
+                sgn_btn := gp.locator(
+                    'header a[href^="https://accounts.google.com/AccountChooser/signinchooser"]:visible',
+                    has_text="sign in",
+                )
+            ).count():
+                await sgn_btn.click()
             # если надо выбрать акк
-            if await gp.locator("h1#headingText", has_text="Choose an account").count():
+            lang = await gp.get_attribute("html", "lang")
+            sgn = {
+                "ru": "Выберите аккаунт",
+                "en": "Choose an account",
+            }
+            if await gp.locator("h1#headingText", has_text=sgn[lang]).count():
                 await gp.locator("li").first.click()
-            # если надо c 0 залогиниться
+            # если предлагает залогиниться
             elif await gp.locator("h1#headingText", has_text="Sign In").count():
                 await gp.fill("input[type=email]", self.agent.user.gmail_auth["login"])
                 await gp.locator("button", has_text="Next").click()
             # осталось ввести пороль:
             await gp.fill("input[type=password]", self.agent.user.gmail_auth["password"])
-            await gp.locator("button", has_text="Next").click()
+            nxt = {"ru": "Далее", "en": "Next"}
+            await gp.locator("button", has_text=nxt[lang]).click()
             await report(self.uid, await gp.screenshot(), "Аппрувни гмейл, у тебя 1.5 минуты", False)
         await gp.wait_for_url(lambda u: u.startswith(Pages.GMH), timeout=90 * 1000)  # убеждаемся что мы в почте
         self.gpage = gp
@@ -234,7 +248,7 @@ async def _test(uid: int, dest: str, amount):
     _ = await init_db(PG_DSN, models, True)
     va = VoletAgent(uid)
     try:
-        await va.start()
+        await va.start(True)
         await va.send(dest, amount)
         await va.wait_for_payments()
     except TimeoutError as te:

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

@@ -21,15 +21,13 @@ 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"
-        }
+        pm_map = {"Rabbit LINE Pay": "LINE Pay", "T-Bank (ex. Tinkoff)": "T-Bank"}
 
     unifier_class = TgWalletUnifier
 
-
     def __init__(self, ex: models.Ex, actor: models.Actor = None):
         if actor:
             self.actor = actor

{xync_client-0.0.43.dev11 → xync_client-0.0.43.dev15}/xync_client/pm_unifier.py

@@ -14,10 +14,11 @@ class PmUni(BaseModel):
 class PmUnifier:
     pms: dict[str, PmUni] = {}  # {origin: normalized}
 
-    pm_map: dict[str, str] = {
-        "Юmoney": "YooMoney",
+    base_pm_map: dict[str, str] = {
+        "ЮMoney": "YooMoney",
         "GTB Bank (Guarantee Trust Bank)": "GTBank",
     }
+    pm_map: dict[str, str] = {}
     re_bank = [
         r"^bank (?!of )|bank$",
         r" banka$",
@@ -60,6 +61,7 @@ class PmUnifier:
     rms = ":`'’′"
 
     def __init__(self, countries: list[str]):
+        self.pm_map = self.base_pm_map | self.pm_map
         self.cts = countries
 
     def countries(self, name: str):

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

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