@clonegod/ttd-core 3.1.22 → 3.1.24

package/dist/app_config/AppConfig.js

@@ -15,13 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppConfig = void 0;
 const events_1 = __importDefault(require("events"));
 const __1 = require("..");
-const EnvArgs_1 = require("./EnvArgs");
 const core_env_1 = require("./core_env");
 class AppConfig extends events_1.default {
     constructor() {
         super();
-        this.env_args = new EnvArgs_1.EnvArgs();
-        (0, core_env_1.setCoreEnv)(this.env_args);
+        this.env_args = (0, core_env_1.getCoreEnv)();
         let { chain_id, app_name, dex_id } = this.env_args;
         this.app_full_name = `${chain_id}_${dex_id}_${app_name}`;
         global.app_config = this;

package/dist/app_config/EnvArgs.js

@@ -5,7 +5,6 @@ const __1 = require("..");
 const env_loader_1 = require("./env_loader");
 class EnvArgs {
     constructor(chain_id, dex_id) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         const overrides = {};
         if (chain_id)
             overrides.chain_id = chain_id;
@@ -13,54 +12,10 @@ class EnvArgs {
             overrides.dex_id = dex_id;
         const cfg = (0, env_loader_1.loadEnvConfig)(overrides);
         this._cfg = cfg;
-        this.app_name = cfg.app_name || '';
-        this.app_base_dir = cfg.app_base_dir || '';
-        this.chain_id = (cfg.chain_id || '').toUpperCase();
-        this.dex_id = (cfg.dex_id || '').toUpperCase();
-        if ((0, __1.isEmpty)(this.chain_id)) {
+        const cid = (cfg.chain_id || '').toUpperCase();
+        if ((0, __1.isEmpty)(cid)) {
             throw new Error(`environment: CHAIN_ID is empty!!!`);
         }
-        this.log_level = (_a = cfg.log_level) !== null && _a !== void 0 ? _a : '';
-        this.log_depth = cfg.log_depth;
-        this.server_id = (_b = cfg.server_id) !== null && _b !== void 0 ? _b : '';
-        this.redis_host = cfg.redis_host;
-        this.redis_port = String(cfg.redis_port);
-        this.config_center_host = cfg.config_center_host;
-        this.enable_init_cache = (_c = cfg.enable_init_cache) !== null && _c !== void 0 ? _c : '';
-        this.trade_analyze_url = cfg.trade_analyze_url;
-        this.trade_analyze_host = (_d = cfg.trade_analyze_host) !== null && _d !== void 0 ? _d : '';
-        this.rpc_endpoint = cfg.rpc_endpoint;
-        this.ws_endpoint = cfg.ws_endpoint;
-        this.grpc_endpoint = cfg.grpc_endpoint;
-        this.grpc_token = cfg.grpc_token;
-        this.auto_quote_enable = cfg.auto_quote_enable;
-        this.auto_quote_interval_mills = cfg.auto_quote_interval_mills;
-        this.quote_pair = cfg.quote_pair;
-        this.quote_amount_usd = cfg.quote_amount_usd;
-        this.quote_pool_address = cfg.quote_pool_address;
-        this.quote_pool_name = cfg.quote_pool_name;
-        this.quote_pool_fee_rate = cfg.quote_pool_fee_rate;
-        this.tick_cache_force_full_refresh_interval = cfg.tick_cache_force_full_refresh_interval;
-        this.depth_cex_bps = cfg.depth_cex_bps;
-        this.group_id = (_e = cfg.group_id) !== null && _e !== void 0 ? _e : '';
-        this.trade_group_id = cfg.trade_group_id;
-        this.trade_pair = cfg.trade_pair;
-        this.trade_log_report_cex_url = (_f = cfg.trade_log_report_cex_url) !== null && _f !== void 0 ? _f : '';
-        this.trade_log_report_cex_data_type = (_g = cfg.trade_log_report_cex_data_type) !== null && _g !== void 0 ? _g : '';
-        this.token_price_cache_seconds = cfg.token_price_cache_seconds;
-        this.token_market_price_url = (_h = cfg.token_market_price_url) !== null && _h !== void 0 ? _h : '';
-        this.wallet_dir = cfg.wallet_dir;
-        this.encryption_key = (_j = cfg.encryption_key) !== null && _j !== void 0 ? _j : '';
-        this.providers_file_path = cfg.providers_file_path;
-        this.fixed_symbol_address_file = (_k = cfg.fixed_symbol_address_file) !== null && _k !== void 0 ? _k : '';
-        this.zh_pinyin_map_file = (_l = cfg.zh_pinyin_map_file) !== null && _l !== void 0 ? _l : '';
-        this.alert_analyze_host = (_m = cfg.alert_analyze_host) !== null && _m !== void 0 ? _m : '';
-        this.alert_flush_size = cfg.alert_flush_size;
-        this.alert_flush_ms = cfg.alert_flush_ms;
-        this.alert_dedup_window_ms = cfg.alert_dedup_window_ms;
-        this.namespace = (_o = cfg.namespace) !== null && _o !== void 0 ? _o : '';
-        this.server_ip_list = (_p = cfg.server_ip_list) !== null && _p !== void 0 ? _p : '';
-        this.ip_exclude_prefix = (_q = cfg.ip_exclude_prefix) !== null && _q !== void 0 ? _q : '';
     }
     print(moduleName) {
         (0, env_loader_1.printEnvConfig)(moduleName || this.app_name || 'EnvArgs', this);

package/dist/pool/cache_pool_config.js

@@ -24,63 +24,55 @@ const cache_pool_config = (chain_id, valid_tokens_map, sol_pools_cache) => __awa
     let skip_pool_list = [];
     const genv = (0, core_env_1.getCoreEnv)();
     const ccBase = `http://${(genv.config_center_host || '127.0.0.1').trim()}:${service_ports_1.SERVICE_PORT.CONFIG_CENTER_HTTP}/${chain_id}/config`;
-    let config_pool_url = `${ccBase}/pools`;
-    for (let [dex_id, pool_list] of sol_pools_cache) {
-        let batch_pools = (0, index_1.chunkArray)(pool_list, 10);
-        for (let one_pool_list of batch_pools) {
-            let valid_pool_list = [];
-            for (let pool of one_pool_list) {
-                let is_contains_unkown_symbol = !valid_tokens_map.has(pool.tokenA.symbol) || !valid_tokens_map.has(pool.tokenB.symbol);
-                if (is_contains_unkown_symbol || (0, is_not_arb_token_1.is_not_arb_token)(pool.pool_name)) {
-                    skip_pool_list.push(pool);
-                    continue;
-                }
-                let std_pool = {
-                    program_id: pool.program_id,
-                    authority: pool.authority,
-                    subscribe_type: 'grpc',
-                    pair: pool.pair,
-                    dex_id: dex_id,
-                    pool_name: pool.pool_name,
-                    pool_address: pool.pool_address,
-                    pool_address_hex: '',
-                    tokenA: null,
-                    tokenB: null,
-                    vaultA: pool.vaultA,
-                    vaultB: pool.vaultB,
-                    subscribe_vault_change: pool.subscribe_vault_change,
-                    router_id: null,
-                    fee_rate: pool.fee_rate_bps,
-                    quote_token: pool.quote_token,
-                    quote_amount_usd: genv.quote_amount_usd,
-                    quote_price_decimals: 18,
-                    is_reverse_token: null,
-                    cu_limit: get_cu_limit(dex_id),
-                    tvl: pool.tvl,
-                    vol_24h: pool.vol_24h,
-                    update_time: (0, index_1.getCurDateTime)(),
-                    is_trade_native_token: pool.is_trade_native_token,
-                    enable: true,
-                };
-                valid_pool_list.push(std_pool);
-                count = count + 1;
-            }
-            if (valid_pool_list.length === 0) {
+    const config_pool_url = `${ccBase}/pools`;
+    const body = [];
+    for (const [dex_id, pool_list] of sol_pools_cache) {
+        const valid_pool_list = [];
+        for (const pool of pool_list) {
+            const is_contains_unkown_symbol = !valid_tokens_map.has(pool.tokenA.symbol) || !valid_tokens_map.has(pool.tokenB.symbol);
+            if (is_contains_unkown_symbol || (0, is_not_arb_token_1.is_not_arb_token)(pool.pool_name)) {
+                skip_pool_list.push(pool);
                 continue;
             }
-            let body = [
-                {
-                    dex_id: dex_id,
-                    pool_list: valid_pool_list
-                }
-            ];
-            const res = (yield axios_1.default.post(config_pool_url, body, {
-                headers: { 'Content-Type': 'application/json' }
-            })).data;
-            (0, index_1.log_trace)('cache_pool_config, res', res);
-            yield (0, index_1.sleep)(200);
+            valid_pool_list.push({
+                program_id: pool.program_id,
+                authority: pool.authority,
+                subscribe_type: 'grpc',
+                pair: pool.pair,
+                dex_id,
+                pool_name: pool.pool_name,
+                pool_address: pool.pool_address,
+                pool_address_hex: '',
+                tokenA: null,
+                tokenB: null,
+                vaultA: pool.vaultA,
+                vaultB: pool.vaultB,
+                subscribe_vault_change: pool.subscribe_vault_change,
+                router_id: null,
+                fee_rate: pool.fee_rate_bps,
+                quote_token: pool.quote_token,
+                quote_amount_usd: genv.quote_amount_usd,
+                quote_price_decimals: 18,
+                is_reverse_token: null,
+                cu_limit: get_cu_limit(dex_id),
+                tvl: pool.tvl,
+                vol_24h: pool.vol_24h,
+                update_time: (0, index_1.getCurDateTime)(),
+                is_trade_native_token: pool.is_trade_native_token,
+                enable: true,
+            });
+            count = count + 1;
+        }
+        if (valid_pool_list.length > 0) {
+            body.push({ dex_id, pool_list: valid_pool_list });
         }
     }
+    if (body.length > 0) {
+        const res = (yield axios_1.default.post(config_pool_url, body, {
+            headers: { 'Content-Type': 'application/json' },
+        })).data;
+        (0, index_1.log_trace)('cache_pool_config, res', res);
+    }
     (0, index_1.log_info)(`cache_pool_config finished! sync pool count:${count}, skip: ${skip_pool_list.length}`);
     skip_pool_list.sort((a, b) => a.pair.localeCompare(b.pair));
     (0, index_1.writeFile)(`dist/${chain_id.toLowerCase()}_skip_pool_list.json`, JSON.stringify({

package/dist/token/cache_token_config.js

@@ -22,46 +22,35 @@ const cache_token_config = (chain_id, valid_tokens_map) => __awaiter(void 0, voi
     (0, index_1.log_info)(`cache_token_config start`);
     const genv = (0, core_env_1.getCoreEnv)();
     const ccBase = `http://${(genv.config_center_host || '127.0.0.1').trim()}:${service_ports_1.SERVICE_PORT.CONFIG_CENTER_HTTP}/${chain_id}/config`;
-    let config_token_url = `${ccBase}/tokens`;
-    let count = 0;
-    let batch_symbols = (0, index_1.chunkArray)(Array.from(valid_tokens_map.keys()), 20);
-    for (let one_batch of batch_symbols) {
-        let valid_tokens = [];
-        for (let key of one_batch) {
-            let value = valid_tokens_map.get(key);
-            if (!value || value.length !== 1) {
-                continue;
-            }
-            let token = value[0];
-            let std_token = {
-                symbol: token.symbol,
-                address: token.address,
-                address_hex: '',
-                decimals: token.decimals,
-                name: token.name,
-                is_token2022: token.is_token_2022,
-                market_price: token.price,
-                update_time: (0, index_1.getCurDateTime)(),
-                alias: (0, index_1.get_token_symbol_alias)(token.address),
-                enable: true
-            };
-            if ((0, is_not_arb_token_1.is_not_arb_token)(std_token.symbol)) {
-                continue;
-            }
-            valid_tokens.push(std_token);
-            count += 1;
-        }
-        if (valid_tokens.length === 0) {
+    const config_token_url = `${ccBase}/tokens`;
+    const valid_tokens = [];
+    for (const [, value] of valid_tokens_map) {
+        if (!value || value.length !== 1)
             continue;
-        }
-        const body = valid_tokens;
-        const res = (yield axios_1.default.post(config_token_url, body, {
-            headers: { 'Content-Type': 'application/json' }
+        const token = value[0];
+        const std_token = {
+            symbol: token.symbol,
+            address: token.address,
+            address_hex: '',
+            decimals: token.decimals,
+            name: token.name,
+            is_token2022: token.is_token_2022,
+            market_price: token.price,
+            update_time: (0, index_1.getCurDateTime)(),
+            alias: (0, index_1.get_token_symbol_alias)(token.address),
+            enable: true,
+        };
+        if ((0, is_not_arb_token_1.is_not_arb_token)(std_token.symbol))
+            continue;
+        valid_tokens.push(std_token);
+    }
+    if (valid_tokens.length > 0) {
+        const res = (yield axios_1.default.post(config_token_url, valid_tokens, {
+            headers: { 'Content-Type': 'application/json' },
         })).data;
         (0, index_1.log_trace)('cache_token_config, res', res);
-        yield (0, index_1.sleep)(200);
     }
-    (0, index_1.log_info)(`cache_token_config finish! sync token count: ${count}`);
+    (0, index_1.log_info)(`cache_token_config finish! sync token count: ${valid_tokens.length}`);
     let notify_config_change_url = `${ccBase}/change?type=token`;
     let res = (yield axios_1.default.get(notify_config_change_url)).data;
     (0, index_1.log_info)('fetch tokens end, notify config change', {

package/package.json

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