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

ccxt/pro/lbank.py

@@ -26,6 +26,7 @@ class lbank(ccxt.async_support.lbank):
                 'watchTicker': True,
                 'watchTickers': False,
                 'watchTrades': True,
+                'watchTradesForSymbols': False,
                 'watchMyTrades': False,
                 'watchOrders': True,
                 'watchOrderBook': True,
@@ -66,7 +67,9 @@ class lbank(ccxt.async_support.lbank):
 
     async def fetch_ohlcv_ws(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
         """
-        :see: https://www.lbank.com/en-US/docs/index.html#request-amp-subscription-instruction
+
+        https://www.lbank.com/en-US/docs/index.html#request-amp-subscription-instruction
+
         watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
         :param str symbol: unified symbol of the market to fetch OHLCV data for
         :param str timeframe: the length of time each candle represents
@@ -82,7 +85,7 @@ class lbank(ccxt.async_support.lbank):
         timeframes = self.safe_value(watchOHLCVOptions, 'timeframes', {})
         timeframeId = self.safe_string(timeframes, timeframe, timeframe)
         messageHash = 'fetchOHLCV:' + market['symbol'] + ':' + timeframeId
-        message = {
+        message: dict = {
             'action': 'request',
             'request': 'kbar',
             'kbar': timeframeId,
@@ -98,7 +101,9 @@ class lbank(ccxt.async_support.lbank):
 
     async def watch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
         """
-        :see: https://www.lbank.com/en-US/docs/index.html#subscription-of-k-line-data
+
+        https://www.lbank.com/en-US/docs/index.html#subscription-of-k-line-data
+
         watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
         :param str symbol: unified symbol of the market to fetch OHLCV data for
         :param str timeframe: the length of time each candle represents
@@ -114,7 +119,7 @@ class lbank(ccxt.async_support.lbank):
         timeframeId = self.safe_string(timeframes, timeframe, timeframe)
         messageHash = 'ohlcv:' + market['symbol'] + ':' + timeframeId
         url = self.urls['api']['ws']
-        subscribe = {
+        subscribe: dict = {
             'action': 'subscribe',
             'subscribe': 'kbar',
             'kbar': timeframeId,
@@ -227,9 +232,11 @@ class lbank(ccxt.async_support.lbank):
             messageHash = 'ohlcv:' + symbol + ':' + timeframeId
             client.resolve(stored, messageHash)
 
-    async def fetch_ticker_ws(self, symbol, params={}) -> Ticker:
+    async def fetch_ticker_ws(self, symbol: str, params={}) -> Ticker:
         """
-        :see: https://www.lbank.com/en-US/docs/index.html#request-amp-subscription-instruction
+
+        https://www.lbank.com/en-US/docs/index.html#request-amp-subscription-instruction
+
         fetches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
         :param str symbol: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the cex api endpoint
@@ -239,7 +246,7 @@ class lbank(ccxt.async_support.lbank):
         market = self.market(symbol)
         url = self.urls['api']['ws']
         messageHash = 'fetchTicker:' + market['symbol']
-        message = {
+        message: dict = {
             'action': 'request',
             'request': 'tick',
             'pair': market['id'],
@@ -250,7 +257,9 @@ class lbank(ccxt.async_support.lbank):
 
     async def watch_ticker(self, symbol: str, params={}) -> Ticker:
         """
-        :see: https://www.lbank.com/en-US/docs/index.html#market
+
+        https://www.lbank.com/en-US/docs/index.html#market
+
         watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
         :param str symbol: unified symbol of the market to fetch the ticker for
         :param dict params: extra parameters specific to the lbank api endpoint
@@ -260,7 +269,7 @@ class lbank(ccxt.async_support.lbank):
         market = self.market(symbol)
         url = self.urls['api']['ws']
         messageHash = 'ticker:' + market['symbol']
-        message = {
+        message: dict = {
             'action': 'subscribe',
             'subscribe': 'tick',
             'pair': market['id'],
@@ -352,7 +361,9 @@ class lbank(ccxt.async_support.lbank):
     async def fetch_trades_ws(self, symbol: str, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         get the list of most recent trades for a particular symbol
-        :see: https://www.lbank.com/en-US/docs/index.html#request-amp-subscription-instruction
+
+        https://www.lbank.com/en-US/docs/index.html#request-amp-subscription-instruction
+
         :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
@@ -365,7 +376,7 @@ class lbank(ccxt.async_support.lbank):
         messageHash = 'fetchTrades:' + market['symbol']
         if limit is None:
             limit = 10
-        message = {
+        message: dict = {
             'action': 'request',
             'request': 'trade',
             'pair': market['id'],
@@ -377,7 +388,9 @@ class lbank(ccxt.async_support.lbank):
 
     async def watch_trades(self, symbol: str, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
-        :see: https://www.lbank.com/en-US/docs/index.html#trade-record
+
+        https://www.lbank.com/en-US/docs/index.html#trade-record
+
         get the list of most recent trades for a particular symbol
         :param str symbol: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
@@ -389,7 +402,7 @@ class lbank(ccxt.async_support.lbank):
         market = self.market(symbol)
         url = self.urls['api']['ws']
         messageHash = 'trades:' + market['symbol']
-        message = {
+        message: dict = {
             'action': 'subscribe',
             'subscribe': 'trade',
             'pair': market['id'],
@@ -482,7 +495,9 @@ class lbank(ccxt.async_support.lbank):
 
     async def watch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
-        :see: https://github.com/LBank-exchange/lbank-official-api-docs/blob/master/API-For-Spot-EN/WebSocket%20API(Asset%20%26%20Order).md#websocketsubscribeunsubscribe
+
+        https://www.lbank.com/en-US/docs/index.html#update-subscribed-orders
+
         get the list of trades associated with the user
         :param str [symbol]: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
@@ -502,7 +517,7 @@ class lbank(ccxt.async_support.lbank):
             symbol = self.symbol(symbol)
             messageHash = 'orders:' + market['symbol']
             pair = market['id']
-        message = {
+        message: dict = {
             'action': 'subscribe',
             'subscribe': 'orderUpdate',
             'subscribeKey': key,
@@ -628,7 +643,7 @@ class lbank(ccxt.async_support.lbank):
         }, market)
 
     def parse_ws_order_status(self, status):
-        statuses = {
+        statuses: dict = {
             '-1': 'canceled',  # Withdrawn
             '0': 'open',   # Unsettled
             '1': 'open',   # Partial sale
@@ -639,7 +654,9 @@ class lbank(ccxt.async_support.lbank):
 
     async def fetch_order_book_ws(self, symbol: str, limit: Int = None, params={}) -> OrderBook:
         """
-        :see: https://www.lbank.com/en-US/docs/index.html#request-amp-subscription-instruction
+
+        https://www.lbank.com/en-US/docs/index.html#request-amp-subscription-instruction
+
         watches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
         :param str symbol: unified symbol of the market to fetch the order book for
         :param int|None limit: the maximum amount of order book entries to return
@@ -652,7 +669,7 @@ class lbank(ccxt.async_support.lbank):
         messageHash = 'fetchOrderbook:' + market['symbol']
         if limit is None:
             limit = 100
-        subscribe = {
+        subscribe: dict = {
             'action': 'request',
             'request': 'depth',
             'depth': limit,
@@ -664,8 +681,9 @@ class lbank(ccxt.async_support.lbank):
 
     async def watch_order_book(self, symbol: str, limit: Int = None, params={}) -> OrderBook:
         """
-        :see: https://www.lbank.com/en-US/docs/index.html#market-depth
-        :see: https://www.lbank.com/en-US/docs/index.html#market-increment-depth
+
+        https://www.lbank.com/en-US/docs/index.html#market-depth
+
         watches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
         :param str symbol: unified symbol of the market to fetch the order book for
         :param int|None limit: the maximum amount of order book entries to return
@@ -679,7 +697,7 @@ class lbank(ccxt.async_support.lbank):
         params = self.omit(params, 'aggregation')
         if limit is None:
             limit = 100
-        subscribe = {
+        subscribe: dict = {
             'action': 'subscribe',
             'subscribe': 'depth',
             'depth': limit,
@@ -751,10 +769,10 @@ class lbank(ccxt.async_support.lbank):
         orderBook = self.safe_value(message, 'depth', message)
         datetime = self.safe_string(message, 'TS')
         timestamp = self.parse8601(datetime)
-        orderbook = self.safe_value(self.orderbooks, symbol)
-        if orderbook is None:
-            orderbook = self.order_book({})
-            self.orderbooks[symbol] = orderbook
+        # orderbook = self.safe_value(self.orderbooks, symbol)
+        if not (symbol in self.orderbooks):
+            self.orderbooks[symbol] = self.order_book({})
+        orderbook = self.orderbooks[symbol]
         snapshot = self.parse_order_book(orderBook, symbol, timestamp, 'bids', 'asks')
         orderbook.reset(snapshot)
         messageHash = 'orderbook:' + symbol
@@ -780,10 +798,13 @@ class lbank(ccxt.async_support.lbank):
         #  {ping: 'a13a939c-5f25-4e06-9981-93cb3b890707', action: 'ping'}
         #
         pingId = self.safe_string(message, 'ping')
-        await client.send({
-            'action': 'pong',
-            'pong': pingId,
-        })
+        try:
+            await client.send({
+                'action': 'pong',
+                'pong': pingId,
+            })
+        except Exception as e:
+            self.on_error(client, e)
 
     def handle_message(self, client, message):
         status = self.safe_string(message, 'status')
@@ -794,7 +815,7 @@ class lbank(ccxt.async_support.lbank):
         if type == 'ping':
             self.spawn(self.handle_ping, client, message)
             return
-        handlers = {
+        handlers: dict = {
             'kbar': self.handle_ohlcv,
             'depth': self.handle_order_book,
             'trade': self.handle_trades,
@@ -829,7 +850,7 @@ class lbank(ccxt.async_support.lbank):
         else:
             expires = self.safe_integer(authenticated, 'expires', 0)
             if expires < now:
-                request = {
+                request: dict = {
                     'subscribeKey': authenticated['key'],
                 }
                 response = await self.spotPrivatePostSubscribeRefreshKey(self.extend(request, params))

ccxt/pro/luno.py

@@ -19,6 +19,7 @@ class luno(ccxt.async_support.luno):
                 'watchTicker': False,
                 'watchTickers': False,
                 'watchTrades': True,
+                'watchTradesForSymbols': False,
                 'watchMyTrades': False,
                 'watchOrders': None,  # is in beta
                 'watchOrderBook': True,
@@ -41,7 +42,9 @@ class luno(ccxt.async_support.luno):
     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
-        :see: https://www.luno.com/en/developers/api#tag/Streaming-API
+
+        https://www.luno.com/en/developers/api#tag/Streaming-API
+
         :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
@@ -53,10 +56,10 @@ class luno(ccxt.async_support.luno):
         market = self.market(symbol)
         symbol = market['symbol']
         subscriptionHash = '/stream/' + market['id']
-        subscription = {'symbol': symbol}
+        subscription: dict = {'symbol': symbol}
         url = self.urls['api']['ws'] + subscriptionHash
         messageHash = 'trades:' + symbol
-        subscribe = {
+        subscribe: dict = {
             'api_key_id': self.apiKey,
             'api_key_secret': self.secret,
         }
@@ -144,10 +147,10 @@ class luno(ccxt.async_support.luno):
         market = self.market(symbol)
         symbol = market['symbol']
         subscriptionHash = '/stream/' + market['id']
-        subscription = {'symbol': symbol}
+        subscription: dict = {'symbol': symbol}
         url = self.urls['api']['ws'] + subscriptionHash
         messageHash = 'orderbook:' + symbol
-        subscribe = {
+        subscribe: dict = {
             'api_key_id': self.apiKey,
             'api_key_secret': self.secret,
         }
@@ -190,11 +193,10 @@ class luno(ccxt.async_support.luno):
         #
         symbol = subscription['symbol']
         messageHash = 'orderbook:' + symbol
-        timestamp = self.safe_string(message, 'timestamp')
-        orderbook = self.safe_value(self.orderbooks, symbol)
-        if orderbook is None:
-            orderbook = self.indexed_order_book({})
-            self.orderbooks[symbol] = orderbook
+        timestamp = self.safe_integer(message, 'timestamp')
+        if not (symbol in self.orderbooks):
+            self.orderbooks[symbol] = self.indexed_order_book({})
+        orderbook = self.orderbooks[symbol]
         asks = self.safe_value(message, 'asks')
         if asks is not None:
             snapshot = self.custom_parse_order_book(message, symbol, timestamp, 'bids', 'asks', 'price', 'volume', 'id')