ccxt-ir 4.24.0 → 4.24.1

package/dist/cjs/src/bitpin.js

@@ -79,6 +79,7 @@ class bitpin extends bitpin$1["default"] {
                 'fetchTradingFee': false,
                 'fetchTradingFees': false,
                 'fetchWithdrawals': false,
+                'otc': true,
                 'setLeverage': false,
                 'setMarginMode': false,
                 'transfer': false,
@@ -135,18 +136,23 @@ class bitpin extends bitpin$1["default"] {
          * @description retrieves data on all markets for bitpin
          * @see https://api-docs.bitpin.ir/#be8d9c51a2
          * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {string} [params.type] market type, 'spot' (default) or 'otc'
          * @returns {object[]} an array of objects representing market data
          */
-        const response = await this.publicGetV1MktMarkets(params);
+        const type = this.safeString(params, 'type', 'spot');
+        const request = this.omit(params, ['type']);
+        const response = await this.publicGetV1MktMarkets(request);
         const markets = this.safeList(response, 'results');
+        const tradableKey = (type === 'otc') ? 'otc_tradable' : 'tradable';
         const result = [];
         for (let i = 0; i < markets.length; i++) {
-            const market = this.parseMarket(markets[i]);
-            result.push(market);
+            if (this.safeBool(markets[i], tradableKey, false)) {
+                result.push(this.parseMarket(markets[i], type));
+            }
         }
         return result;
     }
-    parseMarket(market) {
+    parseMarket(market, type = 'spot') {
         const id = this.safeString(market, 'id');
         const baseCurrency = this.safeDict(market, 'currency1');
         const quoteCurrency = this.safeDict(market, 'currency2');
@@ -156,6 +162,7 @@ class bitpin extends bitpin$1["default"] {
         const quote = this.safeCurrencyCode(quoteId);
         baseId = baseId.toLowerCase();
         quoteId = quoteId.toLowerCase();
+        const tradableKey = (type === 'otc') ? 'otc_tradable' : 'tradable';
         return {
             'id': id,
             'symbol': base + '/' + quote,
@@ -165,13 +172,13 @@ class bitpin extends bitpin$1["default"] {
             'baseId': baseId,
             'quoteId': quoteId,
             'settleId': undefined,
-            'type': 'spot',
-            'spot': true,
+            'type': type,
+            'spot': type === 'spot',
             'margin': false,
             'swap': false,
             'future': false,
             'option': false,
-            'active': true,
+            'active': this.safeBool(market, tradableKey, false),
             'contract': false,
             'linear': undefined,
             'inverse': undefined,
@@ -214,19 +221,20 @@ class bitpin extends bitpin$1["default"] {
          * @see https://api-docs.bitpin.ir/#be8d9c51a2
          * @param {string[]|undefined} symbols unified symbols of the markets to fetch the ticker for, all market tickers are returned if not assigned
          * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {string} [params.type] market type, 'spot' (default) or 'otc'
          * @returns {object} a dictionary of [ticker structures]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
-        await this.loadMarkets();
-        if (symbols !== undefined) {
-            symbols = this.marketSymbols(symbols);
-        }
-        const response = await this.publicGetV1MktMarkets(params);
+        const type = this.safeString(params, 'type', 'spot');
+        const request = this.omit(params, ['type']);
+        await this.loadMarkets(false, { 'type': type });
+        const response = await this.publicGetV1MktMarkets(request);
         const markets = this.safeList(response, 'results');
+        const tradableKey = (type === 'otc') ? 'otc_tradable' : 'tradable';
         const result = {};
         for (let i = 0; i < markets.length; i++) {
-            const is_active = this.safeBool(markets[i], 'tradable');
-            if (is_active === true) {
-                const ticker = this.parseTicker(markets[i]);
+            if (this.safeBool(markets[i], tradableKey, false)) {
+                const market = this.parseMarket(markets[i], type);
+                const ticker = this.parseTicker(markets[i], market);
                 const symbol = ticker['symbol'];
                 result[symbol] = ticker;
             }
@@ -241,9 +249,10 @@ class bitpin extends bitpin$1["default"] {
          * @see https://api-docs.bitpin.ir/#be8d9c51a2
          * @param {string} symbol unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {string} [params.type] market type, 'spot' (default) or 'otc'
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
-        const ticker = await this.fetchTickers([symbol]);
+        const ticker = await this.fetchTickers([symbol], params);
         return ticker[symbol];
     }
     parseTicker(ticker, market = undefined) {
@@ -360,16 +369,17 @@ class bitpin extends bitpin$1["default"] {
         //     'popularity_weight': 0,
         //     'freshness_weight': 0,
         // }
-        const marketType = 'spot';
-        const priceInfo = this.safeValue(ticker, 'order_book_info');
+        const marketType = this.safeString(market, 'type', 'spot');
+        const priceInfoKey = (marketType === 'otc') ? 'price_info' : 'order_book_info';
+        const priceInfo = this.safeDict(ticker, priceInfoKey, {});
         const marketId = this.safeString(ticker, 'id');
         const symbol = this.safeSymbol(marketId, market, undefined, marketType);
-        const high = this.safeFloat(priceInfo, 'max', 0);
-        const low = this.safeFloat(priceInfo, 'min', 0);
-        const last = this.safeFloat(priceInfo, 'price', 0);
-        const change = this.safeFloat(priceInfo, 'change', 0);
-        const baseVolume = this.safeFloat(priceInfo, 'amount', 0);
-        const quoteVolume = this.safeFloat(priceInfo, 'value', 0);
+        const high = this.safeFloat(priceInfo, 'max');
+        const low = this.safeFloat(priceInfo, 'min');
+        const last = this.safeFloat(priceInfo, 'price');
+        const change = this.safeFloat(priceInfo, 'change');
+        const baseVolume = this.safeFloat(priceInfo, 'amount');
+        const quoteVolume = this.safeFloat(priceInfo, 'value');
         return this.safeTicker({
             'symbol': symbol,
             'timestamp': undefined,

package/dist/cjs/src/nobitex.js

@@ -78,6 +78,7 @@ class nobitex extends nobitex$1["default"] {
                 'fetchTradingFee': false,
                 'fetchTradingFees': false,
                 'fetchWithdrawals': false,
+                'otc': true,
                 'setLeverage': false,
                 'setMarginMode': false,
                 'transfer': false,
@@ -137,9 +138,12 @@ class nobitex extends nobitex$1["default"] {
          * @description retrieves data on all markets for nobitex
          * @see https://apidocs.nobitex.ir/#6ae2dae4a2
          * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {string} [params.type] market type, 'spot' (default) or 'otc'; both use market/stats
          * @returns {object[]} an array of objects representing market data
          */
-        const response = await this.publicGetMarketStats();
+        const type = this.safeString(params, 'type', 'spot');
+        const request = this.omit(params, ['type']);
+        const response = await this.publicGetMarketStats(request);
         const markets = this.safeDict(response, 'stats');
         const marketKeys = Object.keys(markets);
         const result = [];
@@ -148,13 +152,13 @@ class nobitex extends nobitex$1["default"] {
             if (markets[symbol]['isClosed']) {
                 continue;
             }
-            markets[symbol]['symbol'] = symbol;
-            const market = this.parseMarket(markets[symbol]);
+            const data = this.extend(markets[symbol], { 'symbol': symbol });
+            const market = this.parseMarket(data, type);
             result.push(market);
         }
         return result;
     }
-    parseMarket(market) {
+    parseMarket(market, type = 'spot') {
         //        btc-rls: {
         // isClosed: false,
         // bestSell: "38820000000",
@@ -185,8 +189,8 @@ class nobitex extends nobitex$1["default"] {
             'baseId': baseId,
             'quoteId': quoteId,
             'settleId': undefined,
-            'type': 'spot',
-            'spot': true,
+            'type': type,
+            'spot': type === 'spot',
             'margin': false,
             'swap': false,
             'future': false,
@@ -234,13 +238,16 @@ class nobitex extends nobitex$1["default"] {
          * @see https://apidocs.nobitex.ir/#6ae2dae4a2
          * @param {string[]|undefined} symbols unified symbols of the markets to fetch the ticker for, all market tickers are returned if not assigned
          * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {string} [params.type] market type, 'spot' (default) or 'otc'; both use market/stats
          * @returns {object} a dictionary of [ticker structures]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
-        await this.loadMarkets();
+        const type = this.safeString(params, 'type', 'spot');
+        const request = this.omit(params, ['type']);
+        await this.loadMarkets(false, { 'type': type });
         if (symbols !== undefined) {
             symbols = this.marketSymbols(symbols);
         }
-        const response = await this.publicGetMarketStats();
+        const response = await this.publicGetMarketStats(request);
         const markets = this.safeDict(response, 'stats');
         const marketKeys = Object.keys(markets);
         const result = {};
@@ -249,8 +256,9 @@ class nobitex extends nobitex$1["default"] {
             if (markets[symbol]['isClosed']) {
                 continue;
             }
-            markets[symbol]['symbol'] = symbol;
-            const ticker = this.parseTicker(markets[symbol]);
+            const data = this.extend(markets[symbol], { 'symbol': symbol });
+            const market = this.parseMarket(data, type);
+            const ticker = this.parseTicker(data, market);
             symbol = ticker['symbol'];
             result[symbol] = ticker;
         }
@@ -264,10 +272,12 @@ class nobitex extends nobitex$1["default"] {
          * @see https://apidocs.nobitex.ir/#6ae2dae4a2
          * @param {string} symbol unified symbol of the market to fetch the ticker for
          * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @param {string} [params.type] market type, 'spot' (default) or 'otc'; both use market/stats
          * @returns {object} a [ticker structure]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
-        const ticker = await this.fetchTickers([symbol]);
-        return ticker[symbol];
+        const tickers = await this.fetchTickers([symbol], params);
+        const values = Object.values(tickers);
+        return this.safeValue(values, 0);
     }
     parseTicker(ticker, market = undefined) {
         //        {
@@ -285,19 +295,8 @@ class nobitex extends nobitex$1["default"] {
         // dayClose: "112800000000",
         // dayChange: "0.01"
         // }
-        const marketType = 'spot';
-        const rawSymbol = this.safeStringLower(ticker, 'symbol');
-        const parts = rawSymbol.split('-');
-        const baseId = parts[0];
-        let quoteId = parts[1];
-        if (quoteId === 'rls') {
-            quoteId = 'irt';
-        }
-        const base = this.safeCurrencyCode(baseId.toUpperCase());
-        const quote = this.safeCurrencyCode(quoteId.toUpperCase());
-        const marketId = base + '/' + quote;
-        const marketinfo = this.market(marketId);
-        const symbol = this.safeSymbol(marketId, market, undefined, marketType);
+        market = (market === undefined) ? this.parseMarket(ticker) : market;
+        const symbol = market['symbol'];
         let high = this.safeFloat(ticker, 'dayHigh');
         let low = this.safeFloat(ticker, 'dayLow');
         let bid = this.safeFloat(ticker, 'bestBuy');
@@ -309,7 +308,7 @@ class nobitex extends nobitex$1["default"] {
         let quoteVolume = this.safeFloat(ticker, 'volumeDst');
         const baseVolume = this.safeFloat(ticker, 'volumeSrc');
         // adjust Nobitex IRT scaling
-        if (marketinfo['quote'] === 'IRT') {
+        if (market['quote'] === 'IRT') {
             high = high ? high / 10 : 0;
             low = low ? low / 10 : 0;
             bid = bid ? bid / 10 : 0;