ccxt 4.1.63 → 4.1.64

package/js/src/phemex.js

@@ -989,11 +989,13 @@ export default class phemex extends Exchange {
             'symbol': market['id'],
             // 'id': 123456789, // optional request id
         };
-        let method = 'v1GetMdOrderbook';
+        let response = undefined;
         if (market['linear'] && market['settle'] === 'USDT') {
-            method = 'v2GetMdV2Orderbook';
+            response = await this.v2GetMdV2Orderbook(this.extend(request, params));
+        }
+        else {
+            response = await this.v1GetMdOrderbook(this.extend(request, params));
         }
-        const response = await this[method](this.extend(request, params));
         //
         //     {
         //         "error": null,
@@ -1298,16 +1300,18 @@ export default class phemex extends Exchange {
             'symbol': market['id'],
             // 'id': 123456789, // optional request id
         };
-        let method = 'v1GetMdSpotTicker24hr';
+        let response = undefined;
         if (market['swap']) {
             if (market['inverse'] || market['settle'] === 'USD') {
-                method = 'v1GetMdTicker24hr';
+                response = await this.v1GetMdTicker24hr(this.extend(request, params));
             }
             else {
-                method = 'v2GetMdV2Ticker24hr';
+                response = await this.v2GetMdV2Ticker24hr(this.extend(request, params));
             }
         }
-        const response = await this[method](this.extend(request, params));
+        else {
+            response = await this.v1GetMdSpotTicker24hr(this.extend(request, params));
+        }
         //
         // spot
         //
