ccxt 4.1.61 → 4.1.63

package/dist/ccxt.browser.js

@@ -2550,7 +2550,7 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                 'createOrder': true,
                 'fetchBalance': true,
                 'fetchBidsAsks': false,
-                'fetchClosedOrders': false,
+                'fetchClosedOrders': true,
                 'fetchCurrencies': false,
                 'fetchDepositAddress': false,
                 'fetchDepositAddressesByNetwork': false,
@@ -2568,12 +2568,12 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
                 'fetchOpenOrders': true,
                 'fetchOrder': true,
                 'fetchOrderBook': true,
-                'fetchOrders': false,
+                'fetchOrders': true,
                 'fetchPositions': false,
                 'fetchStatus': false,
                 'fetchTicker': false,
                 'fetchTickers': false,
-                'fetchTime': false,
+                'fetchTime': true,
                 'fetchTrades': true,
                 'fetchTradingFee': false,
                 'fetchTradingFees': false,
@@ -2761,42 +2761,90 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
             },
         });
     }
+    async fetchTime(params = {}) {
+        /**
+         * @method
+         * @name alpaca#fetchTime
+         * @description fetches the current integer timestamp in milliseconds from the exchange server
+         * @param {object} [params] extra parameters specific to the alpaca api endpoint
+         * @returns {int} the current integer timestamp in milliseconds from the exchange server
+         */
+        const response = await this.traderPrivateGetV2Clock(params);
+        //
+        //     {
+        //         timestamp: '2023-11-22T08:07:57.654738097-05:00',
+        //         is_open: false,
+        //         next_open: '2023-11-22T09:30:00-05:00',
+        //         next_close: '2023-11-22T16:00:00-05:00'
+        //     }
+        //
+        const timestamp = this.safeString(response, 'timestamp');
+        const localTime = timestamp.slice(0, 23);
+        const jetlagStrStart = timestamp.length - 6;
+        const jetlagStrEnd = timestamp.length - 3;
+        const jetlag = timestamp.slice(jetlagStrStart, jetlagStrEnd);
+        const iso = this.parse8601(localTime) - this.parseToNumeric(jetlag) * 3600 * 1000;
+        return iso;
+    }
     async fetchMarkets(params = {}) {
         /**
          * @method
          * @name alpaca#fetchMarkets
          * @description retrieves data on all markets for alpaca
+         * @see https://docs.alpaca.markets/reference/get-v2-assets
          * @param {object} [params] extra parameters specific to the exchange api endpoint
          * @returns {object[]} an array of objects representing market data
          */
         const request = {
             'asset_class': 'crypto',
-            'tradeable': true,
+            'status': 'active',
         };
         const assets = await this.traderPrivateGetV2Assets(this.extend(request, params));
         //
-        //    [
-        //        {
-        //           "id":"a3ba8ac0-166d-460b-b17a-1f035622dd47",
-        //           "class":"crypto",
-        //           "exchange":"FTXU",
-        //           "symbol":"DOGEUSD",
-        //           "name":"Dogecoin",
-        //           "status":"active",
-        //           "tradable":true,
-        //           "marginable":false,
-        //           "shortable":false,
-        //           "easy_to_borrow":false,
-        //           "fractionable":true,
-        //           "min_order_size":"1",
-        //           "min_trade_increment":"1",
-        //           "price_increment":"0.0000005"
-        //        }
-        //    ]
+        //     [
+        //         {
+        //             "id": "c150e086-1e75-44e6-9c2c-093bb1e93139",
+        //             "class": "crypto",
+        //             "exchange": "CRYPTO",
+        //             "symbol": "BTC/USDT",
+        //             "name": "Bitcoin / USD Tether",
+        //             "status": "active",
+        //             "tradable": true,
+        //             "marginable": false,
+        //             "maintenance_margin_requirement": 100,
+        //             "shortable": false,
+        //             "easy_to_borrow": false,
+        //             "fractionable": true,
+        //             "attributes": [],
+        //             "min_order_size": "0.000026873",
+        //             "min_trade_increment": "0.000000001",
+        //             "price_increment": "1"
+        //         }
+        //     ]
         //
         return this.parseMarkets(assets);
     }
     parseMarket(asset) {
+        //
+        //     {
+        //         "id": "c150e086-1e75-44e6-9c2c-093bb1e93139",
+        //         "class": "crypto",
+        //         "exchange": "CRYPTO",
+        //         "symbol": "BTC/USDT",
+        //         "name": "Bitcoin / USD Tether",
+        //         "status": "active",
+        //         "tradable": true,
+        //         "marginable": false,
+        //         "maintenance_margin_requirement": 100,
+        //         "shortable": false,
+        //         "easy_to_borrow": false,
+        //         "fractionable": true,
+        //         "attributes": [],
+        //         "min_order_size": "0.000026873",
+        //         "min_trade_increment": "0.000000001",
+        //         "price_increment": "1"
+        //     }
+        //
         const marketId = this.safeString(asset, 'symbol');
         const parts = marketId.split('/');
         const baseId = this.safeString(parts, 0);
@@ -2936,21 +2984,17 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         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
-        // @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
-        //
+        /**
+         * @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
+         * @param {string} [params.loc] crypto location, default: us
+         * @returns {object} A dictionary of [order book structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-book-structure} indexed by market symbols
+        */
         await this.loadMarkets();
         const market = this.market(symbol);
         const id = market['id'];
@@ -3125,6 +3169,7 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name alpaca#createOrder
          * @description create a trade order
+         * @see https://docs.alpaca.markets/reference/postorder
          * @param {string} symbol unified symbol of the market to create an order in
          * @param {string} type 'market', 'limit' or 'stop_limit'
          * @param {string} side 'buy' or 'sell'
@@ -3213,6 +3258,7 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
          * @method
          * @name alpaca#cancelOrder
          * @description cancels an open order
+         * @see https://docs.alpaca.markets/reference/deleteorderbyorderid
          * @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 alpaca api endpoint
@@ -3230,11 +3276,31 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //
         return this.safeValue(response, 'message', {});
     }
