ccxt 4.1.60 → 4.1.62

package/dist/ccxt.browser.js

@@ -2526,16 +2526,14 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                 'logo': 'https://user-images.githubusercontent.com/1294454/187234005-b864db3d-f1e3-447a-aaf9-a9fc7b955d07.jpg',
                 'www': 'https://alpaca.markets',
                 'api': {
-                    'public': 'https://api.{hostname}/{version}',
-                    'private': 'https://api.{hostname}/{version}',
-                    'cryptoPublic': 'https://data.{hostname}/{version}',
-                    'markets': 'https://api.{hostname}/{version}',
+                    'broker': 'https://broker-api.{hostname}',
+                    'trader': 'https://api.{hostname}',
+                    'market': 'https://data.{hostname}',
                 },
                 'test': {
-                    'public': 'https://paper-api.{hostname}/{version}',
-                    'private': 'https://paper-api.{hostname}/{version}',
-                    'cryptoPublic': 'https://data.{hostname}/{version}',
-                    'markets': 'https://api.{hostname}/{version}',
+                    'broker': 'https://broker-api.sandbox.{hostname}',
+                    'trader': 'https://paper-api.{hostname}',
+                    'market': 'https://data.sandbox.{hostname}',
                 },
                 'doc': 'https://alpaca.markets/docs/',
                 'fees': 'https://alpaca.markets/support/what-are-the-fees-associated-with-crypto-trading/',
