ccxt 4.0.100__py2.py3-none-any.whl → 4.0.102__py2.py3-none-any.whl

ccxt/pro/bybit.py

@@ -353,16 +353,16 @@ class bybit(ccxt.async_support.bybit):
         firstSymbol = None
         for i in range(0, len(symbolsAndTimeframes)):
             data = symbolsAndTimeframes[i]
-            symbol = self.safe_string(data, 0)
-            timeframe = self.safe_string(data, 1)
-            market = self.market(symbol)
-            symbol = market['symbol']
+            symbolString = self.safe_string(data, 0)
+            timeframeString = self.safe_string(data, 1)
+            market = self.market(symbolString)
+            symbolString = market['symbol']
             if i == 0:
                 firstSymbol = market['symbol']
-            timeframeId = self.safe_string(self.timeframes, timeframe, timeframe)
+            timeframeId = self.safe_string(self.timeframes, timeframeString, timeframeString)
             topic = 'kline.' + timeframeId + '.' + market['id']
             topics.append(topic)
-            hashes.append(symbol + '#' + timeframe)
+            hashes.append(symbolString + '#' + timeframeString)
         messageHash = 'multipleOHLCV::' + ','.join(hashes)
         url = self.get_url_by_market_type(firstSymbol, False, params)
         symbol, timeframe, stored = await self.watch_topics(url, messageHash, topics, params)
@@ -861,8 +861,8 @@ class bybit(ccxt.async_support.bybit):
             trades.append(parsed)
         keys = list(symbols.keys())
         for i in range(0, len(keys)):
-            messageHash = 'myTrades:' + keys[i]
-            client.resolve(trades, messageHash)
+            currentMessageHash = 'myTrades:' + keys[i]
+            client.resolve(trades, currentMessageHash)
         # non-symbol specific
         messageHash = 'myTrades'
         client.resolve(trades, messageHash)
@@ -988,22 +988,22 @@ class bybit(ccxt.async_support.bybit):
         first = self.safe_value(rawOrders, 0, {})
         category = self.safe_string(first, 'category')
         isSpot = category == 'spot'
-        parser = None
-        if isSpot:
-            parser = 'parseWsSpotOrder'
-        else:
-            parser = 'parseContractOrder'
+        if not isSpot:
             rawOrders = self.safe_value(rawOrders, 'result', rawOrders)
         symbols = {}
         for i in range(0, len(rawOrders)):
-            parsed = getattr(self, parser)(rawOrders[i])
+            parsed = None
+            if isSpot:
+                parsed = self.parse_ws_spot_order(rawOrders[i])
+            else:
+                parsed = self.parse_order(rawOrders[i])
             symbol = parsed['symbol']
             symbols[symbol] = True
             orders.append(parsed)
         symbolsArray = list(symbols.keys())
         for i in range(0, len(symbolsArray)):
-            messageHash = 'orders:' + symbolsArray[i]
-            client.resolve(orders, messageHash)
+            currentMessageHash = 'orders:' + symbolsArray[i]
+            client.resolve(orders, currentMessageHash)
         messageHash = 'orders'
         client.resolve(orders, messageHash)
 

ccxt/pro/coinbasepro.py

@@ -496,11 +496,11 @@ class coinbasepro(ccxt.async_support.coinbasepro):
         #         reason: 'filled'
         #     }
         #
-        orders = self.orders
-        if orders is None:
+        currentOrders = self.orders
+        if currentOrders is None:
             limit = self.safe_integer(self.options, 'ordersLimit', 1000)
-            orders = ArrayCacheBySymbolById(limit)
-            self.orders = orders
+            currentOrders = ArrayCacheBySymbolById(limit)
+            self.orders = currentOrders
         type = self.safe_string(message, 'type')
         marketId = self.safe_string(message, 'product_id')
         if marketId is not None:
@@ -533,9 +533,9 @@ class coinbasepro(ccxt.async_support.coinbasepro):
                         totalAmount = 0
                         trades = previousOrder['trades']
                         for i in range(0, len(trades)):
