ccxt 4.5.2 → 4.5.4

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

@@ -922,10 +922,12 @@ class bitget extends bitget$1["default"] {
      * @description get the list of most recent trades for a particular symbol
      * @see https://www.bitget.com/api-doc/spot/websocket/public/Trades-Channel
      * @see https://www.bitget.com/api-doc/contract/websocket/public/New-Trades-Channel
+     * @see https://www.bitget.com/api-doc/uta/websocket/public/New-Trades-Channel
      * @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
+     * @param {boolean} [params.uta] set to true for the unified trading account (uta), defaults to false
      * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=public-trades}
      */
     async watchTrades(symbol, since = undefined, limit = undefined, params = {}) {
@@ -937,10 +939,12 @@ class bitget extends bitget$1["default"] {
      * @description get the list of most recent trades for a particular symbol
      * @see https://www.bitget.com/api-doc/spot/websocket/public/Trades-Channel
      * @see https://www.bitget.com/api-doc/contract/websocket/public/New-Trades-Channel
+     * @see https://www.bitget.com/api-doc/uta/websocket/public/New-Trades-Channel
      * @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
+     * @param {boolean} [params.uta] set to true for the unified trading account (uta), defaults to false
      * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=public-trades}
      */
     async watchTradesForSymbols(symbols, since = undefined, limit = undefined, params = {}) {
@@ -950,21 +954,28 @@ class bitget extends bitget$1["default"] {
         }
         await this.loadMarkets();
         symbols = this.marketSymbols(symbols);
+        let uta = undefined;
+        [uta, params] = this.handleOptionAndParams(params, 'watchTradesForSymbols', 'uta', false);
         const topics = [];
         const messageHashes = [];
         for (let i = 0; i < symbols.length; i++) {
             const symbol = symbols[i];
             const market = this.market(symbol);
             let instType = undefined;
-            [instType, params] = this.getInstType(market, false, params);
+            [instType, params] = this.getInstType(market, uta, params);
             const args = {
                 'instType': instType,
-                'channel': 'trade',
-                'instId': market['id'],
             };
+            const topicOrChannel = uta ? 'topic' : 'channel';
+            const symbolOrInstId = uta ? 'symbol' : 'instId';
+            args[topicOrChannel] = uta ? 'publicTrade' : 'trade';
+            args[symbolOrInstId] = market['id'];
             topics.push(args);
             messageHashes.push('trade:' + symbol);
         }
+        if (uta) {
+            params['uta'] = true;
+        }
         const trades = await this.watchPublicMultiple(messageHashes, topics, params);
         if (this.newUpdates) {
             const first = this.safeValue(trades, 0);
@@ -985,13 +996,17 @@ class bitget extends bitget$1["default"] {
      * @description unsubscribe from the trades channel
      * @see https://www.bitget.com/api-doc/spot/websocket/public/Trades-Channel
      * @see https://www.bitget.com/api-doc/contract/websocket/public/New-Trades-Channel
+     * @see https://www.bitget.com/api-doc/uta/websocket/public/New-Trades-Channel
      * @param {string} symbol unified symbol of the market to unwatch the trades 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 {any} status of the unwatch request
      */
     async unWatchTrades(symbol, params = {}) {
-        await this.loadMarkets();
-        return await this.unWatchChannel(symbol, 'trade', 'trade', params);
+        let uta = undefined;
+        [uta, params] = this.handleOptionAndParams(params, 'unWatchTrades', 'uta', false);
+        const channelTopic = uta ? 'publicTrade' : 'trade';
+        return await this.unWatchChannel(symbol, channelTopic, 'trade', params);
     }
     handleTrades(client, message) {
         //
@@ -1010,10 +1025,28 @@ class bitget extends bitget$1["default"] {
         //         "ts": 1701910980730
         //     }
         //
+        // uta
+        //
+        //     {
+        //         "action": "snapshot",
+        //         "arg": { "instType": "spot", "topic": "publicTrade", "symbol": "BTCUSDT" },
+        //         "data": [
+        //             {
+        //                 "T": "1756287827920",
+        //                 "P": "110878.5",
+        //                 "v": "0.07",
+        //                 "S": "buy",
+        //                 "L": "1344534089797185550"
+        //                 "i": "1344534089797185549"
+        //             },
+        //         ],
+        //         "ts": 1701910980730
+        //     }
+        //
         const arg = this.safeValue(message, 'arg', {});
-        const instType = this.safeString(arg, 'instType');
-        const marketType = (instType === 'SPOT') ? 'spot' : 'contract';
-        const marketId = this.safeString(arg, 'instId');
+        const instType = this.safeStringLower(arg, 'instType');
+        const marketType = (instType === 'spot') ? 'spot' : 'contract';
+        const marketId = this.safeString2(arg, 'instId', 'symbol');
         const market = this.safeMarket(marketId, undefined, undefined, marketType);
         const symbol = market['symbol'];
         let stored = this.safeValue(this.trades, symbol);
@@ -1092,13 +1125,57 @@ class bitget extends bitget$1["default"] {
         //           "uTime": "1714471204194"
         //        }
         //
+        // uta private
+        //
+        //     {
+        //         "symbol": "BTCUSDT",
+        //         "orderType": "market",
+        //         "updatedTime": "1736378720623",
+        //         "side": "buy",
+        //         "orderId": "1288888888888888888",
+        //         "execPnl": "0",
+        //         "feeDetail": [
+        //             {
+        //                 "feeCoin": "USDT",
+        //                 "fee": "0.569958"
+        //             }
+        //         ],
+        //         "execTime": "1736378720623",
+        //         "tradeScope": "taker",
+        //         "tradeSide": "open",
+        //         "execId": "1288888888888888888",
+        //         "execLinkId": "1288888888888888888",
+        //         "execPrice": "94993",
+        //         "holdSide": "long",
+        //         "execValue": "949.93",
+        //         "category": "USDT-FUTURES",
+        //         "execQty": "0.01",
+        //         "clientOid": "1288888888888888889"
+        // uta
+        //
+        //     {
+        //         "i": "1344534089797185549", // Fill execution ID
+        //         "L": "1344534089797185550", // Execution correlation ID
+        //         "p": "110878.5", // Fill price
+        //         "v": "0.07", // Fill size
+        //         "S": "buy", // Fill side
+        //         "T": "1756287827920" // Fill timestamp
+        //     }
+        //
         const instId = this.safeString2(trade, 'symbol', 'instId');
         const posMode = this.safeString(trade, 'posMode');
-        const defaultType = (posMode !== undefined) ? 'contract' : 'spot';
+        const category = this.safeString(trade, 'category');
+        let defaultType = undefined;
+        if (category !== undefined) {
+            defaultType = (category !== 'SPOT') ? 'contract' : 'spot';
+        }
+        else {
+            defaultType = (posMode !== undefined) ? 'contract' : 'spot';
+        }
         if (market === undefined) {
             market = this.safeMarket(instId, undefined, undefined, defaultType);
         }
-        const timestamp = this.safeIntegerN(trade, ['uTime', 'cTime', 'ts']);
+        const timestamp = this.safeIntegerN(trade, ['uTime', 'cTime', 'ts', 'T', 'execTime']);
         const feeDetail = this.safeList(trade, 'feeDetail', []);
         const first = this.safeDict(feeDetail, 0);
         let fee = undefined;
@@ -1106,23 +1183,23 @@ class bitget extends bitget$1["default"] {
             const feeCurrencyId = this.safeString(first, 'feeCoin');
             const feeCurrencyCode = this.safeCurrencyCode(feeCurrencyId);
             fee = {
-                'cost': Precise["default"].stringAbs(this.safeString(first, 'totalFee')),
+                'cost': Precise["default"].stringAbs(this.safeString2(first, 'totalFee', 'fee')),
                 'currency': feeCurrencyCode,
             };
         }
         return this.safeTrade({
             'info': trade,
-            'id': this.safeString(trade, 'tradeId'),
-            'order': this.safeString(trade, 'orderId'),
+            'id': this.safeStringN(trade, ['tradeId', 'i', 'execId']),
+            'order': this.safeString2(trade, 'orderId', 'L'),
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
             'symbol': market['symbol'],
             'type': this.safeString(trade, 'orderType'),
-            'side': this.safeString(trade, 'side'),
+            'side': this.safeString2(trade, 'side', 'S'),
             'takerOrMaker': this.safeString(trade, 'tradeScope'),
-            'price': this.safeString2(trade, 'priceAvg', 'price'),
-            'amount': this.safeString2(trade, 'size', 'baseVolume'),
-            'cost': this.safeString2(trade, 'amount', 'quoteVolume'),
+            'price': this.safeStringN(trade, ['priceAvg', 'price', 'execPrice', 'P']),
+            'amount': this.safeStringN(trade, ['size', 'baseVolume', 'execQty', 'v']),
+            'cost': this.safeStringN(trade, ['amount', 'quoteVolume', 'execValue']),
             'fee': fee,
         }, market);
     }
@@ -1718,11 +1795,13 @@ class bitget extends bitget$1["default"] {
      * @method
      * @name bitget#watchMyTrades
      * @description watches trades made by the user
-     * @see https://www.bitget.com/api-doc/contract/websocket/private/Order-Channel
+     * @see https://www.bitget.com/api-doc/contract/websocket/private/Fill-Channel
+     * @see https://www.bitget.com/api-doc/uta/websocket/private/Fill-Channel
      * @param {str} symbol unified market symbol
      * @param {int} [since] the earliest time in ms to fetch trades for
      * @param {int} [limit] the maximum number of trades structures to retrieve
      * @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 list of [trade structures]{@link https://docs.ccxt.com/#/?id=trade-structure}
      */
     async watchMyTrades(symbol = undefined, since = undefined, limit = undefined, params = {}) {
@@ -1737,18 +1816,29 @@ class bitget extends bitget$1["default"] {
         let type = undefined;
         [type, params] = this.handleMarketTypeAndParams('watchMyTrades', market, params);
         let instType = undefined;
+        let uta = undefined;
+        [uta, params] = this.handleOptionAndParams(params, 'watchMyTrades', 'uta', false);
         if (market === undefined && type === 'spot') {
-            instType = 'spot';
+            instType = 'SPOT';
         }
         else {
-            [instType, params] = this.getInstType(market, false, params);
+            [instType, params] = this.getInstType(market, uta, params);
+        }
+        if (uta) {
+            instType = 'UTA';
         }
         const subscriptionHash = 'fill:' + instType;
         const args = {
             'instType': instType,
-            'channel': 'fill',
-            'instId': 'default',
         };
+        const topicOrChannel = uta ? 'topic' : 'channel';
+        args[topicOrChannel] = 'fill';
+        if (!uta) {
+            args['instId'] = 'default';
+        }
+        else {
+            params['uta'] = true;
+        }
         const trades = await this.watchPrivate(messageHash, subscriptionHash, args, params);
         if (this.newUpdates) {
             limit = trades.getLimit(symbol, limit);
@@ -1827,6 +1917,44 @@ class bitget extends bitget$1["default"] {
         //         "ts": 1714471276629
         //     }
         //
+        // uta
+        //
+        //     {
+        //         "data": [
+        //             {
+        //                 "symbol": "BTCUSDT",
+        //                 "orderType": "market",
+        //                 "updatedTime": "1736378720623",
+        //                 "side": "buy",
+        //                 "orderId": "1288888888888888888",
+        //                 "execPnl": "0",
+        //                 "feeDetail": [
+        //                     {
+        //                         "feeCoin": "USDT",
+        //                         "fee": "0.569958"
+        //                     }
+        //                 ],
+        //                 "execTime": "1736378720623",
+        //                 "tradeScope": "taker",
+        //                 "tradeSide": "open",
+        //                 "execId": "1288888888888888888",
+        //                 "execLinkId": "1288888888888888888",
+        //                 "execPrice": "94993",
+        //                 "holdSide": "long",
+        //                 "execValue": "949.93",
+        //                 "category": "USDT-FUTURES",
+        //                 "execQty": "0.01",
+        //                 "clientOid": "1288888888888888889"
+        //             }
+        //         ],
+        //         "arg": {
+        //             "instType": "UTA",
+        //             "topic": "fill"
+        //         },
+        //         "action": "snapshot",
+        //         "ts": 1733904123981
+        //     }
+        //
         if (this.myTrades === undefined) {
             const limit = this.safeInteger(this.options, 'tradesLimit', 1000);
             this.myTrades = new Cache.ArrayCache(limit);
@@ -2089,12 +2217,25 @@ class bitget extends bitget$1["default"] {
         return await future;
     }
     async watchPrivate(messageHash, subscriptionHash, args, params = {}) {
-        let url = this.urls['api']['ws']['private'];
+        let uta = undefined;
+        let url = undefined;
+        [uta, params] = this.handleOptionAndParams(params, 'watchPrivate', 'uta', false);
+        if (uta) {
+            url = this.urls['api']['ws']['utaPrivate'];
+        }
+        else {
+            url = this.urls['api']['ws']['private'];
+        }
         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']['private'];
+                if (uta) {
+                    url = this.urls['api']['demo']['utaPrivate'];
+                }
+                else {
+                    url = this.urls['api']['demo']['private'];
+                }
             }
         }
         await this.authenticate({ 'url': url });
@@ -2253,6 +2394,7 @@ class bitget extends bitget$1["default"] {
         const methods = {
             'ticker': this.handleTicker,
             'trade': this.handleTrades,
+            'publicTrade': this.handleTrades,
             'fill': this.handleMyTrades,
             'orders': this.handleOrder,
             'ordersAlgo': this.handleOrder,
@@ -2326,7 +2468,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:trade:' + market['symbol'];
@@ -2443,7 +2585,7 @@ class bitget extends bitget$1["default"] {
                 // for now only unWatchOrderBook is supporteod
                 this.handleOrderBookUnSubscription(client, message);
             }
-            else if (channel === 'trade') {
+            else if ((channel === 'trade') || (channel === 'publicTrade')) {
                 this.handleTradesUnSubscription(client, message);
             }
             else if (channel === 'ticker') {

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

@@ -445,13 +445,13 @@ class bybit extends bybit$1["default"] {
      * @description unWatches a price ticker
      * @see https://bybit-exchange.github.io/docs/v5/websocket/public/ticker
      * @see https://bybit-exchange.github.io/docs/v5/websocket/public/etp-ticker
-     * @param {string[]} symbols unified symbol of the market to fetch the ticker for
+     * @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}
      */
-    async unWatchTicker(symbols, params = {}) {
+    async unWatchTicker(symbol, params = {}) {
         await this.loadMarkets();
-        return await this.unWatchTickers([symbols], params);
+        return await this.unWatchTickers([symbol], params);
     }
     handleTicker(client, message) {
         //
@@ -1243,11 +1243,13 @@ class bybit extends bybit$1["default"] {
      * @name bybit#watchMyTrades
      * @description watches information on multiple trades made by the user
      * @see https://bybit-exchange.github.io/docs/v5/websocket/private/execution
+     * @see https://bybit-exchange.github.io/docs/v5/websocket/private/fast-execution
      * @param {string} symbol unified market symbol of the market orders were made in
      * @param {int} [since] the earliest time in ms to fetch orders for
      * @param {int} [limit] the maximum number of order structures to retrieve
      * @param {object} [params] extra parameters specific to the exchange API endpoint
      * @param {boolean} [params.unifiedMargin] use unified margin account
+     * @param {boolean} [params.executionFast] use fast execution
      * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
      */
     async watchMyTrades(symbol = undefined, since = undefined, limit = undefined, params = {}) {
@@ -1265,7 +1267,12 @@ class bybit extends bybit$1["default"] {
             'unified': 'execution',
             'usdc': 'user.openapi.perp.trade',
         };
-        const topic = this.safeValue(topicByMarket, this.getPrivateType(url));
+        let topic = this.safeValue(topicByMarket, this.getPrivateType(url));
+        let executionFast = false;
+        [executionFast, params] = this.handleOptionAndParams(params, 'watchMyTrades', 'executionFast', false);
+        if (executionFast) {
+            topic = 'execution.fast';
+        }
         const trades = await this.watchTopics(url, [messageHash], [topic], params);
         if (this.newUpdates) {
             limit = trades.getLimit(symbol, limit);
@@ -1277,9 +1284,11 @@ class bybit extends bybit$1["default"] {
      * @name bybit#unWatchMyTrades
      * @description unWatches information on multiple trades made by the user
      * @see https://bybit-exchange.github.io/docs/v5/websocket/private/execution
+     * @see https://bybit-exchange.github.io/docs/v5/websocket/private/fast-execution
      * @param {string} symbol unified market symbol of the market orders were made in
      * @param {object} [params] extra parameters specific to the exchange API endpoint
      * @param {boolean} [params.unifiedMargin] use unified margin account
+     * @param {boolean} [params.executionFast] use fast execution
      * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
      */
     async unWatchMyTrades(symbol = undefined, params = {}) {
@@ -1297,7 +1306,12 @@ class bybit extends bybit$1["default"] {
             'unified': 'execution',
             'usdc': 'user.openapi.perp.trade',
         };
-        const topic = this.safeValue(topicByMarket, this.getPrivateType(url));
+        let topic = this.safeValue(topicByMarket, this.getPrivateType(url));
+        let executionFast = false;
+        [executionFast, params] = this.handleOptionAndParams(params, 'watchMyTrades', 'executionFast', false);
+        if (executionFast) {
+            topic = 'execution.fast';
+        }
         return await this.unWatchTopics(url, 'myTrades', [], [messageHash], [subHash], [topic], params);
     }
     handleMyTrades(client, message) {
@@ -1363,8 +1377,31 @@ class bybit extends bybit$1["default"] {
         //         ]
         //     }
         //
+        // execution.fast
+        //
+        //     {
+        //         "topic": "execution.fast",
+        //         "creationTime": 1757405601981,
+        //         "data": [
+        //             {
+        //                 "category": "linear",
+        //                 "symbol": "BTCUSDT",
+        //                 "execId": "ffcac6ac-7571-536d-a28a-847dd7d08a0f",
+        //                 "execPrice": "112529.6",
+        //                 "execQty": "0.001",
+        //                 "orderId": "6e25ab73-7a55-4ae7-adc2-8ea95f167c85",
+        //                 "isMaker": false,
+        //                 "orderLinkId": "test-00001",
+        //                 "side": "Buy",
+        //                 "execTime": "1757405601977",
+        //                 "seq": 9515624038
+        //             }
+        //         ]
+        //     }
+        //
         const topic = this.safeString(message, 'topic');
         const spot = topic === 'ticketInfo';
+        const executionFast = topic === 'execution.fast';
         let data = this.safeValue(message, 'data', []);
         if (!Array.isArray(data)) {
             data = this.safeValue(data, 'result', []);
@@ -1379,12 +1416,15 @@ class bybit extends bybit$1["default"] {
         for (let i = 0; i < data.length; i++) {
             const rawTrade = data[i];
             let parsed = undefined;
-            if (spot) {
+            if (spot && !executionFast) {
                 parsed = this.parseWsTrade(rawTrade);
             }
             else {
                 // filter unified trades
-                const execType = this.safeString(rawTrade, 'execType', '');
+                let execType = this.safeString(rawTrade, 'execType', '');
+                if (executionFast) {
+                    execType = 'Trade';
+                }
                 if (!this.inArray(execType, filterExecTypes)) {
                     continue;
                 }
@@ -2340,12 +2380,13 @@ class bybit extends bybit$1["default"] {
         }
     }
     handleMessage(client, message) {
+        const topic = this.safeString2(message, 'topic', 'op', '');
         if (this.handleErrorMessage(client, message)) {
             return;
         }
         // contract pong
         const ret_msg = this.safeString(message, 'ret_msg');
-        if (ret_msg === 'pong') {
+        if ((ret_msg === 'pong') || (topic === 'pong')) {
             this.handlePong(client, message);
             return;
         }
@@ -2357,11 +2398,10 @@ class bybit extends bybit$1["default"] {
         }
         // pong
         const event = this.safeString(message, 'event');
-        if (event === 'sub') {
+        if (event === 'sub' || (topic === 'subscribe')) {
             this.handleSubscriptionStatus(client, message);
             return;
         }
-        const topic = this.safeString2(message, 'topic', 'op', '');
         const methods = {
             'orderbook': this.handleOrderBook,
             'kline': this.handleOHLCV,
@@ -2374,6 +2414,7 @@ class bybit extends bybit$1["default"] {
             'wallet': this.handleBalance,
             'outboundAccountInfo': this.handleBalance,
             'execution': this.handleMyTrades,
+            'execution.fast': this.handleMyTrades,
             'ticketInfo': this.handleMyTrades,
             'user.openapi.perp.trade': this.handleMyTrades,
             'position': this.handlePositions,
@@ -2423,6 +2464,14 @@ class bybit extends bybit$1["default"] {
         //
         //   { pong: 1653296711335 }
         //
+        //
+        //   {
+        //       "req_id": "2",
+        //       "op": "pong",
+        //       "args": [ "1757405570352" ],
+        //       "conn_id": "d266o6hqo29sqmnq4vk0-1yus1"
+        //   }
+        //
         client.lastPong = this.safeInteger(message, 'pong');
         return message;
     }
@@ -2442,6 +2491,13 @@ class bybit extends bybit$1["default"] {
         //        "connId":"cojifin88smerbj9t560-404"
         //    }
         //
+        //    {
+        //        "success": true,
+        //        "ret_msg": "",
+        //        "op": "auth",
+        //        "conn_id": "d266o6hqo29sqmnq4vk0-1yus1"
+        //    }
+        //
         const success = this.safeValue(message, 'success');
         const code = this.safeInteger(message, 'retCode');
         const messageHash = 'authenticated';
@@ -2507,7 +2563,7 @@ class bybit extends bybit$1["default"] {
                 for (let j = 0; j < messageHashes.length; j++) {
                     const unsubHash = messageHashes[j];
                     const subHash = subMessageHashes[j];
-                    const usePrefix = (subHash === 'orders') || (subHash === 'myTrades');
+                    const usePrefix = (subHash === 'orders') || (subHash === 'myTrades') || (subHash === 'positions');
                     this.cleanUnsubscription(client, subHash, unsubHash, usePrefix);
                 }
                 this.cleanCache(subscription);

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

@@ -755,7 +755,6 @@ class coinex extends coinex$1["default"] {
         let type = undefined;
         let callerMethodName = undefined;
         [callerMethodName, params] = this.handleParamString(params, 'callerMethodName', 'watchOrderBookForSymbols');
-        [type, params] = this.handleMarketTypeAndParams(callerMethodName, undefined, params);
         const options = this.safeDict(this.options, 'watchOrderBook', {});
         const limits = this.safeList(options, 'limits', []);
         if (limit === undefined) {
@@ -772,17 +771,16 @@ class coinex extends coinex$1["default"] {
         }
         params = this.omit(params, 'aggregation');
         const symbolsDefined = (symbols !== undefined);
-        if (symbolsDefined) {
-            for (let i = 0; i < symbols.length; i++) {
-                const symbol = symbols[i];
-                market = this.market(symbol);
-                messageHashes.push('orderbook:' + market['symbol']);
-                watchOrderBookSubscriptions[symbol] = [market['id'], limit, aggregation, true];
-            }
+        if (!symbolsDefined) {
+            throw new errors.ArgumentsRequired(this.id + ' watchOrderBookForSymbols() requires a symbol argument');
         }
-        else {
-            messageHashes.push('orderbook');
+        for (let i = 0; i < symbols.length; i++) {
+            const symbol = symbols[i];
+            market = this.market(symbol);
+            messageHashes.push('orderbook:' + market['symbol']);
+            watchOrderBookSubscriptions[symbol] = [market['id'], limit, aggregation, true];
         }
+        [type, params] = this.handleMarketTypeAndParams(callerMethodName, market, params);
         const marketList = Object.values(watchOrderBookSubscriptions);
         const subscribe = {
             'method': 'depth.subscribe',
@@ -849,7 +847,8 @@ class coinex extends coinex$1["default"] {
         //         "id": null
         //     }
         //
-        const defaultType = this.safeString(this.options, 'defaultType');
+        const isSpot = client.url.indexOf('spot') > -1;
+        const defaultType = isSpot ? 'spot' : 'swap';
         const data = this.safeDict(message, 'data', {});
         const depth = this.safeDict(data, 'depth', {});
         const marketId = this.safeString(data, 'market');