exchanges-wrapper 2.1.43__tar.gz → 2.1.46__tar.gz

{exchanges_wrapper-2.1.43 → exchanges_wrapper-2.1.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: exchanges-wrapper
-Version: 2.1.43
+Version: 2.1.46
 Summary: REST API and WebSocket asyncio wrapper with grpc powered multiplexer server
 Author-email: Thomas Marchand <thomas.marchand@tuta.io>, Jerry Fedorenko <jerry.fedorenko@yahoo.com>
 Requires-Python: >=3.10
@@ -12,10 +12,10 @@ Classifier: Operating System :: Unix
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS
 License-File: LICENSE.md
-Requires-Dist: crypto-ws-api==2.1.4
+Requires-Dist: crypto-ws-api==2.1.6
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: simplejson==3.20.2
-Requires-Dist: aiohttp~=3.13.2
+Requires-Dist: aiohttp~=3.13.3
 Requires-Dist: expiringdict~=1.2.2
 Requires-Dist: betterproto==2.0.0b7
 Requires-Dist: grpclib~=0.4.8
@@ -157,7 +157,7 @@ docker run -itP \
 *USDT* (TRC20) TN8F3Dz8BU8VwECRh3LTKi7FrsU8eWfsZz
 
 ## Powered by exchanges-wrapper
-<a><img align="middle" src="https://github.com/DogsTailFarmer/martin-binance/raw/public/doc/Modified%20martingale.svg" width="50"></a>
+<a><img align="middle" src="https://raw.githubusercontent.com/DogsTailFarmer/martin-binance/55758a8d32b08c4deb1b34add01c5e259b88f738/doc/Modified%20martingale.svg" width="50"></a>
 [martin-binance](https://github.com/DogsTailFarmer/martin-binance)
 
 Free trading system for crypto exchanges SPOT markets. Adaptive customizable reverse grid strategy based on martingale.

{exchanges_wrapper-2.1.43 → exchanges_wrapper-2.1.46}/README.md

@@ -134,7 +134,7 @@ docker run -itP \
 *USDT* (TRC20) TN8F3Dz8BU8VwECRh3LTKi7FrsU8eWfsZz
 
 ## Powered by exchanges-wrapper
-<a><img align="middle" src="https://github.com/DogsTailFarmer/martin-binance/raw/public/doc/Modified%20martingale.svg" width="50"></a>
+<a><img align="middle" src="https://raw.githubusercontent.com/DogsTailFarmer/martin-binance/55758a8d32b08c4deb1b34add01c5e259b88f738/doc/Modified%20martingale.svg" width="50"></a>
 [martin-binance](https://github.com/DogsTailFarmer/martin-binance)
 
 Free trading system for crypto exchanges SPOT markets. Adaptive customizable reverse grid strategy based on martingale.

{exchanges_wrapper-2.1.43 → exchanges_wrapper-2.1.46}/exchanges_wrapper/__init__.py

@@ -12,7 +12,7 @@ __maintainer__ = "Jerry Fedorenko"
 __contact__ = "https://github.com/DogsTailFarmer"
 __email__ = "jerry.fedorenko@yahoo.com"
 __credits__ = ["https://github.com/DanyaSWorlD"]
-__version__ = "2.1.43"
+__version__ = "2.1.46"
 
 from pathlib import Path
 import shutil

{exchanges_wrapper-2.1.43 → exchanges_wrapper-2.1.46}/exchanges_wrapper/client.py

@@ -244,6 +244,9 @@ class Client:
         symbol_info = self.symbols.get(symbol)
         return f"{symbol_info.get('baseAsset')}-{symbol_info.get('quoteAsset')}"
 
+    def symbol_to_id(self, symbol) -> int:
+        return self.symbols.get(symbol).get('instIdCode')
+
     def active_order(self, order_id: int, quantity="0", executed_qty="0", last_event=None):
         quantity_decimal = Decimal(quantity)
         executed_qty_decimal = Decimal(executed_qty)
@@ -858,7 +861,7 @@ class Client:
                 self.active_order(int(res), quantity, binance_res['executedQty'])
         elif self.exchange == 'okx':
             params = {
-                "instId": self.symbol_to_okx(symbol),
+                "instIdCode": self.symbol_to_id(symbol),
                 "tdMode": "cash",
                 "clOrdId": new_client_order_id,
                 "side": side.lower(),
@@ -867,6 +870,7 @@ class Client:
                 "px": price,
             }
             res = await self.user_session.handle_request(trade_id, "order", _params=params)
+            params["instId"] = self.symbol_to_okx(symbol)
             if res is None:
                 fallback_warning(self.exchange, symbol)
                 res = await self.http.send_api_call(
@@ -1071,19 +1075,19 @@ class Client:
             _queue = asyncio.Queue()
             self.on_order_update_queues.update({f"{_symbol}{order_id}": _queue})
             params = {
-                "instId": _symbol,
+                "instIdCode": self.symbol_to_id(symbol),
                 "ordId": str(order_id),
                 "clOrdId": str(origin_client_order_id),
             }
-            _res = (
-                    await self.user_session.handle_request(trade_id, "cancel-order", _params=params)
-                    or await self.http.send_api_call(
-                        "/api/v5/trade/cancel-order",
-                        method="POST",
-                        signed=True,
-                        **params,
-                    )
-            )
+            _res = await self.user_session.handle_request(trade_id, "cancel-order", _params=params)
+            if _res is None:
+                params["instId"] = self.symbol_to_okx(symbol)
+                _res = await self.http.send_api_call(
+                    "/api/v5/trade/cancel-order",
+                    method="POST",
+                    signed=True,
+                    **params,
+                )
             if _res[0].get('sCode') != '0':
                 raise UserWarning(_res[0].get('sMsg'))
             try:
@@ -1180,7 +1184,13 @@ class Client:
                 for order in orders:
                     order['status'] = 'CANCELED'
                     orders_canceled.append(order)
-                    params.append({'instId': _symbol, 'ordId': order.get('orderId')})
+                    params.append(
+                        {
+                            "instIdCode": self.symbol_to_id(symbol),
+                            'instId': _symbol,
+                            'ordId': order.get('orderId')
+                        }
+                    )
                     if i >= 19:
                         break
                     i += 1

{exchanges_wrapper-2.1.43 → exchanges_wrapper-2.1.46}/exchanges_wrapper/parsers/okx.py

@@ -78,6 +78,7 @@ def exchange_info(server_time: int, trading_symbol: list, tickers: list, symbol_
                 "isMarginTradingAllowed": False,
                 "filters": [_price_filter, _lot_size, _min_notional, _percent_price],
                 "permissions": ["SPOT"],
+                "instIdCode": market.get("instIdCode")
             }
             symbols.append(symbol)
 

{exchanges_wrapper-2.1.43 → exchanges_wrapper-2.1.46}/pyproject.toml

@@ -20,10 +20,10 @@ dynamic = ["version", "description"]
 requires-python = ">=3.10"
 
 dependencies = [
-    "crypto-ws-api==2.1.4",
+    "crypto-ws-api==2.1.6",
     "pyotp==2.9.0",
     "simplejson==3.20.2",
-    "aiohttp~=3.13.2",
+    "aiohttp~=3.13.3",
     "expiringdict~=1.2.2",
     "betterproto==2.0.0b7",
     "grpclib~=0.4.8"