exchanges-wrapper 2.1.33__tar.gz → 2.1.34__tar.gz

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: exchanges-wrapper
-Version: 2.1.33
+Version: 2.1.34
 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.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Classifier: Programming Language :: Python :: 3
 Classifier: Development Status :: 5 - Production/Stable
@@ -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.0.19
+Requires-Dist: crypto-ws-api==2.0.20
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: simplejson==3.20.1
-Requires-Dist: aiohttp~=3.11.14
+Requires-Dist: aiohttp~=3.11.18
 Requires-Dist: expiringdict~=1.2.2
 Requires-Dist: betterproto==2.0.0b7
 Requires-Dist: grpclib~=0.4.7
@@ -35,7 +35,8 @@ Project-URL: Source, https://github.com/DogsTailFarmer/exchanges-wrapper
 <a href="https://sonarcloud.io/summary/new_code?id=DogsTailFarmer_exchanges-wrapper" target="_blank"><img alt="sonarcloud" title="sonarcloud" src="https://sonarcloud.io/api/project_badges/measure?project=DogsTailFarmer_exchanges-wrapper&metric=alert_status"/></a>
 <a href="https://pepy.tech/project/exchanges-wrapper" target="_blank"><img alt="Downloads" title="Downloads" src="https://static.pepy.tech/badge/exchanges-wrapper/month"/></a>
 ***
