ccxt-ir 4.24.0 → 4.24.1

package/js/src/swapwallet.js

@@ -4,215 +4,215 @@
 // https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
 // EDIT THE CORRESPONDENT .ts FILE INSTEAD
 
-//  ---------------------------------------------------------------------------
-import Exchange from './base/Exchange.js';
-//  ---------------------------------------------------------------------------
-/**
- * @class swapwallet
- * @augments Exchange
- */
-export default class swapwallet extends Exchange {
-    describe() {
-        return this.deepExtend(super.describe(), {
-            'id': 'swapwallet',
-            'name': 'Swapwallet',
-            'countries': ['IR'],
-            'rateLimit': 1000,
-            'version': 'v2',
-            'certified': false,
-            'pro': false,
-            'has': {
-                'CORS': undefined,
-                'spot': false,
-                'margin': false,
-                'swap': false,
-                'future': false,
-                'option': false,
-                'fetchMarkets': true,
-                'fetchTicker': true,
-                'fetchTickers': true,
-                'otc': true,
-            },
-            'options': {
-                'defaultType': 'otc',
-            },
-            'urls': {
-                'api': {
-                    'public': 'https://swapwallet.app/api/v2',
-                },
-                'www': 'https://swapwallet.app',
-                'doc': 'https://swapwallet.app/api/v2/market/crypto/stats',
-            },
-            'api': {
-                'public': {
-                    'get': {
-                        'market/crypto/stats': 1,
-                    },
-                },
-            },
-        });
-    }
-    async fetchMarkets(params = {}) {
-        /**
-         * @method
-         * @name swapwallet#fetchMarkets
-         * @description retrieves all OTC markets
-         * @see https://swapwallet.app/api/v2/market/crypto/stats
-         * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @returns {object[]} an array of market structures
-         */
-        const response = await this.publicGetMarketCryptoStats(params);
-        const markets = this.safeDict(response, 'result', {});
-        const ids = Object.keys(markets);
-        const result = [];
-        for (let i = 0; i < ids.length; i++) {
-            const id = ids[i];
-            result.push(this.parseMarket(this.extend(markets[id], { 'id': id })));
-        }
-        return result;
-    }
-    parseMarket(market) {
-        // {
-        //     "source": "USOON",
-        //     "destination": "USDT",
-        //     "marketData": {
-        //         "bestSell": "165.72",
-        //         "bestBuy": "162.43",
-        //         "latestPrice": "164.08",
-        //         "dayChange": "2.98",
-        //         "volume24h": "3753.99"
-        //     }
-        // }
-        const baseId = this.safeString(market, 'source');
-        const quoteId = this.safeString(market, 'destination');
-        const base = this.safeCurrencyCode(baseId);
-        const quote = this.safeCurrencyCode(quoteId);
-        const id = this.safeString(market, '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': undefined,
-            '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,
-        };
-    }
-    async fetchTickers(symbols = undefined, params = {}) {
-        /**
-         * @method
-         * @name swapwallet#fetchTickers
-         * @description fetches 24 hour price statistics for multiple OTC markets
-         * @see https://swapwallet.app/api/v2/market/crypto/stats
-         * @param {string[]} [symbols] unified symbols, all markets are returned if undefined
-         * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @returns {object} a dictionary of ticker structures indexed by symbol
-         */
-        await this.loadMarkets();
-        symbols = this.marketSymbols(symbols);
-        const response = await this.publicGetMarketCryptoStats(params);
-        const tickers = this.safeDict(response, 'result', {});
-        const ids = Object.keys(tickers);
-        const result = {};
-        for (let i = 0; i < ids.length; i++) {
-            const id = ids[i];
-            const ticker = this.parseTicker(tickers[id]);
-            result[ticker['symbol']] = ticker;
-        }
-        return this.filterByArrayTickers(result, 'symbol', symbols);
-    }
-    async fetchTicker(symbol, params = {}) {
-        /**
-         * @method
-         * @name swapwallet#fetchTicker
-         * @description fetches 24 hour price statistics for a single OTC market
-         * @see https://swapwallet.app/api/v2/market/crypto/stats
-         * @param {string} symbol unified market symbol
-         * @param {object} [params] extra parameters specific to the exchange API endpoint
-         * @returns {object} a ticker structure
-         */
-        await this.loadMarkets();
-        const market = this.market(symbol);
-        const tickers = await this.fetchTickers([market['symbol']], params);
-        return tickers[market['symbol']];
-    }
-    parseTicker(ticker, market = undefined) {
-        const baseId = this.safeString(ticker, 'source');
-        const quoteId = this.safeString(ticker, 'destination');
-        const marketId = baseId + '-' + quoteId;
-        const symbol = this.safeSymbol(marketId, market, '-', 'otc');
-        const data = this.safeDict(ticker, 'marketData', {});
-        const last = this.safeString(data, 'latestPrice');
-        return this.safeTicker({
-            'symbol': symbol,
-            'timestamp': undefined,
-            'datetime': undefined,
-            'high': undefined,
-            'low': undefined,
-            'bid': this.safeString(data, 'bestBuy'),
-            'bidVolume': undefined,
-            'ask': this.safeString(data, 'bestSell'),
-            'askVolume': undefined,
-            'vwap': undefined,
-            'open': undefined,
-            'close': last,
-            'last': last,
-            'previousClose': undefined,
-            'change': undefined,
-            'percentage': this.safeString(data, 'dayChange'),
-            'average': undefined,
-            'baseVolume': this.safeString(data, 'volume24h'),
-            'quoteVolume': undefined,
-            'info': ticker,
-        }, market);
-    }
-    sign(path, api = 'public', method = 'GET', params = {}, headers = undefined, body = undefined) {
-        const query = this.omit(params, this.extractParams(path));
-        let url = this.urls['api'][api] + '/' + this.implodeParams(path, params);
-        if (Object.keys(query).length) {
-            url += '?' + this.urlencode(query);
-        }
-        headers = { 'Content-Type': 'application/json' };
-        return { 'url': url, 'method': method, 'body': body, 'headers': headers };
-    }
-}
+//  ---------------------------------------------------------------------------
+import Exchange from './base/Exchange.js';
+//  ---------------------------------------------------------------------------
+/**
+ * @class swapwallet
+ * @augments Exchange
+ */
+export default class swapwallet extends Exchange {
+    describe() {
+        return this.deepExtend(super.describe(), {
+            'id': 'swapwallet',
+            'name': 'Swapwallet',
+            'countries': ['IR'],
+            'rateLimit': 1000,
+            'version': 'v2',
+            'certified': false,
+            'pro': false,
+            'has': {
+                'CORS': undefined,
+                'spot': false,
+                'margin': false,
+                'swap': false,
+                'future': false,
+                'option': false,
+                'fetchMarkets': true,
+                'fetchTicker': true,
+                'fetchTickers': true,
+                'otc': true,
+            },
+            'options': {
+                'defaultType': 'otc',
+            },
+            'urls': {
+                'api': {
+                    'public': 'https://swapwallet.app/api/v2',
+                },
+                'www': 'https://swapwallet.app',
+                'doc': 'https://swapwallet.app/api/v2/market/crypto/stats',
+            },
+            'api': {
+                'public': {
+                    'get': {
+                        'market/crypto/stats': 1,
+                    },
+                },
+            },
+        });
+    }
+    async fetchMarkets(params = {}) {
+        /**
+         * @method
+         * @name swapwallet#fetchMarkets
+         * @description retrieves all OTC markets
+         * @see https://swapwallet.app/api/v2/market/crypto/stats
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object[]} an array of market structures
+         */
+        const response = await this.publicGetMarketCryptoStats(params);
+        const markets = this.safeDict(response, 'result', {});
+        const ids = Object.keys(markets);
+        const result = [];
+        for (let i = 0; i < ids.length; i++) {
+            const id = ids[i];
+            result.push(this.parseMarket(this.extend(markets[id], { 'id': id })));
+        }
+        return result;
+    }
+    parseMarket(market) {
+        // {
+        //     "source": "USOON",
+        //     "destination": "USDT",
+        //     "marketData": {
+        //         "bestSell": "165.72",
+        //         "bestBuy": "162.43",
+        //         "latestPrice": "164.08",
+        //         "dayChange": "2.98",
+        //         "volume24h": "3753.99"
+        //     }
+        // }
+        const baseId = this.safeString(market, 'source');
+        const quoteId = this.safeString(market, 'destination');
+        const base = this.safeCurrencyCode(baseId);
+        const quote = this.safeCurrencyCode(quoteId);
+        const id = this.safeString(market, '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': undefined,
+            '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,
+        };
+    }
+    async fetchTickers(symbols = undefined, params = {}) {
+        /**
+         * @method
+         * @name swapwallet#fetchTickers
+         * @description fetches 24 hour price statistics for multiple OTC markets
+         * @see https://swapwallet.app/api/v2/market/crypto/stats
+         * @param {string[]} [symbols] unified symbols, all markets are returned if undefined
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a dictionary of ticker structures indexed by symbol
+         */
+        await this.loadMarkets();
+        symbols = this.marketSymbols(symbols);
+        const response = await this.publicGetMarketCryptoStats(params);
+        const tickers = this.safeDict(response, 'result', {});
+        const ids = Object.keys(tickers);
+        const result = {};
+        for (let i = 0; i < ids.length; i++) {
+            const id = ids[i];
+            const ticker = this.parseTicker(tickers[id]);
+            result[ticker['symbol']] = ticker;
+        }
+        return this.filterByArrayTickers(result, 'symbol', symbols);
+    }
+    async fetchTicker(symbol, params = {}) {
+        /**
+         * @method
+         * @name swapwallet#fetchTicker
+         * @description fetches 24 hour price statistics for a single OTC market
+         * @see https://swapwallet.app/api/v2/market/crypto/stats
+         * @param {string} symbol unified market symbol
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a ticker structure
+         */
+        await this.loadMarkets();
+        const market = this.market(symbol);
+        const tickers = await this.fetchTickers([market['symbol']], params);
+        return tickers[market['symbol']];
+    }
+    parseTicker(ticker, market = undefined) {
+        const baseId = this.safeString(ticker, 'source');
+        const quoteId = this.safeString(ticker, 'destination');
+        const marketId = baseId + '-' + quoteId;
+        const symbol = this.safeSymbol(marketId, market, '-', 'otc');
+        const data = this.safeDict(ticker, 'marketData', {});
+        const last = this.safeString(data, 'latestPrice');
+        return this.safeTicker({
+            'symbol': symbol,
+            'timestamp': undefined,
+            'datetime': undefined,
+            'high': undefined,
+            'low': undefined,
+            'bid': this.safeString(data, 'bestBuy'),
+            'bidVolume': undefined,
+            'ask': this.safeString(data, 'bestSell'),
+            'askVolume': undefined,
+            'vwap': undefined,
+            'open': undefined,
+            'close': last,
+            'last': last,
+            'previousClose': undefined,
+            'change': undefined,
+            'percentage': this.safeString(data, 'dayChange'),
+            'average': undefined,
+            'baseVolume': this.safeString(data, 'volume24h'),
+            'quoteVolume': undefined,
+            'info': ticker,
+        }, market);
+    }
+    sign(path, api = 'public', method = 'GET', params = {}, headers = undefined, body = undefined) {
+        const query = this.omit(params, this.extractParams(path));
+        let url = this.urls['api'][api] + '/' + this.implodeParams(path, params);
+        if (Object.keys(query).length) {
+            url += '?' + this.urlencode(query);
+        }
+        headers = { 'Content-Type': 'application/json' };
+        return { 'url': url, 'method': method, 'body': body, 'headers': headers };
+    }
+}

