@clonegod/ttd-core 3.1.84 → 3.1.87

package/dist/pool/cache_pool_config.d.ts

@@ -1,2 +1,3 @@
 import { CHAIN_ID, DEX_ID, FormattedPoolInfo, FormattedTokenInfo } from "../index";
 export declare const cache_pool_config: (chain_id: CHAIN_ID, tokens_map: Map<string, FormattedTokenInfo>, pools_map: Map<DEX_ID, FormattedPoolInfo[]>) => Promise<void>;
+export declare function assert_cache_pool_fields(pools_map: Map<DEX_ID, FormattedPoolInfo[]>): void;

package/dist/pool/cache_pool_config.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cache_pool_config = void 0;
+exports.assert_cache_pool_fields = assert_cache_pool_fields;
 const axios_1 = __importDefault(require("axios"));
 const core_env_1 = require("../appconfig/core_env");
 const index_1 = require("../index");
@@ -36,7 +37,7 @@ const cache_pool_config = (chain_id, tokens_map, pools_map) => __awaiter(void 0,
                 continue;
             }
             valid_pool_list.push({
-                _id: (pool.pool_address || '').toLowerCase(),
+                _id: pool._id,
                 program_id: pool.program_id,
                 authority: pool.authority,
                 subscribe_type: 'grpc',
@@ -113,3 +114,13 @@ function get_cu_limit(dex_id) {
     }
     return cu_limit;
 }
+function assert_cache_pool_fields(pools_map) {
+    var _a, _b;
+    for (const [dex_id, pools] of pools_map) {
+        for (const p of pools) {
+            if (!(p === null || p === void 0 ? void 0 : p._id) || !p.pool_address || !p.pair || !((_a = p.tokenA) === null || _a === void 0 ? void 0 : _a._id) || !((_b = p.tokenB) === null || _b === void 0 ? void 0 : _b._id)) {
+                throw new Error(`assert_cache_pool_fields: pool 字段不全(须含 _id/pool_address/pair/tokenA._id/tokenB._id): dex=${dex_id} name=${p === null || p === void 0 ? void 0 : p.pool_name} addr=${p === null || p === void 0 ? void 0 : p.pool_address}`);
+            }
+        }
+    }
+}

package/dist/token/cache_token_config.d.ts

@@ -1,2 +1,3 @@
 import { CHAIN_ID, FormattedTokenInfo } from "../index";
 export declare const cache_token_config: (chain_id: CHAIN_ID, tokens_map: Map<string, FormattedTokenInfo>) => Promise<void>;
+export declare function assert_cache_token_fields(tokens_map: Map<string, FormattedTokenInfo>): void;

package/dist/token/cache_token_config.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cache_token_config = void 0;
+exports.assert_cache_token_fields = assert_cache_token_fields;
 const axios_1 = __importDefault(require("axios"));
 const core_env_1 = require("../appconfig/core_env");
 const index_1 = require("../index");
@@ -30,7 +31,7 @@ const cache_token_config = (chain_id, tokens_map) => __awaiter(void 0, void 0, v
         if ((0, is_not_arb_token_1.is_not_arb_token)(token.symbol))
             continue;
         valid_tokens.push({
-            _id: (token.address || '').toLowerCase(),
+            _id: token._id,
             symbol: token.symbol,
             raw_symbol: token.raw_symbol,
             address: token.address,
@@ -58,3 +59,10 @@ const cache_token_config = (chain_id, tokens_map) => __awaiter(void 0, void 0, v
     });
 });
 exports.cache_token_config = cache_token_config;
+function assert_cache_token_fields(tokens_map) {
+    for (const t of tokens_map.values()) {
+        if (!(t === null || t === void 0 ? void 0 : t._id) || !t.symbol || !t.address) {
+            throw new Error(`assert_cache_token_fields: token 字段不全(须含 _id/symbol/address): ${JSON.stringify({ _id: t === null || t === void 0 ? void 0 : t._id, symbol: t === null || t === void 0 ? void 0 : t.symbol, address: t === null || t === void 0 ? void 0 : t.address })}`);
+        }
+    }
+}

package/dist/token/price/price_cache.js

@@ -23,9 +23,8 @@ const fetchPriceFromCache = (token_address_list) => __awaiter(void 0, void 0, vo
         (0, __1.log_warn)('global_app_config is not set, skip get token price from cache');
         return result;
     }
-    const map = global_app_config.arb_cache.token_address_map;
     for (const address of token_address_list) {
-        const token = map.get(address.toLowerCase());
+        const token = global_app_config.arb_cache.getTokenByAddress(address);
         if (token === null || token === void 0 ? void 0 : token.market_price) {
             result.set(address, {
                 address: token.address,
@@ -51,14 +50,13 @@ function cache_new_market_price_batch(hits) {
             (0, __1.log_warn)('global_app_config is not set, skip cache_new_market_price_batch');
             return;
         }
-        const map = global_app_config.arb_cache.token_address_map;
         const updated = [];
         for (const { address, price, source } of hits) {
             if (!price || Number(price) <= 0) {
                 (0, __1.log_warn)(`skip cache invalid market_price from ${source}`, { address, price });
                 continue;
             }
-            const tokenInfo = map.get(address.toLowerCase());
+            const tokenInfo = global_app_config.arb_cache.getTokenByAddress(address);
             if (!tokenInfo) {
                 (0, __1.log_warn)(`tokenInfo not found in arb_cache.token_address_map: address=${address}`);
                 continue;
@@ -90,10 +88,9 @@ function warnPriceCacheMiss(missed_addresses) {
         return;
     }
     const now = Date.now();
-    const map = cfg.arb_cache.token_address_map;
     const to_warn = [];
     for (const addr of missed_addresses) {
-        const known = map.has(addr.toLowerCase());
+        const known = cfg.arb_cache.getTokenByAddress(addr) !== undefined;
         if (!known)
             continue;
         const last = (_a = _priceMissLastWarnAt.get(addr)) !== null && _a !== void 0 ? _a : 0;

package/package.json

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