ccxt 4.3.18 → 4.3.19

package/js/src/coinex.js

@@ -1144,115 +1144,50 @@ export default class coinex extends Exchange {
         //
         // Spot and Margin fetchMyTrades (private)
         //
-        //      {
-        //          "id": 2611520950,
-        //          "order_id": 63286573298,
-        //          "account_id": 0,
-        //          "create_time": 1638990636,
-        //          "type": "sell",
-        //          "role": "taker",
-        //          "price": "192.29",
-        //          "amount": "0.098",
-        //          "fee": "0.03768884",
-        //          "fee_asset": "USDT",
-        //          "market": "AAVEUSDT",
-        //          "deal_money": "18.84442"
-        //      }
+        //     {
+        //         "amount": "0.00010087",
+        //         "created_at": 1714618087585,
+        //         "deal_id": 4161200602,
+        //         "margin_market": "",
+        //         "market": "BTCUSDT",
+        //         "order_id": 117654919342,
+        //         "price": "57464.04",
+        //         "side": "sell"
+        //     }
         //
         // Swap fetchMyTrades (private)
         //
         //     {
-        //         "amount": "0.0012",
-        //         "deal_fee": "0.0237528",
-        //         "deal_insurance": "0",
-        //         "deal_margin": "15.8352",
-        //         "deal_order_id": 17797031903,
-        //         "deal_profit": "0",
-        //         "deal_stock": "47.5056",
-        //         "deal_type": 1,
-        //         "deal_user_id": 2969195,
-        //         "fee_asset": "",
-        //         "fee_discount": "0",
-        //         "fee_price": "0",
-        //         "fee_rate": "0.0005",
-        //         "fee_real_rate": "0.0005",
-        //         "id": 379044296,
-        //         "leverage": "3",
-        //         "margin_amount": "15.8352",
+        //         "deal_id": 1180222387,
+        //         "created_at": 1714119054558,
         //         "market": "BTCUSDT",
-        //         "open_price": "39588",
-        //         "order_id": 17797092987,
-        //         "position_amount": "0.0012",
-        //         "position_id": 62052321,
-        //         "position_type": 1,
-        //         "price": "39588",
-        //         "role": 2,
-        //         "side": 2,
-        //         "time": 1650675936.016103,
-        //         "user_id": 3620173
+        //         "side": "buy",
+        //         "order_id": 136915589622,
+        //         "price": "64376",
+        //         "amount": "0.0001"
         //     }
         //
-        let timestamp = this.safeTimestamp2(trade, 'create_time', 'time');
-        if (timestamp === undefined) {
-            timestamp = this.safeInteger(trade, 'created_at');
+        const timestamp = this.safeInteger(trade, 'created_at');
+        let defaultType = this.safeString(this.options, 'defaultType');
+        if (market !== undefined) {
+            defaultType = market['type'];
         }
-        const tradeId = this.safeString2(trade, 'id', 'deal_id');
-        const orderId = this.safeString(trade, 'order_id');
-        const priceString = this.safeString(trade, 'price');
-        const amountString = this.safeString(trade, 'amount');
         const marketId = this.safeString(trade, 'market');
-        const marketType = this.safeString(trade, 'market_type');
-        const defaultType = (marketType === undefined) ? 'spot' : 'swap';
         market = this.safeMarket(marketId, market, undefined, defaultType);
-        const symbol = market['symbol'];
-        const costString = this.safeString(trade, 'deal_money');
-        let fee = undefined;
-        const feeCostString = this.safeString2(trade, 'fee', 'deal_fee');
-        if (feeCostString !== undefined) {
-            const feeCurrencyId = this.safeString(trade, 'fee_asset');
-            const feeCurrencyCode = this.safeCurrencyCode(feeCurrencyId);
-            fee = {
-                'cost': feeCostString,
-                'currency': feeCurrencyCode,
-            };
-        }
-        let takerOrMaker = this.safeString(trade, 'role');
-        if (takerOrMaker === '1') {
-            takerOrMaker = 'maker';
-        }
-        else if (takerOrMaker === '2') {
-            takerOrMaker = 'taker';
-        }
-        let side = undefined;
-        if (market['type'] === 'swap') {
-            const rawSide = this.safeInteger(trade, 'side');
-            if (rawSide === 1) {
-                side = 'sell';
-            }
-            else if (rawSide === 2) {
-                side = 'buy';
-            }
-            if (side === undefined) {
-                side = this.safeString2(trade, 'type', 'side');
-            }
-        }
-        else {
-            side = this.safeString2(trade, 'type', 'side');
-        }
         return this.safeTrade({
             'info': trade,
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
-            'symbol': symbol,
-            'id': tradeId,
-            'order': orderId,
+            'symbol': market['symbol'],
+            'id': this.safeString(trade, 'deal_id'),
+            'order': this.safeString(trade, 'order_id'),
             'type': undefined,
-            'side': side,
-            'takerOrMaker': takerOrMaker,
-            'price': priceString,
-            'amount': amountString,
-            'cost': costString,
-            'fee': fee,
+            'side': this.safeString(trade, 'side'),
+            'takerOrMaker': undefined,
+            'price': this.safeString(trade, 'price'),
+            'amount': this.safeString(trade, 'amount'),
+            'cost': this.safeString(trade, 'deal_money'),
+            'fee': undefined,
         }, market);
     }
     async fetchTrades(symbol, since = undefined, limit = undefined, params = {}) {
@@ -3830,155 +3765,110 @@ export default class coinex extends Exchange {
          * @method
          * @name coinex#fetchMyTrades
          * @description fetch all trades made by the user
-         * @see https://viabtc.github.io/coinex_api_en_doc/futures/#docsfutures001_http013_user_deals
-         * @see https://viabtc.github.io/coinex_api_en_doc/spot/#docsspot003_trade014_user_deals
+         * @see https://docs.coinex.com/api/v2/spot/deal/http/list-user-deals
+         * @see https://docs.coinex.com/api/v2/futures/deal/http/list-user-deals
          * @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 {int} [limit] the maximum number of trade structures to retrieve
          * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {int} [params.until] timestamp in ms of the latest trades
+         * @param {string} [params.side] the side of the trades, either 'buy' or 'sell', required for swap
          * @returns {Trade[]} a list of [trade structures]{@link https://docs.ccxt.com/#/?id=trade-structure}
          */
-        await this.loadMarkets();
-        let market = undefined;
-        if (limit === undefined) {
-            limit = 100;
+        if (symbol === undefined) {
+            throw new ArgumentsRequired(this.id + ' fetchMyTrades() requires a symbol argument');
         }
-        const request = {
-            'limit': limit,
-            'offset': 0, // SWAP, means query from a certain record
-            // 'page': 1, // SPOT
-            // 'side': 2, // SWAP, 0 for no limit, 1 for sell, 2 for buy
-            // 'start_time': since, // SWAP
-            // 'end_time': 1524228297, // SWAP
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        let request = {
+            'market': market['id'],
         };
-        if (symbol !== undefined) {
-            market = this.market(symbol);
-            request['market'] = market['id'];
-        }
-        let type = undefined;
-        [type, params] = this.handleMarketTypeAndParams('fetchMyTrades', market, params);
-        if (type !== 'spot' && symbol === undefined) {
-            throw new ArgumentsRequired(this.id + ' fetchMyTrades() requires a symbol argument for non-spot markets');
+        if (limit !== undefined) {
+            request['limit'] = limit;
         }
-        const swap = (type === 'swap');
-        const accountId = this.safeInteger(params, 'account_id');
-        let marginMode = undefined;
-        [marginMode, params] = this.handleMarginModeAndParams('fetchMyTrades', params);
-        if (marginMode !== undefined) {
-            if (accountId === undefined) {
-                throw new BadRequest(this.id + ' fetchMyTrades() requires an account_id parameter for margin trades');
-            }
-            request['account_id'] = accountId;
-            params = this.omit(params, 'account_id');
+        if (since !== undefined) {
+            request['start_time'] = since;
         }
+        [request, params] = this.handleUntilOption('end_time', request, params);
         let response = undefined;
-        if (swap) {
-            if (since !== undefined) {
-                request['start_time'] = since;
-            }
-            request['side'] = 0;
-            response = await this.v1PerpetualPrivateGetMarketUserDeals(this.extend(request, params));
+        if (market['swap']) {
+            request['market_type'] = 'FUTURES';
+            response = await this.v2PrivateGetFuturesUserDeals(this.extend(request, params));
+            //
+            //     {
+            //         "code": 0,
+            //         "data": [
+            //             {
+            //                 "deal_id": 1180222387,
+            //                 "created_at": 1714119054558,
+            //                 "market": "BTCUSDT",
+            //                 "side": "buy",
+            //                 "order_id": 136915589622,
+            //                 "price": "64376",
+            //                 "amount": "0.0001"
+            //             }
+            //         ],
+            //         "message": "OK",
+            //         "pagination": {
+            //             "has_next": true
+            //         }
+            //     }
+            //
         }
         else {
-            request['page'] = 1;
-            response = await this.v1PrivateGetOrderUserDeals(this.extend(request, params));
+            let marginMode = undefined;
+            [marginMode, params] = this.handleMarginModeAndParams('fetchMyTrades', params);
+            if (marginMode !== undefined) {
+                request['market_type'] = 'MARGIN';
+            }
+            else {
+                request['market_type'] = 'SPOT';
+            }
+            response = await this.v2PrivateGetSpotUserDeals(this.extend(request, params));
+            //
+            //     {
+            //         "code": 0,
+            //         "data": [
+            //             {
+            //                 "amount": "0.00010087",
+            //                 "created_at": 1714618087585,
+            //                 "deal_id": 4161200602,
+            //                 "margin_market": "",
+            //                 "market": "BTCUSDT",
+            //                 "order_id": 117654919342,
+            //                 "price": "57464.04",
+            //                 "side": "sell"
+            //             }
+            //         ],
+            //         "message": "OK",
+            //         "pagination": {
+            //             "has_next": true
+            //         }
+            //     }
+            //
         }
-        //
-        // Spot and Margin
-        //
-        //      {
-        //          "code": 0,
-        //          "data": {
-        //              "data": [
-        //                  {
-        //                      "id": 2611520950,
-        //                      "order_id": 63286573298,
-        //                      "account_id": 0,
-        //                      "create_time": 1638990636,
-        //                      "type": "sell",
-        //                      "role": "taker",
-        //                      "price": "192.29",
-        //                      "amount": "0.098",
-        //                      "fee": "0.03768884",
-        //                      "fee_asset": "USDT",
-        //                      "market": "AAVEUSDT",
-        //                      "deal_money": "18.84442"
-        //                          },
-        //                      ],
-        //              "curr_page": 1,
-        //              "has_next": false,
-        //              "count": 3
-        //              },
-        //          "message": "Success"
-        //      }
-        //
-        // Swap
-        //
-        //     {
-        //         "code": 0,
-        //         "data": {
-        //             "limit": 100,
-        //             "offset": 0,
-        //             "records": [
-        //                 {
-        //                     "amount": "0.0012",
-        //                     "deal_fee": "0.0237528",
-        //                     "deal_insurance": "0",
-        //                     "deal_margin": "15.8352",
-        //                     "deal_order_id": 17797031903,
-        //                     "deal_profit": "0",
-        //                     "deal_stock": "47.5056",
-        //                     "deal_type": 1,
-        //                     "deal_user_id": 2969195,
-        //                     "fee_asset": "",
-        //                     "fee_discount": "0",
-        //                     "fee_price": "0",
-        //                     "fee_rate": "0.0005",
-        //                     "fee_real_rate": "0.0005",
-        //                     "id": 379044296,
-        //                     "leverage": "3",
-        //                     "margin_amount": "15.8352",
-        //                     "market": "BTCUSDT",
-        //                     "open_price": "39588",
-        //                     "order_id": 17797092987,
-        //                     "position_amount": "0.0012",
-        //                     "position_id": 62052321,
-        //                     "position_type": 1,
-        //                     "price": "39588",
-        //                     "role": 2,
-        //                     "side": 2,
-        //                     "time": 1650675936.016103,
-        //                     "user_id": 3620173
-        //                 }
-        //             ]
-        //         },
-        //         "message": "OK"
-        //     }
-        //
-        const tradeRequest = swap ? 'records' : 'data';
-        const data = this.safeValue(response, 'data');
-        const trades = this.safeList(data, tradeRequest, []);
-        return this.parseTrades(trades, market, since, limit);
+        const data = this.safeList(response, 'data', []);
+        return this.parseTrades(data, market, since, limit);
     }
     async fetchPositions(symbols = undefined, params = {}) {
         /**
          * @method
          * @name coinex#fetchPositions
          * @description fetch all open positions
-         * @see https://viabtc.github.io/coinex_api_en_doc/futures/#docsfutures001_http033_pending_position
-         * @see https://viabtc.github.io/coinex_api_en_doc/futures/#docsfutures001_http033-0_finished_position
+         * @see https://docs.coinex.com/api/v2/futures/position/http/list-pending-position
+         * @see https://docs.coinex.com/api/v2/futures/position/http/list-finished-position
          * @param {string[]} [symbols] list of unified market symbols
          * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @param {string} [params.method] the method to use 'perpetualPrivateGetPositionPending' or 'perpetualPrivateGetPositionFinished' default is 'perpetualPrivateGetPositionPending'
-         * @param {int} [params.side] *history endpoint only* 0: All, 1: Sell, 2: Buy, default is 0
+         * @param {string} [params.method] the method to use 'v2PrivateGetFuturesPendingPosition' or 'v2PrivateGetFuturesFinishedPosition' default is 'v2PrivateGetFuturesPendingPosition'
          * @returns {object[]} a list of [position structure]{@link https://docs.ccxt.com/#/?id=position-structure}
          */
         await this.loadMarkets();
         let defaultMethod = undefined;
-        [defaultMethod, params] = this.handleOptionAndParams(params, 'fetchPositions', 'method', 'v1PerpetualPrivateGetPositionPending');
-        const isHistory = (defaultMethod === 'v1PerpetualPrivateGetPositionFinished');
+        [defaultMethod, params] = this.handleOptionAndParams(params, 'fetchPositions', 'method', 'v2PrivateGetFuturesPendingPosition');
         symbols = this.marketSymbols(symbols);
-        const request = {};
+        const request = {
+            'market_type': 'FUTURES',
+        };
         let market = undefined;
         if (symbols !== undefined) {
             let symbol = undefined;
@@ -3995,82 +3885,57 @@ export default class coinex extends Exchange {
             market = this.market(symbol);
             request['market'] = market['id'];
         }
-        else {
-            if (isHistory) {
-                throw new ArgumentsRequired(this.id + ' fetchPositions() requires a symbol argument for closed positions');
-            }
-        }
-        if (isHistory) {
-            request['limit'] = 100;
-            request['side'] = this.safeInteger(params, 'side', 0); // 0: All, 1: Sell, 2: Buy
-        }
         let response = undefined;
-        if (defaultMethod === 'v1PerpetualPrivateGetPositionPending') {
-            response = await this.v1PerpetualPrivateGetPositionPending(this.extend(request, params));
+        if (defaultMethod === 'v2PrivateGetFuturesPendingPosition') {
+            response = await this.v2PrivateGetFuturesPendingPosition(this.extend(request, params));
         }
         else {
-            response = await this.v1PerpetualPrivateGetPositionFinished(this.extend(request, params));
+            response = await this.v2PrivateGetFuturesFinishedPosition(this.extend(request, params));
         }
         //
         //     {
         //         "code": 0,
         //         "data": [
         //             {
-        //                 "adl_sort": 3396,
-        //                 "adl_sort_val": "0.00007786",
-        //                 "amount": "0.0005",
-        //                 "amount_max": "0.0005",
-        //                 "amount_max_margin": "6.42101333333333333333",
-        //                 "bkr_price": "25684.05333333333333346175",
-        //                 "bkr_price_imply": "0.00000000000000000000",
-        //                 "close_left": "0.0005",
-        //                 "create_time": 1651294226.110899,
-        //                 "deal_all": "19.26000000000000000000",
-        //                 "deal_asset_fee": "0.00000000000000000000",
-        //                 "fee_asset": "",
-        //                 "finish_type": 1,
-        //                 "first_price": "38526.08",
-        //                 "insurance": "0.00000000000000000000",
-        //                 "latest_price": "38526.08",
-        //                 "leverage": "3",
-        //                 "liq_amount": "0.00000000000000000000",
-        //                 "liq_order_price": "0",
-        //                 "liq_order_time": 0,
-        //                 "liq_price": "25876.68373333333333346175",
-        //                 "liq_price_imply": "0.00000000000000000000",
-        //                 "liq_profit": "0.00000000000000000000",
-        //                 "liq_time": 0,
-        //                 "mainten_margin": "0.005",
-        //                 "mainten_margin_amount": "0.09631520000000000000",
-        //                 "maker_fee": "0.00000000000000000000",
-        //                 "margin_amount": "6.42101333333333333333",
+        //                 "position_id": 305891033,
         //                 "market": "BTCUSDT",
-        //                 "open_margin": "0.33333333333333333333",
-        //                 "open_margin_imply": "0.00000000000000000000",
-        //                 "open_price": "38526.08000000000000000000",
-        //                 "open_val": "19.26304000000000000000",
-        //                 "open_val_max": "19.26304000000000000000",
-        //                 "position_id": 65847227,
-        //                 "profit_clearing": "-0.00963152000000000000",
-        //                 "profit_real": "-0.00963152000000000000",
-        //                 "profit_unreal": "0.00",
-        //                 "side": 2,
-        //                 "stop_loss_price": "0.00000000000000000000",
-        //                 "stop_loss_type": 0,
-        //                 "sy s": 0,
-        //                 "take_profit_price": "0.00000000000000000000",
-        //                 "take_profit_type": 0,
-        //                 "taker_fee": "0.00000000000000000000",
-        //                 "total": 4661,
-        //                 "type": 1,
-        //                 "update_time": 1651294226.111196,
-        //                 "user_id": 3620173
-        //             },
+        //                 "market_type": "FUTURES",
+        //                 "side": "long",
+        //                 "margin_mode": "cross",
+        //                 "open_interest": "0.0001",
+        //                 "close_avbl": "0.0001",
+        //                 "ath_position_amount": "0.0001",
+        //                 "unrealized_pnl": "0",
+        //                 "realized_pnl": "-0.00311684",
+        //                 "avg_entry_price": "62336.8",
+        //                 "cml_position_value": "6.23368",
+        //                 "max_position_value": "6.23368",
+        //                 "created_at": 1715152208041,
+        //                 "updated_at": 1715152208041,
+        //                 "take_profit_price": "0",
+        //                 "stop_loss_price": "0",
+        //                 "take_profit_type": "",
+        //                 "stop_loss_type": "",
+        //                 "settle_price": "62336.8",
+        //                 "settle_value": "6.23368",
+        //                 "leverage": "3",
+        //                 "margin_avbl": "2.07789333",
+        //                 "ath_margin_size": "2.07789333",
+        //                 "position_margin_rate": "2.40545879023305655728",
+        //                 "maintenance_margin_rate": "0.005",
+        //                 "maintenance_margin_value": "0.03118094",
+        //                 "liq_price": "0",
+        //                 "bkr_price": "0",
+        //                 "adl_level": 1
+        //             }
         //         ],
-        //         "message": "OK"
+        //         "message": "OK",
+        //         "pagination": {
+        //             "has_next": false
+        //         }
         //     }
         //
-        const position = this.safeValue(response, 'data', []);
+        const position = this.safeList(response, 'data', []);
         const result = [];
         for (let i = 0; i < position.length; i++) {
             result.push(this.parsePosition(position[i], market));
@@ -4082,215 +3947,129 @@ export default class coinex extends Exchange {
          * @method
          * @name coinex#fetchPosition
          * @description fetch data on a single open contract trade position
-         * @see https://viabtc.github.io/coinex_api_en_doc/futures/#docsfutures001_http033_pending_position
-         * @param {string} symbol unified market symbol of the market the position is held in, default is undefined
+         * @see https://docs.coinex.com/api/v2/futures/position/http/list-pending-position
+         * @param {string} symbol unified market symbol of the market the position is held in
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [position structure]{@link https://docs.ccxt.com/#/?id=position-structure}
          */
         await this.loadMarkets();
         const market = this.market(symbol);
         const request = {
+            'market_type': 'FUTURES',
             'market': market['id'],
         };
-        const response = await this.v1PerpetualPrivateGetPositionPending(this.extend(request, params));
+        const response = await this.v2PrivateGetFuturesPendingPosition(this.extend(request, params));
         //
         //     {
         //         "code": 0,
         //         "data": [
         //             {
-        //                 "adl_sort": 3396,
-        //                 "adl_sort_val": "0.00007786",
-        //                 "amount": "0.0005",
-        //                 "amount_max": "0.0005",
-        //                 "amount_max_margin": "6.42101333333333333333",
-        //                 "bkr_price": "25684.05333333333333346175",
-        //                 "bkr_price_imply": "0.00000000000000000000",
-        //                 "close_left": "0.0005",
-        //                 "create_time": 1651294226.110899,
-        //                 "deal_all": "19.26000000000000000000",
-        //                 "deal_asset_fee": "0.00000000000000000000",
-        //                 "fee_asset": "",
-        //                 "finish_type": 1,
-        //                 "first_price": "38526.08",
-        //                 "insurance": "0.00000000000000000000",
-        //                 "latest_price": "38526.08",
-        //                 "leverage": "3",
-        //                 "liq_amount": "0.00000000000000000000",
-        //                 "liq_order_price": "0",
-        //                 "liq_order_time": 0,
-        //                 "liq_price": "25876.68373333333333346175",
-        //                 "liq_price_imply": "0.00000000000000000000",
-        //                 "liq_profit": "0.00000000000000000000",
-        //                 "liq_time": 0,
-        //                 "mainten_margin": "0.005",
-        //                 "mainten_margin_amount": "0.09631520000000000000",
-        //                 "maker_fee": "0.00000000000000000000",
-        //                 "margin_amount": "6.42101333333333333333",
+        //                 "position_id": 305891033,
         //                 "market": "BTCUSDT",
-        //                 "open_margin": "0.33333333333333333333",
-        //                 "open_margin_imply": "0.00000000000000000000",
-        //                 "open_price": "38526.08000000000000000000",
-        //                 "open_val": "19.26304000000000000000",
-        //                 "open_val_max": "19.26304000000000000000",
-        //                 "position_id": 65847227,
-        //                 "profit_clearing": "-0.00963152000000000000",
-        //                 "profit_real": "-0.00963152000000000000",
-        //                 "profit_unreal": "0.00",
-        //                 "side": 2,
-        //                 "stop_loss_price": "0.00000000000000000000",
-        //                 "stop_loss_type": 0,
-        //                 "s ys": 0,
-        //                 "take_profit_price": "0.00000000000000000000",
-        //                 "take_profit_type": 0,
-        //                 "taker_fee": "0.00000000000000000000",
-        //                 "total": 4661,
-        //                 "type": 1,
-        //                 "update_time": 1651294226.111196,
-        //                 "user_id": 3620173
+        //                 "market_type": "FUTURES",
+        //                 "side": "long",
+        //                 "margin_mode": "cross",
+        //                 "open_interest": "0.0001",
+        //                 "close_avbl": "0.0001",
+        //                 "ath_position_amount": "0.0001",
+        //                 "unrealized_pnl": "0",
+        //                 "realized_pnl": "-0.00311684",
+        //                 "avg_entry_price": "62336.8",
+        //                 "cml_position_value": "6.23368",
+        //                 "max_position_value": "6.23368",
+        //                 "created_at": 1715152208041,
+        //                 "updated_at": 1715152208041,
+        //                 "take_profit_price": "0",
+        //                 "stop_loss_price": "0",
+        //                 "take_profit_type": "",
+        //                 "stop_loss_type": "",
+        //                 "settle_price": "62336.8",
+        //                 "settle_value": "6.23368",
+        //                 "leverage": "3",
+        //                 "margin_avbl": "2.07789333",
+        //                 "ath_margin_size": "2.07789333",
+        //                 "position_margin_rate": "2.40545879023305655728",
+        //                 "maintenance_margin_rate": "0.005",
+        //                 "maintenance_margin_value": "0.03118094",
+        //                 "liq_price": "0",
+        //                 "bkr_price": "0",
+        //                 "adl_level": 1
         //             }
         //         ],
-        //         "message": "OK"
+        //         "message": "OK",
+        //         "pagination": {
+        //             "has_next": false
+        //         }
         //     }
         //
         const data = this.safeList(response, 'data', []);
         return this.parsePosition(data[0], market);
     }
     parsePosition(position, market = undefined) {
-        //
-        // fetchPosition
         //
         //     {
-        //         "adl_sort": 3396,
-        //         "adl_sort_val": "0.00007786",
-        //         "amount": "0.0005",
-        //         "amount_max": "0.0005",
-        //         "amount_max_margin": "6.42101333333333333333",
-        //         "bkr_price": "25684.05333333333333346175",
-        //         "bkr_price_imply": "0.00000000000000000000",
-        //         "close_left": "0.0005",
-        //         "create_time": 1651294226.110899,
-        //         "deal_all": "19.26000000000000000000",
-        //         "deal_asset_fee": "0.00000000000000000000",
-        //         "fee_asset": "",
-        //         "finish_type": 1,
-        //         "first_price": "38526.08",
-        //         "insurance": "0.00000000000000000000",
-        //         "latest_price": "38526.08",
-        //         "leverage": "3",
-        //         "liq_amount": "0.00000000000000000000",
-        //         "liq_order_price": "0",
-        //         "liq_order_time": 0,
-        //         "liq_price": "25876.68373333333333346175",
-        //         "liq_price_imply": "0.00000000000000000000",
-        //         "liq_profit": "0.00000000000000000000",
-        //         "liq_time": 0,
-        //         "mainten_margin": "0.005",
-        //         "mainten_margin_amount": "0.09631520000000000000",
-        //         "maker_fee": "0.00000000000000000000",
-        //         "margin_amount": "6.42101333333333333333",
+        //         "position_id": 305891033,
         //         "market": "BTCUSDT",
-        //         "open_margin": "0.33333333333333333333",
-        //         "open_margin_imply": "0.00000000000000000000",
-        //         "open_price": "38526.08000000000000000000",
-        //         "open_val": "19.26304000000000000000",
-        //         "open_val_max": "19.26304000000000000000",
-        //         "position_id": 65847227,
-        //         "profit_clearing": "-0.00963152000000000000",
-        //         "profit_real": "-0.00963152000000000000",
-        //         "profit_unreal": "0.00",
-        //         "side": 2,
-        //         "stop_loss_price": "0.00000000000000000000",
-        //         "stop_loss_type": 0,
-        //         "s ys": 0,
-        //         "take_profit_price": "0.00000000000000000000",
-        //         "take_profit_type": 0,
-        //         "taker_fee": "0.00000000000000000000",
-        //         "total": 4661,
-        //         "type": 1,
-        //         "update_time": 1651294226.111196,
-        //         "user_id": 3620173
+        //         "market_type": "FUTURES",
+        //         "side": "long",
+        //         "margin_mode": "cross",
+        //         "open_interest": "0.0001",
+        //         "close_avbl": "0.0001",
+        //         "ath_position_amount": "0.0001",
+        //         "unrealized_pnl": "0",
+        //         "realized_pnl": "-0.00311684",
+        //         "avg_entry_price": "62336.8",
+        //         "cml_position_value": "6.23368",
+        //         "max_position_value": "6.23368",
+        //         "created_at": 1715152208041,
+        //         "updated_at": 1715152208041,
+        //         "take_profit_price": "0",
+        //         "stop_loss_price": "0",
+        //         "take_profit_type": "",
+        //         "stop_loss_type": "",
+        //         "settle_price": "62336.8",
+        //         "settle_value": "6.23368",
+        //         "leverage": "3",
+        //         "margin_avbl": "2.07789333",
+        //         "ath_margin_size": "2.07789333",
+        //         "position_margin_rate": "2.40545879023305655728",
+        //         "maintenance_margin_rate": "0.005",
+        //         "maintenance_margin_value": "0.03118094",
+        //         "liq_price": "0",
+        //         "bkr_price": "0",
+        //         "adl_level": 1
         //     }
         //
-        //
-        // fetchPositionHistory
-        //
-        //    {
-        //        amount_max: '10',
-        //        amount_max_margin: '2.03466666666666666666',
-        //        bkr_price: '0',
-        //        create_time: '1711150526.2581',
-        //        deal_all: '12.591',
-        //        deal_asset_fee: '0',
-        //        fee_asset: '',
-        //        finish_type: '5',
-        //        first_price: '0.6104',
-        //        latest_price: '0.6487',
-        //        leverage: '3',
-        //        liq_amount: '0',
-        //        liq_price: '0',
-        //        liq_profit: '0',
-        //        mainten_margin: '0.01',
-        //        market: 'XRPUSDT',
-        //        market_type: '1',
-        //        open_price: '0.6104',
-        //        open_val_max: '6.104',
-        //        position_id: '297371462',
-        //        profit_real: '0.35702107169',
-        //        settle_price: '0.6104',
-        //        settle_val: '0',
-        //        side: '2',
-        //        s ys: "0",
-        //        type: '2',
-        //        update_time: '1711391446.133233',
-        //        user_id: '3685860'
-        //    }
-        //
         const marketId = this.safeString(position, 'market');
         market = this.safeMarket(marketId, market, undefined, 'swap');
-        const symbol = market['symbol'];
-        const positionId = this.safeInteger(position, 'position_id');
-        const marginModeInteger = this.safeInteger(position, 'type');
-        const marginMode = (marginModeInteger === 1) ? 'isolated' : 'cross';
-        const liquidationPrice = this.safeString(position, 'liq_price');
-        const entryPrice = this.safeString(position, 'open_price');
-        const unrealizedPnl = this.safeString(position, 'profit_unreal');
-        const contracts = this.safeNumber(position, 'amount');
-        const sideInteger = this.safeInteger(position, 'side');
-        const side = (sideInteger === 1) ? 'short' : 'long';
-        const timestamp = this.safeTimestamp(position, 'update_time');
-        const maintenanceMargin = this.safeString(position, 'mainten_margin_amount');
-        const maintenanceMarginPercentage = this.safeString(position, 'mainten_margin');
-        const collateral = this.safeString2(position, 'margin_amount', 'amount_max_margin');
-        const leverage = this.safeString(position, 'leverage');
-        const notional = this.safeString(position, 'open_val');
-        const initialMargin = Precise.stringDiv(notional, leverage);
-        const initialMarginPercentage = Precise.stringDiv('1', leverage);
+        const timestamp = this.safeInteger(position, 'created_at');
         return this.safePosition({
             'info': position,
-            'id': positionId,
-            'symbol': symbol,
-            'notional': this.parseNumber(notional),
-            'marginMode': marginMode,
-            'liquidationPrice': liquidationPrice,
-            'entryPrice': this.parseNumber(entryPrice),
-            'unrealizedPnl': this.parseNumber(unrealizedPnl),
+            'id': this.safeInteger(position, 'position_id'),
+            'symbol': market['symbol'],
+            'notional': this.safeNumber(position, 'settle_value'),
+            'marginMode': this.safeString(position, 'margin_mode'),
+            'liquidationPrice': this.safeNumber(position, 'liq_price'),
+            'entryPrice': this.safeNumber(position, 'avg_entry_price'),
+            'unrealizedPnl': this.safeNumber(position, 'unrealized_pnl'),
+            'realizedPnl': this.safeNumber(position, 'realized_pnl'),
             'percentage': undefined,
-            'contracts': contracts,
+            'contracts': this.safeNumber(position, 'close_avbl'),
             'contractSize': this.safeNumber(market, 'contractSize'),
             'markPrice': undefined,
             'lastPrice': undefined,
-            'side': side,
+            'side': this.safeString(position, 'side'),
             'hedged': undefined,
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
-            'lastUpdateTimestamp': undefined,
-            'maintenanceMargin': this.parseNumber(maintenanceMargin),
-            'maintenanceMarginPercentage': this.parseNumber(maintenanceMarginPercentage),
-            'collateral': this.parseNumber(collateral),
-            'initialMargin': this.parseNumber(initialMargin),
-            'initialMarginPercentage': this.parseNumber(initialMarginPercentage),
-            'leverage': this.parseNumber(leverage),
-            'marginRatio': undefined,
+            'lastUpdateTimestamp': this.safeInteger(position, 'updated_at'),
+            'maintenanceMargin': this.safeNumber(position, 'maintenance_margin_value'),
+            'maintenanceMarginPercentage': this.safeNumber(position, 'maintenance_margin_rate'),
+            'collateral': this.safeNumber(position, 'margin_avbl'),
+            'initialMargin': undefined,
+            'initialMarginPercentage': undefined,
+            'leverage': this.safeNumber(position, 'leverage'),
+            'marginRatio': this.safeNumber(position, 'position_margin_rate'),
             'stopLossPrice': this.omitZero(this.safeString(position, 'stop_loss_price')),
             'takeProfitPrice': this.omitZero(this.safeString(position, 'take_profit_price')),
         });
@@ -4300,10 +4079,11 @@ export default class coinex extends Exchange {
          * @method
          * @name coinex#setMarginMode
          * @description set margin mode to 'cross' or 'isolated'
-         * @see https://viabtc.github.io/coinex_api_en_doc/futures/#docsfutures001_http014_adjust_leverage
+         * @see https://docs.coinex.com/api/v2/futures/position/http/adjust-position-leverage
          * @param {string} marginMode 'cross' or 'isolated'
          * @param {string} symbol unified market symbol
          * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {int} params.leverage the rate of leverage
          * @returns {object} response from the exchange
          */
         if (symbol === undefined) {
@@ -4318,37 +4098,37 @@ export default class coinex extends Exchange {
         if (market['type'] !== 'swap') {
             throw new BadSymbol(this.id + ' setMarginMode() supports swap contracts only');
         }
-        let defaultPositionType = undefined;
-        if (marginMode === 'isolated') {
-            defaultPositionType = 1;
-        }
-        else if (marginMode === 'cross') {
-            defaultPositionType = 2;
-        }
         const leverage = this.safeInteger(params, 'leverage');
         const maxLeverage = this.safeInteger(market['limits']['leverage'], 'max', 100);
-        const positionType = this.safeInteger(params, 'position_type', defaultPositionType);
         if (leverage === undefined) {
             throw new ArgumentsRequired(this.id + ' setMarginMode() requires a leverage parameter');
         }
-        if (positionType === undefined) {
-            throw new ArgumentsRequired(this.id + ' setMarginMode() requires a position_type parameter that will transfer margin to the specified trading pair');
-        }
-        if ((leverage < 3) || (leverage > maxLeverage)) {
-            throw new BadRequest(this.id + ' setMarginMode() leverage should be between 3 and ' + maxLeverage.toString() + ' for ' + symbol);
+        if ((leverage < 1) || (leverage > maxLeverage)) {
+            throw new BadRequest(this.id + ' setMarginMode() leverage should be between 1 and ' + maxLeverage.toString() + ' for ' + symbol);
         }
         const request = {
             'market': market['id'],
-            'leverage': leverage.toString(),
-            'position_type': positionType, // 1: isolated, 2: cross
+            'market_type': 'FUTURES',
+            'margin_mode': marginMode,
+            'leverage': leverage,
         };
-        return await this.v1PerpetualPrivatePostMarketAdjustLeverage(this.extend(request, params));
+        return await this.v2PrivatePostFuturesAdjustPositionLeverage(this.extend(request, params));
+        //
+        //     {
+        //         "code": 0,
+        //         "data": {
+        //             "leverage": 1,
+        //             "margin_mode": "isolated"
+        //         },
+        //         "message": "OK"
+        //     }
+        //
     }
     async setLeverage(leverage, symbol = undefined, params = {}) {
         /**
          * @method
          * @name coinex#setLeverage
-         * @see https://viabtc.github.io/coinex_api_en_doc/futures/#docsfutures001_http014_adjust_leverage
+         * @see https://docs.coinex.com/api/v2/futures/position/http/adjust-position-leverage
          * @description set the level of leverage for a market
          * @param {float} leverage the rate of leverage
          * @param {string} symbol unified market symbol
@@ -4366,13 +4146,6 @@ export default class coinex extends Exchange {
         }
         let marginMode = undefined;
         [marginMode, params] = this.handleMarginModeAndParams('setLeverage', params, 'cross');
-        let positionType = undefined;
-        if (marginMode === 'isolated') {
-            positionType = 1;
-        }
-        else if (marginMode === 'cross') {
-            positionType = 2;
-        }
         const minLeverage = this.safeInteger(market['limits']['leverage'], 'min', 1);
         const maxLeverage = this.safeInteger(market['limits']['leverage'], 'max', 100);
         if ((leverage < minLeverage) || (leverage > maxLeverage)) {
@@ -4380,10 +4153,21 @@ export default class coinex extends Exchange {
         }
         const request = {
             'market': market['id'],
-            'leverage': leverage.toString(),
-            'position_type': positionType, // 1: isolated, 2: cross
+            'market_type': 'FUTURES',
+            'margin_mode': marginMode,
+            'leverage': leverage,
         };
-        return await this.v1PerpetualPrivatePostMarketAdjustLeverage(this.extend(request, params));
+        return await this.v2PrivatePostFuturesAdjustPositionLeverage(this.extend(request, params));
+        //
+        //     {
+        //         "code": 0,
+        //         "data": {
+        //             "leverage": 1,
+        //             "margin_mode": "isolated"
+        //         },
+        //         "message": "OK"
+        //     }
+        //
     }
     async fetchLeverageTiers(symbols = undefined, params = {}) {
         /**
@@ -5244,7 +5028,7 @@ export default class coinex extends Exchange {
         const currencyCode = this.safeCurrencyCode(currencyId, currency);
         return {
             'info': transfer,
-            'id': this.safeInteger(transfer, 'id'),
+            'id': this.safeString(transfer, 'id'),
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
             'currency': currencyCode,
@@ -5939,72 +5723,72 @@ export default class coinex extends Exchange {
          * @method
          * @name coinex#fetchPositionHistory
          * @description fetches historical positions
-         * @see https://viabtc.github.io/coinex_api_en_doc/futures/#docsfutures001_http033-0_finished_position
+         * @see https://docs.coinex.com/api/v2/futures/position/http/list-finished-position
          * @param {string} symbol unified contract symbol
-         * @param {int} [since] not used by coinex fetchPositionHistory
-         * @param {int} [limit] the maximum amount of records to fetch, default=1000
-         * @param {object} params extra parameters specific to the exchange api endpoint
-         *
-         * EXCHANGE SPECIFIC PARAMETERS
-         * @param {int} [params.side] 0: all 1: sell, 2: buy
+         * @param {int} [since] the earliest time in ms to fetch positions for
+         * @param {int} [limit] the maximum amount of records to fetch, default is 10
+         * @param {object} [params] extra parameters specific to the exchange api endpoint
+         * @param {int} [params.until] the latest time in ms to fetch positions for
          * @returns {object[]} a list of [position structures]{@link https://docs.ccxt.com/#/?id=position-structure}
          */
         await this.loadMarkets();
         const market = this.market(symbol);
-        if (limit === undefined) {
-            limit = 1000;
-        }
-        const request = {
+        let request = {
+            'market_type': 'FUTURES',
             'market': market['id'],
-            'side': 0,
-            'limit': limit,
         };
-        const response = await this.v1PerpetualPrivateGetPositionFinished(this.extend(request, params));
+        if (limit !== undefined) {
+            request['limit'] = limit;
+        }
+        if (since !== undefined) {
+            request['start_time'] = since;
+        }
+        [request, params] = this.handleUntilOption('end_time', request, params);
+        const response = await this.v2PrivateGetFuturesFinishedPosition(this.extend(request, params));
         //
-        //    {
-        //        code: '0',
-        //        data: {
-        //            limit: '1000',
-        //            offset: '0',
-        //            records: [
-        //                {
-        //                    amount_max: '10',
-        //                    amount_max_margin: '2.03466666666666666666',
-        //                    bkr_price: '0',
-        //                    create_time: '1711150526.2581',
-        //                    deal_all: '12.591',
-        //                    deal_asset_fee: '0',
-        //                    fee_asset: '',
-        //                    finish_type: '5',
-        //                    first_price: '0.6104',
-        //                    latest_price: '0.6487',
-        //                    leverage: '3',
-        //                    liq_amount: '0',
-        //                    liq_price: '0',
-        //                    liq_profit: '0',
-        //                    mainten_margin: '0.01',
-        //                    market: 'XRPUSDT',
-        //                    market_type: '1',
-        //                    open_price: '0.6104',
-        //                    open_val_max: '6.104',
-        //                    position_id: '297371462',
-        //                    profit_real: '0.35702107169',
-        //                    settle_price: '0.6104',
-        //                    settle_val: '0',
-        //                    side: '2',
-        //                    sy s: '0',
-        //                    type: '2',
-        //                    update_time: '1711391446.133233',
-        //                    user_id: '3685860'
-        //                },
-        //                ...
-        //            ]
-        //        },
-        //        message: 'OK'
-        //    }
+        //     {
+        //         "code": 0,
+        //         "data": [
+        //             {
+        //                 "position_id": 305891033,
+        //                 "market": "BTCUSDT",
+        //                 "market_type": "FUTURES",
+        //                 "side": "long",
+        //                 "margin_mode": "cross",
+        //                 "open_interest": "0.0001",
+        //                 "close_avbl": "0.0001",
+        //                 "ath_position_amount": "0.0001",
+        //                 "unrealized_pnl": "0",
+        //                 "realized_pnl": "-0.00311684",
+        //                 "avg_entry_price": "62336.8",
+        //                 "cml_position_value": "6.23368",
+        //                 "max_position_value": "6.23368",
+        //                 "created_at": 1715152208041,
+        //                 "updated_at": 1715152208041,
+        //                 "take_profit_price": "0",
+        //                 "stop_loss_price": "0",
+        //                 "take_profit_type": "",
+        //                 "stop_loss_type": "",
+        //                 "settle_price": "62336.8",
+        //                 "settle_value": "6.23368",
+        //                 "leverage": "3",
+        //                 "margin_avbl": "2.07789333",
+        //                 "ath_margin_size": "2.07789333",
+        //                 "position_margin_rate": "2.40545879023305655728",
+        //                 "maintenance_margin_rate": "0.005",
+        //                 "maintenance_margin_value": "0.03118094",
+        //                 "liq_price": "0",
+        //                 "bkr_price": "0",
+        //                 "adl_level": 1
+        //             }
+        //         ],
+        //         "message": "OK",
+        //         "pagination": {
+        //             "has_next": false
+        //         }
+        //     }
         //
-        const data = this.safeDict(response, 'data');
-        const records = this.safeList(data, 'records');
+        const records = this.safeList(response, 'data', []);
         const positions = this.parsePositions(records);
         return this.filterBySymbolSinceLimit(positions, symbol, since, limit);
     }