ccxt 4.1.84 → 4.1.86

package/dist/ccxt.browser.js

@@ -1430,7 +1430,7 @@ class Exchange extends _base_Exchange_js__WEBPACK_IMPORTED_MODULE_0__/* .Exchang
 //  ---------------------------------------------------------------------------
 /**
  * @class ace
- * @extends Exchange
+ * @augments Exchange
  */
 class ace extends _abstract_ace_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -2494,7 +2494,7 @@ class ace extends _abstract_ace_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
 //  ---------------------------------------------------------------------------xs
 /**
  * @class alpaca
- * @extends Exchange
+ * @augments Exchange
  */
 class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -2982,7 +2982,7 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @param {string} [params.loc] crypto location, default: us
          * @returns {object} A dictionary of [order book structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-book-structure} indexed by market symbols
-        */
+         */
         await this.loadMarkets();
         const market = this.market(symbol);
         const id = market['id'];
@@ -3625,7 +3625,7 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 //  ---------------------------------------------------------------------------
 /**
  * @class ascendex
- * @extends Exchange
+ * @augments Exchange
  */
 class ascendex extends _abstract_ascendex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -5276,7 +5276,7 @@ class ascendex extends _abstract_ascendex_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @description create a list of trade orders
          * @see https://ascendex.github.io/ascendex-pro-api/#place-batch-orders
          * @see https://ascendex.github.io/ascendex-futures-pro-api-v2/#place-batch-orders
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @param {string} [params.timeInForce] "GTC", "IOC", "FOK", or "PO"
          * @param {bool} [params.postOnly] true or false
@@ -7686,6 +7686,26 @@ class Exchange {
         }
         return chosenAgent;
     }