+    async cancelAllOrders(symbol = undefined, params = {}) {
+        /**
+         * @method
+         * @name alpaca#cancelAllOrders
+         * @description cancel all open orders in a market
+         * @see https://docs.alpaca.markets/reference/deleteallorders
+         * @param {string} symbol alpaca cancelAllOrders cannot setting symbol, it will cancel all open orders
+         * @param {object} [params] extra parameters specific to the alpaca api endpoint
+         * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
+         */
+        await this.loadMarkets();
+        const response = await this.traderPrivateDeleteV2Orders(params);
+        if (Array.isArray(response)) {
+            return this.parseOrders(response, undefined);
+        }
+        else {
+            return response;
+        }
+    }
     async fetchOrder(id, symbol = undefined, params = {}) {
         /**
          * @method
          * @name alpaca#fetchOrder
          * @description fetches information on an order made by the user
+         * @see https://docs.alpaca.markets/reference/getorderbyorderid
          * @param {string} symbol unified symbol of the market the order was made in
          * @param {object} [params] extra parameters specific to the alpaca api endpoint
          * @returns {object} An [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
@@ -3248,24 +3314,117 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         const market = this.safeMarket(marketId);
         return this.parseOrder(order, market);
     }
-    async fetchOpenOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
+    async fetchOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
         /**
          * @method
-         * @name alpaca#fetchOpenOrders
-         * @description fetch all unfilled currently open orders
-         * @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 orders structures to retrieve
+         * @name alpaca#fetchOrders
+         * @description fetches information on multiple orders made by the user
+         * @see https://docs.alpaca.markets/reference/getallorders
+         * @param {string} symbol unified market symbol of the market orders were made in
+         * @param {int} [since] the earliest time in ms to fetch orders for
+         * @param {int} [limit] the maximum number of order structures to retrieve
          * @param {object} [params] extra parameters specific to the alpaca api endpoint
+         * @param {int} [params.until] the latest time in ms to fetch orders for
          * @returns {Order[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
+        const request = {
+            'status': 'all',
+        };
         let market = undefined;
         if (symbol !== undefined) {
             market = this.market(symbol);
+            request['symbols'] = market['id'];
         }
-        const orders = await this.traderPrivateGetV2Orders(params);
-        return this.parseOrders(orders, market, since, limit);
+        const until = this.safeInteger(params, 'until');
+        if (until !== undefined) {
+            params = this.omit(params, 'until');
+            request['endTime'] = until;
+        }
+        if (since !== undefined) {
+            request['after'] = since;
+        }
+        if (limit !== undefined) {
+            request['limit'] = limit;
+        }
+        const response = await this.traderPrivateGetV2Orders(this.extend(request, params));
+        //
+        //     [
+        //         {
+        //           "id": "cbaf12d7-69b8-49c0-a31b-b46af35c755c",
+        //           "client_order_id": "ccxt_b36156ae6fd44d098ac9c179bab33efd",
+        //           "created_at": "2023-11-17T04:21:42.234579Z",
+        //           "updated_at": "2023-11-17T04:22:34.442765Z",
+        //           "submitted_at": "2023-11-17T04:21:42.233357Z",
+        //           "filled_at": null,
+        //           "expired_at": null,
+        //           "canceled_at": "2023-11-17T04:22:34.399019Z",
+        //           "failed_at": null,
+        //           "replaced_at": null,
+        //           "replaced_by": null,
+        //           "replaces": null,
+        //           "asset_id": "77c6f47f-0939-4b23-b41e-47b4469c4bc8",
+        //           "symbol": "LTC/USDT",
+        //           "asset_class": "crypto",
+        //           "notional": null,
+        //           "qty": "0.001",
+        //           "filled_qty": "0",
+        //           "filled_avg_price": null,
+        //           "order_class": "",
+        //           "order_type": "limit",
+        //           "type": "limit",
+        //           "side": "sell",
+        //           "time_in_force": "gtc",
+        //           "limit_price": "1000",
+        //           "stop_price": null,
+        //           "status": "canceled",
+        //           "extended_hours": false,
+        //           "legs": null,
+        //           "trail_percent": null,
+        //           "trail_price": null,
+        //           "hwm": null,
+        //           "subtag": null,
+        //           "source": "access_key"
+        //         }
+        //     ]
+        //
+        return this.parseOrders(response, market, since, limit);
+    }
+    async fetchOpenOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name alpaca#fetchOpenOrders
+         * @description fetch all unfilled currently open orders
+         * @see https://docs.alpaca.markets/reference/getallorders
+         * @param {string} symbol unified market symbol of the market orders were made in
+         * @param {int} [since] the earliest time in ms to fetch orders for
+         * @param {int} [limit] the maximum number of order structures to retrieve
+         * @param {object} [params] extra parameters specific to the alpaca api endpoint
+         * @param {int} [params.until] the latest time in ms to fetch orders for
+         * @returns {Order[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
+         */
+        const request = {
+            'status': 'open',
+        };
+        return await this.fetchOrders(symbol, since, limit, this.extend(request, params));
+    }
+    async fetchClosedOrders(symbol = undefined, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name alpaca#fetchClosedOrders
+         * @description fetches information on multiple closed orders made by the user
+         * @see https://docs.alpaca.markets/reference/getallorders
+         * @param {string} symbol unified market symbol of the market orders were made in
+         * @param {int} [since] the earliest time in ms to fetch orders for
+         * @param {int} [limit] the maximum number of order structures to retrieve
+         * @param {object} [params] extra parameters specific to the alpaca api endpoint
+         * @param {int} [params.until] the latest time in ms to fetch orders for
+         * @returns {Order[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
+         */
+        const request = {
+            'status': 'closed',
+        };
+        return await this.fetchOrders(symbol, since, limit, this.extend(request, params));
     }
     parseOrder(order, market = undefined) {
         //
@@ -3320,9 +3479,11 @@ class alpaca extends _abstract_alpaca_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
             };
         }
         let orderType = this.safeString(order, 'order_type');
-        if (orderType.indexOf('limit') >= 0) {
-            // might be limit or stop-limit
-            orderType = 'limit';
+        if (orderType !== undefined) {
+            if (orderType.indexOf('limit') >= 0) {
+                // might be limit or stop-limit
+                orderType = 'limit';
+            }
         }
         const datetime = this.safeString(order, 'submitted_at');
         const timestamp = this.parse8601(datetime);
@@ -8725,11 +8886,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)) {
@@ -9014,11 +9177,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;
@@ -17539,7 +17704,7 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
                         'cm/income': 30,
                         'um/account': 5,
                         'cm/account': 5,
-                        'portfolio/repay-futures-switch': 3,
+                        'repay-futures-switch': 3,
                         'um/adlQuantile': 5,
                         'cm/adlQuantile': 5,
                     },
