ccxt-ir 4.9.29 → 4.9.32

package/js/src/binance.js

@@ -3047,6 +3047,7 @@ export default class binance extends Exchange {
      */
     async fetchMarkets(params = {}) {
         const promisesRaw = [];
+        params = this.omit(params, ['type']);
         let rawFetchMarkets = undefined;
         const defaultTypes = ['spot', 'linear', 'inverse'];
         const fetchMarketsOptions = this.safeDict(this.options, 'fetchMarkets');

package/js/src/bit24.d.ts

@@ -9,9 +9,12 @@ export default class bit24 extends Exchange {
     describe(): any;
     fetchMarkets(params?: {}): Promise<Market[]>;
     parseMarket(market: any): Market;
+    parseOtcMarket(market: any): Market;
     fetchTickers(symbols?: Strings, params?: {}): Promise<Tickers>;
     fetchTicker(symbol: string, params?: {}): Promise<Ticker>;
     parseTicker(ticker: any, market?: Market): Ticker;
+    parseOtcTicker(ticker: any, market?: Market): Ticker;
+    removeDuplicateValues(markets: Market[]): Promise<Market[]>;
     sign(path: any, api?: string, method?: string, params?: {}, headers?: any, body?: any): {
         url: string;
         method: string;

package/js/src/bit24.js

@@ -90,7 +90,8 @@ export default class bit24 extends Exchange {
             'urls': {
                 'logo': 'https://cdn.arz.digital/cr-odin/img/exchanges/bit24/64x64.png',
                 'api': {
-                    'public': 'https://bit24.cash/api/',
+                    'public': 'https://rest.bit24.cash',
+                    'otc': 'https://otc-api.bit24.cash',
                 },
                 'www': 'https://bit24.cash/',
                 'doc': [
@@ -100,7 +101,8 @@ export default class bit24 extends Exchange {
             'api': {
                 'public': {
                     'get': {
-                        'pro/v3/markets': 1,
+                        'pro/capi/v1/markets': 1,
+                        'api/v1/coins/simple-list': 1,
                     },
                 },
             },
@@ -117,10 +119,18 @@ export default class bit24 extends Exchange {
          * @returns {object[]} an array of objects representing market data
          */
         const result = [];
+        const OTCresponse = await this.publicGetApiV1CoinsSimpleList();
+        const OTCmarkets = this.safeDict(OTCresponse, 'data');
+        const OTCmarketList = this.safeList(OTCmarkets, 'results', []);
+        for (let i = 0; i < OTCmarketList.length; i++) {
+            const marketdata = OTCmarketList[i];
+            const market = this.parseOtcMarket(marketdata);
+            result.push(market);
+        }
         let page = 1;
         const limit = 100; // check Bit24 docs for max allowed per page
         while (true) {
-            const response = await this.publicGetProV3Markets(this.extend(params, {
+            const response = await this.publicGetProCapiV1Markets(this.extend(params, {
                 'page': page,
                 'per_page': limit,
             }));
@@ -137,7 +147,7 @@ export default class bit24 extends Exchange {
             }
             page += 1;
         }
-        return result;
+        return this.removeDuplicateValues(result);
     }
     parseMarket(market) {
         // {
@@ -185,10 +195,70 @@ export default class bit24 extends Exchange {
         // last_price: "83669"
         // }
         // }
-        const base_coin = this.safeDict(market, 'base_coin');
-        let baseId = this.safeString(base_coin, 'symbol');
-        const quote_coin = this.safeDict(market, 'quote_coin');
-        let quoteId = this.safeString(quote_coin, 'symbol');
+        let baseId = this.safeString(market, 'base_coin_symbol');
+        let quoteId = this.safeString(market, 'quote_coin_symbol');
+        const base = this.safeCurrencyCode(baseId);
+        const quote = this.safeCurrencyCode(quoteId);
+        baseId = baseId.toLowerCase();
+        quoteId = quoteId.toLowerCase();
+        const id = baseId + '-' + quoteId;
+        return {
+            'id': id,
+            'symbol': base + '/' + quote,
+            'base': base,
+            'quote': quote,
+            'settle': undefined,
+            'baseId': baseId,
+            'quoteId': quoteId,
+            'settleId': undefined,
+            'type': 'otc',
+            'spot': false,
+            'margin': false,
+            'swap': false,
+            'future': false,
+            'option': false,
+            'active': true,
+            'contract': false,
+            'linear': undefined,
+            'inverse': undefined,
+            'contractSize': undefined,
+            'expiry': undefined,
+            'expiryDatetime': undefined,
+            'strike': undefined,
+            'optionType': undefined,
+            'precision': {
+                'amount': undefined,
+                'price': undefined,
+            },
+            'limits': {
+                'leverage': {
+                    'min': undefined,
+                    'max': undefined,
+                },
+                'amount': {
+                    'min': undefined,
+                    'max': undefined,
+                },
+                'price': {
+                    'min': undefined,
+                    'max': undefined,
+                },
+                'cost': {
+                    'min': undefined,
+                    'max': undefined,
+                },
+            },
+            'created': undefined,
+            'info': market,
+        };
+    }
+    parseOtcMarket(market) {
+        //         {
+        // symbol: "0G",
+        // name: "0G"
+        // },
+        let baseId = this.safeString(market, 'symbol');
+        let quoteId = 'IRT'; // assuming quote currency is always IRT for OTC markets
         const base = this.safeCurrencyCode(baseId);
         const quote = this.safeCurrencyCode(quoteId);
         baseId = baseId.toLowerCase();
@@ -258,11 +328,20 @@ export default class bit24 extends Exchange {
         if (symbols !== undefined) {
             symbols = this.marketSymbols(symbols);
         }
+        const result = {};
+        const Otcresponse = await this.publicGetApiV1CoinsSimpleList(params);
+        const Otcdata = this.safeDict(Otcresponse, 'data', {});
+        const OtctickerList = this.safeList(Otcdata, 'results', []);
+        for (let i = 0; i < OtctickerList.length; i++) {
+            const tickerData = OtctickerList[i];
+            const ticker = this.parseOtcTicker(tickerData);
+            const symbol = ticker['symbol'];
+            result[symbol] = ticker;
+        }
         let page = 1;
         const limit = 100; // adjust if Bit24 docs show a different default
-        const result = {};
         while (true) {
-            const response = await this.publicGetProV3Markets(this.extend(params, {
+            const response = await this.publicGetProCapiV1Markets(this.extend(params, {
                 'page': page,
                 'per_page': limit,
             }));
@@ -341,21 +420,18 @@ export default class bit24 extends Exchange {
         // }
         // },
         const marketType = 'spot';
-        const base_coin = this.safeDict(ticker, 'base_coin', {});
-        let base_symbol = this.safeString(base_coin, 'symbol');
+        let base_symbol = this.safeString(ticker, 'base_coin_symbol');
         base_symbol = base_symbol.toLowerCase();
-        const quote_coin = this.safeDict(ticker, 'quote_coin', {});
-        let quote_symbol = this.safeString(quote_coin, 'symbol');
+        let quote_symbol = this.safeString(ticker, 'quote_coin_symbol');
         quote_symbol = quote_symbol.toLowerCase();
         const marketId = base_symbol + '-' + quote_symbol;
         const symbol = this.safeSymbol(marketId, market, undefined, marketType);
         const last = this.safeFloat(ticker, 'each_price', 0);
-        const markerInfo = this.safeDict(ticker, 'market_24h_information', {});
-        const change = this.safeFloat(markerInfo, 'change_percent', 0);
-        const minPrice = this.safeFloat(markerInfo, 'min_price', 0);
-        const maxPrice = this.safeFloat(markerInfo, 'max_price', 0);
-        const baseVolume = this.safeFloat(markerInfo, 'base_volume', 0);
-        const quoteVolume = this.safeFloat(markerInfo, 'quote_volume', 0);
+        const change = this.safeFloat(ticker, '24h_change', 0);
+        const minPrice = this.safeFloat(ticker, 'min_price', 0);
+        const maxPrice = this.safeFloat(ticker, 'max_price', 0);
+        const baseVolume = this.safeFloat(ticker, 'base_coin_volume', 0);
+        const quoteVolume = this.safeFloat(ticker, 'quote_coin_volume', 0);
         return this.safeTicker({
             'symbol': symbol,
             'timestamp': undefined,
@@ -379,11 +455,65 @@ export default class bit24 extends Exchange {
             'info': ticker,
         }, market);
     }
+    parseOtcTicker(ticker, market = undefined) {
+        // {
+        // symbol: "0G",
+        // name: "0G"
+        // },
+        const marketType = 'otc';
+        let base_symbol = this.safeString(ticker, 'symbol');
+        base_symbol = base_symbol.toLowerCase();
+        const quote_symbol = 'irt'; // assuming quote currency is always IRT for OTC markets
+        const marketId = base_symbol + '-' + quote_symbol;
+        const symbol = this.safeSymbol(marketId, market, undefined, marketType);
+        return this.safeTicker({
+            'symbol': symbol,
+            'timestamp': undefined,
+            'datetime': undefined,
+            'high': undefined,
+            'low': undefined,
+            'bid': undefined,
+            'bidVolume': undefined,
+            'ask': undefined,
+            'askVolume': undefined,
+            'vwap': undefined,
+            'open': undefined,
+            'close': undefined,
+            'last': undefined,
+            'previousClose': undefined,
+            'change': undefined,
+            'percentage': undefined,
+            'average': undefined,
+            'baseVolume': undefined,
+            'quoteVolume': undefined,
+            'info': ticker,
+        }, market);
+    }
+    async removeDuplicateValues(markets) {
+        const uniqueMarkets = [];
+        const seenIds = new Set();
+        for (let i = 0; i < markets.length; i++) {
+            const market = markets[i];
+            if (!seenIds.has(market['id'])) {
+                seenIds.add(market['id']);
+                uniqueMarkets.push(market);
+            }
+        }
+        return uniqueMarkets;
+    }
     sign(path, api = 'public', method = 'GET', params = {}, headers = undefined, body = undefined) {
+        if (path === 'api/v1/coins/simple-list') {
+            api = 'otc';
+        }
         const query = this.omit(params, this.extractParams(path));
         let url = this.urls['api'][api] + '/' + this.implodeParams(path, params);
         url = url + '?' + this.urlencode(query);
-        headers = { 'Content-Type': 'application/json' };
+        if (api === 'otc') {
+            headers = { 'Content-Type': 'application/json' };
+        }
+        else {
+            headers = { 'Content-Type': 'application/json', 'X-BIT24-APIKEY': 'bdfa2c8c971445d5a4a95c95a5a2a4c2' };
+        }
         return { 'url': url, 'method': method, 'body': body, 'headers': headers };
     }
 }