ccxt 4.2.92 → 4.2.94

package/js/src/pro/kraken.js

@@ -19,10 +19,12 @@ export default class kraken extends krakenRest {
                 'watchMyTrades': true,
                 'watchOHLCV': true,
                 'watchOrderBook': true,
+                'watchOrderBookForSymbols': true,
                 'watchOrders': true,
                 'watchTicker': true,
-                'watchTickers': false,
+                'watchTickers': true,
                 'watchTrades': true,
+                'watchTradesForSymbols': true,
                 'createOrderWs': true,
                 'editOrderWs': true,
                 'cancelOrderWs': true,
@@ -313,10 +315,9 @@ export default class kraken extends krakenRest {
         //     ]
         //
         const wsName = message[3];
-        const name = 'ticker';
-        const messageHash = name + ':' + wsName;
         const market = this.safeValue(this.options['marketsByWsName'], wsName);
         const symbol = market['symbol'];
+        const messageHash = this.getMessageHash('ticker', undefined, symbol);
         const ticker = message[1];
         const vwap = this.safeString(ticker['p'], 0);
         let quoteVolume = undefined;
@@ -347,9 +348,6 @@ export default class kraken extends krakenRest {
             'quoteVolume': quoteVolume,
             'info': ticker,
         });
-        // todo add support for multiple tickers (may be tricky)
-        // kraken confirms multi-pair subscriptions separately one by one
-        // trigger correct watchTickers calls upon receiving any of symbols
         this.tickers[symbol] = result;
         client.resolve(result, messageHash);
     }
@@ -367,9 +365,9 @@ export default class kraken extends krakenRest {
         //
         const wsName = this.safeString(message, 3);
         const name = this.safeString(message, 2);
-        const messageHash = name + ':' + wsName;
         const market = this.safeValue(this.options['marketsByWsName'], wsName);
         const symbol = market['symbol'];
+        const messageHash = this.getMessageHash(name, undefined, symbol);
         let stored = this.safeValue(this.trades, symbol);
         if (stored === undefined) {
             const limit = this.safeInteger(this.options, 'tradesLimit', 1000);
@@ -470,25 +468,61 @@ export default class kraken extends krakenRest {
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
-        return await this.watchPublic('ticker', symbol, params);
+        await this.loadMarkets();
+        symbol = this.symbol(symbol);
+        const tickers = await this.watchTickers([symbol], params);
+        return tickers[symbol];
+    }
+    async watchTickers(symbols = undefined, params = {}) {
+        /**
+         * @method
+         * @name kraken#watchTickers
+         * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+         * @param {string} symbol unified symbol of the market to fetch the ticker for
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
+         */
+        await this.loadMarkets();
+        symbols = this.marketSymbols(symbols, undefined, false);
+        const ticker = await this.watchMultiHelper('ticker', 'ticker', symbols, undefined, params);
+        if (this.newUpdates) {
+            const result = {};
+            result[ticker['symbol']] = ticker;
+            return result;
+        }
+        return this.filterByArray(this.tickers, 'symbol', symbols);
     }
     async watchTrades(symbol, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
          * @name kraken#watchTrades
          * @description get the list of most recent trades for a particular symbol
+         * @see https://docs.kraken.com/websockets/#message-trade
          * @param {string} 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
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=public-trades}
          */
-        await this.loadMarkets();
-        symbol = this.symbol(symbol);
-        const name = 'trade';
-        const trades = await this.watchPublic(name, symbol, params);
+        return await this.watchTradesForSymbols([symbol], since, limit, params);
+    }
+    async watchTradesForSymbols(symbols, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name kraken#watchTradesForSymbols
+         * @see https://docs.kraken.com/websockets/#message-trade
+         * @description get the list of most recent trades for a list of symbols
+         * @param {string[]} symbols 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
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=public-trades}
+         */
+        const trades = await this.watchMultiHelper('trade', 'trade', symbols, undefined, params);
         if (this.newUpdates) {
-            limit = trades.getLimit(symbol, limit);
+            const first = this.safeList(trades, 0);
+            const tradeSymbol = this.safeString(first, 'symbol');
+            limit = trades.getLimit(tradeSymbol, limit);
         }
         return this.filterBySinceLimit(trades, since, limit, 'timestamp', true);
     }
