diff --git a/lib/plugins/common/ccxt.js b/lib/plugins/common/ccxt.js index db98b460..5312b35c 100644 --- a/lib/plugins/common/ccxt.js +++ b/lib/plugins/common/ccxt.js @@ -23,7 +23,8 @@ const ALL = { bitpay: bitpay, coinbase: { CRYPTO: [BTC, ETH, LTC, DASH, ZEC, BCH, USDT, USDT_TRON, TRX, LN], - FIAT: 'ALL_CURRENCIES' + FIAT: 'ALL_CURRENCIES', + DEFAULT_FIAT_MARKET: 'EUR' }, binance: binance, bitfinex: bitfinex @@ -51,4 +52,8 @@ function isConfigValid (config, fields) { return _.every(it => it || it === 0)(values) } -module.exports = { buildMarket, ALL, verifyFiatSupport, isConfigValid } +function defaultFiatMarket (serviceName) { + return ALL[serviceName].DEFAULT_FIAT_MARKET +} + +module.exports = { buildMarket, ALL, verifyFiatSupport, isConfigValid, defaultFiatMarket } diff --git a/lib/plugins/exchange/binance.js b/lib/plugins/exchange/binance.js index 8a45723c..e1b4a4c4 100644 --- a/lib/plugins/exchange/binance.js +++ b/lib/plugins/exchange/binance.js @@ -6,7 +6,8 @@ const { ORDER_TYPES } = require('./consts') const ORDER_TYPE = ORDER_TYPES.MARKET const { BTC, BCH, XMR, ETH, LTC, ZEC, LN } = COINS const CRYPTO = [BTC, ETH, LTC, ZEC, BCH, XMR, LN] -const FIAT = ['USD', 'EUR'] +const FIAT = ['EUR'] +const DEFAULT_FIAT_MARKET = 'EUR' const REQUIRED_CONFIG_FIELDS = ['apiKey', 'privateKey'] const loadConfig = (account) => { @@ -17,4 +18,4 @@ const loadConfig = (account) => { return { ...mapped, timeout: 3000 } } -module.exports = { loadConfig, REQUIRED_CONFIG_FIELDS, CRYPTO, FIAT, ORDER_TYPE } +module.exports = { loadConfig, DEFAULT_FIAT_MARKET, REQUIRED_CONFIG_FIELDS, CRYPTO, FIAT, ORDER_TYPE } diff --git a/lib/plugins/ticker/ccxt.js b/lib/plugins/ticker/ccxt.js index 336ef8a3..1f63ff3d 100644 --- a/lib/plugins/ticker/ccxt.js +++ b/lib/plugins/ticker/ccxt.js @@ -1,7 +1,7 @@ const ccxt = require('ccxt') const BN = require('../../bn') -const { buildMarket, verifyFiatSupport } = require('../common/ccxt') +const { buildMarket, verifyFiatSupport, defaultFiatMarket } = require('../common/ccxt') const { getRate } = require('../../../lib/forex') const RETRIES = 2 @@ -33,7 +33,7 @@ function ticker (fiatCode, cryptoCode, tickerName) { return getRate(RETRIES, fiatCode) .then(({ fxRate }) => { try { - return getCurrencyRates(ticker, 'USD', cryptoCode) + return getCurrencyRates(ticker, defaultFiatMarket(tickerName), cryptoCode) .then(res => ({ rates: { ask: res.rates.ask.times(fxRate),