+    async loadHttpProxyAgent() {
+        // for `http://` protocol proxy-urls, we need to load `http` module only on first call
+        if (!this.httpAgent) {
+            const httpModule = await import(/* webpackIgnore: true */ 'node:http');
+            this.httpAgent = new httpModule.Agent();
+        }
+        return this.httpAgent;
+    }
+    getHttpAgentIfNeeded(url) {
+        if (isNode) {
+            // only for non-ssl proxy
+            if (url.substring(0, 5) === 'ws://') {
+                if (this.httpAgent === undefined) {
+                    throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__.NotSupported(this.id + ' to use proxy with non-ssl ws:// urls, at first run  `await exchange.loadHttpProxyAgent()` method');
+                }
+                return this.httpAgent;
+            }
+        }
+        return undefined;
+    }
     async fetch(url, method = 'GET', headers = undefined, body = undefined) {
         // load node-http(s) modules only on first call
         if (isNode) {
@@ -7699,18 +7719,16 @@ class Exchange {
         headers = this.extend(this.headers, headers);
         // proxy-url
         const proxyUrl = this.checkProxyUrlSettings(url, method, headers, body);
-        let isHttpAgentNeeded = false;
+        let httpProxyAgent = false;
         if (proxyUrl !== undefined) {
-            // in node we need to set header to *
+            // part only for node-js
             if (isNode) {
+                // in node we need to set header to *
                 headers = this.extend({ 'Origin': this.origin }, headers);
-                if (proxyUrl.substring(0, 5) !== 'https') {
-                    // for `http://` protocol proxy-urls, we need to load `http` module only on first call
-                    if (!this.httpAgent) {
-                        const httpModule = await import(/* webpackIgnore: true */ 'node:http');
-                        this.httpAgent = new httpModule.Agent();
-                    }
-                    isHttpAgentNeeded = true;
+                // only for http proxy
+                if (proxyUrl.substring(0, 5) === 'http:') {
+                    await this.loadHttpProxyAgent();
+                    httpProxyAgent = this.httpAgent;
                 }
             }
             url = proxyUrl + url;
@@ -7763,9 +7781,9 @@ class Exchange {
             params['agent'] = this.agent;
         }
         // override agent, if needed
-        if (isHttpAgentNeeded) {
-            // if proxyUrl is being used, so we don't overwrite `this.agent` itself
-            params['agent'] = this.httpAgent;
+        if (httpProxyAgent) {
+            // if proxyUrl is being used, then specifically in nodejs, we need http module, not https
+            params['agent'] = httpProxyAgent;
         }
         else if (chosenAgent) {
             // if http(s)Proxy is being used
@@ -7974,7 +7992,9 @@ class Exchange {
             // proxy agents
             const [httpProxy, httpsProxy, socksProxy] = this.checkWsProxySettings();
             const chosenAgent = this.setProxyAgents(httpProxy, httpsProxy, socksProxy);
-            const finalAgent = chosenAgent ? chosenAgent : this.agent;
+            // part only for node-js
+            const httpProxyAgent = this.getHttpAgentIfNeeded(url);
+            const finalAgent = chosenAgent ? chosenAgent : (httpProxyAgent ? httpProxyAgent : this.agent);
             //
             const options = this.deepExtend(this.streaming, {
                 'log': this.log ? this.log.bind(this) : this.log,
@@ -8324,7 +8344,8 @@ class Exchange {
         const usedProxies = [];
         let wsProxy = undefined;
         let wssProxy = undefined;
-        // wsProxy
+        let wsSocksProxy = undefined;
+        // ws proxy
         if (this.wsProxy !== undefined) {
             usedProxies.push('wsProxy');
             wsProxy = this.wsProxy;
@@ -8333,7 +8354,7 @@ class Exchange {
             usedProxies.push('ws_proxy');
             wsProxy = this.ws_proxy;
         }
-        // wsProxy
+        // wss proxy
         if (this.wssProxy !== undefined) {
             usedProxies.push('wssProxy');
             wssProxy = this.wssProxy;
@@ -8342,13 +8363,22 @@ class Exchange {
             usedProxies.push('wss_proxy');
             wssProxy = this.wss_proxy;
         }
+        // ws socks proxy
+        if (this.wsSocksProxy !== undefined) {
+            usedProxies.push('wsSocksProxy');
+            wsSocksProxy = this.wsSocksProxy;
+        }
+        if (this.ws_socks_proxy !== undefined) {
+            usedProxies.push('ws_socks_proxy');
+            wsSocksProxy = this.ws_socks_proxy;
+        }
         // check
         const length = usedProxies.length;
         if (length > 1) {
             const joinedProxyNames = usedProxies.join(',');
-            throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__.ExchangeError(this.id + ' you have multiple conflicting settings (' + joinedProxyNames + '), please use only one from: wsProxy, wssProxy');
+            throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__.ExchangeError(this.id + ' you have multiple conflicting settings (' + joinedProxyNames + '), please use only one from: wsProxy, wssProxy, socksProxy');
         }
-        return [wsProxy, wssProxy];
+        return [wsProxy, wssProxy, wsSocksProxy];
     }
     checkConflictingProxies(proxyAgentSet, proxyUrlSet) {
         if (proxyAgentSet && proxyUrlSet) {
@@ -10689,6 +10719,9 @@ class Exchange {
     async closeAllPositions(params = {}) {
         throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__.NotSupported(this.id + ' closeAllPositions() is not supported yet');
     }
+    async fetchL3OrderBook(symbol, limit = undefined, params = {}) {
+        throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__.BadRequest(this.id + ' fetchL3OrderBook() is not supported yet');
+    }
     parseLastPrice(price, market = undefined) {
         throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__.NotSupported(this.id + ' parseLastPrice() is not supported yet');
     }
@@ -11255,8 +11288,8 @@ class Exchange {
         /**
          * @ignore
          * @method
-         * * Must add timeInForce to this.options to use this method
-         * @return {string} returns the exchange specific value for timeInForce
+         * Must add timeInForce to this.options to use this method
+         * @returns {string} returns the exchange specific value for timeInForce
          */
         const timeInForce = this.safeStringUpper(params, 'timeInForce'); // supported values GTC, IOC, PO
         if (timeInForce !== undefined) {
@@ -11272,7 +11305,7 @@ class Exchange {
         /**
          * @ignore
          * @method
-         * * Must add accountsByType to this.options to use this method
+         * Must add accountsByType to this.options to use this method
          * @param {string} account key for account name in this.options['accountsByType']
          * @returns the exchange specific account name or the isolated margin id for transfers
          */
@@ -15041,7 +15074,7 @@ class bequant extends _hitbtc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .
 //  ---------------------------------------------------------------------------
 /**
  * @class bigone
- * @extends Exchange
+ * @augments Exchange
  */
 class bigone extends _abstract_bigone_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -16996,7 +17029,7 @@ class bigone extends _abstract_bigone_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 //  ---------------------------------------------------------------------------
 /**
  * @class binance
- * @extends Exchange
+ * @augments Exchange
  */
 class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -21376,7 +21409,7 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
          * @name binance#createOrders
          * @description *contract only* create a list of trade orders
          * @see https://binance-docs.github.io/apidocs/futures/en/#place-multiple-orders-trade
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
@@ -28725,7 +28758,7 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
          * @description create a list of trade orders
          * @see https://bingx-api.github.io/docs/#/spot/trade-api.html#Batch%20Placing%20Orders
          * @see https://bingx-api.github.io/docs/#/swapV2/trade-api.html#Bulk%20order
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
@@ -28922,6 +28955,9 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
         const positionSide = this.safeString2(order, 'positionSide', 'ps');
         const marketType = (positionSide === undefined) ? 'spot' : 'swap';
         const marketId = this.safeString2(order, 'symbol', 's');
+        if (market === undefined) {
+            market = this.safeMarket(marketId, undefined, undefined, marketType);
+        }
         const symbol = this.safeSymbol(marketId, market, '-', marketType);
         const orderId = this.safeString2(order, 'orderId', 'i');
         const side = this.safeStringLower2(order, 'side', 'S');
@@ -29287,16 +29323,15 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
          * @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}
          */
-        if (symbol === undefined) {
-            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ArgumentsRequired(this.id + ' fetchOrders() requires a symbol argument');
-        }
         await this.loadMarkets();
-        const market = this.market(symbol);
-        const request = {
-            'symbol': market['id'],
-        };
+        let market = undefined;
+        const request = {};
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+            request['symbol'] = market['id'];
+        }
         let response = undefined;
-        const [marketType, query] = this.handleMarketTypeAndParams('fetchOrder', market, params);
+        const [marketType, query] = this.handleMarketTypeAndParams('fetchOpenOrders', market, params);
         if (marketType === 'spot') {
             response = await this.spotV1PrivateGetTradeOpenOrders(this.extend(request, query));
         }
@@ -30409,7 +30444,7 @@ class bingx extends _abstract_bingx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
 //  ---------------------------------------------------------------------------
 /**
  * @class bit2c
- * @extends Exchange
+ * @augments Exchange
  */
 class bit2c extends _abstract_bit2c_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -31328,7 +31363,7 @@ class bit2c extends _abstract_bit2c_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
 //  ---------------------------------------------------------------------------
 /**
  * @class bitbank
- * @extends Exchange
+ * @augments Exchange
  */
 class bitbank extends _abstract_bitbank_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -32362,7 +32397,7 @@ class bitbay extends _zonda_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z
 //  ---------------------------------------------------------------------------
 /**
  * @class bitbns
- * @extends Exchange
+ * @augments Exchange
  */
 class bitbns extends _abstract_bitbns_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -33615,7 +33650,7 @@ class bitcoincom extends _fmfwio_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
 //  ---------------------------------------------------------------------------
 /**
  * @class bitfinex
- * @extends Exchange
+ * @augments Exchange
  */
 class bitfinex extends _abstract_bitfinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -35296,7 +35331,7 @@ class bitfinex extends _abstract_bitfinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
 // ---------------------------------------------------------------------------
 /**
  * @class bitfinex2
- * @extends Exchange
+ * @augments Exchange
  */
 class bitfinex2 extends _abstract_bitfinex2_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -38297,7 +38332,7 @@ class bitfinex2 extends _abstract_bitfinex2_js__WEBPACK_IMPORTED_MODULE_0__/* ["
 //  ---------------------------------------------------------------------------
 /**
  * @class bitflyer
- * @extends Exchange
+ * @augments Exchange
  */
 class bitflyer extends _abstract_bitflyer_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -39350,7 +39385,7 @@ class bitflyer extends _abstract_bitflyer_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
 //  ---------------------------------------------------------------------------
 /**
  * @class bitforex
- * @extends Exchange
+ * @augments Exchange
  */
 class bitforex extends _abstract_bitforex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -40213,7 +40248,7 @@ class bitforex extends _abstract_bitforex_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
 //  ---------------------------------------------------------------------------
 /**
  * @class bitget
- * @extends Exchange
+ * @augments Exchange
  */
 class bitget extends _abstract_bitget_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -43930,7 +43965,7 @@ class bitget extends _abstract_bitget_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @see https://bitgetlimited.github.io/apidoc/en/mix/#batch-order
          * @see https://bitgetlimited.github.io/apidoc/en/margin/#isolated-batch-order
          * @see https://bitgetlimited.github.io/apidoc/en/margin/#cross-batch-order
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @param {object} [params] extra parameters specific to the api endpoint
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
@@ -46184,7 +46219,6 @@ class bitget extends _abstract_bitget_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @param {string} symbol not used by bitget setPositionMode ()
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} response from the exchange
-         *
          */
         await this.loadMarkets();
         const sandboxMode = this.safeValue(this.options, 'sandboxMode', false);
@@ -47390,7 +47424,7 @@ class bitget extends _abstract_bitget_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 //  ---------------------------------------------------------------------------
 /**
  * @class bithumb
- * @extends Exchange
+ * @augments Exchange
  */
 class bithumb extends _abstract_bithumb_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -48325,11 +48359,11 @@ class bithumb extends _abstract_bithumb_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
         };
         return await this.privatePostTradeCancel(this.extend(request, params));
     }
-    cancelUnifiedOrder(order, params = {}) {
+    async cancelUnifiedOrder(order, params = {}) {
         const request = {
             'side': order['side'],
         };
-        return this.cancelOrder(order['id'], order['symbol'], this.extend(request, params));
+        return await this.cancelOrder(order['id'], order['symbol'], this.extend(request, params));
     }
     async withdraw(code, amount, address, tag = undefined, params = {}) {
         /**
@@ -48490,7 +48524,7 @@ class bithumb extends _abstract_bithumb_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 //  ---------------------------------------------------------------------------
 /**
  * @class bitmart
- * @extends Exchange
+ * @augments Exchange
  */
 class bitmart extends _abstract_bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -49814,48 +49848,58 @@ class bitmart extends _abstract_bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
         //
         // public fetchTrades spot ( amount = count * price )
         //
-        //     {
-        //          "amount": "818.94",
-        //          "order_time": "1637601839035",    // ETH/USDT
-        //          "price": "4221.99",
-        //          "count": "0.19397",
-        //          "type": "buy"
-        //      }
+        //    {
+        //        "amount": "818.94",
+        //        "order_time": "1637601839035",    // ETH/USDT
+        //        "price": "4221.99",
+        //        "count": "0.19397",
+        //        "type": "buy"
+        //    }
         //
         // spot: fetchMyTrades
         //
-        //     {
-        //         "tradeId":"182342999769370687",
-        //         "orderId":"183270218784142990",
-        //         "clientOrderId":"183270218784142990",
-        //         "symbol":"ADA_USDT",
-        //         "side":"buy",
-        //         "orderMode":"spot",
-        //         "type":"market",
-        //         "price":"0.245948",
-        //         "size":"20.71",
-        //         "notional":"5.09358308",
-        //         "fee":"0.00509358",
-        //         "feeCoinName":"USDT",
-        //         "tradeRole":"taker",
-        //         "createTime":1695658457836,
-        //     }
+        //    {
+        //        "tradeId":"182342999769370687",
+        //        "orderId":"183270218784142990",
+        //        "clientOrderId":"183270218784142990",
+        //        "symbol":"ADA_USDT",
+        //        "side":"buy",
+        //        "orderMode":"spot",
+        //        "type":"market",
+        //        "price":"0.245948",
+        //        "size":"20.71",
+        //        "notional":"5.09358308",
+        //        "fee":"0.00509358",
+        //        "feeCoinName":"USDT",
+        //        "tradeRole":"taker",
+        //        "createTime":1695658457836,
+        //    }
         //
         // swap: fetchMyTrades
         //
-        //     {
-        //         "order_id": "230930336848609",
-        //         "trade_id": "6212604014",
-        //         "symbol": "BTCUSDT",
-        //         "side": 3,
-        //         "price": "26910.4",
-        //         "vol": "1",
-        //         "exec_type": "Taker",
-        //         "profit": false,
-        //         "create_time": 1695961596692,
-        //         "realised_profit": "-0.0003",
-        //         "paid_fees": "0.01614624"
-        //     }
+        //    {
+        //        "order_id": "230930336848609",
+        //        "trade_id": "6212604014",
+        //        "symbol": "BTCUSDT",
+        //        "side": 3,
+        //        "price": "26910.4",
+        //        "vol": "1",
+        //        "exec_type": "Taker",
+        //        "profit": false,
+        //        "create_time": 1695961596692,
+        //        "realised_profit": "-0.0003",
+        //        "paid_fees": "0.01614624"
+        //    }
+        //
+        // ws swap
+        //
+        //    {
+        //        'fee': '-0.000044502',
+        //        'feeCcy': 'USDT',
+        //        'fillPrice': '74.17',
+        //        'fillQty': '1',
+        //        'lastTradeID': 6802340762
+        //    }
         //
         const timestamp = this.safeIntegerN(trade, ['order_time', 'createTime', 'create_time']);
         const isPublicTrade = ('order_time' in trade);
@@ -49869,7 +49913,7 @@ class bitmart extends _abstract_bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
             side = this.safeString(trade, 'type');
         }
         else {
-            amount = this.safeString2(trade, 'size', 'vol');
+            amount = this.safeStringN(trade, ['size', 'vol', 'fillQty']);
             cost = this.safeString(trade, 'notional');
             type = this.safeString(trade, 'type');
             side = this.parseOrderSide(this.safeString(trade, 'side'));
@@ -49891,14 +49935,14 @@ class bitmart extends _abstract_bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
         }
         return this.safeTrade({
             'info': trade,
-            'id': this.safeString2(trade, 'tradeId', 'trade_id'),
+            'id': this.safeStringN(trade, ['tradeId', 'trade_id', 'lastTradeID']),
             'order': this.safeString2(trade, 'orderId', 'order_id'),
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
             'symbol': market['symbol'],
             'type': type,
             'side': side,
-            'price': this.safeString(trade, 'price'),
+            'price': this.safeString2(trade, 'price', 'fillPrice'),
             'amount': amount,
             'cost': cost,
             'takerOrMaker': this.safeStringLower2(trade, 'tradeRole', 'exec_type'),
@@ -49952,38 +49996,45 @@ class bitmart extends _abstract_bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
     parseOHLCV(ohlcv, market = undefined) {
         //
         // spot
-        //
-        //     [
-        //         "1699512060", // timestamp
-        //         "36746.49", // open
-        //         "36758.71", // high
-        //         "36736.13", // low
-        //         "36755.99", // close
-        //         "2.83965", // base volume
-        //         "104353.57" // quote volume
-        //     ]
+        //    [
+        //        "1699512060", // timestamp
+        //        "36746.49", // open
+        //        "36758.71", // high
+        //        "36736.13", // low
+        //        "36755.99", // close
+        //        "2.83965", // base volume
+        //        "104353.57" // quote volume
+        //    ]
         //
         // swap
-        //
-        //     {
-        //         "low_price": "20090.3",
-        //         "high_price": "20095.5",
-        //         "open_price": "20092.6",
-        //         "close_price": "20091.4",
-        //         "volume": "8748",
-        //         "timestamp": 1665002281
-        //     }
+        //    {
+        //        "low_price": "20090.3",
+        //        "high_price": "20095.5",
+        //        "open_price": "20092.6",
+        //        "close_price": "20091.4",
+        //        "volume": "8748",
+        //        "timestamp": 1665002281
+        //    }
         //
         // ws
+        //    [
+        //        1631056350, // timestamp
+        //        "46532.83", // open
+        //        "46555.71", // high
+        //        "46511.41", // low
+        //        "46555.71", // close
+        //        "0.25", // volume
+        //    ]
         //
-        //     [
-        //         1631056350, // timestamp
-        //         "46532.83", // open
-        //         "46555.71", // high
-        //         "46511.41", // low
-        //         "46555.71", // close
-        //         "0.25", // volume
-        //     ]
+        // ws swap
+        //    {
+        //        "symbol":"BTCUSDT",
+        //        "o":"146.24",
+        //        "h":"146.24",
+        //        "l":"146.24",
+        //        "c":"146.24",
+        //        "v":"146"
+        //    }
         //
         if (Array.isArray(ohlcv)) {
             return [
@@ -49997,12 +50048,12 @@ class bitmart extends _abstract_bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
         }
         else {
             return [
-                this.safeTimestamp(ohlcv, 'timestamp'),
-                this.safeNumber(ohlcv, 'open_price'),
-                this.safeNumber(ohlcv, 'high_price'),
-                this.safeNumber(ohlcv, 'low_price'),
-                this.safeNumber(ohlcv, 'close_price'),
-                this.safeNumber(ohlcv, 'volume'),
+                this.safeTimestamp2(ohlcv, 'timestamp', 'ts'),
+                this.safeNumber2(ohlcv, 'open_price', 'o'),
+                this.safeNumber2(ohlcv, 'high_price', 'h'),
+                this.safeNumber2(ohlcv, 'low_price', 'l'),
+                this.safeNumber2(ohlcv, 'close_price', 'c'),
+                this.safeNumber2(ohlcv, 'volume', 'v'),
             ];
         }
     }
@@ -52768,7 +52819,7 @@ class bitmart extends _abstract_bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 //  ---------------------------------------------------------------------------
 /**
  * @class bitmex
- * @extends Exchange
+ * @augments Exchange
  */
 class bitmex extends _abstract_bitmex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -55003,7 +55054,7 @@ class bitmex extends _abstract_bitmex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         const datetime = this.safeString(position, 'timestamp');
         const crossMargin = this.safeValue(position, 'crossMargin');
         const marginMode = (crossMargin === true) ? 'cross' : 'isolated';
-        const notionalString = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringAbs(this.safeString(position, 'foreignNotional', 'homeNotional'));
+        const notionalString = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringAbs(this.safeString2(position, 'foreignNotional', 'homeNotional'));
         const settleCurrencyCode = this.safeString(market, 'settle');
         const maintenanceMargin = this.convertToRealAmount(settleCurrencyCode, this.safeString(position, 'maintMargin'));
         const unrealisedPnl = this.convertToRealAmount(settleCurrencyCode, this.safeString(position, 'unrealisedPnl'));
@@ -55597,7 +55648,7 @@ class bitmex extends _abstract_bitmex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 //  ---------------------------------------------------------------------------
 /**
  * @class bitopro
- * @extends Exchange
+ * @augments Exchange
  */
 class bitopro extends _abstract_bitopro_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -56840,11 +56891,11 @@ class bitopro extends _abstract_bitopro_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
         //
         return this.parseOrders(orders, market, since, limit);
     }
-    fetchOpenOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
+    async fetchOpenOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         const request = {
             'statusKind': 'OPEN',
         };
-        return this.fetchOrders(symbol, since, limit, this.extend(request, params));
+        return await this.fetchOrders(symbol, since, limit, this.extend(request, params));
     }
     async fetchClosedOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         /**
@@ -57329,7 +57380,7 @@ class bitopro extends _abstract_bitopro_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 //  ---------------------------------------------------------------------------
 /**
  * @class bitpanda
- * @extends Exchange
+ * @augments Exchange
  */
 class bitpanda extends _abstract_bitpanda_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -59342,7 +59393,7 @@ class bitpanda extends _abstract_bitpanda_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
 //  ---------------------------------------------------------------------------
 /**
  * @class bitrue
- * @extends Exchange
+ * @augments Exchange
  */
 class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -62614,7 +62665,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 //  ---------------------------------------------------------------------------
 /**
  * @class bitso
- * @extends Exchange
+ * @augments Exchange
  */
 class bitso extends _abstract_bitso_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -64377,7 +64428,7 @@ class bitso extends _abstract_bitso_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
 //  ---------------------------------------------------------------------------
 /**
  * @class bitstamp
- * @extends Exchange
+ * @augments Exchange
  */
 class bitstamp extends _abstract_bitstamp_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -66549,7 +66600,7 @@ class bitstamp extends _abstract_bitstamp_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
 //  ---------------------------------------------------------------------------
 /**
  * @class bittrex
- * @extends Exchange
+ * @augments Exchange
  */
 class bittrex extends _abstract_bittrex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -68868,7 +68919,7 @@ class bittrex extends _abstract_bittrex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 // ----------------------------------------------------------------------------
 /**
  * @class bitvavo
- * @extends Exchange
+ * @augments Exchange
  */
 class bitvavo extends _abstract_bitvavo_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -70806,7 +70857,7 @@ class bitvavo extends _abstract_bitvavo_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 // ---------------------------------------------------------------------------
 /**
  * @class bl3p
- * @extends Exchange
+ * @augments Exchange
  */
 class bl3p extends _abstract_bl3p_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -71262,7 +71313,7 @@ class bl3p extends _abstract_bl3p_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
 // ---------------------------------------------------------------------------
 /**
  * @class blockchaincom
- * @extends Exchange
+ * @augments Exchange
  */
 class blockchaincom extends _abstract_blockchaincom_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -72474,7 +72525,7 @@ class blockchaincom extends _abstract_blockchaincom_js__WEBPACK_IMPORTED_MODULE_
 //  ---------------------------------------------------------------------------
 /**
  * @class btcalpha
- * @extends Exchange
+ * @augments Exchange
  */
 class btcalpha extends _abstract_btcalpha_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -73413,7 +73464,7 @@ class btcalpha extends _abstract_btcalpha_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
 //  ---------------------------------------------------------------------------
 /**
  * @class btcbox
- * @extends Exchange
+ * @augments Exchange
  */
 class btcbox extends _abstract_btcbox_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -73989,7 +74040,7 @@ class btcbox extends _abstract_btcbox_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 //  ---------------------------------------------------------------------------
 /**
  * @class btcmarkets
- * @extends Exchange
+ * @augments Exchange
  */
 class btcmarkets extends _abstract_btcmarkets_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -75236,7 +75287,7 @@ class btcmarkets extends _abstract_btcmarkets_js__WEBPACK_IMPORTED_MODULE_0__/*
 //  ---------------------------------------------------------------------------
 /**
  * @class btcturk
- * @extends Exchange
+ * @augments Exchange
  */
 class btcturk extends _abstract_btcturk_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -76177,7 +76228,7 @@ class btcturk extends _abstract_btcturk_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 //  ---------------------------------------------------------------------------
 /**
  * @class bybit
- * @extends Exchange
+ * @augments Exchange
  */
 class bybit extends _abstract_bybit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -79856,7 +79907,7 @@ class bybit extends _abstract_bybit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
          * @name bybit#createOrders
          * @description create a list of trade orders
          * @see https://bybit-exchange.github.io/docs/v5/order/batch-place
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
@@ -80894,7 +80945,6 @@ class bybit extends _abstract_bybit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
          * @param {int} [limit] the maximum number of trades to retrieve
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=trade-structure}
-         *
          */
         const request = {};
         const clientOrderId = this.safeString2(params, 'clientOrderId', 'orderLinkId');
@@ -81180,12 +81230,11 @@ class bybit extends _abstract_bybit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
          * @param {int} [limit] the maximum number of deposits structures to retrieve, default = 50, max = 50
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @param {int} [params.until] the latest time in ms to fetch deposits for, default = 30 days after since
-         *
          * EXCHANGE SPECIFIC PARAMETERS
          * @param {boolean} [params.paginate] default false, when true will automatically paginate by calling this endpoint multiple times. See in the docs all the [availble parameters](https://github.com/ccxt/ccxt/wiki/Manual#pagination-params)
          * @param {string} [params.cursor] used for pagination
          * @returns {object[]} a list of [transaction structures]{@link https://docs.ccxt.com/#/?id=transaction-structure}
-        */
+         */
         await this.loadMarkets();
         let paginate = false;
         [paginate, params] = this.handleOptionAndParams(params, 'fetchDeposits', 'paginate');
@@ -83796,7 +83845,7 @@ class bybit extends _abstract_bybit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
 //  ---------------------------------------------------------------------------
 /**
  * @class cex
- * @extends Exchange
+ * @augments Exchange
  */
 class cex extends _abstract_cex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -85498,7 +85547,7 @@ class cex extends _abstract_cex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
 // ----------------------------------------------------------------------------
 /**
  * @class coinbase
- * @extends Exchange
+ * @augments Exchange
  */
 class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -88769,7 +88818,7 @@ class coinbaseprime extends _coinbasepro_js__WEBPACK_IMPORTED_MODULE_0__/* ["def
 // ----------------------------------------------------------------------------
 /**
  * @class coinbasepro
- * @extends Exchange
+ * @augments Exchange
  */
 class coinbasepro extends _abstract_coinbasepro_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -90686,7 +90735,7 @@ class coinbasepro extends _abstract_coinbasepro_js__WEBPACK_IMPORTED_MODULE_0__/
 //  ---------------------------------------------------------------------------
 /**
  * @class coincheck
- * @extends Exchange
+ * @augments Exchange
  */
 class coincheck extends _abstract_coincheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -91542,7 +91591,7 @@ class coincheck extends _abstract_coincheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["
 //  ---------------------------------------------------------------------------
 /**
  * @class coinex
- * @extends Exchange
+ * @augments Exchange
  */
 class coinex extends _abstract_coinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -91561,6 +91610,7 @@ class coinex extends _abstract_coinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
             // 20 per 2 seconds => 10 per second => weight = 40
             'rateLimit': 2.5,
             'pro': true,
+            'certified': true,
             'has': {
                 'CORS': undefined,
                 'spot': true,
@@ -93801,7 +93851,7 @@ class coinex extends _abstract_coinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @name coinex#createOrders
          * @description create a list of trade orders (all orders should be of the same symbol)
          * @see https://viabtc.github.io/coinex_api_en_doc/spot/#docsspot003_trade002_batch_limit_orders
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @param {object} [params] extra parameters specific to the api endpoint
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
@@ -96912,7 +96962,7 @@ class coinex extends _abstract_coinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 
 /**
  * @class coinlist
- * @extends Exchange
+ * @augments Exchange
  */
 class coinlist extends _abstract_coinlist_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -99254,7 +99304,7 @@ class coinlist extends _abstract_coinlist_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
 //  ---------------------------------------------------------------------------
 /**
  * @class coinmate
- * @extends Exchange
+ * @augments Exchange
  */
 class coinmate extends _abstract_coinmate_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -100253,7 +100303,7 @@ class coinmate extends _abstract_coinmate_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
 //  ---------------------------------------------------------------------------
 /**
  * @class coinone
- * @extends Exchange
+ * @augments Exchange
  */
 class coinone extends _abstract_coinone_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -101195,7 +101245,7 @@ class coinone extends _abstract_coinone_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 
 /**
  * @class coinsph
- * @extends Exchange
+ * @augments Exchange
  */
 class coinsph extends _abstract_coinsph_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -103152,7 +103202,7 @@ class coinsph extends _abstract_coinsph_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 //  ---------------------------------------------------------------------------
 /**
  * @class coinspot
- * @extends Exchange
+ * @augments Exchange
  */
 class coinspot extends _abstract_coinspot_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -103709,7 +103759,7 @@ class coinspot extends _abstract_coinspot_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
 
 /**
  * @class cryptocom
- * @extends Exchange
+ * @augments Exchange
  */
 class cryptocom extends _abstract_cryptocom_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -104866,7 +104916,7 @@ class cryptocom extends _abstract_cryptocom_js__WEBPACK_IMPORTED_MODULE_0__/* ["
          * @description create a list of trade orders
          * @see https://exchange-docs.crypto.com/exchange/v1/rest-ws/index.html#private-create-order-list-list
          * @see https://exchange-docs.crypto.com/exchange/v1/rest-ws/index.html#private-create-order-list-oco
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
@@ -105928,7 +105978,7 @@ class cryptocom extends _abstract_cryptocom_js__WEBPACK_IMPORTED_MODULE_0__/* ["
          * @method
          * @description marginMode specified by params["marginMode"], this.options["marginMode"], this.options["defaultMarginMode"], params["margin"] = true or this.options["defaultType"] = 'margin'
          * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @returns {array} the marginMode in lowercase
+         * @returns {Array} the marginMode in lowercase
          */
         const defaultType = this.safeString(this.options, 'defaultType');
         const isMargin = this.safeValue(params, 'margin', false);
@@ -106712,7 +106762,7 @@ class cryptocom extends _abstract_cryptocom_js__WEBPACK_IMPORTED_MODULE_0__/* ["
 //  ---------------------------------------------------------------------------
 /**
  * @class currencycom
- * @extends Exchange
+ * @augments Exchange
  */
 class currencycom extends _abstract_currencycom_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -108737,7 +108787,7 @@ class currencycom extends _abstract_currencycom_js__WEBPACK_IMPORTED_MODULE_0__/
 //  ---------------------------------------------------------------------------
 /**
  * @class delta
- * @extends Exchange
+ * @augments Exchange
  */
 class delta extends _abstract_delta_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -111980,7 +112030,7 @@ class delta extends _abstract_delta_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
 //  ---------------------------------------------------------------------------
 /**
  * @class deribit
- * @extends Exchange
+ * @augments Exchange
  */
 class deribit extends _abstract_deribit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -115265,7 +115315,7 @@ class deribit extends _abstract_deribit_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 //  ---------------------------------------------------------------------------
 /**
  * @class digifinex
- * @extends Exchange
+ * @augments Exchange
  */
 class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -115785,9 +115835,15 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
     async fetchMarketsV2(params = {}) {
         const defaultType = this.safeString(this.options, 'defaultType');
         const [marginMode, query] = this.handleMarginModeAndParams('fetchMarketsV2', params);
-        const method = (marginMode !== undefined) ? 'publicSpotGetMarginSymbols' : 'publicSpotGetTradesSymbols';
-        let promises = [this[method](query), this.publicSwapGetPublicInstruments(params)];
-        promises = await Promise.all(promises);
+        const promisesRaw = [];
+        if (marginMode !== undefined) {
+            promisesRaw.push(this.publicSpotGetMarginSymbols(query));
+        }
+        else {
+            promisesRaw.push(this.publicSpotGetTradesSymbols(query));
+        }
+        promisesRaw.push(this.publicSwapGetPublicInstruments(params));
+        const promises = await Promise.all(promisesRaw);
         const spotMarkets = promises[0];
         const swapMarkets = promises[1];
         //
@@ -116065,17 +116121,21 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         await this.loadMarkets();
         let marketType = undefined;
         [marketType, params] = this.handleMarketTypeAndParams('fetchBalance', undefined, params);
-        let method = this.getSupportedMapping(marketType, {
-            'spot': 'privateSpotGetSpotAssets',
-            'margin': 'privateSpotGetMarginAssets',
-            'swap': 'privateSwapGetAccountBalance',
-        });
         const [marginMode, query] = this.handleMarginModeAndParams('fetchBalance', params);
-        if (marginMode !== undefined) {
-            method = 'privateSpotGetMarginAssets';
+        let response = undefined;
+        if (marginMode !== undefined || marketType === 'margin') {
             marketType = 'margin';
+            response = await this.privateSpotGetMarginAssets(query);
+        }
+        else if (marketType === 'spot') {
+            response = await this.privateSpotGetSpotAssets(query);
+        }
+        else if (marketType === 'swap') {
+            response = await this.privateSwapGetAccountBalance(query);
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchBalance() not support this market type');
         }
-        const response = await this[method](query);
         //
         // spot and margin
         //
@@ -116132,19 +116192,18 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         const market = this.market(symbol);
         const [marketType, query] = this.handleMarketTypeAndParams('fetchOrderBook', market, params);
         const request = {};
-        let method = undefined;
+        if (limit !== undefined) {
+            request['limit'] = limit;
+        }
+        let response = undefined;
         if (marketType === 'swap') {
-            method = 'publicSwapGetPublicDepth';
             request['instrument_id'] = market['id'];
+            response = await this.publicSwapGetPublicDepth(this.extend(request, query));
         }
         else {
-            method = 'publicSpotGetOrderBook';
             request['symbol'] = market['id'];
+            response = await this.publicSpotGetOrderBook(this.extend(request, query));
         }
-        if (limit !== undefined) {
-            request['limit'] = limit;
-        }
-        const response = await this[method](this.extend(request, query));
         //
         // spot
         //
@@ -116215,12 +116274,14 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         }
         let type = undefined;
         [type, params] = this.handleMarketTypeAndParams('fetchTickers', market, params);
-        let method = 'publicSpotGetTicker';
         const request = {};
+        let response = undefined;
         if (type === 'swap') {
-            method = 'publicSwapGetPublicTickers';
+            response = await this.publicSwapGetPublicTickers(this.extend(request, params));
+        }
+        else {
+            response = await this.publicSpotGetTicker(this.extend(request, params));
         }
-        const response = await this[method](this.extend(request, params));
         //
         // spot
         //
@@ -116295,16 +116356,16 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
          */
         await this.loadMarkets();
         const market = this.market(symbol);
-        let method = 'publicSpotGetTicker';
         const request = {};
+        let response = undefined;
         if (market['swap']) {
-            method = 'publicSwapGetPublicTicker';
             request['instrument_id'] = market['id'];
+            response = await this.publicSwapGetPublicTicker(this.extend(request, params));
         }
         else {
             request['symbol'] = market['id'];
+            response = await this.publicSpotGetTicker(this.extend(request, params));
         }
-        const response = await this[method](this.extend(request, params));
         //
         // spot
         //
@@ -116633,19 +116694,19 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
          */
         await this.loadMarkets();
         const market = this.market(symbol);
-        let method = 'publicSpotGetTrades';
         const request = {};
+        if (limit !== undefined) {
+            request['limit'] = market['swap'] ? Math.min(limit, 100) : limit;
+        }
+        let response = undefined;
         if (market['swap']) {
-            method = 'publicSwapGetPublicTrades';
             request['instrument_id'] = market['id'];
+            response = await this.publicSwapGetPublicTrades(this.extend(request, params));
         }
         else {
             request['symbol'] = market['id'];
+            response = await this.publicSpotGetTrades(this.extend(request, params));
         }
-        if (limit !== undefined) {
-            request['limit'] = market['swap'] ? Math.min(limit, 100) : limit;
-        }
-        const response = await this[method](this.extend(request, params));
         //
         // spot
         //
@@ -116738,15 +116799,15 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
          */
         await this.loadMarkets();
         const market = this.market(symbol);
-        let method = 'publicSpotGetKline';
         const request = {};
+        let response = undefined;
         if (market['swap']) {
-            method = 'publicSwapGetPublicCandles';
             request['instrument_id'] = market['id'];
             request['granularity'] = timeframe;
             if (limit !== undefined) {
                 request['limit'] = limit;
             }
+            response = await this.publicSwapGetPublicCandles(this.extend(request, params));
         }
         else {
             request['symbol'] = market['id'];
@@ -116764,8 +116825,8 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
                 const duration = this.parseTimeframe(timeframe);
                 request['start_time'] = this.sum(endTime, -limit * duration);
             }
+            response = await this.publicSpotGetKline(this.extend(request, params));
         }
-        const response = await this[method](this.extend(request, params));
         //
         // spot
         //
@@ -116870,7 +116931,7 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
          * @description create a list of trade orders (all orders should be of the same symbol)
          * @see https://docs.digifinex.com/en-ww/spot/v3/rest.html#create-multiple-order
          * @see https://docs.digifinex.com/en-ww/swap/v2/rest.html#batchorder
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
@@ -117113,19 +117174,9 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         if (symbol !== undefined) {
             market = this.market(symbol);
         }
+        id = id.toString();
         let marketType = undefined;
         [marketType, params] = this.handleMarketTypeAndParams('cancelOrder', market, params);
-        let method = this.getSupportedMapping(marketType, {
-            'spot': 'privateSpotPostSpotOrderCancel',
-            'margin': 'privateSpotPostMarginOrderCancel',
-            'swap': 'privateSwapPostTradeCancelOrder',
-        });
-        const [marginMode, query] = this.handleMarginModeAndParams('cancelOrder', params);
-        if (marginMode !== undefined) {
-            method = 'privateSpotPostMarginOrderCancel';
-            marketType = 'margin';
-        }
-        id = id.toString();
         const request = {
             'order_id': id,
         };
@@ -117138,7 +117189,21 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         else {
             request['market'] = marketType;
         }
-        const response = await this[method](this.extend(request, query));
+        const [marginMode, query] = this.handleMarginModeAndParams('cancelOrder', params);
+        let response = undefined;
+        if (marginMode !== undefined || marketType === 'margin') {
+            marketType = 'margin';
+            response = await this.privateSpotPostMarginOrderCancel(this.extend(request, query));
+        }
+        else if (marketType === 'spot') {
+            response = await this.privateSpotPostSpotOrderCancel(this.extend(request, query));
+        }
+        else if (marketType === 'swap') {
+            response = await this.privateSwapPostTradeCancelOrder(this.extend(request, query));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' cancelOrder() not support this market type');
+        }
         //
         // spot and margin
         //
@@ -117385,16 +117450,7 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         }
         let marketType = undefined;
         [marketType, params] = this.handleMarketTypeAndParams('fetchOpenOrders', market, params);
-        let method = this.getSupportedMapping(marketType, {
-            'spot': 'privateSpotGetSpotOrderCurrent',
-            'margin': 'privateSpotGetMarginOrderCurrent',
-            'swap': 'privateSwapGetTradeOpenOrders',
-        });
         const [marginMode, query] = this.handleMarginModeAndParams('fetchOpenOrders', params);
-        if (marginMode !== undefined) {
-            method = 'privateSpotGetMarginOrderCurrent';
-            marketType = 'margin';
-        }
         const request = {};
         const swap = (marketType === 'swap');
         if (swap) {
@@ -117412,7 +117468,20 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
             const marketIdRequest = swap ? 'instrument_id' : 'symbol';
             request[marketIdRequest] = market['id'];
         }
-        const response = await this[method](this.extend(request, query));
+        let response = undefined;
+        if (marginMode !== undefined || marketType === 'margin') {
+            marketType = 'margin';
+            response = await this.privateSpotGetMarginOrderCurrent(this.extend(request, query));
+        }
+        else if (marketType === 'spot') {
+            response = await this.privateSpotGetSpotOrderCurrent(this.extend(request, query));
+        }
+        else if (marketType === 'swap') {
+            response = await this.privateSwapGetTradeOpenOrders(this.extend(request, query));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchOpenOrders() not support this market type');
+        }
         //
         // spot and margin
         //
@@ -117487,16 +117556,7 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         }
         let marketType = undefined;
         [marketType, params] = this.handleMarketTypeAndParams('fetchOrders', market, params);
-        let method = this.getSupportedMapping(marketType, {
-            'spot': 'privateSpotGetSpotOrderHistory',
-            'margin': 'privateSpotGetMarginOrderHistory',
-            'swap': 'privateSwapGetTradeHistoryOrders',
-        });
         const [marginMode, query] = this.handleMarginModeAndParams('fetchOrders', params);
-        if (marginMode !== undefined) {
-            method = 'privateSpotGetMarginOrderHistory';
-            marketType = 'margin';
-        }
         const request = {};
         if (marketType === 'swap') {
             if (since !== undefined) {
@@ -117516,102 +117576,119 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         if (limit !== undefined) {
             request['limit'] = limit;
         }
-        const response = await this[method](this.extend(request, query));
-        //
-        // spot and margin
-        //
-        //     {
-        //         "code": 0,
-        //         "data": [
-        //             {
-        //                 "symbol": "BTC_USDT",
-        //                 "order_id": "dd3164b333a4afa9d5730bb87f6db8b3",
-        //                 "created_date": 1562303547,
-        //                 "finished_date": 0,
-        //                 "price": 0.1,
-        //                 "amount": 1,
-        //                 "cash_amount": 1,
-        //                 "executed_amount": 0,
-        //                 "avg_price": 0,
-        //                 "status": 1,
-        //                 "type": "buy",
-        //                 "kind": "margin"
-        //             }
-        //         ]
-        //     }
-        //
-        // swap
-        //
-        //     {
-        //         "code": 0,
-        //         "data": [
-        //             {
-        //                 "order_id": "1590136768156405760",
-        //                 "instrument_id": "BTCUSDTPERP",
-        //                 "margin_mode": "crossed",
-        //                 "contract_val": "0.001",
-        //                 "type": 1,
-        //                 "order_type": 8,
-        //                 "price": "18660.2",
-        //                 "size": "1",
-        //                 "filled_qty": "1",
-        //                 "price_avg": "18514.5",
-        //                 "fee": "0.00925725",
-        //                 "state": 2,
-        //                 "leverage": "20",
-        //                 "turnover": "18.5145",
-        //                 "has_stop": 0,
-        //                 "insert_time": 1667953123526,
-        //                 "time_stamp": 1667953123596
-        //             },
-        //             ...
-        //         ]
-        //     }
-        //
-        const data = this.safeValue(response, 'data', []);
-        return this.parseOrders(data, market, since, limit);
-    }
-    async fetchOrder(id, symbol = undefined, params = {}) {
-        /**
-         * @method
-         * @name digifinex#fetchOrder
-         * @description fetches information on an order made by the user
-         * @see https://docs.digifinex.com/en-ww/spot/v3/rest.html#get-order-status
-         * @see https://docs.digifinex.com/en-ww/swap/v2/rest.html#orderinfo
-         * @param {string} id order id
-         * @param {string} symbol unified symbol of the market the order was made in
-         * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @returns {object} An [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
-         */
-        await this.loadMarkets();
-        let market = undefined;
-        if (symbol !== undefined) {
-            market = this.market(symbol);
-        }
-        let marketType = undefined;
-        [marketType, params] = this.handleMarketTypeAndParams('fetchOrder', market, params);
-        let method = this.getSupportedMapping(marketType, {
-            'spot': 'privateSpotGetSpotOrder',
-            'margin': 'privateSpotGetMarginOrder',
-            'swap': 'privateSwapGetTradeOrderInfo',
-        });
-        const [marginMode, query] = this.handleMarginModeAndParams('fetchOrder', params);
-        if (marginMode !== undefined) {
-            method = 'privateSpotGetMarginOrder';
+        let response = undefined;
+        if (marginMode !== undefined || marketType === 'margin') {
             marketType = 'margin';
+            response = await this.privateSpotGetMarginOrderHistory(this.extend(request, query));
         }
-        const request = {
-            'order_id': id,
-        };
-        if (marketType === 'swap') {
-            if (market !== undefined) {
-                request['instrument_id'] = market['id'];
-            }
+        else if (marketType === 'spot') {
+            response = await this.privateSpotGetSpotOrderHistory(this.extend(request, query));
+        }
+        else if (marketType === 'swap') {
+            response = await this.privateSwapGetTradeHistoryOrders(this.extend(request, query));
         }
         else {
-            request['market'] = marketType;
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchOrders() not support this market type');
+        }
+        //
+        // spot and margin
+        //
+        //     {
+        //         "code": 0,
+        //         "data": [
+        //             {
+        //                 "symbol": "BTC_USDT",
+        //                 "order_id": "dd3164b333a4afa9d5730bb87f6db8b3",
+        //                 "created_date": 1562303547,
+        //                 "finished_date": 0,
+        //                 "price": 0.1,
+        //                 "amount": 1,
+        //                 "cash_amount": 1,
+        //                 "executed_amount": 0,
+        //                 "avg_price": 0,
+        //                 "status": 1,
+        //                 "type": "buy",
+        //                 "kind": "margin"
+        //             }
+        //         ]
+        //     }
+        //
+        // swap
+        //
+        //     {
+        //         "code": 0,
+        //         "data": [
+        //             {
+        //                 "order_id": "1590136768156405760",
+        //                 "instrument_id": "BTCUSDTPERP",
+        //                 "margin_mode": "crossed",
+        //                 "contract_val": "0.001",
+        //                 "type": 1,
+        //                 "order_type": 8,
+        //                 "price": "18660.2",
+        //                 "size": "1",
+        //                 "filled_qty": "1",
+        //                 "price_avg": "18514.5",
+        //                 "fee": "0.00925725",
+        //                 "state": 2,
+        //                 "leverage": "20",
+        //                 "turnover": "18.5145",
+        //                 "has_stop": 0,
+        //                 "insert_time": 1667953123526,
+        //                 "time_stamp": 1667953123596
+        //             },
+        //             ...
+        //         ]
+        //     }
+        //
+        const data = this.safeValue(response, 'data', []);
+        return this.parseOrders(data, market, since, limit);
+    }
+    async fetchOrder(id, symbol = undefined, params = {}) {
+        /**
+         * @method
+         * @name digifinex#fetchOrder
+         * @description fetches information on an order made by the user
+         * @see https://docs.digifinex.com/en-ww/spot/v3/rest.html#get-order-status
+         * @see https://docs.digifinex.com/en-ww/swap/v2/rest.html#orderinfo
+         * @param {string} id order id
+         * @param {string} symbol unified symbol of the market the order was made in
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} An [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
+         */
+        await this.loadMarkets();
+        let market = undefined;
+        if (symbol !== undefined) {
+            market = this.market(symbol);
+        }
+        let marketType = undefined;
+        [marketType, params] = this.handleMarketTypeAndParams('fetchOrder', market, params);
+        const [marginMode, query] = this.handleMarginModeAndParams('fetchOrder', params);
+        const request = {
+            'order_id': id,
+        };
+        if (marketType === 'swap') {
+            if (market !== undefined) {
+                request['instrument_id'] = market['id'];
+            }
+        }
+        else {
+            request['market'] = marketType;
+        }
+        let response = undefined;
+        if ((marginMode !== undefined) || (marketType === 'margin')) {
+            marketType = 'margin';
+            response = await this.privateSpotGetMarginOrder(this.extend(request, query));
+        }
+        else if (marketType === 'spot') {
+            response = await this.privateSpotGetSpotOrder(this.extend(request, query));
+        }
+        else if (marketType === 'swap') {
+            response = await this.privateSwapGetTradeOrderInfo(this.extend(request, query));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchOrder() not support this market type');
         }
-        const response = await this[method](this.extend(request, query));
         //
         // spot and margin
         //
@@ -117688,16 +117765,7 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         }
         let marketType = undefined;
         [marketType, params] = this.handleMarketTypeAndParams('fetchMyTrades', market, params);
-        let method = this.getSupportedMapping(marketType, {
-            'spot': 'privateSpotGetSpotMytrades',
-            'margin': 'privateSpotGetMarginMytrades',
-            'swap': 'privateSwapGetTradeHistoryTrades',
-        });
         const [marginMode, query] = this.handleMarginModeAndParams('fetchMyTrades', params);
-        if (marginMode !== undefined) {
-            method = 'privateSpotGetMarginMytrades';
-            marketType = 'margin';
-        }
         if (marketType === 'swap') {
             if (since !== undefined) {
                 request['start_timestamp'] = since;
@@ -117716,7 +117784,20 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         if (limit !== undefined) {
             request['limit'] = limit;
         }
-        const response = await this[method](this.extend(request, query));
+        let response = undefined;
+        if (marginMode !== undefined || marketType === 'margin') {
+            marketType = 'margin';
+            response = await this.privateSpotGetMarginMytrades(this.extend(request, query));
+        }
+        else if (marketType === 'spot') {
+            response = await this.privateSpotGetSpotMytrades(this.extend(request, query));
+        }
+        else if (marketType === 'swap') {
+            response = await this.privateSwapGetTradeHistoryTrades(this.extend(request, query));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchMyTrades() not support this market type');
+        }
         //
         // spot and margin
         //
@@ -117834,16 +117915,7 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         const request = {};
         let marketType = undefined;
         [marketType, params] = this.handleMarketTypeAndParams('fetchLedger', undefined, params);
-        let method = this.getSupportedMapping(marketType, {
-            'spot': 'privateSpotGetSpotFinancelog',
-            'margin': 'privateSpotGetMarginFinancelog',
-            'swap': 'privateSwapGetAccountFinanceRecord',
-        });
         const [marginMode, query] = this.handleMarginModeAndParams('fetchLedger', params);
-        if (marginMode !== undefined) {
-            method = 'privateSpotGetMarginFinancelog';
-            marketType = 'margin';
-        }
         if (marketType === 'swap') {
             if (since !== undefined) {
                 request['start_timestamp'] = since;
@@ -117864,7 +117936,20 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         if (limit !== undefined) {
             request['limit'] = limit;
         }
-        const response = await this[method](this.extend(request, query));
+        let response = undefined;
+        if (marginMode !== undefined || marketType === 'margin') {
+            marketType = 'margin';
+            response = await this.privateSpotGetMarginFinancelog(this.extend(request, query));
+        }
+        else if (marketType === 'spot') {
+            response = await this.privateSpotGetSpotFinancelog(this.extend(request, query));
+        }
+        else if (marketType === 'swap') {
+            response = await this.privateSwapGetAccountFinanceRecord(this.extend(request, query));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchLedger() not support this market type');
+        }
         //
         // spot and margin
         //
@@ -117981,8 +118066,13 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         if (limit !== undefined) {
             request['size'] = Math.min(500, limit);
         }
-        const method = (type === 'deposit') ? 'privateSpotGetDepositHistory' : 'privateSpotGetWithdrawHistory';
-        const response = await this[method](this.extend(request, params));
+        let response = undefined;
+        if (type === 'deposit') {
+            response = await this.privateSpotGetDepositHistory(this.extend(request, params));
+        }
+        else {
+            response = await this.privateSpotGetWithdrawHistory(this.extend(request, params));
+        }
         //
         //     {
         //         "code": 200,
@@ -118616,12 +118706,16 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
             const marketIdRequest = (marketType === 'swap') ? 'instrument_id' : 'symbol';
             request[marketIdRequest] = market['id'];
         }
-        const method = this.getSupportedMapping(marketType, {
-            'spot': 'privateSpotGetMarginPositions',
-            'margin': 'privateSpotGetMarginPositions',
-            'swap': 'privateSwapGetAccountPositions',
-        });
-        const response = await this[method](this.extend(request, query));
+        let response = undefined;
+        if (marketType === 'spot' || marketType === 'margin') {
+            response = await this.privateSpotGetMarginPositions(this.extend(request, query));
+        }
+        else if (marketType === 'swap') {
+            response = await this.privateSwapGetAccountPositions(this.extend(request, query));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchPositions() not support this market type');
+        }
         //
         // swap
         //
@@ -118703,14 +118797,18 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
         if (marginMode !== undefined) {
             marketType = 'margin';
         }
-        const method = this.getSupportedMapping(marketType, {
-            'spot': 'privateSpotGetMarginPositions',
-            'margin': 'privateSpotGetMarginPositions',
-            'swap': 'privateSwapGetAccountPositions',
-        });
         const marketIdRequest = (marketType === 'swap') ? 'instrument_id' : 'symbol';
         request[marketIdRequest] = market['id'];
-        const response = await this[method](this.extend(request, query));
+        let response = undefined;
+        if (marketType === 'spot' || marketType === 'margin') {
+            response = await this.privateSpotGetMarginPositions(this.extend(request, query));
+        }
+        else if (marketType === 'swap') {
+            response = await this.privateSwapGetAccountPositions(this.extend(request, query));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchPosition() not support this market type');
+        }
         //
         // swap
         //
@@ -119152,7 +119250,7 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
          * @method
          * @description marginMode specified by params["marginMode"], this.options["marginMode"], this.options["defaultMarginMode"], params["margin"] = true or this.options["defaultType"] = 'margin'
          * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @returns {array} the marginMode in lowercase
+         * @returns {Array} the marginMode in lowercase
          */
         const defaultType = this.safeString(this.options, 'defaultType');
         const isMargin = this.safeValue(params, 'margin', false);
@@ -119561,7 +119659,7 @@ class digifinex extends _abstract_digifinex_js__WEBPACK_IMPORTED_MODULE_0__/* ["
 //  ---------------------------------------------------------------------------
 /**
  * @class exmo
- * @extends Exchange
+ * @augments Exchange
  */
 class exmo extends _abstract_exmo_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -122255,7 +122353,7 @@ class fmfwio extends _hitbtc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z
 
 /**
  * @class gate
- * @extends Exchange
+ * @augments Exchange
  */
 class gate extends _abstract_gate_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -129270,7 +129368,7 @@ class gateio extends _gate_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
 //  ---------------------------------------------------------------------------
 /**
  * @class gemini
- * @extends Exchange
+ * @augments Exchange
  */
 class gemini extends _abstract_gemini_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -131078,7 +131176,7 @@ class gemini extends _abstract_gemini_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 
 /**
  * @class hitbtc
- * @extends Exchange
+ * @augments Exchange
  */
 class hitbtc extends _abstract_hitbtc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -134604,7 +134702,7 @@ class hitbtc extends _abstract_hitbtc_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @description marginMode specified by params["marginMode"], this.options["marginMode"], this.options["defaultMarginMode"], params["margin"] = true or this.options["defaultType"] = 'margin'
          * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @returns {array} the marginMode in lowercase
+         * @returns {Array} the marginMode in lowercase
          */
         const defaultType = this.safeString(this.options, 'defaultType');
         const isMargin = this.safeValue(params, 'margin', false);
@@ -134701,7 +134799,7 @@ class hitbtc extends _abstract_hitbtc_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 // ---------------------------------------------------------------------------
 /**
  * @class hitbtc3
- * @extends Exchange
+ * @augments Exchange
  */
 class hitbtc3 extends _hitbtc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -134735,7 +134833,7 @@ class hitbtc3 extends _hitbtc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .
 //  ---------------------------------------------------------------------------
 /**
  * @class hollaex
- * @extends Exchange
+ * @augments Exchange
  */
 class hollaex extends _abstract_hollaex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -136627,7 +136725,7 @@ class hollaex extends _abstract_hollaex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 //  ---------------------------------------------------------------------------
 /**
  * @class huobi
- * @extends Exchange
+ * @augments Exchange
  */
 class htx extends _abstract_htx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -141873,7 +141971,7 @@ class htx extends _abstract_htx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          * @see https://huobiapi.github.io/docs/coin_margined_swap/v1/en/#place-a-batch-of-orders
          * @see https://huobiapi.github.io/docs/usdt_swap/v1/en/#isolated-place-a-batch-of-orders
          * @see https://huobiapi.github.io/docs/usdt_swap/v1/en/#cross-place-a-batch-of-orders
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
@@ -145422,7 +145520,7 @@ class huobi extends _htx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
 // ---------------------------------------------------------------------------
 /**
  * @class huobijp
- * @extends Exchange
+ * @augments Exchange
  */
 class huobijp extends _abstract_huobijp_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -147357,7 +147455,7 @@ class huobijp extends _abstract_huobijp_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 // ---------------------------------------------------------------------------
 /**
  * @class idex
- * @extends Exchange
+ * @augments Exchange
  */
 class idex extends _abstract_idex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -149132,7 +149230,7 @@ class idex extends _abstract_idex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
 //  ---------------------------------------------------------------------------
 /**
  * @class independentreserve
- * @extends Exchange
+ * @augments Exchange
  */
 class independentreserve extends _abstract_independentreserve_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -149900,7 +149998,7 @@ class independentreserve extends _abstract_independentreserve_js__WEBPACK_IMPORT
 //  ---------------------------------------------------------------------------
 /**
  * @class indodax
- * @extends Exchange
+ * @augments Exchange
  */
 class indodax extends _abstract_indodax_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -150982,7 +151080,7 @@ class indodax extends _abstract_indodax_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 //  ---------------------------------------------------------------------------
 /**
  * @class kraken
- * @extends Exchange
+ * @augments Exchange
  */
 class kraken extends _abstract_kraken_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -153326,7 +153424,7 @@ class kraken extends _abstract_kraken_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @param {object} [params.end] End timestamp, withdrawals created strictly after will be not be included in the response
          * @param {boolean} [params.paginate]  default false, when true will automatically paginate by calling this endpoint multiple times
          * @returns {object[]} a list of [transaction structures]{@link https://docs.ccxt.com/#/?id=transaction-structure}
-        */
+         */
         await this.loadMarkets();
         let paginate = false;
         [paginate, params] = this.handleOptionAndParams(params, 'fetchWithdrawals', 'paginate');
@@ -153847,7 +153945,7 @@ class kraken extends _abstract_kraken_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 //  ---------------------------------------------------------------------------
 /**
  * @class krakenfutures
- * @extends Exchange
+ * @augments Exchange
  */
 class krakenfutures extends _abstract_krakenfutures_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -154505,7 +154603,7 @@ class krakenfutures extends _abstract_krakenfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name krakenfutures#fetchTrades
          * @see https://docs.futures.kraken.com/#http-api-trading-v3-api-market-data-get-trade-history
-         * @descriptions Fetch a history of filled trades that this account has made
+         * @description Fetch a history of filled trades that this account has made
          * @param {string} symbol Unified CCXT market symbol
          * @param {int} [since] Timestamp in ms of earliest trade. Not used by krakenfutures except in combination with params.until
          * @param {int} [limit] Total number of trades, cannot exceed 100
@@ -154777,7 +154875,7 @@ class krakenfutures extends _abstract_krakenfutures_js__WEBPACK_IMPORTED_MODULE_
          * @name krakenfutures#createOrders
          * @description create a list of trade orders
          * @see https://docs.futures.kraken.com/#http-api-trading-v3-api-order-management-batch-order-management
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
@@ -156236,7 +156334,7 @@ class krakenfutures extends _abstract_krakenfutures_js__WEBPACK_IMPORTED_MODULE_
 //  ---------------------------------------------------------------------------
 /**
  * @class kucoin
- * @extends Exchange
+ * @augments Exchange
  */
 class kucoin extends _abstract_kucoin_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -156715,11 +156813,7 @@ class kucoin extends _abstract_kucoin_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
             },
             'commonCurrencies': {
                 'BIFI': 'BIFIF',
-                'EDGE': 'DADI',
-                'HOT': 'HOTNOW',
-                'TRY': 'Trias',
                 'VAI': 'VAIOT',
-                'WAX': 'WAXP',
             },
             'options': {
                 'version': 'v1',
@@ -158163,7 +158257,7 @@ class kucoin extends _abstract_kucoin_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @description create a list of trade orders
          * @see https://www.kucoin.com/docs/rest/spot-trading/orders/place-multiple-orders
          * @see https://www.kucoin.com/docs/rest/spot-trading/spot-hf-trade-pro-account/place-multiple-hf-orders
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @param {object} [params]  extra parameters specific to the exchange API endpoint
          * @param {bool} [params.hf] false, // true for hf orders
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
@@ -161337,9 +161431,6 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
         orderbook['nonce'] = this.safeInteger(data, 'sequence');
         return orderbook;
     }
-    async fetchL3OrderBook(symbol, limit = undefined, params = {}) {
-        throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest(this.id + ' fetchL3OrderBook() is not supported yet');
-    }
     async fetchTicker(symbol, params = {}) {
         /**
          * @method
@@ -163075,7 +163166,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
 // ---------------------------------------------------------------------------
 /**
  * @class kuna
- * @extends Exchange
+ * @augments Exchange
  * @description Use the public-key as your apiKey
  */
 class kuna extends _abstract_kuna_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
@@ -165031,7 +165122,7 @@ class kuna extends _abstract_kuna_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
 //  ---------------------------------------------------------------------------
 /**
  * @class latoken
- * @extends Exchange
+ * @augments Exchange
  */
 class latoken extends _abstract_latoken_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -166105,7 +166196,7 @@ class latoken extends _abstract_latoken_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @param {boolean} [params.trigger] true if fetching trigger orders
          * @returns {Order[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
-        */
+         */
         if (symbol === undefined) {
             throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ArgumentsRequired(this.id + ' fetchOpenOrders() requires a symbol argument');
         }
@@ -166775,7 +166866,7 @@ class latoken extends _abstract_latoken_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 //  ---------------------------------------------------------------------------
 /**
  * @class lbank2
- * @extends Exchange
+ * @augments Exchange
  */
 class lbank extends _abstract_lbank_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -169606,7 +169697,7 @@ class lbank extends _abstract_lbank_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
 //  ---------------------------------------------------------------------------
 /**
  * @class luno
- * @extends Exchange
+ * @augments Exchange
  */
 class luno extends _abstract_luno_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -170659,7 +170750,7 @@ class luno extends _abstract_luno_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
 //  ---------------------------------------------------------------------------
 /**
  * @class lykke
- * @extends Exchange
+ * @augments Exchange
  */
 class lykke extends _abstract_lykke_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -171960,7 +172051,7 @@ class lykke extends _abstract_lykke_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
 //  ---------------------------------------------------------------------------
 /**
  * @class mercado
- * @extends Exchange
+ * @augments Exchange
  */
 class mercado extends _abstract_mercado_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -172868,7 +172959,7 @@ class mercado extends _abstract_mercado_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 // ---------------------------------------------------------------------------
 /**
  * @class mexc
- * @extends Exchange
+ * @augments Exchange
  */
 class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -174262,7 +174353,19 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
             }
             let method = this.safeString(this.options, 'fetchTradesMethod', 'spotPublicGetAggTrades');
             method = this.safeString(params, 'method', method); // AggTrades, HistoricalTrades, Trades
-            trades = await this[method](this.extend(request, params));
+            params = this.omit(params, ['method']);
+            if (method === 'spotPublicGetAggTrades') {
+                trades = await this.spotPublicGetAggTrades(this.extend(request, params));
+            }
+            else if (method === 'spotPublicGetHistoricalTrades') {
+                trades = await this.spotPublicGetHistoricalTrades(this.extend(request, params));
+            }
+            else if (method === 'spotPublicGetTrades') {
+                trades = await this.spotPublicGetTrades(this.extend(request, params));
+            }
+            else {
+                throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchTrades() not support this method');
+            }
             //
             //     /trades, /historicalTrades
             //
@@ -174565,12 +174668,19 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
             }
             const priceType = this.safeString(params, 'price', 'default');
             params = this.omit(params, 'price');
-            const method = this.getSupportedMapping(priceType, {
-                'default': 'contractPublicGetKlineSymbol',
-                'index': 'contractPublicGetKlineIndexPriceSymbol',
-                'mark': 'contractPublicGetKlineFairPriceSymbol',
-            });
-            const response = await this[method](this.extend(request, params));
+            let response = undefined;
+            if (priceType === 'default') {
+                response = await this.contractPublicGetKlineSymbol(this.extend(request, params));
+            }
+            else if (priceType === 'index') {
+                response = await this.contractPublicGetKlineIndexPriceSymbol(this.extend(request, params));
+            }
+            else if (priceType === 'mark') {
+                response = await this.contractPublicGetKlineFairPriceSymbol(this.extend(request, params));
+            }
+            else {
+                throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchOHLCV() not support this price type, [default, index, mark]');
+            }
             //
             //     {
             //         "success":true,
@@ -174955,6 +175065,7 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
          * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @param {string} [params.marginMode] only 'isolated' is supported for spot-margin trading
+         * @param {float} [params.triggerPrice] The price at which a trigger order is triggered at
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
@@ -175112,17 +175223,6 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
             // 'trend': 1, // Required for trigger order 1: latest price, 2: fair price, 3: index price
             // 'orderType': 1, // Required for trigger order 1: limit order,2:Post Only Maker,3: close or cancel instantly ,4: close or cancel completely,5: Market order
         };
-        let method = 'contractPrivatePostOrderSubmit';
-        const stopPrice = this.safeNumber2(params, 'triggerPrice', 'stopPrice');
-        params = this.omit(params, ['stopPrice', 'triggerPrice']);
-        if (stopPrice) {
-            method = 'contractPrivatePostPlanorderPlace';
-            request['triggerPrice'] = this.priceToPrecision(symbol, stopPrice);
-            request['triggerType'] = this.safeInteger(params, 'triggerType', 1);
-            request['executeCycle'] = this.safeInteger(params, 'executeCycle', 1);
-            request['trend'] = this.safeInteger(params, 'trend', 1);
-            request['orderType'] = this.safeInteger(params, 'orderType', 1);
-        }
         if ((type !== 5) && (type !== 6) && (type !== 'market')) {
             request['price'] = parseFloat(this.priceToPrecision(symbol, price));
         }
@@ -175143,8 +175243,20 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
         if (clientOrderId !== undefined) {
             request['externalOid'] = clientOrderId;
         }
-        params = this.omit(params, ['clientOrderId', 'externalOid', 'postOnly']);
-        const response = await this[method](this.extend(request, params));
+        const stopPrice = this.safeNumber2(params, 'triggerPrice', 'stopPrice');
+        params = this.omit(params, ['clientOrderId', 'externalOid', 'postOnly', 'stopPrice', 'triggerPrice']);
+        let response = undefined;
+        if (stopPrice) {
+            request['triggerPrice'] = this.priceToPrecision(symbol, stopPrice);
+            request['triggerType'] = this.safeInteger(params, 'triggerType', 1);
+            request['executeCycle'] = this.safeInteger(params, 'executeCycle', 1);
+            request['trend'] = this.safeInteger(params, 'trend', 1);
+            request['orderType'] = this.safeInteger(params, 'orderType', 1);
+            response = await this.contractPrivatePostPlanorderPlace(this.extend(request, params));
+        }
+        else {
+            response = await this.contractPrivatePostOrderSubmit(this.extend(request, params));
+        }
         //
         // Swap
         //     {"code":200,"data":"2ff3163e8617443cb9c6fc19d42b1ca4"}
@@ -175161,7 +175273,7 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
          * @name mexc#createOrders
          * @description *spot only*  *all orders must have the same symbol* create a list of trade orders
          * @see https://mexcdevelop.github.io/apidocs/spot_v3_en/#batch-orders
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @param {object} [params] extra parameters specific to api endpoint
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
@@ -175248,14 +175360,15 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
                 request['orderId'] = id;
             }
             const [marginMode, query] = this.handleMarginModeAndParams('fetchOrder', params);
-            let method = 'spotPrivateGetOrder';
             if (marginMode !== undefined) {
                 if (marginMode !== 'isolated') {
                     throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest(this.id + ' fetchOrder() does not support marginMode ' + marginMode + ' for spot-margin trading');
                 }
-                method = 'spotPrivateGetMarginOrder';
+                data = await this.spotPrivateGetMarginOrder(this.extend(request, query));
+            }
+            else {
+                data = await this.spotPrivateGetOrder(this.extend(request, query));
             }
-            data = await this[method](this.extend(request, query));
             //
             // spot
             //
@@ -175365,20 +175478,22 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
                 throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ArgumentsRequired(this.id + ' fetchOrders() requires a symbol argument for spot market');
             }
             const [marginMode, queryInner] = this.handleMarginModeAndParams('fetchOrders', params);
-            let method = 'spotPrivateGetAllOrders';
-            if (marginMode !== undefined) {
-                if (marginMode !== 'isolated') {
-                    throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest(this.id + ' fetchOrders() does not support marginMode ' + marginMode + ' for spot-margin trading');
-                }
-                method = 'spotPrivateGetMarginAllOrders';
-            }
             if (since !== undefined) {
                 request['startTime'] = since;
             }
             if (limit !== undefined) {
                 request['limit'] = limit;
             }
-            const response = await this[method](this.extend(request, queryInner));
+            let response = undefined;
+            if (marginMode !== undefined) {
+                if (marginMode !== 'isolated') {
+                    throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest(this.id + ' fetchOrders() does not support marginMode ' + marginMode + ' for spot-margin trading');
+                }
+                response = await this.spotPrivateGetMarginAllOrders(this.extend(request, queryInner));
+            }
+            else {
+                response = await this.spotPrivateGetAllOrders(this.extend(request, queryInner));
+            }
             //
             // spot
             //
@@ -175595,15 +175710,17 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
                 throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ArgumentsRequired(this.id + ' fetchOpenOrders() requires a symbol argument for spot market');
             }
             request['symbol'] = market['id'];
-            let method = 'spotPrivateGetOpenOrders';
             const [marginMode, query] = this.handleMarginModeAndParams('fetchOpenOrders', params);
+            let response = undefined;
             if (marginMode !== undefined) {
                 if (marginMode !== 'isolated') {
                     throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest(this.id + ' fetchOpenOrders() does not support marginMode ' + marginMode + ' for spot-margin trading');
                 }
-                method = 'spotPrivateGetMarginOpenOrders';
+                response = await this.spotPrivateGetMarginOpenOrders(this.extend(request, query));
+            }
+            else {
+                response = await this.spotPrivateGetOpenOrders(this.extend(request, query));
             }
-            const response = await this[method](this.extend(request, query));
             //
             // spot
             //
@@ -175738,14 +175855,15 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
             else {
                 requestInner['orderId'] = id;
             }
-            let method = 'spotPrivateDeleteOrder';
             if (marginMode !== undefined) {
                 if (marginMode !== 'isolated') {
                     throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest(this.id + ' cancelOrder() does not support marginMode ' + marginMode + ' for spot-margin trading');
                 }
-                method = 'spotPrivateDeleteMarginOrder';
+                data = await this.spotPrivateDeleteMarginOrder(this.extend(requestInner, query));
+            }
+            else {
+                data = await this.spotPrivateDeleteOrder(this.extend(requestInner, query));
             }
-            data = await this[method](this.extend(requestInner, query));
             //
             // spot
             //
@@ -175785,7 +175903,16 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
             // TODO: PlanorderCancel endpoint has bug atm. waiting for fix.
             let method = this.safeString(this.options, 'cancelOrder', 'contractPrivatePostOrderCancel'); // contractPrivatePostOrderCancel, contractPrivatePostPlanorderCancel
             method = this.safeString(query, 'method', method);
-            const response = await this[method]([id]); // the request cannot be changed or extended. This is the only way to send.
+            let response = undefined;
+            if (method === 'contractPrivatePostOrderCancel') {
+                response = await this.contractPrivatePostOrderCancel([id]); // the request cannot be changed or extended. This is the only way to send.
+            }
+            else if (method === 'contractPrivatePostPlanorderCancel') {
+                response = await this.contractPrivatePostPlanorderCancel([id]); // the request cannot be changed or extended. This is the only way to send.
+            }
+            else {
+                throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' cancelOrder() not support this method');
+            }
             //
             //     {
             //         "success": true,
@@ -175864,14 +175991,16 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
                 throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ArgumentsRequired(this.id + ' cancelAllOrders() requires a symbol argument on spot');
             }
             request['symbol'] = market['id'];
-            let method = 'spotPrivateDeleteOpenOrders';
+            let response = undefined;
             if (marginMode !== undefined) {
                 if (marginMode !== 'isolated') {
                     throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest(this.id + ' cancelAllOrders() does not support marginMode ' + marginMode + ' for spot-margin trading');
                 }
-                method = 'spotPrivateDeleteMarginOpenOrders';
+                response = await this.spotPrivateDeleteMarginOpenOrders(this.extend(request, query));
+            }
+            else {
+                response = await this.spotPrivateDeleteOpenOrders(this.extend(request, query));
             }
-            const response = await this[method](this.extend(request, query));
             //
             // spot
             //
@@ -175918,7 +176047,13 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
             // the Planorder endpoints work not only for stop-market orders but also for stop-limit orders that are supposed to have separate endpoint
             let method = this.safeString(this.options, 'cancelAllOrders', 'contractPrivatePostOrderCancelAll');
             method = this.safeString(query, 'method', method);
-            const response = await this[method](this.extend(request, query));
+            let response = undefined;
+            if (method === 'contractPrivatePostOrderCancelAll') {
+                response = await this.contractPrivatePostOrderCancelAll(this.extend(request, query));
+            }
+            else if (method === 'contractPrivatePostPlanorderCancelAll') {
+                response = await this.contractPrivatePostPlanorderCancelAll(this.extend(request, query));
+            }
             //
             //     {
             //         "success": true,
@@ -176432,13 +176567,10 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
         let marketType = undefined;
         const request = {};
         [marketType, params] = this.handleMarketTypeAndParams('fetchBalance', undefined, params);
-        let method = this.getSupportedMapping(marketType, {
-            'spot': 'spotPrivateGetAccount',
-            'swap': 'contractPrivateGetAccountAssets',
-            'margin': 'spotPrivateGetMarginIsolatedAccount',
-        });
         const marginMode = this.safeString(params, 'marginMode');
         const isMargin = this.safeValue(params, 'margin', false);
+        params = this.omit(params, ['margin', 'marginMode']);
+        let response = undefined;
         if ((marginMode !== undefined) || (isMargin) || (marketType === 'margin')) {
             let parsedSymbols = undefined;
             const symbol = this.safeString(params, 'symbol');
@@ -176453,12 +176585,20 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
                 parsedSymbols = market['id'];
             }
             this.checkRequiredArgument('fetchBalance', parsedSymbols, 'symbol or symbols');
-            method = 'spotPrivateGetMarginIsolatedAccount';
             marketType = 'margin';
             request['symbols'] = parsedSymbols;
+            params = this.omit(params, ['symbol', 'symbols']);
+            response = await this.spotPrivateGetMarginIsolatedAccount(this.extend(request, params));
+        }
+        else if (marketType === 'spot') {
+            response = await this.spotPrivateGetAccount(this.extend(request, params));
+        }
+        else if (marketType === 'swap') {
+            response = await this.contractPrivateGetAccountAssets(this.extend(request, params));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchBalance() not support this method');
         }
-        params = this.omit(params, ['margin', 'marginMode', 'symbol', 'symbols']);
-        const response = await this[method](this.extend(request, params));
         //
         // spot
         //
@@ -178103,7 +178243,7 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
          * @description marginMode specified by params["marginMode"], this.options["marginMode"], this.options["defaultMarginMode"], params["margin"] = true or this.options["defaultType"] = 'margin'
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @param {bool} [params.margin] true for trading spot-margin
-         * @returns {array} the marginMode in lowercase
+         * @returns {Array} the marginMode in lowercase
          */
         const defaultType = this.safeString(this.options, 'defaultType');
         const isMargin = this.safeValue(params, 'margin', false);
@@ -178238,7 +178378,7 @@ class mexc extends _abstract_mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
 // ---------------------------------------------------------------------------
 /**
  * @class ndax
- * @extends Exchange
+ * @augments Exchange
  */
 class ndax extends _abstract_ndax_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -180697,7 +180837,7 @@ class ndax extends _abstract_ndax_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
 //  ---------------------------------------------------------------------------
 /**
  * @class novadax
- * @extends Exchange
+ * @augments Exchange
  */
 class novadax extends _abstract_novadax_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -182251,7 +182391,7 @@ class novadax extends _abstract_novadax_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 //  ---------------------------------------------------------------------------
 /**
  * @class oceanex
- * @extends Exchange
+ * @augments Exchange
  */
 class oceanex extends _abstract_oceanex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -183225,7 +183365,7 @@ class oceanex extends _abstract_oceanex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 //  ---------------------------------------------------------------------------
 /**
  * @class okcoin
- * @extends Exchange
+ * @augments Exchange
  */
 class okcoin extends _abstract_okcoin_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -186288,7 +186428,7 @@ class okcoin extends _abstract_okcoin_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 //  ---------------------------------------------------------------------------
 /**
  * @class okx
- * @extends Exchange
+ * @augments Exchange
  */
 class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -189141,7 +189281,7 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          * @name okx#createOrders
          * @description create a list of trade orders
          * @see https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-place-multiple-orders
-         * @param {array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+         * @param {Array} orders list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
@@ -189684,7 +189824,7 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          * @param {string} symbol unified market symbol
          * @param {object} [params] extra and exchange specific parameters
          * @returns [an order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
-        */
+         */
         if (symbol === undefined) {
             throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ArgumentsRequired(this.id + ' fetchOrder() requires a symbol argument');
         }
@@ -193460,7 +193600,7 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          * EXCHANGE SPECIFIC PARAMETERS
          * @param {boolean} [params.autoCxl] whether any pending orders for closing out needs to be automatically canceled when close position via a market order. false or true, the default is false
          * @param {string} [params.tag] order tag a combination of case-sensitive alphanumerics, all numbers, or all letters of up to 16 characters
-         * @returns {[object]} [A list of position structures]{@link https://docs.ccxt.com/#/?id=position-structure}
+         * @returns {object[]} [A list of position structures]{@link https://docs.ccxt.com/#/?id=position-structure}
          */
         await this.loadMarkets();
         const market = this.market(symbol);
@@ -193575,7 +193715,7 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
 // ---------------------------------------------------------------------------
 /**
  * @class p2b
- * @extends Exchange
+ * @augments Exchange
  */
 class p2b extends _abstract_p2b_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -194096,7 +194236,6 @@ class p2b extends _abstract_p2b_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          * @param {int} [since] timestamp in ms of the earliest trade to fetch
          * @param {int} [limit] 1-100, default=50
          * @param {object} [params] extra parameters specific to the exchange API endpoint
-         *
          * @param {int} params.lastId order id
          * @returns {Trade[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=public-trades}
          */
@@ -194215,7 +194354,6 @@ class p2b extends _abstract_p2b_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          * @param {int} [since] timestamp in ms of the earliest candle to fetch
          * @param {int} [limit] 1-500, default=50
          * @param {object} [params] extra parameters specific to the exchange API endpoint
-         *
          * @param {int} [params.offset] default=0, with this value the last candles are returned
          * @returns {int[][]} A list of candles ordered as timestamp, open, high, low, close, volume
          */
@@ -194831,7 +194969,7 @@ class p2b extends _abstract_p2b_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
 //  ---------------------------------------------------------------------------
 /**
  * @class paymium
- * @extends Exchange
+ * @augments Exchange
  */
 class paymium extends _abstract_paymium_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -195438,7 +195576,7 @@ class paymium extends _abstract_paymium_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
 // ----------------------------------------------------------------------------
 /**
  * @class phemex
- * @extends Exchange
+ * @augments Exchange
  */
 class phemex extends _abstract_phemex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -199952,7 +200090,7 @@ class phemex extends _abstract_phemex_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 //  ---------------------------------------------------------------------------
 /**
  * @class poloniex
- * @extends Exchange
+ * @augments Exchange
  */
 class poloniex extends _abstract_poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -201178,20 +201316,20 @@ class poloniex extends _abstract_poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
     }
     async createOrder(symbol, type, side, amount, price = undefined, params = {}) {
         /**
-        * @method
-        * @name poloniex#createOrder
-        * @description create a trade order
-        * @see https://docs.poloniex.com/#authenticated-endpoints-orders-create-order
-        * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-create-order  // trigger orders
-        * @param {string} symbol unified symbol of the market to create an order in
-        * @param {string} type 'market' or 'limit'
-        * @param {string} side 'buy' or 'sell'
-        * @param {float} amount how much of currency you want to trade in units of base currency
-        * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
-        * @param {object} [params] extra parameters specific to the exchange API endpoint
-        * @param {float} [params.triggerPrice] *spot only* The price at which a trigger order is triggered at
-        * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
-        */
+         * @method
+         * @name poloniex#createOrder
+         * @description create a trade order
+         * @see https://docs.poloniex.com/#authenticated-endpoints-orders-create-order
+         * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-create-order  // trigger orders
+         * @param {string} symbol unified symbol of the market to create an order in
+         * @param {string} type 'market' or 'limit'
+         * @param {string} side 'buy' or 'sell'
+         * @param {float} amount how much of currency you want to trade in units of base currency
+         * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {float} [params.triggerPrice] *spot only* The price at which a trigger order is triggered at
+         * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
+         */
         await this.loadMarkets();
         const market = this.market(symbol);
         if (!market['spot']) {
@@ -201261,21 +201399,21 @@ class poloniex extends _abstract_poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
     }
     async editOrder(id, symbol, type, side, amount = undefined, price = undefined, params = {}) {
         /**
-        * @method
-        * @name poloniex#editOrder
-        * @description edit a trade order
-        * @see https://docs.poloniex.com/#authenticated-endpoints-orders-cancel-replace-order
-        * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-cancel-replace-order
-        * @param {string} id order id
-        * @param {string} symbol unified symbol of the market to create an order in
-        * @param {string} type 'market' or 'limit'
-        * @param {string} side 'buy' or 'sell'
-        * @param {float} [amount] how much of the currency you want to trade in units of the base currency
-        * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
-        * @param {object} [params] extra parameters specific to the exchange API endpoint
-        * @param {float} [params.triggerPrice] The price at which a trigger order is triggered at
-        * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
-        */
+         * @method
+         * @name poloniex#editOrder
+         * @description edit a trade order
+         * @see https://docs.poloniex.com/#authenticated-endpoints-orders-cancel-replace-order
+         * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-cancel-replace-order
+         * @param {string} id order id
+         * @param {string} symbol unified symbol of the market to create an order in
+         * @param {string} type 'market' or 'limit'
+         * @param {string} side 'buy' or 'sell'
+         * @param {float} [amount] how much of the currency you want to trade in units of the base currency
+         * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {float} [params.triggerPrice] The price at which a trigger order is triggered at
+         * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
+         */
         await this.loadMarkets();
         const market = this.market(symbol);
         if (!market['spot']) {
@@ -201347,16 +201485,16 @@ class poloniex extends _abstract_poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
     }
     async cancelAllOrders(symbol = undefined, params = {}) {
         /**
-        * @method
-        * @name poloniex#cancelAllOrders
-        * @description cancel all open orders
-        * @see https://docs.poloniex.com/#authenticated-endpoints-orders-cancel-all-orders
-        * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-cancel-all-orders  // trigger orders
-        * @param {string} symbol unified market symbol, only orders in the market of this symbol are cancelled when symbol is not undefined
-        * @param {object} [params] extra parameters specific to the exchange API endpoint
-        * @param {boolean} [params.trigger] true if canceling trigger orders
-        * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
-        */
+         * @method
+         * @name poloniex#cancelAllOrders
+         * @description cancel all open orders
+         * @see https://docs.poloniex.com/#authenticated-endpoints-orders-cancel-all-orders
+         * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-cancel-all-orders  // trigger orders
+         * @param {string} symbol unified market symbol, only orders in the market of this symbol are cancelled when symbol is not undefined
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {boolean} [params.trigger] true if canceling trigger orders
+         * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
+         */
         await this.loadMarkets();
         const request = {
             // 'accountTypes': 'SPOT',
@@ -201399,17 +201537,17 @@ class poloniex extends _abstract_poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
     }
     async fetchOrder(id, symbol = undefined, params = {}) {
         /**
-        * @method
-        * @name poloniex#fetchOrder
-        * @description fetch an order by it's id
-        * @see https://docs.poloniex.com/#authenticated-endpoints-orders-order-details
-        * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-open-orders  // trigger orders
-        * @param {string} id order id
-        * @param {string} symbol unified market symbol, default is undefined
-        * @param {object} [params] extra parameters specific to the exchange API endpoint
-        * @param {boolean} [params.trigger] true if fetching a trigger order
-        * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
-        */
+         * @method
+         * @name poloniex#fetchOrder
+         * @description fetch an order by it's id
+         * @see https://docs.poloniex.com/#authenticated-endpoints-orders-order-details
+         * @see https://docs.poloniex.com/#authenticated-endpoints-smart-orders-open-orders  // trigger orders
+         * @param {string} id order id
+         * @param {string} symbol unified market symbol, default is undefined
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {boolean} [params.trigger] true if fetching a trigger order
+         * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
+         */
         await this.loadMarkets();
         id = id.toString();
         const request = {
@@ -202292,7 +202430,7 @@ class poloniex extends _abstract_poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
 //  ---------------------------------------------------------------------------
 /**
  * @class poloniexfutures
- * @extends Exchange
+ * @augments Exchange
  */
 class poloniexfutures extends _abstract_poloniexfutures_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -211682,7 +211820,7 @@ class bitfinex2 extends _bitfinex2_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
 //  ---------------------------------------------------------------------------
 /**
  * @class bitget
- * @extends Exchange
+ * @augments Exchange
  * @description watching delivery future markets is not yet implemented (perpertual future / swap is implemented)
  */
 class bitget extends _bitget_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
@@ -213368,12 +213506,14 @@ class bitget extends _bitget_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z
 /* harmony import */ var _bitmart_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3718);
 /* harmony import */ var _base_errors_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6689);
 /* harmony import */ var _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3020);
-/* harmony import */ var _static_dependencies_noble_hashes_sha256_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(1372);
+/* harmony import */ var _static_dependencies_noble_hashes_sha256_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(1372);
+/* harmony import */ var _base_ws_OrderBookSide_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(416);
 //  ---------------------------------------------------------------------------
 
 
 
 
+
 //  ---------------------------------------------------------------------------
 class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -213387,24 +213527,38 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
                 'cancelOrdersWs': false,
                 'cancelAllOrdersWs': false,
                 'ws': true,
+                'watchBalance': true,
                 'watchTicker': true,
+                'watchTickers': true,
                 'watchOrderBook': true,
                 'watchOrders': true,
                 'watchTrades': true,
                 'watchOHLCV': true,
+                'watchPosition': 'emulated',
+                'watchPositions': true,
             },
             'urls': {
                 'api': {
                     'ws': {
-                        'public': 'wss://ws-manager-compress.{hostname}/api?protocol=1.1',
-                        'private': 'wss://ws-manager-compress.{hostname}/user?protocol=1.1',
+                        'spot': {
+                            'public': 'wss://ws-manager-compress.{hostname}/api?protocol=1.1',
+                            'private': 'wss://ws-manager-compress.{hostname}/user?protocol=1.1',
+                        },
+                        'swap': {
+                            'public': 'wss://openapi-ws.{hostname}/api?protocol=1.1',
+                            'private': 'wss://openapi-ws.{hostname}/user?protocol=1.1',
+                        },
                     },
                 },
             },
             'options': {
                 'defaultType': 'spot',
+                'watchBalance': {
+                    'fetchBalanceSnapshot': true,
+                    'awaitBalanceSnapshot': true, // whether to wait for the balance snapshot before providing updates
+                },
                 'watchOrderBook': {
-                    'depth': 'depth5', // depth5, depth20, depth50
+                    'depth': 'depth50', // depth5, depth20, depth50
                 },
                 'ws': {
                     'inflate': true,
@@ -213430,33 +213584,166 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
             },
         });
     }
-    async subscribe(channel, symbol, params = {}) {
-        await this.loadMarkets();
+    async subscribe(channel, symbol, type, params = {}) {
         const market = this.market(symbol);
-        const url = this.implodeHostname(this.urls['api']['ws']['public']);
-        const messageHash = market['type'] + '/' + channel + ':' + market['id'];
-        const request = {
-            'op': 'subscribe',
-            'args': [messageHash],
-        };
+        const url = this.implodeHostname(this.urls['api']['ws'][type]['public']);
+        let request = {};
+        let messageHash = undefined;
+        if (type === 'spot') {
+            messageHash = 'spot/' + channel + ':' + market['id'];
+            request = {
+                'op': 'subscribe',
+                'args': [messageHash],
+            };
+        }
+        else {
+            messageHash = 'futures/' + channel + ':' + market['id'];
+            request = {
+                'action': 'subscribe',
+                'args': [messageHash],
+            };
+        }
         return await this.watch(url, messageHash, this.deepExtend(request, params), messageHash);
     }
-    async subscribePrivate(channel, symbol, params = {}) {
+    async watchBalance(params = {}) {
+        /**
+         * @method
+         * @name bitmart#watchBalance
+         * @see https://developer-pro.bitmart.com/en/spot/#private-balance-change
+         * @see https://developer-pro.bitmart.com/en/futures/#private-assets-channel
+         * @description watch balance and get the amount of funds available for trading or funds locked in orders
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a [balance structure]{@link https://docs.ccxt.com/#/?id=balance-structure}
+         */
         await this.loadMarkets();
-        const market = this.market(symbol);
-        const url = this.implodeHostname(this.urls['api']['ws']['private']);
-        const messageHash = channel + ':' + market['id'];
-        await this.authenticate();
-        const request = {
-            'op': 'subscribe',
-            'args': [messageHash],
-        };
+        let type = 'spot';
+        [type, params] = this.handleMarketTypeAndParams('watchBalance', undefined, params);
+        await this.authenticate(type, params);
+        let request = {};
+        if (type === 'spot') {
+            request = {
+                'op': 'subscribe',
+                'args': ['spot/user/balance:BALANCE_UPDATE'],
+            };
+        }
+        else {
+            request = {
+                'action': 'subscribe',
+                'args': ['futures/asset:USDT', 'futures/asset:BTC', 'futures/asset:ETH'],
+            };
+        }
+        const messageHash = 'balance:' + type;
+        const url = this.implodeHostname(this.urls['api']['ws'][type]['private']);
+        const client = this.client(url);
+        this.setBalanceCache(client, type);
+        const fetchBalanceSnapshot = this.handleOptionAndParams(this.options, 'watchBalance', 'fetchBalanceSnapshot', true);
+        const awaitBalanceSnapshot = this.handleOptionAndParams(this.options, 'watchBalance', 'awaitBalanceSnapshot', false);
+        if (fetchBalanceSnapshot && awaitBalanceSnapshot) {
+            await client.future(type + ':fetchBalanceSnapshot');
+        }
         return await this.watch(url, messageHash, this.deepExtend(request, params), messageHash);
     }
+    setBalanceCache(client, type) {
+        if (type in client.subscriptions) {
+            return undefined;
+        }
+        const options = this.safeValue(this.options, 'watchBalance');
+        const fetchBalanceSnapshot = this.handleOptionAndParams(options, 'watchBalance', 'fetchBalanceSnapshot', true);
+        if (fetchBalanceSnapshot) {
+            const messageHash = type + ':fetchBalanceSnapshot';
+            if (!(messageHash in client.futures)) {
+                client.future(messageHash);
+                this.spawn(this.loadBalanceSnapshot, client, messageHash, type);
+            }
+        }
+        else {
+            this.balance[type] = {};
+        }
+    }
+    async loadBalanceSnapshot(client, messageHash, type) {
+        const response = await this.fetchBalance({ 'type': type });
+        this.balance[type] = this.extend(response, this.safeValue(this.balance, type, {}));
+        // don't remove the future from the .futures cache
+        const future = client.futures[messageHash];
+        future.resolve();
+        client.resolve(this.balance[type], 'balance:' + type);
+    }
+    handleBalance(client, message) {
+        //
+        // spot
+        //    {
+        //        "data":[
+        //           {
+        //              "balance_details":[
+        //                 {
+        //                    "av_bal":"0.206000000000000000000000000000",
+        //                    "ccy":"LTC",
+        //                    "fz_bal":"0.100000000000000000000000000000"
+        //                 }
+        //              ],
+        //              "event_time":"1701632345415",
+        //              "event_type":"TRANSACTION_COMPLETED"
+        //           }
+        //        ],
+        //        "table":"spot/user/balance"
+        //    }
+        // swap
+        //    {
+        //        group: 'futures/asset:USDT',
+        //        data: {
+        //            currency: 'USDT',
+        //            available_balance: '37.19688649135',
+        //            position_deposit: '0.788687546',
+        //            frozen_balance: '0'
+        //        }
+        //    }
+        //
+        const channel = this.safeString2(message, 'table', 'group');
+        const data = this.safeValue(message, 'data');
+        if (data === undefined) {
+            return;
+        }
+        const isSpot = (channel.indexOf('spot') >= 0);
+        const type = isSpot ? 'spot' : 'swap';
+        this.balance['info'] = message;
+        if (isSpot) {
+            if (!Array.isArray(data)) {
+                return;
+            }
+            for (let i = 0; i < data.length; i++) {
+                const timestamp = this.safeInteger(message, 'event_time');
+                this.balance['timestamp'] = timestamp;
+                this.balance['datetime'] = this.iso8601(timestamp);
+                const balanceDetails = this.safeValue(data[i], 'balance_details', []);
+                for (let ii = 0; ii < balanceDetails.length; ii++) {
+                    const rawBalance = balanceDetails[i];
+                    const account = this.account();
+                    const currencyId = this.safeString(rawBalance, 'ccy');
+                    const code = this.safeCurrencyCode(currencyId);
+                    account['free'] = this.safeString(rawBalance, 'av_bal');
+                    account['total'] = this.safeString(rawBalance, 'fz_bal');
+                    this.balance[code] = account;
+                }
+            }
+        }
+        else {
+            const currencyId = this.safeString(data, 'currency');
+            const code = this.safeCurrencyCode(currencyId);
+            const account = this.account();
+            account['free'] = this.safeString(data, 'available_balance');
+            account['used'] = this.safeString(data, 'frozen_balance');
+            this.balance[type][code] = account;
+        }
+        this.balance[type] = this.safeBalance(this.balance[type]);
+        const messageHash = 'balance:' + type;
+        client.resolve(this.balance[type], messageHash);
+    }
     async watchTrades(symbol, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
          * @name bitmart#watchTrades
+         * @see https://developer-pro.bitmart.com/en/spot/#public-trade-channel
+         * @see https://developer-pro.bitmart.com/en/futures/#public-trade-channel
          * @description get the list of most recent trades for a particular symbol
          * @param {string} symbol unified symbol of the market to fetch trades for
          * @param {int} [since] timestamp in ms of the earliest trade to fetch
@@ -213466,7 +213753,10 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          */
         await this.loadMarkets();
         symbol = this.symbol(symbol);
-        const trades = await this.subscribe('trade', symbol, params);
+        const market = this.market(symbol);
+        let type = 'spot';
+        [type, params] = this.handleMarketTypeAndParams('watchTrades', market, params);
+        const trades = await this.subscribe('trade', symbol, type, params);
         if (this.newUpdates) {
             limit = trades.getLimit(symbol, limit);
         }
@@ -213476,17 +213766,64 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         /**
          * @method
          * @name bitmart#watchTicker
+         * @see https://developer-pro.bitmart.com/en/spot/#public-ticker-channel
          * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
          * @param {string} symbol unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
-        return await this.subscribe('ticker', symbol, params);
+        await this.loadMarkets();
+        symbol = this.symbol(symbol);
+        const market = this.market(symbol);
+        let type = 'spot';
+        [type, params] = this.handleMarketTypeAndParams('watchTicker', market, params);
+        if (type === 'swap') {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.NotSupported(this.id + ' watchTicker() does not support ' + type + ' markets. Use watchTickers() instead');
+        }
+        return await this.subscribe('ticker', symbol, type, params);
+    }
+    async watchTickers(symbols = undefined, params = {}) {
+        /**
+         * @method
+         * @name bitmart#watchTickers
+         * @see https://developer-pro.bitmart.com/en/futures/#overview
+         * @description watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for all markets of a specific list
+         * @param {string[]} symbols unified symbol of the market to fetch the ticker for
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
+         */
+        await this.loadMarkets();
+        const market = this.getMarketFromSymbols(symbols);
+        let type = 'spot';
+        [type, params] = this.handleMarketTypeAndParams('watchTickers', market, params);
+        symbols = this.marketSymbols(symbols);
+        if (type === 'spot') {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.NotSupported(this.id + ' watchTickers() does not support ' + type + ' markets. Use watchTicker() instead');
+        }
+        const url = this.implodeHostname(this.urls['api']['ws'][type]['public']);
+        if (type === 'swap') {
+            type = 'futures';
+        }
+        let messageHash = 'tickers';
+        if (symbols !== undefined) {
+            messageHash += '::' + symbols.join(',');
+        }
+        const request = {
+            'action': 'subscribe',
+            'args': ['futures/ticker'],
+        };
+        const newTickers = await this.watch(url, messageHash, this.deepExtend(request, params), messageHash);
+        if (this.newUpdates) {
+            return newTickers;
+        }
+        return this.filterByArray(this.tickers, 'symbol', symbols);
     }
     async watchOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
          * @name bitmart#watchOrders
+         * @see https://developer-pro.bitmart.com/en/spot/#private-order-channel
+         * @see https://developer-pro.bitmart.com/en/futures/#private-order-channel
          * @description watches information on multiple orders made by the user
          * @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
@@ -213494,196 +213831,626 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          * @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}
          */
-        if (symbol === undefined) {
-            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ArgumentsRequired(this.id + ' watchOrders() requires a symbol argument');
-        }
         await this.loadMarkets();
-        const market = this.market(symbol);
-        symbol = market['symbol'];
-        if (market['type'] !== 'spot') {
-            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ArgumentsRequired(this.id + ' watchOrders supports spot markets only');
+        let market = undefined;
+        let messageHash = 'orders';
+        if (symbol !== undefined) {
+            symbol = this.symbol(symbol);
+            market = this.market(symbol);
+            messageHash = 'orders::' + symbol;
+        }
+        let type = 'spot';
+        [type, params] = this.handleMarketTypeAndParams('watchOrders', market, params);
+        await this.authenticate(type, params);
+        let request = undefined;
+        if (type === 'spot') {
+            if (symbol === undefined) {
+                throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ArgumentsRequired(this.id + ' watchOrders() requires a symbol argument for spot markets');
+            }
+            request = {
+                'op': 'subscribe',
+                'args': ['spot/user/order:' + market['id']],
+            };
+        }
+        else {
+            request = {
+                'action': 'subscribe',
+                'args': ['futures/order'],
+            };
         }
-        const channel = 'spot/user/order';
-        const orders = await this.subscribePrivate(channel, symbol, params);
+        const url = this.implodeHostname(this.urls['api']['ws'][type]['private']);
+        const newOrders = await this.watch(url, messageHash, this.deepExtend(request, params), messageHash);
         if (this.newUpdates) {
-            limit = orders.getLimit(symbol, limit);
+            return newOrders;
         }
-        return this.filterBySymbolSinceLimit(orders, symbol, since, limit, true);
+        return this.filterBySymbolSinceLimit(this.orders, symbol, since, limit, true);
     }
     handleOrders(client, message) {
         //
-        // {
-        //     "data":[
-        //         {
-        //             "symbol": "LTC_USDT",
-        //             "notional": '',
-        //             "side": "buy",
-        //             "last_fill_time": "0",
-        //             "ms_t": "1646216634000",
-        //             "type": "limit",
-        //             "filled_notional": "0.000000000000000000000000000000",
-        //             "last_fill_price": "0",
-        //             "size": "0.500000000000000000000000000000",
-        //             "price": "50.000000000000000000000000000000",
-        //             "last_fill_count": "0",
-        //             "filled_size": "0.000000000000000000000000000000",
-        //             "margin_trading": "0",
-        //             "state": "8",
-        //             "order_id": "24807076628",
-        //             "order_type": "0"
+        // spot
+        //    {
+        //        "data":[
+        //            {
+        //                "symbol": "LTC_USDT",
+        //                "notional": '',
+        //                "side": "buy",
+        //                "last_fill_time": "0",
+        //                "ms_t": "1646216634000",
+        //                "type": "limit",
+        //                "filled_notional": "0.000000000000000000000000000000",
+        //                "last_fill_price": "0",
+        //                "size": "0.500000000000000000000000000000",
+        //                "price": "50.000000000000000000000000000000",
+        //                "last_fill_count": "0",
+        //                "filled_size": "0.000000000000000000000000000000",
+        //                "margin_trading": "0",
+        //                "state": "8",
+        //                "order_id": "24807076628",
+        //                "order_type": "0"
+        //              }
+        //        ],
+        //        "table":"spot/user/order"
+        //    }
+        // swap
+        //    {
+        //        "group":"futures/order",
+        //        "data":[
+        //           {
+        //              "action":2,
+        //              "order":{
+        //                 "order_id":"2312045036986775",
+        //                 "client_order_id":"",
+        //                 "price":"71.61707928",
+        //                 "size":"1",
+        //                 "symbol":"LTCUSDT",
+        //                 "state":1,
+        //                 "side":4,
+        //                 "type":"market",
+        //                 "leverage":"1",
+        //                 "open_type":"cross",
+        //                 "deal_avg_price":"0",
+        //                 "deal_size":"0",
+        //                 "create_time":1701625324646,
+        //                 "update_time":1701625324640,
+        //                 "plan_order_id":"",
+        //                 "last_trade":null
+        //              }
         //           }
-        //     ],
-        //     "table":"spot/user/order"
-        // }
+        //        ]
+        //    }
         //
-        const channel = this.safeString(message, 'table');
-        const orders = this.safeValue(message, 'data', []);
+        const orders = this.safeValue(message, 'data');
+        if (orders === undefined) {
+            return;
+        }
         const ordersLength = orders.length;
+        const newOrders = [];
+        const symbols = {};
         if (ordersLength > 0) {
             const limit = this.safeInteger(this.options, 'ordersLimit', 1000);
             if (this.orders === undefined) {
                 this.orders = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_2__/* .ArrayCacheBySymbolById */ .hl(limit);
             }
             const stored = this.orders;
-            const marketIds = [];
             for (let i = 0; i < orders.length; i++) {
                 const order = this.parseWsOrder(orders[i]);
                 stored.append(order);
+                newOrders.push(order);
                 const symbol = order['symbol'];
-                const market = this.market(symbol);
-                marketIds.push(market['id']);
-            }
-            for (let i = 0; i < marketIds.length; i++) {
-                const messageHash = channel + ':' + marketIds[i];
-                client.resolve(this.orders, messageHash);
+                symbols[symbol] = true;
             }
         }
+        const newOrderSymbols = Object.keys(symbols);
+        for (let i = 0; i < newOrderSymbols.length; i++) {
+            const symbol = newOrderSymbols[i];
+            this.resolvePromiseIfMessagehashMatches(client, 'orders::', symbol, newOrders);
+        }
+        client.resolve(newOrders, 'orders');
     }
     parseWsOrder(order, market = undefined) {
         //
-        // {
-        //     "symbol": "LTC_USDT",
-        //     "notional": '',
-        //     "side": "buy",
-        //     "last_fill_time": "0",
-        //     "ms_t": "1646216634000",
-        //     "type": "limit",
-        //     "filled_notional": "0.000000000000000000000000000000",
-        //     "last_fill_price": "0",
-        //     "size": "0.500000000000000000000000000000",
-        //     "price": "50.000000000000000000000000000000",
-        //     "last_fill_count": "0",
-        //     "filled_size": "0.000000000000000000000000000000",
-        //     "margin_trading": "0",
-        //     "state": "8",
-        //     "order_id": "24807076628",
-        //     "order_type": "0"
-        //   }
+        // spot
+        //    {
+        //        "symbol": "LTC_USDT",
+        //        "notional": '',
+        //        "side": "buy",
+        //        "last_fill_time": "0",
+        //        "ms_t": "1646216634000",
+        //        "type": "limit",
+        //        "filled_notional": "0.000000000000000000000000000000",
+        //        "last_fill_price": "0",
+        //        "size": "0.500000000000000000000000000000",
+        //        "price": "50.000000000000000000000000000000",
+        //        "last_fill_count": "0",
+        //        "filled_size": "0.000000000000000000000000000000",
+        //        "margin_trading": "0",
+        //        "state": "8",
+        //        "order_id": "24807076628",
+        //        "order_type": "0"
+        //    }
+        // swap
+        //    {
+        //       "action":2,
+        //       "order":{
+        //          "order_id":"2312045036986775",
+        //          "client_order_id":"",
+        //          "price":"71.61707928",
+        //          "size":"1",
+        //          "symbol":"LTCUSDT",
+        //          "state":1,
+        //          "side":4,
+        //          "type":"market",
+        //          "leverage":"1",
+        //          "open_type":"cross",
+        //          "deal_avg_price":"0",
+        //          "deal_size":"0",
+        //          "create_time":1701625324646,
+        //          "update_time":1701625324640,
+        //          "plan_order_id":"",
+        //          "last_trade":null
+        //       }
+        //    }
         //
-        const marketId = this.safeString(order, 'symbol');
-        market = this.safeMarket(marketId, market);
-        const id = this.safeString(order, 'order_id');
-        const clientOrderId = this.safeString(order, 'clientOid');
-        const price = this.safeString(order, 'price');
-        const filled = this.safeString(order, 'filled_size');
-        const amount = this.safeString(order, 'size');
-        const type = this.safeString(order, 'type');
-        const rawState = this.safeString(order, 'state');
-        const status = this.parseOrderStatusByType(market['type'], rawState);
-        const timestamp = this.safeInteger(order, 'ms_t');
+        const action = this.safeNumber(order, 'action');
+        const isSpot = (action === undefined);
+        if (isSpot) {
+            const marketId = this.safeString(order, 'symbol');
+            market = this.safeMarket(marketId, market, '_', 'spot');
+            const id = this.safeString(order, 'order_id');
+            const clientOrderId = this.safeString(order, 'clientOid');
+            const price = this.safeString(order, 'price');
+            const filled = this.safeString(order, 'filled_size');
+            const amount = this.safeString(order, 'size');
+            const type = this.safeString(order, 'type');
+            const rawState = this.safeString(order, 'state');
+            const status = this.parseOrderStatusByType(market['type'], rawState);
+            const timestamp = this.safeInteger(order, 'ms_t');
+            const symbol = market['symbol'];
+            const side = this.safeStringLower(order, 'side');
+            return this.safeOrder({
+                'info': order,
+                'symbol': symbol,
+                'id': id,
+                'clientOrderId': clientOrderId,
+                'timestamp': undefined,
+                'datetime': undefined,
+                'lastTradeTimestamp': timestamp,
+                'type': type,
+                'timeInForce': undefined,
+                'postOnly': undefined,
+                'side': side,
+                'price': price,
+                'stopPrice': undefined,
+                'triggerPrice': undefined,
+                'amount': amount,
+                'cost': undefined,
+                'average': undefined,
+                'filled': filled,
+                'remaining': undefined,
+                'status': status,
+                'fee': undefined,
+                'trades': undefined,
+            }, market);
+        }
+        else {
+            const orderInfo = this.safeValue(order, 'order');
+            const marketId = this.safeString(orderInfo, 'symbol');
+            const symbol = this.safeSymbol(marketId, market, '', 'swap');
+            const orderId = this.safeString(orderInfo, 'order_id');
+            const timestamp = this.safeInteger(orderInfo, 'create_time');
+            const updatedTimestamp = this.safeInteger(orderInfo, 'update_time');
+            const lastTrade = this.safeValue(orderInfo, 'last_trade');
+            const cachedOrders = this.orders;
+            const orders = this.safeValue(cachedOrders.hashmap, symbol, {});
+            const cachedOrder = this.safeValue(orders, orderId);
+            let trades = undefined;
+            if (cachedOrder !== undefined) {
+                trades = this.safeValue(order, 'trades');
+            }
+            if (lastTrade !== undefined) {
+                if (trades === undefined) {
+                    trades = [];
+                }
+                trades.push(lastTrade);
+            }
+            return this.safeOrder({
+                'info': order,
+                'symbol': symbol,
+                'id': orderId,
+                'clientOrderId': this.safeString(orderInfo, 'client_order_id'),
+                'timestamp': timestamp,
+                'datetime': this.iso8601(timestamp),
+                'lastTradeTimestamp': updatedTimestamp,
+                'type': this.safeString(orderInfo, 'type'),
+                'timeInForce': undefined,
+                'postOnly': undefined,
+                'side': this.parseWsOrderSide(this.safeString(orderInfo, 'side')),
+                'price': this.safeString(orderInfo, 'price'),
+                'stopPrice': undefined,
+                'triggerPrice': undefined,
+                'amount': this.safeString(orderInfo, 'size'),
+                'cost': undefined,
+                'average': this.safeString(orderInfo, 'deal_avg_price'),
+                'filled': this.safeString(orderInfo, 'deal_size'),
+                'remaining': undefined,
+                'status': this.parseWsOrderStatus(this.safeString(order, 'action')),
+                'fee': undefined,
+                'trades': trades,
+            }, market);
+        }
+    }
+    parseWsOrderStatus(statusId) {
+        const statuses = {
+            '1': 'closed',
+            '2': 'open',
+            '3': 'canceled',
+            '4': 'closed',
+            '5': 'canceled',
+            '6': 'open',
+            '7': 'open',
+            '8': 'closed',
+            '9': 'closed', // active adl match deal
+        };
+        return this.safeString(statuses, statusId, statusId);
+    }
+    parseWsOrderSide(sideId) {
+        const sides = {
+            '1': 'buy',
+            '2': 'buy',
+            '3': 'sell',
+            '4': 'sell', // sell_open_short
+        };
+        return this.safeString(sides, sideId, sideId);
+    }
+    async watchPositions(symbols = undefined, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name bitmart#watchPositions
+         * @see https://developer-pro.bitmart.com/en/futures/#private-position-channel
+         * @description watch all open positions
+         * @param {string[]|undefined} symbols list of unified market symbols
+         * @param {object} params extra parameters specific to the exchange API endpoint
+         * @returns {object[]} a list of [position structure]{@link https://docs.ccxt.com/en/latest/manual.html#position-structure}
+         */
+        await this.loadMarkets();
+        const type = 'swap';
+        await this.authenticate(type, params);
+        symbols = this.marketSymbols(symbols, 'swap', true, true, false);
+        let messageHash = 'positions';
+        if (symbols !== undefined) {
+            messageHash += '::' + symbols.join(',');
+        }
+        const subscriptionHash = 'futures/position';
+        const request = {
+            'action': 'subscribe',
+            'args': ['futures/position'],
+        };
+        const url = this.implodeHostname(this.urls['api']['ws'][type]['private']);
+        const newPositions = await this.watch(url, messageHash, this.deepExtend(request, params), subscriptionHash);
+        if (this.newUpdates) {
+            return newPositions;
+        }
+        return this.filterBySymbolsSinceLimit(this.positions, symbols, since, limit);
+    }
+    handlePositions(client, message) {
+        //
+        //    {
+        //        "group":"futures/position",
+        //        "data":[
+        //           {
+        //              "symbol":"LTCUSDT",
+        //              "hold_volume":"5",
+        //              "position_type":2,
+        //              "open_type":2,
+        //              "frozen_volume":"0",
+        //              "close_volume":"0",
+        //              "hold_avg_price":"71.582",
+        //              "close_avg_price":"0",
+        //              "open_avg_price":"71.582",
+        //              "liquidate_price":"0",
+        //              "create_time":1701623327513,
+        //              "update_time":1701627620439
+        //           },
+        //           {
+        //              "symbol":"LTCUSDT",
+        //              "hold_volume":"6",
+        //              "position_type":1,
+        //              "open_type":2,
+        //              "frozen_volume":"0",
+        //              "close_volume":"0",
+        //              "hold_avg_price":"71.681666666666666667",
+        //              "close_avg_price":"0",
+        //              "open_avg_price":"71.681666666666666667",
+        //              "liquidate_price":"0",
+        //              "create_time":1701621167225,
+        //              "update_time":1701628152614
+        //           }
+        //        ]
+        //    }
+        //
+        const data = this.safeValue(message, 'data', []);
+        const cache = this.positions;
+        if (this.positions === undefined) {
+            this.positions = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_2__/* .ArrayCacheBySymbolBySide */ .tU();
+        }
+        const newPositions = [];
+        for (let i = 0; i < data.length; i++) {
+            const rawPosition = data[i];
+            const position = this.parseWsPosition(rawPosition);
+            newPositions.push(position);
+            cache.append(position);
+        }
+        const messageHashes = this.findMessageHashes(client, 'positions::');
+        for (let i = 0; i < messageHashes.length; i++) {
+            const messageHash = messageHashes[i];
+            const parts = messageHash.split('::');
+            const symbolsString = parts[1];
+            const symbols = symbolsString.split(',');
+            const positions = this.filterByArray(newPositions, 'symbol', symbols, false);
+            if (!this.isEmpty(positions)) {
+                client.resolve(positions, messageHash);
+            }
+        }
+        client.resolve(newPositions, 'positions');
+    }
+    parseWsPosition(position, market = undefined) {
+        //
+        //    {
+        //       "symbol":"LTCUSDT",
+        //       "hold_volume":"6",
+        //       "position_type":1,
+        //       "open_type":2,
+        //       "frozen_volume":"0",
+        //       "close_volume":"0",
+        //       "hold_avg_price":"71.681666666666666667",
+        //       "close_avg_price":"0",
+        //       "open_avg_price":"71.681666666666666667",
+        //       "liquidate_price":"0",
+        //       "create_time":1701621167225,
+        //       "update_time":1701628152614
+        //    }
+        //
+        const marketId = this.safeString(position, 'symbol');
+        market = this.safeMarket(marketId, market, '', 'swap');
         const symbol = market['symbol'];
-        const side = this.safeStringLower(order, 'side');
-        return this.safeOrder({
-            'info': order,
+        const openTimestamp = this.safeInteger(position, 'create_time');
+        const timestamp = this.safeInteger(position, 'update_time');
+        const side = this.safeNumber(position, 'position_type');
+        const marginModeId = this.safeNumber(position, 'open_type');
+        return this.safePosition({
+            'info': position,
+            'id': undefined,
             'symbol': symbol,
-            'id': id,
-            'clientOrderId': clientOrderId,
-            'timestamp': undefined,
-            'datetime': undefined,
-            'lastTradeTimestamp': timestamp,
-            'type': type,
-            'timeInForce': undefined,
-            'postOnly': undefined,
-            'side': side,
-            'price': price,
-            'stopPrice': undefined,
-            'triggerPrice': undefined,
-            'amount': amount,
-            'cost': undefined,
-            'average': undefined,
-            'filled': filled,
-            'remaining': undefined,
-            'status': status,
-            'fee': undefined,
-            'trades': undefined,
-        }, market);
+            'timestamp': openTimestamp,
+            'datetime': this.iso8601(openTimestamp),
+            'lastUpdateTimestamp': timestamp,
+            'hedged': undefined,
+            'side': (side === 1) ? 'long' : 'short',
+            'contracts': this.safeNumber(position, 'hold_volume'),
+            'contractSize': this.safeNumber(market, 'contractSize'),
+            'entryPrice': this.safeNumber(position, 'open_avg_price'),
+            'markPrice': this.safeNumber(position, 'hold_avg_price'),
+            'lastPrice': undefined,
+            'notional': undefined,
+            'leverage': undefined,
+            'collateral': undefined,
+            'initialMargin': undefined,
+            'initialMarginPercentage': undefined,
+            'maintenanceMargin': undefined,
+            'maintenanceMarginPercentage': undefined,
+            'unrealizedPnl': undefined,
+            'realizedPnl': undefined,
+            'liquidationPrice': this.safeNumber(position, 'liquidate_price'),
+            'marginMode': (marginModeId === 1) ? 'isolated' : 'cross',
+            'percentage': undefined,
+            'marginRatio': undefined,
+            'stopLossPrice': undefined,
+            'takeProfitPrice': undefined,
+        });
     }
     handleTrade(client, message) {
         //
-        //     {
-        //         "table": "spot/trade",
-        //         "data": [
-        //             {
-        //                 "price": "52700.50",
-        //                 "s_t": 1630982050,
-        //                 "side": "buy",
-        //                 "size": "0.00112",
-        //                 "symbol": "BTC_USDT"
-        //             },
-        //         ]
-        //     }
+        // spot
+        //    {
+        //        "table": "spot/trade",
+        //        "data": [
+        //            {
+        //                "price": "52700.50",
+        //                "s_t": 1630982050,
+        //                "side": "buy",
+        //                "size": "0.00112",
+        //                "symbol": "BTC_USDT"
+        //            },
+        //        ]
+        //    }
         //
-        const table = this.safeString(message, 'table');
-        const data = this.safeValue(message, 'data', []);
-        const tradesLimit = this.safeInteger(this.options, 'tradesLimit', 1000);
+        // swap
+        //    {
+        //        "group":"futures/trade:BTCUSDT",
+        //        "data":[
+        //           {
+        //              "trade_id":6798697637,
+        //              "contract_id":1,
+        //              "symbol":"BTCUSDT",
+        //              "deal_price":"39735.8",
+        //              "deal_vol":"2",
+        //              "type":0,
+        //              "way":1,
+        //              "create_time":1701618503,
+        //              "create_time_mill":1701618503517,
+        //              "created_at":"2023-12-03T15:48:23.517518538Z"
+        //           }
+        //        ]
+        //    }
+        //
+        const channel = this.safeString2(message, 'table', 'group');
+        const isSpot = (channel.indexOf('spot') >= 0);
+        const data = this.safeValue(message, 'data');
+        if (data === undefined) {
+            return;
+        }
+        let stored = undefined;
         for (let i = 0; i < data.length; i++) {
-            const trade = this.parseTrade(data[i]);
+            const trade = this.parseWsTrade(data[i]);
             const symbol = trade['symbol'];
-            const marketId = this.safeString(trade['info'], 'symbol');
-            const messageHash = table + ':' + marketId;
-            let stored = this.safeValue(this.trades, symbol);
+            const tradesLimit = this.safeInteger(this.options, 'tradesLimit', 1000);
+            stored = this.safeValue(this.trades, symbol);
             if (stored === undefined) {
                 stored = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_2__/* .ArrayCache */ .ZL(tradesLimit);
                 this.trades[symbol] = stored;
             }
             stored.append(trade);
-            client.resolve(stored, messageHash);
         }
+        let messageHash = channel;
+        if (isSpot) {
+            messageHash += ':' + this.safeString(data[0], 'symbol');
+        }
+        client.resolve(stored, messageHash);
         return message;
     }
+    parseWsTrade(trade, market = undefined) {
+        // spot
+        //    {
+        //        "price": "52700.50",
+        //        "s_t": 1630982050,
+        //        "side": "buy",
+        //        "size": "0.00112",
+        //        "symbol": "BTC_USDT"
+        //    }
+        // swap
+        //    {
+        //       "trade_id":6798697637,
+        //       "contract_id":1,
+        //       "symbol":"BTCUSDT",
+        //       "deal_price":"39735.8",
+        //       "deal_vol":"2",
+        //       "type":0,
+        //       "way":1,
+        //       "create_time":1701618503,
+        //       "create_time_mill":1701618503517,
+        //       "created_at":"2023-12-03T15:48:23.517518538Z"
+        //    }
+        //
+        const contractId = this.safeString(trade, 'contract_id');
+        const marketType = (contractId === undefined) ? 'spot' : 'swap';
+        const marketDelimiter = (marketType === 'spot') ? '_' : '';
+        const timestamp = this.safeInteger(trade, 'create_time_mill', this.safeTimestamp(trade, 's_t'));
+        const marketId = this.safeString(trade, 'symbol');
+        return this.safeTrade({
+            'info': trade,
+            'id': this.safeString(trade, 'trade_id'),
+            'order': undefined,
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
+            'symbol': this.safeSymbol(marketId, market, marketDelimiter, marketType),
+            'type': undefined,
+            'side': this.safeString(trade, 'side'),
+            'price': this.safeString2(trade, 'price', 'deal_price'),
+            'amount': this.safeString2(trade, 'size', 'deal_vol'),
+            'cost': undefined,
+            'takerOrMaker': undefined,
+            'fee': undefined,
+        }, market);
+    }
     handleTicker(client, message) {
         //
-        //     {
-        //         "data": [
-        //             {
-        //                 "base_volume_24h": "78615593.81",
-        //                 "high_24h": "52756.97",
-        //                 "last_price": "52638.31",
-        //                 "low_24h": "50991.35",
-        //                 "open_24h": "51692.03",
-        //                 "s_t": 1630981727,
-        //                 "symbol": "BTC_USDT"
-        //             }
-        //         ],
-        //         "table": "spot/ticker"
-        //     }
+        //    {
+        //        "data": [
+        //            {
+        //                "base_volume_24h": "78615593.81",
+        //                "high_24h": "52756.97",
+        //                "last_price": "52638.31",
+        //                "low_24h": "50991.35",
+        //                "open_24h": "51692.03",
+        //                "s_t": 1630981727,
+        //                "symbol": "BTC_USDT"
+        //            }
+        //        ],
+        //        "table": "spot/ticker"
+        //    }
+        //    {
+        //        "group":"futures/ticker",
+        //        "data":{
+        //              "symbol":"BTCUSDT",
+        //              "volume_24":"117387.58",
+        //              "fair_price":"146.24",
+        //              "last_price":"146.24",
+        //              "range":"147.17",
+        //              "ask_price": "147.11",
+        //              "ask_vol": "1",
+        //              "bid_price": "142.11",
+        //              "bid_vol": "1"
+        //            }
+        //    }
         //
         const table = this.safeString(message, 'table');
-        const data = this.safeValue(message, 'data', []);
-        for (let i = 0; i < data.length; i++) {
-            const ticker = this.parseTicker(data[i]);
-            const symbol = ticker['symbol'];
-            const marketId = this.safeString(ticker['info'], 'symbol');
-            const messageHash = table + ':' + marketId;
+        const isSpot = (table !== undefined);
+        const data = this.safeValue(message, 'data');
+        if (data === undefined) {
+            return;
+        }
+        if (isSpot) {
+            for (let i = 0; i < data.length; i++) {
+                const ticker = this.parseTicker(data[i]);
+                const symbol = ticker['symbol'];
+                const marketId = this.safeString(ticker['info'], 'symbol');
+                const messageHash = table + ':' + marketId;
+                this.tickers[symbol] = ticker;
+                client.resolve(ticker, messageHash);
+            }
+        }
+        else {
+            const ticker = this.parseWsSwapTicker(data);
+            const symbol = this.safeString(ticker, 'symbol');
             this.tickers[symbol] = ticker;
-            client.resolve(ticker, messageHash);
+            client.resolve(ticker, 'tickers');
+            this.resolvePromiseIfMessagehashMatches(client, 'tickers::', symbol, ticker);
         }
         return message;
     }
+    parseWsSwapTicker(ticker, market = undefined) {
+        //
+        //    {
+        //        "symbol":"BTCUSDT",
+        //        "volume_24":"117387.58",
+        //        "fair_price":"146.24",
+        //        "last_price":"146.24",
+        //        "range":"147.17",
+        //        "ask_price": "147.11",
+        //        "ask_vol": "1",
+        //        "bid_price": "142.11",
+        //        "bid_vol": "1"
+        //    }
+        const marketId = this.safeString(ticker, 'symbol');
+        return this.safeTicker({
+            'symbol': this.safeSymbol(marketId, market, '', 'swap'),
+            'timestamp': undefined,
+            'datetime': undefined,
+            'high': undefined,
+            'low': undefined,
+            'bid': this.safeString(ticker, 'bid_price'),
+            'bidVolume': this.safeString(ticker, 'bid_vol'),
+            'ask': this.safeString(ticker, 'ask_price'),
+            'askVolume': this.safeString(ticker, 'ask_vol'),
+            'vwap': undefined,
+            'open': undefined,
+            'close': undefined,
+            'last': this.safeString(ticker, 'last_price'),
+            'previousClose': undefined,
+            'change': undefined,
+            'percentage': undefined,
+            'average': this.safeString(ticker, 'fair_price'),
+            'baseVolume': undefined,
+            'quoteVolume': this.safeString(ticker, 'volume_24'),
+            'info': ticker,
+        }, market);
+    }
     async watchOHLCV(symbol, timeframe = '1m', since = undefined, limit = undefined, params = {}) {
         /**
          * @method
          * @name bitmart#watchOHLCV
+         * @see https://developer-pro.bitmart.com/en/spot/#public-kline-channel
+         * @see https://developer-pro.bitmart.com/en/futures/#public-klinebin-channel
          * @description watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
          * @param {string} symbol unified symbol of the market to fetch OHLCV data for
          * @param {string} timeframe the length of time each candle represents
@@ -213694,10 +214461,19 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          */
         await this.loadMarkets();
         symbol = this.symbol(symbol);
+        const market = this.market(symbol);
+        let type = 'spot';
+        [type, params] = this.handleMarketTypeAndParams('watchOrderBook', market, params);
         const timeframes = this.safeValue(this.options, 'timeframes', {});
         const interval = this.safeString(timeframes, timeframe);
-        const name = 'kline' + interval;
-        const ohlcv = await this.subscribe(name, symbol, params);
+        let name = undefined;
+        if (type === 'spot') {
+            name = 'kline' + interval;
+        }
+        else {
+            name = 'klineBin' + interval;
+        }
+        const ohlcv = await this.subscribe(name, symbol, type, params);
         if (this.newUpdates) {
             limit = ohlcv.getLimit(symbol, limit);
         }
@@ -213705,40 +214481,82 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
     }
     handleOHLCV(client, message) {
         //
-        //     {
-        //         "data": [
-        //             {
-        //                 "candle": [
-        //                     1631056350,
-        //                     "46532.83",
-        //                     "46555.71",
-        //                     "46511.41",
-        //                     "46555.71",
-        //                     "0.25"
-        //                 ],
-        //                 "symbol": "BTC_USDT"
-        //             }
-        //         ],
-        //         "table": "spot/kline1m"
-        //     }
+        //    {
+        //        "data": [
+        //            {
+        //                "candle": [
+        //                    1631056350,
+        //                    "46532.83",
+        //                    "46555.71",
+        //                    "46511.41",
+        //                    "46555.71",
+        //                    "0.25"
+        //                ],
+        //                "symbol": "BTC_USDT"
+        //            }
+        //        ],
+        //        "table": "spot/kline1m"
+        //    }
+        // swap
+        //    {
+        //        "group":"futures/klineBin1m:BTCUSDT",
+        //        "data":{
+        //           "symbol":"BTCUSDT",
+        //           "items":[
+        //              {
+        //                 "o":"39635.8",
+        //                 "h":"39636",
+        //                 "l":"39614.4",
+        //                 "c":"39629.7",
+        //                 "v":"31852",
+        //                 "ts":1701617761
+        //              }
+        //           ]
+        //        }
+        //    }
         //
-        const table = this.safeString(message, 'table');
-        const data = this.safeValue(message, 'data', []);
-        const parts = table.split('/');
-        const part1 = this.safeString(parts, 1);
-        const interval = part1.replace('kline', '');
+        const channel = this.safeString2(message, 'table', 'group');
+        const isSpot = (channel.indexOf('spot') >= 0);
+        const data = this.safeValue(message, 'data');
+        if (data === undefined) {
+            return;
+        }
+        const parts = channel.split('/');
+        const part1 = this.safeString(parts, 1, '');
+        let interval = part1.replace('kline', '');
+        interval = interval.replace('Bin', '');
+        const intervalParts = interval.split(':');
+        interval = this.safeString(intervalParts, 0);
         // use a reverse lookup in a static map instead
         const timeframes = this.safeValue(this.options, 'timeframes', {});
         const timeframe = this.findTimeframe(interval, timeframes);
         const duration = this.parseTimeframe(timeframe);
         const durationInMs = duration * 1000;
-        for (let i = 0; i < data.length; i++) {
-            const marketId = this.safeString(data[i], 'symbol');
-            const candle = this.safeValue(data[i], 'candle');
-            const market = this.safeMarket(marketId);
+        if (isSpot) {
+            for (let i = 0; i < data.length; i++) {
+                const marketId = this.safeString(data[i], 'symbol');
+                const market = this.safeMarket(marketId);
+                const symbol = market['symbol'];
+                const rawOHLCV = this.safeValue(data[i], 'candle');
+                const parsed = this.parseOHLCV(rawOHLCV, market);
+                parsed[0] = this.parseToInt(parsed[0] / durationInMs) * durationInMs;
+                this.ohlcvs[symbol] = this.safeValue(this.ohlcvs, symbol, {});
+                let stored = this.safeValue(this.ohlcvs[symbol], timeframe);
+                if (stored === undefined) {
+                    const limit = this.safeInteger(this.options, 'OHLCVLimit', 1000);
+                    stored = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_2__/* .ArrayCacheByTimestamp */ .Py(limit);
+                    this.ohlcvs[symbol][timeframe] = stored;
+                }
+                stored.append(parsed);
+                const messageHash = channel + ':' + marketId;
+                client.resolve(stored, messageHash);
+            }
+        }
+        else {
+            const marketId = this.safeString(data, 'symbol');
+            const market = this.safeMarket(marketId, undefined, '', 'swap');
             const symbol = market['symbol'];
-            const parsed = this.parseOHLCV(candle, market);
-            parsed[0] = this.parseToInt(parsed[0] / durationInMs) * durationInMs;
+            const items = this.safeValue(data, 'items', []);
             this.ohlcvs[symbol] = this.safeValue(this.ohlcvs, symbol, {});
             let stored = this.safeValue(this.ohlcvs[symbol], timeframe);
             if (stored === undefined) {
@@ -213746,24 +214564,34 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
                 stored = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_2__/* .ArrayCacheByTimestamp */ .Py(limit);
                 this.ohlcvs[symbol][timeframe] = stored;
             }
-            stored.append(parsed);
-            const messageHash = table + ':' + marketId;
-            client.resolve(stored, messageHash);
+            for (let i = 0; i < items.length; i++) {
+                const candle = items[i];
+                const parsed = this.parseOHLCV(candle, market);
+                stored.append(parsed);
+            }
+            client.resolve(stored, channel);
         }
     }
     async watchOrderBook(symbol, limit = undefined, params = {}) {
         /**
          * @method
          * @name bitmart#watchOrderBook
+         * @see https://developer-pro.bitmart.com/en/spot/#public-depth-all-channel
+         * @see https://developer-pro.bitmart.com/en/futures/#public-depth-channel
          * @description watches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
          * @param {string} symbol unified symbol of the market to fetch the order book for
          * @param {int} [limit] the maximum amount of order book entries to return
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
          */
+        await this.loadMarkets();
         const options = this.safeValue(this.options, 'watchOrderBook', {});
         const depth = this.safeString(options, 'depth', 'depth50');
-        const orderbook = await this.subscribe(depth, symbol, params);
+        symbol = this.symbol(symbol);
+        const market = this.market(symbol);
+        let type = 'spot';
+        [type, params] = this.handleMarketTypeAndParams('watchOrderBook', market, params);
+        const orderbook = await this.subscribe(depth, symbol, type, params);
         return orderbook.limit();
     }
     handleDelta(bookside, delta) {
@@ -213811,22 +214639,19 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
     }
     handleOrderBook(client, message) {
         //
+        // spot
         //     {
         //         "data": [
         //             {
         //                 "asks": [
         //                     [ '46828.38', "0.21847" ],
         //                     [ '46830.68', "0.08232" ],
-        //                     [ '46832.08', "0.09285" ],
-        //                     [ '46837.82', "0.02028" ],
-        //                     [ '46839.43', "0.15068" ]
+        //                     ...
         //                 ],
         //                 "bids": [
         //                     [ '46820.78', "0.00444" ],
         //                     [ '46814.33', "0.00234" ],
-        //                     [ '46813.50', "0.05021" ],
-        //                     [ '46808.14', "0.00217" ],
-        //                     [ '46808.04', "0.00013" ]
+        //                     ...
         //                 ],
         //                 "ms_t": 1631044962431,
         //                 "symbol": "BTC_USDT"
@@ -213834,32 +214659,99 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         //         ],
         //         "table": "spot/depth5"
         //     }
+        // swap
+        //     {
+        //         "group":"futures/depth50:BTCUSDT",
+        //         "data":{
+        //            "symbol":"BTCUSDT",
+        //            "way":1,
+        //            "depths":[
+        //               {
+        //                  "price":"39509.8",
+        //                  "vol":"2379"
+        //               },
+        //               {
+        //                  "price":"39509.6",
+        //                  "vol":"6815"
+        //               },
+        //               ...
+        //            ],
+        //            "ms_t":1701566021194
+        //         }
+        //     }
         //
-        const data = this.safeValue(message, 'data', []);
-        const table = this.safeString(message, 'table');
+        const data = this.safeValue(message, 'data');
+        if (data === undefined) {
+            return;
+        }
+        const depths = this.safeValue(data, 'depths');
+        const isSpot = (depths === undefined);
+        const table = this.safeString2(message, 'table', 'group');
         const parts = table.split('/');
         const lastPart = this.safeString(parts, 1);
-        const limitString = lastPart.replace('depth', '');
-        const limit = parseInt(limitString);
-        for (let i = 0; i < data.length; i++) {
-            const update = data[i];
-            const marketId = this.safeString(update, 'symbol');
+        let limitString = lastPart.replace('depth', '');
+        const dotsIndex = limitString.indexOf(':');
+        limitString = limitString.slice(0, dotsIndex);
+        const limit = this.parseToInt(limitString);
+        if (isSpot) {
+            for (let i = 0; i < data.length; i++) {
+                const update = data[i];
+                const marketId = this.safeString(update, 'symbol');
+                const symbol = this.safeSymbol(marketId);
+                let orderbook = this.safeValue(this.orderbooks, symbol);
+                if (orderbook === undefined) {
+                    orderbook = this.orderBook({}, limit);
+                    orderbook['symbol'] = symbol;
+                    this.orderbooks[symbol] = orderbook;
+                }
+                orderbook.reset({});
+                this.handleOrderBookMessage(client, update, orderbook);
+                const timestamp = this.safeInteger(update, 'ms_t');
+                orderbook['timestamp'] = timestamp;
+                orderbook['datetime'] = this.iso8601(timestamp);
+                const messageHash = table + ':' + marketId;
+                client.resolve(orderbook, messageHash);
+            }
+        }
+        else {
+            const marketId = this.safeString(data, 'symbol');
             const symbol = this.safeSymbol(marketId);
             let orderbook = this.safeValue(this.orderbooks, symbol);
             if (orderbook === undefined) {
                 orderbook = this.orderBook({}, limit);
+                orderbook['symbol'] = symbol;
                 this.orderbooks[symbol] = orderbook;
             }
-            orderbook.reset({});
-            this.handleOrderBookMessage(client, update, orderbook);
-            const messageHash = table + ':' + marketId;
+            const way = this.safeNumber(data, 'way');
+            const side = (way === 1) ? 'bids' : 'asks';
+            if (way === 1) {
+                orderbook[side] = new _base_ws_OrderBookSide_js__WEBPACK_IMPORTED_MODULE_3__/* .Bids */ .T8([], limit);
+            }
+            else {
+                orderbook[side] = new _base_ws_OrderBookSide_js__WEBPACK_IMPORTED_MODULE_3__/* .Asks */ .lB([], limit);
+            }
+            for (let i = 0; i < depths.length; i++) {
+                const depth = depths[i];
+                const price = this.safeNumber(depth, 'price');
+                const amount = this.safeNumber(depth, 'vol');
+                const orderbookSide = this.safeValue(orderbook, side);
+                orderbookSide.store(price, amount);
+            }
+            const bidsLength = orderbook['bids'].length;
+            const asksLength = orderbook['asks'].length;
+            if ((bidsLength === 0) || (asksLength === 0)) {
+                return;
+            }
+            const timestamp = this.safeInteger(data, 'ms_t');
+            orderbook['timestamp'] = timestamp;
+            orderbook['datetime'] = this.iso8601(timestamp);
+            const messageHash = table;
             client.resolve(orderbook, messageHash);
         }
-        return message;
     }
-    async authenticate(params = {}) {
+    async authenticate(type, params = {}) {
         this.checkRequiredCredentials();
-        const url = this.implodeHostname(this.urls['api']['ws']['private']);
+        const url = this.implodeHostname(this.urls['api']['ws'][type]['private']);
         const messageHash = 'authenticated';
         const client = this.client(url);
         const future = client.future(messageHash);
@@ -213869,16 +214761,29 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
             const memo = this.uid;
             const path = 'bitmart.WebSocket';
             const auth = timestamp + '#' + memo + '#' + path;
-            const signature = this.hmac(this.encode(auth), this.encode(this.secret), _static_dependencies_noble_hashes_sha256_js__WEBPACK_IMPORTED_MODULE_3__/* .sha256 */ .J);
-            const operation = 'login';
-            const request = {
-                'op': operation,
-                'args': [
-                    this.apiKey,
-                    timestamp,
-                    signature,
-                ],
-            };
+            const signature = this.hmac(this.encode(auth), this.encode(this.secret), _static_dependencies_noble_hashes_sha256_js__WEBPACK_IMPORTED_MODULE_4__/* .sha256 */ .J);
+            let request = undefined;
+            if (type === 'spot') {
+                request = {
+                    'op': 'login',
+                    'args': [
+                        this.apiKey,
+                        timestamp,
+                        signature,
+                    ],
+                };
+            }
+            else {
+                request = {
+                    'action': 'access',
+                    'args': [
+                        this.apiKey,
+                        timestamp,
+                        signature,
+                        'web',
+                    ],
+                };
+            }
             const message = this.extend(request, params);
             this.watch(url, messageHash, message, messageHash);
         }
@@ -213886,13 +214791,16 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
     }
     handleSubscriptionStatus(client, message) {
         //
-        //     {"event":"subscribe","channel":"spot/depth:BTC-USDT"}
+        //    {"event":"subscribe","channel":"spot/depth:BTC-USDT"}
         //
         return message;
     }
     handleAuthenticate(client, message) {
         //
-        //     { event: "login" }
+        // spot
+        //    { event: "login" }
+        // swap
+        //    { action: 'access', success: true }
         //
         const messageHash = 'authenticated';
         const future = this.safeValue(client.futures, messageHash);
@@ -213900,29 +214808,41 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
     }
     handleErrorMessage(client, message) {
         //
-        //     { event: "error", message: "Invalid sign", errorCode: 30013 }
-        //     {"event":"error","message":"Unrecognized request: {\"event\":\"subscribe\",\"channel\":\"spot/depth:BTC-USDT\"}","errorCode":30039}
+        //    { event: "error", message: "Invalid sign", errorCode: 30013 }
+        //    {"event":"error","message":"Unrecognized request: {\"event\":\"subscribe\",\"channel\":\"spot/depth:BTC-USDT\"}","errorCode":30039}
+        //    {
+        //        action: '',
+        //        group: 'futures/trade:BTCUSDT',
+        //        success: false,
+        //        request: { action: '', args: [ 'futures/trade:BTCUSDT' ] },
+        //        error: 'Invalid action [] for group [futures/trade:BTCUSDT]'
+        //    }
         //
         const errorCode = this.safeString(message, 'errorCode');
+        const error = this.safeString(message, 'error');
         try {
-            if (errorCode !== undefined) {
+            if (errorCode !== undefined || error !== undefined) {
                 const feedback = this.id + ' ' + this.json(message);
                 this.throwExactlyMatchedException(this.exceptions['exact'], errorCode, feedback);
-                const messageString = this.safeValue(message, 'message');
-                if (messageString !== undefined) {
-                    this.throwBroadlyMatchedException(this.exceptions['broad'], messageString, feedback);
+                const messageString = this.safeValue(message, 'message', error);
+                this.throwBroadlyMatchedException(this.exceptions['broad'], messageString, feedback);
+                const action = this.safeString(message, 'action');
+                if (action === 'access') {
+                    throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.AuthenticationError(feedback);
                 }
+                throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ExchangeError(feedback);
             }
             return false;
         }
         catch (e) {
-            if (e instanceof _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.AuthenticationError) {
+            if ((e instanceof _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.AuthenticationError)) {
                 const messageHash = 'authenticated';
                 client.reject(e, messageHash);
                 if (messageHash in client.subscriptions) {
                     delete client.subscriptions[messageHash];
                 }
             }
+            client.reject(e);
             return true;
         }
     }
@@ -213955,14 +214875,14 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         //
         //     { data: '', table: "spot/user/order" }
         //
-        const table = this.safeString(message, 'table');
-        if (table === undefined) {
-            const event = this.safeString(message, 'event');
+        const channel = this.safeString2(message, 'table', 'group');
+        if (channel === undefined) {
+            const event = this.safeString2(message, 'event', 'action');
             if (event !== undefined) {
                 const methods = {
                     // 'info': this.handleSystemStatus,
-                    // 'book': 'handleOrderBook',
                     'login': this.handleAuthenticate,
+                    'access': this.handleAuthenticate,
                     'subscribe': this.handleSubscriptionStatus,
                 };
                 const method = this.safeValue(methods, event);
@@ -213975,30 +214895,25 @@ class bitmart extends _bitmart_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
             }
         }
         else {
-            const parts = table.split('/');
-            const name = this.safeString(parts, 1);
             const methods = {
-                'depth': this.handleOrderBook,
                 'depth5': this.handleOrderBook,
                 'depth20': this.handleOrderBook,
                 'depth50': this.handleOrderBook,
                 'ticker': this.handleTicker,
                 'trade': this.handleTrade,
-                // ...
+                'kline': this.handleOHLCV,
+                'order': this.handleOrders,
+                'position': this.handlePositions,
+                'balance': this.handleBalance,
+                'asset': this.handleBalance,
             };
-            let method = this.safeValue(methods, name);
-            if (name.indexOf('kline') >= 0) {
-                method = this.handleOHLCV;
-            }
-            const privateName = this.safeString(parts, 2);
-            if (privateName === 'order') {
-                method = this.handleOrders;
-            }
-            if (method === undefined) {
-                return message;
-            }
-            else {
-                return method.call(this, client, message);
+            const keys = Object.keys(methods);
+            for (let i = 0; i < keys.length; i++) {
+                const key = keys[i];
+                if (channel.indexOf(key) >= 0) {
+                    const method = this.safeValue(methods, key);
+                    return method.call(this, client, message);
+                }
             }
         }
     }
@@ -214034,6 +214949,7 @@ class bitmex extends _bitmex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z
                 'watchOrderBook': true,
                 'watchOrderBookForSymbols': true,
                 'watchOrders': true,
+                'watchPostions': true,
                 'watchTicker': true,
                 'watchTickers': false,
                 'watchTrades': true,
@@ -214607,6 +215523,210 @@ class bitmex extends _bitmex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z
             }
         }
     }
+    async watchPositions(symbols = undefined, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name bitmex#watchPositions
+         * @see https://www.bitmex.com/app/wsAPI
+         * @description watch all open positions
+         * @param {string[]|undefined} symbols list of unified market symbols
+         * @param {object} params extra parameters specific to the exchange API endpoint
+         * @returns {object[]} a list of [position structure]{@link https://docs.ccxt.com/en/latest/manual.html#position-structure}
+         */
+        await this.loadMarkets();
+        await this.authenticate();
+        const subscriptionHash = 'position';
+        let messageHash = 'positions';
+        if (!this.isEmpty(symbols)) {
+            messageHash = '::' + symbols.join(',');
+        }
+        const url = this.urls['api']['ws'];
+        const request = {
+            'op': 'subscribe',
+            'args': [
+                subscriptionHash,
+            ],
+        };
+        const newPositions = await this.watch(url, messageHash, request, subscriptionHash);
+        if (this.newUpdates) {
+            return newPositions;
+        }
+        return this.filterBySymbolsSinceLimit(this.positions, symbols, since, limit, true);
+    }
+    handlePositions(client, message) {
+        //
+        // partial
+        //    {
+        //        table: 'position',
+        //        action: 'partial',
+        //        keys: [ 'account', 'symbol' ],
+        //        types: {
+        //            account: 'long',
+        //            symbol: 'symbol',
+        //            currency: 'symbol',
+        //            underlying: 'symbol',
+        //            quoteCurrency: 'symbol',
+        //            commission: 'float',
+        //            initMarginReq: 'float',
+        //            maintMarginReq: 'float',
+        //            riskLimit: 'long',
+        //            leverage: 'float',
+        //            crossMargin: 'boolean',
+        //            deleveragePercentile: 'float',
+        //            rebalancedPnl: 'long',
+        //            prevRealisedPnl: 'long',
+        //            prevUnrealisedPnl: 'long',
+        //            openingQty: 'long',
+        //            openOrderBuyQty: 'long',
+        //            openOrderBuyCost: 'long',
+        //            openOrderBuyPremium: 'long',
+        //            openOrderSellQty: 'long',
+        //            openOrderSellCost: 'long',
+        //            openOrderSellPremium: 'long',
+        //            currentQty: 'long',
+        //            currentCost: 'long',
+        //            currentComm: 'long',
+        //            realisedCost: 'long',
+        //            unrealisedCost: 'long',
+        //            grossOpenPremium: 'long',
+        //            isOpen: 'boolean',
+        //            markPrice: 'float',
+        //            markValue: 'long',
+        //            riskValue: 'long',
+        //            homeNotional: 'float',
+        //            foreignNotional: 'float',
+        //            posState: 'symbol',
+        //            posCost: 'long',
+        //            posCross: 'long',
+        //            posComm: 'long',
+        //            posLoss: 'long',
+        //            posMargin: 'long',
+        //            posMaint: 'long',
+        //            initMargin: 'long',
+        //            maintMargin: 'long',
+        //            realisedPnl: 'long',
+        //            unrealisedPnl: 'long',
+        //            unrealisedPnlPcnt: 'float',
+        //            unrealisedRoePcnt: 'float',
+        //            avgCostPrice: 'float',
+        //            avgEntryPrice: 'float',
+        //            breakEvenPrice: 'float',
+        //            marginCallPrice: 'float',
+        //            liquidationPrice: 'float',
+        //            bankruptPrice: 'float',
+        //            timestamp: 'timestamp'
+        //        },
+        //        filter: { account: 412475 },
+        //        data: [
+        //            {
+        //                account: 412475,
+        //                symbol: 'XBTUSD',
+        //                currency: 'XBt',
+        //                underlying: 'XBT',
+        //                quoteCurrency: 'USD',
+        //                commission: 0.00075,
+        //                initMarginReq: 0.01,
+        //                maintMarginReq: 0.0035,
+        //                riskLimit: 20000000000,
+        //                leverage: 100,
+        //                crossMargin: true,
+        //                deleveragePercentile: 1,
+        //                rebalancedPnl: 0,
+        //                prevRealisedPnl: 0,
+        //                prevUnrealisedPnl: 0,
+        //                openingQty: 400,
+        //                openOrderBuyQty: 0,
+        //                openOrderBuyCost: 0,
+        //                openOrderBuyPremium: 0,
+        //                openOrderSellQty: 0,
+        //                openOrderSellCost: 0,
+        //                openOrderSellPremium: 0,
+        //                currentQty: 400,
+        //                currentCost: -912269,
+        //                currentComm: 684,
+        //                realisedCost: 0,
+        //                unrealisedCost: -912269,
+        //                grossOpenPremium: 0,
+        //                isOpen: true,
+        //                markPrice: 43772,
+        //                markValue: -913828,
+        //                riskValue: 913828,
+        //                homeNotional: 0.00913828,
+        //                foreignNotional: -400,
+        //                posCost: -912269,
+        //                posCross: 1559,
+        //                posComm: 694,
+        //                posLoss: 0,
+        //                posMargin: 11376,
+        //                posMaint: 3887,
+        //                initMargin: 0,
+        //                maintMargin: 9817,
+        //                realisedPnl: -684,
+        //                unrealisedPnl: -1559,
+        //                unrealisedPnlPcnt: -0.0017,
+        //                unrealisedRoePcnt: -0.1709,
+        //                avgCostPrice: 43846.7643,
+        //                avgEntryPrice: 43846.7643,
+        //                breakEvenPrice: 43880,
+        //                marginCallPrice: 20976,
+        //                liquidationPrice: 20976,
+        //                bankruptPrice: 20941,
+        //                timestamp: '2023-12-07T00:09:00.709Z'
+        //            }
+        //        ]
+        //    }
+        // update
+        //    {
+        //        table: 'position',
+        //        action: 'update',
+        //        data: [
+        //            {
+        //                account: 412475,
+        //                symbol: 'XBTUSD',
+        //                currency: 'XBt',
+        //                currentQty: 400,
+        //                markPrice: 43772.75,
+        //                markValue: -913812,
+        //                riskValue: 913812,
+        //                homeNotional: 0.00913812,
+        //                posCross: 1543,
+        //                posComm: 693,
+        //                posMargin: 11359,
+        //                posMaint: 3886,
+        //                maintMargin: 9816,
+        //                unrealisedPnl: -1543,
+        //                unrealisedRoePcnt: -0.1691,
+        //                liquidationPrice: 20976,
+        //                timestamp: '2023-12-07T00:09:10.760Z'
+        //            }
+        //        ]
+        //    }
+        //
+        if (this.positions === undefined) {
+            this.positions = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_2__/* .ArrayCacheBySymbolBySide */ .tU();
+        }
+        const cache = this.positions;
+        const rawPositions = this.safeValue(message, 'data', []);
+        const newPositions = [];
+        for (let i = 0; i < rawPositions.length; i++) {
+            const rawPosition = rawPositions[i];
+            const position = this.parsePosition(rawPosition);
+            newPositions.push(position);
+            cache.append(position);
+        }
+        const messageHashes = this.findMessageHashes(client, 'positions::');
+        for (let i = 0; i < messageHashes.length; i++) {
+            const messageHash = messageHashes[i];
+            const parts = messageHash.split('::');
+            const symbolsString = parts[1];
+            const symbols = symbolsString.split(',');
+            const positions = this.filterByArray(newPositions, 'symbol', symbols, false);
+            if (!this.isEmpty(positions)) {
+                client.resolve(positions, messageHash);
+            }
+        }
+        client.resolve(newPositions, 'positions');
+    }
     async watchOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
@@ -215389,6 +216509,7 @@ class bitmex extends _bitmex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z
                 'order': this.handleOrders,
                 'execution': this.handleMyTrades,
                 'margin': this.handleBalance,
+                'position': this.handlePositions,
             };
             const method = this.safeValue(methods, table);
             if (method === undefined) {
@@ -239242,10 +240363,10 @@ class krakenfutures extends _krakenfutures_js__WEBPACK_IMPORTED_MODULE_0__/* ["d
          * @ignore
          * @method
          * @description Connects to a websocket channel
-         * @param {String} name name of the channel
+         * @param {string} name name of the channel
          * @param {string[]} symbols CCXT market symbols
-         * @param {Object} [params] extra parameters specific to the krakenfutures api
-         * @returns {Object} data from the websocket stream
+         * @param {object} [params] extra parameters specific to the krakenfutures api
+         * @returns {object} data from the websocket stream
          */
         await this.loadMarkets();
         const url = this.urls['api']['ws'];
@@ -239276,10 +240397,10 @@ class krakenfutures extends _krakenfutures_js__WEBPACK_IMPORTED_MODULE_0__/* ["d
          * @ignore
          * @method
          * @description Connects to a websocket channel
-         * @param {String} name name of the channel
+         * @param {string} name name of the channel
          * @param {string[]} symbols CCXT market symbols
-         * @param {Object} [params] extra parameters specific to the krakenfutures api
-         * @returns {Object} data from the websocket stream
+         * @param {object} [params] extra parameters specific to the krakenfutures api
+         * @returns {object} data from the websocket stream
          */
         await this.loadMarkets();
         await this.authenticate();
@@ -243752,7 +244873,7 @@ class mexc extends _mexc_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
          * @param {int} [since] the earliest time in ms to fetch orders for
          * @param {int} [limit] the maximum number of  orde structures to retrieve
          * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @params {string|undefined} params.type the type of orders to retrieve, can be 'spot' or 'margin'
+         * @param {string|undefined} params.type the type of orders to retrieve, can be 'spot' or 'margin'
          * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
@@ -248816,7 +249937,7 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
          * @param {string} [params.stpMode] self-trade prevention, defaults to expire_taker, none: enable self-trade; expire_taker: taker order will be canceled when self-trade happens
          * @param {string} [params.slippageTolerance] used to control the maximum slippage ratio, the value range is greater than 0 and less than 1
          * @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
-        */
+         */
         await this.loadMarkets();
         await this.authenticate();
         const market = this.market(symbol);
@@ -249998,9 +251119,9 @@ class poloniexfutures extends _poloniexfutures_js__WEBPACK_IMPORTED_MODULE_0__/*
          * @param {string} name name of the channel and suscriptionHash
          * @param {bool} isPrivate true for the authenticated url, false for the public url
          * @param {string} symbol is required for all public channels, not required for private channels (except position)
-         * @param {Object} subscription subscription parameters
-         * @param {Object} [params] extra parameters specific to the poloniex api
-         * @returns {Object} data from the websocket stream
+         * @param {object} subscription subscription parameters
+         * @param {object} [params] extra parameters specific to the poloniex api
+         * @returns {object} data from the websocket stream
          */
         const url = await this.negotiate(isPrivate);
         if (symbol !== undefined) {
@@ -254241,7 +255362,7 @@ class woo extends _woo_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
 //  ---------------------------------------------------------------------------
 /**
  * @class probit
- * @extends Exchange
+ * @augments Exchange
  */
 class probit extends _abstract_probit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -254260,7 +255381,10 @@ class probit extends _abstract_probit_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                 'option': false,
                 'addMargin': false,
                 'cancelOrder': true,
+                'createMarketBuyOrderWithCost': true,
                 'createMarketOrder': true,
+                'createMarketOrderWithCost': false,
+                'createMarketSellOrderWithCost': false,
                 'createOrder': true,
                 'createReduceOnlyOrder': false,
                 'createStopLimitOrder': false,
@@ -254547,6 +255671,7 @@ class probit extends _abstract_probit_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
             'precision': {
                 'amount': this.parseNumber(this.parsePrecision(this.safeString(market, 'quantity_precision'))),
                 'price': this.safeNumber(market, 'price_increment'),
+                'cost': this.parseNumber(this.parsePrecision(this.safeString(market, 'cost_precision'))),
             },
             'limits': {
                 'leverage': {
@@ -255419,14 +256544,15 @@ class probit extends _abstract_probit_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         /**
          * @method
          * @name probit#createOrder
-         * @see https://docs-en.probit.com/reference/order-1
          * @description create a trade order
+         * @see https://docs-en.probit.com/reference/order-1
          * @param {string} symbol unified symbol of the market to create an order in
          * @param {string} type 'market' or 'limit'
          * @param {string} side 'buy' or 'sell'
-         * @param {float} amount how much of currency you want to trade in units of base currency
+         * @param {float} amount how much you want to trade in units of the base currency
          * @param {float} [price] the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
          * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {float} [params.cost] the quote quantity that can be used as an alternative for the amount for market buy orders
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
@@ -255444,7 +256570,7 @@ class probit extends _abstract_probit_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         if (clientOrderId !== undefined) {
             request['client_order_id'] = clientOrderId;
         }
-        let costToPrecision = undefined;
+        let quoteAmount = undefined;
         if (type === 'limit') {
             request['limit_price'] = this.priceToPrecision(symbol, price);
             request['quantity'] = this.amountToPrecision(symbol, amount);
@@ -255452,25 +256578,28 @@ class probit extends _abstract_probit_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         else if (type === 'market') {
             // for market buy it requires the amount of quote currency to spend
             if (side === 'buy') {
-                let cost = this.safeNumber(params, 'cost');
-                const createMarketBuyOrderRequiresPrice = this.safeValue(this.options, 'createMarketBuyOrderRequiresPrice', true);
-                if (createMarketBuyOrderRequiresPrice) {
-                    if (price !== undefined) {
-                        if (cost === undefined) {
-                            const amountString = this.numberToString(amount);
-                            const priceString = this.numberToString(price);
-                            cost = this.parseNumber(_base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringMul(amountString, priceString));
-                        }
+                let createMarketBuyOrderRequiresPrice = true;
+                [createMarketBuyOrderRequiresPrice, params] = this.handleOptionAndParams(params, 'createOrder', 'createMarketBuyOrderRequiresPrice', true);
+                const cost = this.safeString(params, 'cost');
+                params = this.omit(params, 'cost');
+                if (cost !== undefined) {
+                    quoteAmount = this.costToPrecision(symbol, cost);
+                }
+                else if (createMarketBuyOrderRequiresPrice) {
+                    if (price === undefined) {
+                        throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder(this.id + ' createOrder() requires the price argument for market buy orders to calculate the total cost to spend (amount * price), alternatively set the createMarketBuyOrderRequiresPrice option or param to false and pass the cost to spend in the amount argument');
                     }
-                    else if (cost === undefined) {
-                        throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.InvalidOrder(this.id + ' createOrder() requires the price argument for market buy orders to calculate total order cost (amount to spend), where cost = amount * price. Supply a price argument to createOrder() call if you want the cost to be calculated for you from price and amount, or, alternatively, add .options["createMarketBuyOrderRequiresPrice"] = false and supply the total cost value in the "amount" argument or in the "cost" extra parameter (the exchange-specific behaviour)');
+                    else {
+                        const amountString = this.numberToString(amount);
+                        const priceString = this.numberToString(price);
+                        const costRequest = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringMul(amountString, priceString);
+                        quoteAmount = this.costToPrecision(symbol, costRequest);
                     }
                 }
                 else {
-                    cost = (cost === undefined) ? amount : cost;
+                    quoteAmount = this.costToPrecision(symbol, amount);
                 }
-                costToPrecision = this.costToPrecision(symbol, cost);
-                request['cost'] = costToPrecision;
+                request['cost'] = quoteAmount;
             }
             else {
                 request['quantity'] = this.amountToPrecision(symbol, amount);
@@ -255505,7 +256634,7 @@ class probit extends _abstract_probit_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         // returned by the exchange on market buys
         if ((type === 'market') && (side === 'buy')) {
             order['amount'] = undefined;
-            order['cost'] = this.parseNumber(costToPrecision);
+            order['cost'] = this.parseNumber(quoteAmount);
             order['remaining'] = undefined;
         }
         return order;
@@ -256104,7 +257233,7 @@ const version = typeof process !== 'undefined'
     : undefined;
 /**
  *
- * @param {Object} [options = {}] - An object to customize JSEncrypt behaviour
+ * @param {object} [options = {}] - An object to customize JSEncrypt behaviour
  * possible parameters are:
  * - default_key_size        {number}  default: 1024 the key size in bit
  * - default_public_exponent {string}  default: '010001' the hexadecimal representation of the public exponent
@@ -256552,7 +257681,7 @@ class JSEncryptRSAKey extends _lib_jsbn_rsa_js__WEBPACK_IMPORTED_MODULE_1__/* .R
     /**
      * Check if the object contains the necessary parameters to populate the rsa modulus
      * and public exponent parameters.
-     * @param {Object} [obj={}] - An object that may contain the two public key
+     * @param {object} [obj={}] - An object that may contain the two public key
      * parameters
      * @returns {boolean} true if the object contains both the modulus and the public exponent
      * properties (n and e)
@@ -256566,7 +257695,7 @@ class JSEncryptRSAKey extends _lib_jsbn_rsa_js__WEBPACK_IMPORTED_MODULE_1__/* .R
     }
     /**
      * Check if the object contains ALL the parameters of an RSA key.
-     * @param {Object} [obj={}] - An object that may contain nine rsa key
+     * @param {object} [obj={}] - An object that may contain nine rsa key
      * parameters
      * @returns {boolean} true if the object contains all the parameters needed
      * @todo check for types of the parameters all the parameters but the public exponent
@@ -256587,7 +257716,7 @@ class JSEncryptRSAKey extends _lib_jsbn_rsa_js__WEBPACK_IMPORTED_MODULE_1__/* .R
     /**
      * Parse the properties of obj in the current rsa object. Obj should AT LEAST
      * include the modulus and public exponent (n, e) parameters.
-     * @param {Object} obj - the object containing rsa parameters
+     * @param {object} obj - the object containing rsa parameters
      * @private
      */
     parsePropertiesFrom(obj) {
@@ -265036,7 +266165,7 @@ const bytes = (/* unused pure expression or super */ null && (stringToBytes));
 
 /**
  * @class timex
- * @extends Exchange
+ * @augments Exchange
  */
 class timex extends _abstract_timex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -266611,7 +267740,7 @@ class timex extends _abstract_timex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
 //  ---------------------------------------------------------------------------
 /**
  * @class tokocrypto
- * @extends Exchange
+ * @augments Exchange
  */
 class tokocrypto extends _abstract_tokocrypto_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -267616,16 +268745,21 @@ class tokocrypto extends _abstract_tokocrypto_js__WEBPACK_IMPORTED_MODULE_0__/*
             const data = this.safeValue(responseInner, 'data', {});
             return this.parseTrades(data, market, since, limit);
         }
+        if (limit !== undefined) {
+            request['limit'] = limit; // default = 500, maximum = 1000
+        }
         const defaultMethod = 'binanceGetTrades';
         const method = this.safeString(this.options, 'fetchTradesMethod', defaultMethod);
+        let response = undefined;
         if ((method === 'binanceGetAggTrades') && (since !== undefined)) {
             request['startTime'] = since;
             // https://github.com/ccxt/ccxt/issues/6400
             // https://github.com/binance-exchange/binance-official-api-docs/blob/master/rest-api.md#compressedaggregate-trades-list
             request['endTime'] = this.sum(since, 3600000);
+            response = await this.binanceGetAggTrades(this.extend(request, params));
         }
-        if (limit !== undefined) {
-            request['limit'] = limit; // default = 500, maximum = 1000
+        else {
+            response = await this.binanceGetTrades(this.extend(request, params));
         }
         //
         // Caveats:
@@ -267636,7 +268770,6 @@ class tokocrypto extends _abstract_tokocrypto_js__WEBPACK_IMPORTED_MODULE_0__/*
         // - 'tradeId' accepted and returned by this method is "aggregate" trade id
         //   which is different from actual trade id
         // - setting both fromId and time window results in error
-        const response = await this[method](this.extend(request, params));
         //
         // aggregate trades
         //
@@ -269148,7 +270281,7 @@ class tokocrypto extends _abstract_tokocrypto_js__WEBPACK_IMPORTED_MODULE_0__/*
 //  ---------------------------------------------------------------------------
 /**
  * @class upbit
- * @extends Exchange
+ * @augments Exchange
  */
 class upbit extends _abstract_upbit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -270990,7 +272123,7 @@ class upbit extends _abstract_upbit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
 //  ---------------------------------------------------------------------------
 /**
  * @class wavesexchange
- * @extends Exchange
+ * @augments Exchange
  */
 class wavesexchange extends _abstract_wavesexchange_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -273605,7 +274738,7 @@ class wavesexchange extends _abstract_wavesexchange_js__WEBPACK_IMPORTED_MODULE_
 
 /**
  * @class wazirx
- * @extends Exchange
+ * @augments Exchange
  */
 class wazirx extends _abstract_wazirx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -274570,7 +275703,7 @@ class wazirx extends _abstract_wazirx_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
 //  ---------------------------------------------------------------------------
 /**
  * @class whitebit
- * @extends Exchange
+ * @augments Exchange
  */
 class whitebit extends _abstract_whitebit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -276889,7 +278022,7 @@ class whitebit extends _abstract_whitebit_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
 // ---------------------------------------------------------------------------
 /**
  * @class woo
- * @extends Exchange
+ * @augments Exchange
  */
 class woo extends _abstract_woo_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -279538,7 +280671,7 @@ class woo extends _abstract_woo_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
 // ---------------------------------------------------------------------------
 /**
  * @class yobit
- * @extends Exchange
+ * @augments Exchange
  */
 class yobit extends _abstract_yobit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -280862,7 +281995,7 @@ class yobit extends _abstract_yobit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
 //  ---------------------------------------------------------------------------
 /**
  * @class zaif
- * @extends Exchange
+ * @augments Exchange
  */
 class zaif extends _abstract_zaif_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -281609,7 +282742,7 @@ class zaif extends _abstract_zaif_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
 //  ---------------------------------------------------------------------------
 /**
  * @class zonda
- * @extends Exchange
+ * @augments Exchange
  */
 class zonda extends _abstract_zonda_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
     describe() {
@@ -289039,7 +290172,7 @@ SOFTWARE.
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.1.84';
+const version = '4.1.86';
 _src_base_Exchange_js__WEBPACK_IMPORTED_MODULE_0__/* .Exchange */ .e.ccxtVersion = version;
 //-----------------------------------------------------------------------------