From b6dc94cb126e70f12c33059489585e84543e6db0 Mon Sep 17 00:00:00 2001 From: Josh Harvey Date: Sun, 9 Oct 2016 19:22:03 +0100 Subject: [PATCH] WIP routes --- lib/routes.js | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/lib/routes.js b/lib/routes.js index 20bd87d2..86a0a579 100644 --- a/lib/routes.js +++ b/lib/routes.js @@ -19,13 +19,12 @@ const STALE_BALANCE = 3 * 60 * 1000 const pids = {} const reboots = {} -function buildRates () { +function buildRates (deviceId) { const cryptoCodes = plugins.getcryptoCodes() - const config = plugins.getConfig() - const settings = config.exchanges.settings + const config = plugins.getConfig(deviceId) - const cashInCommission = settings.commission - const cashOutCommission = settings.fiatCommission || cashInCommission + const cashInCommission = config.commissions.cashInCommission + const cashOutCommission = config.commissions.cashOutCommission const rates = {} cryptoCodes.forEach(cryptoCode => { @@ -68,36 +67,41 @@ function poll (req, res) { let rates = {} let balances = {} - rates = buildRates() + rates = buildRates(deviceId) balances = buildBalances() - const config = plugins.getConfig() - const settings = config.exchanges.settings - const complianceSettings = settings.compliance + const config = plugins.getConfig(deviceId) plugins.pollQueries(deviceId) .then(results => { const cartridges = results.cartridges const reboot = reboots[deviceId] === pid + const langs = config.languages.machineLanguages + + const locale = { + currency: config.fiat.fiatCurrency, + primaryLocale: langs[0], + primaryLocales: langs + } const response = { err: null, - locale: config.brain.locale, - txLimit: parseInt(complianceSettings.maximum.limit, 10), - idVerificationEnabled: complianceSettings.idVerificationEnabled, + locale, + txLimit: config.limits.cashInTransactionLimit, + idVerificationEnabled: config.compliance.idVerificationEnabled, cartridges, twoWayMode: !!cartridges, - zeroConfLimit: settings.zeroConfLimit, - fiatTxLimit: settings.fiatTxLimit, + zeroConfLimit: config.commissions.zeroConfLimit, + fiatTxLimit: config.limits.cashOutTransactionLimit, reboot, rates, balances, - coins: settings.coins + coins: config.cryptos.cryptos } if (response.idVerificationEnabled) { - response.idVerificationLimit = complianceSettings.idVerificationLimit + response.idVerificationLimit = config.compliance.idVerificationLimit } res.json(response)