@@ -17558,8 +17723,8 @@ class binance extends _abstract_binance_js__WEBPACK_IMPORTED_MODULE_0__/* ["defa
                         'cm/positionSide/dual': 1,
                         'auto-collection': 0.6667,
                         'bnb-transfer': 0.6667,
-                        'portfolio/repay-futures-switch': 150,
-                        'portfolio/repay-futures-negative-balance': 150,
+                        'repay-futures-switch': 150,
+                        'repay-futures-negative-balance': 150,
                         'listenKey': 1,
                         'asset-collection': 3,
                     },
@@ -58733,10 +58898,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,
@@ -58775,9 +58940,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': {
@@ -58794,66 +58961,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,
+                            },
                         },
                     },
                 },
@@ -58939,6 +59182,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,
@@ -58954,6 +59203,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',
@@ -58997,6 +59279,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,
@@ -59006,12 +59289,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,
@@ -59033,9 +59319,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) {
@@ -59053,10 +59336,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.
         //
@@ -59078,10 +59362,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
@@ -59168,7 +59453,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",
@@ -59293,10 +59578,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",
@@ -59338,19 +59651,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');
@@ -59360,27 +59724,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,
@@ -59396,14 +59769,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,
                 },
             },
@@ -59412,18 +59785,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;
@@ -59435,35 +59854,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
@@ -59471,13 +59977,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,
@@ -59493,7 +60027,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;
     }
@@ -59512,39 +60055,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);
@@ -59554,52 +60114,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
@@ -59609,14 +60204,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",
@@ -59634,10 +60269,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",
@@ -59649,13 +60298,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 = {}) {
@@ -59664,20 +60328,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",
@@ -59685,6 +60369,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);
@@ -59694,65 +60392,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,
@@ -59763,7 +60498,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         "isBestMatch": true
         //     }
         //
-        // private trades
+        // fetchTrades - spot
         //
         //     {
         //         "symbol":"USDCUSDT",
@@ -59780,14 +60515,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');
@@ -59800,12 +60553,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';
         }
@@ -59830,6 +60583,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
@@ -59838,41 +60592,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
         //
         //     [
         //         {
@@ -59889,6 +60624,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',
@@ -59901,7 +60638,7 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
     }
     parseOrder(order, market = undefined) {
         //
-        // createOrder
+        // createOrder - spot
         //
         //     {
         //         "symbol":"USDCUSDT",
@@ -59910,7 +60647,13 @@ class bitrue extends _abstract_bitrue_js__WEBPACK_IMPORTED_MODULE_0__/* ["defaul
         //         "transactTime":1635551031276
         //     }
         //
-        // fetchOpenOrders
+        // createOrder - future
+        //
+        //     {
+        //         "orderId":1690615676032452985,
+        //     }
+        //
+        // fetchOrders - spot
         //
         //     {
         //         "symbol":"USDCUSDT",
@@ -59931,7 +60674,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');
@@ -59966,7 +60726,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';
         }
@@ -60002,16 +60762,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]
@@ -60019,54 +60784,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', {});
         }
-        const response = await this.v1PrivatePostOrder(this.extend(request, params));
+        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');
+        }
+        //
+        // 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}
@@ -60076,25 +60912,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
@@ -60106,6 +61009,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
@@ -60119,7 +61025,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));
         //
         //     [
         //         {
@@ -60149,6 +61055,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
@@ -60160,10 +61069,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
         //
         //     [
         //         {
@@ -60186,13 +61114,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
@@ -60204,20 +61157,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', {});
+        }
+        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');
         }
-        const query = this.omit(params, ['type', 'origClientOrderId', 'clientOrderId']);
-        const response = await this.v1PrivateDeleteOrder(this.extend(request, query));
+        //
+        // spot
         //
         //     {
         //         "symbol": "LTCBTC",
@@ -60226,43 +61200,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
         //
         //     [
         //         {
@@ -60281,13 +61323,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
@@ -60314,7 +61382,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,
@@ -60359,6 +61427,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
@@ -60385,7 +61454,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,
@@ -60549,6 +61618,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
@@ -60585,7 +61655,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,
@@ -60601,7 +61671,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) {
@@ -60656,33 +61726,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 {
@@ -119936,7 +121262,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,
@@ -120001,7 +121326,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,
@@ -125426,220 +126750,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
@@ -157718,12 +158828,6 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
                     'futuresPublic': 'https://api-futures.kucoin.com',
                     'webExchange': 'https://futures.kucoin.com/_api/web-front',
                 },
-                'test': {
-                    'public': 'https://openapi-sandbox.kucoin.com',
-                    'private': 'https://openapi-sandbox.kucoin.com',
-                    'futuresPrivate': 'https://api-sandbox-futures.kucoin.com',
-                    'futuresPublic': 'https://api-sandbox-futures.kucoin.com',
-                },
             },
             'requiredCredentials': {
                 'apiKey': true,
@@ -157948,6 +159052,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchStatus
          * @description the latest known information on the availability of the exchange API
+         * @see https://www.kucoin.com/docs/rest/futures-trading/market-data/get-service-status
          * @param {object} [params] extra parameters specific to the kucoinfutures api endpoint
          * @returns {object} a [status structure]{@link https://docs.ccxt.com/#/?id=exchange-status-structure}
          */
