@clonegod/ttd-core 3.1.11 → 3.1.12

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/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/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.11",
+    "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