move exchange conf to main conf, re-organize conf

Carlos Rodriguez · Carlos Rodriguez · commit fe2d6bf2191c · 2017-05-20T01:14:05.000-07:00
diff --git a/boot.js b/boot.js
@@ -31,16 +31,16 @@ module.exports = function (cb) {
     })
   }
 
-  var u = 'mongodb://' + c.mongo_host + ':' + c.mongo_port + '/' + c.mongo_db
+  var u = 'mongodb://' + c.mongo.host + ':' + c.mongo.port + '/' + c.mongo.db
   require('mongodb').MongoClient.connect(u, function (err, db) {
     if (err) {
       zenbot.set('zenbot:db.mongo', null)
       console.error('warning: mongodb not accessible. some features (such as backfilling/simulation) may be disabled.')
       return withMongo()
     }
     zenbot.set('zenbot:db.mongo', db)
-    if (c.mongo_username) {
-      db.authenticate(c.mongo_username, c.mongo_password, function (err, result) {
+    if (c.mongo.username) {
+      db.authenticate(c.mongo.username, c.mongo.password, function (err, result) {
         if (err) {
           zenbot.set('zenbot:db.mongo', null)
           console.error('warning: mongodb auth failed. some features (such as backfilling/simulation) may be disabled.')
diff --git a/conf-sample.js b/conf-sample.js
@@ -1,11 +1,33 @@
 var c = module.exports = {}
 
-// COMMONLY TWEAKED VARIABLES:
+// mongo configuration
+c.mongo = {}
+c.mongo.host = 'localhost'
+c.mongo.port = 27017
+c.mongo.db = 'zenbot4'
+c.mongo.username = null
+c.mongo.password = null
 
 // default selector. only used if omitting [selector] argument from a command.
 c.selector = 'gdax.BTC-USD'
 // name of default trade strategy
 c.strategy = 'trend_ema'
+
+// Exchange API keys:
+
+// to enable GDAX trading, enter your API credentials:
+c.gdax = {}
+c.gdax.key = 'YOUR-API-KEY'
+c.gdax.b64secret = 'YOUR-BASE64-SECRET'
+c.gdax.passphrase = 'YOUR-PASSPHRASE'
+
+// to enable Poloniex trading, enter your API credentials:
+c.poloniex = {}
+c.poloniex.key = 'YOUR-API-KEY'
+c.poloniex.secret = 'YOUR-SECRET'
+
+// Optional stop-order triggers:
+
 // sell if price drops below this % of bought price (0 to disable)
 c.sell_stop_pct = 0
 // buy if price surges above this % of sold price (0 to disable)
@@ -14,8 +36,9 @@ c.buy_stop_pct = 0
 c.profit_stop_enable_pct = 0
 // maintain a trailing stop this % below the high-water mark of profit
 c.profit_stop_pct = 1
-// avoid selling at a loss below this pct
-c.max_sell_loss_pct = 25
+
+// Order execution rules:
+
 // avoid trading at a slippage above this pct
 c.max_slippage_pct = 5
 // buy with this % of currency balance
@@ -24,15 +47,19 @@ c.buy_pct = 99
 c.sell_pct = 99
 // ms to adjust non-filled order after
 c.order_adjust_time = 30000
+// avoid selling at a loss below this pct
+c.max_sell_loss_pct = 25
+// ms to poll order status
+c.order_poll_time = 5000
+// ms to wait for settlement (after an order cancel)
+c.wait_for_settlement = 5000
+// ms to wait for settlement (after a funds on hold error)
+c.wait_more_for_settlement = 60000
+// % to mark up or down price for orders
+c.markup_pct = 0
 
-// LESS-COMMONLY TWEAKED VARAIBLES:
+// Misc options:
 
-// mongo configuration
-c.mongo_host = 'localhost'
-c.mongo_port = 27017
-c.mongo_db = 'zenbot4'
-c.mongo_username = null
-c.mongo_password = null
 // default # days for backfill and sim commands
 c.days = 90
 // ms to poll new trades at
@@ -41,17 +68,9 @@ c.poll_trades = 30000
 c.currency_capital = 1000
 // amount of asset to start simulations with
 c.asset_capital = 0
-// ms to poll order status
-c.order_poll_time = 5000
 // for sim, reverse time at the end of the graph, normalizing buy/hold to 0
 c.symmetrical = false
 // number of periods to calculate RSI at
 c.rsi_periods = 14
-// ms to wait for settlement (after an order cancel)
-c.wait_for_settlement = 5000
-// ms to wait for settlement (after a funds on hold error)
-c.wait_more_for_settlement = 60000
 // period to record balances for stats
 c.balance_snapshot_period = '15m'
-// % to mark up or down price for orders
-c.markup_pct = 0
diff --git a/extensions/gdax/conf-sample.js b/extensions/gdax/conf-sample.js
diff --git a/extensions/gdax/exchange.js b/extensions/gdax/exchange.js
@@ -3,18 +3,6 @@ var Gdax = require('gdax')
 
 module.exports = function container (get, set, clear) {
   var c = get('conf')
-  var defs = require('./conf-sample')
-  try {
-    c.gdax = require('./conf')
-  }
-  catch (e) {
-    c.gdax = {}
-  }
-  Object.keys(defs).forEach(function (k) {
-    if (typeof c.gdax[k] === 'undefined') {
-      c.gdax[k] = defs[k]
-    }
-  })
 
   var public_client, authed_client
 
diff --git a/extensions/poloniex/conf-sample.js b/extensions/poloniex/conf-sample.js
diff --git a/extensions/poloniex/exchange.js b/extensions/poloniex/exchange.js
@@ -6,18 +6,6 @@ var Poloniex = require('poloniex.js')
 
 module.exports = function container (get, set, clear) {
   var c = get('conf')
-  var defs = require('./conf-sample')
-  try {
-    c.poloniex = require('./conf')
-  }
-  catch (e) {
-    c.poloniex = {}
-  }
-  Object.keys(defs).forEach(function (k) {
-    if (typeof c.poloniex[k] === 'undefined') {
-      c.poloniex[k] = defs[k]
-    }
-  })
 
   var public_client, authed_client
 
