xync-client 0.0.133__tar.gz → 0.0.135__tar.gz

{xync_client-0.0.133/xync_client.egg-info → xync_client-0.0.135}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.133
+Version: 0.0.135
 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.133 → xync_client-0.0.135}/xync_client/Bybit/InAgent.py

@@ -1,7 +1,7 @@
 import json
 import logging
 import re
-from datetime import datetime, timezone
+from datetime import datetime, timezone, timedelta
 from uuid import uuid4
 
 import websockets
@@ -11,6 +11,7 @@ from decimal import Decimal
 from playwright.async_api import async_playwright
 from pydantic import ValidationError
 from pyro_client.client.file import FileClient
+from tortoise.timezone import now
 from tortoise.transactions import in_transaction
 
 from xync_client.Abc.PmAgent import PmAgentClient
@@ -130,7 +131,7 @@ class InAgentClient(BaseInAgentClient):
 
                                                 # если висят незавершенные продажи с такой же суммой
                                                 pos = (await self.agent_client.get_orders_active(1))["result"]
-                                                if [
+                                                pos = [
                                                     o
                                                     for o in pos.get("items", [])
                                                     if (
@@ -138,7 +139,17 @@ class InAgentClient(BaseInAgentClient):
                                                         and o["id"] != upd.id
                                                         and int(order.createDate) < int(o["createDate"]) + 3600 * 000
                                                     )
-                                                ]:
+                                                ]
+                                                curex = await models.CurEx.get(
+                                                    cur__ticker=order.currencyId, ex=self.agent_client.ex_client.ex
+                                                )
+                                                pos_db = await models.Order.filter(
+                                                    exid__not=order.id,
+                                                    amount=int(float(order.amount) * 10**curex.scale),
+                                                    status__not_in=[OrderStatus.completed, OrderStatus.canceled],
+                                                    created_at__gt=now() - timedelta(hours=1),
+                                                )
+                                                if pos or pos_db:
                                                     await self.agent_client.ex_client.bot.send(
                                                         f"[Duplicate amount!]"
                                                         f"(https://www.bybit.com/ru-RU/p2p/orderList/{order.id})",

{xync_client-0.0.133 → xync_client-0.0.135}/xync_client/Bybit/etype/order.py

@@ -335,7 +335,7 @@ class Receive(_BaseMsg):
 
 class Read(_BaseMsg):
     readAmount: int
-    read: Literal["101", "110", "111"]
+    read: Literal["101", "110", "11", "111"]
     orderStatus: StatusApi
 
 

{xync_client-0.0.133 → xync_client-0.0.135}/xync_client/Pms/Payeer/__init__.py

@@ -1,15 +1,25 @@
 import logging
 from asyncio import run
+from base64 import b64encode
 from datetime import datetime
 from decimal import Decimal
 from enum import StrEnum
+from hashlib import sha256
+from json import dumps
 from math import ceil
+from os import urandom
 from time import sleep
+from urllib.parse import urlencode
 
 from asyncpg.pgproto.pgproto import timedelta
+from cryptography.hazmat.primitives import padding
+from cryptography.hazmat.primitives.ciphers import Cipher
+from cryptography.hazmat.primitives.ciphers.algorithms import AES
+from cryptography.hazmat.primitives.ciphers.modes import CBC
 from payeer_api import PayeerAPI
 from playwright.async_api import async_playwright, Playwright, Error
 from playwright._impl._errors import TimeoutError
+from xync_schema.models import TopUp, TopUpAble
 
 from xync_client.loader import TORM
 
@@ -17,6 +27,34 @@ from xync_client.Abc.PmAgent import PmAgentClient
 from xync_client.Pms.Payeer.login import login
 
 
+def encrypt_data(data: dict, md5digest: bytes):
+    # Convert data to JSON string (equivalent to json_encode)
+    bdata = dumps(data).encode()
+
+    # Generate random IV (16 bytes for AES)
+    iv = urandom(16)
+
+    # Pad or truncate key to 32 bytes
+    if len(md5digest) < 32:
+        md5digest = md5digest.ljust(32, b"\0")  # Pad with null bytes
+    elif len(md5digest) > 32:
+        md5digest = md5digest[:32]  # Truncate to 32 bytes
+
+    # Apply PKCS7 padding
+    padder = padding.PKCS7(128).padder()  # 128 bits = 16 bytes block size
+    padded_data = padder.update(bdata)
+    padded_data += padder.finalize()
+
+    # Create cipher
+    cipher = Cipher(AES(md5digest), CBC(iv))
+    encryptor = cipher.encryptor()
+
+    # Encrypt
+    ciphertext = encryptor.update(padded_data) + encryptor.finalize()
+
+    return iv + ciphertext
+
+
 class Client(PmAgentClient):
     class Pages(StrEnum):
         _base = "https://payeer.com/en/"
@@ -39,6 +77,50 @@ class Client(PmAgentClient):
             await self.page.context.add_cookies([cookie])
         await self.page.goto(self.pages.SEND)
 
+    @staticmethod
+    def form_redirect(topup: TopUp) -> tuple[str, dict | None]:
+        m_shop = str(topup.topupable.auth["id"])
+        m_orderid = str(topup.id)
+        m_amount = str(topup.amount * 0.01)
+        m_curr = topup.cur.ticker
+        m_desc = b64encode(b"XyncPay top up").decode()
+        m_key = topup.topupable.auth["sec"]
+        data = [m_shop, m_orderid, m_amount, m_curr, m_desc]
+
+        # # additional
+        # m_params = {
+        #     'success_url': 'https://xync.net/topup?success=1',
+        #     'fail_url': 'https://xync.net/topup?success=0',
+        #     'status_url': 'https://xync.net/topup',
+        #     'reference': {'var1': '1'},
+        # }
+        #
+        # key = md5(m_orderid.to_bytes()).digest()
+        #
+        # base64url_encode(encrypt_data(params, key))
+        #
+        # data.append(m_params)
+        # # additional
+
+        data.append(m_key)
+
+        sign = sha256(":".join(data).encode()).hexdigest().upper()
+
+        params = {
+            "m_shop": m_shop,
+            "m_orderid": m_orderid,
+            "m_amount": m_amount,
+            "m_curr": m_curr,
+            "m_desc": m_desc,
+            "m_sign": sign,
+            # 'm_params': m_params,
+            # 'm_cipher_method': 'AES-256-CBC-IV',
+            "form[ps]": "2609",
+            "form[curr[2609]]": m_curr,
+        }
+        url = "https://payeer.com/merchant/?" + urlencode(params)
+        return url, None
+
     async def send(self, dest: str, amount: int, cur: str) -> tuple[int, bytes, int] | int:
         self.last_active = datetime.now()
         page = self.page
@@ -125,17 +207,18 @@ async def main(uid: int):
     playwright: Playwright = await async_playwright().start()
     pyr = Client(uid)
     try:
-        await pyr.start(playwright, False)
+        dest, amount, cur = "P79619335", 4, "RUB"
+        ta = await TopUpAble.get(pm__norm="payeer")
+        topup = await TopUp.create(amount=1001, cur_id=1, topupable=ta, user_id=1)
+        await topup.fetch_related("cur")
+        _url, _data = pyr.form_redirect(topup)
 
-        dest, amount, cur = "P79619335", 2, "RUB"
+        await pyr.start(playwright, False)
 
-        res = await pyr.send(dest, amount, cur)
-        res = await pyr.send(dest, 3, cur)
-        res = await pyr.send(dest, amount, cur)
-        res = await pyr.send(dest, 3, cur)
-        res = await pyr.send(dest, amount, cur)
+        _res = await pyr.send(dest, amount, cur)
+        _res = await pyr.send(dest, 3, cur)
 
-        res = pyr.check_in(2, cur, datetime.now())
+        res = pyr.check_in(3, cur, datetime.now())
 
         if len(res) > 1 and isinstance(res[1], bytes):
             await pyr.bot.send(f"Transaction #{res[0]}", uid, photo=res[1])
@@ -152,4 +235,4 @@ async def main(uid: int):
 
 
 if __name__ == "__main__":
-    run(main(1779829771))
+    run(main(193017646))

{xync_client-0.0.133 → xync_client-0.0.135/xync_client.egg-info}/PKG-INFO

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