@icgio/icg-exchanges-wrapper 1.14.262 → 1.14.264

package/middleware/orders.js

@@ -4,7 +4,7 @@ const { randomUUID: uuid } = require('crypto')
 
 const ICGExchanges = require('@icgio/icg-exchanges')
 const utils = require('@icgio/icg-utils').utils
-const { coinmarketcap: get_coinmarketcap_rates, observable: Observable } = require('@icgio/icg-utils')
+const { crypto_rates: get_crypto_rates, observable: Observable } = require('@icgio/icg-utils')
 
 const Account = require('./account.js')
 const { ws_data_client } = require('../lib/ws-data-client.js')
@@ -180,7 +180,7 @@ module.exports = class Orders {
     this.rates_observable = new Observable()
     this.market_history = {}
     this.ohlcv = {}
-    this.cmc_rates = {}
+    this.crypto_rates = {}
     this.rates_combined_all = {}
     this.rates_combined_all_with_buy_sell_limits_against_reserve_balance = {}
     this.rates_combined_major = {}
@@ -198,7 +198,7 @@ module.exports = class Orders {
       rates_check: true,
       market_history_check: true,
       ohlcv_check: false,
-      cmc_rates_check: true,
+      crypto_rates_check: true,
     }
     if (this.function_enabled.balances_check) {
       this.check_balances()
@@ -229,8 +229,8 @@ module.exports = class Orders {
     if (this.function_enabled.ohlcv_check) {
       this.check_ohlcv()
     }
-    if (this.function_enabled.cmc_rates_check) {
-      this.check_cmc_rates(this.cmc_curs, 'curs_dict')
+    if (this.function_enabled.crypto_rates_check) {
+      this.check_crypto_rates(this.cmc_curs, 'curs_dict')
     }
     if (this.function_enabled.balances_check && this.function_enabled.open_orders_check && this.function_enabled.trades_check) {
       setInterval(() => {
@@ -278,7 +278,7 @@ module.exports = class Orders {
         open_time: new Date(),
         close_time: null,
       },
-      order_type + ' init'
+      order_type + ' init',
     )
     let no_callback_timeout = setTimeout(() => {
       if (_.get(this.order_info, [exchange, pair, method, id, 'status']) === 'INIT') {
@@ -291,7 +291,7 @@ module.exports = class Orders {
           {
             status: 'N-OPENED-TIMEOUT',
           },
-          order_type + ' n-opened-timeout-init'
+          order_type + ' n-opened-timeout-init',
         )
       }
     }, NO_CALLBACK_TIMEOUT_MS)
@@ -357,7 +357,7 @@ module.exports = class Orders {
             open_time: new Date(),
             close_time: null,
           },
-          order_type + ' n-filled'
+          order_type + ' n-filled',
         )
       } else if (res.error === 'amount-too-small' || res.error === 'insufficient-funds') {
         this.delete_order_info(exchange, pair, method, id, order_type + ' limit-trade-' + res.error)
@@ -389,9 +389,9 @@ module.exports = class Orders {
       {
         status: 'CANCELING',
       },
-      order.order_type + ' canceling'
+      order.order_type + ' canceling',
     )
-    ;(order.exchange = exchange), (order.pair = pair)
+    ;((order.exchange = exchange), (order.pair = pair))
     this.Exchanges[exchange].cancel_order_by_order(order, (res) => {
       if (res.success || (!res.success && res.error === 'order-not-open' && original_status === 'CANCELING')) {
         this.update_order_info(
@@ -403,7 +403,7 @@ module.exports = class Orders {
             status: 'CANCELED',
             close_time: new Date(),
           },
-          order.order_type + ' canceled'
+          order.order_type + ' canceled',
         )
         setTimeout(() => {
           this.delete_order_info(exchange, pair, order.type, order.order_id, order.order_type + ' cancel-order-success')
@@ -422,7 +422,7 @@ module.exports = class Orders {
             f_percentage: 1,
             close_time: new Date(),
           },
-          order.order_type + ' cannot-be-canceled'
+          order.order_type + ' cannot-be-canceled',
         )
         setTimeout(() => {
           this.delete_order_info(exchange, pair, order.type, order.order_id, order.order_type + ' cannot-be-canceled')
@@ -521,7 +521,7 @@ module.exports = class Orders {
                 close_time: trade.close_time || new Date(),
                 fees: trade.fees,
               },
-              order_info.order_type + ' canceled-order-filled(-more)'
+              order_info.order_type + ' canceled-order-filled(-more)',
             )
             setTimeout(() => {
               this.delete_order_info(exchange, pair, type, order_id, order_info.order_type + ' canceled-order-filled(-more)')
@@ -539,7 +539,7 @@ module.exports = class Orders {
                 f_percentage: 1,
                 fees: trade.fees,
               },
-              order_info.order_type + ' filled-order-filled-more'
+              order_info.order_type + ' filled-order-filled-more',
             )
           } else if (
             _.includes(['N-FILLED', 'P-FILLED'], order_info.status) &&
@@ -561,7 +561,7 @@ module.exports = class Orders {
                 close_time: trade.close_time || new Date(),
                 fees: trade.fees,
               },
-              order_info.order_type + ' order-f-filled-1'
+              order_info.order_type + ' order-f-filled-1',
             )
             setTimeout(() => {
               this.delete_order_info(exchange, pair, order_info.type, order_info.order_id, order_info.order_type + ' order-f-filled-1')
@@ -584,7 +584,7 @@ module.exports = class Orders {
                 f_percentage: trade.amount / order_info.t_amount,
                 fees: trade.fees,
               },
-              order_info.order_type + ' order-p-filled-1'
+              order_info.order_type + ' order-p-filled-1',
             )
           } else if (_.includes(['F-FILLED', 'P-FILLED'], order_info.status)) {
           } else if (_.includes(['CANCELED', 'CANCELING'], order_info.status) && trade.amount === order_info.f_amount) {
@@ -646,7 +646,7 @@ module.exports = class Orders {
                     f_percentage: 1,
                     close_time: new Date(),
                   },
-                  order_info_order.order_type + ' order-f-filled-2'
+                  order_info_order.order_type + ' order-f-filled-2',
                 )
                 setTimeout(() => {
                   this.delete_order_info(exchange, pair, order_info_order.type, order_info_order.order_id, order_info_order.order_type + ' order-f-filled-2')
@@ -681,7 +681,7 @@ module.exports = class Orders {
                   f_percentage: order_f_amount / order_info.t_amount,
                   close_time: order.close_time || new Date(),
                 },
-                order_info.order_type + ' order-f-filled-3'
+                order_info.order_type + ' order-f-filled-3',
               )
               setTimeout(() => {
                 this.delete_order_info(exchange, pair, order_info.type, order_info.order_id, order_info.order_type + ' order-f-filled-3')
@@ -703,7 +703,7 @@ module.exports = class Orders {
                   f_amount: order_f_amount,
                   f_percentage: order_f_amount / order_info.t_amount,
                 },
-                order_info.order_type + ' order-p-filled-2'
+                order_info.order_type + ' order-p-filled-2',
               )
             }
           } else if (this.get_order_info_status_all(exchange, pair, 'both', 'INIT') && this.check_init_order_opened) {
@@ -736,7 +736,7 @@ module.exports = class Orders {
                     open_time: order.open_time || new Date(),
                     close_time: null,
                   },
-                  init_order.order_type + ' init-order-opened'
+                  init_order.order_type + ' init-order-opened',
                 )
               }
             })
@@ -756,7 +756,7 @@ module.exports = class Orders {
                 status: 'CANCELED',
                 close_time: new Date(),
               },
-              (order_info.order_type || '') + ' canceling-canceled-from-open-orders'
+              (order_info.order_type || '') + ' canceling-canceled-from-open-orders',
             )
             setTimeout(() => {
               this.delete_order_info(exchange, pair, order_info.type, order_info.order_id, (order_info.order_type || '') + ' canceling-canceled-from-open-orders')
@@ -1105,8 +1105,8 @@ module.exports = class Orders {
           [exchange, pair],
           _.sumBy(
             res.body.filter((t) => t.close_time > new Date().getTime() - ONE_HOUR_IN_MS || t.open_time > new Date().getTime() - ONE_HOUR_IN_MS),
-            (t) => t.amount
-          ) || 0
+            (t) => t.amount,
+          ) || 0,
         )
       } else if (_.get(this.trades, [exchange, pair, 'update_time']) < new Date().getTime() - this.interval_dict[exchange].trades) {
         console.log('%s %s trades expired: %j', exchange, pair, res)
@@ -1125,8 +1125,8 @@ module.exports = class Orders {
             [exchange, pair],
             _.sumBy(
               trades.filter((t) => t.close_time > new Date().getTime() - ONE_HOUR_IN_MS || t.open_time > new Date().getTime() - ONE_HOUR_IN_MS),
-              (t) => t.amount
-            ) || 0
+              (t) => t.amount,
+            ) || 0,
           )
         }
       } else if (res.error !== 'opening') {
@@ -1544,20 +1544,22 @@ module.exports = class Orders {
     }
     get_ohlcv(this.Exchanges, this.exchange_pairs_without_affiliates, this.interval_dict)
   }
-  check_cmc_rates(data, type, source) {
-    let check_cmc_rates_base = (data, type, source) => {
-      get_coinmarketcap_rates(
+  check_crypto_rates(data, type) {
+    let check_crypto_rates_base = (data, type) => {
+      get_crypto_rates(
         (rates) => {
-          this.cmc_rates = rates
+          this.crypto_rates = rates
         },
         data,
         type,
-        source
       )
     }
-    check_cmc_rates_base(data, type, source)
-    setInterval(() => {
-      check_cmc_rates_base(data, type, source)
-    }, 15 * 60 * 1000)
+    check_crypto_rates_base(data, type)
+    setInterval(
+      () => {
+        check_crypto_rates_base(data, type)
+      },
+      15 * 60 * 1000,
+    )
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icgio/icg-exchanges-wrapper",
-  "version": "1.14.262",
+  "version": "1.14.264",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -18,7 +18,7 @@
   "homepage": "https://github.com/icgio/icg-exchanges-wrapper#readme",
   "dependencies": {
     "@icgio/icg-exchanges": "^1.32.136",
-    "@icgio/icg-utils": "^1.9.42",
+    "@icgio/icg-utils": "^1.9.44",
     "lodash": "^4.17.20",
     "pg": "^8.17.2"
   }