ccxt 4.4.100 → 4.5.1

package/dist/cjs/src/pro/bitget.js

@@ -8,7 +8,7 @@ var Precise = require('../base/Precise.js');
 var Cache = require('../base/ws/Cache.js');
 var sha256 = require('../static_dependencies/noble-hashes/sha256.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 /**
  * @class bitget
@@ -46,10 +46,14 @@ class bitget extends bitget$1["default"] {
                     'ws': {
                         'public': 'wss://ws.bitget.com/v2/ws/public',
                         'private': 'wss://ws.bitget.com/v2/ws/private',
+                        'utaPublic': 'wss://ws.bitget.com/v3/ws/public',
+                        'utaPrivate': 'wss://ws.bitget.com/v3/ws/private',
                     },
                     'demo': {
                         'public': 'wss://wspap.bitget.com/v2/ws/public',
                         'private': 'wss://wspap.bitget.com/v2/ws/private',
+                        'utaPublic': 'wss://wspap.bitget.com/v3/ws/public',
+                        'utaPrivate': 'wss://wspap.bitget.com/v3/ws/private',
                     },
                 },
             },
@@ -101,7 +105,10 @@ class bitget extends bitget$1["default"] {
             },
         });
     }
-    getInstType(market, params = {}) {
+    getInstType(market, uta = false, params = {}) {
+        if ((uta === undefined) || !uta) {
+            [uta, params] = this.handleOptionAndParams(params, 'getInstType', 'uta', false);
+        }
         let instType = undefined;
         if (market === undefined) {
             [instType, params] = this.handleProductTypeAndParams(undefined, params);
@@ -115,6 +122,9 @@ class bitget extends bitget$1["default"] {
         let instypeAux = undefined;
         [instypeAux, params] = this.handleOptionAndParams(params, 'getInstType', 'instType', instType);
         instType = instypeAux;
+        if (uta) {
+            instType = instType.toLowerCase();
+        }
         return [instType, params];
     }
     /**
@@ -123,8 +133,10 @@ class bitget extends bitget$1["default"] {
      * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
      * @see https://www.bitget.com/api-doc/spot/websocket/public/Tickers-Channel
      * @see https://www.bitget.com/api-doc/contract/websocket/public/Tickers-Channel
+     * @see https://www.bitget.com/api-doc/uta/websocket/public/Tickers-Channel
      * @param {string} symbol unified symbol of the market to watch the ticker for
      * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @param {boolean} [params.uta] set to true for the unified trading account (uta), defaults to false
      * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
      */
     async watchTicker(symbol, params = {}) {
@@ -133,12 +145,16 @@ class bitget extends bitget$1["default"] {
         symbol = market['symbol'];
         const messageHash = 'ticker:' + symbol;
         let instType = undefined;
-        [instType, params] = this.getInstType(market, params);
+        let uta = undefined;
+        [uta, params] = this.handleOptionAndParams(params, 'watchTicker', 'uta', false);
+        [instType, params] = this.getInstType(market, uta, params);
         const args = {
             'instType': instType,
-            'channel': 'ticker',
-            'instId': market['id'],
         };
+        const topicOrChannel = uta ? 'topic' : 'channel';
+        const symbolOrInstId = uta ? 'symbol' : 'instId';
+        args[topicOrChannel] = 'ticker';
+        args[symbolOrInstId] = market['id'];
         return await this.watchPublic(messageHash, args, params);
     }
     /**
@@ -161,8 +177,10 @@ class bitget extends bitget$1["default"] {
      * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for all markets of a specific list
      * @see https://www.bitget.com/api-doc/spot/websocket/public/Tickers-Channel
      * @see https://www.bitget.com/api-doc/contract/websocket/public/Tickers-Channel
+     * @see https://www.bitget.com/api-doc/uta/websocket/public/Tickers-Channel
      * @param {string[]} symbols unified symbol of the market to watch the tickers for
      * @param {object} [params] extra parameters specific to the exchange API endpoint
+     * @param {boolean} [params.uta] set to true for the unified trading account (uta), defaults to false
      * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
      */
     async watchTickers(symbols = undefined, params = {}) {
@@ -170,7 +188,9 @@ class bitget extends bitget$1["default"] {
         symbols = this.marketSymbols(symbols, undefined, false);
         const market = this.market(symbols[0]);
         let instType = undefined;
-        [instType, params] = this.getInstType(market, params);
+        let uta = undefined;
+        [uta, params] = this.handleOptionAndParams(params, 'watchTickers', 'uta', false);
+        [instType, params] = this.getInstType(market, uta, params);
         const topics = [];
         const messageHashes = [];
         for (let i = 0; i < symbols.length; i++) {
@@ -178,9 +198,11 @@ class bitget extends bitget$1["default"] {
             const marketInner = this.market(symbol);
             const args = {
                 'instType': instType,
-                'channel': 'ticker',
-                'instId': marketInner['id'],
             };
+            const topicOrChannel = uta ? 'topic' : 'channel';
+            const symbolOrInstId = uta ? 'symbol' : 'instId';
+            args[topicOrChannel] = 'ticker';
+            args[symbolOrInstId] = marketInner['id'];
             topics.push(args);
             messageHashes.push('ticker:' + symbol);
         }
@@ -193,6 +215,8 @@ class bitget extends bitget$1["default"] {
         return this.filterByArray(this.tickers, 'symbol', symbols);
     }
     handleTicker(client, message) {
+        //
+        // default
         //
         //     {
         //         "action": "snapshot",
@@ -223,6 +247,29 @@ class bitget extends bitget$1["default"] {
         //         "ts": 1701842994341
         //     }
         //
+        // uta
+        //
+        //     {
+        //         "action": "snapshot",
+        //         "arg": { "instType": "spot", topic: "ticker", symbol: "BTCUSDT" },
+        //         "data": [
+        //             {
+        //                 "highPrice24h": "120255.61",
+        //                 "lowPrice24h": "116145.88",
+        //                 "openPrice24h": "118919.38",
+        //                 "lastPrice": "119818.83",
+        //                 "turnover24h": "215859996.272276",
+        //                 "volume24h": "1819.756798",
+        //                 "bid1Price": "119811.26",
+        //                 "ask1Price": "119831.18",
+        //                 "bid1Size": "0.008732",
+        //                 "ask1Size": "0.004297",
+        //                 "price24hPcnt": "0.02002"
+        //             }
+        //         ],
+        //         "ts": 1753230479687
+        //     }
+        //
         this.handleBidAsk(client, message);
         const ticker = this.parseWsTicker(message);
         const symbol = ticker['symbol'];
@@ -301,48 +348,75 @@ class bitget extends bitget$1["default"] {
         //         "ts": 1701843962812
         //     }
         //
+        // uta
+        //
+        //     {
+        //         "action": "snapshot",
+        //         "arg": { "instType": "spot", topic: "ticker", symbol: "BTCUSDT" },
+        //         "data": [
+        //             {
+        //                 "highPrice24h": "120255.61",
+        //                 "lowPrice24h": "116145.88",
+        //                 "openPrice24h": "118919.38",
+        //                 "lastPrice": "119818.83",
+        //                 "turnover24h": "215859996.272276",
+        //                 "volume24h": "1819.756798",
+        //                 "bid1Price": "119811.26",
+        //                 "ask1Price": "119831.18",
+        //                 "bid1Size": "0.008732",
+        //                 "ask1Size": "0.004297",
+        //                 "price24hPcnt": "0.02002"
+        //             }
+        //         ],
+        //         "ts": 1753230479687
+        //     }
+        //
         const arg = this.safeValue(message, 'arg', {});
         const data = this.safeValue(message, 'data', []);
         const ticker = this.safeValue(data, 0, {});
-        const timestamp = this.safeInteger(ticker, 'ts');
-        const instType = this.safeString(arg, 'instType');
-        const marketType = (instType === 'SPOT') ? 'spot' : 'contract';
-        const marketId = this.safeString(ticker, 'instId');
+        const utaTimestamp = this.safeInteger(message, 'ts');
+        const timestamp = this.safeInteger(ticker, 'ts', utaTimestamp);
+        const instType = this.safeStringLower(arg, 'instType');
+        const marketType = (instType === 'spot') ? 'spot' : 'contract';
+        const utaMarketId = this.safeString(arg, 'symbol');
+        const marketId = this.safeString(ticker, 'instId', utaMarketId);
         market = this.safeMarket(marketId, market, undefined, marketType);
-        const close = this.safeString(ticker, 'lastPr');
-        const changeDecimal = this.safeString(ticker, 'change24h');
-        const change = Precise["default"].stringMul(changeDecimal, '100');
+        const close = this.safeString2(ticker, 'lastPr', 'lastPrice');
+        const changeDecimal = this.safeString(ticker, 'change24h', '');
+        const change = this.safeString(ticker, 'price24hPcnt', Precise["default"].stringMul(changeDecimal, '100'));
         return this.safeTicker({
             'symbol': market['symbol'],
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
-            'high': this.safeString(ticker, 'high24h'),
-            'low': this.safeString(ticker, 'low24h'),
-            'bid': this.safeString(ticker, 'bidPr'),
-            'bidVolume': this.safeString(ticker, 'bidSz'),
-            'ask': this.safeString(ticker, 'askPr'),
-            'askVolume': this.safeString(ticker, 'askSz'),
+            'high': this.safeString2(ticker, 'high24h', 'highPrice24h'),
+            'low': this.safeString2(ticker, 'low24h', 'lowPrice24h'),
+            'bid': this.safeString2(ticker, 'bidPr', 'bid1Price'),
+            'bidVolume': this.safeString2(ticker, 'bidSz', 'bid1Size'),
+            'ask': this.safeString2(ticker, 'askPr', 'ask1Price'),
+            'askVolume': this.safeString2(ticker, 'askSz', 'ask1Size'),
             'vwap': undefined,
-            'open': this.safeString(ticker, 'open24h'),
+            'open': this.safeString2(ticker, 'open24h', 'openPrice24h'),
             'close': close,
             'last': close,
             'previousClose': undefined,
             'change': undefined,
             'percentage': change,
             'average': undefined,
-            'baseVolume': this.safeString(ticker, 'baseVolume'),
-            'quoteVolume': this.safeString(ticker, 'quoteVolume'),
+            'baseVolume': this.safeString2(ticker, 'baseVolume', 'volume24h'),
+            'quoteVolume': this.safeString2(ticker, 'quoteVolume', 'turnover24h'),
             'info': ticker,
         }, market);
     }
     /**
      * @method
      * @name bitget#watchBidsAsks
+     * @description watches best bid & ask for symbols
      * @see https://www.bitget.com/api-doc/spot/websocket/public/Tickers-Channel
      * @see https://www.bitget.com/api-doc/contract/websocket/public/Tickers-Channel
-     * @description watches best bid & ask for symbols
+     * @see https://www.bitget.com/api-doc/uta/websocket/public/Tickers-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
+     * @param {boolean} [params.uta] set to true for the unified trading account (uta), defaults to false
      * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
      */
     async watchBidsAsks(symbols = undefined, params = {}) {
@@ -350,7 +424,9 @@ class bitget extends bitget$1["default"] {
         symbols = this.marketSymbols(symbols, undefined, false);
         const market = this.market(symbols[0]);
         let instType = undefined;
-        [instType, params] = this.getInstType(market, params);
+        let uta = undefined;
+        [uta, params] = this.handleOptionAndParams(params, 'watchBidsAsks', 'uta', false);
+        [instType, params] = this.getInstType(market, uta, params);
         const topics = [];
         const messageHashes = [];
         for (let i = 0; i < symbols.length; i++) {
@@ -358,9 +434,11 @@ class bitget extends bitget$1["default"] {
             const marketInner = this.market(symbol);
             const args = {
                 'instType': instType,
-                'channel': 'ticker',
-                'instId': marketInner['id'],
             };
+            const topicOrChannel = uta ? 'topic' : 'channel';
+            const symbolOrInstId = uta ? 'symbol' : 'instId';
+            args[topicOrChannel] = 'ticker';
+            args[symbolOrInstId] = marketInner['id'];
             topics.push(args);
             messageHashes.push('bidask:' + symbol);
         }
@@ -383,19 +461,21 @@ class bitget extends bitget$1["default"] {
         const arg = this.safeValue(message, 'arg', {});
         const data = this.safeValue(message, 'data', []);
         const ticker = this.safeValue(data, 0, {});
-        const timestamp = this.safeInteger(ticker, 'ts');
-        const instType = this.safeString(arg, 'instType');
-        const marketType = (instType === 'SPOT') ? 'spot' : 'contract';
-        const marketId = this.safeString(ticker, 'instId');
+        const utaTimestamp = this.safeInteger(message, 'ts');
+        const timestamp = this.safeInteger(ticker, 'ts', utaTimestamp);
+        const instType = this.safeStringLower(arg, 'instType');
+        const marketType = (instType === 'spot') ? 'spot' : 'contract';
+        const utaMarketId = this.safeString(arg, 'symbol');
+        const marketId = this.safeString(ticker, 'instId', utaMarketId);
         market = this.safeMarket(marketId, market, undefined, marketType);
         return this.safeTicker({
             'symbol': market['symbol'],
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
-            'ask': this.safeString(ticker, 'askPr'),
-            'askVolume': this.safeString(ticker, 'askSz'),
-            'bid': this.safeString(ticker, 'bidPr'),
-            'bidVolume': this.safeString(ticker, 'bidSz'),
+            'ask': this.safeString2(ticker, 'askPr', 'ask1Price'),
+            'askVolume': this.safeString2(ticker, 'askSz', 'ask1Size'),
+            'bid': this.safeString2(ticker, 'bidPr', 'bid1Price'),
+            'bidVolume': this.safeString2(ticker, 'bidSz', 'bid1Size'),
             'info': ticker,
         }, market);
     }
@@ -420,7 +500,7 @@ class bitget extends bitget$1["default"] {
         const interval = this.safeString(timeframes, timeframe);
         const messageHash = 'candles:' + timeframe + ':' + symbol;
         let instType = undefined;
-        [instType, params] = this.getInstType(market, params);
+        [instType, params] = this.getInstType(market, false, params);
         const args = {
             'instType': instType,
             'channel': 'candle' + interval,
@@ -572,7 +652,7 @@ class bitget extends bitget$1["default"] {
         const market = this.market(symbol);
         const messageHash = 'unsubscribe:' + messageHashTopic + ':' + market['symbol'];
         let instType = undefined;
-        [instType, params] = this.getInstType(market, params);
+        [instType, params] = this.getInstType(market, false, params);
         const args = {
             'instType': instType,
             'channel': channel,
@@ -606,7 +686,7 @@ class bitget extends bitget$1["default"] {
             const symbol = symbols[i];
             const market = this.market(symbol);
             let instType = undefined;
-            [instType, params] = this.getInstType(market, params);
+            [instType, params] = this.getInstType(market, false, params);
             const args = {
                 'instType': instType,
                 'channel': channel,
@@ -777,7 +857,7 @@ class bitget extends bitget$1["default"] {
             const symbol = symbols[i];
             const market = this.market(symbol);
             let instType = undefined;
-            [instType, params] = this.getInstType(market, params);
+            [instType, params] = this.getInstType(market, false, params);
             const args = {
                 'instType': instType,
                 'channel': 'trade',
@@ -968,7 +1048,7 @@ class bitget extends bitget$1["default"] {
         symbols = this.marketSymbols(symbols);
         if (!this.isEmpty(symbols)) {
             market = this.getMarketFromSymbols(symbols);
-            [instType, params] = this.getInstType(market, params);
+            [instType, params] = this.getInstType(market, false, params);
         }
         messageHash = instType + ':positions' + messageHash;
         const args = {
@@ -1178,7 +1258,7 @@ class bitget extends bitget$1["default"] {
             instType = 'SPOT';
         }
         else {
-            [instType, params] = this.getInstType(market, params);
+            [instType, params] = this.getInstType(market, false, params);
         }
         if (type === 'spot' && (symbol !== undefined)) {
             subscriptionHash = subscriptionHash + ':' + symbol;
@@ -1562,7 +1642,7 @@ class bitget extends bitget$1["default"] {
             instType = 'spot';
         }
         else {
-            [instType, params] = this.getInstType(market, params);
+            [instType, params] = this.getInstType(market, false, params);
         }
         const subscriptionHash = 'fill:' + instType;
         const args = {
@@ -1794,12 +1874,25 @@ class bitget extends bitget$1["default"] {
         client.resolve(this.balance, messageHash);
     }
     async watchPublic(messageHash, args, params = {}) {
-        let url = this.urls['api']['ws']['public'];
+        let uta = undefined;
+        let url = undefined;
+        [uta, params] = this.handleOptionAndParams(params, 'watchPublic', 'uta', false);
+        if (uta) {
+            url = this.urls['api']['ws']['utaPublic'];
+        }
+        else {
+            url = this.urls['api']['ws']['public'];
+        }
         const sandboxMode = this.safeBool2(this.options, 'sandboxMode', 'sandbox', false);
         if (sandboxMode) {
             const instType = this.safeString(args, 'instType');
             if ((instType !== 'SCOIN-FUTURES') && (instType !== 'SUSDT-FUTURES') && (instType !== 'SUSDC-FUTURES')) {
-                url = this.urls['api']['demo']['public'];
+                if (uta) {
+                    url = this.urls['api']['demo']['utaPublic'];
+                }
+                else {
+                    url = this.urls['api']['demo']['public'];
+                }
             }
         }
         const request = {
@@ -1810,12 +1903,25 @@ class bitget extends bitget$1["default"] {
         return await this.watch(url, messageHash, message, messageHash);
     }
     async unWatchPublic(messageHash, args, params = {}) {
-        let url = this.urls['api']['ws']['public'];
+        let uta = undefined;
+        let url = undefined;
+        [uta, params] = this.handleOptionAndParams(params, 'unWatchPublic', 'uta', false);
+        if (uta) {
+            url = this.urls['api']['ws']['utaPublic'];
+        }
+        else {
+            url = this.urls['api']['ws']['public'];
+        }
         const sandboxMode = this.safeBool2(this.options, 'sandboxMode', 'sandbox', false);
         if (sandboxMode) {
             const instType = this.safeString(args, 'instType');
             if ((instType !== 'SCOIN-FUTURES') && (instType !== 'SUSDT-FUTURES') && (instType !== 'SUSDC-FUTURES')) {
-                url = this.urls['api']['demo']['public'];
+                if (uta) {
+                    url = this.urls['api']['demo']['utaPublic'];
+                }
+                else {
+                    url = this.urls['api']['demo']['public'];
+                }
             }
         }
         const request = {
@@ -1826,13 +1932,26 @@ class bitget extends bitget$1["default"] {
         return await this.watch(url, messageHash, message, messageHash);
     }
     async watchPublicMultiple(messageHashes, argsArray, params = {}) {
-        let url = this.urls['api']['ws']['public'];
+        let uta = undefined;
+        let url = undefined;
+        [uta, params] = this.handleOptionAndParams(params, 'watchPublicMultiple', 'uta', false);
+        if (uta) {
+            url = this.urls['api']['ws']['utaPublic'];
+        }
+        else {
+            url = this.urls['api']['ws']['public'];
+        }
         const sandboxMode = this.safeBool2(this.options, 'sandboxMode', 'sandbox', false);
         if (sandboxMode) {
             const argsArrayFirst = this.safeDict(argsArray, 0, {});
             const instType = this.safeString(argsArrayFirst, 'instType');
             if ((instType !== 'SCOIN-FUTURES') && (instType !== 'SUSDT-FUTURES') && (instType !== 'SUSDC-FUTURES')) {
-                url = this.urls['api']['demo']['public'];
+                if (uta) {
+                    url = this.urls['api']['demo']['utaPublic'];
+                }
+                else {
+                    url = this.urls['api']['demo']['public'];
+                }
             }
         }
         const request = {
@@ -1972,6 +2091,29 @@ class bitget extends bitget$1["default"] {
         //        ]
         //    }
         //
+        // uta
+        //
+        //     {
+        //         "action": "snapshot",
+        //         "arg": { "instType": "spot", topic: "ticker", symbol: "BTCUSDT" },
+        //         "data": [
+        //             {
+        //                 "highPrice24h": "120255.61",
+        //                 "lowPrice24h": "116145.88",
+        //                 "openPrice24h": "118919.38",
+        //                 "lastPrice": "119818.83",
+        //                 "turnover24h": "215859996.272276",
+        //                 "volume24h": "1819.756798",
+        //                 "bid1Price": "119811.26",
+        //                 "ask1Price": "119831.18",
+        //                 "bid1Size": "0.008732",
+        //                 "ask1Size": "0.004297",
+        //                 "price24hPcnt": "0.02002"
+        //             }
+        //         ],
+        //         "ts": 1753230479687
+        //     }
+        //
         if (this.handleErrorMessage(client, message)) {
             return;
         }
@@ -2012,7 +2154,7 @@ class bitget extends bitget$1["default"] {
             'account-crossed': this.handleBalance,
         };
         const arg = this.safeValue(message, 'arg', {});
-        const topic = this.safeValue(arg, 'channel', '');
+        const topic = this.safeValue2(arg, 'channel', 'topic', '');
         const method = this.safeValue(methods, topic);
         if (method !== undefined) {
             method.call(this, client, message);
@@ -2097,7 +2239,7 @@ class bitget extends bitget$1["default"] {
         const arg = this.safeDict(message, 'arg', {});
         const instType = this.safeStringLower(arg, 'instType');
         const type = (instType === 'spot') ? 'spot' : 'contract';
-        const instId = this.safeString(arg, 'instId');
+        const instId = this.safeString2(arg, 'instId', 'symbol');
         const market = this.safeMarket(instId, undefined, undefined, type);
         const symbol = market['symbol'];
         const messageHash = 'unsubscribe:ticker:' + market['symbol'];
@@ -2164,7 +2306,7 @@ class bitget extends bitget$1["default"] {
         }
         for (let i = 0; i < argsList.length; i++) {
             const arg = argsList[i];
-            const channel = this.safeString(arg, 'channel');
+            const channel = this.safeString2(arg, 'channel', 'topic');
             if (channel === 'books') {
                 // for now only unWatchOrderBook is supporteod
                 this.handleOrderBookUnSubscription(client, message);

package/dist/cjs/src/pro/bithumb.js

@@ -6,7 +6,7 @@ var bithumb$1 = require('../bithumb.js');
 var Cache = require('../base/ws/Cache.js');
 var errors = require('../base/errors.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 class bithumb extends bithumb$1["default"] {
     describe() {

package/dist/cjs/src/pro/bitmart.js

@@ -8,7 +8,7 @@ var Cache = require('../base/ws/Cache.js');
 var sha256 = require('../static_dependencies/noble-hashes/sha256.js');
 var OrderBookSide = require('../base/ws/OrderBookSide.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 class bitmart extends bitmart$1["default"] {
     describe() {

package/dist/cjs/src/pro/bitmex.js

@@ -7,7 +7,7 @@ var errors = require('../base/errors.js');
 var Cache = require('../base/ws/Cache.js');
 var sha256 = require('../static_dependencies/noble-hashes/sha256.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 class bitmex extends bitmex$1["default"] {
     describe() {

package/dist/cjs/src/pro/bitrue.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var bitrue$1 = require('../bitrue.js');
 var Cache = require('../base/ws/Cache.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 class bitrue extends bitrue$1["default"] {
     describe() {

package/dist/cjs/src/pro/bitstamp.js

@@ -7,7 +7,7 @@ var errors = require('../base/errors.js');
 var Cache = require('../base/ws/Cache.js');
 var Precise = require('../base/Precise.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 class bitstamp extends bitstamp$1["default"] {
     describe() {

package/dist/cjs/src/pro/bitvavo.js

@@ -7,7 +7,7 @@ var errors = require('../base/errors.js');
 var Cache = require('../base/ws/Cache.js');
 var sha256 = require('../static_dependencies/noble-hashes/sha256.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 class bitvavo extends bitvavo$1["default"] {
     describe() {

package/dist/cjs/src/pro/blockchaincom.js

@@ -6,7 +6,7 @@ var blockchaincom$1 = require('../blockchaincom.js');
 var errors = require('../base/errors.js');
 var Cache = require('../base/ws/Cache.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 class blockchaincom extends blockchaincom$1["default"] {
     describe() {

package/dist/cjs/src/pro/blofin.js

@@ -7,7 +7,7 @@ var errors = require('../base/errors.js');
 var Cache = require('../base/ws/Cache.js');
 var sha256 = require('../static_dependencies/noble-hashes/sha256.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 class blofin extends blofin$1["default"] {
     describe() {

package/dist/cjs/src/pro/bybit.js

@@ -7,7 +7,7 @@ var errors = require('../base/errors.js');
 var Cache = require('../base/ws/Cache.js');
 var sha256 = require('../static_dependencies/noble-hashes/sha256.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 class bybit extends bybit$1["default"] {
     describe() {
@@ -866,21 +866,14 @@ class bybit extends bybit$1["default"] {
             }
         }
         else {
-            if (!market['spot']) {
-                if (market['option']) {
-                    if ((limit !== 25) && (limit !== 100)) {
-                        throw new errors.BadRequest(this.id + ' watchOrderBookForSymbols() can only use limit 25 and 100 for option markets.');
-                    }
-                }
-                else if ((limit !== 1) && (limit !== 50) && (limit !== 200) && (limit !== 500)) {
-                    // bybit only support limit 1, 50, 200, 500 for contract
-                    throw new errors.BadRequest(this.id + ' watchOrderBookForSymbols() can only use limit 1, 50, 200 and 500 for swap and future markets.');
-                }
-            }
-            else {
-                if ((limit !== 1) && (limit !== 50) && (limit !== 200)) {
-                    throw new errors.BadRequest(this.id + ' watchOrderBookForSymbols() can only use limit 1,50, and 200 for spot markets.');
-                }
+            const limits = {
+                'spot': [1, 50, 200, 1000],
+                'option': [25, 100],
+                'default': [1, 50, 200, 500, 1000],
+            };
+            const selectedLimits = this.safeList2(limits, market['type'], 'default');
+            if (!this.inArray(limit, selectedLimits)) {
+                throw new errors.BadRequest(this.id + ' watchOrderBookForSymbols(): for ' + market['type'] + ' markets limit can be one of: ' + this.json(selectedLimits));
             }
         }
         const topics = [];

package/dist/cjs/src/pro/cex.js

@@ -8,7 +8,7 @@ var errors = require('../base/errors.js');
 var Precise = require('../base/Precise.js');
 var Cache = require('../base/ws/Cache.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 class cex extends cex$1["default"] {
     describe() {

package/dist/cjs/src/pro/coinbase.js

@@ -7,7 +7,7 @@ var errors = require('../base/errors.js');
 var Cache = require('../base/ws/Cache.js');
 var sha256 = require('../static_dependencies/noble-hashes/sha256.js');
 
-//  ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 //  ---------------------------------------------------------------------------
 class coinbase extends coinbase$1["default"] {
     describe() {