-                            trade = trades[i]
-                            totalCost = self.sum(totalCost, trade['cost'])
-                            totalAmount = self.sum(totalAmount, trade['amount'])
+                            tradeEntry = trades[i]
+                            totalCost = self.sum(totalCost, tradeEntry['cost'])
+                            totalAmount = self.sum(totalAmount, tradeEntry['amount'])
                         if totalAmount > 0:
                             previousOrder['average'] = totalCost / totalAmount
                         previousOrder['cost'] = totalCost
@@ -646,12 +646,12 @@ class coinbasepro(ccxt.async_support.coinbasepro):
             client.resolve(ticker, messageHash)
             messageHashes = self.find_message_hashes(client, 'tickers::')
             for i in range(0, len(messageHashes)):
-                messageHash = messageHashes[i]
-                parts = messageHash.split('::')
+                currentMessageHash = messageHashes[i]
+                parts = currentMessageHash.split('::')
                 symbolsString = parts[1]
                 symbols = symbolsString.split(',')
                 if self.in_array(symbol, symbols):
-                    client.resolve(ticker, messageHash)
+                    client.resolve(ticker, currentMessageHash)
         return message
 
     def parse_ticker(self, ticker, market=None):

ccxt/pro/huobijp.py

@@ -316,8 +316,7 @@ class huobijp(ccxt.async_support.huobijp):
         # unroll the accumulated deltas
         messages = orderbook.cache
         for i in range(0, len(messages)):
-            message = messages[i]
-            self.handle_order_book_message(client, message, orderbook)
+            self.handle_order_book_message(client, messages[i], orderbook)
         self.orderbooks[symbol] = orderbook
         client.resolve(orderbook, messageHash)
 

ccxt/pro/krakenfutures.py

@@ -482,9 +482,9 @@ class krakenfutures(ccxt.async_support.krakenfutures):
                 totalAmount = '0'
                 trades = previousOrder['trades']
                 for i in range(0, len(trades)):
-                    trade = trades[i]
-                    totalCost = Precise.string_add(totalCost, self.number_to_string(trade['cost']))
-                    totalAmount = Precise.string_add(totalAmount, self.number_to_string(trade['amount']))
+                    currentTrade = trades[i]
+                    totalCost = Precise.string_add(totalCost, self.number_to_string(currentTrade['cost']))
+                    totalAmount = Precise.string_add(totalAmount, self.number_to_string(currentTrade['amount']))
                 if Precise.string_gt(totalAmount, '0'):
                     previousOrder['average'] = Precise.string_div(totalCost, totalAmount)
                 previousOrder['cost'] = totalCost
@@ -511,13 +511,13 @@ class krakenfutures(ccxt.async_support.krakenfutures):
             if isCancel:
                 # get order without symbol
                 for i in range(0, len(orders)):
