@icgio/icg-exchanges-wrapper 1.14.118 → 1.14.120

package/middleware/orders.js

@@ -75,12 +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, exchange_pairs_without_2, pair_exchanges_without_2 } = utils.exchange_cur_quote_cur_converter(exchange_cur_quote_cur)
+    let { exchange_pairs, pair_exchanges, exchange_pairs_without_numbers, pair_exchanges_without_numbers } = 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.exchange_pairs_without_numbers = exchange_pairs_without_numbers
     this.pair_exchanges = pair_exchanges
-    this.pair_exchanges_without_2 = pair_exchanges_without_2
+    this.pair_exchanges_without_numbers = pair_exchanges_without_numbers
     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
@@ -93,7 +93,7 @@ module.exports = class Orders {
     this.check_init_order_opened_timeout = 5 * 1000
     this.cancel_previous_orders = settings.cancel_previous_orders || false
     this.cancel_range_orders = settings.cancel_range_orders || false
-    this.delete_connection_error_order_timeout = 2 * 60 * 1000
+    this.delete_connection_error_orders_timeout = 2 * 60 * 1000
     this.delete_finished_orders_timeout = 30 * 1000 // CANCELED or F-FILLED
     this.interval_dict = settings.interval_dict || {}
     this.major_exchanges = settings.major_exchanges || []
@@ -131,7 +131,7 @@ module.exports = class Orders {
       } else {
         limits = STANDARD_LIMITS
       }
-      this.Exchanges[exchange] = new ICGExchanges[_.upperFirst(exchange.replace('_2', ''))](api_key_temp, secret_key_temp, _.assign(limits, cd[exchange]))
+      this.Exchanges[exchange] = new ICGExchanges[_.upperFirst(_split(exchange, '_')[0])](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,
@@ -238,8 +238,8 @@ module.exports = class Orders {
     this.account?.update_non_initial_from_balances(balances)
   }
   limit_trade(exchange, pair, method, price, amount, id = uuid(), order_type = '', limiter_on = true, api_key_index) {
-    price = round_price(_.upperFirst(exchange.replace('_2', '')), pair, price)
-    amount = round_amount(_.upperFirst(exchange.replace('_2', '')), pair, amount)
+    price = round_price(exchange, pair, price)
+    amount = round_amount(exchange, pair, amount)
     // console.log('%s %s %s %s %s %s at %s', limiter_on, order_type, exchange, pair, method, amount, price)
     this.update_order_info(
       exchange,
@@ -346,7 +346,7 @@ module.exports = class Orders {
       } else if (res.error === 'connection-error') {
         setTimeout(() => {
           this.delete_order_info(exchange, pair, method, id, order_type + ' limit-trade-' + res.error)
-        }, this.delete_connection_error_order_timeout)
+        }, this.delete_connection_error_orders_timeout)
       } else {
         if (order_type.startsWith('self') || order_type.startsWith('maker_2')) {
           this.delete_order_info(exchange, pair, method, id, order_type + ' limit-trade-timeout')
@@ -481,7 +481,7 @@ module.exports = class Orders {
         trades[exchange][pair].trades.map((trade) => {
           if (_.get(this.order_info, [exchange, pair, trade.type, trade.order_id])) {
             let order_info = this.order_info[exchange][pair][trade.type][trade.order_id]
-            trade.amount = round_amount(_.upperFirst(exchange.replace('_2', '')), pair, trade.amount)
+            trade.amount = round_amount(exchange, pair, trade.amount)
             if (_.includes(['CANCELED', 'CANCELING'], order_info.status) && trade.amount > order_info.f_amount) {
               let type = trade.type,
                 order_id = trade.order_id
@@ -642,7 +642,7 @@ module.exports = class Orders {
         open_orders[exchange][pair].open_orders.map((order) => {
           if (_.get(this.order_info, [exchange, pair, order.type, order.order_id])) {
             let order_info = this.order_info[exchange][pair][order.type][order.order_id]
-            order.f_amount = round_amount(_.upperFirst(exchange.replace('_2', '')), pair, order.f_amount)
+            order.f_amount = round_amount(exchange, pair, order.f_amount)
             if (_.includes(['N-FILLED', 'P-FILLED'], order_info.status) && order.f_amount > order_info.f_amount && order.f_amount / order_info.t_amount > this.f_filled_threshold) {
               // console.log('ORDERS: %s %s ORDER F-FILLED', exchange, pair)
               this.update_order_info(
@@ -684,8 +684,8 @@ module.exports = class Orders {
             }
           } else if (this.get_order_info_status_all(exchange, pair, 'both', 'INIT') && this.check_init_order_opened) {
             this.get_order_info_status_all(exchange, pair, 'both', 'INIT').map((init_order) => {
-              let init_order_price = round_price(exchange.replace('_2', ''), pair, init_order.price)
-              let order_price = round_price(exchange.replace('_2', ''), pair, order.price)
+              let init_order_price = round_price(exchange, pair, init_order.price)
+              let order_price = round_price(exchange, pair, order.price)
               let init_order_time = init_order.open_time.getTime()
               let order_time = order.open_time.getTime()
               if (
@@ -1383,7 +1383,7 @@ module.exports = class Orders {
         }
       }
     }
-    get_rates(this.Exchanges, this.ExchangesRatesOnly, this.exchange_pairs_without_2, this.exchange_pairs_rates_only, this.interval_dict)
+    get_rates(this.Exchanges, this.ExchangesRatesOnly, this.exchange_pairs_without_numbers, this.exchange_pairs_rates_only, this.interval_dict)
   }
   check_market_history() {
     let market_history_handler = (exchange, pair, res) => {
@@ -1418,7 +1418,7 @@ module.exports = class Orders {
         }
       }
     }
-    get_market_history(this.Exchanges, this.exchange_pairs_without_2, this.interval_dict)
+    get_market_history(this.Exchanges, this.exchange_pairs_without_numbers, this.interval_dict)
   }
   check_ohlcv() {
     const OHLCV_DEFAULT_PAST_HOURS = 24
@@ -1455,7 +1455,7 @@ module.exports = class Orders {
         }
       }
     }
-    get_ohlcv(this.Exchanges, this.exchange_pairs_without_2, this.interval_dict)
+    get_ohlcv(this.Exchanges, this.exchange_pairs_without_numbers, 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.118",
+  "version": "1.14.120",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,9 +17,9 @@
   },
   "homepage": "https://github.com/icgio/icg-exchanges-wrapper#readme",
   "dependencies": {
-    "@icgio/icg-exchanges": "^1.32.68",
-    "@icgio/icg-exchanges-data": "^1.10.59",
-    "@icgio/icg-utils": "^1.9.20",
+    "@icgio/icg-exchanges": "^1.32.69",
+    "@icgio/icg-exchanges-data": "^1.10.60",
+    "@icgio/icg-utils": "^1.9.21",
     "influx": "^5.10.0",
     "lodash": "^4.17.20",
     "uuid": "^11.1.0",