From b6568baa5c903fe4a55d88dd99473403c5a77d1f Mon Sep 17 00:00:00 2001
From: Josh Harvey <josh@lamassu.is>
Date: Mon, 5 Dec 2016 03:25:51 +0200
Subject: [PATCH] cashEnabled bug fixes

---
 lib/config-manager.js | 2 +-
 lib/plugins.js        | 6 ++++--
 lib/routes.js         | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/config-manager.js b/lib/config-manager.js
index 01e0400c..33a73c35 100644
--- a/lib/config-manager.js
+++ b/lib/config-manager.js
@@ -36,7 +36,7 @@ function generalScoped (crypto, machine, config) {
   const keys = R.uniq(R.map(r => r.fieldLocator.code, config))
   const keyedValues = keys.map(key => scopedValue(key, allScopes(key)))
 
-  return R.fromPairs(keys, keyedValues)
+  return R.zipObj(keys, keyedValues)
 }
 
 function machineScoped (machine, config) {
diff --git a/lib/plugins.js b/lib/plugins.js
index 55d097b5..a2fa6ed9 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -50,9 +50,10 @@ function buildRates (deviceId, tickers) {
   const settings = settingsLoader.settings()
   const config = configManager.machineScoped(deviceId, settings.config)
   const cryptoCodes = config.cryptoCurrencies
+  const cashOut = config.cashOutEnabled
 
   const cashInCommission = new BigNumber(config.cashInCommission).div(100).plus(1)
-  const cashOutCommission = new BigNumber(config.cashOutCommission).div(100).plus(1)
+  const cashOutCommission = cashOut && new BigNumber(config.cashOutCommission).div(100).plus(1)
 
   const rates = {}
 
@@ -62,7 +63,7 @@ function buildRates (deviceId, tickers) {
     const rate = rateRec.rates
     rates[cryptoCode] = {
       cashIn: rate.ask.times(cashInCommission),
-      cashOut: rate.bid.div(cashOutCommission)
+      cashOut: cashOut ? rate.bid.div(cashOutCommission) : undefined
     }
   })
 
@@ -395,6 +396,7 @@ function executeTrades () {
       const config = configManager.machineScoped(deviceId, settings.config)
       const fiatCode = config.fiatCurrency
       const cryptoCodes = config.cryptoCurrencies
+
       return cryptoCodes.map(cryptoCode => ({fiatCode, cryptoCode}))
     })
 
diff --git a/lib/routes.js b/lib/routes.js
index edb117a5..97d72d8b 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -24,6 +24,7 @@ const pids = {}
 const reboots = {}
 
 function poll (req, res, next) {
+  console.log('DEBUG77')
   const deviceId = req.deviceId
   const deviceTime = req.deviceTime
   const pid = req.query.pid
@@ -54,7 +55,7 @@ function poll (req, res, next) {
       idVerificationEnabled: config.idVerificationEnabled,
       smsVerificationEnabled: config.smsVerificationEnabled,
       cartridges,
-      twoWayMode: !!cartridges,
+      twoWayMode: config.cashOutEnabled,
       zeroConfLimit: config.zeroConfLimit,
       fiatTxLimit: config.cashOutTransactionLimit,
       reboot,
@@ -142,11 +143,13 @@ function ca (req, res) {
 }
 
 function pair (req, res, next) {
+  console.log('DEBUG100')
   const token = req.query.token
   const deviceId = req.deviceId
 
   return pairing.pair(token, deviceId)
   .then(valid => {
+    console.log('DEBUG102')
     if (valid) return res.end()
     throw httpError('Pairing failed')
   })