ccxt 4.2.77__py2.py3-none-any.whl → 4.4.48__py2.py3-none-any.whl

ccxt/pro/wazirx.py

@@ -22,6 +22,7 @@ class wazirx(ccxt.async_support.wazirx):
                 'watchTicker': True,
                 'watchTickers': True,
                 'watchTrades': True,
+                'watchTradesForSymbols': False,
                 'watchMyTrades': True,
                 'watchOrders': True,
                 'watchOrderBook': True,
@@ -50,7 +51,9 @@ class wazirx(ccxt.async_support.wazirx):
     async def watch_balance(self, params={}) -> Balances:
         """
         watch balance and get the amount of funds available for trading or funds locked in orders
-        :see: https://docs.wazirx.com/#account-update
+
+        https://docs.wazirx.com/#account-update
+
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
         """
@@ -58,7 +61,7 @@ class wazirx(ccxt.async_support.wazirx):
         token = await self.authenticate(params)
         messageHash = 'balance'
         url = self.urls['api']['ws']
-        subscribe = {
+        subscribe: dict = {
             'event': 'subscribe',
             'streams': ['outboundAccountPosition'],
             'auth_key': token,
@@ -166,7 +169,9 @@ class wazirx(ccxt.async_support.wazirx):
     async def watch_ticker(self, symbol: str, params={}) -> Ticker:
         """
         watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
-        :see: https://docs.wazirx.com/#all-market-tickers-stream
+
+        https://docs.wazirx.com/#all-market-tickers-stream
+
         :param str symbol: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
@@ -177,7 +182,7 @@ class wazirx(ccxt.async_support.wazirx):
         messageHash = 'ticker:' + market['symbol']
         subscribeHash = 'tickers'
         stream = '!' + 'ticker@arr'
-        subscribe = {
+        subscribe: dict = {
             'event': 'subscribe',
             'streams': [stream],
         }
@@ -187,7 +192,9 @@ class wazirx(ccxt.async_support.wazirx):
     async def watch_tickers(self, symbols: Strings = None, params={}) -> Tickers:
         """
         watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for all markets of a specific list
-        :see: https://docs.wazirx.com/#all-market-tickers-stream
+
+        https://docs.wazirx.com/#all-market-tickers-stream
+
         :param str[] symbols: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
@@ -197,7 +204,7 @@ class wazirx(ccxt.async_support.wazirx):
         url = self.urls['api']['ws']
         messageHash = 'tickers'
         stream = '!' + 'ticker@arr'
-        subscribe = {
+        subscribe: dict = {
             'event': 'subscribe',
             'streams': [stream],
         }
@@ -283,6 +290,9 @@ class wazirx(ccxt.async_support.wazirx):
     async def watch_trades(self, symbol: str, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         get the list of most recent trades for a particular symbol
+
+        https://docs.wazirx.com/#trade-streams
+
         :param str symbol: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
         :param int [limit]: the maximum amount of trades to fetch
@@ -294,7 +304,7 @@ class wazirx(ccxt.async_support.wazirx):
         symbol = market['symbol']
         messageHash = market['id'] + '@trades'
         url = self.urls['api']['ws']
-        message = {
+        message: dict = {
             'event': 'subscribe',
             'streams': [messageHash],
         }
@@ -343,7 +353,9 @@ class wazirx(ccxt.async_support.wazirx):
     async def watch_my_trades(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         watch trades by user
-        :see: https://docs.wazirx.com/#trade-update
+
+        https://docs.wazirx.com/#trade-update
+
         :param str symbol: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
         :param int [limit]: the maximum amount of trades to fetch
@@ -357,7 +369,7 @@ class wazirx(ccxt.async_support.wazirx):
             symbol = market['symbol']
         url = self.urls['api']['ws']
         messageHash = 'myTrades'
-        message = {
+        message: dict = {
             'event': 'subscribe',
             'streams': ['ownTrade'],
             'auth_key': token,
@@ -371,6 +383,9 @@ class wazirx(ccxt.async_support.wazirx):
     async def watch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
         """
         watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+
+        https://docs.wazirx.com/#kline-candlestick-stream
+
         :param str symbol: unified symbol of the market to fetch OHLCV data for
         :param str timeframe: the length of time each candle represents
         :param int [since]: timestamp in ms of the earliest candle to fetch
@@ -384,7 +399,7 @@ class wazirx(ccxt.async_support.wazirx):
         url = self.urls['api']['ws']
         messageHash = 'ohlcv:' + symbol + ':' + timeframe
         stream = market['id'] + '@kline_' + timeframe
-        message = {
+        message: dict = {
             'event': 'subscribe',
             'streams': [stream],
         }
@@ -455,7 +470,9 @@ class wazirx(ccxt.async_support.wazirx):
     async def watch_order_book(self, symbol: str, limit: Int = None, params={}) -> OrderBook:
         """
         watches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
-        :see: https://docs.wazirx.com/#depth-stream
+
+        https://docs.wazirx.com/#depth-stream
+
         :param str symbol: unified symbol of the market to fetch the order book for
         :param int [limit]: the maximum amount of order book entries to return
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -467,7 +484,7 @@ class wazirx(ccxt.async_support.wazirx):
         url = self.urls['api']['ws']
         messageHash = 'orderbook:' + symbol
         stream = market['id'] + '@depth'
-        subscribe = {
+        subscribe: dict = {
             'event': 'subscribe',
             'streams': [stream],
         }
@@ -505,20 +522,20 @@ class wazirx(ccxt.async_support.wazirx):
         market = self.safe_market(marketId)
         symbol = market['symbol']
         messageHash = 'orderbook:' + symbol
-        currentOrderBook = self.safe_value(self.orderbooks, symbol)
-        if currentOrderBook is None:
+        # currentOrderBook = self.safe_value(self.orderbooks, symbol)
+        if not (symbol in self.orderbooks):
             snapshot = self.parse_order_book(data, symbol, timestamp, 'b', 'a')
-            orderBook = self.order_book(snapshot)
-            self.orderbooks[symbol] = orderBook
+            self.orderbooks[symbol] = self.order_book(snapshot)
         else:
-            asks = self.safe_value(data, 'a', [])
-            bids = self.safe_value(data, 'b', [])
-            self.handle_deltas(currentOrderBook['asks'], asks)
-            self.handle_deltas(currentOrderBook['bids'], bids)
-            currentOrderBook['nonce'] = timestamp
-            currentOrderBook['timestamp'] = timestamp
-            currentOrderBook['datetime'] = self.iso8601(timestamp)
-            self.orderbooks[symbol] = currentOrderBook
+            orderbook = self.orderbooks[symbol]
+            asks = self.safe_list(data, 'a', [])
+            bids = self.safe_list(data, 'b', [])
+            self.handle_deltas(orderbook['asks'], asks)
+            self.handle_deltas(orderbook['bids'], bids)
+            orderbook['nonce'] = timestamp
+            orderbook['timestamp'] = timestamp
+            orderbook['datetime'] = self.iso8601(timestamp)
+            self.orderbooks[symbol] = orderbook
         client.resolve(self.orderbooks[symbol], messageHash)
 
     async def watch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
@@ -528,7 +545,7 @@ class wazirx(ccxt.async_support.wazirx):
             symbol = market['symbol']
         token = await self.authenticate(params)
         messageHash = 'orders'
-        message = {
+        message: dict = {
             'event': 'subscribe',
             'streams': ['orderUpdate'],
             'auth_key': token,
@@ -701,7 +718,7 @@ class wazirx(ccxt.async_support.wazirx):
             self.handle_error(client, message)
             return
         event = self.safe_string(message, 'event')
-        eventHandlers = {
+        eventHandlers: dict = {
             'error': self.handle_error,
             'connected': self.handle_connected,
             'subscribed': self.handle_subscribed,
@@ -711,7 +728,7 @@ class wazirx(ccxt.async_support.wazirx):
             eventHandler(client, message)
             return
         stream = self.safe_string(message, 'stream', '')
-        streamHandlers = {
+        streamHandlers: dict = {
             'ticker@arr': self.handle_ticker,
             '@depth': self.handle_order_book,
             '@kline': self.handle_ohlcv,
@@ -722,7 +739,8 @@ class wazirx(ccxt.async_support.wazirx):
         }
         streams = list(streamHandlers.keys())
         for i in range(0, len(streams)):
-            if self.in_array(streams[i], stream):
+            streamContains = stream.find(streams[i]) > -1
+            if streamContains:
                 handler = streamHandlers[streams[i]]
                 handler(client, message)
                 return

ccxt/pro/whitebit.py

@@ -5,12 +5,12 @@
 
 import ccxt.async_support
 from ccxt.async_support.base.ws.cache import ArrayCache, ArrayCacheBySymbolById, ArrayCacheByTimestamp
-from ccxt.base.types import Balances, Int, Order, OrderBook, Str, Ticker, Trade
+from ccxt.base.types import Balances, Int, Order, OrderBook, Str, Strings, Ticker, Tickers, Trade
 from ccxt.async_support.base.ws.client import Client
 from typing import List
+from ccxt.base.errors import AuthenticationError
 from ccxt.base.errors import ArgumentsRequired
 from ccxt.base.errors import BadRequest
-from ccxt.base.errors import AuthenticationError
 from ccxt.base.precise import Precise
 
 
@@ -26,7 +26,9 @@ class whitebit(ccxt.async_support.whitebit):
                 'watchOrderBook': True,
                 'watchOrders': True,
                 'watchTicker': True,
+                'watchTickers': True,
                 'watchTrades': True,
+                'watchTradesForSymbols': False,
             },
             'urls': {
                 'api': {
@@ -67,6 +69,9 @@ class whitebit(ccxt.async_support.whitebit):
     async def watch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
         """
         watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+
+        https://docs.whitebit.com/public/websocket/#kline
+
         :param str symbol: unified symbol of the market to fetch OHLCV data for
         :param str timeframe: the length of time each candle represents
         :param int [since]: timestamp in ms of the earliest candle to fetch
@@ -135,6 +140,9 @@ class whitebit(ccxt.async_support.whitebit):
     async def watch_order_book(self, symbol: str, limit: Int = None, params={}) -> OrderBook:
         """
         watches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
+
+        https://docs.whitebit.com/public/websocket/#market-depth
+
         :param str symbol: unified symbol of the market to fetch the order book for
         :param int [limit]: the maximum amount of order book entries to return
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -233,6 +241,9 @@ class whitebit(ccxt.async_support.whitebit):
     async def watch_ticker(self, symbol: str, params={}) -> Ticker:
         """
         watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+
+        https://docs.whitebit.com/public/websocket/#market-statistics
+
         :param str symbol: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
@@ -245,6 +256,35 @@ class whitebit(ccxt.async_support.whitebit):
         # every time we want to subscribe to another market we have to "re-subscribe" sending it all again
         return await self.watch_multiple_subscription(messageHash, method, symbol, False, params)
 
+    async def watch_tickers(self, symbols: Strings = None, params={}) -> Tickers:
+        """
+        watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for all markets of a specific list
+
+        https://docs.whitebit.com/public/websocket/#market-statistics
+
+        :param str[] [symbols]: unified symbol of the market to fetch the ticker for
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
+        """
+        await self.load_markets()
+        symbols = self.market_symbols(symbols, None, False)
+        method = 'market_subscribe'
+        url = self.urls['api']['ws']
+        id = self.nonce()
+        messageHashes = []
+        args = []
+        for i in range(0, len(symbols)):
+            market = self.market(symbols[i])
+            messageHashes.append('ticker:' + market['symbol'])
+            args.append(market['id'])
+        request: dict = {
+            'id': id,
+            'method': method,
+            'params': args,
+        }
+        await self.watch_multiple(url, messageHashes, self.extend(request, params), messageHashes)
+        return self.filter_by_array(self.tickers, 'symbol', symbols)
+
     def handle_ticker(self, client: Client, message):
         #
         #   {
@@ -295,6 +335,9 @@ class whitebit(ccxt.async_support.whitebit):
     async def watch_trades(self, symbol: str, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         get the list of most recent trades for a particular symbol
+
+        https://docs.whitebit.com/public/websocket/#market-trades
+
         :param str symbol: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
         :param int [limit]: the maximum amount of trades to fetch
@@ -356,6 +399,9 @@ class whitebit(ccxt.async_support.whitebit):
     async def watch_my_trades(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         watches trades made by the user
+
+        https://docs.whitebit.com/private/websocket/#deals
+
         :param str symbol: unified market symbol
         :param int [since]: the earliest time in ms to fetch trades for
         :param int [limit]: the maximum number of trades structures to retrieve
@@ -449,11 +495,14 @@ class whitebit(ccxt.async_support.whitebit):
     async def watch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
         watches information on multiple orders made by the user
+
+        https://docs.whitebit.com/private/websocket/#orders-pending
+
         :param str symbol: unified market symbol of the market orders were made in
         :param int [since]: the earliest time in ms to fetch orders for
         :param int [limit]: the maximum number of order structures to retrieve
         :param dict [params]: extra parameters specific to the exchange API endpoint
-        :returns dict[]: a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure
+        :returns dict[]: a list of `order structures <https://docs.ccxt.com/#/?id=order-structure>`
         """
         if symbol is None:
             raise ArgumentsRequired(self.id + ' watchOrders() requires a symbol argument')
@@ -596,7 +645,7 @@ class whitebit(ccxt.async_support.whitebit):
         }, market)
 
     def parse_ws_order_type(self, status):
-        statuses = {
+        statuses: dict = {
             '1': 'limit',
             '2': 'market',
             '202': 'market',
@@ -612,6 +661,10 @@ class whitebit(ccxt.async_support.whitebit):
     async def watch_balance(self, params={}) -> Balances:
         """
         watch balance and get the amount of funds available for trading or funds locked in orders
+
+        https://docs.whitebit.com/private/websocket/#balance-spot
+        https://docs.whitebit.com/private/websocket/#balance-margin
+
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :param str [params.type]: spot or contract if not provided self.options['defaultType'] is used
         :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
@@ -668,7 +721,7 @@ class whitebit(ccxt.async_support.whitebit):
     async def watch_public(self, messageHash, method, reqParams=[], params={}):
         url = self.urls['api']['ws']
         id = self.nonce()
-        request = {
+        request: dict = {
             'id': id,
             'method': method,
             'params': reqParams,
@@ -684,7 +737,7 @@ class whitebit(ccxt.async_support.whitebit):
         request = None
         marketIds = []
         if client is None:
-            subscription = {}
+            subscription: dict = {}
             market = self.market(symbol)
             marketId = market['id']
             subscription[marketId] = True
@@ -716,7 +769,7 @@ class whitebit(ccxt.async_support.whitebit):
                 marketIdsNew = list(subscription.keys())
                 if isNested:
                     marketIdsNew = [marketIdsNew]
-                resubRequest = {
+                resubRequest: dict = {
                     'id': id,
                     'method': method,
                     'params': marketIdsNew,
@@ -730,7 +783,7 @@ class whitebit(ccxt.async_support.whitebit):
         await self.authenticate()
         url = self.urls['api']['ws']
         id = self.nonce()
-        request = {
+        request: dict = {
             'id': id,
             'method': method,
             'params': reqParams,
@@ -754,7 +807,7 @@ class whitebit(ccxt.async_support.whitebit):
             #
             token = self.safe_string(authToken, 'websocket_token')
             id = self.nonce()
-            request = {
+            request: dict = {
                 'id': id,
                 'method': 'authorize',
                 'params': [
@@ -762,7 +815,7 @@ class whitebit(ccxt.async_support.whitebit):
                     'public',
                 ],
             }
-            subscription = {
+            subscription: dict = {
                 'id': id,
                 'method': self.handle_authenticate,
             }
@@ -821,7 +874,7 @@ class whitebit(ccxt.async_support.whitebit):
         if id is not None:
             self.handle_subscription_status(client, message, id)
             return
-        methods = {
+        methods: dict = {
             'market_update': self.handle_ticker,
             'trades_update': self.handle_trades,
             'depth_update': self.handle_order_book,
@@ -856,7 +909,7 @@ class whitebit(ccxt.async_support.whitebit):
         client.lastPong = self.milliseconds()
         return message
 
-    def ping(self, client):
+    def ping(self, client: Client):
         return {
             'id': 0,
             'method': 'ping',