ccxt 4.3.2 → 4.3.3

package/js/src/hyperliquid.js

@@ -315,6 +315,7 @@ export default class hyperliquid extends Exchange {
         //         ]
         //     ]
         //
+        //
         let meta = this.safeDict(response, 0, {});
         meta = this.safeList(meta, 'universe', []);
         const assetCtxs = this.safeDict(response, 1, {});
@@ -373,10 +374,70 @@ export default class hyperliquid extends Exchange {
         //         },
         //     ],
         // ];
+        // mainnet
+        // [
+        //     {
+        //        "canonical_tokens2":[
+        //           0,
+        //           1
+        //        ],
+        //        "spot_infos":[
+        //           {
+        //              "name":"PURR/USDC",
+        //              "tokens":[
+        //                 1,
+        //                 0
+        //              ]
+        //           }
+        //        ],
+        //        "token_id_to_token":[
+        //           [
+        //              "0x6d1e7cde53ba9467b783cb7c530ce054",
+        //              0
+        //           ],
+        //           [
+        //              "0xc1fb593aeffbeb02f85e0308e9956a90",
+        //              1
+        //           ]
+        //        ],
+        //        "token_infos":[
+        //           {
+        //              "deployer":null,
+        //              "spec":{
+        //                 "name":"USDC",
+        //                 "szDecimals":"8",
+        //                 "weiDecimals":"8"
+        //              },
+        //              "spots":[
+        //              ]
+        //           },
+        //           {
+        //              "deployer":null,
+        //              "spec":{
+        //                 "name":"PURR",
+        //                 "szDecimals":"0",
+        //                 "weiDecimals":"5"
+        //              },
+        //              "spots":[
+        //                 0
+        //              ]
+        //           }
+        //        ]
+        //     },
+        //     [
+        //        {
+        //           "dayNtlVlm":"35001170.16631",
+        //           "markPx":"0.15743",
+        //           "midPx":"0.157555",
+        //           "prevDayPx":"0.158"
+        //        }
+        //     ]
+        // ]
         //
+        // response differs depending on the environment (mainnet vs sandbox)
         const first = this.safeDict(response, 0, {});
-        const meta = this.safeList(first, 'universe', []);
-        const tokens = this.safeList(first, 'tokens', []);
+        const meta = this.safeList2(first, 'universe', 'spot_infos', []);
+        const tokens = this.safeList2(first, 'tokens', 'token_infos', []);
         const markets = [];
         for (let i = 0; i < meta.length; i++) {
             const market = this.safeDict(meta, i, {});
@@ -392,14 +453,16 @@ export default class hyperliquid extends Exchange {
             const maker = this.safeNumber(fees, 'maker');
             const tokensPos = this.safeList(market, 'tokens', []);
             const baseTokenPos = this.safeInteger(tokensPos, 0);
-            const quoteTokenPos = this.safeInteger(tokensPos, 1);
+            // const quoteTokenPos = this.safeInteger (tokensPos, 1);
             const baseTokenInfo = this.safeDict(tokens, baseTokenPos, {});
-            const quoteTokenInfo = this.safeDict(tokens, quoteTokenPos, {});
-            const baseDecimals = this.safeString(baseTokenInfo, 'szDecimals');
-            const quoteDecimals = this.safeInteger(quoteTokenInfo, 'szDecimals');
+            // const quoteTokenInfo = this.safeDict (tokens, quoteTokenPos, {});
+            const innerBaseTokenInfo = this.safeDict(baseTokenInfo, 'spec', baseTokenInfo);
+            // const innerQuoteTokenInfo = this.safeDict (quoteTokenInfo, 'spec', quoteTokenInfo);
+            const amountPrecision = this.parseNumber(this.parsePrecision(this.safeString(innerBaseTokenInfo, 'szDecimals')));
+            // const quotePrecision = this.parseNumber (this.parsePrecision (this.safeString (innerQuoteTokenInfo, 'szDecimals')));
             const baseId = this.numberToString(i + 10000);
             markets.push(this.safeMarketStructure({
-                'id': baseId,
+                'id': marketName,
                 'symbol': symbol,
                 'base': base,
                 'quote': quote,
@@ -409,14 +472,15 @@ export default class hyperliquid extends Exchange {
                 'settleId': undefined,
                 'type': 'spot',
                 'spot': true,
+                'subType': undefined,
                 'margin': undefined,
                 'swap': false,
                 'future': false,
                 'option': false,
                 'active': true,
                 'contract': false,
-                'linear': true,
-                'inverse': false,
+                'linear': undefined,
+                'inverse': undefined,
                 'taker': taker,
                 'maker': maker,
                 'contractSize': undefined,
@@ -425,8 +489,8 @@ export default class hyperliquid extends Exchange {
                 'strike': undefined,
                 'optionType': undefined,
                 'precision': {
-                    'amount': this.parseNumber(this.parsePrecision(baseDecimals)),
-                    'price': quoteDecimals, // significant digits
+                    'amount': amountPrecision,
+                    'price': 5, // significant digits
                 },
                 'limits': {
                     'leverage': {
@@ -642,7 +706,7 @@ export default class hyperliquid extends Exchange {
         const market = this.market(symbol);
         const request = {
             'type': 'l2Book',
-            'coin': market['base'],
+            'coin': market['swap'] ? market['base'] : market['id'],
         };
         const response = await this.publicPostInfo(this.extend(request, params));
         //
@@ -702,7 +766,7 @@ export default class hyperliquid extends Exchange {
         const request = {
             'type': 'candleSnapshot',
             'req': {
-                'coin': market['base'],
+                'coin': market['swap'] ? market['base'] : market['id'],
                 'interval': timeframe,
                 'startTime': since,
                 'endTime': until,
@@ -810,6 +874,10 @@ export default class hyperliquid extends Exchange {
         return this.parseTrades(response, market, since, limit);
     }
     amountToPrecision(symbol, amount) {
+        const market = this.market(symbol);
+        if (market['spot']) {
+            return super.amountToPrecision(symbol, amount);
+        }
         return this.decimalToPrecision(amount, ROUND, this.markets[symbol]['precision']['amount'], this.precisionMode);
     }
     priceToPrecision(symbol, price) {
@@ -2358,6 +2426,12 @@ export default class hyperliquid extends Exchange {
         }
         throw new ArgumentsRequired(this.id + ' ' + methodName + '() requires a user parameter inside \'params\' or the wallet address set');
     }
+    coinToMarketId(coin) {
+        if (coin.indexOf('/') > -1) {
+            return coin; // spot
+        }
+        return coin + '/USDC:USDC';
+    }
     handleErrors(code, reason, url, method, headers, body, response, requestHeaders, requestBody) {
         if (!response) {
             return undefined; // fallback to default error handler

package/js/src/okx.d.ts

@@ -299,6 +299,8 @@ export default class okx extends Exchange {
     };
     fetchConvertQuote(fromCode: string, toCode: string, amount?: Num, params?: {}): Promise<Conversion>;
     createConvertTrade(id: string, fromCode: string, toCode: string, amount?: Num, params?: {}): Promise<Conversion>;
+    fetchConvertTrade(id: string, code?: Str, params?: {}): Promise<Conversion>;
+    fetchConvertTradeHistory(code?: Str, since?: Int, limit?: Int, params?: {}): Promise<Conversion[]>;
     parseConversion(conversion: any, fromCurrency?: Currency, toCurrency?: Currency): Conversion;
     fetchConvertCurrencies(params?: {}): Promise<Currencies>;
     handleErrors(httpCode: any, reason: any, url: any, method: any, headers: any, body: any, response: any, requestHeaders: any, requestBody: any): any;

package/js/src/okx.js

@@ -66,6 +66,8 @@ export default class okx extends Exchange {
                 'fetchClosedOrders': true,
                 'fetchConvertCurrencies': true,
                 'fetchConvertQuote': true,
+                'fetchConvertTrade': true,
+                'fetchConvertTradeHistory': true,
                 'fetchCrossBorrowRate': true,
                 'fetchCrossBorrowRates': true,
                 'fetchCurrencies': true,
@@ -7715,6 +7717,104 @@ export default class okx extends Exchange {
         const toCurrency = this.currency(toCurrencyId);
         return this.parseConversion(result, fromCurrency, toCurrency);
     }
+    async fetchConvertTrade(id, code = undefined, params = {}) {
+        /**
+         * @method
+         * @name okx#fetchConvertTrade
+         * @description fetch the data for a conversion trade
+         * @see https://www.okx.com/docs-v5/en/#funding-account-rest-api-get-convert-history
+         * @param {string} id the id of the trade that you want to fetch
+         * @param {string} [code] the unified currency code of the conversion trade
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a [conversion structure]{@link https://docs.ccxt.com/#/?id=conversion-structure}
+         */
+        await this.loadMarkets();
+        const request = {
+            'clTReqId': id,
+        };
+        const response = await this.privateGetAssetConvertHistory(this.extend(request, params));
+        //
+        //     {
+        //         "code": "0",
+        //         "data": [
+        //             {
+        //                 "clTReqId": "",
+        //                 "instId": "ETH-USDT",
+        //                 "side": "buy",
+        //                 "fillPx": "2932.401044",
+        //                 "baseCcy": "ETH",
+        //                 "quoteCcy": "USDT",
+        //                 "fillBaseSz": "0.01023052",
+        //                 "state": "fullyFilled",
+        //                 "tradeId": "trader16461885203381437",
+        //                 "fillQuoteSz": "30",
+        //                 "ts": "1646188520000"
+        //             }
+        //         ],
+        //         "msg": ""
+        //     }
+        //
+        const data = this.safeList(response, 'data', []);
+        const result = this.safeDict(data, 0, {});
+        const fromCurrencyId = this.safeString(result, 'baseCcy');
+        const toCurrencyId = this.safeString(result, 'quoteCcy');
+        let fromCurrency = undefined;
+        let toCurrency = undefined;
+        if (fromCurrencyId !== undefined) {
+            fromCurrency = this.currency(fromCurrencyId);
+        }
+        if (toCurrencyId !== undefined) {
+            toCurrency = this.currency(toCurrencyId);
+        }
+        return this.parseConversion(result, fromCurrency, toCurrency);
+    }
+    async fetchConvertTradeHistory(code = undefined, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name okx#fetchConvertTradeHistory
+         * @description fetch the users history of conversion trades
+         * @see https://www.okx.com/docs-v5/en/#funding-account-rest-api-get-convert-history
+         * @param {string} [code] the unified currency code
+         * @param {int} [since] the earliest time in ms to fetch conversions for
+         * @param {int} [limit] the maximum number of conversion structures to retrieve
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {int} [params.until] timestamp in ms of the latest conversion to fetch
+         * @returns {object[]} a list of [conversion structures]{@link https://docs.ccxt.com/#/?id=conversion-structure}
+         */
+        await this.loadMarkets();
+        let request = {};
+        [request, params] = this.handleUntilOption('after', request, params);
+        if (since !== undefined) {
+            request['before'] = since;
+        }
+        if (limit !== undefined) {
+            request['limit'] = limit;
+        }
+        const response = await this.privateGetAssetConvertHistory(this.extend(request, params));
+        //
+        //     {
+        //         "code": "0",
+        //         "data": [
+        //             {
+        //                 "clTReqId": "",
+        //                 "instId": "ETH-USDT",
+        //                 "side": "buy",
+        //                 "fillPx": "2932.401044",
+        //                 "baseCcy": "ETH",
+        //                 "quoteCcy": "USDT",
+        //                 "fillBaseSz": "0.01023052",
+        //                 "state": "fullyFilled",
+        //                 "tradeId": "trader16461885203381437",
+        //                 "fillQuoteSz": "30",
+        //                 "ts": "1646188520000"
+        //             }
+        //         ],
+        //         "msg": ""
+        //     }
+        //
+        const rows = this.safeList(response, 'data', []);
+        return this.parseConversions(rows, 'baseCcy', 'quoteCcy', since, limit);
+    }
     parseConversion(conversion, fromCurrency = undefined, toCurrency = undefined) {
         //
         // fetchConvertQuote
@@ -7752,6 +7852,22 @@ export default class okx extends Exchange {
         //         "ts": "1646188520338"
         //     }
         //
+        // fetchConvertTrade, fetchConvertTradeHistory
+        //
+        //     {
+        //         "clTReqId": "",
+        //         "instId": "ETH-USDT",
+        //         "side": "buy",
+        //         "fillPx": "2932.401044",
+        //         "baseCcy": "ETH",
+        //         "quoteCcy": "USDT",
+        //         "fillBaseSz": "0.01023052",
+        //         "state": "fullyFilled",
+        //         "tradeId": "trader16461885203381437",
+        //         "fillQuoteSz": "30",
+        //         "ts": "1646188520000"
+        //     }
+        //
         const timestamp = this.safeInteger2(conversion, 'quoteTime', 'ts');
         const fromCoin = this.safeString(conversion, 'baseCcy');
         const fromCode = this.safeCurrencyCode(fromCoin, fromCurrency);

package/js/src/poloniexfutures.js

@@ -376,8 +376,18 @@ export default class poloniexfutures extends Exchange {
         const marketId = this.safeString(ticker, 'symbol');
         const symbol = this.safeSymbol(marketId, market);
         const timestampString = this.safeString(ticker, 'ts');
-        // check timestamp bcz bug: https://app.travis-ci.com/github/ccxt/ccxt/builds/269959181#L4011
-        const multiplier = (timestampString.length === 18) ? 0.00001 : 0.000001;
+        // check timestamp bcz bug: https://app.travis-ci.com/github/ccxt/ccxt/builds/269959181#L4011 and also 17 digits occured
+        let multiplier = undefined;
+        if (timestampString.length === 17) {
+            multiplier = 0.0001;
+        }
+        else if (timestampString.length === 18) {
+            multiplier = 0.00001;
+        }
+        else {
+            // 19 length default
+            multiplier = 0.000001;
+        }
         const timestamp = this.safeIntegerProduct(ticker, 'ts', multiplier);
         const last = this.safeString2(ticker, 'price', 'lastPrice');
         const percentage = Precise.stringMul(this.safeString(ticker, 'priceChgPct'), '100');

package/js/src/pro/hyperliquid.js

@@ -67,7 +67,7 @@ export default class hyperliquid extends hyperliquidRest {
             'method': 'subscribe',
             'subscription': {
                 'type': 'l2Book',
-                'coin': market['base'],
+                'coin': market['swap'] ? market['base'] : market['id'],
             },
         };
         const message = this.extend(request, params);
@@ -102,7 +102,7 @@ export default class hyperliquid extends hyperliquidRest {
         //
         const entry = this.safeDict(message, 'data', {});
         const coin = this.safeString(entry, 'coin');
-        const marketId = coin + '/USDC:USDC';
+        const marketId = this.coinToMarketId(coin);
         const market = this.market(marketId);
         const symbol = market['symbol'];
         const rawData = this.safeList(entry, 'levels', []);
@@ -233,7 +233,7 @@ export default class hyperliquid extends hyperliquidRest {
             'method': 'subscribe',
             'subscription': {
                 'type': 'trades',
-                'coin': market['base'],
+                'coin': market['swap'] ? market['base'] : market['id'],
             },
         };
         const message = this.extend(request, params);
@@ -263,7 +263,7 @@ export default class hyperliquid extends hyperliquidRest {
         const entry = this.safeList(message, 'data', []);
         const first = this.safeDict(entry, 0, {});
         const coin = this.safeString(first, 'coin');
-        const marketId = coin + '/USDC:USDC';
+        const marketId = this.coinToMarketId(coin);
         const market = this.market(marketId);
         const symbol = market['symbol'];
         if (!(symbol in this.trades)) {
@@ -318,7 +318,7 @@ export default class hyperliquid extends hyperliquidRest {
         const price = this.safeString(trade, 'px');
         const amount = this.safeString(trade, 'sz');
         const coin = this.safeString(trade, 'coin');
-        const marketId = coin + '/USDC:USDC';
+        const marketId = this.coinToMarketId(coin);
         market = this.safeMarket(marketId, undefined);
         const symbol = market['symbol'];
         const id = this.safeString(trade, 'tid');
@@ -363,7 +363,7 @@ export default class hyperliquid extends hyperliquidRest {
             'method': 'subscribe',
             'subscription': {
                 'type': 'candle',
-                'coin': market['base'],
+                'coin': market['swap'] ? market['base'] : market['id'],
                 'interval': timeframe,
             },
         };
@@ -395,7 +395,8 @@ export default class hyperliquid extends hyperliquidRest {
         //
         const data = this.safeDict(message, 'data', {});
         const base = this.safeString(data, 's');
-        const symbol = base + '/USDC:USDC';
+        const marketId = this.coinToMarketId(base);
+        const symbol = this.safeSymbol(marketId);
         const timeframe = this.safeString(data, 'i');
         if (!(symbol in this.ohlcvs)) {
             this.ohlcvs[symbol] = {};

package/js/src/pro/kraken.js

@@ -1323,7 +1323,7 @@ export default class kraken extends krakenRest {
             },
         };
         const url = this.urls['api']['ws']['public'];
-        return await this.watchMultiple(url, messageHashes, this.extend(request, params), messageHashes, subscriptionArgs);
+        return await this.watchMultiple(url, messageHashes, this.deepExtend(request, params), messageHashes, subscriptionArgs);
     }
     getMessageHash(unifiedElementName, subChannelName = undefined, symbol = undefined) {
         // unifiedElementName can be : orderbook, trade, ticker, bidask ...

package/js/src/pro/wazirx.js

@@ -749,7 +749,8 @@ export default class wazirx extends wazirxRest {
         };
         const streams = Object.keys(streamHandlers);
         for (let i = 0; i < streams.length; i++) {
-            if (this.inArray(streams[i], stream)) {
+            const streamContains = stream.indexOf(streams[i]) > -1;
+            if (streamContains) {
                 const handler = streamHandlers[streams[i]];
                 handler.call(this, client, message);
                 return;

package/js/src/static_dependencies/jsencrypt/JSEncryptRSAKey.d.ts

@@ -55,7 +55,7 @@ export declare class JSEncryptRSAKey extends RSAKey {
      * @returns {string}  DER Encoded String representing the rsa private key
      * @private
      */
-    getPrivateBaseKey(): string;
+    getPrivateBaseKey(): any;
     /**
      * base64 (pem) encoded version of the DER encoded representation
      * @returns {string} pem encoded representation without header and footer
@@ -82,7 +82,7 @@ export declare class JSEncryptRSAKey extends RSAKey {
      * @returns {string} DER Encoded String representing the rsa public key
      * @private
      */
-    getPublicBaseKey(): string;
+    getPublicBaseKey(): any;
     /**
      * base64 (pem) encoded version of the DER encoded representation
      * @returns {string} pem encoded representation without header and footer

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;