@icgio/icg-exchanges-wrapper 1.9.87 → 1.9.89

package/middleware/account.js

@@ -70,14 +70,22 @@ module.exports = class Account {
       }
     }
   }
-  // balances
-  get_exchange_position__balances(balances, initial = true) {
-    let exchange_assets_balances = initial ? this.initial_exchange_assets_balances : this.non_initial_exchange_assets_balances
+  get_exchange_position(balances, type = 'initial') {
+    let exchange_assets_balances
+    if (type === 'initial') {
+      exchange_assets_balances = this.initial_exchange_assets_balances
+    } else if (type === 'non_initial') {
+      exchange_assets_balances = this.non_initial_exchange_assets_balances
+    } else if (type === 'benchmark') {
+      exchange_assets_balances = this.exchange_assets_benchmarks
+    } else {
+      console.error('get_exchange_position type incorrect:', type)
+    }
     let exchange_position = {}
     for (let exchange in exchange_assets_balances) {
       for (let cur in exchange_assets_balances[exchange]) {
         if (!_.get(balances, [exchange, 'total'])) {
-          console.error('get_exchange_position__balances error: ', exchange, balances[exchange])
+          console.error('get_exchange_position error: ', exchange, balances[exchange])
         }
         if (_.get(balances, [exchange, 'total', cur]) > 0) {
           let diff = balances[exchange].total[cur] - exchange_assets_balances[exchange][cur]
@@ -88,80 +96,8 @@ module.exports = class Account {
     }
     return exchange_position
   }
-  get_position__balances(balances, initial = true) {
-    let exchange_position = this.get_exchange_position__balances(balances, initial)
-    let position = {}
-    for (let exchange in exchange_position) {
-      for (let cur in exchange_position[exchange]) {
-        if (!position[cur]) {
-          _.set(position, [cur, 'amount'], 0)
-          _.set(position, [cur, 'percentage'], 0)
-        }
-        position[cur].amount += exchange_position[exchange][cur].amount
-        position[cur].percentage = ((position[cur].amount / this.non_initial_assets_balances[cur]) * 100).toPrecision(3) + '%'
-      }
-    }
-    return position
-  }
-  get_exchange_profit__balances(balances, cmc_rates, initial = true) {
-    let exchange_position = this.get_exchange_position__balances(balances, initial)
-    let exchange_profit = {}
-    for (let exchange in exchange_position) {
-      let profit = {
-        USD: 0,
-      }
-      for (let cur in exchange_position[exchange]) {
-        let position = exchange_position[exchange][cur].amount
-        if (_.includes(constants.stablecoins, cur)) {
-          profit.USD += position
-        } else if (_.includes(['KRW'], cur)) {
-          profit.USD += position / USDKRW
-        } else if (_.includes(['THB'], cur)) {
-          profit.USD += position / USDTHB
-        } else if (_.includes(['CNYT'], cur)) {
-          profit.USD += position / USDCNY
-        } else {
-          if (!cmc_rates[cur]) {
-            console.log('get_exchange_profit__balances rates_cmc %s does not exist', cur)
-          } else if (cmc_rates[cur].update_time < new Date().getTime() - CMC_RATES_EXPIRY_TIMEOUT) {
-            // some currencies like USDT are updating slow
-            console.log('get_exchange_profit__balances rates_cmc %s expired', cur)
-          }
-          profit.USD += position * _.get(cmc_rates, [cur, 'USD'], 0)
-        }
-      }
-      _.set(exchange_profit, [exchange], profit)
-    }
-    return exchange_profit
-  }
-  get_profit__balances(balances, cmc_rates, initial = true) {
-    let exchange_profit = this.get_exchange_profit__balances(balances, cmc_rates, initial)
-    let profit = {
-      USD: 0,
-    }
-    for (let exchange in exchange_profit) {
-      profit.USD += exchange_profit[exchange].USD
-    }
-    return profit
-  }
-  // benchmarks
-  get_exchange_position__benchmarks(benchmarks) {
-    let exchange_assets_benchmarks = this.exchange_assets_benchmarks
-    let exchange_position = {}
-    for (let exchange in exchange_assets_benchmarks) {
-      for (let cur in exchange_assets_benchmarks[exchange]) {
-        if (!_.get(benchmarks, [exchange])) console.error('get_exchange_position__benchmarks error: ', exchange, benchmarks[exchange])
-        if (_.get(benchmarks, [exchange, cur])) {
-          let diff = benchmarks[exchange][cur] - exchange_assets_benchmarks[exchange][cur]
-          _.set(exchange_position, [exchange, cur, 'amount'], diff)
-          _.set(exchange_position, [exchange, cur, 'percentage'], ((diff / exchange_assets_benchmarks[exchange][cur]) * 100).toPrecision(3) + '%')
-        }
-      }
-    }
-    return exchange_position
-  }
-  get_position__benchmarks(benchmarks) {
-    let exchange_position = this.get_exchange_position__benchmarks(benchmarks)
+  get_position(balances, type = 'initial') {
+    let exchange_position = this.get_exchange_position(balances, type)
     let position = {}
     for (let exchange in exchange_position) {
       for (let cur in exchange_position[exchange]) {
@@ -170,13 +106,12 @@ module.exports = class Account {
           _.set(position, [cur, 'percentage'], 0)
         }
         position[cur].amount += exchange_position[exchange][cur].amount
-        position[cur].percentage = ((position[cur].amount / this.assets_benchmarks[cur]) * 100).toPrecision(3) + '%'
       }
     }
     return position
   }
-  get_exchange_profit__benchmarks(benchmarks, cmc_rates) {
-    let exchange_position = this.get_exchange_position__benchmarks(benchmarks)
+  get_exchange_profit(balances, cmc_rates, type = 'initial') {
+    let exchange_position = this.get_exchange_position(balances, type)
     let exchange_profit = {}
     for (let exchange in exchange_position) {
       let profit = {
@@ -194,10 +129,10 @@ module.exports = class Account {
           profit.USD += position / USDCNY
         } else {
           if (!cmc_rates[cur]) {
-            console.log('get_exchange_profit__benchmarks rates_cmc %s does not exist', cur)
+            console.log('get_exchange_profit rates_cmc %s does not exist', cur)
           } else if (cmc_rates[cur].update_time < new Date().getTime() - CMC_RATES_EXPIRY_TIMEOUT) {
             // some currencies like USDT are updating slow
-            console.log('get_exchange_profit__benchmarks rates_cmc %s expired', cur)
+            console.log('get_exchange_profit rates_cmc %s expired', cur)
           }
           profit.USD += position * _.get(cmc_rates, [cur, 'USD'], 0)
         }
@@ -206,8 +141,8 @@ module.exports = class Account {
     }
     return exchange_profit
   }
-  get_profit__benchmarks(benchmarks, cmc_rates) {
-    let exchange_profit = this.get_exchange_profit__benchmarks(benchmarks, cmc_rates)
+  get_profit(balances, cmc_rates, type = 'initial') {
+    let exchange_profit = this.get_exchange_profit(balances, cmc_rates, type)
     let profit = {
       USD: 0,
     }

package/middleware/orders.js

@@ -685,7 +685,7 @@ module.exports = class Orders {
         this.buy_sell_limits = _.omit(this.buy_sell_limits, [exchange])
       }
     }
-    function get_position__balancess(Exchanges, interval_dict) {
+    function get_positions(Exchanges, interval_dict) {
       for (let exchange in Exchanges) {
         if (Exchanges[exchange].position_all_ws) {
           if (Exchanges[exchange].ws_status().trading === 'n-opened') Exchanges[exchange].ws_account()
@@ -720,7 +720,7 @@ module.exports = class Orders {
         }
       }
     }
-    get_position__balancess(this.Exchanges, this.interval_dict)
+    get_positions(this.Exchanges, this.interval_dict)
   }
   check_open_orders() {
     const open_orders_timeframe = 12 * 60 * 60 * 1000

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icgio/icg-exchanges-wrapper",
-  "version": "1.9.87",
+  "version": "1.9.89",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,9 +17,9 @@
   },
   "homepage": "https://github.com/icgio/icg-exchanges-wrapper#readme",
   "dependencies": {
-    "@icgio/icg-exchanges": "^1.27.70",
+    "@icgio/icg-exchanges": "^1.27.71",
     "@icgio/icg-exchanges-data": "^1.6.38",
-    "@icgio/icg-utils": "^1.7.13",
+    "@icgio/icg-utils": "^1.7.14",
     "influx": "^5.7.0",
     "lodash": "^4.17.20",
     "needle": "^2.6.0",