From ee37367c62752537e44484d67304689dc70da097 Mon Sep 17 00:00:00 2001 From: Josh Harvey Date: Thu, 15 Sep 2016 01:32:11 +0300 Subject: [PATCH] start moving to new config; WIP --- lib/plugins.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/plugins.js b/lib/plugins.js index b7db9695..ab634258 100644 --- a/lib/plugins.js +++ b/lib/plugins.js @@ -174,8 +174,8 @@ exports.configure = function configure (config) { } cachedConfig = config - deviceCurrency = config.exchanges.settings.currency - cryptoCodes = config.exchanges.settings.coins || ['BTC'] + deviceCurrency = config.fiat.fiatCurrency + cryptoCodes = config.crypto.cryptoCurrencies cryptoCodes.forEach(cryptoCode => { // TICKER [required] configure (or load) @@ -266,9 +266,9 @@ function buildCartridges (cartridges, virtualCartridges, rec) { } exports.pollQueries = function pollQueries (deviceId) { - const cartridges = cachedConfig.exchanges.settings.cartridges - if (!cartridges) return Promise.resolve({}) - const virtualCartridges = cachedConfig.exchanges.settings.virtualCartridges + const cartridges = [ cachedConfig.fiat.topCashOutDenomination, + cachedConfig.fiat.bottomCashOutDenomination ] + const virtualCartridges = [cachedConfig.fiat.virtualCashOutDenomination] return db.cartridgeCounts(deviceId) .then(result => ({ @@ -288,7 +288,7 @@ function _sendCoins (toAddress, cryptoAtoms, cryptoCode) { function _sendCoinsCb (toAddress, cryptoAtoms, cryptoCode, cb) { const walletPlugin = walletPlugins[cryptoCode] - const transactionFee = cachedConfig.exchanges.settings.transactionFee + const transactionFee = null logger.debug('Sending coins [%s] to: %s', cryptoCode, toAddress) if (cryptoCode === 'BTC') { @@ -394,7 +394,9 @@ exports.cashOut = function cashOut (deviceId, tx) { exports.dispenseAck = function (deviceId, tx) { console.log('DEBUG23: %j', tx) - const cartridges = cachedConfig.exchanges.settings.cartridges + const cartridges = [ cachedConfig.fiat.topCashOutDenomination, + cachedConfig.fiat.bottomCashOutDenomination ] + return db.addDispense(deviceId, tx, cartridges) } @@ -402,7 +404,7 @@ exports.fiatBalance = function fiatBalance (cryptoCode) { const deviceRate = exports.getDeviceRate(cryptoCode) if (!deviceRate) return null const rawRate = deviceRate.rates.ask - const commission = cachedConfig.exchanges.settings.commission + const commission = cachedConfig.commissions.cashInCommission const lastBalanceRec = lastBalances[cryptoCode] if (!lastBalanceRec) return null const lastBalance = lastBalanceRec.balance @@ -414,7 +416,7 @@ exports.fiatBalance = function fiatBalance (cryptoCode) { // `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 = cachedConfig.exchanges.settings.lowBalanceMargin || LOW_BALANCE_MARGIN_DEFAULT + const lowBalanceMargin = cachedConfig.commissions.lowBalanceMargin || LOW_BALANCE_MARGIN_DEFAULT const unitScale = new BigNumber(10).pow(coins[cryptoCode].unitScale) const fiatTransferBalance = lastBalance.div(unitScale).times(rate).div(lowBalanceMargin)