@@ -157976,6 +159081,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchMarkets
          * @description retrieves data on all markets for kucoinfutures
+         * @see https://www.kucoin.com/docs/rest/futures-trading/market-data/get-symbols-list
          * @param {object} [params] extra parameters specific to the exchange api endpoint
          * @returns {object[]} an array of objects representing market data
          */
@@ -158140,6 +159246,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchTime
          * @description fetches the current integer timestamp in milliseconds from the exchange server
+         * @see https://www.kucoin.com/docs/rest/futures-trading/market-data/get-server-time
          * @param {object} [params] extra parameters specific to the kucoinfutures api endpoint
          * @returns {int} the current integer timestamp in milliseconds from the exchange server
          */
@@ -158157,6 +159264,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchOHLCV
          * @description fetches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+         * @see https://www.kucoin.com/docs/rest/futures-trading/market-data/get-klines
          * @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
@@ -158237,6 +159345,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchDepositAddress
          * @description fetch the deposit address for a currency associated with this account
+         * @see https://www.kucoin.com/docs/rest/funding/deposit/get-deposit-address
          * @param {string} code unified currency code
          * @param {object} [params] extra parameters specific to the kucoinfutures api endpoint
          * @returns {object} an [address structure]{@link https://docs.ccxt.com/#/?id=address-structure}
@@ -158276,6 +159385,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchOrderBook
          * @description fetches information on open orders with bid (buy) and ask (sell) prices, volumes and other data
+         * @see https://www.kucoin.com/docs/rest/futures-trading/market-data/get-part-order-book-level-2
          * @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 kucoinfutures api endpoint
@@ -158334,6 +159444,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchTicker
          * @description fetches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+         * @see https://www.kucoin.com/docs/rest/futures-trading/market-data/get-ticker
          * @param {string} symbol unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the kucoinfutures api endpoint
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
@@ -158415,6 +159526,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchFundingHistory
          * @description fetch the history of funding payments paid and received on this account
+         * @see https://www.kucoin.com/docs/rest/futures-trading/funding-fees/get-funding-history
          * @param {string} symbol unified market symbol
          * @param {int} [since] the earliest time in ms to fetch funding history for
          * @param {int} [limit] the maximum number of funding history structures to retrieve
@@ -158851,6 +159963,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#cancelOrder
          * @description cancels an open order
+         * @see https://www.kucoin.com/docs/rest/futures-trading/orders/cancel-futures-order-by-orderid
          * @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 kucoinfutures api endpoint
@@ -158878,6 +159991,8 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#cancelAllOrders
          * @description cancel all open orders
+         * @see https://www.kucoin.com/docs/rest/futures-trading/orders/cancel-multiple-futures-limit-orders
+         * @see https://www.kucoin.com/docs/rest/futures-trading/orders/cancel-multiple-futures-stop-orders
          * @param {string} symbol unified market symbol, only orders in the market of this symbol are cancelled when symbol is not undefined
          * @param {object} [params] extra parameters specific to the kucoinfutures api endpoint
          * @param {object} [params.stop] When true, all the trigger orders will be cancelled
@@ -158889,8 +160004,14 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
             request['symbol'] = this.marketId(symbol);
         }
         const stop = this.safeValue(params, 'stop');
