From 594566c6064622ed7e69e07492cd1bdad28669c2 Mon Sep 17 00:00:00 2001
From: joeuhren <46763106+joeuhren@users.noreply.github.com>
Date: Mon, 23 Nov 2020 17:20:30 -0700
Subject: [PATCH] Stex market fixes

---
 lib/markets/stex.js    | 45 ++++++++++++++++++++++++++++++++----------
 lib/settings.js        |  1 -
 settings.json.template |  1 -
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/lib/markets/stex.js b/lib/markets/stex.js
index a99318e..a79e55a 100644
--- a/lib/markets/stex.js
+++ b/lib/markets/stex.js
@@ -120,21 +120,46 @@ function get_chartdata(coin, exchange, stex_id, cb) {
 */
 }
 
+function get_pair_id(coin, exchange, cb) {
+    // Lookup the currency pair id needed to use the stex api
+    request({ uri: base_url + '/currency_pairs/list/' + exchange, json: true, headers: {'User-Agent': 'eiquidus'} }, function (error, response, body) {
+      if (error)
+        return cb(error, null);
+      else if (body.success === true) {
+        var stex_id = 0;
+        // Find the currency pair
+        for (i = 0; i < body.data.length; i++) {
+          if (body.data[i].currency_code.toUpperCase() == coin.toUpperCase()) {
+            stex_id = body.data[i].id;
+            break;
+          }
+        }
+
+        return cb(null, stex_id);
+      } else
+        return cb(error, null);
+    }).on('error', function(err) {
+      return cb(error, null);
+    });
+}
+
 module.exports = {
-    get_data: function (coin, exchange, stex_id, cb) {
+    get_data: function (settings, cb) {
         var error = null;
-        get_chartdata(coin, exchange, stex_id, function (err, chartdata) {
-			if (err) { chartdata = []; error = err; }
-            get_orders(coin, exchange, stex_id, function (err, buys, sells) {
+        get_pair_id(settings.coin, settings.exchange, function (err, stex_id) {
+          get_chartdata(settings.coin, settings.exchange, stex_id, function (err, chartdata) {
+            if (err) { chartdata = []; error = err; }
+              get_orders(settings.coin, settings.exchange, stex_id, function (err, buys, sells) {
                 if (err) { error = err; }
-                get_trades(coin, exchange, stex_id, function (err, trades) {
+                  get_trades(settings.coin, settings.exchange, stex_id, function (err, trades) {
                     if (err) { error = err; }
-                    get_summary(coin, exchange, stex_id, function (err, stats) {
-                        if (err) { error = err; }
-                        return cb(error, { buys: buys, sells: sells, chartdata: chartdata, trades: trades, stats: stats });
+                    get_summary(settings.coin, settings.exchange, stex_id, function (err, stats) {
+                      if (err) { error = err; }
+                      return cb(error, { buys: buys, sells: sells, chartdata: chartdata, trades: trades, stats: stats });
                     });
-                });
-            });
+                  });
+              });
+           });
         });
     }
 };
\ No newline at end of file
diff --git a/lib/settings.js b/lib/settings.js
index 29bcb0e..cf8e33e 100644
--- a/lib/settings.js
+++ b/lib/settings.js
@@ -95,7 +95,6 @@ exports.markets = {
   "coin": "EXOR",
   "exchange": "BTC",
   "enabled": [],
-  "stex_id": "",
   "default": ""
 };
 
diff --git a/settings.json.template b/settings.json.template
index d05e5c5..1864cac 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -122,7 +122,6 @@
     "coin": "EXOR",
     "exchange": "BTC",
     "enabled": [],
-    "stex_id": "",
     "default": ""
   },