@clonegod/ttd-core 3.1.10 → 3.1.12

package/dist/cache/arb_cache.d.ts

@@ -1,11 +1,12 @@
 import { EventEmitter } from 'events';
-import { CommonServiceType, LoadingCache, OrderMessageType, PriceMessageType, RedisCommand, StandardDexPoolConfigType, StandardPairType, StandardPoolInfoType, StandardTokenInfoType, TradePairDexPoolsType, TradePairType, TradeResponseType, TradeRuntimeType, TradeServiceConfigType } from "../../types";
+import { CommonServiceType, LoadingCache, OrderMessageType, PriceMessageType, StandardDexPoolConfigType, StandardPairType, StandardPoolInfoType, StandardTokenInfoType, TradePairDexPoolsType, TradePairType, TradeResponseType, TradeRuntimeType, TradeServiceConfigType } from "../../types";
+import { RedisClient } from "../redis";
 import { CHAIN_ID } from "../index";
 import { ArbEventPublisher } from './arb_event_pub';
 export declare class ArbCache {
     chain_id: CHAIN_ID;
     loading_cache: LoadingCache;
-    redis_cmd: RedisCommand;
+    redis_cmd: RedisClient;
     redis_event_publisher: ArbEventPublisher;
     token_list: StandardTokenInfoType[];
     token_symbol_map: Map<string, StandardTokenInfoType>;

package/dist/cache/arb_cache.js

@@ -20,7 +20,7 @@ class ArbCache {
     constructor(env_args) {
         this.chain_id = env_args.chain_id;
         this.loading_cache = (0, index_1.getLoadingCache)();
-        this.redis_cmd = (0, index_1.getRedisCommamd)();
+        this.redis_cmd = (0, index_1.getRedisClient)();
         this.token_list = [];
         this.token_symbol_map = new Map();
         this.token_address_map = new Map();

package/dist/cache/arb_event_pub.d.ts

@@ -1,10 +1,11 @@
-import { RedisCommand, RedisConfigChangeEventMessageType, RedisOrderEventMessageType, RedisQuoteEventMessageType, TradeResponseType } from "../../types";
+import { RedisConfigChangeEventMessageType, RedisOrderEventMessageType, RedisQuoteEventMessageType, TradeResponseType } from "../../types";
+import { RedisClient } from "../redis";
 import { CHAIN_ID, DEX_ID } from "../index";
 import { ArbCache } from "./arb_cache";
 export declare class ArbEventPublisher {
     arb_cache: ArbCache;
     chain_id: CHAIN_ID;
-    redis_cmd: RedisCommand;
+    redis_cmd: RedisClient;
     constructor(arb_cache: ArbCache);
     publish_config_change_event(message: RedisConfigChangeEventMessageType): Promise<void>;
     publish_quote_price_event(chain_id: string, message: RedisQuoteEventMessageType): Promise<void>;

package/dist/cache/arb_event_sub.d.ts

@@ -1,9 +1,11 @@
-import { ArbCache, RedisCommand, RedisConfigChangeEventMessageType } from "../../types";
+import { RedisConfigChangeEventMessageType } from "../../types";
+import { RedisClient } from "../redis";
+import { ArbCache } from "./arb_cache";
 import { CHAIN_ID, DEX_ID } from "../index";
 export declare class ArbEventSubscriber {
     arb_cache: ArbCache;
     chain_id: CHAIN_ID;
-    redis_cmd: RedisCommand;
+    redis_cmd: RedisClient;
     constructor(arb_cache: ArbCache);
     pre_load_config_cache(): Promise<void>;
     subscribe_config_change_event(callback?: Function): Promise<void>;

package/dist/chains/evm_gas_options.d.ts

@@ -0,0 +1,9 @@
+export interface EvmGasOptions {
+    gasLimit: number;
+    defaultGasPriceGwei: number;
+    maxGasPriceGwei: number;
+    maxFeePerGasGwei: number;
+    maxPriorityFeePerGasGwei: number;
+    defaultTipAmountGwei: number;
+    maxTipAmountGwei: number;
+}

package/dist/chains/evm_gas_options.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/index.d.ts

@@ -136,7 +136,6 @@ export declare const parse_unique_orderbook_id: (unique_orderbook_id: string) =>
 export declare const format_unique_order_msg_id: (group_id: string, price_id: string, order_trace_id: string) => string;
 export declare const format_order_lock_key: (chain_id: string, group_id: string, price_id: string, order_trace_id: string) => string;
 export declare const getRedisClient: (lockPrefix?: string) => redis.RedisClient;
-export declare const getRedisCommamd: () => redis.RedisClient;
 export declare const getLoadingCache: () => cache.LoadingCache;
 export declare const getArbCache: (env_args: any) => cache.ArbCache;
 export declare const getArbEventPublisher: (arb_cache: any) => cache.ArbEventPublisher;

package/dist/index.js

@@ -48,8 +48,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DATE_TIME_FORMAT_DEFAULT = exports.to_json_str = exports.DecimalUtil = exports.generateRandomNumber = exports.LOG = exports._active_log_level = exports.LOG_LEVEL = exports.REDIS_EVENT_TYPE_TRADE_INSTANCE_CHANGE = exports.REDIS_EVENT_TYPE_ORDER = exports.REDIS_EVENT_TYPE_QUOTE = exports.REDIS_EVENT_TYPE_CONFIG_CHANGE = exports.REDIS_EVENT_CHANNEL = exports.get_new_block_channel_name = exports.get_tx_result_channel_name = exports.get_wallet_raw_tx_channel_name = exports.get_order_channel_name = exports.get_quote_channel_name = exports.get_config_channel_name = exports.get_cache_key = exports.getArbEventSubscriber = exports.getArbEventPublisher = exports.getArbCache = exports.getLoadingCache = exports.getRedisCommamd = exports.getRedisClient = exports.format_order_lock_key = exports.format_unique_order_msg_id = exports.parse_unique_orderbook_id = exports.format_unique_orderbook_id = exports.format_symbol_name = exports.LOCAL_EVENT_NAME = exports.CACHE_KEY_TYPE = exports.OnChainDataSubscribeType = exports.TradeErrorCodeType = exports.SystemErrorCodeType = exports.TRADE_TYPE = exports.GROUP_ID = exports.DEX_ID = exports.CHAIN_ID = exports.STREAMING_TRANSACTION_CONFIRMED = exports.TRANSACTION_STATE_FAILED = exports.TRANSACTION_STATE_SUCCESS = exports.TRANSACTION_STATE_PROCESSING = exports.QUOTE_AMOUNT_USD_MAX = exports.QUOTE_AMOUNT_USD_MIN = exports.REGEX_HEX_PREFIX = exports.PROCESSING = exports.NOT_FOUND = exports.SUCCESS = exports.FAILED = void 0;
-exports.execute_bash = exports.inspect_arb_local_cache = exports.save_trade_execution_logs = exports.parse_trade_cmdline_args = exports.get_input_out_token_fix = exports.get_input_out_token = exports.calc_amount_in_token = exports.estimate_amount_in_token = exports.failed = exports.success = exports.home_dir = exports.postJSON = exports.deep_merge_object = exports.isArray = exports.isTrue = exports.deep_clone = exports.uuid = exports.DATE_TIME_FORMAT_NO_WHITESPACE = void 0;
+exports.DATE_TIME_FORMAT_NO_WHITESPACE = exports.DATE_TIME_FORMAT_DEFAULT = exports.to_json_str = exports.DecimalUtil = exports.generateRandomNumber = exports.LOG = exports._active_log_level = exports.LOG_LEVEL = exports.REDIS_EVENT_TYPE_TRADE_INSTANCE_CHANGE = exports.REDIS_EVENT_TYPE_ORDER = exports.REDIS_EVENT_TYPE_QUOTE = exports.REDIS_EVENT_TYPE_CONFIG_CHANGE = exports.REDIS_EVENT_CHANNEL = exports.get_new_block_channel_name = exports.get_tx_result_channel_name = exports.get_wallet_raw_tx_channel_name = exports.get_order_channel_name = exports.get_quote_channel_name = exports.get_config_channel_name = exports.get_cache_key = exports.getArbEventSubscriber = exports.getArbEventPublisher = exports.getArbCache = exports.getLoadingCache = exports.getRedisClient = exports.format_order_lock_key = exports.format_unique_order_msg_id = exports.parse_unique_orderbook_id = exports.format_unique_orderbook_id = exports.format_symbol_name = exports.LOCAL_EVENT_NAME = exports.CACHE_KEY_TYPE = exports.OnChainDataSubscribeType = exports.TradeErrorCodeType = exports.SystemErrorCodeType = exports.TRADE_TYPE = exports.GROUP_ID = exports.DEX_ID = exports.CHAIN_ID = exports.STREAMING_TRANSACTION_CONFIRMED = exports.TRANSACTION_STATE_FAILED = exports.TRANSACTION_STATE_SUCCESS = exports.TRANSACTION_STATE_PROCESSING = exports.QUOTE_AMOUNT_USD_MAX = exports.QUOTE_AMOUNT_USD_MIN = exports.REGEX_HEX_PREFIX = exports.PROCESSING = exports.NOT_FOUND = exports.SUCCESS = exports.FAILED = void 0;
+exports.execute_bash = exports.inspect_arb_local_cache = exports.save_trade_execution_logs = exports.parse_trade_cmdline_args = exports.get_input_out_token_fix = exports.get_input_out_token = exports.calc_amount_in_token = exports.estimate_amount_in_token = exports.failed = exports.success = exports.home_dir = exports.postJSON = exports.deep_merge_object = exports.isArray = exports.isTrue = exports.deep_clone = exports.uuid = void 0;
 exports._caller = _caller;
 exports.log_trace = log_trace;
 exports.log_debug = log_debug;
@@ -260,10 +260,6 @@ const getRedisClient = (lockPrefix = '') => {
     return new redis.RedisClient(lockPrefix);
 };
 exports.getRedisClient = getRedisClient;
-const getRedisCommamd = () => {
-    return new redis.RedisClient();
-};
-exports.getRedisCommamd = getRedisCommamd;
 const getLoadingCache = () => {
     return new cache.LoadingCache();
 };

package/dist/pool/pool_util.js

@@ -31,7 +31,7 @@ function get_pair_name(native_token, pool_name) {
 function check_pool_token_address(pool) {
     let { pool_name, pool_address, tokenA, tokenB } = pool;
     for (let token of [tokenA, tokenB]) {
-        let is_fake_token = token_1.fixed_symbol_address.some(e => e.symbol === token.symbol && e.address.toLowerCase() !== token.address.toLowerCase());
+        let is_fake_token = (0, token_1.get_fixed_symbol_address)().some(e => e.symbol === token.symbol && e.address.toLowerCase() !== token.address.toLowerCase());
         if (is_fake_token) {
             throw new Error(`Invalid token address of ${token.symbol}: ${token.address}, ${pool_name}, ${pool_address}`);
         }

package/dist/redis/redis_client.d.ts

@@ -325,4 +325,3 @@ export declare class RedisClient {
     subscribe(channel: string, listener: any): Promise<void>;
     publish(channel: string, message: string): Promise<void>;
 }
-export declare const RedisCommand: typeof RedisClient;

package/dist/redis/redis_client.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisCommand = exports.RedisClient = void 0;
+exports.RedisClient = void 0;
 const index_1 = require("../index");
 const redis_connection_1 = require("./redis_connection");
 const MAX_SUBSCRIBE_RECONNECT = 10;
@@ -282,4 +282,3 @@ class RedisClient {
     }
 }
 exports.RedisClient = RedisClient;
-exports.RedisCommand = RedisClient;

package/dist/token/fixed_symbol_address.d.ts

@@ -1,2 +1,2 @@
 import { TokenFixedSymbolAddress } from './types';
-export declare const fixed_symbol_address: TokenFixedSymbolAddress[];
+export declare const get_fixed_symbol_address: () => TokenFixedSymbolAddress[];

package/dist/token/fixed_symbol_address.js

@@ -3,25 +3,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fixed_symbol_address = void 0;
+exports.get_fixed_symbol_address = void 0;
 require('dotenv').config();
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const index_1 = require("../index");
+let _first_load_logged = false;
 const get_fixed_symbol_address = () => {
-    let chain_id = process.env.CHAIN_ID;
+    const chain_id = process.env.CHAIN_ID;
     if (!chain_id) {
         return [];
     }
-    let filepath = process.env.BSC_FIXED_SYMBOL_ADDRESS_FILE || path_1.default.join(os_1.default.homedir(), 'data', 'onchain_data', chain_id.toLowerCase(), 'fixed_symbol_address.json');
-    console.log(`get_fixed_symbol_address: ${filepath}`);
-    let fixed_symbol_address_list = [];
+    const filepath = process.env.BSC_FIXED_SYMBOL_ADDRESS_FILE ||
+        path_1.default.join(os_1.default.homedir(), 'data', 'onchain_data', chain_id.toLowerCase(), 'fixed_symbol_address.json');
+    const print_log = process.env.PRINT_FIXED_SYMBOL_ADDRESS === 'true';
+    let list = [];
     try {
-        fixed_symbol_address_list = (0, index_1.readFile)(filepath, true, true);
+        list = (0, index_1.readFile)(filepath, true, true);
+        if (print_log && !_first_load_logged) {
+            (0, index_1.log_info)(`[fixed_symbol_address] loaded ${list.length} entries from ${filepath}`);
+            _first_load_logged = true;
+        }
     }
     catch (error) {
-        console.error('get_fixed_symbol_address erro!', error);
+        (0, index_1.log_error)(`[fixed_symbol_address] load failed from ${filepath}`, error);
     }
-    return fixed_symbol_address_list;
+    return list;
 };
-exports.fixed_symbol_address = get_fixed_symbol_address();
+exports.get_fixed_symbol_address = get_fixed_symbol_address;

package/dist/token/token_util.js

@@ -21,6 +21,6 @@ const is_valid_symbol = (symbol) => {
 };
 exports.is_valid_symbol = is_valid_symbol;
 function get_token_symbol_alias(token_address) {
-    let token = __1.fixed_symbol_address.find(e => e.address === token_address);
+    let token = (0, __1.get_fixed_symbol_address)().find(e => e.address === token_address);
     return (token === null || token === void 0 ? void 0 : token.alias) || '';
 }

package/package.json

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

package/types/index.d.ts

@@ -177,13 +177,14 @@ export interface TradeStrategyType {
     max_block_offset: number                   // Solana特定：限制交易在多少个区块内有效（约等于秒数，1 block ≈ 0.4秒）。使用最新blockhash，设置lastValidBlockHeight = currentBlockHeight + max_block_offset
 
     // evm chain
+    evm_tx_type: 0 | 2                        // 交易类型：0=Legacy, 2=EIP-1559
     evm_gas_limit: number                      // 300000
-    evm_gas_price_gwei: number                 // 1.1 Gwei
-    evm_tip_amount_gwei: number                // 48000 Gwei
+    evm_gas_price_gwei: number                 // Legacy: gasPrice（Gwei）
+    evm_tip_amount_gwei: number                // Builder tip（Gwei），独立原生代币转账
 
-    // evm EIP-1559 交易类型
-    evm_max_gas_price_gwei: number             // 0.01 Gwei 允许的gas price上限
-    evm_max_priority_fee_per_gas_gwei: number  // 0.002 Gwei 允许的priority fee上限，需小于 max_gas_price_gwei
+    // evm EIP-1559 (Type 2)
+    evm_max_fee_per_gas_gwei: number            // Type2: maxFeePerGas（Gwei）
+    evm_max_priority_fee_per_gas_gwei: number  // Type2: maxPriorityFeePerGas（Gwei），允许为 0
 
     // sui
     gas_price: number // default