-        const method = stop ? 'futuresPrivateDeleteStopOrders' : 'futuresPrivateDeleteOrders';
-        const response = await this[method](this.extend(request, params));
+        params = this.omit(params, 'stop');
+        let response = undefined;
+        if (stop) {
+            response = await this.futuresPrivateDeleteStopOrders(this.extend(request, params));
+        }
+        else {
+            response = await this.futuresPrivateDeleteOrders(this.extend(request, params));
+        }
         //
         //   {
         //       "code": "200000",
@@ -158908,6 +160029,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#addMargin
          * @description add margin
+         * @see https://www.kucoin.com/docs/rest/futures-trading/positions/add-margin-manually
          * @param {string} symbol unified market symbol
          * @param {float} amount amount of margin to add
          * @param {object} [params] extra parameters specific to the kucoinfutures api endpoint
@@ -159091,8 +160213,13 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
         if (until !== undefined) {
             request['endAt'] = until;
         }
-        const method = stop ? 'futuresPrivateGetStopOrders' : 'futuresPrivateGetOrders';
-        const response = await this[method](this.extend(request, params));
+        let response = undefined;
+        if (stop) {
+            response = await this.futuresPrivateGetStopOrders(this.extend(request, params));
+        }
+        else {
+            response = await this.futuresPrivateGetOrders(this.extend(request, params));
+        }
         //
         //     {
         //         "code": "200000",
@@ -159184,20 +160311,20 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          */
         await this.loadMarkets();
         const request = {};
-        let method = 'futuresPrivateGetOrdersOrderId';
+        let response = undefined;
         if (id === undefined) {
             const clientOrderId = this.safeString2(params, 'clientOid', 'clientOrderId');
             if (clientOrderId === undefined) {
                 throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.InvalidOrder(this.id + ' fetchOrder() requires parameter id or params.clientOid');
             }
             request['clientOid'] = clientOrderId;
-            method = 'futuresPrivateGetOrdersByClientOid';
             params = this.omit(params, ['clientOid', 'clientOrderId']);
+            response = await this.futuresPrivateGetOrdersByClientOid(this.extend(request, params));
         }
         else {
             request['orderId'] = id;
+            response = await this.futuresPrivateGetOrdersOrderId(this.extend(request, params));
         }
-        const response = await this[method](this.extend(request, params));
         //
         //     {
         //         "code": "200000",
@@ -159362,6 +160489,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchFundingRate
          * @description fetch the current funding rate
+         * @see https://www.kucoin.com/docs/rest/futures-trading/market-data/get-current-funding-rate
          * @param {string} symbol unified market symbol
          * @param {object} [params] extra parameters specific to the kucoinfutures api endpoint
          * @returns {object} a [funding rate structure]{@link https://docs.ccxt.com/#/?id=funding-rate-structure}
@@ -159427,6 +160555,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchBalance
          * @description query for balance and get the amount of funds available for trading or funds locked in orders
+         * @see https://www.kucoin.com/docs/rest/funding/funding-overview/get-account-detail-futures
          * @param {object} [params] extra parameters specific to the kucoinfutures api endpoint
          * @returns {object} a [balance structure]{@link https://docs.ccxt.com/#/?id=balance-structure}
          */
@@ -159604,6 +160733,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchTrades
          * @description get the list of most recent trades for a particular symbol
+         * @see https://www.kucoin.com/docs/rest/futures-trading/market-data/get-transaction-history
          * @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
@@ -159886,6 +161016,7 @@ class kucoinfutures extends _abstract_kucoinfutures_js__WEBPACK_IMPORTED_MODULE_
          * @method
          * @name kucoinfutures#fetchMarketLeverageTiers
          * @description retrieve information on the maximum leverage, and maintenance margin for trades of varying trade sizes for a single market
+         * @see https://www.kucoin.com/docs/rest/futures-trading/risk-limit/get-futures-risk-limit-level
          * @param {string} symbol unified market symbol
          * @param {object} [params] extra parameters specific to the kucoinfutures api endpoint
          * @returns {object} a [leverage tiers structure]{@link https://docs.ccxt.com/#/?id=leverage-tiers-structure}
@@ -244893,8 +246024,8 @@ class phemex extends _phemex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z
 /* harmony export */ });
 /* harmony import */ var _poloniex_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8891);
 /* harmony import */ var _base_errors_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(6689);
-/* harmony import */ var _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(3020);
-/* harmony import */ var _base_Precise_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2194);
+/* harmony import */ var _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3020);
+/* harmony import */ var _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(2194);
 /* harmony import */ var _static_dependencies_noble_hashes_sha256_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(1372);
 //  ---------------------------------------------------------------------------
 
@@ -244917,6 +246048,15 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
                 'watchStatus': false,
                 'watchOrders': true,
                 'watchMyTrades': true,
