ccxt 4.1.68 → 4.1.69

package/js/src/ascendex.js

@@ -263,7 +263,7 @@ export default class ascendex extends Exchange {
                 'account-category': 'cash',
                 'account-group': undefined,
                 'fetchClosedOrders': {
-                    'method': 'v2PrivateDataGetOrderHist', // 'v1PrivateAccountGroupGetAccountCategoryOrderHistCurrent'
+                    'method': 'v2PrivateDataGetOrderHist', // 'v1PrivateAccountCategoryGetOrderHistCurrent'
                 },
                 'defaultType': 'spot',
                 'accountsByType': {
@@ -803,6 +803,9 @@ export default class ascendex extends Exchange {
          * @method
          * @name ascendex#fetchBalance
          * @description query for balance and get the amount of funds available for trading or funds locked in orders
+         * @see https://ascendex.github.io/ascendex-pro-api/#cash-account-balance
+         * @see https://ascendex.github.io/ascendex-pro-api/#margin-account-balance
+         * @see https://ascendex.github.io/ascendex-futures-pro-api-v2/#position
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object} a [balance structure]{@link https://docs.ccxt.com/#/?id=balance-structure}
          */
@@ -813,8 +816,7 @@ export default class ascendex extends Exchange {
         [marketType, query] = this.handleMarketTypeAndParams('fetchBalance', undefined, params);
         const isMargin = this.safeValue(params, 'margin', false);
         marketType = isMargin ? 'margin' : marketType;
-        params = this.omit(params, 'margin');
-        const options = this.safeValue(this.options, 'fetchBalance', {});
+        query = this.omit(query, 'margin');
         const accountsByType = this.safeValue(this.options, 'accountsByType', {});
         const accountCategory = this.safeString(accountsByType, marketType, 'cash');
         const account = this.safeValue(this.accounts, 0, {});
@@ -822,16 +824,19 @@ export default class ascendex extends Exchange {
         const request = {
             'account-group': accountGroup,
         };
-        const defaultMethod = this.safeString(options, 'method', 'v1PrivateAccountCategoryGetBalance');
-        const method = this.getSupportedMapping(marketType, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupGetFuturesPosition',
-        });
         if ((accountCategory === 'cash') || (accountCategory === 'margin')) {
             request['account-category'] = accountCategory;
         }
-        const response = await this[method](this.extend(request, query));
+        let response = undefined;
+        if ((marketType === 'spot') || (marketType === 'margin')) {
+            response = await this.v1PrivateAccountCategoryGetBalance(this.extend(request, query));
+        }
+        else if (marketType === 'swap') {
+            response = await this.v2PrivateAccountGroupGetFuturesPosition(this.extend(request, query));
+        }
+        else {
+            throw new NotSupported(this.id + ' fetchBalance() is not currently supported for ' + marketType + ' markets');
+        }
         //
         // cash
         //
@@ -1756,6 +1761,8 @@ export default class ascendex extends Exchange {
          * @method
          * @name ascendex#fetchOrder
          * @description fetches information on an order made by the user
+         * @see https://ascendex.github.io/ascendex-pro-api/#query-order
+         * @see https://ascendex.github.io/ascendex-futures-pro-api-v2/#query-order-by-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
          * @returns {object} An [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
@@ -1767,7 +1774,6 @@ export default class ascendex extends Exchange {
             market = this.market(symbol);
         }
         const [type, query] = this.handleMarketTypeAndParams('fetchOrder', market, params);
-        const options = this.safeValue(this.options, 'fetchOrder', {});
         const accountsByType = this.safeValue(this.options, 'accountsByType', {});
         const accountCategory = this.safeString(accountsByType, type, 'cash');
         const account = this.safeValue(this.accounts, 0, {});
@@ -1777,21 +1783,17 @@ export default class ascendex extends Exchange {
             'account-category': accountCategory,
             'orderId': id,
         };
-        const defaultMethod = this.safeString(options, 'method', 'v1PrivateAccountCategoryGetOrderStatus');
-        const method = this.getSupportedMapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupGetFuturesOrderStatus',
-        });
-        if (method === 'v1PrivateAccountCategoryGetOrderStatus') {
-            if (accountCategory !== undefined) {
-                request['category'] = accountCategory;
-            }
+        let response = undefined;
+        if ((type === 'spot') || (type === 'margin')) {
+            response = await this.v1PrivateAccountCategoryGetOrderStatus(this.extend(request, query));
         }
-        else {
+        else if (type === 'swap') {
             request['account-category'] = accountCategory;
+            response = await this.v2PrivateAccountGroupGetFuturesOrderStatus(this.extend(request, query));
+        }
+        else {
+            throw new NotSupported(this.id + ' fetchOrder() is not currently supported for ' + type + ' markets');
         }
-        const response = await this[method](this.extend(request, query));
         //
         // AccountCategoryGetOrderStatus
         //
@@ -1867,6 +1869,8 @@ export default class ascendex extends Exchange {
          * @method
          * @name ascendex#fetchOpenOrders
          * @description fetch all unfilled currently open orders
+         * @see https://ascendex.github.io/ascendex-pro-api/#list-open-orders
+         * @see https://ascendex.github.io/ascendex-futures-pro-api-v2/#list-open-orders
          * @param {string} symbol unified market symbol
          * @param {int} [since] the earliest time in ms to fetch open orders for
          * @param {int} [limit] the maximum number of  open orders structures to retrieve
@@ -1889,22 +1893,17 @@ export default class ascendex extends Exchange {
             'account-group': accountGroup,
             'account-category': accountCategory,
         };
-        const options = this.safeValue(this.options, 'fetchOpenOrders', {});
-        const defaultMethod = this.safeString(options, 'method', 'v1PrivateAccountCategoryGetOrderOpen');
-        const method = this.getSupportedMapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupGetFuturesOrderOpen',
-        });
-        if (method === 'v1PrivateAccountCategoryGetOrderOpen') {
-            if (accountCategory !== undefined) {
-                request['category'] = accountCategory;
-            }
+        let response = undefined;
+        if ((type === 'spot') || (type === 'margin')) {
+            response = await this.v1PrivateAccountCategoryGetOrderOpen(this.extend(request, query));
         }
-        else {
+        else if (type === 'swap') {
             request['account-category'] = accountCategory;
+            response = await this.v2PrivateAccountGroupGetFuturesOrderOpen(this.extend(request, query));
+        }
+        else {
+            throw new NotSupported(this.id + ' fetchOpenOrders() is not currently supported for ' + type + ' markets');
         }
-        const response = await this[method](this.extend(request, query));
         //
         // AccountCategoryGetOrderOpen
         //
@@ -1990,6 +1989,7 @@ export default class ascendex extends Exchange {
          * @name ascendex#fetchClosedOrders
          * @description fetches information on multiple closed orders made by the user
          * @see https://ascendex.github.io/ascendex-pro-api/#list-history-orders-v2
+         * @see https://ascendex.github.io/ascendex-futures-pro-api-v2/#list-current-history-orders
          * @param {string} symbol unified market symbol of the market orders were made in
          * @param {int} [since] the earliest time in ms to fetch orders for
          * @param {int} [limit] the maximum number of  orde structures to retrieve
@@ -2002,16 +2002,15 @@ export default class ascendex extends Exchange {
         const account = this.safeValue(this.accounts, 0, {});
         const accountGroup = this.safeValue(account, 'id');
         const request = {
-            'account-group': accountGroup,
-            // 'category': accountCategory,
-            // 'symbol': market['id'],
-            // 'orderType': 'market', // optional, string
-            // 'side': 'buy', // or 'sell', optional, case insensitive.
-            // 'status': 'Filled', // "Filled", "Canceled", or "Rejected"
-            // 'startTime': exchange.milliseconds (),
-            // 'endTime': exchange.milliseconds (),
-            // 'page': 1,
-            // 'pageSize': 100,
+        // 'category': accountCategory,
+        // 'symbol': market['id'],
+        // 'orderType': 'market', // optional, string
+        // 'side': 'buy', // or 'sell', optional, case insensitive.
+        // 'status': 'Filled', // "Filled", "Canceled", or "Rejected"
+        // 'startTime': exchange.milliseconds (),
+        // 'endTime': exchange.milliseconds (),
+        // 'page': 1,
+        // 'pageSize': 100,
         };
         let market = undefined;
         if (symbol !== undefined) {
@@ -2026,28 +2025,42 @@ export default class ascendex extends Exchange {
             'margin': defaultMethod,
             'swap': 'v2PrivateAccountGroupGetFuturesOrderHistCurrent',
         });
+        if (since !== undefined) {
+            request['startTime'] = since;
+        }
+        const until = this.safeString(params, 'until');
+        if (until !== undefined) {
+            request['endTime'] = until;
+        }
         const accountsByType = this.safeValue(this.options, 'accountsByType', {});
         const accountCategory = this.safeString(accountsByType, type, 'cash'); // margin, futures
-        if (method === 'v2PrivateDataGetOrderHist') {
+        let response = undefined;
+        if (method === 'v1PrivateAccountCategoryGetOrderHistCurrent') {
+            request['account-group'] = accountGroup;
+            request['account-category'] = accountCategory;
+            if (limit !== undefined) {
+                request['limit'] = limit;
+            }
+            response = await this.v1PrivateAccountCategoryGetOrderHistCurrent(this.extend(request, query));
+        }
+        else if (method === 'v2PrivateDataGetOrderHist') {
             request['account'] = accountCategory;
             if (limit !== undefined) {
                 request['limit'] = limit;
             }
+            response = await this.v2PrivateDataGetOrderHist(this.extend(request, query));
         }
-        else {
+        else if (method === 'v2PrivateAccountGroupGetFuturesOrderHistCurrent') {
+            request['account-group'] = accountGroup;
             request['account-category'] = accountCategory;
             if (limit !== undefined) {
                 request['pageSize'] = limit;
             }
+            response = await this.v2PrivateAccountGroupGetFuturesOrderHistCurrent(this.extend(request, query));
         }
-        if (since !== undefined) {
-            request['startTime'] = since;
-        }
-        const until = this.safeString(params, 'until');
-        if (until !== undefined) {
-            request['endTime'] = until;
+        else {
+            throw new NotSupported(this.id + ' fetchClosedOrders() is not currently supported for ' + type + ' markets');
         }
-        const response = await this[method](this.extend(request, query));
         //
         // accountCategoryGetOrderHistCurrent
         //
@@ -2151,6 +2164,8 @@ export default class ascendex extends Exchange {
          * @method
          * @name ascendex#cancelOrder
          * @description cancels an open order
+         * @see https://ascendex.github.io/ascendex-pro-api/#cancel-order
+         * @see https://ascendex.github.io/ascendex-futures-pro-api-v2/#cancel-order
          * @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
@@ -2163,7 +2178,6 @@ export default class ascendex extends Exchange {
         await this.loadAccounts();
         const market = this.market(symbol);
         const [type, query] = this.handleMarketTypeAndParams('cancelOrder', market, params);
-        const options = this.safeValue(this.options, 'cancelOrder', {});
         const accountsByType = this.safeValue(this.options, 'accountsByType', {});
         const accountCategory = this.safeString(accountsByType, type, 'cash');
         const account = this.safeValue(this.accounts, 0, {});
@@ -2175,20 +2189,6 @@ export default class ascendex extends Exchange {
             'time': this.milliseconds(),
             'id': 'foobar',
         };
-        const defaultMethod = this.safeString(options, 'method', 'v1PrivateAccountCategoryDeleteOrder');
-        const method = this.getSupportedMapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupDeleteFuturesOrder',
-        });
-        if (method === 'v1PrivateAccountCategoryDeleteOrder') {
-            if (accountCategory !== undefined) {
-                request['category'] = accountCategory;
-            }
-        }
-        else {
-            request['account-category'] = accountCategory;
-        }
         const clientOrderId = this.safeString2(params, 'clientOrderId', 'id');
         if (clientOrderId === undefined) {
             request['orderId'] = id;
@@ -2197,7 +2197,17 @@ export default class ascendex extends Exchange {
             request['id'] = clientOrderId;
             params = this.omit(params, ['clientOrderId', 'id']);
         }
-        const response = await this[method](this.extend(request, query));
+        let response = undefined;
+        if ((type === 'spot') || (type === 'margin')) {
+            response = await this.v1PrivateAccountCategoryDeleteOrder(this.extend(request, query));
+        }
+        else if (type === 'swap') {
+            request['account-category'] = accountCategory;
+            response = await this.v2PrivateAccountGroupDeleteFuturesOrder(this.extend(request, query));
+        }
+        else {
+            throw new NotSupported(this.id + ' cancelOrder() is not currently supported for ' + type + ' markets');
+        }
         //
         // AccountCategoryDeleteOrder
         //
@@ -2270,6 +2280,8 @@ export default class ascendex extends Exchange {
          * @method
          * @name ascendex#cancelAllOrders
          * @description cancel all open orders
+         * @see https://ascendex.github.io/ascendex-pro-api/#cancel-all-orders
+         * @see https://ascendex.github.io/ascendex-futures-pro-api-v2/#cancel-all-open-orders
          * @param {string} symbol unified market symbol, only orders in the market of this symbol are cancelled when symbol is not undefined
          * @param {object} [params] extra parameters specific to the exchange API endpoint
          * @returns {object[]} a list of [order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
@@ -2281,7 +2293,6 @@ export default class ascendex extends Exchange {
             market = this.market(symbol);
         }
         const [type, query] = this.handleMarketTypeAndParams('cancelAllOrders', market, params);
-        const options = this.safeValue(this.options, 'cancelAllOrders', {});
         const accountsByType = this.safeValue(this.options, 'accountsByType', {});
         const accountCategory = this.safeString(accountsByType, type, 'cash');
         const account = this.safeValue(this.accounts, 0, {});
@@ -2294,21 +2305,17 @@ export default class ascendex extends Exchange {
         if (symbol !== undefined) {
             request['symbol'] = market['id'];
         }
-        const defaultMethod = this.safeString(options, 'method', 'v1PrivateAccountCategoryDeleteOrderAll');
-        const method = this.getSupportedMapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupDeleteFuturesOrderAll',
-        });
-        if (method === 'v1PrivateAccountCategoryDeleteOrderAll') {
-            if (accountCategory !== undefined) {
-                request['category'] = accountCategory;
-            }
+        let response = undefined;
+        if ((type === 'spot') || (type === 'margin')) {
+            response = await this.v1PrivateAccountCategoryDeleteOrderAll(this.extend(request, query));
         }
-        else {
+        else if (type === 'swap') {
             request['account-category'] = accountCategory;
+            response = await this.v2PrivateAccountGroupDeleteFuturesOrderAll(this.extend(request, query));
+        }
+        else {
+            throw new NotSupported(this.id + ' cancelAllOrders() is not currently supported for ' + type + ' markets');
         }
-        const response = await this[method](this.extend(request, query));
         //
         // AccountCategoryDeleteOrderAll
         //

package/js/src/phemex.js

@@ -147,6 +147,7 @@ export default class phemex extends Exchange {
                 },
                 'v1': {
                     'get': {
+                        'md/fullbook': 5,
                         'md/orderbook': 5,
                         'md/trade': 5,
                         'md/ticker/24hr': 5,
@@ -200,6 +201,11 @@ export default class phemex extends Exchange {
                         'phemex-user/users/children': 5,
                         'phemex-user/wallets/v2/depositAddress': 5,
                         'phemex-user/wallets/tradeAccountDetail': 5,
+                        'phemex-deposit/wallets/api/depositAddress': 5,
+                        'phemex-deposit/wallets/api/depositHist': 5,
+                        'phemex-deposit/wallets/api/chainCfg': 5,
+                        'phemex-withdraw/wallets/api/withdrawHist': 5,
+                        'phemex-withdraw/wallets/api/asset/info': 5,
                         'phemex-user/order/closedPositionList': 5,
                         'exchange/margins/transfer': 5,
                         'exchange/wallets/confirm/withdraw': 5,
@@ -238,6 +244,9 @@ export default class phemex extends Exchange {
                         'assets/futures/sub-accounts/transfer': 5,
                         'assets/universal-transfer': 5,
                         'assets/convert': 5,
+                        // withdraw
+                        'phemex-withdraw/wallets/api/createWithdraw': 5,
+                        'phemex-withdraw/wallets/api/cancelWithdraw': 5, // ?id=<id>
                     },
                     'put': {
                         // spot
@@ -994,7 +1003,12 @@ export default class phemex extends Exchange {
             response = await this.v2GetMdV2Orderbook(this.extend(request, params));
         }
         else {
-            response = await this.v1GetMdOrderbook(this.extend(request, params));
+            if ((limit !== undefined) && (limit <= 30)) {
+                response = await this.v1GetMdOrderbook(this.extend(request, params));
+            }
+            else {
+                response = await this.v1GetMdFullbook(this.extend(request, params));
+            }
         }
         //
         //     {

package/js/src/pro/htx.js

@@ -340,9 +340,11 @@ export default class htx extends htxRest {
         // which means whenever there is an order book change at that level, it pushes an update;
         // 150-levels/400-level incremental MBP feed is based on the gap
         // between two snapshots at 100ms interval.
-        limit = (limit === undefined) ? 20 : limit;
+        if (limit === undefined) {
+            limit = market['spot'] ? 150 : 20;
+        }
         if (!this.inArray(limit, allowedLimits)) {
-            throw new ExchangeError(this.id + ' watchOrderBook swap market accepts limits of 20 and 150 only');
+            throw new ExchangeError(this.id + ' watchOrderBook market accepts limits of 20 and 150 only');
         }
         let messageHash = undefined;
         if (market['spot']) {

package/package.json

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

package/skip-tests.json

@@ -1086,6 +1086,7 @@
         }
     },
     "kuna": {
+        "skip": "temporary glitches with this exchange: https://app.travis-ci.com/github/ccxt/ccxt/builds/267517440#L2304",
         "httpProxy": "http://5.75.153.75:8002",
         "skipPhpAsync": true,
         "skipMethods": {
@@ -1095,7 +1096,8 @@
             "fetchCurrencies": {
                 "deposit":"is undefined",
                 "withdraw":"is undefined",
-                "active":"is undefined"
+                "active":"is undefined",
+                "precision":"somewhat strange atm https://app.travis-ci.com/github/ccxt/ccxt/builds/267515280#L2337"
             }
         }
     },
@@ -1386,9 +1388,13 @@
         "skipWs": true,
         "skipPhpAsync": true,
         "skipMethods": {
+            "loadMarkets": {
+                "currencyIdAndCode": "https://app.travis-ci.com/github/ccxt/ccxt/builds/267515280#L2314"
+            },
             "fetchCurrencies": {
                 "withdraw": "undefined",
-                "deposit": "undefined"
+                "deposit": "undefined",
+                "currencyIdAndCode": "same as in loadMarkets"
             },
             "fetchTickers": {
                 "quoteVolume": "quoteVolume <= baseVolume * high is failing",