ccxt 4.0.101 → 4.0.103

package/js/src/bybit.js

@@ -7,7 +7,7 @@
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/bybit.js';
 import { TICK_SIZE } from './base/functions/number.js';
-import { AuthenticationError, ExchangeError, ArgumentsRequired, PermissionDenied, InvalidOrder, OrderNotFound, InsufficientFunds, BadRequest, RateLimitExceeded, InvalidNonce, NotSupported, RequestTimeout, BadSymbol } from './base/errors.js';
+import { AuthenticationError, ExchangeError, ArgumentsRequired, PermissionDenied, InvalidOrder, OrderNotFound, InsufficientFunds, BadRequest, RateLimitExceeded, InvalidNonce, NotSupported, RequestTimeout, BadSymbol, MarginModeAlreadySet, NoChange } from './base/errors.js';
 import { Precise } from './base/Precise.js';
 import { sha256 } from './static_dependencies/noble-hashes/sha256.js';
 import { rsa } from './base/functions/rsa.js';
@@ -727,12 +727,12 @@ export default class bybit extends Exchange {
                     '110021': InvalidOrder,
                     '110022': InvalidOrder,
                     '110023': InvalidOrder,
-                    '110024': InvalidOrder,
-                    '110025': InvalidOrder,
-                    '110026': BadRequest,
-                    '110027': InvalidOrder,
-                    '110028': InvalidOrder,
-                    '110029': InvalidOrder,
+                    '110024': BadRequest,
+                    '110025': NoChange,
+                    '110026': MarginModeAlreadySet,
+                    '110027': NoChange,
+                    '110028': BadRequest,
+                    '110029': BadRequest,
                     '110030': InvalidOrder,
                     '110031': InvalidOrder,
                     '110032': InvalidOrder,
@@ -3724,12 +3724,12 @@ export default class bybit extends Exchange {
         }
         else if (isStopLoss || isTakeProfit) {
             if (isStopLoss) {
-                const stopLossTriggerPrice = this.safeValue2(stopLoss, 'triggerPrice', 'stopPrice', stopLoss);
-                request['stopLoss'] = this.priceToPrecision(symbol, stopLossTriggerPrice);
+                const slTriggerPrice = this.safeValue2(stopLoss, 'triggerPrice', 'stopPrice', stopLoss);
+                request['stopLoss'] = this.priceToPrecision(symbol, slTriggerPrice);
             }
             if (isTakeProfit) {
-                const takeProfitTriggerPrice = this.safeValue2(takeProfit, 'triggerPrice', 'stopPrice', takeProfit);
-                request['takeProfit'] = this.priceToPrecision(symbol, takeProfitTriggerPrice);
+                const tpTriggerPrice = this.safeValue2(takeProfit, 'triggerPrice', 'stopPrice', takeProfit);
+                request['takeProfit'] = this.priceToPrecision(symbol, tpTriggerPrice);
             }
         }
         if (market['spot']) {
@@ -3838,12 +3838,12 @@ export default class bybit extends Exchange {
             }
             else if (isStopLoss || isTakeProfit) {
                 if (isStopLoss) {
-                    const stopLossTriggerPrice = this.safeValue2(stopLoss, 'triggerPrice', 'stopPrice', stopLoss);
-                    request['stopLoss'] = this.priceToPrecision(symbol, stopLossTriggerPrice);
+                    const slTriggerPrice = this.safeValue2(stopLoss, 'triggerPrice', 'stopPrice', stopLoss);
+                    request['stopLoss'] = this.priceToPrecision(symbol, slTriggerPrice);
                 }
                 if (isTakeProfit) {
-                    const takeProfitTriggerPrice = this.safeValue2(takeProfit, 'triggerPrice', 'stopPrice', takeProfit);
-                    request['takeProfit'] = this.priceToPrecision(symbol, takeProfitTriggerPrice);
+                    const tpTriggerPrice = this.safeValue2(takeProfit, 'triggerPrice', 'stopPrice', takeProfit);
+                    request['takeProfit'] = this.priceToPrecision(symbol, tpTriggerPrice);
                 }
             }
             else {
@@ -4024,12 +4024,12 @@ export default class bybit extends Exchange {
         }
         if (isStopLoss || isTakeProfit) {
             if (isStopLoss) {
-                const stopLossTriggerPrice = this.safeValue2(stopLoss, 'triggerPrice', 'stopPrice', stopLoss);
-                request['stopLoss'] = this.priceToPrecision(symbol, stopLossTriggerPrice);
+                const slTriggerPrice = this.safeValue2(stopLoss, 'triggerPrice', 'stopPrice', stopLoss);
+                request['stopLoss'] = this.priceToPrecision(symbol, slTriggerPrice);
             }
             if (isTakeProfit) {
-                const takeProfitTriggerPrice = this.safeValue2(takeProfit, 'triggerPrice', 'stopPrice', takeProfit);
-                request['takeProfit'] = this.priceToPrecision(symbol, takeProfitTriggerPrice);
+                const tpTriggerPrice = this.safeValue2(takeProfit, 'triggerPrice', 'stopPrice', takeProfit);
+                request['takeProfit'] = this.priceToPrecision(symbol, tpTriggerPrice);
             }
         }
         const clientOrderId = this.safeString(params, 'clientOrderId');
@@ -5999,12 +5999,10 @@ export default class bybit extends Exchange {
         await this.loadMarkets();
         const [enableUnifiedMargin, enableUnifiedAccount] = await this.isUnifiedEnabled();
         const isUnifiedAccount = (enableUnifiedMargin || enableUnifiedAccount);
+        let market = undefined;
         let response = undefined;
-        if (symbol === undefined) {
+        if (isUnifiedAccount) {
             if (marginMode === 'isolated') {
-                if (!isUnifiedAccount) {
-                    throw new NotSupported(this.id + ' setMarginMode() Normal Account not support ISOLATED_MARGIN');
-                }
                 marginMode = 'ISOLATED_MARGIN';
             }
             else if (marginMode === 'cross') {
@@ -6022,44 +6020,70 @@ export default class bybit extends Exchange {
             response = await this.privatePostV5AccountSetMarginMode(this.extend(request, params));
         }
         else {
-            const market = this.market(symbol);
-            let type = undefined;
-            [type, params] = this.getBybitType('setMarginMode', market, params);
-            if (type === 'linear') {
-                if (isUnifiedAccount) {
-                    throw new NotSupported(this.id + ' setMarginMode() with symbol Unified Account only support inverse contract');
+            if (symbol === undefined) {
+                throw new ArgumentsRequired(this.id + ' setMarginMode() requires a symbol parameter for non unified account');
+            }
+            market = this.market(symbol);
+            const isUsdcSettled = market['settle'] === 'USDC';
+            if (isUsdcSettled) {
+                if (marginMode === 'cross') {
+                    marginMode = 'REGULAR_MARGIN';
                 }
-                const isUsdtSettled = market['settle'] === 'USDT';
-                if (!isUsdtSettled) {
-                    throw new NotSupported(this.id + ' setMarginMode() with symbol only support USDT perpetual / inverse contract');
+                else if (marginMode === 'portfolio') {
+                    marginMode = 'PORTFOLIO_MARGIN';
                 }
-            }
-            else if (type !== 'inverse') {
-                throw new NotSupported(this.id + ' setMarginMode() does not support this market type');
-            }
-            let tradeMode = undefined;
-            if (marginMode === 'cross') {
-                tradeMode = 0;
-            }
-            else if (marginMode === 'isolated') {
-                tradeMode = 1;
+                else {
+                    throw new NotSupported(this.id + ' setMarginMode() for usdc market marginMode must be either [cross, portfolio]');
+                }
+                const request = {
+                    'setMarginMode': marginMode,
+                };
+                response = await this.privatePostV5AccountSetMarginMode(this.extend(request, params));
             }
             else {
-                throw new NotSupported(this.id + ' setMarginMode() with symbol marginMode must be either [isolated, cross]');
-            }
-            const leverage = this.safeString(params, 'leverage');
-            params = this.omit(params, ['leverage']);
-            if (leverage === undefined) {
-                throw new ArgumentsRequired(this.id + ' setMarginMode() with symbol requires leverage');
+                let type = undefined;
+                [type, params] = this.getBybitType('setPositionMode', market, params);
+                let tradeMode = undefined;
+                if (marginMode === 'cross') {
+                    tradeMode = 0;
+                }
+                else if (marginMode === 'isolated') {
+                    tradeMode = 1;
+                }
+                else {
+                    throw new NotSupported(this.id + ' setMarginMode() with symbol marginMode must be either [isolated, cross]');
+                }
+                let sellLeverage = undefined;
+                let buyLeverage = undefined;
+                const leverage = this.safeString(params, 'leverage');
+                if (leverage === undefined) {
+                    sellLeverage = this.safeString2(params, 'sell_leverage', 'sellLeverage');
+                    buyLeverage = this.safeString2(params, 'buy_leverage', 'buyLeverage');
+                    if (sellLeverage === undefined && buyLeverage === undefined) {
+                        throw new ArgumentsRequired(this.id + ' setMarginMode() requires a leverage parameter or sell_leverage and buy_leverage parameters');
+                    }
+                    if (buyLeverage === undefined) {
+                        buyLeverage = sellLeverage;
+                    }
+                    if (sellLeverage === undefined) {
+                        sellLeverage = buyLeverage;
+                    }
+                    params = this.omit(params, ['buy_leverage', 'sell_leverage', 'sellLeverage', 'buyLeverage']);
+                }
+                else {
+                    sellLeverage = leverage;
+                    buyLeverage = leverage;
+                    params = this.omit(params, 'leverage');
+                }
+                const request = {
+                    'category': type,
+                    'symbol': market['id'],
+                    'tradeMode': tradeMode,
+                    'buyLeverage': buyLeverage,
+                    'sellLeverage': sellLeverage,
+                };
+                response = await this.privatePostV5PositionSwitchIsolated(this.extend(request, params));
             }
-            const request = {
-                'category': type,
-                'symbol': market['id'],
-                'tradeMode': tradeMode,
-                'buyLeverage': leverage,
-                'sellLeverage': leverage,
-            };
-            response = await this.privatePostV5PositionSwitchIsolated(this.extend(request, params));
         }
         return response;
     }