@@ -1378,18 +1382,16 @@ export default class phemex extends Exchange {
         let subType = undefined;
         [subType, params] = this.handleSubTypeAndParams('fetchTickers', market, params);
         const query = this.omit(params, 'type');
-        let defaultMethod;
+        let response = undefined;
         if (type === 'spot') {
-            defaultMethod = 'v1GetMdSpotTicker24hrAll';
+            response = await this.v1GetMdSpotTicker24hrAll(query);
         }
-        else if (subType === 'inverse') {
-            defaultMethod = 'v1GetMdTicker24hrAll';
+        else if (subType === 'inverse' || market['settle'] === 'USD') {
+            response = await this.v1GetMdTicker24hrAll(query);
         }
         else {
-            defaultMethod = 'v2GetMdV2Ticker24hrAll';
+            response = await this.v2GetMdV2Ticker24hrAll(query);
         }
-        const method = this.safeString(this.options, 'fetchTickersMethod', defaultMethod);
-        const response = await this[method](query);
         const result = this.safeValue(response, 'result', []);
         return this.parseTickers(result, symbols);
     }
@@ -1411,11 +1413,13 @@ export default class phemex extends Exchange {
             'symbol': market['id'],
             // 'id': 123456789, // optional request id
         };
-        let method = 'v1GetMdTrade';
+        let response = undefined;
         if (market['linear'] && market['settle'] === 'USDT') {
-            method = 'v2GetMdV2Trade';
+            response = await this.v2GetMdV2Trade(this.extend(request, params));
+        }
+        else {
+            response = await this.v1GetMdTrade(this.extend(request, params));
         }
-        const response = await this[method](this.extend(request, params));
         //
         //     {
         //         "error": null,
@@ -1812,18 +1816,20 @@ export default class phemex extends Exchange {
          * @description query for balance and get the amount of funds available for trading or funds locked in orders
          * @see https://github.com/phemex/phemex-api-docs/blob/master/Public-Hedged-Perpetual-API.md#query-account-positions
          * @param {object} [params] extra parameters specific to the phemex api endpoint
+         * @param {string} [params.type] spot or swap
          * @returns {object} a [balance structure]{@link https://docs.ccxt.com/#/?id=balance-structure}
          */
         await this.loadMarkets();
         let type = undefined;
         [type, params] = this.handleMarketTypeAndParams('fetchBalance', undefined, params);
-        let method = 'privateGetSpotWallets';
+        const code = this.safeString(params, 'code');
+        params = this.omit(params, ['type', 'code']);
+        let response = undefined;
         const request = {};
         if ((type !== 'spot') && (type !== 'swap')) {
             throw new BadRequest(this.id + ' does not support ' + type + ' markets, only spot and swap');
         }
         if (type === 'swap') {
-            const code = this.safeString(params, 'code');
             let settle = undefined;
             [settle, params] = this.handleOptionAndParams(params, 'fetchBalance', 'settle');
             if (code !== undefined || settle !== undefined) {
@@ -1837,10 +1843,10 @@ export default class phemex extends Exchange {
                 const currency = this.currency(coin);
                 request['currency'] = currency['id'];
                 if (currency['id'] === 'USDT') {
-                    method = 'privateGetGAccountsAccountPositions';
+                    response = await this.privateGetGAccountsAccountPositions(this.extend(request, params));
                 }
                 else {
-                    method = 'privateGetAccountsAccountPositions';
+                    response = await this.privateGetAccountsAccountPositions(this.extend(request, params));
                 }
             }
             else {
@@ -1848,10 +1854,12 @@ export default class phemex extends Exchange {
                 if (currency === undefined) {
                     throw new ArgumentsRequired(this.id + ' fetchBalance() requires a code parameter or a currency or settle parameter for ' + type + ' type');
                 }
+                response = await this.privateGetSpotWallets(this.extend(request, params));
             }
         }
-        params = this.omit(params, ['type', 'code']);
-        const response = await this[method](this.extend(request, params));
+        else {
+            response = await this.privateGetSpotWallets(this.extend(request, params));
+        }
         //
         // usdt
         //   {
@@ -2378,7 +2386,7 @@ export default class phemex extends Exchange {
             request['clOrdID'] = clientOrderId;
             params = this.omit(params, ['clOrdID', 'clientOrderId']);
         }
-        const stopPrice = this.safeString2(params, 'stopPx', 'stopPrice');
+        const stopPrice = this.safeStringN(params, ['stopPx', 'stopPrice', 'triggerPrice']);
         if (stopPrice !== undefined) {
             if (market['settle'] === 'USDT') {
                 request['stopPxRp'] = this.priceToPrecision(symbol, stopPrice);
@@ -2387,7 +2395,7 @@ export default class phemex extends Exchange {
                 request['stopPxEp'] = this.toEp(stopPrice, market);
             }
         }
-        params = this.omit(params, ['stopPx', 'stopPrice', 'stopLoss', 'takeProfit']);
+        params = this.omit(params, ['stopPx', 'stopPrice', 'stopLoss', 'takeProfit', 'triggerPrice']);
         if (market['spot']) {
             let qtyType = this.safeValue(params, 'qtyType', 'ByBase');
             if ((type === 'Market') || (type === 'Stop') || (type === 'MarketIfTouched')) {
@@ -2523,15 +2531,17 @@ export default class phemex extends Exchange {
             }
             params = this.omit(params, 'stopLossPrice');
         }
-        let method = 'privatePostSpotOrders';
+        params = this.omit(params, 'reduceOnly');
+        let response = undefined;
         if (market['settle'] === 'USDT') {
-            method = 'privatePostGOrders';
+            response = await this.privatePostGOrders(this.extend(request, params));
         }
         else if (market['contract']) {
-            method = 'privatePostOrders';
+            response = await this.privatePostOrders(this.extend(request, params));
+        }
+        else {
+            response = await this.privatePostSpotOrders(this.extend(request, params));
         }
-        params = this.omit(params, 'reduceOnly');
-        const response = await this[method](this.extend(request, params));
         //
         // spot
         //
@@ -2673,18 +2683,20 @@ export default class phemex extends Exchange {
             }
         }
         params = this.omit(params, ['stopPx', 'stopPrice']);
-        let method = 'privatePutSpotOrders';
+        let response = undefined;
         if (isUSDTSettled) {
-            method = 'privatePutGOrdersReplace';
             const posSide = this.safeString(params, 'posSide');
             if (posSide === undefined) {
                 request['posSide'] = 'Merged';
             }
+            response = await this.privatePutGOrdersReplace(this.extend(request, params));
         }
         else if (market['swap']) {
-            method = 'privatePutOrdersReplace';
+            response = await this.privatePutOrdersReplace(this.extend(request, params));
+        }
+        else {
+            response = await this.privatePutSpotOrders(this.extend(request, params));
         }
-        const response = await this[method](this.extend(request, params));
         const data = this.safeValue(response, 'data', {});
         return this.parseOrder(data, market);
     }
@@ -2716,18 +2728,20 @@ export default class phemex extends Exchange {
         else {
             request['orderID'] = id;
         }
-        let method = 'privateDeleteSpotOrders';
+        let response = undefined;
         if (market['settle'] === 'USDT') {
-            method = 'privateDeleteGOrdersCancel';
             const posSide = this.safeString(params, 'posSide');
             if (posSide === undefined) {
                 request['posSide'] = 'Merged';
             }
+            response = await this.privateDeleteGOrdersCancel(this.extend(request, params));
         }
         else if (market['swap']) {
-            method = 'privateDeleteOrdersCancel';
+            response = await this.privateDeleteOrdersCancel(this.extend(request, params));
+        }
+        else {
+            response = await this.privateDeleteSpotOrders(this.extend(request, params));
         }
-        const response = await this[method](this.extend(request, params));
         const data = this.safeValue(response, 'data', {});
         return this.parseOrder(data, market);
     }
@@ -2745,21 +2759,23 @@ export default class phemex extends Exchange {
             throw new ArgumentsRequired(this.id + ' cancelAllOrders() requires a symbol argument');
         }
         await this.loadMarkets();
+        const market = this.market(symbol);
         const request = {
-        // 'symbol': market['id'],
-        // 'untriggerred': false, // false to cancel non-conditional orders, true to cancel conditional orders
-        // 'text': 'up to 40 characters max',
+            'symbol': market['id'],
+            // 'untriggerred': false, // false to cancel non-conditional orders, true to cancel conditional orders
+            // 'text': 'up to 40 characters max',
         };
-        const market = this.market(symbol);
-        let method = 'privateDeleteSpotOrdersAll';
+        let response = undefined;
         if (market['settle'] === 'USDT') {
-            method = 'privateDeleteGOrdersAll';
+            response = await this.privateDeleteGOrdersAll(this.extend(request, params));
         }
         else if (market['swap']) {
-            method = 'privateDeleteOrdersAll';
+            response = await this.privateDeleteOrdersAll(this.extend(request, params));
         }
-        request['symbol'] = market['id'];
-        return await this[method](this.extend(request, params));
+        else {
+            response = await this.privateDeleteSpotOrdersAll(this.extend(request, params));
+        }
+        return response;
     }
     async fetchOrder(id, symbol = undefined, params = {}) {
         /**
@@ -2778,7 +2794,6 @@ export default class phemex extends Exchange {
         if (market['settle'] === 'USDT') {
             throw new NotSupported(this.id + 'fetchOrder() is not supported yet for USDT settled swap markets'); // https://github.com/phemex/phemex-api-docs/blob/master/Public-Hedged-Perpetual-API.md#query-user-order-by-orderid-or-query-user-order-by-client-order-id
         }
-        const method = market['spot'] ? 'privateGetSpotOrdersActive' : 'privateGetExchangeOrder';
         const request = {
             'symbol': market['id'],
         };
@@ -2790,7 +2805,13 @@ export default class phemex extends Exchange {
         else {
             request['orderID'] = id;
         }
-        const response = await this[method](this.extend(request, params));
+        let response = undefined;
+        if (market['spot']) {
+            response = await this.privateGetSpotOrdersActive(this.extend(request, params));
+        }
+        else {
+            response = await this.privateGetExchangeOrder(this.extend(request, params));
+        }
         const data = this.safeValue(response, 'data', {});
         let order = data;
         if (Array.isArray(data)) {
@@ -2827,21 +2848,23 @@ export default class phemex extends Exchange {
         const request = {
             'symbol': market['id'],
         };
-        let method = 'privateGetSpotOrders';
-        if (market['settle'] === 'USDT') {
-            request['currency'] = market['settle'];
-            method = 'privateGetExchangeOrderV2OrderList';
-        }
-        else if (market['swap']) {
-            method = 'privateGetExchangeOrderList';
-        }
         if (since !== undefined) {
             request['start'] = since;
         }
         if (limit !== undefined) {
             request['limit'] = limit;
         }
-        const response = await this[method](this.extend(request, params));
+        let response = undefined;
+        if (market['settle'] === 'USDT') {
+            request['currency'] = market['settle'];
+            response = await this.privateGetExchangeOrderV2OrderList(this.extend(request, params));
+        }
+        else if (market['swap']) {
+            response = await this.privateGetExchangeOrderList(this.extend(request, params));
+        }
+        else {
+            response = await this.privateGetSpotOrders(this.extend(request, params));
+        }
         const data = this.safeValue(response, 'data', {});
         const rows = this.safeValue(data, 'rows', data);
         return this.parseOrders(rows, market, since, limit);
@@ -2864,19 +2887,20 @@ export default class phemex extends Exchange {
         }
         await this.loadMarkets();
         const market = this.market(symbol);
-        let method = 'privateGetSpotOrders';
-        if (market['settle'] === 'USDT') {
-            method = 'privateGetGOrdersActiveList';
-        }
-        else if (market['swap']) {
-            method = 'privateGetOrdersActiveList';
-        }
         const request = {
             'symbol': market['id'],
         };
         let response = undefined;
         try {
-            response = await this[method](this.extend(request, params));
+            if (market['settle'] === 'USDT') {
+                response = await this.privateGetGOrdersActiveList(this.extend(request, params));
+            }
+            else if (market['swap']) {
+                response = await this.privateGetOrdersActiveList(this.extend(request, params));
+            }
+            else {
+                response = await this.privateGetSpotOrders(this.extend(request, params));
+            }
         }
         catch (e) {
             if (e instanceof OrderNotFound) {
@@ -2913,21 +2937,23 @@ export default class phemex extends Exchange {
         const request = {
             'symbol': market['id'],
         };
-        let method = 'privateGetExchangeSpotOrder';
-        if (market['settle'] === 'USDT') {
-            request['currency'] = market['settle'];
-            method = 'privateGetExchangeOrderV2OrderList';
-        }
-        else if (market['swap']) {
-            method = 'privateGetExchangeOrderList';
-        }
         if (since !== undefined) {
             request['start'] = since;
         }
         if (limit !== undefined) {
             request['limit'] = limit;
         }
-        const response = await this[method](this.extend(request, params));
+        let response = undefined;
+        if (market['settle'] === 'USDT') {
+            request['currency'] = market['settle'];
+            response = await this.privateGetExchangeOrderV2OrderList(this.extend(request, params));
+        }
+        else if (market['swap']) {
+            response = await this.privateGetExchangeOrderList(this.extend(request, params));
+        }
+        else {
+            response = await this.privateGetExchangeSpotOrder(this.extend(request, params));
+        }
         //
         // spot
         //
@@ -2991,13 +3017,6 @@ export default class phemex extends Exchange {
         }
         await this.loadMarkets();
         const market = this.market(symbol);
-        let method = 'privateGetExchangeSpotOrderTrades';
-        if (market['swap']) {
-            method = 'privateGetExchangeOrderTrade';
-            if (market['settle'] === 'USDT') {
-                method = 'privateGetExchangeOrderV2TradingList';
-            }
-        }
         const request = {};
         if (limit !== undefined) {
             limit = Math.min(200, limit);
@@ -3019,7 +3038,19 @@ export default class phemex extends Exchange {
         if (market['swap'] && (limit !== undefined)) {
             request['limit'] = limit;
         }
-        const response = await this[method](this.extend(request, params));
+        const isUSDTSettled = market['settle'] === 'USDT';
+        let response = undefined;
+        if (market['swap']) {
+            if (isUSDTSettled) {
+                response = await this.privateGetExchangeOrderV2TradingList(this.extend(request, params));
+            }
+            else {
+                response = await this.privateGetExchangeOrderTrade(this.extend(request, params));
+            }
+        }
+        else {
+            response = await this.privateGetExchangeSpotOrderTrades(this.extend(request, params));
+        }
         //
         // spot
         //
@@ -3124,10 +3155,13 @@ export default class phemex extends Exchange {
         //     }
         // }
         //
-        const data = this.safeValue(response, 'data', {});
-        if (method !== 'privateGetExchangeOrderV2TradingList') {
-            const rows = this.safeValue(data, 'rows', []);
-            return this.parseTrades(rows, market, since, limit);
+        let data = undefined;
+        if (isUSDTSettled) {
+            data = this.safeValue(response, 'data', []);
+        }
+        else {
+            data = this.safeValue(response, 'data', {});
+            data = this.safeValue(data, 'rows', []);
         }
         return this.parseTrades(data, market, since, limit);
     }
@@ -3359,7 +3393,6 @@ export default class phemex extends Exchange {
         await this.loadMarkets();
         symbols = this.marketSymbols(symbols);
         let subType = undefined;
-        let method = 'privateGetAccountsAccountPositions';
         let code = this.safeString(params, 'currency');
         let settle = undefined;
         let market = undefined;
@@ -3373,9 +3406,9 @@ export default class phemex extends Exchange {
             [settle, params] = this.handleOptionAndParams(params, 'fetchPositions', 'settle', 'USD');
         }
         [subType, params] = this.handleSubTypeAndParams('fetchPositions', market, params);
-        if (settle === 'USDT') {
+        const isUSDTSettled = settle === 'USDT';
+        if (isUSDTSettled) {
             code = 'USDT';
-            method = 'privateGetGAccountsAccountPositions';
         }
         else if (code === undefined) {
             code = (subType === 'linear') ? 'USD' : 'BTC';
@@ -3387,7 +3420,13 @@ export default class phemex extends Exchange {
         const request = {
             'currency': currency['id'],
         };
-        const response = await this[method](this.extend(request, params));
+        let response = undefined;
+        if (isUSDTSettled) {
+            response = await this.privateGetGAccountsAccountPositions(this.extend(request, params));
+        }
+        else {
+            response = await this.privateGetAccountsAccountPositions(this.extend(request, params));
+        }
         //
         //     {
         //         "code":0,"msg":"",

package/js/src/pro/krakenfutures.js

@@ -406,7 +406,7 @@ export default class krakenfutures extends krakenfuturesRest {
          * @param {int} [limit] not used by krakenfutures watchBalance
          * @param {object} [params] extra parameters specific to the krakenfutures api endpoint
          * @param {string} [params.account] can be either 'futures' or 'flex_futures'
-         * @returns {object[]} a list of [balance structures]{@link https://docs.ccxt.com/#/?id=balance-structure}
+         * @returns {object} a object of wallet types each with a balance structure {@link https://docs.ccxt.com/#/?id=balance-structure}
          */
         await this.loadMarkets();
         const name = 'balances';
@@ -1271,6 +1271,7 @@ export default class krakenfutures extends krakenfuturesRest {
                 holdingResult[code] = newAccount;
             }
             this.balance['cash'] = holdingResult;
+            this.balance['cash'] = this.safeBalance(this.balance['cash']);
             client.resolve(holdingResult, messageHash);
         }
         if (futures !== undefined) {
@@ -1294,6 +1295,7 @@ export default class krakenfutures extends krakenfuturesRest {
                 futuresResult[symbol][code] = newAccount;
             }
             this.balance['margin'] = futuresResult;
+            this.balance['margin'] = this.safeBalance(this.balance['margin']);
             client.resolve(this.balance['margin'], messageHash + 'futures');
         }
         if (flexFutures !== undefined) {
@@ -1315,6 +1317,7 @@ export default class krakenfutures extends krakenfuturesRest {
                 flexFuturesResult[code] = newAccount;
             }
             this.balance['flex'] = flexFuturesResult;
+            this.balance['flex'] = this.safeBalance(this.balance['flex']);
             client.resolve(this.balance['flex'], messageHash + 'flex_futures');
         }
         client.resolve(this.balance, messageHash);

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/js/src/tokocrypto.js

@@ -1166,9 +1166,7 @@ export default class tokocrypto extends Exchange {
          * @returns {object} a dictionary of [ticker structures]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
         await this.loadMarkets();
-        const defaultMethod = 'binanceGetTicker24hr';
-        const method = this.safeString(this.options, 'fetchTickersMethod', defaultMethod);
-        const response = await this[method](params);
+        const response = await this.binanceGetTicker24hr(params);
         return this.parseTickers(response, symbols);
     }
     getMarketIdByType(market) {

package/js/src/wazirx.js

@@ -472,7 +472,13 @@ export default class wazirx extends Exchange {
             request['limit'] = Math.min(limit, 1000); // Default 500; max 1000.
         }
         const method = this.safeString(this.options, 'fetchTradesMethod', 'publicGetTrades');
-        const response = await this[method](this.extend(request, params));
+        let response = undefined;
+        if (method === 'privateGetHistoricalTrades') {
+            response = await this.privateGetHistoricalTrades(this.extend(request, params));
+        }
+        else {
+            response = await this.publicGetTrades(this.extend(request, params));
+        }
         // [
         //     {
         //         "id":322307791,

package/package.json

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