xync-client 0.0.25.dev71__tar.gz → 0.0.25.dev74__tar.gz

{xync_client-0.0.25.dev71/xync_client.egg-info → xync_client-0.0.25.dev74}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.25.dev71
+Version: 0.0.25.dev74
 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.25.dev74/xync_client/BitGet/etype/ad.py

@@ -0,0 +1,79 @@
+from typing import List, Optional
+from pydantic import BaseModel, Field
+from xync_schema.types import BaseAd
+
+
+class PaymethodDetail(BaseModel):
+    name: str
+    required: int
+    type: str
+
+
+class PaymethodInfo(BaseModel):
+    colorValue: str
+    iconUrl: str
+    isModifyKyc: int
+    paymethodId: str
+    paymethodInfo: List[PaymethodDetail]
+    paymethodName: str
+    paymethodNameHandle: bool
+
+
+class Ad(BaseAd):
+    exid: int | str | None = Field(alias="id")
+    adEditorTime: str
+    adNo: str
+    adType: int
+    advImages: List[str]
+    advertiseIsEvent: int
+    allowMerchantPlace: int
+    allowPlace: int
+    amount: str
+    avgTime: int
+    businessCertifiedList: List
+    businessCertifiedResp: Optional[None]
+    cancellPlaceOrderTime: int
+    certifiedMerchant: int
+    coinCode: str
+    coinPrecision: int
+    countryList: List
+    createTime: str
+    customizeState: int
+    delAdv: int
+    editAmount: str
+    encryptUserId: str
+    fiatCode: str
+    fiatPrecision: int
+    fiatSymbol: str
+    floatValue: str
+    fundState: bool
+    goodEvaluationRate: str
+    headColor: str
+    hideFlag: int
+    iconUrl: str
+    lastAmount: str
+    limitPrice: str
+    maxAmount: str
+    maxCompleteDefault: int
+    minAmount: str
+    minCompleteDefault: int
+    nickName: str
+    orderMode: str
+    payDuration: int
+    paymethodInfo: List[PaymethodInfo]
+    positionNum: str
+    price: str
+    priceType: int
+    priceValue: float
+    recentOnlineText: str
+    showOnline: bool
+    soldAmount: str
+    state: int
+    taxAmount: str
+    thirtyCompletionRate: str
+    thirtyTunoverNum: str
+    transactionTermsRespList: List
+    turnoverNum: str
+    turnoverRate: str
+    turnoverRateNum: float  # Changed from int to float
+    userId: str

{xync_client-0.0.25.dev71 → xync_client-0.0.25.dev74}/xync_client/BitGet/ex.py

@@ -12,6 +12,7 @@ from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
 from xync_client.Abc.Base import MapOfIdsList
 from xync_client.Abc.types import PmEx
+from xync_client.BitGet.etype import ad
 
 
 class ExClient(BaseExClient):
@@ -64,19 +65,32 @@ class ExClient(BaseExClient):
                 pp[p["paymethodId"]] = PmEx(exid=p["paymethodId"], name=p["paymethodName"])
         return pp
 
-    async def ads(self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[int] = None) -> list[dict]:
+    async def ads(
+        self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
+    ) -> list[ad.Ad]:
+        request_data = {
+            "side": 1 if is_sell else 2,
+            "pageNo": 1,
+            "pageSize": 10,
+            "coinCode": coin_exid,
+            "fiatCode": cur_exid,
+            "paymethodId": pm_exids or "",
+            "languageType": 6,
+        }
+        request_json = json.dumps(request_data, separators=(",", ":"))
         p = subprocess.Popen(
             [
                 "node",
                 dirname(__file__) + "/req.mjs",
                 "pub/adv/queryAdvList",
-                "{'side': 1, 'pageNo': 1,'pageSize': 10,'coinCode': 'USDT','fiatCode': 'AMD','languageType': 6}",
+                request_json,
                 json.dumps(self.headers, separators=(",", ":")),
             ],
             stdout=subprocess.PIPE,
         )
         out = p.stdout.read().decode()
-        return json.loads(out)
+        ads = json.loads(out)
+        return [ad.Ad(id=_ad["encryptUserId"], **_ad) for _ad in ads["dataList"]]
 
     async def cur_pms_map(self) -> dict[str, list[int]]:
         cur_pms_map: list[dict] = (await self._coin_cur_pms())["fiatInfoRespList"]

{xync_client-0.0.25.dev71 → xync_client-0.0.25.dev74}/xync_client/Gate/ex.py

@@ -27,9 +27,9 @@ class ExClient(BaseExClient):
         pattern = r"var c2cData = (\{.*?\})\s+var transLang"
         match = re.search(pattern, strng.replace(",}", "}").replace(",]", "]"), re.DOTALL)
         res = match.group(1)
-        p = subprocess.Popen(
-            ["node", "-e", f"const lang_string = a => a;console.log(JSON.stringify({res}))"], stdout=subprocess.PIPE
-        )
+        with open("res.js", "w") as file:
+            file.write(f"const lang_string = a => a;console.log(JSON.stringify({res}))")
+        p = subprocess.Popen(["node", "res.js"], stdout=subprocess.PIPE)
         out = p.stdout.read().decode()
         return loads(out)
 

{xync_client-0.0.25.dev71 → xync_client-0.0.25.dev74/xync_client.egg-info}/PKG-INFO

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

@@ -54,6 +54,7 @@ xync_client/BitGet/__init__.py
 xync_client/BitGet/agent.py
 xync_client/BitGet/ex.py
 xync_client/BitGet/req.mjs
+xync_client/BitGet/etype/ad.py
 xync_client/Bybit/agent.py
 xync_client/Bybit/ex.py
 xync_client/Bybit/web_earn.py