-From `2.1.21` must be updated `exch_srv_cfg.toml` from `exchanges_wrapper/exch_srv_cfg.toml.template`
+On `Binance`: now API key type [Ed25519](https://www.binance.com/en/support/faq/detail/6b9a63f1e3384cf48a2eedb82767a69a) is used instead of `HMAC`
+From `2.1.34` must be updated `exch_srv_cfg.toml` from `exchanges_wrapper/exch_srv_cfg.toml.template`
 ***
 
 ## exchanges-wrapper vs [binance.py](https://github.com/Th0rgal/binance.py)
@@ -75,11 +76,13 @@ at real bidding. First, run applications on the [Binance Spot Test Network](http
 
 ## Get started
 ### Prepare exchange account
-* Create account on [Binance](https://accounts.binance.com/en/register?ref=FXQ6HY5O) and get 10% discount on all trading fee
-* Create account on [Bitfinex](https://www.bitfinex.com/sign-up?refcode=v_4az2nCP) and get 6% rebate fee
-* Create account on [HUOBI](https://www.huobi.com/en-us/topic/double-reward/?invite_code=9uaw3223) and get 10% cashback on all trading fee
-* Create account on [OKX](https://www.okx.com/join/2607649) and get Mystery Boxes worth up to $10,000
-* Create account on [Bybit](https://www.bybit.com/invite?ref=9KEW1K) and get exclusive referral rewards
+Create account on [Binance](https://accounts.binance.com/en/register?ref=FXQ6HY5O) and get 10% discount on all trading fee
+Create account on [HTX](https://www.htx.com/invite/en-us/1f?invite_code=9uaw3223) From every invitee, win a Mystery Box (up to 1,500 USDT) and 30% of their trading fees.
+Create account on [Bitfinex](https://www.bitfinex.com/sign-up?refcode=v_4az2nCP) and get 6% rebate fee
+Create account on [OKX](https://okx.com/join/2607649) and will be in for the chance to earn up to 100 USDT
+Create account on [Bybit](https://www.bybit.com/invite?ref=9KEW1K) and get exclusive referral rewards
+
+Also, you can start strategy on [Hetzner](https://hetzner.cloud/?ref=uFdrF8nsdGMc) cloud VPS only for 4.75 € per month
  
 * For test purpose log in at [Binance Spot Test Network](https://testnet.binance.vision/)
 * Create API Key

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/README.md

@@ -12,7 +12,8 @@
 <a href="https://sonarcloud.io/summary/new_code?id=DogsTailFarmer_exchanges-wrapper" target="_blank"><img alt="sonarcloud" title="sonarcloud" src="https://sonarcloud.io/api/project_badges/measure?project=DogsTailFarmer_exchanges-wrapper&metric=alert_status"/></a>
 <a href="https://pepy.tech/project/exchanges-wrapper" target="_blank"><img alt="Downloads" title="Downloads" src="https://static.pepy.tech/badge/exchanges-wrapper/month"/></a>
 ***
-From `2.1.21` must be updated `exch_srv_cfg.toml` from `exchanges_wrapper/exch_srv_cfg.toml.template`
+On `Binance`: now API key type [Ed25519](https://www.binance.com/en/support/faq/detail/6b9a63f1e3384cf48a2eedb82767a69a) is used instead of `HMAC`
+From `2.1.34` must be updated `exch_srv_cfg.toml` from `exchanges_wrapper/exch_srv_cfg.toml.template`
 ***
 
 ## exchanges-wrapper vs [binance.py](https://github.com/Th0rgal/binance.py)
@@ -52,11 +53,13 @@ at real bidding. First, run applications on the [Binance Spot Test Network](http
 
 ## Get started
 ### Prepare exchange account
-* Create account on [Binance](https://accounts.binance.com/en/register?ref=FXQ6HY5O) and get 10% discount on all trading fee
-* Create account on [Bitfinex](https://www.bitfinex.com/sign-up?refcode=v_4az2nCP) and get 6% rebate fee
-* Create account on [HUOBI](https://www.huobi.com/en-us/topic/double-reward/?invite_code=9uaw3223) and get 10% cashback on all trading fee
-* Create account on [OKX](https://www.okx.com/join/2607649) and get Mystery Boxes worth up to $10,000
-* Create account on [Bybit](https://www.bybit.com/invite?ref=9KEW1K) and get exclusive referral rewards
+Create account on [Binance](https://accounts.binance.com/en/register?ref=FXQ6HY5O) and get 10% discount on all trading fee
+Create account on [HTX](https://www.htx.com/invite/en-us/1f?invite_code=9uaw3223) From every invitee, win a Mystery Box (up to 1,500 USDT) and 30% of their trading fees.
+Create account on [Bitfinex](https://www.bitfinex.com/sign-up?refcode=v_4az2nCP) and get 6% rebate fee
+Create account on [OKX](https://okx.com/join/2607649) and will be in for the chance to earn up to 100 USDT
+Create account on [Bybit](https://www.bybit.com/invite?ref=9KEW1K) and get exclusive referral rewards
+
+Also, you can start strategy on [Hetzner](https://hetzner.cloud/?ref=uFdrF8nsdGMc) cloud VPS only for 4.75 € per month
  
 * For test purpose log in at [Binance Spot Test Network](https://testnet.binance.vision/)
 * Create API Key

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/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.33"
+__version__ = "2.1.34"
 
 from pathlib import Path
 import shutil

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/exchanges_wrapper/client.py

@@ -30,7 +30,6 @@ from crypto_ws_api.ws_session import UserWSSession
 logger = logging.getLogger(__name__)
 
 STATUS_TIMEOUT = 5  # sec, also use for lifetime limit for inactive order (Bitfinex) as 60 * STATUS_TIMEOUT
-USER_DATA_STREAM = "/api/v3/userDataStream"
 ORDER_ENDPOINT = "/api/v3/order"
 
 def fallback_warning(exchange, symbol=None):
@@ -161,7 +160,7 @@ class Client:
         logger.info(f"Start '{self.exchange}' user events listener for {_trade_id}")
         user_data_stream = None
         if self.exchange == 'binance':
-            user_data_stream = await UserEventsDataStream(self, self.endpoint_ws_auth, self.exchange, _trade_id)
+            user_data_stream = UserEventsDataStream(self, self.endpoint_ws_api, self.exchange, _trade_id)
         elif self.exchange == 'bitfinex':
             user_data_stream = BfxPrivateEventsDataStream(self, self.endpoint_ws_auth, self.exchange, _trade_id)
         elif self.exchange == 'huobi':
@@ -185,7 +184,7 @@ class Client:
                 if not timeout:
                     logger.warning(f"{self.exchange} user WSS start timeout reached for {_trade_id}")
                     break
-                await asyncio.sleep(0.05)
+                await asyncio.sleep(0.1)
 
     async def start_market_events_listener(self, _trade_id):
         _events = self.events.registered_streams.get(self.exchange, {}).get(_trade_id, set())
@@ -525,6 +524,7 @@ class Client:
                         self.ledgers_id.pop(0)
                     balances.append(i[_id])
             return balances
+        return None
 
     # https://github.com/binance/binance-spot-api-docs/blob/master/rest-api.md#recent-trades-list
     async def fetch_recent_trades_list(self, symbol, limit=500):
@@ -773,6 +773,7 @@ class Client:
                 params=params,
                 signed=True,
             )
+        return None
 
     async def fetch_api_info(self):
         res, _ = await self.http.send_api_call("/v5/user/query-api", signed=True)
@@ -816,7 +817,6 @@ class Client:
                 trade_id,
                 "order.place",
                 _params=params,
-                send_api_key=True,
                 _signed=True
             )
             if binance_res is None:
@@ -947,7 +947,6 @@ class Client:
                         trade_id,
                         "order.status",
                         _params=params,
-                        send_api_key=True,
                         _signed=True,
                     )
             if b_res is None:
@@ -1050,7 +1049,6 @@ class Client:
                 trade_id,
                 "order.cancel",
                 _params=params,
-                send_api_key=True,
                 _signed=True
             )
             if binance_res is None:
@@ -1152,7 +1150,6 @@ class Client:
                 trade_id,
                 "openOrders.cancelAll",
                 _params=params,
-                send_api_key=True,
                 _signed=True
             )
             if binance_res is None:
@@ -1275,7 +1272,6 @@ class Client:
                 trade_id,
                 "openOrders.status",
                 _params=params,
-                send_api_key=True,
                 _signed=True
             )
             if binance_res is None:
@@ -1522,7 +1518,6 @@ class Client:
                 trade_id,
                 "account.status",
                 _params=params,
-                send_api_key=True,
                 _signed=True
             )
             if binance_res is None:
@@ -1744,7 +1739,6 @@ class Client:
                 trade_id,
                 "myTrades",
                 _params=params,
-                send_api_key=True,
                 _signed=True
             )
             if binance_res is None:
@@ -1839,25 +1833,3 @@ class Client:
         return b_res
 
     # endregion
-
-    # USER DATA STREAM ENDPOINTS
-
-    # https://github.com/binance-exchange/binance-official-api-docs/blob/master/user-data-stream.md#create-a-listenkey
-    async def create_listen_key(self):
-        return await self.http.send_api_call(USER_DATA_STREAM, "POST")
-
-    # https://github.com/binance-exchange/binance-official-api-docs/blob/master/user-data-stream.md#close-a-listenkey
-    async def keep_alive_listen_key(self, listen_key):
-        if not listen_key:
-            raise ValueError("This query requires a listen_key.")
-        return await self.http.send_api_call(
-            USER_DATA_STREAM, "PUT", params={"listenKey": listen_key}
-        )
-
-    # https://github.com/binance-exchange/binance-official-api-docs/blob/master/user-data-stream.md#close-a-listenkey
-    async def close_listen_key(self, listen_key):
-        if not listen_key:
-            raise ValueError("This query requires a listen_key.")
-        return await self.http.send_api_call(
-            USER_DATA_STREAM, "DELETE", params={"listenKey": listen_key}
-        )

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/exchanges_wrapper/exch_srv.py

@@ -12,6 +12,7 @@ import gc
 import traceback
 import asyncio
 import functools
+# noinspection PyPackageRequirements
 import ujson as json
 import logging.handlers
 from decimal import Decimal

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/exchanges_wrapper/exch_srv_cfg.toml.template

@@ -1,28 +1,17 @@
 # Parameters for exchanges-wrapper REST API Server exch_srv.py
 # Copyright © 2021-2025 Jerry Fedorenko aka VM
-# __version__ = "2.1.29"
+# __version__ = "2.1.34"
+
 # region endpoint
 [endpoint]
     [endpoint.binance]
         api_public = 'https://api.binance.com'
         api_auth = 'https://api.binance.com'
         ws_public = 'wss://stream.binance.com:9443'
-        ws_auth = 'wss://stream.binance.com:9443'
         api_test = 'https://testnet.binance.vision'
-        ws_test = 'wss://testnet.binance.vision/ws'
         ws_api = 'wss://ws-api.binance.com:443/ws-api/v3'
         ws_api_test = 'wss://testnet.binance.vision/ws-api/v3'
 
-    [endpoint.binance_us]
-        api_public = 'https://api.binance.us'
-        api_auth = 'https://api.binance.us'
-        ws_public = 'wss://stream.binance.us:9443'
-        ws_auth = 'wss://stream.binance.us:9443'
-        api_test = 'https://testnet.binance.vision'
-        ws_test = 'wss://testnet.binance.vision/ws'
-        ws_api = 'wss://ws-api.binance.us:443/ws-api/v3'
-        ws_api_test = 'wss://testnet.binance.vision/ws-api/v3'
-
     [endpoint.bitfinex]
         api_public = 'https://api-pub.bitfinex.com'
         api_auth = 'https://api.bitfinex.com'
@@ -58,35 +47,42 @@
 # endregion
 
 # region Binance.com accounts
+# How to Generate an Ed25519 Key Pair and Register then on Binance:
+# https://www.binance.com/en/support/faq/detail/6b9a63f1e3384cf48a2eedb82767a69a
 [[accounts]]
     exchange = 'binance'
     name = 'Demo - Binance'
-    api_key = '*********** Place API key there ************'
-    api_secret = '*********** Place secret API key there ************'
+    api_key = '*********** Place Ed25519 API key there ************'
+    api_secret = """
+-----BEGIN PRIVATE KEY-----
+*********** Place PRIVATE API key there ************
+-----END PRIVATE KEY-----
+"""
     test_net = true
 
 [[accounts]]
     exchange = 'binance'
     name = 'BinanceSub1'
-    api_key = '*********** Place API key there ************'
-    api_secret = '*********** Place secret API key there ************'
+    api_key = '*********** Place Ed25519 API key there ************'
+    api_secret = """
+-----BEGIN PRIVATE KEY-----
+*********** Place PRIVATE API key there ************
+-----END PRIVATE KEY-----
+"""
     test_net = false
 
 [[accounts]]
     exchange = 'binance'
     name = 'BinanceSub2'
-    api_key = '*********** Place API key there ************'
-    api_secret = '*********** Place secret API key there ************'
+    api_key = '*********** Place Ed25519 API key there ************'
+    api_secret = """
+-----BEGIN PRIVATE KEY-----
+*********** Place PRIVATE API key there ************
+-----END PRIVATE KEY-----
+"""
     master_email = 'sub1@mail.com'  # If set, 'BinanceSub1' use for collecting assets instead of Main
     test_net = false
 
-# Binance.us accounts
-[[accounts]]
-    exchange = 'binance_us'
-    name = 'Binance US'
-    api_key = '*********** Place API key there ************'
-    api_secret = '*********** Place secret API key there ************'
-    test_net = false
 # endregion
 
 # region Bitfinex accounts

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/exchanges_wrapper/http_client.py

@@ -45,7 +45,6 @@ class HttpClient:
         self.rate_limit_handler = RateLimitHandler() if self.exchange == 'bybit' else None
 
     def declare_exchanges_implementation(self):
-        # noinspection PyTypeChecker
         self.ex_imps = {
         'binance': self._binance_request,
         'bitfinex': self._bitfinex_request,

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/exchanges_wrapper/lib.py

@@ -77,9 +77,6 @@ def get_account(account_name: str) -> dict:
             ws_public = get_ws_public(endpoint, exchange, test_net)
             ws_api, ws_auth = get_ws_api_auth(endpoint, exchange, test_net)
 
-            if exchange == 'binance_us':
-                exchange = 'binance'
-
             return {
                 'exchange': exchange,
                 'sub_account': sub_account,
@@ -96,7 +93,7 @@ def get_account(account_name: str) -> dict:
                 'master_name': master_name,
                 'two_fa': account.get('two_fa'),
                 'ws_api': ws_api,
-            }
+           }
     return {}
 
 def get_ws_add_on(endpoint, exchange):
@@ -118,7 +115,7 @@ def get_ws_api_auth(endpoint, exchange, test_net):
     if exchange == 'bitfinex':
         ws_api = ws_auth = endpoint['ws_auth']
     else:
-        ws_auth = endpoint['ws_test'] if test_net else endpoint['ws_auth']
+        ws_auth = endpoint.get('ws_test') if test_net else endpoint.get('ws_auth')
         ws_api = endpoint.get('ws_api_test') if test_net else endpoint.get('ws_api')
         if exchange == 'okx':
             ws_api = ws_auth

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/exchanges_wrapper/parsers/bitfinex.py

@@ -50,7 +50,7 @@ class OrderBook:
         return self
 
 
-def get_symbols(symbols_details: [], symbol) -> str:
+def get_symbols(symbols_details: list, symbol) -> str:
     symbols = []
     res = ",t"
     for symbol_details in symbols_details:
@@ -86,7 +86,7 @@ def symbol_name(_pair: str) -> ():
     return pair, base_asset, quote_asset
 
 
-def exchange_info(symbols_details: [], tickers: [], symbol_t) -> {}:
+def exchange_info(symbols_details: list, tickers: list, symbol_t) -> dict:
     symbols = []
     symbols_price = {
         pair[0].replace(':', '').upper()[1:]: pair[7] for pair in tickers
@@ -159,7 +159,7 @@ def exchange_info(symbols_details: [], tickers: [], symbol_t) -> {}:
     }
 
 
-def account_information(res: []) -> {}:
+def account_balances(res: list) -> dict:
     balances = []
     for balance in res:
         if balance[0] == 'exchange':
@@ -172,23 +172,10 @@ def account_information(res: []) -> {}:
                 "locked": locked,
             }
             balances.append(_binance_res)
+    return {"balances": balances}
 
-    return {
-        "makerCommission": 0,
-        "takerCommission": 0,
-        "buyerCommission": 0,
-        "sellerCommission": 0,
-        "canTrade": True,
-        "canWithdraw": False,
-        "canDeposit": False,
-        "updateTime": int(time.time() * 1000),
-        "accountType": "SPOT",
-        "balances": balances,
-        "permissions": ["SPOT"],
-    }
 
-
-def order(res: [], response_type=None, cancelled=False) -> {}:
+def order(res: list, response_type=None, cancelled=False) -> dict:
     # print(f"order.order: {res}")
     symbol = res[3][1:].replace(':', '')
     order_id = res[0]
@@ -275,7 +262,7 @@ def order(res: [], response_type=None, cancelled=False) -> {}:
         }
 
 
-def orders(res: [], response_type=None, cancelled=False) -> []:
+def orders(res: list, response_type=None, cancelled=False) -> list:
     binance_orders = []
     for _order in res:
         i_order = order(_order, response_type=response_type, cancelled=cancelled)
@@ -283,7 +270,7 @@ def orders(res: [], response_type=None, cancelled=False) -> []:
     return binance_orders
 
 
-def order_book(res: []) -> {}:
+def order_book(res: list) -> dict:
     binance_order_book = {"lastUpdateId": int(time.time() * 1000)}
     bids = []
     asks = []
@@ -297,7 +284,7 @@ def order_book(res: []) -> {}:
     return binance_order_book
 
 
-def ticker_price_change_statistics(res: [], symbol):
+def ticker_price_change_statistics(res: list, symbol):
     return {
         "symbol": symbol,
         "priceChange": str(res[4]),
@@ -323,7 +310,7 @@ def ticker_price_change_statistics(res: [], symbol):
     }
 
 
-def fetch_symbol_price_ticker(res: [], symbol) -> {}:
+def fetch_symbol_price_ticker(res: list, symbol) -> dict:
     return {
         "symbol": symbol,
         "price": str(res[6]),
@@ -348,7 +335,7 @@ def interval(_interval: str) -> int:
     return resolution.get(_interval, 0)
 
 
-def klines(res: [], _interval: str) -> []:
+def klines(res: list, _interval: str) -> list:
     binance_klines = []
     for i in res:
         start_time = i[0]
@@ -370,7 +357,7 @@ def klines(res: [], _interval: str) -> []:
     return binance_klines
 
 
-def candle(res: [], symbol: str = None, ch_type: str = None) -> {}:
+def candle(res: list, symbol: str = None, ch_type: str = None) -> dict:
     symbol = symbol[1:].replace(':', '')
     start_time = res[0]
     _interval = ch_type.split('_')[1]
@@ -403,7 +390,7 @@ def candle(res: [], symbol: str = None, ch_type: str = None) -> {}:
     }
 
 
-def account_trade_list(res: [], order_id=None) -> []:
+def account_trade_list(res: list, order_id=None) -> list:
     binance_trade_list = []
     for trade in res:
         if order_id is None or order_id == trade[3]:
@@ -429,7 +416,7 @@ def account_trade_list(res: [], order_id=None) -> []:
     return binance_trade_list
 
 
-def ticker(res: [], symbol: str = None) -> {}:
+def ticker(res: list, symbol: str = None) -> dict:
     _symbol = symbol[1:].replace(':', '').lower()
     return {
         'stream': f"{_symbol}@miniTicker",
@@ -447,7 +434,7 @@ def ticker(res: [], symbol: str = None) -> {}:
     }
 
 
-def on_funds_update(res: []) -> {}:
+def on_funds_update(res: list) -> dict:
     binance_funds = {
         'e': 'outboundAccountPosition',
         'E': int(time.time() * 1000),
@@ -471,7 +458,7 @@ def on_funds_update(res: []) -> {}:
     return binance_funds
 
 
-def on_balance_update(res: []) -> {}:
+def on_balance_update(res: list) -> dict:
     return {
         'e': 'balanceUpdate',
         'E': res[3],
@@ -481,7 +468,7 @@ def on_balance_update(res: []) -> {}:
     }
 
 
-def on_order_update(res: [], _order: {}) -> {}:
+def on_order_update(res: list, _order: {}) -> dict:
     # logger.info(f"on_order_update.res: {res}, order: {_order}")
     side = 'BUY' if res[7] > 0 else 'SELL'
     #
@@ -548,7 +535,7 @@ def on_order_update(res: [], _order: {}) -> {}:
     }
 
 
-def on_order_trade(_order: {}) -> {}:
+def on_order_trade(_order: dict) -> dict:
     # logger.info(f"on_order_trade._order: {_order}")
     event = _order['lastEvent']
     orig_qty = _order['origQty']
@@ -604,7 +591,7 @@ def on_order_trade(_order: {}) -> {}:
     }
 
 
-def funding_wallet(res: []) -> []:
+def funding_wallet(res: list) -> list:
     balances = []
     for balance in res:
         if balance[0] in ('exchange', 'funding'):
@@ -621,7 +608,6 @@ def funding_wallet(res: []) -> []:
                     "btcValuation": "0.0",
                 }
                 balances.append(_binance_res)
-
     return balances
 
 

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/exchanges_wrapper/parsers/bybit.py

@@ -17,7 +17,6 @@ class OrderBook:
         self.asks = {i[0]: i[1] for i in snapshot["a"]}
         self.bids = {i[0]: i[1] for i in snapshot["b"]}
 
-    # noinspection PyTypeChecker
     def get_book(self) -> dict:
         return {
             'stream': f"{self.symbol}@depth5",
@@ -541,7 +540,7 @@ def on_balance_update(data_in: list, ts: str, symbol: str, mode: str, uid=None)
     return data_out
 
 
-def funding_wallet(res: []) -> []:
+def funding_wallet(res: list) -> list:
     balances = []
     for balance in res:
         _free = Decimal(balance["transferBalance"])
@@ -559,7 +558,7 @@ def funding_wallet(res: []) -> []:
     return balances
 
 
-def order_trade_list(res: []) -> []:
+def order_trade_list(res: list) -> list:
     trades = []
     for trade in reversed(res):
         trades.append(

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/exchanges_wrapper/parsers/huobi.py

@@ -79,7 +79,7 @@ def exchange_info(server_time: int, _symbol_params) -> {}:
     }
 
 
-def orders(res: [], response_type=None) -> []:
+def orders(res: list, response_type=None) -> list:
     binance_orders = []
     for _order in res:
         i_order = order(_order, response_type=response_type)
@@ -341,7 +341,7 @@ def interval2value(_interval) -> int:
     return resolution.get(_interval, 0)
 
 
-def klines(res: [], _interval: str) -> []:
+def klines(res: list, _interval: str) -> list:
     binance_klines = []
     for i in res:
         start_time = i.get('id') * 1000
@@ -363,7 +363,7 @@ def klines(res: [], _interval: str) -> []:
     return binance_klines
 
 
-def candle(res: [], symbol: str = None, ch_type: str = None) -> {}:
+def candle(res: dict, symbol: str = None, ch_type: str = None) -> {}:
     tick = res.get('tick')
     start_time = tick.get('id')
     _interval = ch_type.split('_')[1]
@@ -473,7 +473,7 @@ def on_order_update(_order: {}) -> {}:
     }
 
 
-def account_trade_list(res: []) -> []:
+def account_trade_list(res: list) -> list:
     binance_trade_list = []
     for trade in res:
         price = trade['price']

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/exchanges_wrapper/parsers/okx.py

@@ -8,12 +8,13 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-def fetch_server_time(res: []) -> {}:
+def fetch_server_time(res: list) -> dict | None:
     if res:
         return {'serverTime': int(res[0].get('ts'))}
+    return None
 
 
-def exchange_info(server_time: int, trading_symbol: [], tickers: [], symbol_t) -> {}:
+def exchange_info(server_time: int, trading_symbol: list, tickers: list, symbol_t) -> {}:
     symbols = []
     symbols_price = {}
     for pair in tickers:
@@ -88,7 +89,7 @@ def exchange_info(server_time: int, trading_symbol: [], tickers: [], symbol_t) -
     }
 
 
-def orders(res: [], response_type=None) -> []:
+def orders(res: list, response_type=None) -> list:
     binance_orders = []
     for _order in res:
         i_order = order(_order, response_type=response_type)
@@ -201,7 +202,7 @@ def place_order_response(res: {}, req: {}) -> {}:
     }
 
 
-def account_information(res: [], u_time: str) -> {}:
+def account_balances(res: list) -> dict:
     balances = []
     for asset in res:
         _binance_res = {
@@ -210,24 +211,10 @@ def account_information(res: [], u_time: str) -> {}:
             "locked": asset.get('frozenBal'),
         }
         balances.append(_binance_res)
-
-    return {
-        "makerCommission": 0,
-        "takerCommission": 0,
-        "buyerCommission": 0,
-        "sellerCommission": 0,
-        "canTrade": True,
-        "canWithdraw": False,
-        "canDeposit": False,
-        "brokered": False,
-        "updateTime": int(u_time),
-        "accountType": "SPOT",
-        "balances": balances,
-        "permissions": ["SPOT"],
-    }
+    return {"balances": balances}
 
 
-def order_book(res: {}) -> {}:
+def order_book(res: dict) -> dict:
     asks = []
     bids = []
     binance_order_book = {"lastUpdateId": int(res.get('ts'))}
@@ -313,7 +300,7 @@ def interval(_interval: str) -> str:
     return resolution.get(_interval, 0)
 
 
-def klines(res: [], _interval: str) -> []:
+def klines(res: list, _interval: str) -> list:
     binance_klines = []
     for i in res:
         start_time = int(i[0])
@@ -352,7 +339,7 @@ def interval2value(_interval: str) -> int:
     return resolution.get(_interval, 0)
 
 
-def candle(res: [], symbol: str = None, ch_type: str = None) -> {}:
+def candle(res: list, symbol: str = None, ch_type: str = None) -> {}:
     symbol = symbol.replace('-', '').lower()
     start_time = int(res[0])
     _interval = ch_type.replace('kline_', '')
@@ -491,7 +478,7 @@ def on_balance_update(res: list, buffer: dict, transfer: bool) -> ():
     return res_diff, buffer
 
 
-def funding_wallet(res: []) -> []:
+def funding_wallet(res: list) -> list:
     balances = []
     for balance in res:
         _binance_res = {
@@ -506,7 +493,7 @@ def funding_wallet(res: []) -> []:
     return balances
 
 
-def order_trade_list(res: []) -> []:
+def order_trade_list(res: list) -> list:
     binance_trade_list = []
     for trade in res:
         price = trade['fillPx']

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/exchanges_wrapper/web_sockets.py

@@ -1,5 +1,6 @@
 import sys
 import asyncio
+# noinspection PyPackageRequirements
 import ujson as json
 import logging.handlers
 from pathlib import Path
@@ -8,14 +9,16 @@ from decimal import Decimal
 import gzip
 from datetime import datetime, timezone
 
+# noinspection PyPackageRequirements
 from websockets.asyncio.client import connect
+# noinspection PyPackageRequirements
 from websockets import ConnectionClosed
 
 import exchanges_wrapper.parsers.bitfinex as bfx
 import exchanges_wrapper.parsers.huobi as hbp
 import exchanges_wrapper.parsers.okx as okx
 import exchanges_wrapper.parsers.bybit as bbt
-from crypto_ws_api.ws_session import generate_signature, compose_htx_ws_auth
+from crypto_ws_api.ws_session import generate_signature, compose_htx_ws_auth, compose_binance_ws_auth
 from exchanges_wrapper import LOG_PATH
 
 logger = logging.getLogger(__name__)
@@ -55,7 +58,7 @@ class EventsDataStream:
         async for self.websocket in connect(
                 self.endpoint,
                 logger=logger,
-                ping_interval=None if self.exchange == 'huobi' else 20
+                ping_interval=None if self.exchange in ('binance', 'huobi') else 20
         ):
             start_time = datetime.now(timezone.utc).replace(tzinfo=None)
             try:
@@ -100,7 +103,14 @@ class EventsDataStream:
     async def _handle_messages(self, msg, symbol=None, ch_type=str()):
         msg_data = json.loads(msg if isinstance(msg, str) else gzip.decompress(msg))
         if self.exchange == 'binance':
-            await self._handle_event(msg_data)
+            if "stream" in msg_data:
+                await self._handle_event(msg_data)
+            elif event := msg_data.get("event"):
+                await self._handle_event(event)
+            elif msg_data.get("status") == 200:
+                result = msg_data.get("result")
+                if isinstance(result, dict) and not result:
+                    self.wss_started = True
         elif self.exchange == 'bybit':
             if _data := msg_data.get('data'):
                 if ch_type == 'depth5':
@@ -368,7 +378,7 @@ class MarketEventsDataStream(EventsDataStream):
                 content = self._order_book.get_book()
         #
         stream_name = None
-        if isinstance(content, dict) and "stream" in content:
+        if isinstance(content, dict):
             stream_name = content["stream"]
             content = content["data"]
             content["stream"] = stream_name
@@ -593,33 +603,21 @@ class BBTPrivateEventsDataStream(EventsDataStream):
 
 
 class UserEventsDataStream(EventsDataStream):
-    def __init__(self, client, endpoint, exchange, trade_id):
-        super().__init__(client, endpoint, exchange, trade_id)
-        self.listen_key = None
-
-    async def async_init(self):
-        self.listen_key = (await self.client.create_listen_key())["listenKey"]
-        self.endpoint = f"{self.endpoint}/ws/{self.listen_key}"
-        self.wss_started = True
-        return self
-
-    def __await__(self):
-        return self.async_init().__await__()
-
-    async def _heartbeat(self, listen_key, interval=60 * 30):
-        # 30 minutes is recommended according to
-        # https://github.com/binance-exchange/binance-official-api-docs/blob/master/user-data-stream.md#pingkeep-alive-a-listenkey
-        while True:
-            await asyncio.sleep(interval)
-            await self.client.keep_alive_listen_key(listen_key)
 
     async def start_wss(self):
-        logger.info(f"Start User WSS for {self.exchange}")
-        self.tasks_manage(self._heartbeat(self.listen_key))
-        try:
-            await self.ws_listener()
-        finally:
-            self.tasks_cancel()
+        await self.websocket.send(
+            json.dumps(
+                compose_binance_ws_auth(self.trade_id, self.client.api_key, self.client.api_secret)
+            )
+        )
+        await asyncio.sleep(0)
+        await self._handle_messages(await self.websocket.recv())
+        #
+        request = {
+            "id": self.trade_id,
+            "method": "userDataStream.subscribe"
+        }
+        await self.ws_listener(request)
 
     async def _handle_event(self, content):
         # logger.debug(f"UserEventsDataStream._handle_event.content: {content}")

{exchanges_wrapper-2.1.33 → exchanges_wrapper-2.1.34}/pyproject.toml

@@ -14,13 +14,13 @@ classifiers=["Programming Language :: Python :: 3",
              "Operating System :: Microsoft :: Windows",
              "Operating System :: MacOS"]
 dynamic = ["version", "description"]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 dependencies = [
-    "crypto-ws-api==2.0.19",
+    "crypto-ws-api==2.0.20",
     "pyotp==2.9.0",
     "simplejson==3.20.1",
-    "aiohttp~=3.11.14",
+    "aiohttp~=3.11.18",
     "expiringdict~=1.2.2",
     "betterproto==2.0.0b7",
     "grpclib~=0.4.7"