package/js/src/wallex.d.ts

@@ -1,5 +1,5 @@
 import Exchange from './abstract/wallex.js';
-import { Int, Market, OHLCV, OrderBook, Strings, Ticker, Tickers } from './base/types.js';
+import { Int, Market, MarketType, OHLCV, OrderBook, Strings, Ticker, Tickers } from './base/types.js';
 /**
  * @class wallex
  * @augments Exchange
@@ -8,7 +8,7 @@ import { Int, Market, OHLCV, OrderBook, Strings, Ticker, Tickers } from './base/
 export default class wallex extends Exchange {
     describe(): any;
     fetchMarkets(params?: {}): Promise<Market[]>;
-    parseMarket(market: any): Market;
+    parseMarket(market: any, type?: MarketType): Market;
     fetchTickers(symbols?: Strings, params?: {}): Promise<Tickers>;
     fetchTicker(symbol: string, params?: {}): Promise<Ticker>;
     parseTicker(ticker: any, market?: Market): Ticker;

package/js/src/wallex.js

@@ -6,6 +6,7 @@
 
 //  ---------------------------------------------------------------------------
 import Exchange from './abstract/wallex.js';
+import { BadSymbol, ExchangeError } from './base/errors.js';
 //  ---------------------------------------------------------------------------
 /**
  * @class wallex
@@ -80,6 +81,7 @@ export default class wallex extends Exchange {
                 'fetchTradingFee': false,
                 'fetchTradingFees': false,
                 'fetchWithdrawals': false,
+                'otc': true,
                 'setLeverage': false,
                 'setMarginMode': false,
                 'transfer': false,
@@ -108,6 +110,8 @@ export default class wallex extends Exchange {
                 'public': {
                     'get': {
                         'v1/markets': 1,
+                        'v1/currencies': 1,
+                        'v1/otc/price': 1,
                         'v1/currencies/stats': 1,
                         'v1/depth': 1,
                         'v1/udf/history': 1,
@@ -134,9 +138,39 @@ export default class wallex extends Exchange {
          * @description retrieves data on all markets for wallex
          * @see https://api-docs.wallex.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.publicGetV1Markets(params);
+        const type = this.safeString(params, 'type', 'spot');
+        const request = this.omit(params, ['type']);
+        if (type === 'otc') {
+            const otcResponse = await this.publicGetV1Currencies(request);
+            const currencies = this.safeDict(otcResponse, 'result', {});
+            const baseIds = Object.keys(currencies);
+            const quoteIds = ['TMN', 'USDT'];
+            const otcMarkets = [];
+            for (let i = 0; i < baseIds.length; i++) {
+                const baseId = baseIds[i];
+                // TMN is a quote currency; the OTC API does not support TMNUSDT.
+                if (baseId === 'TMN') {
+                    continue;
+                }
+                for (let j = 0; j < quoteIds.length; j++) {
+                    const quoteId = quoteIds[j];
+                    if (baseId === quoteId) {
+                        continue;
+                    }
+                    otcMarkets.push(this.parseMarket({
+                        'symbol': baseId + quoteId,
+                        'baseAsset': baseId,
+                        'quoteAsset': quoteId,
+                        'info': currencies[baseId],
+                    }, type));
+                }
+            }
+            return otcMarkets;
+        }
+        const response = await this.publicGetV1Markets(request);
         const markets = this.safeDict(response, 'result');
         const marketList = this.safeDict(markets, 'symbols');
         const marketKeys = Object.keys(marketList);
@@ -148,7 +182,7 @@ export default class wallex extends Exchange {
         }
         return result;
     }
-    parseMarket(market) {
+    parseMarket(market, type = 'spot') {
         //  {
         // symbol: "PEPETMN",
         // baseAsset: "PEPE",
@@ -212,8 +246,8 @@ export default class wallex extends Exchange {
             'baseId': baseId,
             'quoteId': quoteId,
             'settleId': undefined,
-            'type': 'spot',
-            'spot': true,
+            'type': type,
+            'spot': type === 'spot',
             'margin': false,
             'swap': false,
             'future': false,
@@ -250,7 +284,7 @@ export default class wallex extends Exchange {
                 },
             },
             'created': undefined,
-            'info': market,
+            'info': this.safeDict(market, 'info', market),
         };
     }
     async fetchTickers(symbols = undefined, params = {}) {
@@ -261,8 +295,40 @@ export default class wallex extends Exchange {
          * @see https://api-docs.wallex.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'; OTC requests one BUY quote per symbol
          * @returns {object} a dictionary of [ticker structures]{@link https://docs.ccxt.com/#/?id=ticker-structure}
          */
