ccxt 4.1.98 → 4.1.99

package/js/src/coinex.js

@@ -211,6 +211,8 @@ export default class coinex extends Exchange {
                     },
                     'put': {
                         'balance/deposit/address/{coin_type}': 40,
+                        'sub_account/unfrozen': 40,
+                        'sub_account/frozen': 40,
                         'sub_account/auth/api/{user_auth_id}': 40,
                         'v1/account/settings': 40,
                     },
@@ -220,7 +222,10 @@ export default class coinex extends Exchange {
                         'order/pending': 13.334,
                         'order/stop/pending': 40,
                         'order/stop/pending/{id}': 13.334,
+                        'order/pending/by_client_id': 40,
+                        'order/stop/pending/by_client_id': 40,
                         'sub_account/auth/api/{user_auth_id}': 40,
+                        'sub_account/authorize/{id}': 40,
                     },
                 },
                 'perpetualPublic': {
@@ -234,12 +239,12 @@ export default class coinex extends Exchange {
                         'market/depth': 1,
                         'market/deals': 1,
                         'market/funding_history': 1,
-                        'market/user_deals': 1,
                         'market/kline': 1,
                     },
                 },
                 'perpetualPrivate': {
                     'get': {
+                        'market/user_deals': 1,
                         'asset/query': 40,
                         'order/pending': 8,
                         'order/finished': 40,
@@ -247,8 +252,13 @@ export default class coinex extends Exchange {
                         'order/stop_pending': 8,
                         'order/status': 8,
                         'order/stop_status': 8,
+                        'position/finished': 40,
                         'position/pending': 40,
                         'position/funding': 40,
+                        'position/adl_history': 40,
+                        'market/preference': 40,
+                        'position/margin_history': 40,
+                        'position/settle_history': 40,
                     },
                     'post': {
                         'market/adjust_leverage': 1,
@@ -270,6 +280,9 @@ export default class coinex extends Exchange {
                         'position/stop_loss': 20,
                         'position/take_profit': 20,
                         'position/market_close': 20,
+                        'order/cancel/by_client_id': 20,
+                        'order/cancel_stop/by_client_id': 20,
+                        'market/preference': 20,
                     },
                 },
             },
@@ -1090,9 +1103,10 @@ export default class coinex extends Exchange {
         const priceString = this.safeString(trade, 'price');
         const amountString = this.safeString(trade, 'amount');
         const marketId = this.safeString(trade, 'market');
-        const defaultType = this.safeString(this.options, 'defaultType');
+        const marketType = this.safeString(trade, 'market_type');
+        const defaultType = (marketType === undefined) ? 'spot' : 'swap';
         market = this.safeMarket(marketId, market, undefined, defaultType);
-        const symbol = this.safeSymbol(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');
@@ -2590,11 +2604,17 @@ export default class coinex extends Exchange {
          * @description cancels an open order
          * @see https://viabtc.github.io/coinex_api_en_doc/spot/#docsspot003_trade018_cancle_stop_pending_order
          * @see https://viabtc.github.io/coinex_api_en_doc/spot/#docsspot003_trade015_cancel_order
+         * @see https://viabtc.github.io/coinex_api_en_doc/spot/#docsspot003_trade024_cancel_order_by_client_id
+         * @see https://viabtc.github.io/coinex_api_en_doc/spot/#docsspot003_trade025_cancel_stop_order_by_client_id
          * @see https://viabtc.github.io/coinex_api_en_doc/futures/#docsfutures001_http023_cancel_stop_order
          * @see https://viabtc.github.io/coinex_api_en_doc/futures/#docsfutures001_http021_cancel_order
+         * @see https://viabtc.github.io/coinex_api_en_doc/futures/#docsfutures001_http042_cancel_order_by_client_id
+         * @see https://viabtc.github.io/coinex_api_en_doc/futures/#docsfutures001_http043_cancel_stop_order_by_client_id
          * @param {string} id order id
          * @param {string} symbol unified symbol of the market the order was made in
          * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {string} [params.clientOrderId] client order id, defaults to id if not passed
+         * @param {boolean} [params.stop] if stop order = true, default = false
          * @returns {object} An [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         if (symbol === undefined) {
@@ -2607,32 +2627,54 @@ export default class coinex extends Exchange {
         const request = {
             'market': market['id'],
         };
-        const idRequest = swap ? 'order_id' : 'id';
-        request[idRequest] = id;
         const accountId = this.safeInteger(params, 'account_id');
         const defaultType = this.safeString(this.options, 'defaultType');
+        const clientOrderId = this.safeString2(params, 'client_id', 'clientOrderId');
         if (defaultType === 'margin') {
             if (accountId === undefined) {
                 throw new BadRequest(this.id + ' cancelOrder() requires an account_id parameter for margin orders');
             }
             request['account_id'] = accountId;
         }
-        const query = this.omit(params, ['stop', 'account_id']);
+        const query = this.omit(params, ['stop', 'account_id', 'clientOrderId']);
         let response = undefined;
-        if (stop) {
-            if (swap) {
-                response = await this.perpetualPrivatePostOrderCancelStop(this.extend(request, query));
+        if (clientOrderId !== undefined) {
+            request['client_id'] = clientOrderId;
+            if (stop) {
+                if (swap) {
+                    response = await this.perpetualPrivatePostOrderCancelStopByClientId(this.extend(request, query));
+                }
+                else {
+                    response = await this.privateDeleteOrderStopPendingByClientId(this.extend(request, query));
+                }
             }
             else {
-                response = await this.privateDeleteOrderStopPendingId(this.extend(request, query));
+                if (swap) {
+                    response = await this.perpetualPrivatePostOrderCancelByClientId(this.extend(request, query));
+                }
+                else {
+                    response = await this.privateDeleteOrderPendingByClientId(this.extend(request, query));
+                }
             }
         }
         else {
-            if (swap) {
-                response = await this.perpetualPrivatePostOrderCancel(this.extend(request, query));
+            const idRequest = swap ? 'order_id' : 'id';
+            request[idRequest] = id;
+            if (stop) {
+                if (swap) {
+                    response = await this.perpetualPrivatePostOrderCancelStop(this.extend(request, query));
+                }
+                else {
+                    response = await this.privateDeleteOrderStopPendingId(this.extend(request, query));
+                }
             }
             else {
-                response = await this.privateDeleteOrderPending(this.extend(request, query));
+                if (swap) {
+                    response = await this.perpetualPrivatePostOrderCancel(this.extend(request, query));
+                }
+                else {
+                    response = await this.privateDeleteOrderPending(this.extend(request, query));
+                }
             }
         }
         //
@@ -3374,16 +3416,11 @@ export default class coinex extends Exchange {
         }
         let response = undefined;
         if (swap) {
-            const side = this.safeInteger(params, 'side');
-            if (side === undefined) {
-                throw new ArgumentsRequired(this.id + ' fetchMyTrades() requires a side parameter for swap markets');
-            }
             if (since !== undefined) {
                 request['start_time'] = since;
             }
-            request['side'] = side;
-            params = this.omit(params, 'side');
-            response = await this.perpetualPublicGetMarketUserDeals(this.extend(request, params));
+            request['side'] = 0;
+            response = await this.perpetualPrivateGetMarketUserDeals(this.extend(request, params));
         }
         else {
             request['page'] = 1;
@@ -5312,7 +5349,7 @@ export default class coinex extends Exchange {
                 }
             }
         }
-        if (api === 'perpetualPrivate' || url === 'https://api.coinex.com/perpetual/v1/market/user_deals') {
+        if (api === 'perpetualPrivate') {
             this.checkRequiredCredentials();
             query = this.extend({
                 'access_id': this.apiKey,

package/js/src/kraken.js

@@ -1360,7 +1360,9 @@ export default class kraken extends Exchange {
          * @param {bool} [params.reduceOnly] *margin only* indicates if this order is to reduce the size of a position
          * @param {float} [params.stopLossPrice] *margin only* the price that a stop loss order is triggered at
          * @param {float} [params.takeProfitPrice] *margin only* the price that a take profit order is triggered at
-         * @param {string} [params.trailingStopPrice] *margin only* the quote amount to trail away from the current market price
+         * @param {string} [params.trailingAmount] *margin only* the quote amount to trail away from the current market price
+         * @param {string} [params.trailingLimitAmount] *margin only* the quote amount away from the trailingAmount
+         * @param {string} [params.offset] *margin only* '+' or '-' whether you want the trailingLimitAmount value to be positive or negative, default is negative '-'
          * @param {string} [params.trigger] *margin only* the activation price type, 'last' or 'index', default is 'last'
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
@@ -1621,9 +1623,10 @@ export default class kraken extends Exchange {
         const isStopLossTriggerOrder = stopLossTriggerPrice !== undefined;
         const isTakeProfitTriggerOrder = takeProfitTriggerPrice !== undefined;
         const isStopLossOrTakeProfitTrigger = isStopLossTriggerOrder || isTakeProfitTriggerOrder;
-        const trailingStopPrice = this.safeString(params, 'trailingStopPrice');
-        const isTrailingStopPriceOrder = trailingStopPrice !== undefined;
-        if (type === 'limit') {
+        const trailingAmount = this.safeString(params, 'trailingAmount');
+        const trailingLimitAmount = this.safeString(params, 'trailingLimitAmount');
+        const isTrailingAmountOrder = trailingAmount !== undefined;
+        if ((type === 'limit') && !isTrailingAmountOrder) {
             request['price'] = this.priceToPrecision(symbol, price);
         }
         let reduceOnly = this.safeValue2(params, 'reduceOnly', 'reduce_only');
@@ -1639,19 +1642,19 @@ export default class kraken extends Exchange {
             request['price2'] = this.priceToPrecision(symbol, price);
             reduceOnly = true;
         }
-        else if (isTrailingStopPriceOrder) {
-            const trailingStopActivationPriceType = this.safeString(params, 'trigger', 'last');
-            const trailingStopPriceString = '+' + trailingStopPrice;
-            request['trigger'] = trailingStopActivationPriceType;
-            reduceOnly = true;
-            if (type === 'limit') {
-                const trailingStopLimitPriceString = '+' + this.numberToString(price);
-                request['price'] = trailingStopPriceString;
-                request['price2'] = trailingStopLimitPriceString;
+        else if (isTrailingAmountOrder) {
+            const trailingActivationPriceType = this.safeString(params, 'trigger', 'last');
+            const trailingAmountString = '+' + trailingAmount;
+            request['trigger'] = trailingActivationPriceType;
+            if ((type === 'limit') || (trailingLimitAmount !== undefined)) {
+                const offset = this.safeString(params, 'offset', '-');
+                const trailingLimitAmountString = offset + this.numberToString(trailingLimitAmount);
+                request['price'] = trailingAmountString;
+                request['price2'] = trailingLimitAmountString;
                 request['ordertype'] = 'trailing-stop-limit';
             }
             else {
-                request['price'] = trailingStopPriceString;
+                request['price'] = trailingAmountString;
                 request['ordertype'] = 'trailing-stop';
             }
         }
@@ -1681,7 +1684,7 @@ export default class kraken extends Exchange {
         if (postOnly) {
             request['oflags'] = 'post';
         }
-        params = this.omit(params, ['timeInForce', 'reduceOnly', 'stopLossPrice', 'takeProfitPrice', 'trailingStopPrice']);
+        params = this.omit(params, ['timeInForce', 'reduceOnly', 'stopLossPrice', 'takeProfitPrice', 'trailingAmount', 'trailingLimitAmount', 'offset']);
         return [request, params];
     }
     async editOrder(id, symbol, type, side, amount = undefined, price = undefined, params = {}) {
@@ -1699,7 +1702,9 @@ export default class kraken extends Exchange {
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @param {float} [params.stopLossPrice] *margin only* the price that a stop loss order is triggered at
          * @param {float} [params.takeProfitPrice] *margin only* the price that a take profit order is triggered at
-         * @param {string} [params.trailingStopPrice] *margin only* the quote price away from the current market price
+         * @param {string} [params.trailingAmount] *margin only* the quote price away from the current market price
+         * @param {string} [params.trailingLimitAmount] *margin only* the quote amount away from the trailingAmount
+         * @param {string} [params.offset] *margin only* '+' or '-' whether you want the trailingLimitAmount value to be positive or negative, default is negative '-'
          * @param {string} [params.trigger] *margin only* the activation price type, 'last' or 'index', default is 'last'
          * @returns {object} an [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */

package/js/src/pro/binance.js

@@ -22,7 +22,7 @@ export default class binance extends binanceRest {
                 'watchBalance': true,
                 'watchMyTrades': true,
                 'watchOHLCV': true,
-                'watchOHLCVForSymbols': true,
+                'watchOHLCVForSymbols': false,
                 'watchOrderBook': true,
                 'watchOrderBookForSymbols': true,
                 'watchOrders': true,

package/js/src/pro/bitget.js

@@ -31,7 +31,7 @@ export default class bitget extends bitgetRest {
                 'watchBalance': true,
                 'watchMyTrades': true,
                 'watchOHLCV': true,
-                'watchOHLCVForSymbols': true,
+                'watchOHLCVForSymbols': false,
                 'watchOrderBook': true,
                 'watchOrderBookForSymbols': true,
                 'watchOrders': true,

package/js/src/pro/bybit.js

@@ -27,7 +27,7 @@ export default class bybit extends bybitRest {
                 'watchBalance': true,
                 'watchMyTrades': true,
                 'watchOHLCV': true,
-                'watchOHLCVForSymbols': true,
+                'watchOHLCVForSymbols': false,
                 'watchOrderBook': true,
                 'watchOrderBookForSymbols': true,
                 'watchOrders': true,

package/js/src/static_dependencies/jsencrypt/lib/jsbn/jsbn.d.ts

@@ -15,7 +15,7 @@ export declare class BigInteger {
     protected intValue(): number;
     protected byteValue(): number;
     protected shortValue(): number;
-    protected signum(): 1 | 0 | -1;
+    protected signum(): 0 | 1 | -1;
     toByteArray(): number[];
     protected equals(a: BigInteger): boolean;
     protected min(a: BigInteger): BigInteger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "4.1.98",
+  "version": "4.1.99",
   "description": "A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 100+ exchanges",
   "unpkg": "dist/ccxt.browser.js",
   "type": "module",