ccxt 4.1.58 → 4.1.59

package/js/src/bitget.js

@@ -33,7 +33,8 @@ export default class bitget extends Exchange {
                 'future': true,
                 'option': false,
                 'addMargin': true,
-                'borrowMargin': true,
+                'borrowCrossMargin': true,
+                'borrowIsolatedMargin': true,
                 'cancelAllOrders': true,
                 'cancelOrder': true,
                 'cancelOrders': true,
@@ -97,7 +98,8 @@ export default class bitget extends Exchange {
                 'fetchWithdrawal': false,
                 'fetchWithdrawals': true,
                 'reduceMargin': true,
-                'repayMargin': true,
+                'repayCrossMargin': true,
+                'repayIsolatedMargin': true,
                 'setLeverage': true,
                 'setMarginMode': true,
                 'setPositionMode': true,
@@ -6298,18 +6300,15 @@ export default class bitget extends Exchange {
             'info': interest,
         }, market);
     }
-    async borrowMargin(code, amount, symbol = undefined, params = {}) {
+    async borrowCrossMargin(code, amount, params = {}) {
         /**
          * @method
-         * @name bitget#borrowMargin
+         * @name bitget#borrowCrossMargin
          * @description create a loan to borrow margin
          * @see https://bitgetlimited.github.io/apidoc/en/margin/#cross-borrow
-         * @see https://bitgetlimited.github.io/apidoc/en/margin/#isolated-borrow
          * @param {string} code unified currency code of the currency to borrow
          * @param {string} amount the amount to borrow
-         * @param {string} [symbol] unified market symbol
          * @param {object} [params] extra parameters specific to the bitget api endpoint
-         * @param {string} [params.marginMode] 'isolated' or 'cross', symbol is required for 'isolated'
          * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
          */
         await this.loadMarkets();
@@ -6318,91 +6317,91 @@ export default class bitget extends Exchange {
             'coin': currency['info']['coinName'],
             'borrowAmount': this.currencyToPrecision(code, amount),
         };
-        let response = undefined;
-        let marginMode = undefined;
-        [marginMode, params] = this.handleMarginModeAndParams('borrowMargin', params);
-        if ((symbol !== undefined) || (marginMode === 'isolated')) {
-            if (symbol === undefined) {
-                throw new ArgumentsRequired(this.id + ' borrowMargin() requires a symbol argument');
-            }
-            const market = this.market(symbol);
-            const marketId = market['id'];
-            const parts = marketId.split('_');
-            const marginMarketId = this.safeStringUpper(parts, 0);
-            request['symbol'] = marginMarketId;
-            response = await this.privateMarginPostMarginV1IsolatedAccountBorrow(this.extend(request, params));
-        }
-        else {
-            response = await this.privateMarginPostMarginV1CrossAccountBorrow(this.extend(request, params));
-        }
+        const response = await this.privateMarginPostMarginV1CrossAccountBorrow(this.extend(request, params));
         //
-        // isolated
+        // cross
         //
         //     {
         //         "code": "00000",
         //         "msg": "success",
-        //         "requestTime": 1697250952516,
+        //         "requestTime": 1697251314271,
         //         "data": {
         //             "clientOid": null,
-        //             "symbol": "BTCUSDT",
         //             "coin": "BTC",
-        //             "borrowAmount": "0.001"
+        //             "borrowAmount": "0.0001"
         //         }
         //     }
         //
-        // cross
+        const data = this.safeValue(response, 'data', {});
+        return this.parseMarginLoan(data, currency);
+    }
+    async borrowIsolatedMargin(symbol, code, amount, params = {}) {
+        /**
+         * @method
+         * @name bitget#borrowIsolatedMargin
+         * @description create a loan to borrow margin
+         * @see https://bitgetlimited.github.io/apidoc/en/margin/#isolated-borrow
+         * @param {string} symbol unified market symbol
+         * @param {string} code unified currency code of the currency to borrow
+         * @param {string} amount the amount to borrow
+         * @param {object} [params] extra parameters specific to the bitget api endpoint
+         * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
+         */
+        await this.loadMarkets();
+        const currency = this.currency(code);
+        const market = this.market(symbol);
+        const marketId = market['id'];
+        const parts = marketId.split('_');
+        const marginMarketId = this.safeStringUpper(parts, 0);
+        const request = {
+            'coin': currency['info']['coinName'],
+            'borrowAmount': this.currencyToPrecision(code, amount),
+            'symbol': marginMarketId,
+        };
+        const response = await this.privateMarginPostMarginV1IsolatedAccountBorrow(this.extend(request, params));
+        //
+        // isolated
         //
         //     {
         //         "code": "00000",
         //         "msg": "success",
-        //         "requestTime": 1697251314271,
+        //         "requestTime": 1697250952516,
         //         "data": {
         //             "clientOid": null,
+        //             "symbol": "BTCUSDT",
         //             "coin": "BTC",
-        //             "borrowAmount": "0.0001"
+        //             "borrowAmount": "0.001"
         //         }
         //     }
         //
         const data = this.safeValue(response, 'data', {});
         return this.parseMarginLoan(data, currency);
     }
-    async repayMargin(code, amount, symbol = undefined, params = {}) {
+    async repayIsolatedMargin(symbol, code, amount, params = {}) {
         /**
          * @method
-         * @name bitget#repayMargin
+         * @name bitget#repayIsolatedMargin
          * @description repay borrowed margin and interest
          * @see https://bitgetlimited.github.io/apidoc/en/margin/#cross-repay
          * @see https://bitgetlimited.github.io/apidoc/en/margin/#isolated-repay
+         * @param {string} symbol unified market symbol
          * @param {string} code unified currency code of the currency to repay
          * @param {string} amount the amount to repay
-         * @param {string} [symbol] unified market symbol
          * @param {object} [params] extra parameters specific to the bitget api endpoint
-         * @param {string} [params.marginMode] 'isolated' or 'cross', symbol is required for 'isolated'
          * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
          */
         await this.loadMarkets();
         const currency = this.currency(code);
+        const market = this.market(symbol);
+        const marketId = market['id'];
+        const parts = marketId.split('_');
+        const marginMarketId = this.safeStringUpper(parts, 0);
         const request = {
             'coin': currency['info']['coinName'],
             'repayAmount': this.currencyToPrecision(code, amount),
+            'symbol': marginMarketId,
         };
-        let response = undefined;
-        let marginMode = undefined;
-        [marginMode, params] = this.handleMarginModeAndParams('repayMargin', params);
-        if ((symbol !== undefined) || (marginMode === 'isolated')) {
-            if (symbol === undefined) {
-                throw new ArgumentsRequired(this.id + ' repayMargin() requires a symbol argument');
-            }
-            const market = this.market(symbol);
-            const marketId = market['id'];
-            const parts = marketId.split('_');
-            const marginMarketId = this.safeStringUpper(parts, 0);
-            request['symbol'] = marginMarketId;
-            response = await this.privateMarginPostMarginV1IsolatedAccountRepay(this.extend(request, params));
-        }
-        else {
-            response = await this.privateMarginPostMarginV1CrossAccountRepay(this.extend(request, params));
-        }
+        const response = await this.privateMarginPostMarginV1IsolatedAccountRepay(this.extend(request, params));
         //
         // isolated
         //
@@ -6419,6 +6418,29 @@ export default class bitget extends Exchange {
         //         }
         //     }
         //
+        const data = this.safeValue(response, 'data', {});
+        return this.parseMarginLoan(data, currency);
+    }
+    async repayCrossMargin(code, amount, params = {}) {
+        /**
+         * @method
+         * @name bitget#repayCrossMargin
+         * @description repay borrowed margin and interest
+         * @see https://bitgetlimited.github.io/apidoc/en/margin/#cross-repay
+         * @see https://bitgetlimited.github.io/apidoc/en/margin/#isolated-repay
+         * @param {string} code unified currency code of the currency to repay
+         * @param {string} amount the amount to repay
+         * @param {object} [params] extra parameters specific to the bitget api endpoint
+         * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
+         */
+        await this.loadMarkets();
+        const currency = this.currency(code);
+        const request = {
+            'coin': currency['info']['coinName'],
+            'repayAmount': this.currencyToPrecision(code, amount),
+        };
+        const response = await this.privateMarginPostMarginV1CrossAccountRepay(this.extend(request, params));
+        //
         // cross
         //
         //     {

package/js/src/bitmart.d.ts

@@ -101,8 +101,8 @@ export default class bitmart extends Exchange {
     fetchWithdrawals(code?: Str, since?: Int, limit?: Int, params?: {}): Promise<Transaction[]>;
     parseTransactionStatus(status: any): string;
     parseTransaction(transaction: any, currency?: Currency): Transaction;
-    repayMargin(code: string, amount: any, symbol?: Str, params?: {}): Promise<any>;
-    borrowMargin(code: string, amount: any, symbol?: Str, params?: {}): Promise<any>;
+    repayIsolatedMargin(symbol: string, code: string, amount: any, params?: {}): Promise<any>;
+    borrowIsolatedMargin(symbol: string, code: string, amount: any, params?: {}): Promise<any>;
     parseMarginLoan(info: any, currency?: Currency): {
         id: string;
         currency: string;

package/js/src/bitmart.js

@@ -34,7 +34,8 @@ export default class bitmart extends Exchange {
                 'swap': true,
                 'future': false,
                 'option': false,
-                'borrowMargin': true,
+                'borrowCrossMargin': false,
+                'borrowIsolatedMargin': true,
                 'cancelAllOrders': true,
                 'cancelOrder': true,
                 'cancelOrders': false,
@@ -96,7 +97,8 @@ export default class bitmart extends Exchange {
                 'fetchWithdrawal': true,
                 'fetchWithdrawals': true,
                 'reduceMargin': false,
-                'repayMargin': true,
+                'repayCrossMargin': false,
+                'repayIsolatedMargin': true,
                 'setLeverage': true,
                 'setMarginMode': false,
                 'transfer': true,
@@ -3200,22 +3202,18 @@ export default class bitmart extends Exchange {
             'fee': fee,
         };
     }
-    async repayMargin(code, amount, symbol = undefined, params = {}) {
+    async repayIsolatedMargin(symbol, code, amount, params = {}) {
         /**
          * @method
-         * @name bitmart#repayMargin
+         * @name bitmart#repayIsolatedMargin
          * @description repay borrowed margin and interest
          * @see https://developer-pro.bitmart.com/en/spot/#margin-repay-isolated
+         * @param {string} symbol unified market symbol
          * @param {string} code unified currency code of the currency to repay
          * @param {string} amount the amount to repay
-         * @param {string} symbol unified market symbol
          * @param {object} [params] extra parameters specific to the bitmart api endpoint
-         * @param {string} [params.marginMode] 'isolated' is the default and 'cross' is unavailable
          * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
          */
-        if (symbol === undefined) {
-            throw new ArgumentsRequired(this.id + ' repayMargin() requires a symbol argument');
-        }
         await this.loadMarkets();
         const market = this.market(symbol);
         const currency = this.currency(code);
@@ -3224,7 +3222,6 @@ export default class bitmart extends Exchange {
             'currency': currency['id'],
             'amount': this.currencyToPrecision(code, amount),
         };
-        params = this.omit(params, 'marginMode');
         const response = await this.privatePostSpotV1MarginIsolatedRepay(this.extend(request, params));
         //
         //     {
@@ -3243,22 +3240,18 @@ export default class bitmart extends Exchange {
             'symbol': symbol,
         });
     }
-    async borrowMargin(code, amount, symbol = undefined, params = {}) {
+    async borrowIsolatedMargin(symbol, code, amount, params = {}) {
         /**
          * @method
-         * @name bitmart#borrowMargin
+         * @name bitmart#borrowIsolatedMargin
          * @description create a loan to borrow margin
          * @see https://developer-pro.bitmart.com/en/spot/#margin-borrow-isolated
+         * @param {string} symbol unified market symbol
          * @param {string} code unified currency code of the currency to borrow
          * @param {string} amount the amount to borrow
-         * @param {string} symbol unified market symbol
          * @param {object} [params] extra parameters specific to the bitmart api endpoint
-         * @param {string} [params.marginMode] 'isolated' is the default and 'cross' is unavailable
          * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
          */
-        if (symbol === undefined) {
-            throw new ArgumentsRequired(this.id + ' borrowMargin() requires a symbol argument');
-        }
         await this.loadMarkets();
         const market = this.market(symbol);
         const currency = this.currency(code);
@@ -3267,7 +3260,6 @@ export default class bitmart extends Exchange {
             'currency': currency['id'],
             'amount': this.currencyToPrecision(code, amount),
         };
-        params = this.omit(params, 'marginMode');
         const response = await this.privatePostSpotV1MarginIsolatedBorrow(this.extend(request, params));
         //
         //     {

package/js/src/bitrue.js

@@ -96,7 +96,7 @@ export default class bitrue extends Exchange {
                     'kline': 'https://www.bitrue.com/kline-api',
                 },
                 'www': 'https://www.bitrue.com',
-                'referral': 'https://www.bitrue.com/activity/task/task-landing?inviteCode=EZWETQE&cn=900000',
+                'referral': 'https://www.bitrue.com/affiliate/landing?cn=600000&inviteCode=EZWETQE',
                 'doc': [
                     'https://github.com/Bitrue-exchange/bitrue-official-api-docs',
                 ],

package/js/src/bybit.d.ts

@@ -157,8 +157,8 @@ export default class bybit extends Exchange {
     };
     transfer(code: string, amount: any, fromAccount: any, toAccount: any, params?: {}): Promise<any>;
     fetchTransfers(code?: Str, since?: Int, limit?: Int, params?: {}): Promise<any>;
-    borrowMargin(code: string, amount: any, symbol?: Str, params?: {}): Promise<any>;
-    repayMargin(code: string, amount: any, symbol?: Str, params?: {}): Promise<any>;
+    borrowCrossMargin(code: string, amount: any, params?: {}): Promise<any>;
+    repayCrossMargin(code: string, amount: any, params?: {}): Promise<any>;
     parseMarginLoan(info: any, currency?: Currency): {
         id: string;
         currency: string;

package/js/src/bybit.js

@@ -35,6 +35,7 @@ export default class bybit extends Exchange {
                 'swap': true,
                 'future': true,
                 'option': true,
+                'borrowCrossMargin': true,
                 'cancelAllOrders': true,
                 'cancelOrder': true,
                 'createOrder': true,
@@ -97,6 +98,7 @@ export default class bybit extends Exchange {
                 'fetchUnderlyingAssets': false,
                 'fetchVolatilityHistory': true,
                 'fetchWithdrawals': true,
+                'repayCrossMargin': true,
                 'setLeverage': true,
                 'setMarginMode': true,
                 'setPositionMode': true,
@@ -3434,7 +3436,9 @@ export default class bybit extends Exchange {
         const result = await this.fetchOrders(symbol, undefined, undefined, this.extend(request, params));
         const length = result.length;
         if (length === 0) {
-            throw new OrderNotFound('Order ' + id.toString() + ' does not exist.');
+            const isTrigger = this.safeValueN(params, ['trigger', 'stop'], false);
+            const extra = isTrigger ? '' : 'If you are trying to fetch SL/TP conditional order, you might try setting params["trigger"] = true';
+            throw new OrderNotFound('Order ' + id.toString() + ' was not found.' + extra);
         }
         if (length > 1) {
             throw new InvalidOrder(this.id + ' returned more than one order');
@@ -3460,7 +3464,7 @@ export default class bybit extends Exchange {
          * @param {boolean} [params.isLeverage] *unified spot only* false then spot trading true then margin trading
          * @param {string} [params.tpslMode] *contract only* 'full' or 'partial'
          * @param {string} [params.mmp] *option only* market maker protection
-         * @param {string} [params.triggerDirection] *contract only* the direction for trigger orders, 'up' or 'down'
+         * @param {string} [params.triggerDirection] *contract only* the direction for trigger orders, 'above' or 'below'
          * @param {float} [params.triggerPrice] The price at which a trigger order is triggered at
          * @param {float} [params.stopLossPrice] The price at which a stop loss order is triggered at
          * @param {float} [params.takeProfitPrice] The price at which a take profit order is triggered at
@@ -3592,21 +3596,30 @@ export default class bybit extends Exchange {
         const isStopLoss = stopLoss !== undefined;
         const isTakeProfit = takeProfit !== undefined;
         const isBuy = side === 'buy';
-        const setTriggerDirection = (stopLossTriggerPrice || triggerPrice) ? !isBuy : isBuy;
-        const defaultTriggerDirection = setTriggerDirection ? 2 : 1;
-        const triggerDirection = this.safeString(params, 'triggerDirection');
-        params = this.omit(params, 'triggerDirection');
-        let selectedDirection = defaultTriggerDirection;
-        if (triggerDirection !== undefined) {
-            const isAsending = ((triggerDirection === 'up') || (triggerDirection === '1'));
-            selectedDirection = isAsending ? 1 : 2;
-        }
         if (triggerPrice !== undefined) {
-            request['triggerDirection'] = selectedDirection;
+            const triggerDirection = this.safeString(params, 'triggerDirection');
+            params = this.omit(params, ['triggerPrice', 'stopPrice', 'triggerDirection']);
+            if (market['spot']) {
+                if (triggerDirection !== undefined) {
+                    throw new NotSupported(this.id + ' createOrder() : trigger order does not support triggerDirection for spot markets yet');
+                }
+            }
+            else {
+                if (triggerDirection === undefined) {
+                    throw new ArgumentsRequired(this.id + ' stop/trigger orders require a triggerDirection parameter, either "above" or "below" to determine the direction of the trigger.');
+                }
+                const isAsending = ((triggerDirection === 'above') || (triggerDirection === '1'));
+                request['triggerDirection'] = isAsending ? 1 : 2;
+            }
             request['triggerPrice'] = this.priceToPrecision(symbol, triggerPrice);
         }
         else if (isStopLossTriggerOrder || isTakeProfitTriggerOrder) {
-            request['triggerDirection'] = selectedDirection;
+            if (isBuy) {
+                request['triggerDirection'] = isStopLossTriggerOrder ? 1 : 2;
+            }
+            else {
+                request['triggerDirection'] = isStopLossTriggerOrder ? 2 : 1;
+            }
             triggerPrice = isStopLossTriggerOrder ? stopLossTriggerPrice : takeProfitTriggerPrice;
             request['triggerPrice'] = this.priceToPrecision(symbol, triggerPrice);
             request['reduceOnly'] = true;
@@ -4406,8 +4419,8 @@ export default class bybit extends Exchange {
             return await this.fetchUsdcOrders(symbol, since, limit, params);
         }
         request['category'] = type;
-        const isStop = this.safeValue(params, 'stop', false);
-        params = this.omit(params, ['stop']);
+        const isStop = this.safeValueN(params, ['trigger', 'stop'], false);
+        params = this.omit(params, ['trigger', 'stop']);
         if (isStop) {
             if (type === 'spot') {
                 request['orderFilter'] = 'tpslOrder';
@@ -6613,29 +6626,24 @@ export default class bybit extends Exchange {
         const data = this.addPaginationCursorToResult(response);
         return this.parseTransfers(data, currency, since, limit);
     }
-    async borrowMargin(code, amount, symbol = undefined, params = {}) {
+    async borrowCrossMargin(code, amount, params = {}) {
         /**
          * @method
-         * @name bybit#borrowMargin
+         * @name bybit#borrowCrossMargin
          * @description create a loan to borrow margin
          * @see https://bybit-exchange.github.io/docs/v5/spot-margin-normal/borrow
          * @param {string} code unified currency code of the currency to borrow
          * @param {float} amount the amount to borrow
-         * @param {string} symbol not used by bybit.borrowMargin ()
          * @param {object} [params] extra parameters specific to the bybit api endpoint
          * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
          */
         await this.loadMarkets();
         const currency = this.currency(code);
-        const [marginMode, query] = this.handleMarginModeAndParams('borrowMargin', params);
-        if (marginMode === 'isolated') {
-            throw new NotSupported(this.id + ' borrowMargin () cannot use isolated margin');
-        }
         const request = {
             'coin': currency['id'],
             'qty': this.currencyToPrecision(code, amount),
         };
-        const response = await this.privatePostV5SpotCrossMarginTradeLoan(this.extend(request, query));
+        const response = await this.privatePostV5SpotCrossMarginTradeLoan(this.extend(request, params));
         //
         //     {
         //         "retCode": 0,
@@ -6650,33 +6658,28 @@ export default class bybit extends Exchange {
         const result = this.safeValue(response, 'result', {});
         const transaction = this.parseMarginLoan(result, currency);
         return this.extend(transaction, {
-            'symbol': symbol,
+            'symbol': undefined,
             'amount': amount,
         });
     }
-    async repayMargin(code, amount, symbol = undefined, params = {}) {
+    async repayCrossMargin(code, amount, params = {}) {
         /**
          * @method
-         * @name bybit#repayMargin
+         * @name bybit#repayCrossMargin
          * @description repay borrowed margin and interest
          * @see https://bybit-exchange.github.io/docs/v5/spot-margin-normal/repay
          * @param {string} code unified currency code of the currency to repay
          * @param {float} amount the amount to repay
-         * @param {string} symbol not used by bybit.repayMargin ()
          * @param {object} [params] extra parameters specific to the bybit api endpoint
          * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
          */
         await this.loadMarkets();
         const currency = this.currency(code);
-        const [marginMode, query] = this.handleMarginModeAndParams('repayMargin', params);
-        if (marginMode === 'isolated') {
-            throw new NotSupported(this.id + ' repayMargin () cannot use isolated margin');
-        }
         const request = {
             'coin': currency['id'],
             'qty': this.numberToString(amount),
         };
-        const response = await this.privatePostV5SpotCrossMarginTradeRepay(this.extend(request, query));
+        const response = await this.privatePostV5SpotCrossMarginTradeRepay(this.extend(request, params));
         //
         //     {
         //         "retCode": 0,
@@ -6691,7 +6694,7 @@ export default class bybit extends Exchange {
         const result = this.safeValue(response, 'result', {});
         const transaction = this.parseMarginLoan(result, currency);
         return this.extend(transaction, {
-            'symbol': symbol,
+            'symbol': undefined,
             'amount': amount,
         });
     }

package/js/src/coinex.d.ts

@@ -190,8 +190,8 @@ export default class coinex extends Exchange {
         datetime: string;
         info: any;
     };
-    borrowMargin(code: string, amount: any, symbol?: Str, params?: {}): Promise<any>;
-    repayMargin(code: string, amount: any, symbol?: Str, params?: {}): Promise<any>;
+    borrowIsolatedMargin(symbol: string, code: string, amount: any, params?: {}): Promise<any>;
+    repayIsolatedMargin(symbol: string, code: string, amount: any, params?: {}): Promise<any>;
     parseMarginLoan(info: any, currency?: Currency): {
         id: number;
         currency: string;

package/js/src/coinex.js

@@ -41,7 +41,8 @@ export default class coinex extends Exchange {
                 'future': false,
                 'option': false,
                 'addMargin': true,
-                'borrowMargin': true,
+                'borrowCrossMargin': false,
+                'borrowIsolatedMargin': true,
                 'cancelAllOrders': true,
                 'cancelOrder': true,
                 'createDepositAddress': true,
@@ -94,7 +95,8 @@ export default class coinex extends Exchange {
                 'fetchWithdrawal': false,
                 'fetchWithdrawals': true,
                 'reduceMargin': true,
-                'repayMargin': true,
+                'repayCrossMargin': false,
+                'repayIsolatedMargin': true,
                 'setLeverage': true,
                 'setMarginMode': true,
                 'setPositionMode': false,
@@ -3259,16 +3261,19 @@ export default class coinex extends Exchange {
         const maintenanceMargin = this.safeString(position, 'mainten_margin_amount');
         const maintenanceMarginPercentage = this.safeString(position, 'mainten_margin');
         const collateral = this.safeString(position, 'margin_amount');
-        const leverage = this.safeNumber(position, 'leverage');
+        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);
         return this.safePosition({
             'info': position,
             'id': positionId,
             'symbol': symbol,
-            'notional': undefined,
+            'notional': this.parseNumber(notional),
             'marginMode': marginMode,
             'liquidationPrice': liquidationPrice,
-            'entryPrice': entryPrice,
-            'unrealizedPnl': unrealizedPnl,
+            'entryPrice': this.parseNumber(entryPrice),
+            'unrealizedPnl': this.parseNumber(unrealizedPnl),
             'percentage': undefined,
             'contracts': contracts,
             'contractSize': this.safeNumber(market, 'contractSize'),
@@ -3279,15 +3284,15 @@ export default class coinex extends Exchange {
             'timestamp': timestamp,
             'datetime': this.iso8601(timestamp),
             'lastUpdateTimestamp': undefined,
-            'maintenanceMargin': maintenanceMargin,
-            'maintenanceMarginPercentage': maintenanceMarginPercentage,
-            'collateral': collateral,
-            'initialMargin': undefined,
-            'initialMarginPercentage': undefined,
-            'leverage': leverage,
+            '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,
-            'stopLossPrice': this.safeNumber(position, 'stop_loss_price'),
-            'takeProfitPrice': this.safeNumber(position, 'take_profit_price'),
+            'stopLossPrice': this.omitZero(this.safeString(position, 'stop_loss_price')),
+            'takeProfitPrice': this.omitZero(this.safeString(position, 'take_profit_price')),
         });
     }
     async setMarginMode(marginMode, symbol = undefined, params = {}) {
@@ -4606,21 +4611,18 @@ export default class coinex extends Exchange {
             'info': info,
         };
     }
-    async borrowMargin(code, amount, symbol = undefined, params = {}) {
+    async borrowIsolatedMargin(symbol, code, amount, params = {}) {
         /**
          * @method
-         * @name coinex#borrowMargin
+         * @name coinex#borrowIsolatedMargin
          * @description create a loan to borrow margin
          * @see https://github.com/coinexcom/coinex_exchange_api/wiki/086margin_loan
+         * @param {string} symbol unified market symbol, required for coinex
          * @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 coinex
          * @param {object} [params] extra parameters specific to the coinex api endpoint
          * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
          */
-        if (symbol === undefined) {
-            throw new ArgumentsRequired(this.id + ' borrowMargin() requires a symbol argument');
-        }
         await this.loadMarkets();
         const market = this.market(symbol);
         const currency = this.currency(code);
@@ -4646,22 +4648,19 @@ export default class coinex extends Exchange {
             'symbol': symbol,
         });
     }
-    async repayMargin(code, amount, symbol = undefined, params = {}) {
+    async repayIsolatedMargin(symbol, code, amount, params = {}) {
         /**
          * @method
-         * @name coinex#repayMargin
+         * @name coinex#repayIsolatedMargin
          * @description repay borrowed margin and interest
          * @see https://github.com/coinexcom/coinex_exchange_api/wiki/087margin_flat
+         * @param {string} symbol unified market symbol, required for coinex
          * @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 coinex
          * @param {object} [params] extra parameters specific to the coinex api endpoint
          * @param {string} [params.loan_id] extra parameter that is not required
          * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
          */
-        if (symbol === undefined) {
-            throw new ArgumentsRequired(this.id + ' repayMargin() requires a symbol argument');
-        }
         await this.loadMarkets();
         const market = this.market(symbol);
         const currency = this.currency(code);
@@ -4670,10 +4669,6 @@ export default class coinex extends Exchange {
             'coin_type': currency['id'],
             'amount': this.currencyToPrecision(code, amount),
         };
-        const loanId = this.safeInteger(params, 'loan_id');
-        if (loanId !== undefined) {
-            request['loan_id'] = loanId;
-        }
         const response = await this.privatePostMarginFlat(this.extend(request, params));
         //
         //     {