+        const type = this.safeString(params, 'type', 'spot');
+        params = this.omit(params, ['type']);
+        if (type === 'otc') {
+            let otcMarkets = await this.fetchMarkets(this.extend(params, { 'type': type }));
+            if (symbols !== undefined) {
+                const marketsBySymbol = this.indexBy(otcMarkets, 'symbol');
+                const marketsById = this.indexBy(otcMarkets, 'id');
+                const selectedMarkets = [];
+                for (let i = 0; i < symbols.length; i++) {
+                    const symbol = symbols[i];
+                    const market = this.safeDict(marketsBySymbol, symbol, this.safeDict(marketsById, symbol));
+                    if (market === undefined) {
+                        throw new BadSymbol(this.id + ' does not have OTC market symbol ' + symbol);
+                    }
+                    selectedMarkets.push(market);
+                }
+                otcMarkets = selectedMarkets;
+            }
+            const otcTickers = {};
+            for (let i = 0; i < otcMarkets.length; i++) {
+                const market = otcMarkets[i];
+                const request = this.extend(params, { 'side': 'BUY', 'symbol': market['id'] });
+                const otcResponse = await this.publicGetV1OtcPrice(request);
+                const data = this.safeDict(otcResponse, 'result', {});
+                if (this.safeString(data, 'price') === undefined) {
+                    throw new ExchangeError(this.id + ' OTC quote unavailable for ' + market['symbol'] + ': ' + this.json(otcResponse));
+                }
+                otcTickers[market['symbol']] = this.parseTicker(data, market);
+            }
+            return otcTickers;
+        }
         await this.loadMarkets();
         if (symbols !== undefined) {
             symbols = this.marketSymbols(symbols);
@@ -274,7 +340,8 @@ export default class wallex extends Exchange {
         const result = {};
         for (let i = 0; i < marketKeys.length; i++) {
             const index = marketKeys[i];
-            const ticker = this.parseTicker(marketList[index]);
+            const market = this.parseMarket(marketList[index]);
+            const ticker = this.parseTicker(marketList[index], market);
             const symbol = ticker['symbol'];
             result[symbol] = ticker;
         }
@@ -288,15 +355,12 @@ export default class wallex extends Exchange {
          * @see https://api-docs.wallex.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}
          */
-        await this.loadMarkets();
-        const market = this.market(symbol);
-        const response = await this.publicGetV1Markets(params);
-        const markets = this.safeDict(response, 'result');
-        const marketList = this.safeDict(markets, 'symbols');
-        const ticker = this.parseTicker(marketList[market['id']]);
-        return ticker;
+        const tickers = await this.fetchTickers([symbol], params);
+        const values = Object.values(tickers);
+        return this.safeValue(values, 0);
     }
     parseTicker(ticker, market = undefined) {
         // {
@@ -346,7 +410,33 @@ export default class wallex extends Exchange {
         // isNew: false,
         // isZeroFee: false
         // },
-        const marketType = 'spot';
+        const marketType = this.safeString(market, 'type', 'spot');
+        if (marketType === 'otc') {
+            const timestamp = this.parse8601(this.safeString(ticker, 'current_time'));
+            const price = this.safeNumber(ticker, 'price');
+            return this.safeTicker({
+                'symbol': market['symbol'],
+                'timestamp': timestamp,
+                'datetime': this.iso8601(timestamp),
+                'high': undefined,
+                'low': undefined,
+                'bid': undefined,
+                'bidVolume': undefined,
+                'ask': price,
+                'askVolume': undefined,
+                'vwap': undefined,
+                'open': undefined,
+                'close': price,
+                'last': price,
+                'previousClose': undefined,
+                'change': undefined,
+                'percentage': undefined,
+                'average': undefined,
+                'baseVolume': undefined,
+                'quoteVolume': undefined,
+                'info': ticker,
+            }, market);
+        }
         const stats = this.safeValue(ticker, 'stats');
         const marketId = this.safeString(ticker, 'symbol');
         const symbol = this.safeSymbol(marketId, market, undefined, marketType);
@@ -455,10 +545,7 @@ export default class wallex extends Exchange {
     sign(path, api = 'public', method = 'GET', params = {}, headers = undefined, body = undefined) {
         const query = this.omit(params, this.extractParams(path));
         let url = this.urls['api']['public'] + '/' + path;
-        if (path === 'v1/udf/history') {
-            url = url + '?' + this.urlencode(query);
-        }
-        if (path === 'v1/depth') {
+        if (!this.isEmpty(query)) {
             url = url + '?' + this.urlencode(query);
         }
         headers = { 'Content-Type': 'application/json' };