-                    order = orders[i]
-                    if order['id'] == message['order_id']:
-                        orders[i] = self.extend(order, {
+                    currentOrder = orders[i]
+                    if currentOrder['id'] == message['order_id']:
+                        orders[i] = self.extend(currentOrder, {
                             'status': 'canceled',
                         })
                         client.resolve(orders, 'orders')
-                        client.resolve(orders, 'orders:' + order['symbol'])
+                        client.resolve(orders, 'orders:' + currentOrder['symbol'])
                         break
         return message
 

ccxt/pro/kucoin.py

@@ -21,7 +21,7 @@ class kucoin(ccxt.async_support.kucoin):
                 'watchOrderBook': True,
                 'watchOrders': True,
                 'watchMyTrades': True,
-                'watchTickers': False,  # for now
+                'watchTickers': True,
                 'watchTicker': True,
                 'watchTrades': True,
                 'watchTradesForSymbols': True,
@@ -133,6 +133,25 @@ class kucoin(ccxt.async_support.kucoin):
         messageHash = 'ticker:' + symbol
         return await self.subscribe(url, messageHash, topic, query)
 
+    async def watch_tickers(self, symbols: Optional[List[str]] = None, params={}):
+        """
+        watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for all markets of a specific list
+        :param str[] symbols: unified symbol of the market to fetch the ticker for
+        :param dict [params]: extra parameters specific to the kucoin api endpoint
+        :returns dict: a `ticker structure <https://github.com/ccxt/ccxt/wiki/Manual#ticker-structure>`
+        """
+        await self.load_markets()
+        symbols = self.market_symbols(symbols)
+        messageHash = 'tickers'
+        if symbols is not None:
+            messageHash = 'tickers::' + ','.join(symbols)
+        url = await self.negotiate(False)
+        topic = '/market/ticker:all'
+        tickers = await self.subscribe(url, messageHash, topic, params)
+        if self.newUpdates:
+            return tickers
+        return self.filter_by_array(self.tickers, 'symbol', symbols)
+
     def handle_ticker(self, client: Client, message):
         #
         # market/snapshot
@@ -192,7 +211,12 @@ class kucoin(ccxt.async_support.kucoin):
         market = None
         if topic is not None:
             parts = topic.split(':')
-            marketId = self.safe_string(parts, 1)
+            first = self.safe_string(parts, 1)
+            marketId = None
+            if first == 'all':
+                marketId = self.safe_string(message, 'subject')
+            else:
+                marketId = first
             market = self.safe_market(marketId, market, '-')
         data = self.safe_value(message, 'data', {})
         rawTicker = self.safe_value(data, 'data', data)
@@ -201,6 +225,19 @@ class kucoin(ccxt.async_support.kucoin):
         self.tickers[symbol] = ticker
         messageHash = 'ticker:' + symbol
         client.resolve(ticker, messageHash)
+        # watchTickers
+        client.resolve(ticker, 'tickers')
+        messageHashes = self.find_message_hashes(client, 'tickers::')
+        for i in range(0, len(messageHashes)):
+            currentMessageHash = messageHashes[i]
+            parts = currentMessageHash.split('::')
+            symbolsString = parts[1]
+            symbols = symbolsString.split(',')
+            tickers = self.filter_by_array(self.tickers, 'symbol', symbols)
+            tickersSymbols = list(tickers.keys())
+            numTickers = len(tickersSymbols)
+            if numTickers > 0:
+                client.resolve(tickers, currentMessageHash)
 
     async def watch_ohlcv(self, symbol: str, timeframe='1m', since: Optional[int] = None, limit: Optional[int] = None, params={}):
         """
@@ -828,6 +865,9 @@ class kucoin(ccxt.async_support.kucoin):
         #         }
         #     }
         #
+        topic = self.safe_string(message, 'topic')
+        if topic == '/market/ticker:all':
+            return self.handle_ticker(client, message)
         subject = self.safe_string(message, 'subject')
         methods = {
             'trade.l2update': self.handle_order_book,

ccxt/pro/kucoinfutures.py

@@ -369,9 +369,9 @@ class kucoinfutures(ccxt.async_support.kucoinfutures):
         deltaEnd = self.safe_integer(data, 'sequence')
         if nonce is None:
             cacheLength = len(storedOrderBook.cache)
-            topicParts = topic.split(':')
-            topicSymbol = self.safe_string(topicParts, 1)
-            topicChannel = self.safe_string(topicParts, 0)
+            topicPartsNew = topic.split(':')
+            topicSymbol = self.safe_string(topicPartsNew, 1)
+            topicChannel = self.safe_string(topicPartsNew, 0)
             subscriptions = list(client.subscriptions.keys())
             subscription = None
             for i in range(0, len(subscriptions)):

ccxt/pro/phemex.py

@@ -1343,8 +1343,8 @@ class phemex(ccxt.async_support.phemex):
             del client.subscriptions[id]
             if method is not True:
                 return method(client, message)
-        method = self.safe_string(message, 'method', '')
-        if ('market24h' in message) or ('spot_market24h' in message) or (method.find('perp_market24h_pack_p') >= 0):
+        methodName = self.safe_string(message, 'method', '')
+        if ('market24h' in message) or ('spot_market24h' in message) or (methodName.find('perp_market24h_pack_p') >= 0):
             return self.handle_ticker(client, message)
         elif ('trades' in message) or ('trades_p' in message):
             return self.handle_trades(client, message)

ccxt/test/test_async.py

@@ -695,7 +695,7 @@ class testMainClass(baseMainTestClass):
                 dump(self.add_padding('[INFO:PRIVATE_TESTS_DONE]', 25), exchange.id)
 
     async def start_test(self, exchange, symbol):
-        # we don't need to test aliases
+        # we do not need to test aliases
         if exchange.alias:
             return
         if self.sandbox or get_exchange_prop(exchange, 'sandbox'):

ccxt/test/test_sync.py

@@ -694,7 +694,7 @@ class testMainClass(baseMainTestClass):
                 dump(self.add_padding('[INFO:PRIVATE_TESTS_DONE]', 25), exchange.id)
 
     def start_test(self, exchange, symbol):
-        # we don't need to test aliases
+        # we do not need to test aliases
         if exchange.alias:
             return
         if self.sandbox or get_exchange_prop(exchange, 'sandbox'):

{ccxt-4.0.100.dist-info → ccxt-4.0.102.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ccxt
-Version: 4.0.100
+Version: 4.0.102
 Summary: A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 130+ exchanges
 Home-page: https://ccxt.com
 Author: Igor Kroitor
@@ -44,7 +44,7 @@ Requires-Dist: flake8 (==3.7.9) ; extra == 'qa'
 
 # CCXT – CryptoCurrency eXchange Trading Library
 
-[![Build Status](https://travis-ci.com/ccxt/ccxt.svg?branch=master)](https://travis-ci.com/ccxt/ccxt) [![npm](https://img.shields.io/npm/v/ccxt.svg)](https://npmjs.com/package/ccxt) [![PyPI](https://img.shields.io/pypi/v/ccxt.svg)](https://pypi.python.org/pypi/ccxt) [![NPM Downloads](https://img.shields.io/npm/dy/ccxt.svg)](https://www.npmjs.com/package/ccxt) [![Discord](https://img.shields.io/discord/690203284119617602?logo=discord&logoColor=white)](https://discord.gg/ccxt) [![Supported Exchanges](https://img.shields.io/badge/exchanges-106-blue.svg)](https://github.com/ccxt/ccxt/wiki/Exchange-Markets) [![Twitter Follow](https://img.shields.io/twitter/follow/ccxt_official.svg?style=social&label=CCXT)](https://twitter.com/ccxt_official)
+[![Build Status](https://travis-ci.com/ccxt/ccxt.svg?branch=master)](https://travis-ci.com/ccxt/ccxt) [![npm](https://img.shields.io/npm/v/ccxt.svg)](https://npmjs.com/package/ccxt) [![PyPI](https://img.shields.io/pypi/v/ccxt.svg)](https://pypi.python.org/pypi/ccxt) [![NPM Downloads](https://img.shields.io/npm/dy/ccxt.svg)](https://www.npmjs.com/package/ccxt) [![Discord](https://img.shields.io/discord/690203284119617602?logo=discord&logoColor=white)](https://discord.gg/ccxt) [![Supported Exchanges](https://img.shields.io/badge/exchanges-105-blue.svg)](https://github.com/ccxt/ccxt/wiki/Exchange-Markets) [![Twitter Follow](https://img.shields.io/twitter/follow/ccxt_official.svg?style=social&label=CCXT)](https://twitter.com/ccxt_official)
 
 A JavaScript / Python / PHP / C#  library for cryptocurrency trading and e-commerce with support for many bitcoin/ether/altcoin exchange markets and merchant APIs.
 
@@ -100,7 +100,7 @@ Current feature list:
 
 ## Supported Cryptocurrency Exchange Markets
 
-The CCXT library currently supports the following 98 cryptocurrency exchange markets and trading APIs:
+The CCXT library currently supports the following 97 cryptocurrency exchange markets and trading APIs:
 
 | logo                                                                                                                                                                                                            | id                 | name                                                                                                    | ver                                                                                                                                                | certified                                                                                                                   | pro                                                                          |
 |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|---------------------------------------------------------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------:|-----------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------|
@@ -133,7 +133,6 @@ The CCXT library currently supports the following 98 cryptocurrency exchange mar
 | [![bitstamp1](https://user-images.githubusercontent.com/1294454/27786377-8c8ab57e-5fe9-11e7-8ea4-2b05b6bcceec.jpg)](https://www.bitstamp.net)                                                                   | bitstamp1          | [Bitstamp](https://www.bitstamp.net)                                                                    | [![API Version 1](https://img.shields.io/badge/1-lightgray)](https://www.bitstamp.net/api)                                                         |                                                                                                                             |                                                                              |
 | [![bittrex](https://user-images.githubusercontent.com/51840849/87153921-edf53180-c2c0-11ea-96b9-f2a9a95a455b.jpg)](https://bittrex.com/Account/Register?referralCode=1ZE-G0G-M3B)                               | bittrex            | [Bittrex](https://bittrex.com/Account/Register?referralCode=1ZE-G0G-M3B)                                | [![API Version 3](https://img.shields.io/badge/3-lightgray)](https://bittrex.github.io/api/v3)                                                     |                                                                                                                             | [![CCXT Pro](https://img.shields.io/badge/CCXT-Pro-black)](https://ccxt.pro) |
 | [![bitvavo](https://user-images.githubusercontent.com/1294454/169202626-bd130fc5-fcf9-41bb-8d97-6093225c73cd.jpg)](https://bitvavo.com/?a=24F34952F7)                                                           | bitvavo            | [Bitvavo](https://bitvavo.com/?a=24F34952F7)                                                            | [![API Version 2](https://img.shields.io/badge/2-lightgray)](https://docs.bitvavo.com/)                                                            | [![CCXT Certified](https://img.shields.io/badge/CCXT-Certified-green.svg)](https://github.com/ccxt/ccxt/wiki/Certification) | [![CCXT Pro](https://img.shields.io/badge/CCXT-Pro-black)](https://ccxt.pro) |
-| [![bkex](https://user-images.githubusercontent.com/1294454/158043180-bb079a65-69e8-45a2-b393-f094d334e610.jpg)](https://www.bkex.com/)                                                                          | bkex               | [BKEX](https://www.bkex.com/)                                                                           | [![API Version 2](https://img.shields.io/badge/2-lightgray)](https://bkexapi.github.io/docs/api_en.htm)                                            |                                                                                                                             |                                                                              |
 | [![bl3p](https://user-images.githubusercontent.com/1294454/28501752-60c21b82-6feb-11e7-818b-055ee6d0e754.jpg)](https://bl3p.eu)                                                                                 | bl3p               | [BL3P](https://bl3p.eu)                                                                                 | [![API Version 1](https://img.shields.io/badge/1-lightgray)](https://github.com/BitonicNL/bl3p-api/tree/master/docs)                               |                                                                                                                             |                                                                              |
 | [![blockchaincom](https://user-images.githubusercontent.com/1294454/147515585-1296e91b-7398-45e5-9d32-f6121538533f.jpeg)](https://blockchain.com)                                                               | blockchaincom      | [Blockchain.com](https://blockchain.com)                                                                | [![API Version 3](https://img.shields.io/badge/3-lightgray)](https://api.blockchain.com/v3)                                                        |                                                                                                                             | [![CCXT Pro](https://img.shields.io/badge/CCXT-Pro-black)](https://ccxt.pro) |
 | [![btcalpha](https://user-images.githubusercontent.com/1294454/42625213-dabaa5da-85cf-11e8-8f99-aa8f8f7699f0.jpg)](https://btc-alpha.com/?r=123788)                                                             | btcalpha           | [BTC-Alpha](https://btc-alpha.com/?r=123788)                                                            | [![API Version 1](https://img.shields.io/badge/1-lightgray)](https://btc-alpha.github.io/api-docs)                                                 |                                                                                                                             |                                                                              |
@@ -259,13 +258,13 @@ console.log(version, Object.keys(exchanges));
 
 All-in-one browser bundle (dependencies included), served from a CDN of your choice:
 
-* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.0.100/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/ccxt@4.0.100/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.0.102/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/ccxt@4.0.102/dist/ccxt.browser.js
 
 CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.
 
 ```HTML
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.0.100/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.0.102/dist/ccxt.browser.js"></script>
 ```
 
 Creates a global `ccxt` object: