@icgio/icg-exchanges-wrapper 1.14.69 → 1.14.70

package/middleware/orders.js

@@ -2,7 +2,7 @@ const _ = require('lodash')
 
 const { v4: uuid } = require('uuid')
 
-const icg_exchanges = require('@icgio/icg-exchanges')
+const ICGExchanges = require('@icgio/icg-exchanges')
 const utils = require('@icgio/icg-utils').utils
 const { coinmarketcap: get_coinmarketcap_rates, observable: Observable } = require('@icgio/icg-utils')
 
@@ -75,10 +75,12 @@ module.exports = class Orders {
     this.exchange_cur_quote_cur = exchange_cur_quote_cur
     this.exchange_cur_quote_cur_rates_only = exchange_cur_quote_cur_rates_only
     this.pair_map_rates_only = pair_map_rates_only || {}
-    let { exchange_pairs, pair_exchanges } = utils.exchange_cur_quote_cur_converter(exchange_cur_quote_cur)
+    let { exchange_pairs, pair_exchanges, exchange_pairs_without_2, pair_exchanges_without_2 } = utils.exchange_cur_quote_cur_converter(exchange_cur_quote_cur)
     let { exchange_pairs: exchange_pairs_rates_only, pair_exchanges: pair_exchanges_rates_only } = utils.exchange_cur_quote_cur_converter(exchange_cur_quote_cur_rates_only)
     this.exchange_pairs = exchange_pairs
+    this.exchange_pairs_without_2 = exchange_pairs_without_2
     this.pair_exchanges = pair_exchanges
+    this.pair_exchanges_without_2 = pair_exchanges_without_2
     this.exchange_pairs_rates_only = exchange_pairs_rates_only
     this.pair_exchanges_rates_only = pair_exchanges_rates_only
     this.rates_only_exchanges = pair_exchanges_rates_only
@@ -130,7 +132,7 @@ module.exports = class Orders {
       } else {
         limits = STANDARD_LIMITS
       }
-      this.Exchanges[exchange] = new icg_exchanges[_.upperFirst(exchange)](api_key_temp, secret_key_temp, _.assign(limits, cd[exchange]))
+      this.Exchanges[exchange] = new ICGExchanges[_.upperFirst(exchange.replace('_2', ''))](api_key_temp, secret_key_temp, _.assign(limits, cd[exchange]))
       if (!this.interval_dict || !this.interval_dict[exchange]) {
         this.interval_dict[exchange] = {
           balances: 10 * 1000,
@@ -154,7 +156,7 @@ module.exports = class Orders {
       }
     }
     for (let exchange in this.exchange_cur_quote_cur_rates_only) {
-      this.ExchangesRatesOnly[exchange] = new icg_exchanges[_.upperFirst(exchange)]('', '', STANDARD_LIMITS)
+      this.ExchangesRatesOnly[exchange] = new ICGExchanges[_.upperFirst(exchange)]('', '', STANDARD_LIMITS)
     }
     this.balances = {}
     this.positions = {}
@@ -1327,7 +1329,7 @@ module.exports = class Orders {
       if (!this.ws_market_first_time) {
         this.ws_market_first_time = {}
       }
-      for (let exchange in Exchanges) {
+      for (let exchange in exchange_pairs) {
         if (Exchanges[exchange].ws_market && Exchanges[exchange].exchange_type === 'spot') {
           if (!this.ws_market_first_time[exchange]) {
             Exchanges[exchange].ws_market(exchange_pairs[exchange])
@@ -1369,7 +1371,7 @@ module.exports = class Orders {
           }
         }
       }
-      for (let exchange in ExchangesRatesOnly) {
+      for (let exchange in exchange_pairs_rates_only) {
         if (ExchangesRatesOnly[exchange].ws_market) {
           if (!this.ws_market_first_time[exchange]) {
             ExchangesRatesOnly[exchange].ws_market(exchange_pairs_rates_only[exchange])
@@ -1391,7 +1393,7 @@ module.exports = class Orders {
         }
       }
     }
-    get_rates(this.Exchanges, this.ExchangesRatesOnly, this.exchange_pairs, this.exchange_pairs_rates_only, this.interval_dict)
+    get_rates(this.Exchanges, this.ExchangesRatesOnly, this.exchange_pairs_without_2, this.exchange_pairs_rates_only, this.interval_dict)
   }
   check_market_history() {
     let market_history_handler = (exchange, pair, res) => {
@@ -1403,7 +1405,7 @@ module.exports = class Orders {
       }
     }
     let get_market_history = (Exchanges, exchange_pairs, interval_dict) => {
-      for (let exchange in Exchanges) {
+      for (let exchange in exchange_pairs) {
         const market_history_timeframe = exchange === 'coinbene' ? 30 * 24 * 60 * 60 * 1000 : MARKET_HISTORY_DEFAULT_MS
         if (Exchanges[exchange].ws_market && Exchanges[exchange].exchange_type === 'spot') {
           if (!this.ws_market_first_time[exchange]) {
@@ -1426,7 +1428,7 @@ module.exports = class Orders {
         }
       }
     }
-    get_market_history(this.Exchanges, this.exchange_pairs, this.interval_dict)
+    get_market_history(this.Exchanges, this.exchange_pairs_without_2, this.interval_dict)
   }
   check_ohlcv() {
     const OHLCV_DEFAULT_PAST_HOURS = 24
@@ -1444,7 +1446,7 @@ module.exports = class Orders {
       }
     }
     let get_ohlcv = (Exchanges, exchange_pairs, interval_dict) => {
-      for (let exchange in Exchanges) {
+      for (let exchange in exchange_pairs) {
         for (let pair of exchange_pairs[exchange]) {
           if (Exchanges[exchange].ohlcv) {
             let ohlcv_from_timetamp = new Date().floorHours(1).addHours(-OHLCV_DEFAULT_PAST_HOURS)
@@ -1463,7 +1465,7 @@ module.exports = class Orders {
         }
       }
     }
-    get_ohlcv(this.Exchanges, this.exchange_pairs, this.interval_dict)
+    get_ohlcv(this.Exchanges, this.exchange_pairs_without_2, this.interval_dict)
   }
   check_cmc_rates(data, type, source) {
     let check_cmc_rates_base = (data, type, source) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icgio/icg-exchanges-wrapper",
-  "version": "1.14.69",
+  "version": "1.14.70",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -18,8 +18,8 @@
   "homepage": "https://github.com/icgio/icg-exchanges-wrapper#readme",
   "dependencies": {
     "@icgio/icg-exchanges": "^1.32.45",
-    "@icgio/icg-exchanges-data": "^1.10.36",
-    "@icgio/icg-utils": "^1.9.14",
+    "@icgio/icg-exchanges-data": "^1.10.37",
+    "@icgio/icg-utils": "^1.9.15",
     "influx": "^5.10.0",
     "lodash": "^4.17.20",
     "uuid": "^11.1.0",