+                'createOrderWs': true,
+                'editOrderWs': false,
+                'fetchOpenOrdersWs': false,
+                'fetchOrderWs': false,
+                'cancelOrderWs': true,
+                'cancelOrdersWs': true,
+                'cancelAllOrdersWs': true,
+                'fetchTradesWs': false,
+                'fetchBalanceWs': false,
             },
             'urls': {
                 'api': {
@@ -244927,6 +246067,7 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
                 },
             },
             'options': {
+                'createMarketBuyOrderRequiresPrice': true,
                 'tradesLimit': 1000,
                 'ordersLimit': 1000,
                 'OHLCVLimit': 1000,
@@ -245046,6 +246187,164 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
         const request = this.extend(subscribe, params);
         return await this.watch(url, messageHash, request, messageHash);
     }
+    async tradeRequest(name, params = {}) {
+        /**
+         * @ignore
+         * @method
+         * @description Connects to a websocket channel
+         * @param {string} name name of the channel
+         * @param {string[]|undefined} symbols CCXT market symbols
+         * @param {object} [params] extra parameters specific to the poloniex api
+         * @returns {object} data from the websocket stream
+         */
+        const url = this.urls['api']['ws']['private'];
+        const messageHash = this.nonce();
+        const subscribe = {
+            'id': messageHash,
+            'event': name,
+            'params': params,
+        };
+        return await this.watch(url, messageHash, subscribe, messageHash);
+    }
+    async createOrderWs(symbol, type, side, amount, price = undefined, params = {}) {
+        /**
+         * @method
+         * @name poloniex#createOrderWs
+         * @see https://docs.poloniex.com/#authenticated-channels-trade-requests-create-order
+         * @description create a trade order
+         * @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 poloniex api endpoint
+         * @param {string} [params.timeInForce] GTC (default), IOC, FOK
+         * @param {string} [params.clientOrderId] Maximum 64-character length.*
+         *
+         * EXCHANGE SPECIFIC PARAMETERS
+         * @param {string} [params.amount] quote units for the order
+         * @param {boolean} [params.allowBorrow] allow order to be placed by borrowing funds (Default: false)
+         * @param {string} [params.stpMode] self-trade prevention, defaults to expire_taker, none: enable self-trade; expire_taker: taker order will be canceled when self-trade happens
+         * @param {string} [params.slippageTolerance] used to control the maximum slippage ratio, the value range is greater than 0 and less than 1
+         * @returns {object} an [order structure]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+        */
+        await this.loadMarkets();
+        await this.authenticate();
+        const market = this.market(symbol);
+        let uppercaseType = type.toUpperCase();
+        const uppercaseSide = side.toUpperCase();
+        const isPostOnly = this.isPostOnly(uppercaseType === 'MARKET', uppercaseType === 'LIMIT_MAKER', params);
+        if (isPostOnly) {
+            uppercaseType = 'LIMIT_MAKER';
+        }
+        const request = {
+            'symbol': market['id'],
+            'side': side.toUpperCase(),
+            'type': type.toUpperCase(),
+        };
+        if ((uppercaseType === 'MARKET') && (uppercaseSide === 'BUY')) {
+            let quoteAmount = this.safeString(params, 'amount');
+            if ((quoteAmount === undefined) && (this.options['createMarketBuyOrderRequiresPrice'])) {
+                const cost = this.safeNumber(params, 'cost');
+                params = this.omit(params, 'cost');
+                if (price === undefined && cost === undefined) {
+                    throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ArgumentsRequired(this.id + ' createOrder() requires the price argument with 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 quote = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringMul(amountString, priceString);
+                    amount = (cost !== undefined) ? cost : this.parseNumber(quote);
+                    quoteAmount = this.costToPrecision(symbol, amount);
+                }
+            }
+            else {
+                quoteAmount = this.costToPrecision(symbol, amount);
+            }
+            request['amount'] = this.amountToPrecision(market['symbol'], quoteAmount);
+        }
+        else {
+            request['quantity'] = this.amountToPrecision(market['symbol'], amount);
+            if (price !== undefined) {
+                request['price'] = this.priceToPrecision(symbol, price);
+            }
+        }
+        return await this.tradeRequest('createOrder', this.extend(request, params));
+    }
+    async cancelOrderWs(id, symbol = undefined, params = {}) {
+        /**
+         * @method
+         * @name poloniex#cancelOrderWs
+         * @see https://docs.poloniex.com/#authenticated-channels-trade-requests-cancel-multiple-orders
+         * @description cancel multiple orders
+         * @param {string} id order id
+         * @param {string} [symbol] unified market symbol
+         * @param {object} [params] extra parameters specific to the poloniex api endpoint
+         * @param {string} [params.clientOrderId] client order id
+         * @returns {object} an list of [order structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+         */
+        const clientOrderId = this.safeString(params, 'clientOrderId');
+        if (clientOrderId !== undefined) {
+            const clientOrderIds = this.safeValue(params, 'clientOrderId', []);
+            params['clientOrderIds'] = this.arrayConcat(clientOrderIds, [clientOrderId]);
+        }
+        return await this.cancelOrdersWs([id], symbol, params);
+    }
+    async cancelOrdersWs(ids, symbol = undefined, params = {}) {
+        /**
+         * @method
+         * @name poloniex#cancelOrdersWs
+         * @see https://docs.poloniex.com/#authenticated-channels-trade-requests-cancel-multiple-orders
+         * @description cancel multiple orders
+         * @param {string[]} ids order ids
+         * @param {string} symbol unified market symbol, default is undefined
+         * @param {object} [params] extra parameters specific to the poloniex api endpoint
+         * @param {string[]} [params.clientOrderIds] client order ids
+         * @returns {object} an list of [order structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+         */
+        await this.loadMarkets();
+        await this.authenticate();
+        const request = {
+            'orderIds': ids,
+        };
+        return await this.tradeRequest('cancelOrders', this.extend(request, params));
+    }
+    async cancelAllOrdersWs(symbol = undefined, params = {}) {
+        /**
+         * @method
+         * @name poloniex#cancelAllOrdersWs
+         * @see https://docs.poloniex.com/#authenticated-channels-trade-requests-cancel-all-orders
+         * @description cancel all open orders of a type. Only applicable to Option in Portfolio Margin mode, and MMP privilege is required.
+         * @param {string} symbol unified market symbol, only orders in the market of this symbol are cancelled when symbol is not undefined
+         * @param {object} [params] extra parameters specific to the poloniex api endpoint
+         * @returns {object[]} a list of [order structures]{@link https://github.com/ccxt/ccxt/wiki/Manual#order-structure}
+         */
+        await this.loadMarkets();
+        await this.authenticate();
+        return await this.tradeRequest('cancelAllOrders', params);
+    }
+    handleOrderRequest(client, message) {
+        //
+        //    {
+        //        "id": "1234567",
+        //        "data": [{
+        //           "orderId": 205343650954092544,
+        //           "clientOrderId": "",
+        //           "message": "",
+        //           "code": 200
+        //        }]
+        //    }
+        //
+        const messageHash = this.safeInteger(message, 'id');
+        const data = this.safeValue(message, 'data', []);
+        const orders = [];
+        for (let i = 0; i < data.length; i++) {
+            const order = data[i];
+            const parsedOrder = this.parseWsOrder(order);
+            orders.push(parsedOrder);
+        }
+        client.resolve(orders, messageHash);
+    }
     async watchOHLCV(symbol, timeframe = '1m', since = undefined, limit = undefined, params = {}) {
         /**
          * @method
@@ -245269,7 +246568,7 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
         if (symbol !== undefined) {
             if (stored === undefined) {
                 const limit = this.safeInteger(this.options, 'OHLCVLimit', 1000);
-                stored = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_3__/* .ArrayCacheByTimestamp */ .Py(limit);
+                stored = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_4__/* .ArrayCacheByTimestamp */ .Py(limit);
                 this.ohlcvs[symbol][timeframe] = stored;
             }
             stored.append(parsed);
@@ -245307,7 +246606,7 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
                 let tradesArray = this.safeValue(this.trades, symbol);
                 if (tradesArray === undefined) {
                     const tradesLimit = this.safeInteger(this.options, 'tradesLimit', 1000);
-                    tradesArray = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_3__/* .ArrayCache */ .ZL(tradesLimit);
+                    tradesArray = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_4__/* .ArrayCache */ .ZL(tradesLimit);
                     this.trades[symbol] = tradesArray;
                 }
                 tradesArray.append(trade);
@@ -245486,7 +246785,7 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
         let orders = this.orders;
         if (orders === undefined) {
             const limit = this.safeInteger(this.options, 'ordersLimit');
-            orders = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_3__/* .ArrayCacheBySymbolById */ .hl(limit);
+            orders = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_4__/* .ArrayCacheBySymbolById */ .hl(limit);
             this.orders = orders;
         }
         const marketIds = [];
@@ -245519,21 +246818,21 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
                         const previousOrderTrade = previousOrderTrades[j];
                         const cost = this.numberToString(previousOrderTrade['cost']);
                         const amount = this.numberToString(previousOrderTrade['amount']);
-                        totalCost = _base_Precise_js__WEBPACK_IMPORTED_MODULE_4__/* .Precise */ .O.stringAdd(totalCost, cost);
-                        totalAmount = _base_Precise_js__WEBPACK_IMPORTED_MODULE_4__/* .Precise */ .O.stringAdd(totalAmount, amount);
+                        totalCost = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringAdd(totalCost, cost);
+                        totalAmount = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringAdd(totalAmount, amount);
                     }
