ccxt 4.2.1 → 4.2.3

package/js/src/okx.js

@@ -3032,12 +3032,13 @@ export default class okx extends Exchange {
          * @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 {boolean} [params.trigger] true if trigger orders
          * @returns {object} An [order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         if (symbol === undefined) {
             throw new ArgumentsRequired(this.id + ' cancelOrder() requires a symbol argument');
         }
-        const stop = this.safeValue(params, 'stop');
+        const stop = this.safeValue2(params, 'stop', 'trigger');
         if (stop) {
             const orderInner = await this.cancelOrders([id], symbol, params);
             return this.safeValue(orderInner, 0);
@@ -3409,6 +3410,7 @@ export default class okx extends Exchange {
          * @param {string} id the order id
          * @param {string} symbol unified market symbol
          * @param {object} [params] extra and exchange specific parameters
+         * @param {boolean} [params.trigger] true if fetching trigger orders
          * @returns [an order structure]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         if (symbol === undefined) {
@@ -3426,7 +3428,7 @@ export default class okx extends Exchange {
         const options = this.safeValue(this.options, 'fetchOrder', {});
         const defaultMethod = this.safeString(options, 'method', 'privateGetTradeOrder');
         let method = this.safeString(params, 'method', defaultMethod);
-        const stop = this.safeValue(params, 'stop');
+        const stop = this.safeValue2(params, 'stop', 'trigger');
         if (stop) {
             method = 'privateGetTradeOrderAlgo';
             if (clientOrderId !== undefined) {
@@ -3444,7 +3446,7 @@ export default class okx extends Exchange {
                 request['ordId'] = id;
             }
         }
-        const query = this.omit(params, ['method', 'clOrdId', 'clientOrderId', 'stop']);
+        const query = this.omit(params, ['method', 'clOrdId', 'clientOrderId', 'stop', 'trigger']);
         let response = undefined;
         if (method === 'privateGetTradeOrderAlgo') {
             response = await this.privateGetTradeOrderAlgo(this.extend(request, query));
@@ -3600,7 +3602,7 @@ export default class okx extends Exchange {
         const defaultMethod = this.safeString(options, 'method', 'privateGetTradeOrdersPending');
         let method = this.safeString(params, 'method', defaultMethod);
         const ordType = this.safeString(params, 'ordType');
-        const stop = this.safeValue(params, 'stop');
+        const stop = this.safeValue2(params, 'stop', 'trigger');
         if (stop || (ordType in algoOrderTypes)) {
             method = 'privateGetTradeOrdersAlgoPending';
             if (stop) {
@@ -3609,7 +3611,7 @@ export default class okx extends Exchange {
                 }
             }
         }
-        const query = this.omit(params, ['method', 'stop']);
+        const query = this.omit(params, ['method', 'stop', 'trigger']);
         let response = undefined;
         if (method === 'privateGetTradeOrdersAlgoPending') {
             response = await this.privateGetTradeOrdersAlgoPending(this.extend(request, query));
@@ -3762,7 +3764,7 @@ export default class okx extends Exchange {
         const defaultMethod = this.safeString(options, 'method', 'privateGetTradeOrdersHistory');
         let method = this.safeString(params, 'method', defaultMethod);
         const ordType = this.safeString(params, 'ordType');
-        const stop = this.safeValue(params, 'stop');
+        const stop = this.safeValue2(params, 'stop', 'trigger');
         if (stop || (ordType in algoOrderTypes)) {
             method = 'privateGetTradeOrdersAlgoHistory';
             const algoId = this.safeString(params, 'algoId');
@@ -3787,7 +3789,7 @@ export default class okx extends Exchange {
                 query = this.omit(query, ['until', 'till']);
             }
         }
-        const send = this.omit(query, ['method', 'stop', 'ordType']);
+        const send = this.omit(query, ['method', 'stop', 'ordType', 'trigger']);
         let response = undefined;
         if (method === 'privateGetTradeOrdersAlgoHistory') {
             response = await this.privateGetTradeOrdersAlgoHistory(this.extend(request, send));
@@ -3949,7 +3951,7 @@ export default class okx extends Exchange {
         const defaultMethod = this.safeString(options, 'method', 'privateGetTradeOrdersHistory');
         let method = this.safeString(params, 'method', defaultMethod);
         const ordType = this.safeString(params, 'ordType');
-        const stop = this.safeValue(params, 'stop');
+        const stop = this.safeValue2(params, 'stop', 'trigger');
         if (stop || (ordType in algoOrderTypes)) {
             method = 'privateGetTradeOrdersAlgoHistory';
             if (stop) {
@@ -3970,7 +3972,7 @@ export default class okx extends Exchange {
             }
             request['state'] = 'filled';
         }
-        const send = this.omit(query, ['method', 'stop']);
+        const send = this.omit(query, ['method', 'stop', 'trigger']);
         let response = undefined;
         if (method === 'privateGetTradeOrdersAlgoHistory') {
             response = await this.privateGetTradeOrdersAlgoHistory(this.extend(request, send));

package/js/src/poloniexfutures.js

@@ -1192,9 +1192,15 @@ export default class poloniexfutures extends Exchange {
         if (symbol !== undefined) {
             request['symbol'] = this.marketId(symbol);
         }
-        const stop = this.safeValue(params, 'stop');
-        const method = stop ? 'privateDeleteStopOrders' : 'privateDeleteOrders';
-        const response = await this[method](this.extend(request, params));
+        const stop = this.safeValue2(params, 'stop', 'trigger');
+        params = this.omit(params, ['stop', 'trigger']);
+        let response = undefined;
+        if (stop) {
+            response = await this.privateDeleteStopOrders(this.extend(request, params));
+        }
+        else {
+            response = await this.privateDeleteOrders(this.extend(request, params));
+        }
         //
         //   {
         //       "code": "200000",
@@ -1256,9 +1262,9 @@ export default class poloniexfutures extends Exchange {
          * @returns An [array of order structures]{@link https://docs.ccxt.com/#/?id=order-structure}
          */
         await this.loadMarkets();
-        const stop = this.safeValue(params, 'stop');
+        const stop = this.safeValue2(params, 'stop', 'trigger');
         const until = this.safeInteger2(params, 'until', 'till');
-        params = this.omit(params, ['stop', 'until', 'till']);
+        params = this.omit(params, ['triger', 'stop', 'until', 'till']);
         if (status === 'closed') {
             status = 'done';
         }
@@ -1280,8 +1286,13 @@ export default class poloniexfutures extends Exchange {
         if (until !== undefined) {
             request['endAt'] = until;
         }
-        const method = stop ? 'privateGetStopOrders' : 'privateGetOrders';
-        const response = await this[method](this.extend(request, params));
+        let response = undefined;
+        if (stop) {
+            response = await this.privateGetStopOrders(this.extend(request, params));
+        }
+        else {
+            response = await this.privateGetOrders(this.extend(request, params));
+        }
         //
         //    {
         //        "code": "200000",
@@ -1391,20 +1402,20 @@ export default class poloniexfutures extends Exchange {
          */
         await this.loadMarkets();
         const request = {};
-        let method = 'privateGetOrdersOrderId';
+        let response = undefined;
         if (id === undefined) {
             const clientOrderId = this.safeString2(params, 'clientOid', 'clientOrderId');
             if (clientOrderId === undefined) {
                 throw new InvalidOrder(this.id + ' fetchOrder() requires parameter id or params.clientOid');
             }
             request['clientOid'] = clientOrderId;
-            method = 'privateGetOrdersByClientOid';
             params = this.omit(params, ['clientOid', 'clientOrderId']);
+            response = await this.privateGetClientOrderIdClientOid(this.extend(request, params));
         }
         else {
             request['order-id'] = id;
+            response = await this.privateGetOrdersOrderId(this.extend(request, params));
         }
-        const response = await this[method](this.extend(request, params));
         //
         //    {
         //        "code": "200000",
@@ -1724,7 +1735,7 @@ export default class poloniexfutures extends Exchange {
         const version = this.safeString(params, 'version', defaultVersion);
         const tail = '/api/' + version + '/' + this.implodeParams(path, params);
         url += tail;
-        const query = this.omit(params, path);
+        const query = this.omit(params, this.extractParams(path));
         const queryLength = Object.keys(query).length;
         if (api === 'public') {
             if (queryLength) {

package/js/src/pro/binance.js

@@ -1117,25 +1117,27 @@ export default class binance extends binanceRest {
         const listenKeyRefreshRate = this.safeInteger(this.options, 'listenKeyRefreshRate', 1200000);
         const delay = this.sum(listenKeyRefreshRate, 10000);
         if (time - lastAuthenticatedTime > delay) {
-            let method = 'publicPostUserDataStream';
+            let response = undefined;
             if (type === 'future') {
-                method = 'fapiPrivatePostListenKey';
+                response = await this.fapiPrivatePostListenKey(query);
             }
             else if (type === 'delivery') {
-                method = 'dapiPrivatePostListenKey';
+                response = await this.dapiPrivatePostListenKey(query);
             }
             else if (type === 'margin' && isCrossMargin) {
-                method = 'sapiPostUserDataStream';
+                response = await this.sapiPostUserDataStream(query);
             }
             else if (isIsolatedMargin) {
-                method = 'sapiPostUserDataStreamIsolated';
                 if (symbol === undefined) {
                     throw new ArgumentsRequired(this.id + ' authenticate() requires a symbol argument for isolated margin mode');
                 }
                 const marketId = this.marketId(symbol);
                 query = this.extend(query, { 'symbol': marketId });
+                response = await this.sapiPostUserDataStreamIsolated(query);
+            }
+            else {
+                response = await this.publicPostUserDataStream(query);
             }
-            const response = await this[method](query);
             this.options[type] = this.extend(options, {
                 'listenKey': this.safeString(response, 'listenKey'),
                 'lastAuthenticatedTime': time,
@@ -1161,26 +1163,27 @@ export default class binance extends binanceRest {
             // A network error happened: we can't renew a listen key that does not exist.
             return;
         }
-        let method = 'publicPutUserDataStream';
         const request = {};
         const symbol = this.safeString(params, 'symbol');
         const sendParams = this.omit(params, ['type', 'symbol']);
-        if (type === 'future') {
-            method = 'fapiPrivatePutListenKey';
-        }
-        else if (type === 'delivery') {
-            method = 'dapiPrivatePutListenKey';
-        }
-        else {
-            request['listenKey'] = listenKey;
-            if (type === 'margin') {
-                request['symbol'] = symbol;
-                method = 'sapiPutUserDataStream';
-            }
-        }
         const time = this.milliseconds();
         try {
-            await this[method](this.extend(request, sendParams));
+            if (type === 'future') {
+                await this.fapiPrivatePutListenKey(this.extend(request, sendParams));
+            }
+            else if (type === 'delivery') {
+                await this.dapiPrivatePutListenKey(this.extend(request, sendParams));
+            }
+            else {
+                request['listenKey'] = listenKey;
+                if (type === 'margin') {
+                    request['symbol'] = symbol;
+                    await this.sapiPutUserDataStream(this.extend(request, sendParams));
+                }
+                else {
+                    await this.publicPutUserDataStream(this.extend(request, sendParams));
+                }
+            }
         }
         catch (error) {
             const url = this.urls['api']['ws'][type] + '/' + this.options[type]['listenKey'];

package/js/src/pro/bingx.js

@@ -33,6 +33,7 @@ export default class bingx extends bingxRest {
                 },
             },
             'options': {
+                'listenKeyRefreshRate': 3540000,
                 'ws': {
                     'gunzip': true,
                 },
@@ -630,7 +631,7 @@ export default class bingx extends bingxRest {
         const lastAuthenticatedTime = this.safeInteger(this.options, 'lastAuthenticatedTime', 0);
         const listenKeyRefreshRate = this.safeInteger(this.options, 'listenKeyRefreshRate', 3600000); // 1 hour
         if (time - lastAuthenticatedTime > listenKeyRefreshRate) {
-            const response = await this.userAuthPrivatePostUserDataStream({ 'listenKey': listenKey }); // extend the expiry
+            const response = await this.userAuthPrivatePutUserDataStream({ 'listenKey': listenKey }); // extend the expiry
             this.options['listenKey'] = this.safeString(response, 'listenKey');
             this.options['lastAuthenticatedTime'] = time;
         }

package/js/src/pro/bybit.js

@@ -211,7 +211,7 @@ export default class bybit extends bybitRest {
          */
         await this.loadMarkets();
         symbols = this.marketSymbols(symbols, undefined, false);
-        const messageHash = 'tickers::' + symbols.join(',');
+        const messageHashes = [];
         const url = this.getUrlByMarketType(symbols[0], false, params);
         params = this.cleanParams(params);
         const options = this.safeValue(this.options, 'watchTickers', {});
@@ -221,8 +221,9 @@ export default class bybit extends bybitRest {
         for (let i = 0; i < marketIds.length; i++) {
             const marketId = marketIds[i];
             topics.push(topic + '.' + marketId);
+            messageHashes.push('ticker:' + symbols[i]);
         }
-        const ticker = await this.watchTopics(url, messageHash, topics, params);
+        const ticker = await this.watchTopics(url, messageHashes, topics, params);
         if (this.newUpdates) {
             return ticker;
         }
@@ -358,17 +359,6 @@ export default class bybit extends bybitRest {
         this.tickers[symbol] = parsed;
         const messageHash = 'ticker:' + symbol;
         client.resolve(this.tickers[symbol], messageHash);
-        // watchTickers part
-        const messageHashes = this.findMessageHashes(client, 'tickers::');
-        for (let i = 0; i < messageHashes.length; i++) {
-            const messageHashTicker = messageHashes[i];
-            const parts = messageHashTicker.split('::');
-            const symbolsString = parts[1];
-            const symbols = symbolsString.split(',');
-            if (this.inArray(parsed['symbol'], symbols)) {
-                client.resolve(parsed, messageHashTicker);
-            }
-        }
     }
     async watchOHLCV(symbol, timeframe = '1m', since = undefined, limit = undefined, params = {}) {
         /**
@@ -889,10 +879,15 @@ export default class bybit extends bybitRest {
         }
         const trades = this.myTrades;
         const symbols = {};
-        const method = spot ? 'parseWsTrade' : 'parseTrade';
         for (let i = 0; i < data.length; i++) {
             const rawTrade = data[i];
-            const parsed = this[method](rawTrade);
+            let parsed = undefined;
+            if (spot) {
+                parsed = this.parseWsTrade(rawTrade);
+            }
+            else {
+                parsed = this.parseTrade(rawTrade);
+            }
             const symbol = parsed['symbol'];
             symbols[symbol] = true;
             trades.append(parsed);

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(): 0 | 1 | -1;
+    protected signum(): 1 | 0 | -1;
     toByteArray(): number[];
     protected equals(a: BigInteger): boolean;
     protected min(a: BigInteger): BigInteger;

package/package.json

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