From e8474252440117fd054eaafa64d26d19e520c733 Mon Sep 17 00:00:00 2001
From: Josh Harvey <josh@lamassu.is>
Date: Mon, 23 Oct 2017 16:11:25 +0300
Subject: [PATCH] fix up eth 0-conf

---
 bin/lamassu-display-config.js | 12 ++++++++++++
 lib/admin/config.js           |  4 ++--
 lib/routes.js                 |  1 -
 lib/settings-loader.js        | 14 ++++++++++++--
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 bin/lamassu-display-config.js

diff --git a/bin/lamassu-display-config.js b/bin/lamassu-display-config.js
new file mode 100644
index 00000000..12caab16
--- /dev/null
+++ b/bin/lamassu-display-config.js
@@ -0,0 +1,12 @@
+const settingsLoader = require('../lib/settings-loader')
+const pp = require('../lib/pp')
+
+settingsLoader.loadLatest()
+.then(r => {
+  pp('config')(r)
+  process.exit(0)
+})
+.catch(e => {
+  console.log(e.stack)
+  process.exit(1)
+})
diff --git a/lib/admin/config.js b/lib/admin/config.js
index b939992c..672d3692 100644
--- a/lib/admin/config.js
+++ b/lib/admin/config.js
@@ -186,8 +186,8 @@ function fetchData () {
       {code: 'mock-id-verify', display: 'Mock ID verifier', class: 'idVerifier'},
       {code: 'twilio', display: 'Twilio', class: 'sms'},
       {code: 'mailjet', display: 'Mailjet', class: 'email'},
-      {code: 'all-zero-conf', display: 'All pass', class: 'zeroConf', cryptos: ALL_CRYPTOS},
-      {code: 'no-zero-conf', display: 'None pass', class: 'zeroConf', cryptos: ALL_CRYPTOS},
+      {code: 'all-zero-conf', display: 'Always 0-conf', class: 'zeroConf', cryptos: ['BTC', 'ZEC', 'LTC', 'DASH']},
+      {code: 'no-zero-conf', display: 'Always 1-conf', class: 'zeroConf', cryptos: ALL_CRYPTOS},
       {code: 'blockcypher', display: 'Blockcypher', class: 'zeroConf', cryptos: ['BTC']},
       {code: 'mock-zero-conf', display: 'Mock 0-conf', class: 'zeroConf', cryptos: ['BTC', 'ZEC', 'LTC', 'DASH']}
     ],
diff --git a/lib/routes.js b/lib/routes.js
index bec55979..70d98c11 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -67,7 +67,6 @@ function poll (req, res, next) {
       cassettes,
       twoWayMode: config.cashOutEnabled,
       zeroConfLimit: config.zeroConfLimit,
-      fiatTxLimit: config.cashOutTransactionLimit,
       reboot
     }
 
diff --git a/lib/settings-loader.js b/lib/settings-loader.js
index b525f91e..a91f6c48 100644
--- a/lib/settings-loader.js
+++ b/lib/settings-loader.js
@@ -182,6 +182,14 @@ function populateScopes (schema) {
   return _.map(r => _.assign(scopeLookup[r.code], r), schema.fields)
 }
 
+function cryptoDefaultOverride (cryptoCode, code, defaultValue) {
+  if (cryptoCode === 'ETH' && code === 'zeroConf') {
+    return 'no-zero-conf'
+  }
+
+  return defaultValue
+}
+
 function cryptoCodeDefaults (schema, cryptoCode) {
   const scope = {crypto: cryptoCode, machine: 'global'}
 
@@ -190,13 +198,15 @@ function cryptoCodeDefaults (schema, cryptoCode) {
   const cryptoSpecificFields = _.filter(hasCryptoSpecificDefault, schemaEntries)
 
   return _.map(r => {
-    return configAddField(scope, r.code, r.fieldType, r.fieldClass, r.default)
+    const defaultValue = cryptoDefaultOverride(cryptoCode, r.code, r.default)
+
+    return configAddField(scope, r.code, r.fieldType, r.fieldClass, defaultValue)
   }, cryptoSpecificFields)
 }
 
 function addCryptoDefaults (oldConfig, newFields) {
   const cryptoCodeEntries = _.filter(v => v.fieldLocator.code === 'cryptoCurrencies', newFields)
-  const cryptoCodes = _.map(v => v.fieldValue.value, cryptoCodeEntries)
+  const cryptoCodes = _.map(_.get('fieldValue.value'), cryptoCodeEntries)
   const uniqueCryptoCodes = _.uniq(_.flatten(cryptoCodes))
 
   const mapDefaults = cryptoCode => cryptoCodeDefaults(schema, cryptoCode)