WIP

lib/config-manager.js

@@ -30,17 +30,13 @@ function fallbackValue (crypto, machine, instances) {
 
 function generalScoped (crypto, machine, config) {
   const scopedValue = (key, instances) =>
-    [key, fallbackValue(crypto, machine, keyedValues(key, instances))]
+    fallbackValue(crypto, machine, instances)
 
-  const keyedValues = (key, instances) => R.filter(r => r.fieldLocator.code === key, instances)
+  const allScopes = key => config.filter(R.pathEq(['fieldLocator', 'code'], key))
-  const keys = instances => R.uniq(R.map(r => r.fieldLocator.code, instances))
+  const keys = R.uniq(R.map(r => r.fieldLocator.code, config))
+  const keyedValues = keys.map(key => scopedValue(key, allScopes(key)))
 
-  const scopedGroups = group => {
+  return R.fromPairs(keys, keyedValues)
-    const instances = group.values
-    return [group.code, R.fromPairs(keys(instances).map(key => scopedValue(key, instances)))]
-  }
-
-  return R.fromPairs(config.groups.map(scopedGroups))
 }
 
 function machineScoped (machine, config) {

lib/email.js

@@ -5,7 +5,7 @@ function sendMessage (rec) {
   return Promise.resolve()
   .then(() => {
     const settings = settingsLoader.settings()
-    const pluginCode = configManager.unscoped(settings.config).notifications.email
+    const pluginCode = configManager.unscoped(settings.config).email
 
     if (!pluginCode) throw new Error('No email plugin defined')
     const account = settings.accounts[pluginCode]

lib/exchange.js

@@ -12,7 +12,7 @@ function fetchExchange (cryptoCode) {
   return Promise.resolve()
   .then(() => {
     const settings = settingsLoader.settings()
-    const plugin = configManager.cryptoScoped(cryptoCode, settings.config).cryptoServices.exchange
+    const plugin = configManager.cryptoScoped(cryptoCode, settings.config).exchange
     if (!plugin) throw noExchangeError(cryptoCode)
     const account = settings.accounts[plugin]
     const exchange = require('lamassu-' + plugin)

lib/notifier.js

@@ -29,7 +29,7 @@ function sameState (a, b) {
 function checkBalance (rec) {
   const settings = settingsLoader.settings()
   const config = configManager.unscoped(settings.config)
-  const lowBalanceThreshold = config.notifications.lowBalanceThreshold
+  const lowBalanceThreshold = config.lowBalanceThreshold
   return lowBalanceThreshold && rec.fiatBalance < lowBalanceThreshold
   ? {code: 'lowBalance', cryptoCode: rec.cryptoCode, fiatBalance: rec.fiatBalance, fiatCode: rec.fiatCode}
   : null

lib/plugins.js

@@ -49,10 +49,10 @@ let lastAlertTime = null
 function buildRates (deviceId, tickers) {
   const settings = settingsLoader.settings()
   const config = configManager.machineScoped(deviceId, settings.config)
-  const cryptoCodes = config.currencies.cryptoCurrencies
+  const cryptoCodes = config.cryptoCurrencies
 
-  const cashInCommission = new BigNumber(config.commissions.cashInCommission).div(100).plus(1)
+  const cashInCommission = new BigNumber(config.cashInCommission).div(100).plus(1)
-  const cashOutCommission = new BigNumber(config.commissions.cashOutCommission).div(100).plus(1)
+  const cashOutCommission = new BigNumber(config.cashOutCommission).div(100).plus(1)
 
   const rates = {}
 
@@ -72,7 +72,7 @@ function buildRates (deviceId, tickers) {
 function buildBalances (deviceId, balanceRecs) {
   const settings = settingsLoader.settings()
   const config = configManager.machineScoped(deviceId, settings.config)
-  const cryptoCodes = config.currencies.cryptoCurrencies
+  const cryptoCodes = config.cryptoCurrencies
 
   const balances = {}
 
@@ -106,11 +106,11 @@ function buildCartridges (cartridges, virtualCartridges, rec) {
 function pollQueries (deviceTime, deviceId, deviceRec) {
   const settings = settingsLoader.settings()
   const config = configManager.machineScoped(deviceId, settings.config)
-  const fiatCode = config.currencies.fiatCurrency
+  const fiatCode = config.fiatCurrency
-  const cryptoCodes = config.currencies.cryptoCurrencies
+  const cryptoCodes = config.cryptoCurrencies
-  const cartridges = [ config.currencies.topCashOutDenomination,
+  const cartridges = [ config.topCashOutDenomination,
-    config.currencies.bottomCashOutDenomination ]
+    config.bottomCashOutDenomination ]
-  const virtualCartridges = [config.currencies.virtualCashOutDenomination]
+  const virtualCartridges = [config.virtualCashOutDenomination]
 
   const tickerPromises = cryptoCodes.map(c => ticker.getRates(fiatCode, c))
   const balancePromises = cryptoCodes.map(wallet.balance)
@@ -226,8 +226,8 @@ function cashOut (deviceId, tx) {
 function dispenseAck (deviceId, tx) {
   const settings = settingsLoader.settings()
   const config = configManager.machineScoped(deviceId, settings.config)
-  const cartridges = [ config.currencies.topCashOutDenomination,
+  const cartridges = [ config.topCashOutDenomination,
-    config.currencies.bottomCashOutDenomination ]
+    config.bottomCashOutDenomination ]
 
   return dbm.addDispense(deviceId, tx, cartridges)
 }
@@ -239,7 +239,7 @@ function fiatBalance (fiatCode, cryptoCode, deviceId) {
   return Promise.all([ticker.getRates(fiatCode, cryptoCode), wallet.balance(cryptoCode)])
   .then(([rates, balanceRec]) => {
     const rawRate = rates.rates.ask
-    const commission = (new BigNumber(config.commissions.cashInCommission).div(100)).plus(1)
+    const commission = (new BigNumber(config.cashInCommission).div(100)).plus(1)
     const balance = balanceRec.balance
 
     if (!rawRate || !balance) return null
@@ -249,7 +249,7 @@ function fiatBalance (fiatCode, cryptoCode, deviceId) {
 
     // `lowBalanceMargin` is our safety net. It's a number > 1, and we divide
     // all our balances by it to provide a safety margin.
-    const lowBalanceMargin = (new BigNumber(config.commissions.lowBalanceMargin).div(100)).plus(1)
+    const lowBalanceMargin = (new BigNumber(config.lowBalanceMargin).div(100)).plus(1)
 
     const unitScale = new BigNumber(10).pow(coins[cryptoCode].unitScale)
     const fiatTransferBalance = balance.div(unitScale).times(rate).div(lowBalanceMargin)
@@ -387,15 +387,14 @@ function consolidateTrades (cryptoCode, fiatCode) {
 
 function executeTrades () {
   const settings = settingsLoader.settings()
-  const config = settings.config
 
   return dbm.devices()
   .then(devices => {
     const deviceIds = devices.map(device => device.device_id)
     const lists = deviceIds.map(deviceId => {
-      const currencies = configManager.machineScoped(deviceId, config).currencies
+      const config = configManager.machineScoped(deviceId, settings.config)
-      const fiatCode = currencies.fiatCurrency
+      const fiatCode = config.fiatCurrency
-      const cryptoCodes = currencies.cryptoCurrencies
+      const cryptoCodes = config.cryptoCurrencies
       return cryptoCodes.map(cryptoCode => ({fiatCode, cryptoCode}))
     })
 
@@ -432,11 +431,11 @@ function executeTradesForMarket (settings, fiatCode, cryptoCode) {
 
 function sendMessage (rec) {
   const settings = settingsLoader.settings()
-  const notifications = configManager.unscoped(settings.config).notifications
+  const config = configManager.unscoped(settings.config)
 
   let promises = []
-  if (notifications.notificationsEmailEnabled) promises.push(email.sendMessage(rec))
+  if (config.notificationsEmailEnabled) promises.push(email.sendMessage(rec))
-  if (notifications.notificationsSMSEnabled) promises.push(sms.sendMessage(rec))
+  if (config.notificationsSMSEnabled) promises.push(sms.sendMessage(rec))
 
   return Promise.all(promises)
 }
@@ -496,8 +495,8 @@ function checkNotification () {
 function checkDeviceBalances (deviceId) {
   const settings = settingsLoader.settings()
   const config = configManager.machineScoped(deviceId, settings.config)
-  const cryptoCodes = config.currencies.cryptoCurrencies
+  const cryptoCodes = config.cryptoCurrencies
-  const fiatCode = config.currencies.fiatCurrency
+  const fiatCode = config.fiatCurrency
   const fiatBalancePromises = cryptoCodes.map(c => fiatBalance(fiatCode, c, deviceId))
 
   return Promise.all(fiatBalancePromises)

lib/routes.js

@@ -37,10 +37,10 @@ function poll (req, res, next) {
     const cartridges = results.cartridges
 
     const reboot = pid && reboots[deviceId] && reboots[deviceId] === pid
-    const langs = config.languages.machineLanguages
+    const langs = config.machineLanguages
 
     const locale = {
-      fiatCode: config.currencies.fiatCurrency,
+      fiatCode: config.fiatCurrency,
       localeInfo: {
         primaryLocale: langs[0],
         primaryLocales: langs
@@ -50,21 +50,21 @@ function poll (req, res, next) {
     const response = {
       err: null,
       locale,
-      txLimit: config.limits.cashInTransactionLimit,
+      txLimit: config.cashInTransactionLimit,
-      idVerificationEnabled: config.compliance.idVerificationEnabled,
+      idVerificationEnabled: config.idVerificationEnabled,
-      smsVerificationEnabled: config.compliance.smsVerificationEnabled,
+      smsVerificationEnabled: config.smsVerificationEnabled,
       cartridges,
       twoWayMode: !!cartridges,
-      zeroConfLimit: config.commissions.zeroConfLimit,
+      zeroConfLimit: config.zeroConfLimit,
-      fiatTxLimit: config.limits.cashOutTransactionLimit,
+      fiatTxLimit: config.cashOutTransactionLimit,
       reboot,
       rates: results.rates,
       balances: results.balances,
-      coins: config.currencies.cryptoCurrencies
+      coins: config.cryptoCurrencies
     }
 
     if (response.idVerificationEnabled) {
-      response.idVerificationLimit = config.compliance.idVerificationLimit
+      response.idVerificationLimit = config.idVerificationLimit
     }
 
     return res.json(response)

lib/settings-loader.js

@@ -11,7 +11,7 @@ function load () {
   ])
   .then(function ([data, accounts]) {
     settingsCache = {
-      config: data.data,
+      config: data.data.config,
       accounts: accounts
     }
 

lib/sms.js

@@ -5,7 +5,7 @@ function sendMessage (rec) {
   return Promise.resolve()
   .then(() => {
     const settings = settingsLoader.settings()
-    const pluginCode = configManager.unscoped(settings.config).notifications.sms
+    const pluginCode = configManager.unscoped(settings.config).sms
 
     if (!pluginCode) throw new Error('No sms plugin defined')
     const account = settings.accounts[pluginCode]

lib/ticker.js

@@ -8,7 +8,7 @@ function getRates (fiatCode, cryptoCode) {
   .then(() => {
     const settings = settingsLoader.settings()
     const config = settings.config
-    const plugin = configManager.cryptoScoped(cryptoCode, config).cryptoServices.ticker
+    const plugin = configManager.cryptoScoped(cryptoCode, config).ticker
     const account = settings.accounts[plugin]
     const ticker = require('lamassu-' + plugin)
 

lib/wallet.js

@@ -8,7 +8,7 @@ function fetchWallet (cryptoCode) {
   return Promise.resolve()
   .then(() => {
     const settings = settingsLoader.settings()
-    const plugin = configManager.cryptoScoped(cryptoCode, settings.config).cryptoServices.wallet
+    const plugin = configManager.cryptoScoped(cryptoCode, settings.config).wallet
     const account = settings.accounts[plugin]
     const wallet = require('lamassu-' + plugin)