@@ -497,15 +531,28 @@ export default class kraken extends krakenRest {
          * @method
          * @name kraken#watchOrderBook
          * @description watches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
+         * @see https://docs.kraken.com/websockets/#message-book
          * @param {string} 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 {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
          */
-        const name = 'book';
+        return await this.watchOrderBookForSymbols([symbol], limit, params);
+    }
+    async watchOrderBookForSymbols(symbols, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name kraken#watchOrderBookForSymbols
+         * @description watches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
+         * @see https://docs.kraken.com/websockets/#message-book
+         * @param {string[]} symbols unified array of symbols
+         * @param {int} [limit] the maximum amount of order book entries to return
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
+         */
         const request = {};
         if (limit !== undefined) {
-            if ((limit === 10) || (limit === 25) || (limit === 100) || (limit === 500) || (limit === 1000)) {
+            if (this.inArray(limit, [10, 25, 100, 500, 1000])) {
                 request['subscription'] = {
                     'depth': limit, // default 10, valid options 10, 25, 100, 500, 1000
                 };
@@ -514,7 +561,7 @@ export default class kraken extends krakenRest {
                 throw new NotSupported(this.id + ' watchOrderBook accepts limit values of 10, 25, 100, 500 and 1000 only');
             }
         }
-        const orderbook = await this.watchPublic(name, symbol, this.extend(request, params));
+        const orderbook = await this.watchMultiHelper('orderbook', 'book', symbols, { 'limit': limit }, this.extend(request, params));
         return orderbook.limit();
     }
     async watchOHLCV(symbol, timeframe = '1m', since = undefined, limit = undefined, params = {}) {
@@ -643,7 +690,7 @@ export default class kraken extends krakenRest {
         const market = this.safeValue(this.options['marketsByWsName'], wsName);
         const symbol = market['symbol'];
         let timestamp = undefined;
-        const messageHash = 'book:' + wsName;
+        const messageHash = this.getMessageHash('orderbook', undefined, symbol);
         // if this is a snapshot
         if ('as' in message[1]) {
             // todo get depth from marketsByWsName
@@ -724,6 +771,7 @@ export default class kraken extends krakenRest {
                 if (localChecksum !== c) {
                     const error = new InvalidNonce(this.id + ' invalid checksum');
                     client.reject(error, messageHash);
+                    return;
                 }
             }
             orderbook['symbol'] = symbol;
@@ -1251,6 +1299,48 @@ export default class kraken extends krakenRest {
             'trades': trades,
         });
     }
+    async watchMultiHelper(unifiedName, channelName, symbols = undefined, subscriptionArgs = undefined, params = {}) {
+        await this.loadMarkets();
+        // symbols are required
+        symbols = this.marketSymbols(symbols, undefined, false, true, false);
+        const messageHashes = [];
+        for (let i = 0; i < symbols.length; i++) {
+            messageHashes.push(this.getMessageHash(unifiedName, undefined, this.symbol(symbols[i])));
+        }
+        // for WS subscriptions, we can't use .marketIds (symbols), instead a custom is field needed
+        const markets = this.marketsForSymbols(symbols);
+        const wsMarketIds = [];
+        for (let i = 0; i < markets.length; i++) {
+            const wsMarketId = this.safeString(markets[i]['info'], 'wsname');
+            wsMarketIds.push(wsMarketId);
+        }
+        const request = {
+            'event': 'subscribe',
+            'reqid': this.requestId(),
+            'pair': wsMarketIds,
+            'subscription': {
+                'name': channelName,
+            },
+        };
+        const url = this.urls['api']['ws']['public'];
+        return await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes, subscriptionArgs);
+    }
+    getMessageHash(unifiedElementName, subChannelName = undefined, symbol = undefined) {
+        // unifiedElementName can be : orderbook, trade, ticker, bidask ...
+        // subChannelName only applies to channel that needs specific variation (i.e. depth_50, depth_100..) to be selected
+        const withSymbol = symbol !== undefined;
+        let messageHash = unifiedElementName;
+        if (!withSymbol) {
+            messageHash += 's';
+        }
+        else {
+            messageHash += '@' + symbol;
+        }
+        if (subChannelName !== undefined) {
+            messageHash += '#' + subChannelName;
+        }
+        return messageHash;
+    }
     handleSubscriptionStatus(client, message) {
         //
         // public

package/js/src/pro/krakenfutures.d.ts

@@ -4,11 +4,14 @@ import Client from '../base/ws/Client.js';
 export default class krakenfutures extends krakenfuturesRest {
     describe(): any;
     authenticate(params?: {}): Promise<any>;
+    watchOrderBookForSymbols(symbols: string[], limit?: Int, params?: {}): Promise<OrderBook>;
     subscribePublic(name: string, symbols: string[], params?: {}): Promise<any>;
     subscribePrivate(name: string, messageHash: string, params?: {}): Promise<any>;
     watchTicker(symbol: string, params?: {}): Promise<Ticker>;
     watchTickers(symbols?: Strings, params?: {}): Promise<Tickers>;
+    watchBidsAsks(symbols?: Strings, params?: {}): Promise<Tickers>;
     watchTrades(symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<Trade[]>;
+    watchTradesForSymbols(symbols: string[], since?: Int, limit?: Int, params?: {}): Promise<Trade[]>;
     watchOrderBook(symbol: string, limit?: Int, params?: {}): Promise<OrderBook>;
     watchPositions(symbols?: Strings, since?: Int, limit?: Int, params?: {}): Promise<Position[]>;
     handlePositions(client: any, message: any): void;
@@ -16,19 +19,22 @@ export default class krakenfutures extends krakenfuturesRest {
     watchOrders(symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<Order[]>;
     watchMyTrades(symbol?: Str, since?: Int, limit?: Int, params?: {}): Promise<Trade[]>;
     watchBalance(params?: {}): Promise<Balances>;
-    handleTrade(client: Client, message: any): any;
+    handleTrade(client: Client, message: any): void;
     parseWsTrade(trade: any, market?: any): Trade;
     parseWsOrderTrade(trade: any, market?: any): Trade;
     handleOrder(client: Client, message: any): any;
     handleOrderSnapshot(client: Client, message: any): void;
     parseWsOrder(order: any, market?: any): Order;
-    handleTicker(client: Client, message: any): any;
+    handleTicker(client: Client, message: any): void;
+    handleBidAsk(client: Client, message: any): void;
     parseWsTicker(ticker: any, market?: any): Ticker;
     handleOrderBookSnapshot(client: Client, message: any): void;
     handleOrderBook(client: Client, message: any): void;
     handleBalance(client: Client, message: any): void;
     handleMyTrades(client: Client, message: any): void;
     parseWsMyTrade(trade: any, market?: any): Trade;
+    watchMultiHelper(unifiedName: string, channelName: string, symbols?: Strings, subscriptionArgs?: any, params?: {}): Promise<any>;
+    getMessageHash(unifiedElementName: string, subChannelName?: Str, symbol?: Str): string;
     handleErrorMessage(client: Client, message: any): void;
     handleMessage(client: any, message: any): void;
     handleAuthenticate(client: Client, message: any): any;

package/js/src/pro/krakenfutures.js

@@ -28,9 +28,12 @@ export default class krakenfutures extends krakenfuturesRest {
                 'fetchTradesWs': false,
                 'watchOHLCV': false,
                 'watchOrderBook': true,
+                'watchOrderBookForSymbols': true,
                 'watchTicker': true,
                 'watchTickers': true,
+                'watchBidsAsks': true,
                 'watchTrades': true,
+                'watchTradesForSymbols': true,
                 'watchBalance': true,
                 // 'watchStatus': true, // https://docs.futures.kraken.com/#websocket-api-public-feeds-heartbeat
                 'watchOrders': true,
@@ -51,12 +54,6 @@ export default class krakenfutures extends krakenfuturesRest {
                 'OHLCVLimit': 1000,
                 'connectionLimit': 100,
                 'requestLimit': 100,
-                'watchTicker': {
-                    'method': 'ticker', // or ticker_lite
-                },
-                'watchTickers': {
-                    'method': 'ticker', // or ticker_lite
-                },
                 'fetchBalance': {
                     'type': undefined,
                 },
@@ -94,6 +91,20 @@ export default class krakenfutures extends krakenfuturesRest {
         }
         return future;
     }
+    async watchOrderBookForSymbols(symbols, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name krakenfutures#watchOrderBookForSymbols
+         * @description watches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
+         * @see https://docs.futures.kraken.com/#websocket-api-public-feeds-challenge
+         * @param {string[]} symbols unified array of symbols
+         * @param {int} [limit] the maximum amount of order book entries to return
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
+         */
+        const orderbook = await this.watchMultiHelper('orderbook', 'book', symbols, { 'limit': limit }, params);
+        return orderbook.limit();
+    }
     async subscribePublic(name, symbols, params = {}) {
         /**
          * @ignore
@@ -161,34 +172,49 @@ export default class krakenfutures extends krakenfuturesRest {
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
-        const options = this.safeValue(this.options, 'watchTicker');
-        const method = this.safeString(options, 'method', 'ticker'); // or ticker_lite
-        const name = this.safeString(params, 'method', method);
-        params = this.omit(params, ['method']);
-        return await this.subscribePublic(name, [symbol], params);
+        await this.loadMarkets();
+        symbol = this.symbol(symbol);
+        const tickers = await this.watchTickers([symbol], params);
+        return tickers[symbol];
     }
     async watchTickers(symbols = undefined, params = {}) {
         /**
          * @method
-         * @name krakenfutures#watchTicker
+         * @name krakenfutures#watchTickers
          * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
-         * @see https://docs.futures.kraken.com/#websocket-api-public-feeds-ticker-lite
+         * @see https://docs.futures.kraken.com/#websocket-api-public-feeds-ticker
          * @param {string} symbol unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
-        const method = this.safeString(this.options, 'watchTickerMethod', 'ticker'); // or ticker_lite
-        const name = this.safeString2(params, 'method', 'watchTickerMethod', method);
-        params = this.omit(params, ['watchTickerMethod', 'method']);
+        await this.loadMarkets();
         symbols = this.marketSymbols(symbols, undefined, false);
-        const ticker = await this.subscribePublic(name, symbols, params);
+        const ticker = await this.watchMultiHelper('ticker', 'ticker', symbols, undefined, params);
         if (this.newUpdates) {
-            const tickers = {};
-            tickers[ticker['symbol']] = ticker;
-            return tickers;
+            const result = {};
+            result[ticker['symbol']] = ticker;
+            return result;
         }
         return this.filterByArray(this.tickers, 'symbol', symbols);
     }
+    async watchBidsAsks(symbols = undefined, params = {}) {
+        /**
+         * @method
+         * @name krakenfutures#watchBidsAsks
+         * @see https://docs.futures.kraken.com/#websocket-api-public-feeds-ticker-lite
+         * @description watches best bid & ask for symbols
+         * @param {string[]} symbols unified symbol of the market to fetch the ticker for
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
+         */
+        const ticker = await this.watchMultiHelper('bidask', 'ticker_lite', symbols, undefined, params);
+        if (this.newUpdates) {
+            const result = {};
+            result[ticker['symbol']] = ticker;
+            return result;
+        }
+        return this.filterByArray(this.bidsasks, 'symbol', symbols);
+    }
     async watchTrades(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
@@ -201,11 +227,25 @@ export default class krakenfutures extends krakenfuturesRest {
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=public-trades}
          */
-        await this.loadMarkets();
-        const name = 'trade';
-        const trades = await this.subscribePublic(name, [symbol], params);
+        return await this.watchTradesForSymbols([symbol], since, limit, params);
+    }
+    async watchTradesForSymbols(symbols, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name krakenfutures#watchTradesForSymbols
+         * @see https://docs.futures.kraken.com/#websocket-api-public-feeds-trade
+         * @description get the list of most recent trades for a list of symbols
+         * @param {string[]} symbols 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
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=public-trades}
+         */
+        const trades = await this.watchMultiHelper('trade', 'trade', symbols, undefined, params);
         if (this.newUpdates) {
-            limit = trades.getLimit(symbol, limit);
+            const first = this.safeList(trades, 0);
+            const tradeSymbol = this.safeString(first, 'symbol');
+            limit = trades.getLimit(tradeSymbol, limit);
         }
         return this.filterBySinceLimit(trades, since, limit, 'timestamp', true);
     }
@@ -220,8 +260,7 @@ export default class krakenfutures extends krakenfuturesRest {
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
          */
-        const orderbook = await this.subscribePublic('book', [symbol], params);
-        return orderbook.limit();
+        return await this.watchOrderBookForSymbols([symbol], limit, params);
     }
     async watchPositions(symbols = undefined, since = undefined, limit = undefined, params = {}) {
         /**
@@ -469,7 +508,7 @@ export default class krakenfutures extends krakenfuturesRest {
         if (marketId !== undefined) {
             const market = this.market(marketId);
             const symbol = market['symbol'];
-            const messageHash = 'trade:' + symbol;
+            const messageHash = this.getMessageHash('trade', undefined, symbol);
             if (this.safeList(this.trades, symbol) === undefined) {
                 const tradesLimit = this.safeInteger(this.options, 'tradesLimit', 1000);
                 this.trades[symbol] = new ArrayCache(tradesLimit);
@@ -491,7 +530,6 @@ export default class krakenfutures extends krakenfuturesRest {
             }
             client.resolve(tradesArray, messageHash);
         }
-        return message;
     }
     parseWsTrade(trade, market = undefined) {
         //
@@ -917,7 +955,16 @@ export default class krakenfutures extends krakenfuturesRest {
         //        "volumeQuote": 19628180
         //    }
         //
-        // ticker_lite
+        const marketId = this.safeString(message, 'product_id');
+        if (marketId !== undefined) {
+            const ticker = this.parseWsTicker(message);
+            const symbol = ticker['symbol'];
+            this.tickers[symbol] = ticker;
+            const messageHash = this.getMessageHash('ticker', undefined, symbol);
+            client.resolve(ticker, messageHash);
+        }
+    }
+    handleBidAsk(client, message) {
         //
         //    {
         //        "feed": "ticker_lite",
@@ -935,16 +982,13 @@ export default class krakenfutures extends krakenfuturesRest {
         //    }
         //
         const marketId = this.safeString(message, 'product_id');
-        const feed = this.safeString(message, 'feed');
         if (marketId !== undefined) {
             const ticker = this.parseWsTicker(message);
             const symbol = ticker['symbol'];
-            this.tickers[symbol] = ticker;
-            const messageHash = feed + ':' + symbol;
+            this.bidsasks[symbol] = ticker;
+            const messageHash = this.getMessageHash('bidask', undefined, symbol);
             client.resolve(ticker, messageHash);
         }
-        client.resolve(this.tickers, feed);
-        return message;
     }
     parseWsTicker(ticker, market = undefined) {
         //
@@ -1056,14 +1100,14 @@ export default class krakenfutures extends krakenfuturesRest {
         const marketId = this.safeString(message, 'product_id');
         const market = this.safeMarket(marketId);
         const symbol = market['symbol'];
-        const messageHash = 'book:' + symbol;
-        const subscription = this.safeValue(client.subscriptions, messageHash, {});
+        const messageHash = this.getMessageHash('orderbook', undefined, symbol);
+        const subscription = this.safeDict(client.subscriptions, messageHash, {});
         const limit = this.safeInteger(subscription, 'limit');
         const timestamp = this.safeInteger(message, 'timestamp');
         this.orderbooks[symbol] = this.orderBook({}, limit);
         const orderbook = this.orderbooks[symbol];
-        const bids = this.safeValue(message, 'bids');
-        const asks = this.safeValue(message, 'asks');
+        const bids = this.safeList(message, 'bids');
+        const asks = this.safeList(message, 'asks');
         for (let i = 0; i < bids.length; i++) {
             const bid = bids[i];
             const price = this.safeNumber(bid, 'price');
@@ -1098,7 +1142,7 @@ export default class krakenfutures extends krakenfuturesRest {
         const marketId = this.safeString(message, 'product_id');
         const market = this.safeMarket(marketId);
         const symbol = market['symbol'];
-        const messageHash = 'book:' + symbol;
+        const messageHash = this.getMessageHash('orderbook', undefined, symbol);
         const orderbook = this.orderbooks[symbol];
         const side = this.safeString(message, 'side');
         const price = this.safeNumber(message, 'price');
@@ -1425,6 +1469,39 @@ export default class krakenfutures extends krakenfuturesRest {
             },
         });
     }
+    async watchMultiHelper(unifiedName, channelName, symbols = undefined, subscriptionArgs = undefined, params = {}) {
+        await this.loadMarkets();
+        // symbols are required
+        symbols = this.marketSymbols(symbols, undefined, false, true, false);
+        const messageHashes = [];
+        for (let i = 0; i < symbols.length; i++) {
+            messageHashes.push(this.getMessageHash(unifiedName, undefined, this.symbol(symbols[i])));
+        }
+        const marketIds = this.marketIds(symbols);
+        const request = {
+            'event': 'subscribe',
+            'feed': channelName,
+            'product_ids': marketIds,
+        };
+        const url = this.urls['api']['ws'];
+        return await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes, subscriptionArgs);
+    }
+    getMessageHash(unifiedElementName, subChannelName = undefined, symbol = undefined) {
+        // unifiedElementName can be : orderbook, trade, ticker, bidask ...
+        // subChannelName only applies to channel that needs specific variation (i.e. depth_50, depth_100..) to be selected
+        const withSymbol = symbol !== undefined;
+        let messageHash = unifiedElementName;
+        if (!withSymbol) {
+            messageHash += 's';
+        }
+        else {
+            messageHash += ':' + symbol;
+        }
+        if (subChannelName !== undefined) {
+            messageHash += '#' + subChannelName;
+        }
+        return messageHash;
+    }
     handleErrorMessage(client, message) {
         //
         //    {
@@ -1455,10 +1532,10 @@ export default class krakenfutures extends krakenfuturesRest {
             const feed = this.safeString(message, 'feed');
             const methods = {
                 'ticker': this.handleTicker,
+                'ticker_lite': this.handleBidAsk,
                 'trade': this.handleTrade,
                 'trade_snapshot': this.handleTrade,
                 // 'heartbeat': this.handleStatus,
-                'ticker_lite': this.handleTicker,
                 'book': this.handleOrderBook,
                 'book_snapshot': this.handleOrderBookSnapshot,
                 'open_orders_verbose': this.handleOrder,

package/js/src/pro/kucoin.js

@@ -176,22 +176,46 @@ export default class kucoin extends kucoinRest {
         /**
          * @method
          * @name kucoin#watchTickers
+         * @see https://www.kucoin.com/docs/websocket/spot-trading/public-channels/ticker
          * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for all markets of a specific list
          * @param {string[]} symbols unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {string} [params.method] either '/market/snapshot' or '/market/ticker' default is '/market/ticker'
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
         await this.loadMarkets();
         symbols = this.marketSymbols(symbols);
-        let messageHash = 'tickers';
+        const messageHash = 'tickers';
+        let method = undefined;
+        [method, params] = this.handleOptionAndParams(params, 'watchTickers', 'method', '/market/ticker');
+        const messageHashes = [];
+        const topics = [];
         if (symbols !== undefined) {
-            messageHash = 'tickers::' + symbols.join(',');
+            for (let i = 0; i < symbols.length; i++) {
+                const symbol = symbols[i];
+                messageHashes.push('ticker:' + symbol);
+                const market = this.market(symbol);
+                topics.push(method + ':' + market['id']);
+            }
         }
         const url = await this.negotiate(false);
-        const topic = '/market/ticker:all';
-        const tickers = await this.subscribe(url, messageHash, topic, params);
-        if (this.newUpdates) {
-            return tickers;
+        let tickers = undefined;
+        if (symbols === undefined) {
+            const allTopic = method + ':all';
+            tickers = await this.subscribe(url, messageHash, allTopic, params);
+            if (this.newUpdates) {
+                return tickers;
+            }
+        }
+        else {
+            const marketIds = this.marketIds(symbols);
+            const symbolsTopic = method + ':' + marketIds.join(',');
+            tickers = await this.subscribeMultiple(url, messageHashes, symbolsTopic, topics, params);
+            if (this.newUpdates) {
+                const newDict = {};
+                newDict[tickers['symbol']] = tickers;
+                return newDict;
+            }
         }
         return this.filterByArray(this.tickers, 'symbol', symbols);
     }
@@ -275,19 +299,6 @@ export default class kucoin extends kucoinRest {
         const allTickers = {};
         allTickers[symbol] = ticker;
         client.resolve(allTickers, 'tickers');
-        const messageHashes = this.findMessageHashes(client, 'tickers::');
-        for (let i = 0; i < messageHashes.length; i++) {
-            const currentMessageHash = messageHashes[i];
-            const parts = currentMessageHash.split('::');
-            const symbolsString = parts[1];
-            const symbols = symbolsString.split(',');
-            const tickers = this.filterByArray(this.tickers, 'symbol', symbols);
-            const tickersSymbols = Object.keys(tickers);
-            const numTickers = tickersSymbols.length;
-            if (numTickers > 0) {
-                client.resolve(tickers, currentMessageHash);
-            }
-        }
     }
     async watchBidsAsks(symbols = undefined, params = {}) {
         /**

package/js/src/probit.d.ts

@@ -48,7 +48,7 @@ export default class probit extends Exchange {
     withdraw(code: string, amount: number, address: any, tag?: any, params?: {}): Promise<Transaction>;
     fetchDeposits(code?: Str, since?: Int, limit?: Int, params?: {}): Promise<Transaction[]>;
     fetchWithdrawals(code?: Str, since?: Int, limit?: Int, params?: {}): Promise<Transaction[]>;
-    fetchTransactions(code?: Str, since?: Int, limit?: Int, params?: {}): Promise<Transaction[]>;
+    fetchDepositsWithdrawals(code?: Str, since?: Int, limit?: Int, params?: {}): Promise<Transaction[]>;
     parseTransaction(transaction: any, currency?: Currency): Transaction;
     parseTransactionStatus(status: any): string;
     fetchDepositWithdrawFees(codes?: Strings, params?: {}): Promise<any>;

package/js/src/probit.js

@@ -1490,12 +1490,11 @@ export default class probit extends Exchange {
         const result = await this.fetchTransactions(code, since, limit, this.extend(request, params));
         return result;
     }
-    async fetchTransactions(code = undefined, since = undefined, limit = undefined, params = {}) {
+    async fetchDepositsWithdrawals(code = undefined, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
-         * @name probit#fetchTransactions
-         * @deprecated
-         * @description use fetchDepositsWithdrawals instead
+         * @name probit#fetchDepositsWithdrawals
+         * @description fetch history of deposits and withdrawals
          * @see https://docs-en.probit.com/reference/transferpayment
          * @param {string} code unified currency code
          * @param {int} [since] the earliest time in ms to fetch transactions for