From bc63aeab4ce7046ea44fd6650e1e9be1fb97522e Mon Sep 17 00:00:00 2001
From: Josh Harvey <josh@lamassu.is>
Date: Thu, 8 Jan 2015 16:41:12 -0500
Subject: [PATCH] new polling fields for two-way

---
 lib/routes.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/routes.js b/lib/routes.js
index 90b52198..43cf3347 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -44,26 +44,31 @@ function poll(req, res) {
     logger.warn('No bid rate, using ask rate');
 
   var fiatBalance = plugins.fiatBalance();
-  if (fiatBalance === null) return res.json({err: 'No balance available'});
+  if (fiatBalance === null) {
+    logger.warn('No balance available.');
+    return res.json({err: 'No balance available'});
+  }
 
   var config = plugins.getCachedConfig();
-  var complianceSettings = config.exchanges.settings.compliance;
-  var fiatCommission = config.exchanges.settings.fiatCommission ||
-    config.exchanges.settings.commission;
+  var settings = config.exchanges.settings;
+  var complianceSettings = settings.compliance;
+  var fiatCommission = settings.fiatCommission || settings.commission;
 
   plugins.pollQueries(session(req), function(err, results) {
     if (err) return logger.error(err);
     var cartridges = results.cartridges;
     var response = {
       err: null,
-      rate: rate * config.exchanges.settings.commission,
+      rate: rate * settings.commission,
       fiatRate: fiatRate / fiatCommission,
       fiat: fiatBalance,
       locale: config.brain.locale,
       txLimit: parseInt(complianceSettings.maximum.limit, 10),
       idVerificationEnabled: complianceSettings.idVerificationEnabled,
       cartridges: cartridges,
-      twoWayMode: cartridges ? true : false
+      twoWayMode: cartridges ? true : false,
+      zeroConfLimit: settings.zeroConfLimit,
+      fiatTxLimit: settings.fiatTxLimit
     };
 
     if (response.idVerificationEnabled)