@clonegod/ttd-core 2.0.9 → 2.0.11

package/dist/app_config/app_config.d.ts

@@ -8,7 +8,6 @@ export declare class AppConfig extends EventEmitter {
     arb_cache: ArbCache;
     arb_event_subscriber: ArbEventSubscriber;
     trade_runtime: TradeRuntimeType;
-    query_token_market_price_url: string;
     constructor();
     init(): Promise<void>;
     subscribe_config_change(): Promise<void>;

package/dist/app_config/app_config.js

@@ -28,15 +28,10 @@ class AppConfig extends events_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             this.arb_cache = (0, __1.getArbCache)(this.env_args);
             yield this.arb_cache.init();
-            this.arb_cache.listen_trade_result(this);
             let common_service_config = yield this.arb_cache.get_common_service();
             if ((0, __1.isEmpty)(common_service_config)) {
                 throw new Error(`get_common_service from cache failed! read from cache=${(0, __1.to_json_str)(common_service_config)}`);
             }
-            let { config_center } = common_service_config;
-            this.query_token_market_price_url = this.env_args.token_market_price_url
-                .replace('${config_center_http_port}', config_center.http_port + '')
-                .replace('${chain_id}', this.env_args.chain_id);
         });
     }
     subscribe_config_change() {

package/dist/app_config/app_trade_config.js

@@ -24,6 +24,7 @@ class TradeAppConfig extends app_config_1.AppConfig {
         });
         return __awaiter(this, void 0, void 0, function* () {
             yield _super.init.call(this);
+            this.arb_cache.listen_trade_result(this);
         });
     }
     init_trade_runtime() {

package/dist/app_config/env_args.d.ts

@@ -23,6 +23,6 @@ export declare class EnvArgs {
     trade_pool_address: string;
     trade_pool_name: string;
     trade_pool_fee_rate: number;
-    cache_price_seconds: number;
+    token_price_cache_seconds: number;
     constructor(chain_id?: CHAIN_ID, dex_id?: DEX_ID);
 }

package/dist/app_config/env_args.js

@@ -12,7 +12,6 @@ class EnvArgs {
         }
         this.dex_id = dex_id || ((_b = process.env.DEX_ID) === null || _b === void 0 ? void 0 : _b.toUpperCase());
         if ((0, __1.isEmpty)(this.dex_id)) {
-            throw new Error(`Invalid config: DEX_ID=${process.env.DEX_ID}!!!`);
         }
         this.app_base_dir = process.env.APP_BASE_DIR || '';
         this.redis_host = process.env.REDIS_HOST;
@@ -34,7 +33,7 @@ class EnvArgs {
         this.trade_pool_address = process.env.TRADE_POOL_ADDRESS;
         this.trade_pool_name = process.env.TRADE_POOL_NAME;
         this.trade_pool_fee_rate = parseInt(process.env.TRADE_POOL_FEE_RATE || '0');
-        this.cache_price_seconds = parseInt(process.env.CACHE_PRICE_SECONDS || '600');
+        this.token_price_cache_seconds = parseInt(process.env.TOKEN_PRICE_CACHE_SECONDS || '600');
         (0, __1.log_info)('EnvArgs init finish', this);
     }
 }

package/dist/cache/arb_cache.js

@@ -39,6 +39,10 @@ class ArbCache {
                 ]);
                 this.redis_event_publisher = (0, index_1.getArbEventPublisher)(this);
                 (0, index_1.mkdirSync)(path_1.default.join('config', this.chain_id, 'bak').toLowerCase(), true);
+                yield Promise.all([
+                    this.get_token_list_no_cache(),
+                    this.get_pool_list_no_cache()
+                ]);
                 if (((_a = process.env.APP_NAME) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'config-center') {
                     yield this.init_configs();
                 }

package/dist/token/price/cached_price.js

@@ -20,6 +20,9 @@ const check_token_price_timeout = (token_info, token_price_timeout_seconds) => {
     let diff_seconds = Math.floor((Date.now() - (0, __1.parseDateTimeStrToMills)(last_update_time)) / 1000);
     return diff_seconds > token_price_timeout_seconds;
 };
+const get_diff_seconds = (last_update_time, now) => {
+    return Math.floor((now - (0, __1.parseDateTimeStrToMills)(last_update_time)) / 1000);
+};
 const fetchPriceFromCache = (token_address_list) => __awaiter(void 0, void 0, void 0, function* () {
     let result = new Map();
     let global_app_config;
@@ -40,13 +43,13 @@ const fetchPriceFromCache = (token_address_list) => __awaiter(void 0, void 0, vo
                 not_found_token_list.push(token_info);
             }
             else {
-                let diff_seconds = Math.floor((Date.now() - (0, __1.parseDateTimeStrToMills)(token_info.update_time)) / 1000);
+                let diff_seconds = get_diff_seconds(token_info.update_time, Date.now());
                 result.set(token_info.address, {
                     address: token_info.address,
                     price: token_info.market_price,
                     update_time: token_info.update_time,
                 });
-                (0, __1.log_info)(`get token price from cache success: ${token_info.symbol} ${token_info.address}, price=${token_info.market_price} (${diff_seconds}s ago)`);
+                (0, __1.log_info)(`get token price from cache(token_info) success: ${token_info.symbol} ${token_info.address}, price=${token_info.market_price} (${diff_seconds}s ago)`);
             }
         }
         catch (err) {
@@ -63,6 +66,8 @@ const fetchPriceFromCache = (token_address_list) => __awaiter(void 0, void 0, vo
             price: price_info.market_price,
             update_time: price_info.update_time,
         });
+        let diff_seconds = get_diff_seconds(price_info.update_time, Date.now());
+        (0, __1.log_info)(`get token price from cache(market_price) success: ${token_info.symbol} ${token_info.address}, price=${price_info.market_price} (${diff_seconds}s ago)`);
     }
     return result;
 });
@@ -77,7 +82,7 @@ function cache_new_market_price(token_address, market_price, market_source) {
             (0, __1.log_warn)('global_app_config is not set, skip get token price from cache');
             return;
         }
-        let ttl = global_app_config.env_args.cache_price_seconds || 900;
+        let ttl = global_app_config.env_args.token_price_cache_seconds;
         let tokenInfo = global_app_config.arb_cache.token_address_map.get(token_address);
         if (!tokenInfo) {
             tokenInfo = (yield global_app_config.arb_cache.get_token_list_no_cache()).find(e => e.address === token_address);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-core",
-    "version": "2.0.9",
+    "version": "2.0.11",
     "description": "Common types and utilities for trading systems - use `npm run push` to publish",
     "main": "dist/index.js",
     "types": "types/index.d.ts",