@@ -2589,37 +2587,96 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                 'withdraw': false,
             },
             'api': {
-                'markets': {
-                    'get': [
-                        'assets/public/beta',
-                    ],
-                },
-                'private': {
-                    'get': [
-                        'account',
-                        'orders',
-                        'orders/{order_id}',
-                        'positions',
-                        'positions/{symbol}',
-                        'account/activities/{activity_type}',
-                    ],
-                    'post': [
-                        'orders',
-                    ],
-                    'delete': [
-                        'orders',
-                        'orders/{order_id}',
-                    ],
+                'broker': {},
+                'trader': {
+                    'private': {
+                        'get': [
+                            'v2/account',
+                            'v2/orders',
+                            'v2/orders/{order_id}',
+                            'v2/positions',
+                            'v2/positions/{symbol_or_asset_id}',
+                            'v2/account/portfolio/history',
+                            'v2/watchlists',
+                            'v2/watchlists/{watchlist_id}',
+                            'v2/watchlists:by_name',
+                            'v2/account/configurations',
+                            'v2/account/activities',
+                            'v2/account/activities/{activity_type}',
+                            'v2/calendar',
+                            'v2/clock',
+                            'v2/assets',
+                            'v2/assets/{symbol_or_asset_id}',
+                            'v2/corporate_actions/announcements/{id}',
+                            'v2/corporate_actions/announcements',
+                        ],
+                        'post': [
+                            'v2/orders',
+                            'v2/watchlists',
+                            'v2/watchlists/{watchlist_id}',
+                            'v2/watchlists:by_name',
+                        ],
+                        'put': [
+                            'v2/watchlists/{watchlist_id}',
+                            'v2/watchlists:by_name',
+                        ],
+                        'patch': [
+                            'v2/orders/{order_id}',
+                            'v2/account/configurations',
+                        ],
+                        'delete': [
+                            'v2/orders',
+                            'v2/orders/{order_id}',
+                            'v2/positions',
+                            'v2/positions/{symbol_or_asset_id}',
+                            'v2/watchlists/{watchlist_id}',
+                            'v2/watchlists:by_name',
+                            'v2/watchlists/{watchlist_id}/{symbol}',
+                        ],
+                    },
                 },
-                'cryptoPublic': {
-                    'get': [
-                        'crypto/latest/orderbooks',
-                        'crypto/trades',
-                        'crypto/quotes',
-                        'crypto/latest/quotes',
-                        'crypto/bars',
-                        'crypto/snapshots',
-                    ],
+                'market': {
+                    'public': {
+                        'get': [
+                            'v1beta3/crypto/{loc}/bars',
+                            'v1beta3/crypto/{loc}/latest/bars',
+                            'v1beta3/crypto/{loc}/latest/orderbooks',
+                            'v1beta3/crypto/{loc}/latest/quotes',
+                            'v1beta3/crypto/{loc}/latest/trades',
+                            'v1beta3/crypto/{loc}/quotes',
+                            'v1beta3/crypto/{loc}/snapshots',
+                            'v1beta3/crypto/{loc}/trades',
+                        ],
+                    },
+                    'private': {
+                        'get': [
+                            'v1beta1/corporate-actions',
+                            'v1beta1/forex/latest/rates',
+                            'v1beta1/forex/rates',
+                            'v1beta1/logos/{symbol}',
+                            'v1beta1/news',
+                            'v1beta1/screener/stocks/most-actives',
+                            'v1beta1/screener/{market_type}/movers',
+                            'v2/stocks/auctions',
+                            'v2/stocks/bars',
+                            'v2/stocks/bars/latest',
+                            'v2/stocks/meta/conditions/{ticktype}',
+                            'v2/stocks/meta/exchanges',
+                            'v2/stocks/quotes',
+                            'v2/stocks/quotes/latest',
+                            'v2/stocks/snapshots',
+                            'v2/stocks/trades',
+                            'v2/stocks/trades/latest',
+                            'v2/stocks/{symbol}/auctions',
+                            'v2/stocks/{symbol}/bars',
+                            'v2/stocks/{symbol}/bars/latest',
+                            'v2/stocks/{symbol}/quotes',
+                            'v2/stocks/{symbol}/quotes/latest',
+                            'v2/stocks/{symbol}/snapshot',
+                            'v2/stocks/{symbol}/trades',
+                            'v2/stocks/{symbol}/trades/latest',
+                        ],
+                    },
                 },
             },
             'timeframes': {
@@ -2678,14 +2735,6 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                 'APCA-PARTNER-ID': 'ccxt',
             },
             'options': {
-                'fetchTradesMethod': 'cryptoPublicGetCryptoTrades',
-                'fetchOHLCVMethod': 'cryptoPublicGetCryptoBars',
-                'versions': {
-                    'public': 'v2',
-                    'private': 'v2',
-                    'cryptoPublic': 'v1beta2',
-                    'markets': 'v2', // crypto beta
-                },
                 'defaultExchange': 'CBSE',
                 'exchanges': [
                     'CBSE',
@@ -2724,7 +2773,7 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
             'asset_class': 'crypto',
             'tradeable': true,
         };
-        const assets = await this.marketsGetAssetsPublicBeta(this.extend(request, params));
+        const assets = await this.traderPrivateGetV2Assets(this.extend(request, params));
         //
         //    [
         //        {
@@ -2815,26 +2864,42 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name alpaca#fetchTrades
          * @description get the list of most recent trades for a particular symbol
+         * @see https://docs.alpaca.markets/reference/cryptotrades
+         * @see https://docs.alpaca.markets/reference/cryptolatesttrades
          * @param {string} symbol unified symbol of the market to fetch trades for
          * @param {int} [since] timestamp in ms of the earliest trade to fetch
          * @param {int} [limit] the maximum amount of trades to fetch
          * @param {object} [params] extra parameters specific to the alpaca api endpoint
+         * @param {string} [params.loc] crypto location, default: us
+         * @param {string} [params.method] method, default: marketPublicGetV1beta3CryptoLocTrades
          * @returns {Trade[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=public-trades}
          */
         await this.loadMarkets();
         const market = this.market(symbol);
-        const id = market['id'];
+        const marketId = market['id'];
+        const loc = this.safeString(params, 'loc', 'us');
+        const method = this.safeString(params, 'method', 'marketPublicGetV1beta3CryptoLocTrades');
         const request = {
-            'symbols': id,
+            'symbols': marketId,
+            'loc': loc,
         };
-        if (since !== undefined) {
-            request['start'] = this.iso8601(since);
+        params = this.omit(params, ['loc', 'method']);
+        let response = undefined;
+        if (method === 'marketPublicGetV1beta3CryptoLocTrades') {
+            if (since !== undefined) {
+                request['start'] = this.iso8601(since);
+            }
+            if (limit !== undefined) {
+                request['limit'] = limit;
+            }
+            response = await this.marketPublicGetV1beta3CryptoLocTrades(this.extend(request, params));
         }
-        if (limit !== undefined) {
-            request['limit'] = limit;
+        else if (method === 'marketPublicGetV1beta3CryptoLocLatestTrades') {
+            response = await this.marketPublicGetV1beta3CryptoLocLatestTrades(this.extend(request, params));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchTrades() does not support ' + method + ', marketPublicGetV1beta3CryptoLocTrades and marketPublicGetV1beta3CryptoLocLatestTrades are supported');
         }
-        const method = this.safeString(this.options, 'fetchTradesMethod', 'cryptoPublicGetCryptoTrades');
-        const response = await this[method](this.extend(request, params));
         //
         // {
         //     "next_page_token":null,
@@ -2851,27 +2916,50 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //     }
         // }
         //
+        // {
+        //     "trades":{
+        //        "BTC/USD":{
+        //           "i":36440704,
+        //           "p":22625,
+        //           "s":0.0001,
+        //           "t":"2022-07-21T11:47:31.073391Z",
+        //           "tks":"B"
+        //        }
+        //     }
+        // }
+        //
         const trades = this.safeValue(response, 'trades', {});
-        const symbolTrades = this.safeValue(trades, market['id'], {});
+        let symbolTrades = this.safeValue(trades, marketId, {});
+        if (!Array.isArray(symbolTrades)) {
+            symbolTrades = [symbolTrades];
+        }
         return this.parseTrades(symbolTrades, market, since, limit);
     }
     async fetchOrderBook(symbol, limit = undefined, params = {}) {
-        /**
-         * @method
-         * @name alpaca#fetchOrderBook
-         * @description fetches 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 alpaca api endpoint
-         * @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
-         */
+        //
+        // @method
+        // @name alpaca#fetchOrderBook
+        // @description fetches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
+        // @see https://docs.alpaca.markets/reference/cryptolatestorderbooks
+        // @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 alpaca api endpoint
+        // <<<<<<< HEAD
+        // @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
+        // =======
+        // @returns {object} A dictionary of [order book structures]{@link https://docs.ccxt.com/#/?id=order-book-structure} indexed by market symbols
+        // >>>>>>> f68b1b599ee41469fefa424f0efc9b6891549278
+        //
         await this.loadMarkets();
         const market = this.market(symbol);
         const id = market['id'];
+        const loc = this.safeString(params, 'loc', 'us');
         const request = {
             'symbols': id,
+            'loc': loc,
         };
-        const response = await this.cryptoPublicGetCryptoLatestOrderbooks(this.extend(request, params));
+        const response = await this.marketPublicGetV1beta3CryptoLocLatestOrderbooks(this.extend(request, params));
         //
         //   {
         //       "orderbooks":{
@@ -2919,27 +3007,44 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name alpaca#fetchOHLCV
          * @description fetches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @see https://docs.alpaca.markets/reference/cryptobars
+         * @see https://docs.alpaca.markets/reference/cryptolatestbars
          * @param {string} symbol unified symbol of the market to fetch OHLCV data for
          * @param {string} timeframe the length of time each candle represents
          * @param {int} [since] timestamp in ms of the earliest candle to fetch
          * @param {int} [limit] the maximum amount of candles to fetch
          * @param {object} [params] extra parameters specific to the alpha api endpoint
+         * @param {string} [params.loc] crypto location, default: us
+         * @param {string} [params.method] method, default: marketPublicGetV1beta3CryptoLocBars
          * @returns {int[][]} A list of candles ordered as timestamp, open, high, low, close, volume
          */
         await this.loadMarkets();
         const market = this.market(symbol);
+        const marketId = market['id'];
+        const loc = this.safeString(params, 'loc', 'us');
+        const method = this.safeString(params, 'method', 'marketPublicGetV1beta3CryptoLocBars');
         const request = {
-            'symbols': market['id'],
-            'timeframe': this.safeString(this.timeframes, timeframe, timeframe),
+            'symbols': marketId,
+            'loc': loc,
         };
-        if (limit !== undefined) {
-            request['limit'] = limit;
+        params = this.omit(params, ['loc', 'method']);
+        let response = undefined;
+        if (method === 'marketPublicGetV1beta3CryptoLocBars') {
+            if (limit !== undefined) {
+                request['limit'] = limit;
+            }
+            if (since !== undefined) {
+                request['start'] = this.yyyymmdd(since);
+            }
+            request['timeframe'] = this.safeString(this.timeframes, timeframe, timeframe);
+            response = await this.marketPublicGetV1beta3CryptoLocBars(this.extend(request, params));
         }
-        if (since !== undefined) {
-            request['start'] = this.yyyymmdd(since);
+        else if (method === 'marketPublicGetV1beta3CryptoLocLatestBars') {
+            response = await this.marketPublicGetV1beta3CryptoLocLatestBars(this.extend(request, params));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchOHLCV() does not support ' + method + ', marketPublicGetV1beta3CryptoLocBars and marketPublicGetV1beta3CryptoLocLatestBars are supported');
         }
-        const method = this.safeString(this.options, 'fetchOHLCVMethod', 'cryptoPublicGetCryptoBars');
-        const response = await this[method](this.extend(request, params));
         //
         //    {
         //        "bars":{
@@ -2969,8 +3074,26 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //        "next_page_token":"QlRDL1VTRHxNfDIwMjItMDctMjFUMDU6MDE6MDAuMDAwMDAwMDAwWg=="
         //     }
         //
+        //    {
+        //        "bars":{
+        //           "BTC/USD":{
+        //              "c":22887,
+        //              "h":22888,
+        //              "l":22873,
+        //              "n":11,
+        //              "o":22883,
+        //              "t":"2022-07-21T05:00:00Z",
+        //              "v":1.1138,
+        //              "vw":22883.0155324116
+        //           }
+        //        }
+        //     }
+        //
         const bars = this.safeValue(response, 'bars', {});
-        const ohlcvs = this.safeValue(bars, market['id'], {});
+        let ohlcvs = this.safeValue(bars, marketId, {});
+        if (!Array.isArray(ohlcvs)) {
+            ohlcvs = [ohlcvs];
+        }
         return this.parseOHLCVs(ohlcvs, market, timeframe, since, limit);
     }
     parseOHLCV(ohlcv, market = undefined) {
@@ -3046,7 +3169,7 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         const clientOrderId = this.safeString(params, 'clientOrderId', defaultClientId);
         request['client_order_id'] = clientOrderId;
         params = this.omit(params, ['clientOrderId']);
-        const order = await this.privatePostOrders(this.extend(request, params));
+        const order = await this.traderPrivatePostV2Orders(this.extend(request, params));
         //
         //   {
         //      "id": "61e69015-8549-4bfd-b9c3-01e75843f47d",
@@ -3098,7 +3221,7 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         const request = {
             'order_id': id,
         };
-        const response = await this.privateDeleteOrdersOrderId(this.extend(request, params));
+        const response = await this.traderPrivateDeleteV2OrdersOrderId(this.extend(request, params));
         //
         //   {
         //       "code": 40410000,
@@ -3120,7 +3243,7 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         const request = {
             'order_id': id,
         };
-        const order = await this.privateGetOrdersOrderId(this.extend(request, params));
+        const order = await this.traderPrivateGetV2OrdersOrderId(this.extend(request, params));
         const marketId = this.safeString(order, 'symbol');
         const market = this.safeMarket(marketId);
         return this.parseOrder(order, market);
@@ -3141,7 +3264,7 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         if (symbol !== undefined) {
             market = this.market(symbol);
         }
-        const orders = await this.privateGetOrders(params);
+        const orders = await this.traderPrivateGetV2Orders(params);
         return this.parseOrders(orders, market, since, limit);
     }
     parseOrder(order, market = undefined) {
@@ -3287,13 +3410,10 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         }, market);
     }
     sign(path, api = 'public', method = 'GET', params = {}, headers = undefined, body = undefined) {
-        const versions = this.safeValue(this.options, 'versions');
-        const version = this.safeString(versions, api);
         let endpoint = '/' + this.implodeParams(path, params);
-        let url = this.implodeParams(this.urls['api'][api], { 'version': version });
-        url = this.implodeHostname(url);
+        let url = this.implodeHostname(this.urls['api'][api[0]]);
         headers = (headers !== undefined) ? headers : {};
-        if (api === 'private') {
+        if (api[1] === 'private') {
             headers['APCA-API-KEY-ID'] = this.apiKey;
             headers['APCA-API-SECRET-KEY'] = this.secret;
         }
@@ -8605,11 +8725,13 @@ class Exchange {
                 }
             }
             if (!parseFee && (reducedLength === 0)) {
-                fee['cost'] = this.safeNumber(fee, 'cost');
-                if ('rate' in fee) {
-                    fee['rate'] = this.safeNumber(fee, 'rate');
+                // copy fee to avoid modification by reference
+                const feeCopy = this.deepExtend(fee);
+                feeCopy['cost'] = this.safeNumber(feeCopy, 'cost');
+                if ('rate' in feeCopy) {
+                    feeCopy['rate'] = this.safeNumber(feeCopy, 'rate');
                 }
-                reducedFees.push(fee);
+                reducedFees.push(feeCopy);
             }
             order['fees'] = reducedFees;
             if (parseFee && (reducedLength === 1)) {
@@ -8894,11 +9016,13 @@ class Exchange {
                 }
             }
             if (!parseFee && (reducedLength === 0)) {
-                fee['cost'] = this.safeNumber(fee, 'cost');
-                if ('rate' in fee) {
-                    fee['rate'] = this.safeNumber(fee, 'rate');
+                // copy fee to avoid modification by reference
+                const feeCopy = this.deepExtend(fee);
+                feeCopy['cost'] = this.safeNumber(feeCopy, 'cost');
+                if ('rate' in feeCopy) {
+                    feeCopy['rate'] = this.safeNumber(feeCopy, 'rate');
                 }
-                reducedFees.push(fee);
+                reducedFees.push(feeCopy);
             }
             if (parseFees) {
                 trade['fees'] = reducedFees;
@@ -9733,7 +9857,7 @@ class Exchange {
         /**
          * @method
          * @name exchange#fetchPositionsForSymbol
-         * @description fetches all open positions for specific symbol, unlike fetchPositions (which is designed to work with multiple symbols) so this method might be preffered for ony-market purposes, because of less rate-limit consumption and speed
+         * @description fetches all open positions for specific symbol, unlike fetchPositions (which is designed to work with multiple symbols) so this method might be preffered for one-market position, because of less rate-limit consumption and speed
          * @param {string} symbol unified market symbol
          * @param {object} params extra parameters specific to the endpoint
          * @returns {object[]} a list of [position structure]{@link https://docs.ccxt.com/#/?id=position-structure} with maximum 3 items - possible one position for "one-way" mode, and possible two positions (long & short) for "two-way" (a.k.a. hedge) mode
@@ -16739,6 +16863,7 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
                         // https://binance-docs.github.io/apidocs/spot/en/#withdraw-sapi
                         'capital/config/getall': 1,
                         'capital/deposit/address': 1,
+                        'capital/deposit/address/list': 1,
                         'capital/deposit/hisrec': 0.1,
                         'capital/deposit/subAddress': 0.1,
                         'capital/deposit/subHisrec': 0.1,
@@ -58612,10 +58737,10 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                 'CORS': undefined,
                 'spot': true,
                 'margin': false,
-                'swap': undefined,
-                'future': undefined,
+                'swap': true,
+                'future': false,
                 'option': false,
-                'cancelAllOrders': false,
+                'cancelAllOrders': true,
                 'cancelOrder': true,
                 'createOrder': true,
                 'createStopLimitOrder': true,
@@ -58654,9 +58779,11 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                 'fetchTradingFees': false,
                 'fetchTransactionFees': false,
                 'fetchTransactions': false,
-                'fetchTransfers': false,
+                'fetchTransfers': true,
                 'fetchWithdrawals': true,
-                'transfer': false,
+                'setLeverage': true,
+                'setMargin': true,
+                'transfer': true,
                 'withdraw': true,
             },
             'timeframes': {
@@ -58673,66 +58800,142 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
             'urls': {
                 'logo': 'https://user-images.githubusercontent.com/1294454/139516488-243a830d-05dd-446b-91c6-c1f18fe30c63.jpg',
                 'api': {
-                    'v1': 'https://www.bitrue.com/api/v1',
-                    'v2': 'https://www.bitrue.com/api/v2',
+                    'spot': 'https://www.bitrue.com/api',
+                    'fapi': 'https://fapi.bitrue.com/fapi',
+                    'dapi': 'https://fapi.bitrue.com/dapi',
                     'kline': 'https://www.bitrue.com/kline-api',
                 },
                 'www': 'https://www.bitrue.com',
                 'referral': 'https://www.bitrue.com/affiliate/landing?cn=600000&inviteCode=EZWETQE',
                 'doc': [
                     'https://github.com/Bitrue-exchange/bitrue-official-api-docs',
+                    'https://www.bitrue.com/api-docs',
                 ],
                 'fees': 'https://bitrue.zendesk.com/hc/en-001/articles/4405479952537',
             },
             'api': {
-                'kline': {
-                    'public': {
-                        'get': {
-                            'public.json': 1,
-                            'public{currency}.json': 1,
+                'spot': {
+                    'kline': {
+                        'public': {
+                            'get': {
+                                'public.json': 1,
+                                'public{currency}.json': 1,
+                            },
                         },
                     },
-                },
-                'v1': {
-                    'public': {
-                        'get': {
-                            'ping': 1,
-                            'time': 1,
-                            'exchangeInfo': 1,
-                            'depth': { 'cost': 1, 'byLimit': [[100, 1], [500, 5], [1000, 10]] },
-                            'trades': 1,
-                            'historicalTrades': 5,
-                            'aggTrades': 1,
-                            'ticker/24hr': { 'cost': 1, 'noSymbol': 40 },
-                            'ticker/price': { 'cost': 1, 'noSymbol': 2 },
-                            'ticker/bookTicker': { 'cost': 1, 'noSymbol': 2 },
-                            'market/kline': 1,
+                    'v1': {
+                        'public': {
+                            'get': {
+                                'ping': 1,
+                                'time': 1,
+                                'exchangeInfo': 1,
+                                'depth': { 'cost': 1, 'byLimit': [[100, 1], [500, 5], [1000, 10]] },
+                                'trades': 1,
+                                'historicalTrades': 5,
+                                'aggTrades': 1,
+                                'ticker/24hr': { 'cost': 1, 'noSymbol': 40 },
+                                'ticker/price': { 'cost': 1, 'noSymbol': 2 },
+                                'ticker/bookTicker': { 'cost': 1, 'noSymbol': 2 },
+                                'market/kline': 1,
+                            },
+                        },
+                        'private': {
+                            'get': {
+                                'order': 1,
+                                'openOrders': 1,
+                                'allOrders': 5,
+                                'account': 5,
+                                'myTrades': { 'cost': 5, 'noSymbol': 40 },
+                                'etf/net-value/{symbol}': 1,
+                                'withdraw/history': 1,
+                                'deposit/history': 1,
+                            },
+                            'post': {
+                                'order': 4,
+                                'withdraw/commit': 1,
+                            },
+                            'delete': {
+                                'order': 1,
+                            },
                         },
                     },
-                    'private': {
-                        'get': {
-                            'order': 1,
-                            'openOrders': 1,
-                            'allOrders': 5,
-                            'account': 5,
-                            'myTrades': { 'cost': 5, 'noSymbol': 40 },
-                            'etf/net-value/{symbol}': 1,
-                            'withdraw/history': 1,
-                            'deposit/history': 1,
+                    'v2': {
+                        'private': {
+                            'get': {
+                                'myTrades': 5,
+                            },
                         },
-                        'post': {
-                            'order': 4,
-                            'withdraw/commit': 1,
+                    },
+                },
+                'fapi': {
+                    'v1': {
+                        'public': {
+                            'get': {
+                                'ping': 1,
+                                'time': 1,
+                                'contracts': 1,
+                                'depth': 1,
+                                'ticker': 1,
+                                'klines': 1,
+                            },
                         },
-                        'delete': {
-                            'order': 1,
+                    },
+                    'v2': {
+                        'private': {
+                            'get': {
+                                'myTrades': 1,
+                                'openOrders': 1,
+                                'order': 1,
+                                'account': 1,
+                                'leverageBracket': 1,
+                                'commissionRate': 1,
+                                'futures_transfer_history': 1,
+                                'forceOrdersHistory': 1,
+                            },
+                            'post': {
+                                'positionMargin': 1,
+                                'level_edit': 1,
+                                'cancel': 1,
+                                'order': 1,
+                                'allOpenOrders': 1,
+                                'futures_transfer': 1,
+                            },
                         },
                     },
                 },
-                'v2': {
-                    'private': {
-                        'get': {
-                            'myTrades': 5,
+                'dapi': {
+                    'v1': {
+                        'public': {
+                            'get': {
+                                'ping': 1,
+                                'time': 1,
+                                'contracts': 1,
+                                'depth': 1,
+                                'ticker': 1,
+                                'klines': 1,
+                            },
+                        },
+                    },
+                    'v2': {
+                        'private': {
+                            'get': {
+                                'myTrades': 1,
+                                'openOrders': 1,
+                                'order': 1,
+                                'account': 1,
+                                'leverageBracket': 1,
+                                'commissionRate': 1,
+                                'futures_transfer_history': 1,
+                                'forceOrdersHistory': 1,
+                            },
+                            'post': {
+                                'positionMargin': 1,
+                                'level_edit': 1,
+                                'cancel': 1,
+                                'order': 1,
+                                'allOpenOrders': 1,
+                                'futures_transfer': 1,
+                            },
                         },
                     },
                 },
@@ -58818,6 +59021,12 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
             },
             // exchange-specific options
             'options': {
+                'createMarketBuyOrderRequiresPrice': true,
+                'fetchMarkets': [
+                    'spot',
+                    'linear',
+                    'inverse',
+                ],
                 // 'fetchTradesMethod': 'publicGetAggTrades', // publicGetTrades, publicGetHistoricalTrades
                 'fetchMyTradesMethod': 'v2PrivateGetMyTrades',
                 'hasAlreadyAuthenticatedSuccessfully': false,
@@ -58833,6 +59042,39 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                     'ERC20': 'ETH',
                     'TRC20': 'TRX',
                 },
+                'defaultType': 'spot',
+                'timeframes': {
+                    'spot': {
+                        '1m': '1m',
+                        '5m': '5m',
+                        '15m': '15m',
+                        '30m': '30m',
+                        '1h': '1H',
+                        '2h': '2H',
+                        '4h': '4H',
+                        '12h': '12H',
+                        '1d': '1D',
+                        '1w': '1W',
+                    },
+                    'future': {
+                        '1m': '1min',
+                        '5m': '5min',
+                        '15m': '15min',
+                        '30m': '30min',
+                        '1h': '1h',
+                        '1d': '1day',
+                        '1w': '1week',
+                        '1M': '1month',
+                    },
+                },
+                'accountsByType': {
+                    'spot': 'wallet',
+                    'future': 'contract',
+                    'swap': 'contract',
+                    'funding': 'wallet',
+                    'fund': 'wallet',
+                    'contract': 'contract',
+                },
             },
             'commonCurrencies': {
                 'MIM': 'MIM Swarm',
@@ -58876,6 +59118,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                     '-1115': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest,
                     '-1116': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest,
                     '-1117': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest,
+                    '-1166': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InvalidOrder,
                     '-1118': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest,
                     '-1119': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest,
                     '-1120': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest,
@@ -58885,12 +59128,15 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                     '-1128': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest,
                     '-1130': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest,
                     '-1131': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest,
+                    '-1160': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InvalidOrder,
+                    '-1156': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InvalidOrder,
                     '-2008': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.AuthenticationError,
                     '-2010': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ExchangeError,
                     '-2011': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.OrderNotFound,
                     '-2013': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.OrderNotFound,
                     '-2014': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.AuthenticationError,
                     '-2015': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.AuthenticationError,
+                    '-2017': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InsufficientFunds,
                     '-2019': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InsufficientFunds,
                     '-3005': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InsufficientFunds,
                     '-3006': _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InsufficientFunds,
@@ -58912,9 +59158,6 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
             },
         });
     }
-    costToPrecision(symbol, cost) {
-        return this.decimalToPrecision(cost, _base_functions_number_js__WEBPACK_IMPORTED_MODULE_1__/* .TRUNCATE */ .tk, this.markets[symbol]['precision']['quote'], this.precisionMode, this.paddingMode);
-    }
     currencyToPrecision(code, fee, networkCode = undefined) {
         // info is available in currencies only if the user has configured his api keys
         if (this.safeValue(this.currencies[code], 'precision') !== undefined) {
@@ -58932,10 +59175,11 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bitrue#fetchStatus
          * @description the latest known information on the availability of the exchange API
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#test-connectivity
          * @param {object} [params] extra parameters specific to the bitrue api endpoint
          * @returns {object} a [status structure]{@link https://docs.ccxt.com/#/?id=exchange-status-structure}
          */
-        const response = await this.v1PublicGetPing(params);
+        const response = await this.spotV1PublicGetPing(params);
         //
         // empty means working status.
         //
@@ -58957,10 +59201,11 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bitrue#fetchTime
          * @description fetches the current integer timestamp in milliseconds from the exchange server
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#check-server-time
          * @param {object} [params] extra parameters specific to the bitrue api endpoint
          * @returns {int} the current integer timestamp in milliseconds from the exchange server
          */
-        const response = await this.v1PublicGetTime(params);
+        const response = await this.spotV1PublicGetTime(params);
         //
         //     {
         //         "serverTime":1635467280514
@@ -59047,7 +59292,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @param {object} [params] extra parameters specific to the bitrue api endpoint
          * @returns {object} an associative dictionary of currencies
          */
-        const response = await this.v1PublicGetExchangeInfo(params);
+        const response = await this.spotV1PublicGetExchangeInfo(params);
         //
         //     {
         //         "timezone":"CTT",
@@ -59172,10 +59417,38 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bitrue#fetchMarkets
          * @description retrieves data on all markets for bitrue
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#exchangeInfo_endpoint
+         * @see https://www.bitrue.com/api-docs#current-open-contract
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#current-open-contract
          * @param {object} [params] extra parameters specific to the exchange api endpoint
          * @returns {object[]} an array of objects representing market data
          */
-        const response = await this.v1PublicGetExchangeInfo(params);
+        const promisesRaw = [];
+        const fetchMarkets = this.safeValue(this.options, 'fetchMarkets', ['spot', 'linear', 'inverse']);
+        for (let i = 0; i < fetchMarkets.length; i++) {
+            const marketType = fetchMarkets[i];
+            if (marketType === 'spot') {
+                promisesRaw.push(this.spotV1PublicGetExchangeInfo(params));
+            }
+            else if (marketType === 'linear') {
+                promisesRaw.push(this.fapiV1PublicGetContracts(params));
+            }
+            else if (marketType === 'inverse') {
+                promisesRaw.push(this.dapiV1PublicGetContracts(params));
+            }
+            else {
+                throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ExchangeError(this.id + ' fetchMarkets() this.options fetchMarkets "' + marketType + '" is not a supported market type');
+            }
+        }
+        const promises = await Promise.all(promisesRaw);
+        const spotMarkets = this.safeValue(this.safeValue(promises, 0), 'symbols', []);
+        const futureMarkets = this.safeValue(promises, 1);
+        const deliveryMarkets = this.safeValue(promises, 2);
+        let markets = spotMarkets;
+        markets = this.arrayConcat(markets, futureMarkets);
+        markets = this.arrayConcat(markets, deliveryMarkets);
+        //
+        // spot
         //
         //     {
         //         "timezone":"CTT",
@@ -59217,19 +59490,70 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         ],
         //     }
         //
+        // swap / delivery
+        //
+        //     [
+        //         {
+        //           "symbol": "H-HT-USDT",
+        //           "pricePrecision": 8,
+        //           "side": 1,
+        //           "maxMarketVolume": 100000,
+        //           "multiplier": 6,
+        //           "minOrderVolume": 1,
+        //           "maxMarketMoney": 10000000,
+        //           "type": "H", // E: perpetual contract, S: test contract, others are mixed contract
+        //           "maxLimitVolume": 1000000,
+        //           "maxValidOrder": 20,
+        //           "multiplierCoin": "HT",
+        //           "minOrderMoney": 0.001,
+        //           "maxLimitMoney": 1000000,
+        //           "status": 1
+        //         }
+        //     ]
+        //
         if (this.options['adjustForTimeDifference']) {
             await this.loadTimeDifference();
         }
-        const markets = this.safeValue(response, 'symbols', []);
         return this.parseMarkets(markets);
     }
     parseMarket(market) {
         const id = this.safeString(market, 'symbol');
         const lowercaseId = this.safeStringLower(market, 'symbol');
-        const baseId = this.safeString(market, 'baseAsset');
-        const quoteId = this.safeString(market, 'quoteAsset');
+        const side = this.safeInteger(market, 'side'); // 1 linear, 0 inverse, undefined spot
+        let type = undefined;
+        let isLinear = undefined;
+        let isInverse = undefined;
+        if (side === undefined) {
+            type = 'spot';
+        }
+        else {
+            type = 'swap';
+            isLinear = (side === 1);
+            isInverse = (side === 0);
+        }
+        const isContract = (type !== 'spot');
+        let baseId = this.safeString(market, 'baseAsset');
+        let quoteId = this.safeString(market, 'quoteAsset');
+        let settleId = undefined;
+        let settle = undefined;
+        if (isContract) {
+            const symbolSplit = id.split('-');
+            baseId = this.safeString(symbolSplit, 1);
+            quoteId = this.safeString(symbolSplit, 2);
+            if (isLinear) {
+                settleId = quoteId;
+            }
+            else {
+                settleId = baseId;
+            }
+            settle = this.safeCurrencyCode(settleId);
+        }
         const base = this.safeCurrencyCode(baseId);
         const quote = this.safeCurrencyCode(quoteId);
+        let symbol = base + '/' + quote;
+        if (settle !== undefined) {
+            symbol += ':' + settle;
+        }
         const filters = this.safeValue(market, 'filters', []);
         const filtersByType = this.indexBy(filters, 'filterType');
         const status = this.safeString(market, 'status');
@@ -59239,27 +59563,36 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         const defaultAmountPrecision = this.safeString(market, 'quantityPrecision');
         const pricePrecision = this.safeString(priceFilter, 'priceScale', defaultPricePrecision);
         const amountPrecision = this.safeString(amountFilter, 'volumeScale', defaultAmountPrecision);
+        const multiplier = this.safeString(market, 'multiplier');
+        let maxQuantity = this.safeNumber(amountFilter, 'maxQty');
+        if (maxQuantity === undefined) {
+            maxQuantity = this.safeNumber(market, 'maxValidOrder');
+        }
+        let minCost = this.safeNumber(amountFilter, 'minVal');
+        if (minCost === undefined) {
+            minCost = this.safeNumber(market, 'minOrderMoney');
+        }
         return {
             'id': id,
             'lowercaseId': lowercaseId,
-            'symbol': base + '/' + quote,
+            'symbol': symbol,
             'base': base,
             'quote': quote,
-            'settle': undefined,
+            'settle': settle,
             'baseId': baseId,
             'quoteId': quoteId,
-            'settleId': undefined,
-            'type': 'spot',
-            'spot': true,
+            'settleId': settleId,
+            'type': type,
+            'spot': (type === 'spot'),
             'margin': false,
-            'swap': false,
+            'swap': isContract,
             'future': false,
             'option': false,
             'active': (status === 'TRADING'),
-            'contract': false,
-            'linear': undefined,
-            'inverse': undefined,
-            'contractSize': undefined,
+            'contract': isContract,
+            'linear': isLinear,
+            'inverse': isInverse,
+            'contractSize': this.parseNumber(_base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringAbs(multiplier)),
             'expiry': undefined,
             'expiryDatetime': undefined,
             'strike': undefined,
@@ -59275,14 +59608,14 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                 },
                 'amount': {
                     'min': this.safeNumber(amountFilter, 'minQty'),
-                    'max': this.safeNumber(amountFilter, 'maxQty'),
+                    'max': maxQuantity,
                 },
                 'price': {
                     'min': this.safeNumber(priceFilter, 'minPrice'),
                     'max': this.safeNumber(priceFilter, 'maxPrice'),
                 },
                 'cost': {
-                    'min': this.safeNumber(amountFilter, 'minVal'),
+                    'min': minCost,
                     'max': undefined,
                 },
             },
@@ -59291,18 +59624,64 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         };
     }
     parseBalance(response) {
+        //
+        // spot
+        //
+        //     {
+        //         "makerCommission":0,
+        //         "takerCommission":0,
+        //         "buyerCommission":0,
+        //         "sellerCommission":0,
+        //         "updateTime":null,
+        //         "balances":[
+        //             {"asset":"sbr","free":"0","locked":"0"},
+        //             {"asset":"ksm","free":"0","locked":"0"},
+        //             {"asset":"neo3s","free":"0","locked":"0"},
+        //         ],
+        //         "canTrade":false,
+        //         "canWithdraw":false,
+        //         "canDeposit":false
+        //     }
+        //
+        // swap
+        //
+        //     {
+        //         "account":[
+        //             {
+        //                 "marginCoin":"USDT",
+        //                 "coinPrecious":4,
+        //                 "accountNormal":1010.4043400372839856,
+        //                 "accountLock":2.9827889600000006,
+        //                 "partPositionNormal":0,
+        //                 "totalPositionNormal":0,
+        //                 "achievedAmount":0,
+        //                 "unrealizedAmount":0,
+        //                 "totalMarginRate":0,
+        //                 "totalEquity":1010.4043400372839856,
+        //                 "partEquity":0,
+        //                 "totalCost":0,
+        //                 "sumMarginRate":0,
+        //                 "sumOpenRealizedAmount":0,
+        //                 "canUseTrialFund":0,
+        //                 "sumMaintenanceMargin":null,
+        //                 "futureModel":null,
+        //                 "positionVos":[]
+        //             }
+        //         ]
+        //     }
+        //
         const result = {
             'info': response,
         };
         const timestamp = this.safeInteger(response, 'updateTime');
-        const balances = this.safeValue(response, 'balances', []);
+        const balances = this.safeValue2(response, 'balances', 'account', []);
         for (let i = 0; i < balances.length; i++) {
             const balance = balances[i];
-            const currencyId = this.safeString(balance, 'asset');
+            const currencyId = this.safeString2(balance, 'asset', 'marginCoin');
             const code = this.safeCurrencyCode(currencyId);
             const account = this.account();
-            account['free'] = this.safeString(balance, 'free');
-            account['used'] = this.safeString(balance, 'locked');
+            account['free'] = this.safeString2(balance, 'free', 'accountNormal');
+            account['used'] = this.safeString2(balance, 'locked', 'accountLock');
             result[code] = account;
         }
         result['timestamp'] = timestamp;
@@ -59314,35 +59693,122 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bitrue#fetchBalance
          * @description query for balance and get the amount of funds available for trading or funds locked in orders
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#account-information-user_data
+         * @see https://www.bitrue.com/api-docs#account-information-v2-user_data-hmac-sha256
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#account-information-v2-user_data-hmac-sha256
          * @param {object} [params] extra parameters specific to the bitrue api endpoint
+         * @param {string} [params.type] 'future', 'delivery', 'spot', 'swap'
+         * @param {string} [params.subType] 'linear', 'inverse'
          * @returns {object} a [balance structure]{@link https://docs.ccxt.com/#/?id=balance-structure}
          */
         await this.loadMarkets();
-        const response = await this.v1PrivateGetAccount(params);
-        //
-        //     {
-        //         "makerCommission":0,
-        //         "takerCommission":0,
-        //         "buyerCommission":0,
-        //         "sellerCommission":0,
-        //         "updateTime":null,
-        //         "balances":[
-        //             {"asset":"sbr","free":"0","locked":"0"},
-        //             {"asset":"ksm","free":"0","locked":"0"},
-        //             {"asset":"neo3s","free":"0","locked":"0"},
-        //         ],
-        //         "canTrade":false,
-        //         "canWithdraw":false,
-        //         "canDeposit":false
-        //     }
-        //
-        return this.parseBalance(response);
+        let type = undefined;
+        [type, params] = this.handleMarketTypeAndParams('fetchBalance', undefined, params);
+        let subType = undefined;
+        [subType, params] = this.handleSubTypeAndParams('fetchBalance', undefined, params);
+        let response = undefined;
+        let result = undefined;
+        if (type === 'swap') {
+            if (subType !== undefined && subType === 'inverse') {
+                response = await this.dapiV2PrivateGetAccount(params);
+                result = this.safeValue(response, 'data', {});
+                //
+                // {
+                //         "code":"0",
+                //         "msg":"Success",
+                //         "data":{
+                //             "account":[
+                //                 {
+                //                     "marginCoin":"USD",
+                //                     "coinPrecious":4,
+                //                     "accountNormal":1010.4043400372839856,
+                //                     "accountLock":2.9827889600000006,
+                //                     "partPositionNormal":0,
+                //                     "totalPositionNormal":0,
+                //                     "achievedAmount":0,
+                //                     "unrealizedAmount":0,
+                //                     "totalMarginRate":0,
+                //                     "totalEquity":1010.4043400372839856,
+                //                     "partEquity":0,
+                //                     "totalCost":0,
+                //                     "sumMarginRate":0,
+                //                     "sumOpenRealizedAmount":0,
+                //                     "canUseTrialFund":0,
+                //                     "sumMaintenanceMargin":null,
+                //                     "futureModel":null,
+                //                     "positionVos":[]
+                //                 }
+                //             ]
+                //         }
+                //     }
+                //
+            }
+            else {
+                response = await this.fapiV2PrivateGetAccount(params);
+                result = this.safeValue(response, 'data', {});
+                //
+                //     {
+                //         "code":"0",
+                //         "msg":"Success",
+                //         "data":{
+                //             "account":[
+                //                 {
+                //                     "marginCoin":"USDT",
+                //                     "coinPrecious":4,
+                //                     "accountNormal":1010.4043400372839856,
+                //                     "accountLock":2.9827889600000006,
+                //                     "partPositionNormal":0,
+                //                     "totalPositionNormal":0,
+                //                     "achievedAmount":0,
+                //                     "unrealizedAmount":0,
+                //                     "totalMarginRate":0,
+                //                     "totalEquity":1010.4043400372839856,
+                //                     "partEquity":0,
+                //                     "totalCost":0,
+                //                     "sumMarginRate":0,
+                //                     "sumOpenRealizedAmount":0,
+                //                     "canUseTrialFund":0,
+                //                     "sumMaintenanceMargin":null,
+                //                     "futureModel":null,
+                //                     "positionVos":[]
+                //                 }
+                //             ]
+                //         }
+                //     }
+                //
+            }
+        }
+        else {
+            response = await this.spotV1PrivateGetAccount(params);
+            result = response;
+            //
+            //     {
+            //         "makerCommission":0,
+            //         "takerCommission":0,
+            //         "buyerCommission":0,
+            //         "sellerCommission":0,
+            //         "updateTime":null,
+            //         "balances":[
+            //             {"asset":"sbr","free":"0","locked":"0"},
+            //             {"asset":"ksm","free":"0","locked":"0"},
+            //             {"asset":"neo3s","free":"0","locked":"0"},
+            //         ],
+            //         "canTrade":false,
+            //         "canWithdraw":false,
+            //         "canDeposit":false
+            //     }
+            //
+        }
+        return this.parseBalance(result);
     }
     async fetchOrderBook(symbol, limit = undefined, params = {}) {
         /**
          * @method
          * @name bitrue#fetchOrderBook
          * @description fetches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#order-book
+         * @see https://www.bitrue.com/api-docs#order-book
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#order-book
          * @param {string} symbol unified symbol of the market to fetch the order book for
          * @param {int} [limit] the maximum amount of order book entries to return
          * @param {object} [params] extra parameters specific to the bitrue api endpoint
@@ -59350,13 +59816,41 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          */
         await this.loadMarkets();
         const market = this.market(symbol);
-        const request = {
-            'symbol': market['id'],
-        };
-        if (limit !== undefined) {
-            request['limit'] = limit; // default 100, max 1000, see https://github.com/Bitrue-exchange/bitrue-official-api-docs#order-book
+        let response = undefined;
+        if (market['swap']) {
+            const request = {
+                'contractName': market['id'],
+            };
+            if (limit !== undefined) {
+                if (limit > 100) {
+                    limit = 100;
+                }
+                request['limit'] = limit; // default 100, max 100, see https://www.bitrue.com/api-docs#order-book
+            }
+            if (market['linear']) {
+                response = await this.fapiV1PublicGetDepth(this.extend(request, params));
+            }
+            else if (market['inverse']) {
+                response = await this.dapiV1PublicGetDepth(this.extend(request, params));
+            }
+        }
+        else if (market['spot']) {
+            const request = {
+                'symbol': market['id'],
+            };
+            if (limit !== undefined) {
+                if (limit > 1000) {
+                    limit = 1000;
+                }
+                request['limit'] = limit; // default 100, max 1000, see https://github.com/Bitrue-exchange/bitrue-official-api-docs#order-book
+            }
+            response = await this.spotV1PublicGetDepth(this.extend(request, params));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchOrderBook only support spot & swap markets');
         }
-        const response = await this.v1PublicGetDepth(this.extend(request, params));
+        //
+        // spot
         //
         //     {
         //         "lastUpdateId":1635474910177,
@@ -59372,7 +59866,16 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         ]
         //     }
         //
-        const orderbook = this.parseOrderBook(response, symbol);
+        // swap
+        //
+        //     {
+        //         "asks": [[34916.5, 2582], [34916.6, 2193], [34916.7, 2629], [34916.8, 3478], [34916.9, 2718]],
+        //         "bids": [[34916.4, 92065], [34916.3, 25703], [34916.2, 37259], [34916.1, 26446], [34916, 44456]],
+        //         "time": 1699338305000
+        //     }
+        //
+        const timestamp = this.safeInteger(response, 'time');
+        const orderbook = this.parseOrderBook(response, symbol, timestamp);
         orderbook['nonce'] = this.safeInteger(response, 'lastUpdateId');
         return orderbook;
     }
@@ -59391,39 +59894,56 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         // fetchTicker
         //
         //     {
-        //         "id":397945892,
-        //         "last":"1.143411",
-        //         "lowestAsk":"1.144223",
-        //         "highestBid":"1.141696",
-        //         "percentChange":"-0.001432",
-        //         "baseVolume":"338287",
-        //         "quoteVolume":"415013.244366",
-        //         "isFrozen":"0",
-        //         "high24hr":"1.370087",
-        //         "low24hr":"1.370087",
+        //         "symbol": "BNBBTC",
+        //         "priceChange": "0.000248",
+        //         "priceChangePercent": "3.5500",
+        //         "weightedAvgPrice": null,
+        //         "prevClosePrice": null,
+        //         "lastPrice": "0.007226",
+        //         "lastQty": null,
+        //         "bidPrice": "0.007208",
+        //         "askPrice": "0.007240",
+        //         "openPrice": "0.006978",
+        //         "highPrice": "0.007295",
+        //         "lowPrice": "0.006935",
+        //         "volume": "11749.86",
+        //         "quoteVolume": "84.1066211",
+        //         "openTime": 0,
+        //         "closeTime": 0,
+        //         "firstId": 0,
+        //         "lastId": 0,
+        //         "count": 0
         //     }
         //
         const symbol = this.safeSymbol(undefined, market);
-        const last = this.safeString(ticker, 'last');
+        const last = this.safeString2(ticker, 'lastPrice', 'last');
+        const timestamp = this.safeInteger(ticker, 'time');
+        let percentage = undefined;
+        if (market['swap']) {
+            percentage = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringMul(this.safeString(ticker, 'rose'), '100');
+        }
+        else {
+            percentage = this.safeString(ticker, 'priceChangePercent');
+        }
         return this.safeTicker({
             'symbol': symbol,
-            'timestamp': undefined,
-            'datetime': undefined,
-            'high': this.safeString(ticker, 'high24hr'),
-            'low': this.safeString(ticker, 'low24hr'),
-            'bid': this.safeString2(ticker, 'highestBid', 'bidPrice'),
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
+            'high': this.safeString2(ticker, 'highPrice', 'high'),
+            'low': this.safeString2(ticker, 'lowPrice', 'low'),
+            'bid': this.safeString2(ticker, 'bidPrice', 'buy'),
             'bidVolume': this.safeString(ticker, 'bidQty'),
-            'ask': this.safeString2(ticker, 'lowestAsk', 'askPrice'),
+            'ask': this.safeString2(ticker, 'askPrice', 'sell'),
             'askVolume': this.safeString(ticker, 'askQty'),
-            'vwap': undefined,
-            'open': undefined,
+            'vwap': this.safeString(ticker, 'weightedAvgPrice'),
+            'open': this.safeString(ticker, 'openPrice'),
             'close': last,
             'last': last,
             'previousClose': undefined,
-            'change': undefined,
-            'percentage': _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringMul(this.safeString(ticker, 'percentChange'), '10000'),
+            'change': this.safeString(ticker, 'priceChange'),
+            'percentage': percentage,
             'average': undefined,
-            'baseVolume': this.safeString(ticker, 'baseVolume'),
+            'baseVolume': this.safeString2(ticker, 'volume', 'vol'),
             'quoteVolume': this.safeString(ticker, 'quoteVolume'),
             'info': ticker,
         }, market);
@@ -59433,52 +59953,87 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bitrue#fetchTicker
          * @description fetches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#24hr-ticker-price-change-statistics
+         * @see https://www.bitrue.com/api-docs#ticker
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#ticker
          * @param {string} symbol unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the bitrue api endpoint
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
         await this.loadMarkets();
         const market = this.market(symbol);
-        const uppercaseBaseId = this.safeStringUpper(market, 'baseId');
-        const uppercaseQuoteId = this.safeStringUpper(market, 'quoteId');
-        const request = {
-            'currency': uppercaseQuoteId,
-            'command': 'returnTicker',
-        };
-        const response = await this.klinePublicGetPublicCurrencyJson(this.extend(request, params));
+        let response = undefined;
+        let data = undefined;
+        if (market['swap']) {
+            const request = {
+                'contractName': market['id'],
+            };
+            if (market['linear']) {
+                response = await this.fapiV1PublicGetTicker(this.extend(request, params));
+            }
+            else if (market['inverse']) {
+                response = await this.dapiV1PublicGetTicker(this.extend(request, params));
+            }
+            data = response;
+        }
+        else if (market['spot']) {
+            const request = {
+                'symbol': market['id'],
+            };
+            response = await this.spotV1PublicGetTicker24hr(this.extend(request, params));
+            data = this.safeValue(response, 0, {});
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchTicker only support spot & swap markets');
+        }
+        //
+        // spot
+        //
+        //     [{
+        //         symbol: 'BTCUSDT',
+        //         priceChange: '105.20',
+        //         priceChangePercent: '0.3000',
+        //         weightedAvgPrice: null,
+        //         prevClosePrice: null,
+        //         lastPrice: '34905.21',
+        //         lastQty: null,
+        //         bidPrice: '34905.21',
+        //         askPrice: '34905.22',
+        //         openPrice: '34800.01',
+        //         highPrice: '35276.33',
+        //         lowPrice: '34787.51',
+        //         volume: '12549.6481',
+        //         quoteVolume: '439390492.917',
+        //         openTime: '0',
+        //         closeTime: '0',
+        //         firstId: '0',
+        //         lastId: '0',
+        //         count: '0'
+        //     }]
+        //
+        // swap
         //
         //     {
-        //         "code":"200",
-        //         "msg":"success",
-        //         "data":{
-        //             "DODO3S_USDT":{
-        //                 "id":397945892,
-        //                 "last":"1.143411",
-        //                 "lowestAsk":"1.144223",
-        //                 "highestBid":"1.141696",
-        //                 "percentChange":"-0.001432",
-        //                 "baseVolume":"338287",
-        //                 "quoteVolume":"415013.244366",
-        //                 "isFrozen":"0",
-        //                 "high24hr":"1.370087",
-        //                 "low24hr":"1.370087"
-        //             }
-        //         }
+        //         "high": "35296",
+        //         "vol": "779308354",
+        //         "last": "34884.1",
+        //         "low": "34806.7",
+        //         "buy": 34883.9,
+        //         "sell": 34884,
+        //         "rose": "-0.0027957315",
+        //         "time": 1699348013000
         //     }
         //
-        const data = this.safeValue(response, 'data', {});
-        const id = uppercaseBaseId + '_' + uppercaseQuoteId;
-        const ticker = this.safeValue(data, id);
-        if (ticker === undefined) {
-            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ExchangeError(this.id + ' fetchTicker() could not find the ticker for ' + market['symbol']);
-        }
-        return this.parseTicker(ticker, market);
+        return this.parseTicker(data, market);
     }
     async fetchOHLCV(symbol, timeframe = '1m', since = undefined, limit = undefined, params = {}) {
         /**
          * @method
          * @name bitrue#fetchOHLCV
          * @description fetches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#kline-data
+         * @see https://www.bitrue.com/api-docs#kline-candlestick-data
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#kline-candlestick-data
          * @param {string} symbol unified symbol of the market to fetch OHLCV data for
          * @param {string} timeframe the length of time each candle represents
          * @param {int} [since] timestamp in ms of the earliest candle to fetch
@@ -59488,14 +60043,54 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          */
         await this.loadMarkets();
         const market = this.market(symbol);
-        const request = {
-            'symbol': market['id'],
-            'scale': this.safeString(this.timeframes, timeframe, timeframe),
-        };
-        if (limit !== undefined) {
-            request['limit'] = limit;
+        const timeframes = this.safeValue(this.options, 'timeframes', {});
+        let response = undefined;
+        let data = undefined;
+        if (market['swap']) {
+            const timeframesFuture = this.safeValue(timeframes, 'future', {});
+            const request = {
+                'contractName': market['id'],
+                // 1min / 5min / 15min / 30min / 1h / 1day / 1week / 1month
+                'interval': this.safeString(timeframesFuture, timeframe, '1min'),
+            };
+            if (limit !== undefined) {
+                if (limit > 300) {
+                    limit = 300;
+                }
+                request['limit'] = limit;
+            }
+            if (market['linear']) {
+                response = await this.fapiV1PublicGetKlines(this.extend(request, params));
+            }
+            else if (market['inverse']) {
+                response = await this.dapiV1PublicGetKlines(this.extend(request, params));
+            }
+            data = response;
+        }
+        else if (market['spot']) {
+            const timeframesSpot = this.safeValue(timeframes, 'spot', {});
+            const request = {
+                'symbol': market['id'],
+                // 1m / 5m / 15m / 30m / 1H / 2H / 4H / 12H / 1D / 1W
+                'scale': this.safeString(timeframesSpot, timeframe, '1m'),
+            };
+            if (limit !== undefined) {
+                if (limit > 1440) {
+                    limit = 1440;
+                }
+                request['limit'] = limit;
+            }
+            if (since !== undefined) {
+                request['fromIdx'] = since;
+            }
+            response = await this.spotV1PublicGetMarketKline(this.extend(request, params));
+            data = this.safeValue(response, 'data', []);
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchOHLCV only support spot & swap markets');
         }
-        const response = await this.v1PublicGetMarketKline(this.extend(request, params));
+        //
+        // spot
         //
         //       {
         //           "symbol":"BTCUSDT",
@@ -59513,10 +60108,24 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //           ]
         //       }
         //
-        const data = this.safeValue(response, 'data', []);
+        // swap
+        //
+        //     [
+        //         {
+        //           "high": "35360.7",
+        //           "vol": "110288",
+        //           "low": "35347.9",
+        //           "idx": 1699411680000,
+        //           "close": "35347.9",
+        //           "open": "35349.4"
+        //         }
+        //     ]
+        //
         return this.parseOHLCVs(data, market, timeframe, since, limit);
     }
     parseOHLCV(ohlcv, market = undefined) {
+        //
+        // spot
         //
         //      {
         //         "i":"1660825020",
@@ -59528,13 +60137,28 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         "o":"23508.34"
         //      }
         //
+        // swap
+        //
+        //     {
+        //         "high": "35360.7",
+        //         "vol": "110288",
+        //         "low": "35347.9",
+        //         "idx": 1699411680000,
+        //         "close": "35347.9",
+        //         "open": "35349.4"
+        //     }
+        //
+        let timestamp = this.safeTimestamp(ohlcv, 'i');
+        if (timestamp === undefined) {
+            timestamp = this.safeInteger(ohlcv, 'idx');
+        }
         return [
-            this.safeTimestamp(ohlcv, 'i'),
-            this.safeNumber(ohlcv, 'o'),
-            this.safeNumber(ohlcv, 'h'),
-            this.safeNumber(ohlcv, 'l'),
-            this.safeNumber(ohlcv, 'c'),
-            this.safeNumber(ohlcv, 'v'),
+            timestamp,
+            this.safeNumber2(ohlcv, 'o', 'open'),
+            this.safeNumber2(ohlcv, 'h', 'high'),
+            this.safeNumber2(ohlcv, 'l', 'low'),
+            this.safeNumber2(ohlcv, 'c', 'close'),
+            this.safeNumber2(ohlcv, 'v', 'vol'),
         ];
     }
     async fetchBidsAsks(symbols = undefined, params = {}) {
@@ -59543,20 +60167,40 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @name bitrue#fetchBidsAsks
          * @description fetches the bid and ask price and volume for multiple markets
          * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#symbol-order-book-ticker
+         * @see https://www.bitrue.com/api-docs#ticker
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#ticker
          * @param {string[]|undefined} symbols unified symbols of the markets to fetch the bids and asks for, all markets are returned if not assigned
          * @param {object} [params] extra parameters specific to the bitrue api endpoint
          * @returns {object} a dictionary of [ticker structures]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
         await this.loadMarkets();
-        symbols = this.marketSymbols(symbols);
-        let market = undefined;
-        const request = {};
-        if (symbols !== undefined) {
-            const first = this.safeString(symbols, 0);
-            market = this.market(first);
-            request['symbol'] = market['id'];
+        symbols = this.marketSymbols(symbols, undefined, false);
+        const first = this.safeString(symbols, 0);
+        const market = this.market(first);
+        let response = undefined;
+        if (market['swap']) {
+            const request = {
+                'contractName': market['id'],
+            };
+            if (market['linear']) {
+                response = await this.fapiV1PublicGetTicker(this.extend(request, params));
+            }
+            else if (market['inverse']) {
+                response = await this.dapiV1PublicGetTicker(this.extend(request, params));
+            }
+        }
+        else if (market['spot']) {
+            const request = {
+                'symbol': market['id'],
+            };
+            response = await this.spotV1PublicGetTickerBookTicker(this.extend(request, params));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchBidsAsks only support spot & swap markets');
         }
-        const response = await this.v1PublicGetTickerBookTicker(this.extend(request, params));
+        //
+        // spot
+        //
         //     {
         //         "symbol": "LTCBTC",
         //         "bidPrice": "4.00000000",
@@ -59564,6 +60208,20 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         "askPrice": "4.00000200",
         //         "askQty": "9.00000000"
         //     }
+        //
+        // swap
+        //
+        //     {
+        //         "high": "35296",
+        //         "vol": "779308354",
+        //         "last": "34884.1",
+        //         "low": "34806.7",
+        //         "buy": 34883.9,
+        //         "sell": 34884,
+        //         "rose": "-0.0027957315",
+        //         "time": 1699348013000
+        //     }
+        //
         const data = {};
         data[market['id']] = response;
         return this.parseTickers(data, symbols);
@@ -59573,65 +60231,102 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bitrue#fetchTickers
          * @description fetches price tickers for multiple markets, statistical calculations with the information calculated over the past 24 hours each market
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#24hr-ticker-price-change-statistics
+         * @see https://www.bitrue.com/api-docs#ticker
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#ticker
          * @param {string[]|undefined} symbols unified symbols of the markets to fetch the ticker for, all market tickers are returned if not assigned
          * @param {object} [params] extra parameters specific to the bitrue api endpoint
          * @returns {object} a dictionary of [ticker structures]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
         await this.loadMarkets();
-        const request = {
-            'command': 'returnTicker',
-        };
-        const response = await this.klinePublicGetPublicJson(this.extend(request, params));
+        symbols = this.marketSymbols(symbols);
+        let response = undefined;
+        let data = undefined;
+        const request = {};
+        let type = undefined;
+        if (symbols !== undefined) {
+            const first = this.safeString(symbols, 0);
+            const market = this.market(first);
+            if (market['swap']) {
+                request['contractName'] = market['id'];
+                if (market['linear']) {
+                    response = await this.fapiV1PublicGetTicker(this.extend(request, params));
+                }
+                else if (market['inverse']) {
+                    response = await this.dapiV1PublicGetTicker(this.extend(request, params));
+                }
+                response['symbol'] = market['id'];
+                data = [response];
+            }
+            else if (market['spot']) {
+                request['symbol'] = market['id'];
+                response = await this.spotV1PublicGetTicker24hr(this.extend(request, params));
+                data = response;
+            }
+            else {
+                throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchTickers only support spot & swap markets');
+            }
+        }
+        else {
+            [type, params] = this.handleMarketTypeAndParams('fetchTickers', undefined, params);
+            if (type !== 'spot') {
+                throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchTickers only support spot when symbols is not set');
+            }
+            response = await this.spotV1PublicGetTicker24hr(this.extend(request, params));
+            data = response;
+        }
+        //
+        // spot
+        //
+        //     [{
+        //         symbol: 'BTCUSDT',
+        //         priceChange: '105.20',
+        //         priceChangePercent: '0.3000',
+        //         weightedAvgPrice: null,
+        //         prevClosePrice: null,
+        //         lastPrice: '34905.21',
+        //         lastQty: null,
+        //         bidPrice: '34905.21',
+        //         askPrice: '34905.22',
+        //         openPrice: '34800.01',
+        //         highPrice: '35276.33',
+        //         lowPrice: '34787.51',
+        //         volume: '12549.6481',
+        //         quoteVolume: '439390492.917',
+        //         openTime: '0',
+        //         closeTime: '0',
+        //         firstId: '0',
+        //         lastId: '0',
+        //         count: '0'
+        //     }]
+        //
+        // swap
         //
         //     {
-        //         "code":"200",
-        //         "msg":"success",
-        //         "data":{
-        //             "DODO3S_USDT":{
-        //                 "id":397945892,
-        //                 "last":"1.143411",
-        //                 "lowestAsk":"1.144223",
-        //                 "highestBid":"1.141696",
-        //                 "percentChange":"-0.001432",
-        //                 "baseVolume":"338287",
-        //                 "quoteVolume":"415013.244366",
-        //                 "isFrozen":"0",
-        //                 "high24hr":"1.370087",
-        //                 "low24hr":"1.370087"
-        //             }
-        //         }
+        //         "high": "35296",
+        //         "vol": "779308354",
+        //         "last": "34884.1",
+        //         "low": "34806.7",
+        //         "buy": 34883.9,
+        //         "sell": 34884,
+        //         "rose": "-0.0027957315",
+        //         "time": 1699348013000
         //     }
         //
-        const data = this.safeValue(response, 'data', {});
         // the exchange returns market ids with an underscore from the tickers endpoint
         // the market ids do not have an underscore, so it has to be removed
         // https://github.com/ccxt/ccxt/issues/13856
         const tickers = {};
-        const marketIds = Object.keys(data);
-        for (let i = 0; i < marketIds.length; i++) {
-            const marketId = marketIds[i].replace('_', '');
-            tickers[marketId] = data[marketIds[i]];
+        for (let i = 0; i < data.length; i++) {
+            const ticker = this.safeValue(data, i, {});
+            const market = this.market(this.safeValue(ticker, 'symbol'));
+            tickers[market['id']] = ticker;
         }
         return this.parseTickers(tickers, symbols);
     }
     parseTrade(trade, market = undefined) {
         //
-        // aggregate trades
-        //  - "T" is timestamp of *api-call* not trades. Use more expensive v1PublicGetHistoricalTrades if actual timestamp of trades matter
-        //  - Trades are aggregated by timestamp, price, and side. But "m" is always True. Use method above if side of trades matter
-        //
-        //     {
-        //         "a": 26129,         // Aggregate tradeId
-        //         "p": "0.01633102",  // Price
-        //         "q": "4.70443515",  // Quantity
-        //         "f": 27781,         // First tradeId
-        //         "l": 27781,         // Last tradeId
-        //         "T": 1498793709153, // Timestamp of *Api-call* not trade!
-        //         "m": true,          // Was the buyer the maker?  // Always True -> ignore it and leave side undefined
-        //         "M": true           // Was the trade the best price match?
-        //     }
-        //
-        // recent public trades and old public trades
+        // fetchTrades
         //
         //     {
         //         "id": 28457,
@@ -59642,7 +60337,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         "isBestMatch": true
         //     }
         //
-        // private trades
+        // fetchTrades - spot
         //
         //     {
         //         "symbol":"USDCUSDT",
@@ -59659,14 +60354,32 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         "isBestMatch":true
         //     }
         //
-        const timestamp = this.safeInteger2(trade, 'T', 'time');
-        const priceString = this.safeString2(trade, 'p', 'price');
-        const amountString = this.safeString2(trade, 'q', 'qty');
-        const marketId = this.safeString(trade, 'symbol');
+        // fetchTrades - future
+        //
+        //     {
+        //         "tradeId":12,
+        //         "price":0.9,
+        //         "qty":1,
+        //         "amount":9,
+        //         "contractName":"E-SAND-USDT",
+        //         "side":"BUY",
+        //         "fee":"0.0018",
+        //         "bidId":1558124009467904992,
+        //         "askId":1558124043827644908,
+        //         "bidUserId":10294,
+        //         "askUserId":10467,
+        //         "isBuyer":true,
+        //         "isMaker":true,
+        //         "ctime":1678426306000
+        //     }
+        //
+        const timestamp = this.safeInteger2(trade, 'ctime', 'time');
+        const priceString = this.safeString(trade, 'price');
+        const amountString = this.safeString(trade, 'qty');
+        const marketId = this.safeString2(trade, 'symbol', 'contractName');
         const symbol = this.safeSymbol(marketId, market);
         const orderId = this.safeString(trade, 'orderId');
-        let id = this.safeString2(trade, 't', 'a');
-        id = this.safeString2(trade, 'id', 'tradeId', id);
+        const id = this.safeString2(trade, 'id', 'tradeId');
         let side = undefined;
         const buyerMaker = this.safeValue(trade, 'isBuyerMaker'); // ignore "m" until Bitrue fixes api
         const isBuyer = this.safeValue(trade, 'isBuyer');
@@ -59679,12 +60392,12 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         let fee = undefined;
         if ('commission' in trade) {
             fee = {
-                'cost': this.safeString(trade, 'commission'),
+                'cost': this.safeString2(trade, 'commission', 'fee'),
                 'currency': this.safeCurrencyCode(this.safeString(trade, 'commissionAssert')),
             };
         }
         let takerOrMaker = undefined;
-        const isMaker = this.safeValue2(trade, 'isMaker', 'maker');
+        const isMaker = this.safeValue(trade, 'isMaker');
         if (isMaker !== undefined) {
             takerOrMaker = isMaker ? 'maker' : 'taker';
         }
@@ -59709,6 +60422,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bitrue#fetchTrades
          * @description get the list of most recent trades for a particular symbol
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#recent-trades-list
          * @param {string} symbol unified symbol of the market to fetch trades for
          * @param {int} [since] timestamp in ms of the earliest trade to fetch
          * @param {int} [limit] the maximum amount of trades to fetch
@@ -59717,41 +60431,22 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          */
         await this.loadMarkets();
         const market = this.market(symbol);
-        const request = {
-            'symbol': market['id'],
-            // 'limit': 100, // default 100, max = 1000
-        };
-        const method = this.safeString(this.options, 'fetchTradesMethod', 'v1PublicGetAggTrades');
-        if (limit !== undefined) {
-            request['limit'] = limit; // default 100, max 1000
+        let response = undefined;
+        if (market['spot']) {
+            const request = {
+                'symbol': market['id'],
+                // 'limit': 100, // default 100, max = 1000
+            };
+            if (limit !== undefined) {
+                request['limit'] = limit; // default 100, max 1000
+            }
+            response = await this.spotV1PublicGetTrades(this.extend(request, params));
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchTrades only support spot markets');
         }
         //
-        // Caveats:
-        // - default limit (500) applies only if no other parameters set, trades up
-        //   to the maximum limit may be returned to satisfy other parameters
-        // - if both limit and time window is set and time window contains more
-        //   trades than the limit then the last trades from the window are returned
-        // - '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
-        //
-        //     [
-        //         {
-        //             "a": 26129,         // Aggregate tradeId
-        //             "p": "0.01633102",  // Price
-        //             "q": "4.70443515",  // Quantity
-        //             "f": 27781,         // First tradeId
-        //             "l": 27781,         // Last tradeId
-        //             "T": 1498793709153, // Timestamp
-        //             "m": true,          // Was the buyer the maker?
-        //             "M": true           // Was the trade the best price match?
-        //         }
-        //     ]
-        //
-        // recent public trades and historical public trades
+        // spot
         //
         //     [
         //         {
@@ -59768,6 +60463,8 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
     }
     parseOrderStatus(status) {
         const statuses = {
+            'INIT': 'open',
+            'PENDING_CREATE': 'open',
             'NEW': 'open',
             'PARTIALLY_FILLED': 'open',
             'FILLED': 'closed',
@@ -59780,7 +60477,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
     }
     parseOrder(order, market = undefined) {
         //
-        // createOrder
+        // createOrder - spot
         //
         //     {
         //         "symbol":"USDCUSDT",
@@ -59789,7 +60486,13 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         "transactTime":1635551031276
         //     }
         //
-        // fetchOpenOrders
+        // createOrder - future
+        //
+        //     {
+        //         "orderId":1690615676032452985,
+        //     }
+        //
+        // fetchOrders - spot
         //
         //     {
         //         "symbol":"USDCUSDT",
@@ -59810,7 +60513,24 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         "isWorking":false
         //     }
         //
-        const status = this.parseOrderStatus(this.safeString(order, 'status'));
+        // fetchOrders - future
+        //
+        //     {
+        //         "orderId":1917641,
+        //         "price":100,
+        //         "origQty":10,
+        //         "origAmount":10,
+        //         "executedQty":1,
+        //         "avgPrice":10000,
+        //         "status":"INIT",
+        //         "type":"LIMIT",
+        //         "side":"BUY",
+        //         "action":"OPEN",
+        //         "transactTime":1686716571425
+        //         "clientOrderId":4949299210
+        //     }
+        //
+        const status = this.parseOrderStatus(this.safeString2(order, 'status', 'orderStatus'));
         const marketId = this.safeString(order, 'symbol');
         const symbol = this.safeSymbol(marketId, market);
         const filled = this.safeString(order, 'executedQty');
@@ -59845,7 +60565,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         const fills = this.safeValue(order, 'fills', []);
         const clientOrderId = this.safeString(order, 'clientOrderId');
         const timeInForce = this.safeString(order, 'timeInForce');
-        const postOnly = (type === 'limit_maker') || (timeInForce === 'GTX');
+        const postOnly = (type === 'limit_maker') || (timeInForce === 'GTX') || (type === 'post_only');
         if (type === 'limit_maker') {
             type = 'limit';
         }
@@ -59881,16 +60601,21 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bitrue#createOrder
          * @description create a trade order
-         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#signed-endpoint-examples-for-post-apiv1order
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#recent-trades-list
+         * @see https://www.bitrue.com/api-docs#new-order-trade-hmac-sha256
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#new-order-trade-hmac-sha256
          * @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 bitrue api endpoint
-         * @param {float} [params.triggerPrice] the price at which a trigger order is triggered at
+         * @param {float} [params.triggerPrice] *spot only* the price at which a trigger order is triggered at
          * @param {string} [params.clientOrderId] a unique id for the order, automatically generated if not sent
-         *
+         * @param {decimal} [params.leverage] in future order, the leverage value of the order should consistent with the user contract configuration, default is 1
+         * @param {string} [params.timeInForce] 'fok', 'ioc' or 'po'
+         * @param {bool} [params.postOnly] default false
+         * @param {bool} [params.reduceOnly] default false
          * EXCHANGE SPECIFIC PARAMETERS
          * @param {decimal} [params.icebergQty]
          * @param {long} [params.recvWindow]
@@ -59898,54 +60623,125 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          */
         await this.loadMarkets();
         const market = this.market(symbol);
+        let response = undefined;
+        let data = undefined;
         const uppercaseType = type.toUpperCase();
-        const validOrderTypes = this.safeValue(market['info'], 'orderTypes');
-        if (!this.inArray(uppercaseType, validOrderTypes)) {
-            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InvalidOrder(this.id + ' ' + type + ' is not a valid order type in market ' + symbol);
-        }
         const request = {
-            'symbol': market['id'],
             'side': side.toUpperCase(),
             'type': uppercaseType,
             // 'timeInForce': '',
-            'quantity': this.amountToPrecision(symbol, amount),
             // 'price': this.priceToPrecision (symbol, price),
             // 'newClientOrderId': clientOrderId, // automatically generated if not sent
             // 'stopPrice': this.priceToPrecision (symbol, 'stopPrice'),
             // 'icebergQty': this.amountToPrecision (symbol, icebergQty),
         };
-        const clientOrderId = this.safeString2(params, 'newClientOrderId', 'clientOrderId');
-        if (clientOrderId !== undefined) {
-            params = this.omit(params, ['newClientOrderId', 'clientOrderId']);
-            request['newClientOrderId'] = clientOrderId;
-        }
         if (uppercaseType === 'LIMIT') {
             if (price === undefined) {
                 throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InvalidOrder(this.id + ' createOrder() requires a price argument');
             }
             request['price'] = this.priceToPrecision(symbol, price);
         }
-        const stopPrice = this.safeValue2(params, 'triggerPrice', 'stopPrice');
-        if (stopPrice !== undefined) {
-            params = this.omit(params, ['triggerPrice', 'stopPrice']);
-            request['stopPrice'] = this.priceToPrecision(symbol, stopPrice);
+        if (market['swap']) {
+            const isMarket = uppercaseType === 'MARKET';
+            const timeInForce = this.safeStringLower(params, 'timeInForce');
+            const postOnly = this.isPostOnly(isMarket, undefined, params);
+            if (postOnly) {
+                request['type'] = 'POST_ONLY';
+            }
+            else if (timeInForce === 'fok') {
+                request['type'] = 'FOK';
+            }
+            else if (timeInForce === 'ioc') {
+                request['type'] = 'IOC';
+            }
+            request['contractName'] = market['id'];
+            if (isMarket && (side === 'buy') && (this.options['createMarketBuyOrderRequiresPrice'])) {
+                const cost = this.safeString(params, 'cost');
+                params = this.omit(params, 'cost');
+                if (price === undefined && cost === undefined) {
+                    throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InvalidOrder(this.id + ' createOrder() requires the price argument with swap 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 to supply the cost in the amount argument (the exchange-specific behaviour)');
+                }
+                else {
+                    const amountString = this.numberToString(amount);
+                    const priceString = this.numberToString(price);
+                    const quoteAmount = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringMul(amountString, priceString);
+                    amount = (cost !== undefined) ? cost : quoteAmount;
+                    request['amount'] = this.costToPrecision(symbol, amount);
+                    request['volume'] = this.costToPrecision(symbol, amount);
+                }
+            }
+            else {
+                request['amount'] = this.parseToNumeric(amount);
+                request['volume'] = this.parseToNumeric(amount);
+            }
+            request['positionType'] = 1;
+            const reduceOnly = this.safeValue2(params, 'reduceOnly', 'reduce_only');
+            request['open'] = reduceOnly ? 'CLOSE' : 'OPEN';
+            const leverage = this.safeString(params, 'leverage', '1');
+            request['leverage'] = this.parseToNumeric(leverage);
+            params = this.omit(params, ['leverage', 'reduceOnly', 'reduce_only', 'timeInForce']);
+            if (market['linear']) {
+                response = await this.fapiV2PrivatePostOrder(this.extend(request, params));
+            }
+            else if (market['inverse']) {
+                response = await this.dapiV2PrivatePostOrder(this.extend(request, params));
+            }
+            data = this.safeValue(response, 'data', {});
+        }
+        else if (market['spot']) {
+            request['symbol'] = market['id'];
+            request['quantity'] = this.amountToPrecision(symbol, amount);
+            const validOrderTypes = this.safeValue(market['info'], 'orderTypes');
+            if (!this.inArray(uppercaseType, validOrderTypes)) {
+                throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InvalidOrder(this.id + ' ' + type + ' is not a valid order type in market ' + symbol);
+            }
+            const clientOrderId = this.safeString2(params, 'newClientOrderId', 'clientOrderId');
+            if (clientOrderId !== undefined) {
+                params = this.omit(params, ['newClientOrderId', 'clientOrderId']);
+                request['newClientOrderId'] = clientOrderId;
+            }
+            const stopPrice = this.safeValue2(params, 'triggerPrice', 'stopPrice');
+            if (stopPrice !== undefined) {
+                params = this.omit(params, ['triggerPrice', 'stopPrice']);
+                request['stopPrice'] = this.priceToPrecision(symbol, stopPrice);
+            }
+            response = await this.spotV1PrivatePostOrder(this.extend(request, params));
+            data = response;
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' createOrder only support spot & swap markets');
         }
-        const response = await this.v1PrivatePostOrder(this.extend(request, params));
+        //
+        // spot
         //
         //     {
-        //         "symbol":"USDCUSDT",
-        //         "orderId":2878854881,
-        //         "clientOrderId":"",
-        //         "transactTime":1635551031276
+        //         "symbol": "BTCUSDT",
+        //         "orderId": 307650651173648896,
+        //         "orderIdStr": "307650651173648896",
+        //         "clientOrderId": "6gCrw2kRUAF9CvJDGP16IP",
+        //         "transactTime": 1507725176595
         //     }
         //
-        return this.parseOrder(response, market);
+        // swap
+        //
+        //     {
+        //         "code": "0",
+        //         "msg": "Success",
+        //         "data": {
+        //             "orderId": 1690615676032452985
+        //         }
+        //     }
+        //
+        return this.parseOrder(data, market);
     }
     async fetchOrder(id, symbol = undefined, params = {}) {
         /**
          * @method
          * @name bitrue#fetchOrder
          * @description fetches information on an order made by the user
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#query-order-user_data
+         * @see https://www.bitrue.com/api-docs#query-order-user_data-hmac-sha256
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#query-order-user_data-hmac-sha256
          * @param {string} symbol unified symbol of the market the order was made in
          * @param {object} [params] extra parameters specific to the bitrue api endpoint
          * @returns {object} An [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
@@ -59955,25 +60751,92 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         }
         await this.loadMarkets();
         const market = this.market(symbol);
-        const request = {
-            'symbol': market['id'],
-        };
-        const clientOrderId = this.safeValue2(params, 'origClientOrderId', 'clientOrderId');
-        if (clientOrderId !== undefined) {
-            request['origClientOrderId'] = clientOrderId;
+        const origClientOrderId = this.safeValue2(params, 'origClientOrderId', 'clientOrderId');
+        params = this.omit(params, ['origClientOrderId', 'clientOrderId']);
+        let response = undefined;
+        let data = undefined;
+        const request = {};
+        if (origClientOrderId === undefined) {
+            request['orderId'] = id;
         }
         else {
-            request['orderId'] = id;
+            if (market['swap']) {
+                request['clientOrderId'] = origClientOrderId;
+            }
+            else {
+                request['origClientOrderId'] = origClientOrderId;
+            }
         }
-        const query = this.omit(params, ['type', 'clientOrderId', 'origClientOrderId']);
-        const response = await this.v1PrivateGetOrder(this.extend(request, query));
-        return this.parseOrder(response, market);
+        if (market['swap']) {
+            request['contractName'] = market['id'];
+            if (market['linear']) {
+                response = await this.fapiV2PrivateGetOrder(this.extend(request, params));
+            }
+            else if (market['inverse']) {
+                response = await this.dapiV2PrivateGetOrder(this.extend(request, params));
+            }
+            data = this.safeValue(response, 'data', {});
+        }
+        else if (market['spot']) {
+            request['orderId'] = id; // spot market id is mandatory
+            request['symbol'] = market['id'];
+            response = await this.spotV1PrivateGetOrder(this.extend(request, params));
+            data = response;
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchOrder only support spot & swap markets');
+        }
+        //
+        // spot
+        //
+        //     {
+        //         "symbol": "LTCBTC",
+        //         "orderId": 1,
+        //         "clientOrderId": "myOrder1",
+        //         "price": "0.1",
+        //         "origQty": "1.0",
+        //         "executedQty": "0.0",
+        //         "cummulativeQuoteQty": "0.0",
+        //         "status": "NEW",
+        //         "timeInForce": "GTC",
+        //         "type": "LIMIT",
+        //         "side": "BUY",
+        //         "stopPrice": "0.0",
+        //         "icebergQty": "0.0",
+        //         "time": 1499827319559,
+        //         "updateTime": 1499827319559,
+        //         "isWorking": true
+        //     }
+        //
+        // swap
+        //
+        //     {
+        //         "code":0,
+        //         "msg":"success",
+        //         "data":{
+        //             "orderId":1917641,
+        //             "price":100,
+        //             "origQty":10,
+        //             "origAmount":10,
+        //             "executedQty":1,
+        //             "avgPrice":10000,
+        //             "status":"INIT",
+        //             "type":"LIMIT",
+        //             "side":"BUY",
+        //             "action":"OPEN",
+        //             "transactTime":1686716571425
+        //             "clientOrderId":4949299210
+        //         }
+        //     }
+        //
+        return this.parseOrder(data, market);
     }
     async fetchClosedOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
          * @name bitrue#fetchClosedOrders
          * @description fetches information on multiple closed orders made by the user
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#all-orders-user_data
          * @param {string} symbol unified market symbol of the market orders were made in
          * @param {int} [since] the earliest time in ms to fetch orders for
          * @param {int} [limit] the maximum number of order structures to retrieve
@@ -59985,6 +60848,9 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         }
         await this.loadMarkets();
         const market = this.market(symbol);
+        if (!market['spot']) {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchClosedOrders only support spot markets');
+        }
         const request = {
             'symbol': market['id'],
             // 'orderId': 123445, // long
@@ -59998,7 +60864,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         if (limit !== undefined) {
             request['limit'] = limit; // default 100, max 1000
         }
-        const response = await this.v1PrivateGetAllOrders(this.extend(request, params));
+        const response = await this.spotV1PrivateGetAllOrders(this.extend(request, params));
         //
         //     [
         //         {
@@ -60028,6 +60894,9 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bitrue#fetchOpenOrders
          * @description fetch all unfilled currently open orders
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#current-open-orders-user_data
+         * @see https://www.bitrue.com/api-docs#current-all-open-orders-user_data-hmac-sha256
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#current-all-open-orders-user_data-hmac-sha256
          * @param {string} symbol unified market symbol
          * @param {int} [since] the earliest time in ms to fetch open orders for
          * @param {int} [limit] the maximum number of open order structures to retrieve
@@ -60039,10 +60908,29 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         }
         await this.loadMarkets();
         const market = this.market(symbol);
-        const request = {
-            'symbol': market['id'],
-        };
-        const response = await this.v1PrivateGetOpenOrders(this.extend(request, params));
+        let response = undefined;
+        let data = undefined;
+        const request = {};
+        if (market['swap']) {
+            request['contractName'] = market['id'];
+            if (market['linear']) {
+                response = await this.fapiV2PrivateGetOpenOrders(this.extend(request, params));
+            }
+            else if (market['inverse']) {
+                response = await this.dapiV2PrivateGetOpenOrders(this.extend(request, params));
+            }
+            data = this.safeValue(response, 'data', []);
+        }
+        else if (market['spot']) {
+            request['symbol'] = market['id'];
+            response = await this.spotV1PrivateGetOpenOrders(this.extend(request, params));
+            data = response;
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchOpenOrders only support spot & swap markets');
+        }
+        //
+        // spot
         //
         //     [
         //         {
@@ -60065,13 +60953,38 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         }
         //     ]
         //
-        return this.parseOrders(response, market, since, limit);
+        // swap
+        //
+        //      {
+        //          "code": "0",
+        //          "msg": "Success",
+        //          "data": [{
+        //                  "orderId": 1917641,
+        //                  "clientOrderId": "2488514315",
+        //                  "price": 100,
+        //                  "origQty": 10,
+        //                  "origAmount": 10,
+        //                  "executedQty": 1,
+        //                  "avgPrice": 12451,
+        //                  "status": "INIT",
+        //                  "type": "LIMIT",
+        //                  "side": "BUY",
+        //                  "action": "OPEN",
+        //                  "transactTime": 1686717303975
+        //              }
+        //          ]
+        //      }
+        //
+        return this.parseOrders(data, market, since, limit);
     }
     async cancelOrder(id, symbol = undefined, params = {}) {
         /**
          * @method
          * @name bitrue#cancelOrder
          * @description cancels an open order
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#cancel-order-trade
+         * @see https://www.bitrue.com/api-docs#cancel-order-trade-hmac-sha256
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#cancel-order-trade-hmac-sha256
          * @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 bitrue api endpoint
@@ -60083,20 +60996,41 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         await this.loadMarkets();
         const market = this.market(symbol);
         const origClientOrderId = this.safeValue2(params, 'origClientOrderId', 'clientOrderId');
-        const request = {
-            'symbol': market['id'],
-            // "orderId": id,
-            // "origClientOrderId": id,
-            // "newClientOrderId": id,
-        };
+        params = this.omit(params, ['origClientOrderId', 'clientOrderId']);
+        let response = undefined;
+        let data = undefined;
+        const request = {};
         if (origClientOrderId === undefined) {
             request['orderId'] = id;
         }
         else {
-            request['origClientOrderId'] = origClientOrderId;
+            if (market['swap']) {
+                request['clientOrderId'] = origClientOrderId;
+            }
+            else {
+                request['origClientOrderId'] = origClientOrderId;
+            }
+        }
+        if (market['swap']) {
+            request['contractName'] = market['id'];
+            if (market['linear']) {
+                response = await this.fapiV2PrivatePostCancel(this.extend(request, params));
+            }
+            else if (market['inverse']) {
+                response = await this.dapiV2PrivatePostCancel(this.extend(request, params));
+            }
+            data = this.safeValue(response, 'data', {});
         }
-        const query = this.omit(params, ['type', 'origClientOrderId', 'clientOrderId']);
-        const response = await this.v1PrivateDeleteOrder(this.extend(request, query));
+        else if (market['spot']) {
+            request['symbol'] = market['id'];
+            response = await this.spotV1PrivateDeleteOrder(this.extend(request, params));
+            data = response;
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' cancelOrder only support spot & swap markets');
+        }
+        //
+        // spot
         //
         //     {
         //         "symbol": "LTCBTC",
@@ -60105,43 +61039,111 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         "clientOrderId": "cancelMyOrder1"
         //     }
         //
-        return this.parseOrder(response, market);
+        // swap
+        //
+        //     {
+        //         "code": "0",
+        //         "msg": "Success",
+        //         "data": {
+        //             "orderId": 1690615847831143159
+        //         }
+        //     }
+        //
+        return this.parseOrder(data, market);
+    }
+    async cancelAllOrders(symbol = undefined, params = {}) {
+        /**
+         * @method
+         * @name bitrue#cancelAllOrders
+         * @description cancel all open orders in a market
+         * @see https://www.bitrue.com/api-docs#cancel-all-open-orders-trade-hmac-sha256
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#cancel-all-open-orders-trade-hmac-sha256
+         * @param {string} symbol unified market symbol of the market to cancel orders in
+         * @param {object} [params] extra parameters specific to the bitrue api endpoint
+         * @param {string} [params.marginMode] 'cross' or 'isolated', for spot margin trading
+         * @returns {object[]} a list of [order structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+         */
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        let response = undefined;
+        let data = undefined;
+        if (market['swap']) {
+            const request = {
+                'contractName': market['id'],
+            };
+            if (market['linear']) {
+                response = await this.fapiV2PrivatePostAllOpenOrders(this.extend(request, params));
+            }
+            else if (market['inverse']) {
+                response = await this.dapiV2PrivatePostAllOpenOrders(this.extend(request, params));
+            }
+            data = this.safeValue(response, 'data', []);
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' cancelAllOrders only support future markets');
+        }
+        //
+        // swap
+        //
+        //      {
+        //          'code': '0',
+        //          'msg': 'Success',
+        //          'data': null
+        //      }
+        //
+        return this.parseOrders(data, market);
     }
     async fetchMyTrades(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
          * @name bitrue#fetchMyTrades
          * @description fetch all trades made by the user
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#account-trade-list-user_data
+         * @see https://www.bitrue.com/api-docs#account-trade-list-user_data-hmac-sha256
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#account-trade-list-user_data-hmac-sha256
          * @param {string} symbol unified market symbol
          * @param {int} [since] the earliest time in ms to fetch trades for
          * @param {int} [limit] the maximum number of trades structures to retrieve
          * @param {object} [params] extra parameters specific to the bitrue api endpoint
          * @returns {Trade[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=trade-structure}
          */
-        const method = this.safeString(this.options, 'fetchMyTradesMethod', 'v2PrivateGetMyTrades');
-        if ((symbol === undefined) && (method === 'v2PrivateGetMyTrades')) {
-            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ArgumentsRequired(this.id + ' v2PrivateGetMyTrades() requires a symbol argument');
-        }
         await this.loadMarkets();
-        const request = {
-        // 'symbol': market['id'],
-        // 'startTime': since,
-        // 'endTime': this.milliseconds (),
-        // 'fromId': 12345, // trade id to fetch from, most recent trades by default
-        // 'limit': limit, // default 100, max 1000
-        };
-        let market = undefined;
-        if (symbol !== undefined) {
-            market = this.market(symbol);
-            request['symbol'] = market['id'];
+        if (symbol === undefined) {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ArgumentsRequired(this.id + ' fetchMyTrades() requires a symbol argument');
         }
+        const market = this.market(symbol);
+        let response = undefined;
+        let data = undefined;
+        const request = {};
         if (since !== undefined) {
             request['startTime'] = since;
         }
         if (limit !== undefined) {
+            if (limit > 1000) {
+                limit = 1000;
+            }
             request['limit'] = limit;
         }
-        const response = await this[method](this.extend(request, params));
+        if (market['swap']) {
+            request['contractName'] = market['id'];
+            if (market['linear']) {
+                response = await this.fapiV2PrivateGetMyTrades(this.extend(request, params));
+            }
+            else if (market['inverse']) {
+                response = await this.dapiV2PrivateGetMyTrades(this.extend(request, params));
+            }
+            data = this.safeValue(response, 'data', []);
+        }
+        else if (market['spot']) {
+            request['symbol'] = market['id'];
+            response = await this.spotV2PrivateGetMyTrades(this.extend(request, params));
+            data = response;
+        }
+        else {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' fetchMyTrades only support spot & swap markets');
+        }
+        //
+        // spot
         //
         //     [
         //         {
@@ -60160,13 +61162,39 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         }
         //     ]
         //
-        return this.parseTrades(response, market, since, limit);
+        // swap
+        //
+        //     {
+        //         "code":"0",
+        //         "msg":"Success",
+        //         "data":[
+        //             {
+        //                 "tradeId":12,
+        //                 "price":0.9,
+        //                 "qty":1,
+        //                 "amount":9,
+        //                 "contractName":"E-SAND-USDT",
+        //                 "side":"BUY",
+        //                 "fee":"0.0018",
+        //                 "bidId":1558124009467904992,
+        //                 "askId":1558124043827644908,
+        //                 "bidUserId":10294,
+        //                 "askUserId":10467,
+        //                 "isBuyer":true,
+        //                 "isMaker":true,
+        //                 "ctime":1678426306000
+        //             }
+        //         ]
+        //     }
+        //
+        return this.parseTrades(data, market, since, limit);
     }
     async fetchDeposits(code = undefined, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
          * @name bitrue#fetchDeposits
          * @description fetch all deposits made to an account
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#deposit-history--withdraw_data
          * @param {string} code unified currency code
          * @param {int} [since] the earliest time in ms to fetch deposits for
          * @param {int} [limit] the maximum number of deposits structures to retrieve
@@ -60193,7 +61221,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         if (limit !== undefined) {
             request['limit'] = limit;
         }
-        const response = await this.v1PrivateGetDepositHistory(this.extend(request, params));
+        const response = await this.spotV1PrivateGetDepositHistory(this.extend(request, params));
         //
         //     {
         //         "code":200,
@@ -60238,6 +61266,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bitrue#fetchWithdrawals
          * @description fetch all withdrawals made from an account
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#withdraw-history--withdraw_data
          * @param {string} code unified currency code
          * @param {int} [since] the earliest time in ms to fetch withdrawals for
          * @param {int} [limit] the maximum number of withdrawals structures to retrieve
@@ -60264,7 +61293,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         if (limit !== undefined) {
             request['limit'] = limit;
         }
-        const response = await this.v1PrivateGetWithdrawHistory(this.extend(request, params));
+        const response = await this.spotV1PrivateGetWithdrawHistory(this.extend(request, params));
         //
         //     {
         //         "code": 200,
@@ -60428,6 +61457,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name bitrue#withdraw
          * @description make a withdrawal
+         * @see https://github.com/Bitrue-exchange/Spot-official-api-docs#withdraw-commit--withdraw_data
          * @param {string} code unified currency code
          * @param {float} amount the amount to withdraw
          * @param {string} address the address to withdraw to
@@ -60439,7 +61469,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         this.checkAddress(address);
         await this.loadMarkets();
         const currency = this.currency(code);
-        let chainName = this.safeString(params, 'chainName');
+        let chainName = this.safeString2(params, 'network', 'chainName');
         if (chainName === undefined) {
             const networks = this.safeValue(currency, 'networks', {});
             const optionsNetworks = this.safeValue(this.options, 'networks', {});
@@ -60464,7 +61494,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         if (tag !== undefined) {
             request['tag'] = tag;
         }
-        const response = await this.v1PrivatePostWithdrawCommit(this.extend(request, params));
+        const response = await this.spotV1PrivatePostWithdrawCommit(this.extend(request, params));
         //
         //     {
         //         "code": 200,
@@ -60480,7 +61510,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         }
         //     }
         //
-        const data = this.safeValue(response, 'data');
+        const data = this.safeValue(response, 'data', {});
         return this.parseTransaction(data, currency);
     }
     parseDepositWithdrawFee(fee, currency = undefined) {
@@ -60535,33 +61565,289 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @returns {object} a list of [fee structures]{@link https://docs.ccxt.com/#/?id=fee-structure}
          */
         await this.loadMarkets();
-        const response = await this.v1PublicGetExchangeInfo(params);
+        const response = await this.spotV1PublicGetExchangeInfo(params);
         const coins = this.safeValue(response, 'coins');
         return this.parseDepositWithdrawFees(coins, codes, 'coin');
     }
+    parseTransfer(transfer, currency = undefined) {
+        //
+        //     fetchTransfers
+        //
+        //     {
+        //         'transferType': 'wallet_to_contract',
+        //         'symbol': 'USDT',
+        //         'amount': 1.0,
+        //         'status': 1,
+        //         'ctime': 1685404575000
+        //     }
+        //
+        //     transfer
+        //
+        //     {}
+        //
+        const transferType = this.safeString(transfer, 'transferType');
+        let fromAccount = undefined;
+        let toAccount = undefined;
+        if (transferType !== undefined) {
+            const accountSplit = transferType.split('_to_');
+            fromAccount = this.safeString(accountSplit, 0);
+            toAccount = this.safeString(accountSplit, 1);
+        }
+        const timestamp = this.safeInteger(transfer, 'ctime');
+        return {
+            'info': transfer,
+            'id': undefined,
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
+            'currency': this.safeString(currency, 'code'),
+            'amount': this.safeNumber(transfer, 'amount'),
+            'fromAccount': fromAccount,
+            'toAccount': toAccount,
+            'status': 'ok',
+        };
+    }
+    async fetchTransfers(code = undefined, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name bitrue#fetchTransfers
+         * @description fetch a history of internal transfers made on an account
+         * @see https://www.bitrue.com/api-docs#get-future-account-transfer-history-list-user_data-hmac-sha256
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#get-future-account-transfer-history-list-user_data-hmac-sha256
+         * @param {string} code unified currency code of the currency transferred
+         * @param {int} [since] the earliest time in ms to fetch transfers for
+         * @param {int} [limit] the maximum number of transfers structures to retrieve
+         * @param {object} [params] extra parameters specific to the bitrue api endpoint
+         * @param {int} [params.until] the latest time in ms to fetch transfers for
+         * @param {string} [params.type] transfer type wallet_to_contract or contract_to_wallet
+         * @returns {object[]} a list of [transfer structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#transfer-structure}
+         */
+        await this.loadMarkets();
+        const type = this.safeString2(params, 'type', 'transferType');
+        const request = {
+            'transferType': type,
+        };
+        let currency = undefined;
+        if (code !== undefined) {
+            currency = this.currency(code);
+            request['coinSymbol'] = currency['id'];
+        }
+        if (since !== undefined) {
+            request['beginTime'] = since;
+        }
+        if (limit !== undefined) {
+            if (limit > 200) {
+                limit = 200;
+            }
+            request['limit'] = limit;
+        }
+        const until = this.safeInteger(params, 'until');
+        if (until !== undefined) {
+            params = this.omit(params, 'until');
+            request['endTime'] = until;
+        }
+        const response = await this.fapiV2PrivateGetFuturesTransferHistory(this.extend(request, params));
+        //
+        //     {
+        //         'code': '0',
+        //         'msg': 'Success',
+        //         'data': [{
+        //             'transferType': 'wallet_to_contract',
+        //             'symbol': 'USDT',
+        //             'amount': 1.0,
+        //             'status': 1,
+        //             'ctime': 1685404575000
+        //         }]
+        //     }
+        //
+        const data = this.safeValue(response, 'data', {});
+        return this.parseTransfers(data, currency, since, limit);
+    }
+    async transfer(code, amount, fromAccount, toAccount, params = {}) {
+        /**
+         * @method
+         * @name bitrue#transfer
+         * @description transfer currency internally between wallets on the same account
+         * @see https://www.bitrue.com/api-docs#new-future-account-transfer-user_data-hmac-sha256
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#user-commission-rate-user_data-hmac-sha256
+         * @param {string} code unified currency code
+         * @param {float} amount amount to transfer
+         * @param {string} fromAccount account to transfer from
+         * @param {string} toAccount account to transfer to
+         * @param {object} [params] extra parameters specific to the bitrue api endpoint
+         * @returns {object} a [transfer structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#transfer-structure}
+         */
+        await this.loadMarkets();
+        const currency = this.currency(code);
+        const accountTypes = this.safeValue(this.options, 'accountsByType', {});
+        const fromId = this.safeString(accountTypes, fromAccount, fromAccount);
+        const toId = this.safeString(accountTypes, toAccount, toAccount);
+        const request = {
+            'coinSymbol': currency['id'],
+            'amount': this.currencyToPrecision(code, amount),
+            'transferType': fromId + '_to_' + toId,
+        };
+        const response = await this.fapiV2PrivatePostFuturesTransfer(this.extend(request, params));
+        //
+        //     {
+        //         'code': '0',
+        //         'msg': 'Success',
+        //         'data': null
+        //     }
+        //
+        const data = this.safeValue(response, 'data', {});
+        return this.parseTransfer(data, currency);
+    }
+    async setLeverage(leverage, symbol = undefined, params = {}) {
+        /**
+         * @method
+         * @name bitrue#setLeverage
+         * @description set the level of leverage for a market
+         * @see https://www.bitrue.com/api-docs#change-initial-leverage-trade-hmac-sha256
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#change-initial-leverage-trade-hmac-sha256
+         * @param {float} leverage the rate of leverage
+         * @param {string} symbol unified market symbol
+         * @param {object} [params] extra parameters specific to the bitrue api endpoint
+         * @returns {object} response from the exchange
+         */
+        if (symbol === undefined) {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ArgumentsRequired(this.id + ' setLeverage() requires a symbol argument');
+        }
+        if ((leverage < 1) || (leverage > 125)) {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.BadRequest(this.id + ' leverage should be between 1 and 125');
+        }
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        let response = undefined;
+        const request = {
+            'contractName': market['id'],
+            'leverage': leverage,
+        };
+        if (!market['swap']) {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' setLeverage only support swap markets');
+        }
+        if (market['linear']) {
+            response = await this.fapiV2PrivatePostLevelEdit(this.extend(request, params));
+        }
+        else if (market['inverse']) {
+            response = await this.dapiV2PrivatePostLevelEdit(this.extend(request, params));
+        }
+        return response;
+    }
+    parseMarginModification(data, market = undefined) {
+        return {
+            'info': data,
+            'type': undefined,
+            'amount': undefined,
+            'code': undefined,
+            'symbol': market['symbol'],
+            'status': undefined,
+        };
+    }
+    async setMargin(symbol, amount, params = {}) {
+        /**
+         * @method
+         * @name bitrue#setMargin
+         * @description Either adds or reduces margin in an isolated position in order to set the margin to a specific value
+         * @see https://www.bitrue.com/api-docs#modify-isolated-position-margin-trade-hmac-sha256
+         * @see https://www.bitrue.com/api_docs_includes_file/delivery.html#modify-isolated-position-margin-trade-hmac-sha256
+         * @param {string} symbol unified market symbol of the market to set margin in
+         * @param {float} amount the amount to set the margin to
+         * @param {object} [params] parameters specific to the bitrue api endpoint
+         * @returns {object} A [margin structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#add-margin-structure}
+         */
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        if (!market['swap']) {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.NotSupported(this.id + ' setMargin only support swap markets');
+        }
+        let response = undefined;
+        const request = {
+            'contractName': market['id'],
+            'amount': this.parseToNumeric(amount),
+        };
+        if (market['linear']) {
+            response = await this.fapiV2PrivatePostPositionMargin(this.extend(request, params));
+        }
+        else if (market['inverse']) {
+            response = await this.dapiV2PrivatePostPositionMargin(this.extend(request, params));
+        }
+        //
+        //     {
+        //         "code": 0,
+        //         "msg": "success"
+        //         "data": null
+        //     }
+        //
+        return this.parseMarginModification(response, market);
+    }
     sign(path, api = 'public', method = 'GET', params = {}, headers = undefined, body = undefined) {
-        const version = this.safeString(api, 0);
-        const access = this.safeString(api, 1);
-        let url = this.urls['api'][version] + '/' + this.implodeParams(path, params);
+        const type = this.safeString(api, 0);
+        const version = this.safeString(api, 1);
+        const access = this.safeString(api, 2);
+        let url = undefined;
+        if (type === 'api' && version === 'kline') {
+            url = this.urls['api'][type];
+        }
+        else {
+            url = this.urls['api'][type] + '/' + version;
+        }
+        url = url + '/' + this.implodeParams(path, params);
         params = this.omit(params, this.extractParams(path));
         if (access === 'private') {
             this.checkRequiredCredentials();
             const recvWindow = this.safeInteger(this.options, 'recvWindow', 5000);
-            let query = this.urlencode(this.extend({
-                'timestamp': this.nonce(),
-                'recvWindow': recvWindow,
-            }, params));
-            const signature = this.hmac(this.encode(query), this.encode(this.secret), _static_dependencies_noble_hashes_sha256_js__WEBPACK_IMPORTED_MODULE_4__/* .sha256 */ .J);
-            query += '&' + 'signature=' + signature;
-            headers = {
-                'X-MBX-APIKEY': this.apiKey,
-            };
-            if ((method === 'GET') || (method === 'DELETE')) {
-                url += '?' + query;
+            if (type === 'spot') {
+                let query = this.urlencode(this.extend({
+                    'timestamp': this.nonce(),
+                    'recvWindow': recvWindow,
+                }, params));
+                const signature = this.hmac(this.encode(query), this.encode(this.secret), _static_dependencies_noble_hashes_sha256_js__WEBPACK_IMPORTED_MODULE_4__/* .sha256 */ .J);
+                query += '&' + 'signature=' + signature;
+                headers = {
+                    'X-MBX-APIKEY': this.apiKey,
+                };
+                if ((method === 'GET') || (method === 'DELETE')) {
+                    url += '?' + query;
+                }
+                else {
+                    body = query;
+                    headers['Content-Type'] = 'application/x-www-form-urlencoded';
+                }
             }
             else {
-                body = query;
-                headers['Content-Type'] = 'application/x-www-form-urlencoded';
+                const timestamp = this.nonce().toString();
+                let signPath = undefined;
+                if (type === 'fapi') {
+                    signPath = '/fapi';
+                }
+                else if (type === 'dapi') {
+                    signPath = '/dapi';
+                }
+                signPath = signPath + '/' + version + '/' + path;
+                let signMessage = timestamp + method + signPath;
+                if (method === 'GET') {
+                    const signature = this.hmac(this.encode(signMessage), this.encode(this.secret), _static_dependencies_noble_hashes_sha256_js__WEBPACK_IMPORTED_MODULE_4__/* .sha256 */ .J);
+                    headers = {
+                        'X-CH-APIKEY': this.apiKey,
+                        'X-CH-SIGN': signature,
+                        'X-CH-TS': timestamp,
+                    };
+                    url += '?' + this.urlencode(params);
+                }
+                else {
+                    const query = this.extend({
+                        'recvWindow': recvWindow,
+                    }, params);
+                    body = this.json(query);
+                    signMessage = signMessage + JSON.stringify(body);
+                    const signature = this.hmac(this.encode(signMessage), this.encode(this.secret), _static_dependencies_noble_hashes_sha256_js__WEBPACK_IMPORTED_MODULE_4__/* .sha256 */ .J);
+                    headers = {
+                        'Content-Type': 'application/json',
+                        'X-CH-APIKEY': this.apiKey,
+                        'X-CH-SIGN': signature,
+                        'X-CH-TS': timestamp,
+                    };
+                }
             }
         }
         else {
@@ -79914,7 +81200,7 @@ class bybit extends _abstract_bybit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"
          * @returns {object[]} a list of [position structure]{@link https://docs.ccxt.com/#/?id=position-structure}
          */
         let symbol = undefined;
-        if (Array.isArray(symbols)) {
+        if ((symbols !== undefined) && Array.isArray(symbols)) {
             const symbolsLength = symbols.length;
             if (symbolsLength > 1) {
                 throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ArgumentsRequired(this.id + ' fetchPositions() does not accept an array with more than one symbol');
@@ -83713,12 +84999,17 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
                     'fiat',
                     // 'vault',
                 ],
+                'v3Accounts': [
+                    'ACCOUNT_TYPE_CRYPTO',
+                    'ACCOUNT_TYPE_FIAT',
+                ],
                 'createMarketBuyOrderRequiresPrice': true,
                 'advanced': true,
                 'fetchMarkets': 'fetchMarketsV3',
                 'fetchTicker': 'fetchTickerV3',
                 'fetchTickers': 'fetchTickersV3',
                 'fetchAccounts': 'fetchAccountsV3',
+                'fetchBalance': 'v2PrivateGetAccounts',
                 'user_native_currency': 'USD', // needed to get fees for v3
             },
         });
@@ -83728,6 +85019,7 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchTime
          * @description fetches the current integer timestamp in milliseconds from the exchange server
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-time#http-request
          * @param {object} [params] extra parameters specific to the coinbase api endpoint
          * @returns {int} the current integer timestamp in milliseconds from the exchange server
          */
@@ -83748,6 +85040,8 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchAccounts
          * @description fetch all the accounts associated with a profile
+         * @see https://docs.cloud.coinbase.com/advanced-trade-api/reference/retailbrokerageapi_getaccounts
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-accounts#list-accounts
          * @param {object} [params] extra parameters specific to the coinbase api endpoint
          * @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)
          * @returns {object} a dictionary of [account structures]{@link https://docs.ccxt.com/#/?id=account-structure} indexed by the account type
@@ -83951,6 +85245,7 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#createDepositAddress
          * @description create a currency deposit address
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-addresses#create-address
          * @param {string} code unified currency code of the currency for the deposit address
          * @param {object} [params] extra parameters specific to the coinbase api endpoint
          * @returns {object} an [address structure]{@link https://docs.ccxt.com/#/?id=address-structure}
@@ -84025,6 +85320,7 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchMySells
          * @description fetch sells
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-sells#list-sells
          * @param {string} symbol not used by coinbase fetchMySells ()
          * @param {int} [since] timestamp in ms of the earliest sell, default is undefined
          * @param {int} [limit] max number of sells to return, default is undefined
@@ -84043,6 +85339,7 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchMyBuys
          * @description fetch buys
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-buys#list-buys
          * @param {string} symbol not used by coinbase fetchMyBuys ()
          * @param {int} [since] timestamp in ms of the earliest buy, default is undefined
          * @param {int} [limit] max number of buys to return, default is undefined
@@ -84068,6 +85365,7 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchWithdrawals
          * @description fetch all withdrawals made from an account
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-withdrawals#list-withdrawals
          * @param {string} code unified currency code
          * @param {int} [since] the earliest time in ms to fetch withdrawals for
          * @param {int} [limit] the maximum number of withdrawals structures to retrieve
@@ -84082,6 +85380,7 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchDeposits
          * @description fetch all deposits made to an account
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-deposits#list-deposits
          * @param {string} code unified currency code
          * @param {int} [since] the earliest time in ms to fetch deposits for
          * @param {int} [limit] the maximum number of deposits structures to retrieve
@@ -84340,6 +85639,8 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchMarkets
          * @see https://docs.cloud.coinbase.com/advanced-trade-api/reference/retailbrokerageapi_getproducts
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-currencies#get-fiat-currencies
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-exchange-rates#get-exchange-rates
          * @description retrieves data on all markets for coinbase
          * @param {object} [params] extra parameters specific to the exchange api endpoint
          * @returns {object[]} an array of objects representing market data
@@ -84563,6 +85864,8 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchCurrencies
          * @description fetches all available currencies on an exchange
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-currencies#get-fiat-currencies
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-exchange-rates#get-exchange-rates
          * @param {object} [params] extra parameters specific to the coinbase api endpoint
          * @returns {object} an associative dictionary of currencies
          */
@@ -84638,6 +85941,8 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchTickers
          * @description fetches price tickers for multiple markets, statistical calculations with the information calculated over the past 24 hours each market
+         * @see https://docs.cloud.coinbase.com/advanced-trade-api/reference/retailbrokerageapi_getproducts
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-exchange-rates#get-exchange-rates
          * @param {string[]|undefined} symbols unified symbols of the markets to fetch the ticker for, all market tickers are returned if not assigned
          * @param {object} [params] extra parameters specific to the coinbase api endpoint
          * @returns {object} a dictionary of [ticker structures]{@link https://docs.ccxt.com/#/?id=ticker-structure}
@@ -84739,6 +86044,10 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchTicker
          * @description fetches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+         * @see https://docs.cloud.coinbase.com/advanced-trade-api/reference/retailbrokerageapi_getmarkettrades
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-prices#get-spot-price
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-prices#get-buy-price
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-prices#get-sell-price
          * @param {string} symbol unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the coinbase api endpoint
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
@@ -84929,8 +86238,9 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
         }, market);
     }
     parseBalance(response, params = {}) {
-        const balances = this.safeValue(response, 'data', []);
+        const balances = this.safeValue2(response, 'data', 'accounts', []);
         const accounts = this.safeValue(params, 'type', this.options['accounts']);
+        const v3Accounts = this.safeValue(params, 'type', this.options['v3Accounts']);
         const result = { 'info': response };
         for (let b = 0; b < balances.length; b++) {
             const balance = balances[b];
@@ -84955,6 +86265,30 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
                     result[code] = account;
                 }
             }
+            else if (this.inArray(type, v3Accounts)) {
+                const available = this.safeValue(balance, 'available_balance');
+                const hold = this.safeValue(balance, 'hold');
+                if (available !== undefined && hold !== undefined) {
+                    const currencyId = this.safeString(available, 'currency');
+                    const code = this.safeCurrencyCode(currencyId);
+                    const used = this.safeString(hold, 'value');
+                    const free = this.safeString(available, 'value');
+                    const total = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringAdd(used, free);
+                    let account = this.safeValue(result, code);
+                    if (account === undefined) {
+                        account = this.account();
+                        account['free'] = free;
+                        account['used'] = used;
+                        account['total'] = total;
+                    }
+                    else {
+                        account['free'] = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringAdd(account['free'], free);
+                        account['used'] = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringAdd(account['used'], used);
+                        account['total'] = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringAdd(account['total'], total);
+                    }
+                    result[code] = account;
+                }
+            }
         }
         return this.safeBalance(result);
     }
@@ -84963,15 +86297,28 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchBalance
          * @description query for balance and get the amount of funds available for trading or funds locked in orders
+         * @see https://docs.cloud.coinbase.com/advanced-trade-api/reference/retailbrokerageapi_getaccounts
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-accounts#list-accounts
          * @param {object} [params] extra parameters specific to the coinbase api endpoint
+         * @param {boolean} [params.v3] default false, set true to use v3 api endpoint
          * @returns {object} a [balance structure]{@link https://docs.ccxt.com/#/?id=balance-structure}
          */
         await this.loadMarkets();
         const request = {
             'limit': 100,
         };
-        const response = await this.v2PrivateGetAccounts(this.extend(request, params));
+        let response = undefined;
+        const isV3 = this.safeValue(params, 'v3', false);
+        params = this.omit(params, 'v3');
+        const method = this.safeString(this.options, 'fetchBalance', 'v3PrivateGetBrokerageAccounts');
+        if ((isV3) || (method === 'v3PrivateGetBrokerageAccounts')) {
+            response = await this.v3PrivateGetBrokerageAccounts(this.extend(request, params));
+        }
+        else {
+            response = await this.v2PrivateGetAccounts(this.extend(request, params));
+        }
         //
+        // v2PrivateGetAccounts
         //     {
         //         "pagination":{
         //             "ending_before":null,
@@ -85011,6 +86358,36 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
         //         ]
         //     }
         //
+        // v3PrivateGetBrokerageAccounts
+        //     {
+        //         "accounts": [
+        //             {
+        //                 "uuid": "11111111-1111-1111-1111-111111111111",
+        //                 "name": "USDC Wallet",
+        //                 "currency": "USDC",
+        //                 "available_balance": {
+        //                     "value": "0.0000000000000000",
+        //                     "currency": "USDC"
+        //                 },
+        //                 "default": true,
+        //                 "active": true,
+        //                 "created_at": "2023-01-04T06:20:06.456Z",
+        //                 "updated_at": "2023-01-04T06:20:07.181Z",
+        //                 "deleted_at": null,
+        //                 "type": "ACCOUNT_TYPE_CRYPTO",
+        //                 "ready": false,
+        //                 "hold": {
+        //                     "value": "0.0000000000000000",
+        //                     "currency": "USDC"
+        //                 }
+        //             },
+        //             ...
+        //         ],
+        //         "has_next": false,
+        //         "cursor": "",
+        //         "size": 9
+        //     }
+        //
         return this.parseBalance(response, params);
     }
     async fetchLedger(code = undefined, since = undefined, limit = undefined, params = {}) {
@@ -85018,6 +86395,7 @@ class coinbase extends _abstract_coinbase_js__WEBPACK_IMPORTED_MODULE_0__/* ["de
          * @method
          * @name coinbase#fetchLedger
          * @description fetch the history of changes, actions done by the user or operations that altered balance of the user
+         * @see https://docs.cloud.coinbase.com/sign-in-with-coinbase/docs/api-transactions#list-transactions
          * @param {string} code unified currency code, default is undefined
          * @param {int} [since] timestamp in ms of the earliest ledger entry, default is undefined
          * @param {int} [limit] max number of ledger entrys to return, default is undefined
@@ -119723,7 +121101,6 @@ class gate extends _abstract_gate_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
                 'future': true,
                 'option': true,
                 'addMargin': true,
-                'borrowMargin': true,
                 'cancelAllOrders': true,
                 'cancelOrder': true,
                 'createMarketOrder': true,
@@ -119788,7 +121165,6 @@ class gate extends _abstract_gate_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
                 'fetchVolatilityHistory': false,
                 'fetchWithdrawals': true,
                 'reduceMargin': true,
-                'repayMargin': true,
                 'setLeverage': true,
                 'setMarginMode': false,
                 'setPositionMode': true,
@@ -124577,7 +125953,7 @@ class gate extends _abstract_gate_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
             params = this.omit(params, 'symbol');
         }
         if ((toId === 'futures') || (toId === 'delivery') || (fromId === 'futures') || (fromId === 'delivery')) {
-            request['settle'] = currency['lowerCaseId'];
+            request['settle'] = currency['id'];
         }
         const response = await this.privateWalletPostTransfers(this.extend(request, params));
         //
@@ -125213,220 +126589,6 @@ class gate extends _abstract_gate_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
         }
         return tiers;
     }
-    async repayMargin(code, amount, symbol = undefined, params = {}) {
-        /**
-         * @method
-         * @name gate#repayMargin
-         * @description repay borrowed margin and interest
-         * @see https://www.gate.io/docs/apiv4/en/#repay-cross-margin-loan
-         * @see https://www.gate.io/docs/apiv4/en/#repay-a-loan
-         * @param {string} code unified currency code of the currency to repay
-         * @param {float} amount the amount to repay
-         * @param {string} symbol unified market symbol, required for isolated margin
-         * @param {object} [params] extra parameters specific to the gate api endpoint
-         * @param {string} [params.mode] 'all' or 'partial' payment mode, extra parameter required for isolated margin
-         * @param {string} [params.id] '34267567' loan id, extra parameter required for isolated margin
-         * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
-         */
-        const marginMode = this.safeString(params, 'marginMode'); // cross or isolated
-        params = this.omit(params, 'marginMode');
-        this.checkRequiredMarginArgument('repayMargin', symbol, marginMode);
-        await this.loadMarkets();
-        const currency = this.currency(code);
-        const request = {
-            'currency': currency['id'],
-            'amount': this.currencyToPrecision(code, amount),
-        };
-        let response = undefined;
-        params = this.omit(params, ['marginMode']);
-        if (symbol === undefined) {
-            response = await this.privateMarginPostCrossRepayments(this.extend(request, params));
-        }
-        else {
-            const market = this.market(symbol);
-            request['currency_pair'] = market['id'];
-            request['mode'] = 'partial';
-            const loanId = this.safeString2(params, 'loan_id', 'id');
-            if (loanId === undefined) {
-                throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ArgumentsRequired(this.id + ' repayMargin() requires loan_id param for isolated margin');
-            }
-            request['loan_id'] = loanId;
-            params = this.omit(params, ['loan_id', 'id']);
-            response = await this.privateMarginPostLoansLoanIdRepayment(this.extend(request, params));
-        }
-        //
-        // Cross
-        //
-        //     [
-        //         {
-        //             "id": "17",
-        //             "create_time": 1620381696159,
-        //             "update_time": 1620381696159,
-        //             "currency": "EOS",
-        //             "amount": "110.553635",
-        //             "text": "web",
-        //             "status": 2,
-        //             "repaid": "110.506649705159",
-        //             "repaid_interest": "0.046985294841",
-        //             "unpaid_interest": "0.0000074393366667"
-        //         }
-        //     ]
-        //
-        // Isolated
-        //
-        //     {
-        //         "id": "34267567",
-        //         "create_time": "1656394778",
-        //         "expire_time": "1657258778",
-        //         "status": "finished",
-        //         "side": "borrow",
-        //         "currency": "USDT",
-        //         "rate": "0.0002",
-        //         "amount": "100",
-        //         "days": 10,
-        //         "auto_renew": false,
-        //         "currency_pair": "LTC_USDT",
-        //         "left": "0",
-        //         "repaid": "100",
-        //         "paid_interest": "0.003333333333",
-        //         "unpaid_interest": "0"
-        //     }
-        //
-        if (marginMode === 'cross') {
-            response = response[0];
-        }
-        return this.parseMarginLoan(response, currency);
-    }
-    async borrowMargin(code, amount, symbol = undefined, params = {}) {
-        /**
-         * @method
-         * @name gate#borrowMargin
-         * @description create a loan to borrow margin
-         * @see https://www.gate.io/docs/apiv4/en/#create-a-cross-margin-borrow-loan
-         * @see https://www.gate.io/docs/apiv4/en/#lend-or-borrow
-         * @param {string} code unified currency code of the currency to borrow
-         * @param {float} amount the amount to borrow
-         * @param {string} symbol unified market symbol, required for isolated margin
-         * @param {object} [params] extra parameters specific to the gate api endpoint
-         * @param {string} [params.rate] '0.0002' or '0.002' extra parameter required for isolated margin
-         * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
-         */
-        const marginMode = this.safeString(params, 'marginMode'); // cross or isolated
-        params = this.omit(params, 'marginMode');
-        this.checkRequiredMarginArgument('borrowMargin', symbol, marginMode);
-        await this.loadMarkets();
-        const currency = this.currency(code);
-        const request = {
-            'currency': currency['id'],
-            'amount': this.currencyToPrecision(code, amount),
-        };
-        let response = undefined;
-        if (symbol === undefined) {
-            response = await this.privateMarginPostCrossLoans(this.extend(request, params));
-        }
-        else {
-            const market = this.market(symbol);
-            request['currency_pair'] = market['id'];
-            request['side'] = 'borrow';
-            // default it to 0.01% since this is a reasonable limit
-            // as it is the smallest tick size currently offered by gateio
-            request['rate'] = this.safeString(params, 'rate', '0.0001');
-            request['auto_renew'] = true;
-            params = this.omit(params, ['rate']);
-            response = await this.privateMarginPostLoans(this.extend(request, params));
-        }
-        //
-        // Cross
-        //
-        //     {
-        //         "id": "17",
-        //         "create_time": 1620381696159,
-        //         "update_time": 1620381696159,
-        //         "currency": "EOS",
-        //         "amount": "110.553635",
-        //         "text": "web",
-        //         "status": 2,
-        //         "repaid": "110.506649705159",
-        //         "repaid_interest": "0.046985294841",
-        //         "unpaid_interest": "0.0000074393366667"
-        //     }
-        //
-        // Isolated
-        //
-        //     {
-        //         "id": "34267567",
-        //         "create_time": "1656394778",
-        //         "expire_time": "1657258778",
-        //         "status": "loaned",
-        //         "side": "borrow",
-        //         "currency": "USDT",
-        //         "rate": "0.0002",
-        //         "amount": "100",
-        //         "days": 10,
-        //         "auto_renew": false,
-        //         "currency_pair": "LTC_USDT",
-        //         "left": "0",
-        //         "repaid": "0",
-        //         "paid_interest": "0",
-        //         "unpaid_interest": "0.003333333333"
-        //     }
-        //
-        return this.parseMarginLoan(response, currency);
-    }
-    parseMarginLoan(info, currency = undefined) {
-        //
-        // Cross
-        //
-        //     {
-        //         "id": "17",
-        //         "create_time": 1620381696159,
-        //         "update_time": 1620381696159,
-        //         "currency": "EOS",
-        //         "amount": "110.553635",
-        //         "text": "web",
-        //         "status": 2,
-        //         "repaid": "110.506649705159",
-        //         "repaid_interest": "0.046985294841",
-        //         "unpaid_interest": "0.0000074393366667"
-        //     }
-        //
-        // Isolated
-        //
-        //     {
-        //         "id": "34267567",
-        //         "create_time": "1656394778",
-        //         "expire_time": "1657258778",
-        //         "status": "loaned",
-        //         "side": "borrow",
-        //         "currency": "USDT",
-        //         "rate": "0.0002",
-        //         "amount": "100",
-        //         "days": 10,
-        //         "auto_renew": false,
-        //         "currency_pair": "LTC_USDT",
-        //         "left": "0",
-        //         "repaid": "0",
-        //         "paid_interest": "0",
-        //         "unpaid_interest": "0.003333333333"
-        //     }
-        //
-        const marginMode = this.safeString2(this.options, 'defaultMarginMode', 'marginMode', 'cross');
-        let timestamp = this.safeInteger(info, 'create_time');
-        if (marginMode === 'isolated') {
-            timestamp = this.safeTimestamp(info, 'create_time');
-        }
-        const currencyId = this.safeString(info, 'currency');
-        const marketId = this.safeString(info, 'currency_pair');
-        return {
-            'id': this.safeInteger(info, 'id'),
-            'currency': this.safeCurrencyCode(currencyId, currency),
-            'amount': this.safeNumber(info, 'amount'),
-            'symbol': this.safeSymbol(marketId, undefined, '_', 'margin'),
-            'timestamp': timestamp,
-            'datetime': this.iso8601(timestamp),
-            'info': info,
-        };
-    }
     sign(path, api = [], method = 'GET', params = {}, headers = undefined, body = undefined) {
         const authentication = api[0]; // public, private
         const type = api[1]; // spot, margin, future, delivery
@@ -137411,7 +138573,13 @@ class htx extends _abstract_htx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         if (limit !== undefined) {
             request['size'] = limit;
         }
-        const response = await this[method](this.extend(request, params));
+        let response = undefined;
+        if (method === 'spot_private_get_v1_order_orders') {
+            response = await this.spotPrivateGetV1OrderOrders(this.extend(request, params));
+        }
+        else {
+            response = await this.spotPrivateGetV1OrderHistory(this.extend(request, params));
+        }
         //
         // spot_private_get_v1_order_orders GET /v1/order/orders
         //
@@ -159891,7 +161059,7 @@ class kuna extends _abstract_kuna_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
                 'fetchPosition': false,
                 'fetchPositionMode': false,
                 'fetchPositions': false,
-                'fetchPositionsBySymbol': false,
+                'fetchPositionsForSymbol': false,
                 'fetchPositionsRisk': false,
                 'fetchPremiumIndexOHLCV': false,
                 'fetchTicker': true,
@@ -160769,7 +161937,7 @@ class kuna extends _abstract_kuna_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
         const request = {
             'pair': market['id'],
             'orderSide': (side === 'buy') ? 'Bid' : 'Ask',
-            'quantity': amount.toString(),
+            'quantity': this.numberToString(amount),
             'type': capitalizedType,
         };
         if (capitalizedType === 'Limit') {
@@ -161635,7 +162803,8 @@ class kuna extends _abstract_kuna_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"]
         let url = undefined;
         if (Array.isArray(api)) {
             const isGet = method === 'GET';
-            const [version, access] = api;
+            const version = this.safeString(api, 0);
+            const access = this.safeString(api, 1);
             if (version === 'v3') {
                 url = this.urls['api'][version] + '/' + version + '/' + this.implodeParams(path, params);
                 if (access === 'public') {
@@ -189365,7 +190534,7 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          * @method
          * @name okx#borrowCrossMargin
          * @description create a loan to borrow margin (need to be VIP 5 and above)
-         * @see https://www.okx.com/docs-v5/en/#rest-api-account-vip-loans-borrow-and-repay
+         * @see https://www.okx.com/docs-v5/en/#trading-account-rest-api-vip-loans-borrow-and-repay
          * @param {string} code unified currency code of the currency to borrow
          * @param {float} amount the amount to borrow
          * @param {object} [params] extra parameters specific to the okx api endpoint
@@ -189385,12 +190554,10 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         //         "data": [
         //             {
         //                 "amt": "102",
-        //                 "availLoan": "97",
         //                 "ccy": "USDT",
-        //                 "loanQuota": "6000000",
-        //                 "posLoan": "0",
+        //                 "ordId": "544199684697214976",
         //                 "side": "borrow",
-        //                 "usedLoan": "97"
+        //                 "state": "1"
         //             }
         //         ],
         //         "msg": ""
@@ -189405,18 +190572,25 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
          * @method
          * @name okx#repayCrossMargin
          * @description repay borrowed margin and interest
-         * @see https://www.okx.com/docs-v5/en/#rest-api-account-vip-loans-borrow-and-repay
+         * @see https://www.okx.com/docs-v5/en/#trading-account-rest-api-vip-loans-borrow-and-repay
          * @param {string} code unified currency code of the currency to repay
          * @param {float} amount the amount to repay
          * @param {object} [params] extra parameters specific to the okx api endpoint
+         * @param {string} [params.id] the order ID of borrowing, it is necessary while repaying
          * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
          */
         await this.loadMarkets();
+        const id = this.safeString2(params, 'id', 'ordId');
+        params = this.omit(params, 'id');
+        if (id === undefined) {
+            throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_1__.ArgumentsRequired(this.id + ' repayCrossMargin() requires an id parameter');
+        }
         const currency = this.currency(code);
         const request = {
             'ccy': currency['id'],
             'amt': this.currencyToPrecision(code, amount),
             'side': 'repay',
+            'ordId': id,
         };
         const response = await this.privatePostAccountBorrowRepay(this.extend(request, params));
         //
@@ -189425,12 +190599,10 @@ class okx extends _abstract_okx_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
         //         "data": [
         //             {
         //                 "amt": "102",
-        //                 "availLoan": "97",
         //                 "ccy": "USDT",
-        //                 "loanQuota": "6000000",
-        //                 "posLoan": "0",
+        //                 "ordId": "544199684697214976",
         //                 "side": "repay",
-        //                 "usedLoan": "97"
+        //                 "state": "1"
         //             }
         //         ],
         //         "msg": ""
@@ -190136,7 +191308,7 @@ class p2b extends _abstract_p2b_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */
                 'fetchPermissions': false,
                 'fetchPosition': false,
                 'fetchPositions': false,
-                'fetchPositionsBySymbol': false,
+                'fetchPositionsForSymbol': false,
                 'fetchPositionsRisk': false,
                 'fetchPremiumIndexOHLCV': false,
                 'fetchTicker': true,
@@ -218715,7 +219887,7 @@ class bybit extends _bybit_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
             'args': topics,
         };
         const message = this.extend(request, params);
-        return await this.watch(url, messageHash, message, subscriptionHash);
+        return await this.watch(url, messageHash, message, messageHash, subscriptionHash);
     }
     async authenticate(url, params = {}) {
         this.checkRequiredCredentials();
@@ -285910,7 +287082,7 @@ SOFTWARE.
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.1.60';
+const version = '4.1.62';
 _src_base_Exchange_js__WEBPACK_IMPORTED_MODULE_0__/* .Exchange */ .e.ccxtVersion = version;
 //-----------------------------------------------------------------------------