ccxt 4.5.51 → 4.5.53

package/js/src/pro/backpack.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import backpackRest from '../backpack.js';
 import { ArgumentsRequired, ExchangeError } from '../base/errors.js';

package/js/src/pro/bequant.js

@@ -1,13 +1,20 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import hitbtc from './hitbtc.js';
-import hitbtcRest from '../hitbtc.js';
 import bequantRest from '../bequant.js';
 // ---------------------------------------------------------------------------
 export default class bequant extends hitbtc {
     describe() {
         // eslint-disable-next-line new-cap
-        const describeExtended = this.getDescribeForExtendedWsExchange(new bequantRest(), new hitbtcRest(), super.describe());
-        return this.deepExtend(describeExtended, {
+        const restInstance = new bequantRest();
+        const restDescribe = restInstance.describe();
+        const extended = this.deepExtend(super.describe(), restDescribe);
+        return this.deepExtend(extended, {
             'id': 'bequant',
             'name': 'Bequant',
             'countries': ['MT'],

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

@@ -178,7 +178,7 @@ export default class binance extends binanceRest {
     isSpotUrl(client: Client): boolean;
     stream(type: Str, subscriptionHash: Str, numSubscriptions?: number): string;
     getWsUrl(type: any, category: any): any;
-    getFutureWsCategory(channel: any): "public" | "market";
+    getFutureWsCategory(channel: any): "market" | "public";
     getPrivateWsUrl(type: any, listenKey: any): string;
     /**
      * @method

package/js/src/pro/binance.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 // ----------------------------------------------------------------------------
 import binanceRest from '../binance.js';
 import { Precise } from '../base/Precise.js';
@@ -3511,6 +3517,9 @@ export default class binance extends binanceRest {
      * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/?id=order-structure}
      */
     async cancelAllOrdersWs(symbol = undefined, params = {}) {
+        if (symbol === undefined) {
+            throw new ArgumentsRequired(this.id + ' cancelAllOrdersWs() requires a symbol argument');
+        }
         await this.loadMarkets();
         const market = this.market(symbol);
         const type = this.getMarketType('cancelAllOrdersWs', market, params);

package/js/src/pro/binancecoinm.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import binance from './binance.js';
 import binancecoinmRest from '../binancecoinm.js';

package/js/src/pro/binanceus.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import binance from './binance.js';
 import binanceusRest from '../binanceus.js';

package/js/src/pro/binanceusdm.js

@@ -1,10 +1,21 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import binance from './binance.js';
+import binanceusdmRest from '../binanceusdm.js';
 import { InvalidOrder } from '../base/errors.js';
 // ---------------------------------------------------------------------------
 export default class binanceusdm extends binance {
     describe() {
-        return this.deepExtend(super.describe(), {
+        // eslint-disable-next-line new-cap
+        const restInstance = new binanceusdmRest();
+        const restDescribe = restInstance.describe();
+        const extended = this.deepExtend(super.describe(), restDescribe);
+        return this.deepExtend(extended, {
             'id': 'binanceusdm',
             'name': 'Binance USDⓈ-M',
             'urls': {

package/js/src/pro/bingx.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import bingxRest from '../bingx.js';
 import { BadRequest, NetworkError, NotSupported } from '../base/errors.js';

package/js/src/pro/bitfinex.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import bitfinexRest from '../bitfinex.js';
 import { Precise } from '../base/Precise.js';

package/js/src/pro/bitget.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import bitgetRest from '../bitget.js';
 import { AuthenticationError, BadRequest, ArgumentsRequired, ChecksumError, ExchangeError, RateLimitExceeded, UnsubscribeError } from '../base/errors.js';

package/js/src/pro/bithumb.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import bithumbRest from '../bithumb.js';
 import { ArrayCache, ArrayCacheBySymbolById } from '../base/ws/Cache.js';

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

@@ -3,8 +3,8 @@ import type { Int, Market, Str, Strings, OrderBook, Order, Trade, Ticker, Ticker
 import Client from '../base/ws/Client.js';
 export default class bitmart extends bitmartRest {
     describe(): any;
-    subscribe(channel: any, symbol: any, type: any, params?: {}): Promise<any>;
-    subscribeMultiple(channel: string, type: string, symbols?: Strings, params?: {}): Promise<any>;
+    subscribe(unifiedName: any, channel: any, symbol: any, type: any, params?: {}): Promise<any>;
+    subscribeMultiple(unifiedName: string, channel: string, type: string, symbols?: Strings, params?: {}): Promise<any>;
     /**
      * @method
      * @name bitmart#watchBalance
@@ -52,7 +52,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#public-trade-channel
      * @param {string} symbol unified symbol of the market to fetch trades for
      * @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}
+     * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/?id=public-trades}
      */
     unWatchTrades(symbol: string, params?: {}): Promise<any>;
     /**
@@ -63,7 +63,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#public-trade-channel
      * @param {string[]} symbols unified symbol of the market to fetch trades for
      * @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}
+     * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/?id=public-trades}
      */
     unWatchTradesForSymbols(symbols: string[], params?: {}): Promise<any>;
     getParamsForMultipleSub(methodName: string, symbols: string[], limit?: Int, params?: {}): any[];
@@ -97,7 +97,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#public-ticker-channel
      * @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}
+     * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/?id=ticker-structure}
      */
     unWatchTicker(symbol: string, params?: {}): Promise<any>;
     /**
@@ -108,7 +108,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#public-ticker-channel
      * @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}
+     * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/?id=ticker-structure}
      */
     unWatchTickers(symbols?: Strings, params?: {}): Promise<any>;
     /**
@@ -145,7 +145,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#private-order-channel
      * @param {string} symbol unified market symbol of the market orders were made in
      * @param {object} [params] extra parameters specific to the exchange API endpoint
-     * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
+     * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/?id=order-structure}
      */
     unWatchOrders(symbol?: Str, params?: {}): Promise<any>;
     handleOrders(client: Client, message: any): void;
@@ -231,7 +231,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#public-depth-channel
      * @param {string} symbol unified array of symbols
      * @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
+     * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/?id=order-book-structure} indexed by market symbols
      */
     unWatchOrderBook(symbol: string, params?: {}): Promise<any>;
     handleDelta(bookside: any, delta: any): void;
@@ -258,7 +258,7 @@ export default class bitmart extends bitmartRest {
      * @param {string[]} symbols unified array of symbols
      * @param {object} [params] extra parameters specific to the exchange API endpoint
      * @param {string} [params.depth] the type of order book to subscribe to, default is 'depth/increase100', also accepts 'depth5' or 'depth20' or depth50
-     * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
+     * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/?id=order-book-structure} indexed by market symbols
      */
     unWatchOrderBookForSymbols(symbols: string[], params?: {}): Promise<any>;
     /**
@@ -296,5 +296,6 @@ export default class bitmart extends bitmartRest {
     };
     parseTopic(topic: any): string;
     parseMarketType(marketType: string): string;
+    subscriptionExistsForHash(url: string, hash: string): boolean;
     handleMessage(client: Client, message: any): void;
 }

package/js/src/pro/bitmart.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import bitmartRest from '../bitmart.js';
 import { AuthenticationError, ExchangeError, NotSupported, ArgumentsRequired } from '../base/errors.js';
@@ -99,11 +105,12 @@ export default class bitmart extends bitmartRest {
             },
         });
     }
-    async subscribe(channel, symbol, type, params = {}) {
+    async subscribe(unifiedName, channel, symbol, type, params = {}) {
         const market = this.market(symbol);
         const url = this.implodeHostname(this.urls['api']['ws'][type]['public']);
         let request = {};
         let messageHash = undefined;
+        let rawHash = undefined;
         const unsubscribe = this.safeBool(params, 'unsubscribe', false);
         let prefix = '';
         let requestOp = 'subscribe';
@@ -112,15 +119,16 @@ export default class bitmart extends bitmartRest {
             prefix = 'unsubscribe::';
             requestOp = 'unsubscribe';
         }
+        messageHash = unifiedName + '::' + symbol;
         if (type === 'spot') {
-            messageHash = 'spot/' + channel + ':' + market['id'];
+            rawHash = 'spot/' + channel + ':' + market['id'];
             request = {
                 'op': requestOp,
-                'args': [messageHash],
+                'args': [rawHash],
             };
         }
         else {
-            messageHash = 'futures/' + channel + ':' + market['id'];
+            rawHash = 'futures/' + channel + ':' + market['id'];
             const speed = this.safeString(params, 'speed');
             if (speed !== undefined) {
                 params = this.omit(params, 'speed');
@@ -128,20 +136,19 @@ export default class bitmart extends bitmartRest {
             }
             request = {
                 'action': requestOp,
-                'args': [messageHash],
+                'args': [rawHash],
             };
         }
         messageHash = prefix + messageHash;
         return await this.watch(url, messageHash, this.deepExtend(request, params), messageHash);
     }
-    async subscribeMultiple(channel, type, symbols = undefined, params = {}) {
+    async subscribeMultiple(unifiedName, channel, type, symbols = undefined, params = {}) {
         symbols = this.marketSymbols(symbols, type, false, true);
         const url = this.implodeHostname(this.urls['api']['ws'][type]['public']);
         const channelType = (type === 'spot') ? 'spot' : 'futures';
         const actionType = (type === 'spot') ? 'op' : 'action';
         const rawSubscriptions = [];
         const messageHashes = [];
-        const subHashes = [];
         const unsubscribe = this.safeBool(params, 'unsubscribe', false);
         let prefix = '';
         let requestOp = 'subscribe';
@@ -152,12 +159,12 @@ export default class bitmart extends bitmartRest {
         }
         for (let i = 0; i < symbols.length; i++) {
             const market = this.market(symbols[i]);
-            const message = channelType + '/' + channel + ':' + market['id'];
-            const subHash = prefix + message;
-            const messageHash = prefix + channel + ':' + market['symbol'];
-            rawSubscriptions.push(message);
-            subHashes.push(subHash);
+            const rawHash = channelType + '/' + channel + ':' + market['id'];
+            const messageHash = prefix + unifiedName + '::' + market['symbol'];
             messageHashes.push(messageHash);
+            if (!this.subscriptionExistsForHash(url, messageHash)) {
+                rawSubscriptions.push(rawHash);
+            }
         }
         // as an exclusion, futures "tickers" need one generic request for all symbols
         // if ((type !== 'spot') && (channel === 'ticker')) {
@@ -168,7 +175,7 @@ export default class bitmart extends bitmartRest {
             'args': rawSubscriptions,
         };
         request[actionType] = requestOp;
-        return await this.watchMultiple(url, messageHashes, this.deepExtend(request, params), subHashes);
+        return await this.watchMultiple(url, messageHashes, this.deepExtend(request, params), messageHashes);
     }
     /**
      * @method
@@ -338,7 +345,7 @@ export default class bitmart extends bitmartRest {
         let marketType = undefined;
         [symbols, marketType, params] = this.getParamsForMultipleSub('watchTradesForSymbols', symbols, limit, params);
         const channelName = 'trade';
-        const trades = await this.subscribeMultiple(channelName, marketType, symbols, params);
+        const trades = await this.subscribeMultiple('trade', channelName, marketType, symbols, params);
         if (this.newUpdates) {
             const first = this.safeDict(trades, 0);
             const tradeSymbol = this.safeString(first, 'symbol');
@@ -360,7 +367,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#public-trade-channel
      * @param {string} symbol unified symbol of the market to fetch trades for
      * @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}
+     * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/?id=public-trades}
      */
     async unWatchTrades(symbol, params = {}) {
         return await this.unWatchTradesForSymbols([symbol], params);
@@ -373,7 +380,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#public-trade-channel
      * @param {string[]} symbols unified symbol of the market to fetch trades for
      * @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}
+     * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/?id=public-trades}
      */
     async unWatchTradesForSymbols(symbols, params = {}) {
         await this.loadMarkets();
@@ -381,7 +388,7 @@ export default class bitmart extends bitmartRest {
         [symbols, marketType, params] = this.getParamsForMultipleSub('unWatchTradesForSymbols', symbols, undefined, params);
         const channelName = 'trade';
         params = this.extend(params, { 'unsubscribe': true });
-        return await this.subscribeMultiple(channelName, marketType, symbols, params);
+        return await this.subscribeMultiple('trade', channelName, marketType, symbols, params);
     }
     getParamsForMultipleSub(methodName, symbols, limit = undefined, params = {}) {
         symbols = this.marketSymbols(symbols, undefined, false, true);
@@ -425,7 +432,7 @@ export default class bitmart extends bitmartRest {
         const market = this.getMarketFromSymbols(symbols);
         let marketType = undefined;
         [marketType, params] = this.handleMarketTypeAndParams('watchTickers', market, params);
-        const ticker = await this.subscribeMultiple('ticker', marketType, symbols, params);
+        const ticker = await this.subscribeMultiple('ticker', 'ticker', marketType, symbols, params);
         if (this.newUpdates) {
             const tickers = {};
             tickers[ticker['symbol']] = ticker;
@@ -441,7 +448,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#public-ticker-channel
      * @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}
+     * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/?id=ticker-structure}
      */
     async unWatchTicker(symbol, params = {}) {
         return await this.unWatchTickers([symbol], params);
@@ -454,7 +461,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#public-ticker-channel
      * @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}
+     * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/?id=ticker-structure}
      */
     async unWatchTickers(symbols = undefined, params = {}) {
         await this.loadMarkets();
@@ -462,7 +469,7 @@ export default class bitmart extends bitmartRest {
         let marketType = undefined;
         [marketType, params] = this.handleMarketTypeAndParams('watchTickers', market, params);
         params = this.extend(params, { 'unsubscribe': true });
-        return await this.subscribeMultiple('ticker', marketType, symbols, params);
+        return await this.subscribeMultiple('ticker', 'ticker', marketType, symbols, params);
     }
     /**
      * @method
@@ -487,8 +494,12 @@ export default class bitmart extends bitmartRest {
         const messageHashes = [];
         for (let i = 0; i < symbols.length; i++) {
             const market = this.market(symbols[i]);
-            rawSubscriptions.push(channelType + ':' + market['id']);
-            messageHashes.push('bidask:' + symbols[i]);
+            const rawHash = channelType + ':' + market['id'];
+            const messageHash = 'bidask::' + market['symbol'];
+            messageHashes.push(messageHash);
+            if (!this.subscriptionExistsForHash(url, messageHash)) {
+                rawSubscriptions.push(rawHash);
+            }
         }
         if (marketType !== 'spot') {
             rawSubscriptions = [channelType];
@@ -497,7 +508,7 @@ export default class bitmart extends bitmartRest {
             'args': rawSubscriptions,
         };
         request[actionType] = 'subscribe';
-        const newTickers = await this.watchMultiple(url, messageHashes, request, rawSubscriptions);
+        const newTickers = await this.watchMultiple(url, messageHashes, request, messageHashes);
         if (this.newUpdates) {
             const tickers = {};
             tickers[newTickers['symbol']] = newTickers;
@@ -522,7 +533,7 @@ export default class bitmart extends bitmartRest {
             const ticker = this.parseWsBidAsk(rawTickers[i]);
             const symbol = ticker['symbol'];
             this.bidsasks[symbol] = ticker;
-            const messageHash = 'bidask:' + symbol;
+            const messageHash = 'bidask::' + symbol;
             client.resolve(ticker, messageHash);
         }
     }
@@ -601,7 +612,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#private-order-channel
      * @param {string} symbol unified market symbol of the market orders were made in
      * @param {object} [params] extra parameters specific to the exchange API endpoint
-     * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
+     * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/?id=order-structure}
      */
     async unWatchOrders(symbol = undefined, params = {}) {
         await this.loadMarkets();
@@ -1105,7 +1116,7 @@ export default class bitmart extends bitmartRest {
                 symbol = this.handleTradeLoop(data[i]);
             }
         }
-        client.resolve(this.trades[symbol], 'trade:' + symbol);
+        client.resolve(this.trades[symbol], 'trade::' + symbol);
     }
     handleTradeLoop(entry) {
         const trade = this.parseWsTrade(entry);
@@ -1232,7 +1243,7 @@ export default class bitmart extends bitmartRest {
             const ticker = isSpot ? this.parseTicker(rawTickers[i]) : this.parseWsSwapTicker(rawTickers[i]);
             const symbol = ticker['symbol'];
             this.tickers[symbol] = ticker;
-            const messageHash = 'ticker:' + symbol;
+            const messageHash = 'ticker::' + symbol;
             client.resolve(ticker, messageHash);
         }
     }
@@ -1305,7 +1316,7 @@ export default class bitmart extends bitmartRest {
         else {
             name = 'klineBin' + interval;
         }
-        const ohlcv = await this.subscribe(name, symbol, type, params);
+        const ohlcv = await this.subscribe('ohlcv', name, symbol, type, params);
         if (this.newUpdates) {
             limit = ohlcv.getLimit(symbol, limit);
         }
@@ -1338,7 +1349,7 @@ export default class bitmart extends bitmartRest {
             name = 'klineBin' + interval;
         }
         params = this.extend(params, { 'unsubscribe': true });
-        return await this.subscribe(name, symbol, type, params);
+        return await this.subscribe('ohlcv', name, symbol, type, params);
     }
     handleOHLCV(client, message) {
         //
@@ -1409,7 +1420,7 @@ export default class bitmart extends bitmartRest {
                     this.ohlcvs[symbol][timeframe] = stored;
                 }
                 stored.append(parsed);
-                const messageHash = channel + ':' + marketId;
+                const messageHash = 'ohlcv::' + symbol;
                 client.resolve(stored, messageHash);
             }
         }
@@ -1430,7 +1441,7 @@ export default class bitmart extends bitmartRest {
                 const parsed = this.parseOHLCV(candle, market);
                 stored.append(parsed);
             }
-            client.resolve(stored, channel);
+            client.resolve(stored, 'ohlcv::' + symbol);
         }
     }
     /**
@@ -1457,7 +1468,7 @@ export default class bitmart extends bitmartRest {
         if (type === 'swap' && depth === 'depth/increase100') {
             depth = 'depth50';
         }
-        const orderbook = await this.subscribe(depth, symbol, type, params);
+        const orderbook = await this.subscribe('orderbook', depth, symbol, type, params);
         return orderbook.limit();
     }
     /**
@@ -1469,7 +1480,7 @@ export default class bitmart extends bitmartRest {
      * @see https://developer-pro.bitmart.com/en/futuresv2/#public-depth-channel
      * @param {string} symbol unified array of symbols
      * @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
+     * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/?id=order-book-structure} indexed by market symbols
      */
     async unWatchOrderBook(symbol, params = {}) {
         await this.loadMarkets();
@@ -1483,7 +1494,7 @@ export default class bitmart extends bitmartRest {
             depth = 'depth50';
         }
         params = this.extend(params, { 'unsubscribe': true });
-        return await this.subscribe(depth, symbol, type, params);
+        return await this.subscribe('orderbook', depth, symbol, type, params);
     }
     handleDelta(bookside, delta) {
         const price = this.safeFloat(delta, 0);
@@ -1623,7 +1634,6 @@ export default class bitmart extends bitmartRest {
             }
         }
         if (isSpot) {
-            const channel = channelName.replace('spot/', '');
             for (let i = 0; i < datas.length; i++) {
                 const update = datas[i];
                 const marketId = this.safeString(update, 'symbol');
@@ -1644,16 +1654,11 @@ export default class bitmart extends bitmartRest {
                     orderbook['timestamp'] = timestamp;
                     orderbook['datetime'] = this.iso8601(timestamp);
                 }
-                const messageHash = channelName + ':' + marketId;
+                const messageHash = 'orderbook::' + symbol;
                 client.resolve(orderbook, messageHash);
-                // resolve ForSymbols
-                const messageHashForMulti = channel + ':' + symbol;
-                client.resolve(orderbook, messageHashForMulti);
             }
         }
         else {
-            const tableParts = channelName.split(':');
-            const channel = tableParts[0].replace('futures/', '');
             const data = datas[0]; // contract markets always contain only one member
             const depths = data['depths'];
             const marketId = this.safeString(data, 'symbol');
@@ -1687,11 +1692,8 @@ export default class bitmart extends bitmartRest {
             const timestamp = this.safeInteger(data, 'ms_t');
             orderbook['timestamp'] = timestamp;
             orderbook['datetime'] = this.iso8601(timestamp);
-            const messageHash = channelName;
+            const messageHash = 'orderbook::' + symbol;
             client.resolve(orderbook, messageHash);
-            // resolve ForSymbols
-            const messageHashForMulti = channel + ':' + symbol;
-            client.resolve(orderbook, messageHashForMulti);
         }
     }
     /**
@@ -1714,7 +1716,7 @@ export default class bitmart extends bitmartRest {
         if (type === 'swap' && channel === 'depth/increase100') {
             channel = 'depth50';
         }
-        const orderbook = await this.subscribeMultiple(channel, type, symbols, params);
+        const orderbook = await this.subscribeMultiple('orderbook', channel, type, symbols, params);
         return orderbook.limit();
     }
     /**
@@ -1725,7 +1727,7 @@ export default class bitmart extends bitmartRest {
      * @param {string[]} symbols unified array of symbols
      * @param {object} [params] extra parameters specific to the exchange API endpoint
      * @param {string} [params.depth] the type of order book to subscribe to, default is 'depth/increase100', also accepts 'depth5' or 'depth20' or depth50
-     * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
+     * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/?id=order-book-structure} indexed by market symbols
      */
     async unWatchOrderBookForSymbols(symbols, params = {}) {
         await this.loadMarkets();
@@ -1737,7 +1739,7 @@ export default class bitmart extends bitmartRest {
             channel = 'depth50';
         }
         params = this.extend(params, { 'unsubscribe': true });
-        return await this.subscribeMultiple(channel, type, symbols, params);
+        return await this.subscribeMultiple('orderbook', channel, type, symbols, params);
     }
     /**
      * @method
@@ -1771,7 +1773,7 @@ export default class bitmart extends bitmartRest {
         const market = this.getMarketFromSymbols(symbols);
         let marketType = undefined;
         [marketType, params] = this.handleMarketTypeAndParams('watchFundingRates', market, params);
-        const fundingRate = await this.subscribeMultiple('fundingRate', marketType, symbols, params);
+        const fundingRate = await this.subscribeMultiple('fundingRate', 'fundingRate', marketType, symbols, params);
         if (this.newUpdates) {
             const fundingRates = {};
             fundingRates[fundingRate['symbol']] = fundingRate;
@@ -1799,7 +1801,7 @@ export default class bitmart extends bitmartRest {
         const fundingRate = this.parseFundingRate(data);
         const symbol = fundingRate['symbol'];
         this.fundingRates[symbol] = fundingRate;
-        const messageHash = 'fundingRate:' + symbol;
+        const messageHash = 'fundingRate::' + symbol;
         client.resolve(fundingRate, messageHash);
     }
     async authenticate(type, params = {}) {
@@ -2012,6 +2014,10 @@ export default class bitmart extends bitmartRest {
         };
         return this.safeString(types, marketType, marketType);
     }
+    subscriptionExistsForHash(url, hash) {
+        const client = this.client(url);
+        return (hash in client.subscriptions);
+    }
     handleMessage(client, message) {
         if (this.handleErrorMessage(client, message)) {
             return;

package/js/src/pro/bitmex.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import bitmexRest from '../bitmex.js';
 import { AuthenticationError, ExchangeError, RateLimitExceeded } from '../base/errors.js';

package/js/src/pro/bitopro.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 // ----------------------------------------------------------------------------
 import bitoproRest from '../bitopro.js';
 import { ExchangeError } from '../base/errors.js';

package/js/src/pro/bitrue.js

@@ -1,3 +1,9 @@
+// ----------------------------------------------------------------------------
+
+// PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+// https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+// EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 //  ---------------------------------------------------------------------------
 import bitrueRest from '../bitrue.js';
 import { ArrayCacheBySymbolById } from '../base/ws/Cache.js';