-                    if (_base_Precise_js__WEBPACK_IMPORTED_MODULE_4__/* .Precise */ .O.stringGt(totalAmount, '0')) {
-                        previousOrder['average'] = this.parseNumber(_base_Precise_js__WEBPACK_IMPORTED_MODULE_4__/* .Precise */ .O.stringDiv(totalCost, totalAmount));
+                    if (_base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringGt(totalAmount, '0')) {
+                        previousOrder['average'] = this.parseNumber(_base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringDiv(totalCost, totalAmount));
                     }
                     previousOrder['cost'] = this.parseNumber(totalCost);
                     if (previousOrder['filled'] !== undefined) {
                         const tradeAmount = this.numberToString(trade['amount']);
                         let previousOrderFilled = this.numberToString(previousOrder['filled']);
-                        previousOrderFilled = _base_Precise_js__WEBPACK_IMPORTED_MODULE_4__/* .Precise */ .O.stringAdd(previousOrderFilled, tradeAmount);
+                        previousOrderFilled = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringAdd(previousOrderFilled, tradeAmount);
                         previousOrder['filled'] = previousOrderFilled;
                         if (previousOrder['amount'] !== undefined) {
                             const previousOrderAmount = this.numberToString(previousOrder['amount']);
-                            previousOrder['remaining'] = this.parseNumber(_base_Precise_js__WEBPACK_IMPORTED_MODULE_4__/* .Precise */ .O.stringSub(previousOrderAmount, previousOrderFilled));
+                            previousOrder['remaining'] = this.parseNumber(_base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringSub(previousOrderAmount, previousOrderFilled));
                         }
                     }
                     if (previousOrder['fee'] === undefined) {
@@ -245546,7 +246845,7 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
                     if ((previousOrder['fee']['cost'] !== undefined) && (trade['fee']['cost'] !== undefined)) {
                         const stringOrderCost = this.numberToString(previousOrder['fee']['cost']);
                         const stringTradeCost = this.numberToString(trade['fee']['cost']);
-                        previousOrder['fee']['cost'] = _base_Precise_js__WEBPACK_IMPORTED_MODULE_4__/* .Precise */ .O.stringAdd(stringOrderCost, stringTradeCost);
+                        previousOrder['fee']['cost'] = _base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringAdd(stringOrderCost, stringTradeCost);
                     }
                     const rawState = this.safeString(order, 'state');
                     const state = this.parseStatus(rawState);
@@ -245603,7 +246902,7 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
         const filledAmount = this.safeString(order, 'filledAmount');
         const status = this.safeString(order, 'state');
         let trades = undefined;
-        if (!_base_Precise_js__WEBPACK_IMPORTED_MODULE_4__/* .Precise */ .O.stringEq(filledAmount, '0')) {
+        if (!_base_Precise_js__WEBPACK_IMPORTED_MODULE_3__/* .Precise */ .O.stringEq(filledAmount, '0')) {
             trades = [];
             const trade = this.parseWsOrderTrade(order);
             trades.push(trade);
@@ -245844,7 +247143,7 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
         const symbol = parsedTrade['symbol'];
         if (this.myTrades === undefined) {
             const limit = this.safeInteger(this.options, 'tradesLimit', 1000);
-            this.myTrades = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_3__/* .ArrayCacheBySymbolById */ .hl(limit);
+            this.myTrades = new _base_ws_Cache_js__WEBPACK_IMPORTED_MODULE_4__/* .ArrayCacheBySymbolById */ .hl(limit);
         }
         const trades = this.myTrades;
         trades.append(parsedTrade);
@@ -245852,6 +247151,9 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
         const symbolMessageHash = messageHash + ':' + symbol;
         client.resolve(trades, symbolMessageHash);
     }
+    handlePong(client) {
+        client.lastPong = this.milliseconds();
+    }
     handleMessage(client, message) {
         if (this.handleErrorMessage(client, message)) {
             return;
@@ -245882,11 +247184,26 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
             'trades': this.handleTrade,
             'orders': this.handleOrder,
             'balances': this.handleBalance,
+            'createOrder': this.handleOrderRequest,
+            'cancelOrder': this.handleOrderRequest,
+            'cancelAllOrders': this.handleOrderRequest,
+            'auth': this.handleAuthenticate,
         };
         const method = this.safeValue(methods, type);
         if (type === 'auth') {
             this.handleAuthenticate(client, message);
         }
+        else if (type === undefined) {
+            const data = this.safeValue(message, 'data');
+            const item = this.safeValue(data, 0);
+            const orderId = this.safeString(item, 'orderId');
+            if (orderId === '0') {
+                this.handleErrorMessage(client, item);
+            }
+            else {
+                return this.handleOrderRequest(client, message);
+            }
+        }
         else {
             const data = this.safeValue(message, 'data', []);
             const dataLength = data.length;
@@ -245897,9 +247214,26 @@ class poloniex extends _poloniex_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] *
     }
     handleErrorMessage(client, message) {
         //
-        // { message: 'Invalid channel value ["ordersss"]', event: 'error' }
+        //    {
+        //        message: 'Invalid channel value ["ordersss"]',
+        //        event: 'error'
+        //    }
+        //
+        //    {
+        //        "orderId": 0,
+        //        "clientOrderId": null,
+        //        "message": "Currency trade disabled",
+        //        "code": 21352
+        //    }
+        //
+        //    {
+        //       "event": "error",
+        //       "message": "Platform in maintenance mode"
+        //    }
+        //
         const event = this.safeString(message, 'event');
-        if (event === 'error') {
+        const orderId = this.safeString(message, 'orderId');
+        if ((event === 'error') || (orderId === '0')) {
             const error = this.safeString(message, 'message');
             throw new _base_errors_js__WEBPACK_IMPORTED_MODULE_2__.ExchangeError(this.id + ' error: ' + this.json(error));
         }
@@ -286133,7 +287467,7 @@ SOFTWARE.
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.1.61';
+const version = '4.1.63';
 _src_base_Exchange_js__WEBPACK_IMPORTED_MODULE_0__/* .Exchange */ .e.ccxtVersion = version;
 //-----------------------------------------------------------------------------