@clonegod/ttd-sol-common 2.0.83 → 2.0.84

package/dist/quote/verify/quote_price_verify.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuotePriceVerify = void 0;
 const trade_direction_1 = require("../../utils/trade_direction");
 const ttd_core_1 = require("@clonegod/ttd-core");
+const USD_STABLECOINS = new Set(['USDT', 'USDC', 'USD1']);
 function pickMatchingTier(tiers, actualAmountIn) {
     if (!tiers || tiers.length === 0)
         return null;
@@ -183,25 +184,24 @@ class QuotePriceVerify {
     compareAndLog(poolAddress, poolName, poolInfo, cached, inputTokenAddress, outputTokenAddress, inputAmountUi, outputAmountUi, refPrice, execPriceNum, token0PriceUsd, token1PriceUsd, token0Address, swapBlockNumber, txHash, sources, primaryTierInfo) {
         if (inputAmountUi <= 0 || outputAmountUi <= 0)
             return;
-        let swapUsd = 0;
-        if (token0PriceUsd && token1PriceUsd && token0Address) {
-            const inputIsToken0 = inputTokenAddress.toLowerCase() === token0Address.toLowerCase();
-            swapUsd = inputIsToken0
-                ? inputAmountUi * token0PriceUsd
-                : inputAmountUi * token1PriceUsd;
-        }
         const direction = (0, trade_direction_1.resolveTradeDirection)(poolInfo, true);
         const baseToken = direction.baseToken;
         const quoteToken = direction.quoteToken;
         const inputIsQuoteToken = inputTokenAddress.toLowerCase() === quoteToken.address.toLowerCase();
         const isBuy = inputIsQuoteToken;
         const side = isBuy ? 'BUY' : 'SELL';
+        const quoteIsToken0 = quoteToken.address === token0Address;
+        const quotePriceUsd = USD_STABLECOINS.has((quoteToken.symbol || '').toUpperCase())
+            ? 1
+            : (quoteIsToken0 ? (token0PriceUsd || 0) : (token1PriceUsd || 0));
+        const quoteLegAmount = isBuy ? inputAmountUi : outputAmountUi;
+        const swapUsd = quotePriceUsd > 0 ? quoteLegAmount * quotePriceUsd : 0;
         if (refPrice <= 0 || execPriceNum <= 0)
             return;
         const diffBps = (refPrice - execPriceNum) / refPrice * 10000;
         const absDiffBps = Math.abs(diffBps);
         const status = absDiffBps < 5 ? '✅' : absDiffBps < 10 ? '⚠️' : '❌';
-        const usdStr = swapUsd > 0 ? `$${swapUsd.toFixed(0)}` : '$?';
+        const usdStr = swapUsd > 0 ? `$${swapUsd.toFixed(2)}` : '$?';
         const maxUsd = cached.quoteAmountUsd * 2;
         const inRange = swapUsd <= 0 || swapUsd <= maxUsd;
         const rangeTag = inRange ? '' : ' [out]';
@@ -229,7 +229,7 @@ class QuotePriceVerify {
                 ref_price: refPrice,
                 exec_price: execPriceNum,
                 diff_bps: parseFloat(diffBps.toFixed(1)),
-                swap_usd: parseFloat(swapUsd.toFixed(0)),
+                swap_usd: parseFloat(swapUsd.toFixed(2)),
                 in_range: inRange,
                 input_amount: inputAmountUi,
                 output_amount: outputAmountUi,

package/dist/trade/tx_builder.js

@@ -41,9 +41,11 @@ const jitodontfrontAccounts = [
     'jitodontfront1111111111111111111111111111wP',
     'jitodontfront111111111111234565432123456RX5',
 ];
+const jitodontfrontPubkeys = jitodontfrontAccounts.map(s => new web3_js_1.PublicKey(s));
+const heliusTipPubkeys = helius_1.HELIUS_TIP_ACCOUNTS.map(s => new web3_js_1.PublicKey(s));
 function getJitoDontFrontAccount() {
-    const randomIndex = Math.floor(Math.random() * jitodontfrontAccounts.length);
-    return new web3_js_1.PublicKey(jitodontfrontAccounts[randomIndex]);
+    const randomIndex = Math.floor(Math.random() * jitodontfrontPubkeys.length);
+    return jitodontfrontPubkeys[randomIndex];
 }
 class SolTransactionBuilder {
     constructor(appConfig) {
@@ -88,6 +90,7 @@ class SolTransactionBuilder {
         return [];
     }
     buildTransactionForSwap(context, swapInstructions) {
+        const _t0 = Date.now();
         const max_block_offset = context.trade_runtime.settings.strategy.max_block_offset;
         const swapTx = new web3_js_1.Transaction();
         const preInstructions = this.getPreInstructions(context);
@@ -106,11 +109,14 @@ class SolTransactionBuilder {
         }
         let tip_instruction = web3_js_1.SystemProgram.transfer({
             fromPubkey: this.keypair.publicKey,
-            toPubkey: new web3_js_1.PublicKey(helius_1.HELIUS_TIP_ACCOUNTS[Math.floor(Math.random() * helius_1.HELIUS_TIP_ACCOUNTS.length)]),
+            toPubkey: heliusTipPubkeys[Math.floor(Math.random() * heliusTipPubkeys.length)],
             lamports: tip_lamports,
         });
         swapTx.instructions.push(tip_instruction);
+        const _t1 = Date.now();
         swapTx.sign(this.keypair);
+        const _t2 = Date.now();
+        (0, dist_1.log_debug)(`[txBuilder] build breakdown: assemble=${_t1 - _t0}ms sign=${_t2 - _t1}ms total=${_t2 - _t0}ms`);
         return swapTx;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sol-common",
-  "version": "2.0.83",
+  "version": "2.0.84",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/quote/verify/quote_price_verify.ts

@@ -16,6 +16,9 @@
 import { resolveTradeDirection, calculateStandardPrice } from '../../utils/trade_direction';
 import { report_data_to_analyze, QuoteTier } from '@clonegod/ttd-core';
 
+/** USD 稳定币：作 quote 时直接按 $1，无需查价。扩展时在此加。 */
+const USD_STABLECOINS = new Set(['USDT', 'USDC', 'USD1']);
+
 // ========== 类型定义 ==========
 
 interface CachedQuote {
@@ -441,25 +444,24 @@ export class QuotePriceVerify {
     ): string | void {
         if (inputAmountUi <= 0 || outputAmountUi <= 0) return;
 
-        // 估算 USD 金额
-        let swapUsd = 0;
-        if (token0PriceUsd && token1PriceUsd && token0Address) {
-            const inputIsToken0 = inputTokenAddress.toLowerCase() === token0Address.toLowerCase();
-            swapUsd = inputIsToken0
-                ? inputAmountUi * token0PriceUsd
-                : inputAmountUi * token1PriceUsd;
-        }
-
-        // 判断是 买入 base 还是 卖出 base
+        // 判断 买入/卖出 base（USD 估值也要用 quote 侧，提前算）
         const direction = resolveTradeDirection(poolInfo, true);
         const baseToken = direction.baseToken;
         const quoteToken = direction.quoteToken;
 
         const inputIsQuoteToken = inputTokenAddress.toLowerCase() === quoteToken.address.toLowerCase();
         const isBuy = inputIsQuoteToken;
-
         const side = isBuy ? 'BUY' : 'SELL';
 
+        // 估算 USD：只看 **quote 侧那条腿**（swap 必有一条 quote 腿，quote 是稳定/可靠定价侧）。
+        // quote 是 USD 稳定币 → 直接按 $1；否则（SOL 等）→ 用 quote 市价。base(pump 币)有没有价都不影响。
+        const quoteIsToken0 = quoteToken.address === token0Address;   // base58 原值比较（不 lowercase）
+        const quotePriceUsd = USD_STABLECOINS.has((quoteToken.symbol || '').toUpperCase())
+            ? 1
+            : (quoteIsToken0 ? (token0PriceUsd || 0) : (token1PriceUsd || 0));
+        const quoteLegAmount = isBuy ? inputAmountUi : outputAmountUi;   // 买:input=quote；卖:output=quote
+        const swapUsd = quotePriceUsd > 0 ? quoteLegAmount * quotePriceUsd : 0;
+
         if (refPrice <= 0 || execPriceNum <= 0) return;
 
         // sign 约定：(ref - exec) / ref —— "我们报价 vs 实际成交"
@@ -470,7 +472,7 @@ export class QuotePriceVerify {
         const absDiffBps = Math.abs(diffBps);
         // 阈值统一：<5 ✅ / 5-10 ⚠️ / ≥10 ❌（前端颜色阈值同步）
         const status = absDiffBps < 5 ? '✅' : absDiffBps < 10 ? '⚠️' : '❌';
-        const usdStr = swapUsd > 0 ? `$${swapUsd.toFixed(0)}` : '$?';
+        const usdStr = swapUsd > 0 ? `$${swapUsd.toFixed(2)}` : '$?';
 
         // USD 范围标注（不过滤，全部打印）
         // 规则：仅排除"过大的 swap"（超过 2× 询价金额），偏差大可能是滑点而非报价不准；
@@ -509,7 +511,7 @@ export class QuotePriceVerify {
                 ref_price: refPrice,
                 exec_price: execPriceNum,
                 diff_bps: parseFloat(diffBps.toFixed(1)),
-                swap_usd: parseFloat(swapUsd.toFixed(0)),
+                swap_usd: parseFloat(swapUsd.toFixed(2)),   // 显示到分：pump 币多是 <$1 的小单，取整会全成 $0
                 in_range: inRange,
                 input_amount: inputAmountUi,
                 output_amount: outputAmountUi,

package/src/trade/tx_builder.ts

@@ -1,4 +1,4 @@
-import { CHAIN_ID, TradeContext } from "@clonegod/ttd-core/dist";
+import { CHAIN_ID, log_debug, TradeContext } from "@clonegod/ttd-core/dist";
 import { ComputeBudgetProgram, Connection, Keypair, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction, TransactionInstruction } from "@solana/web3.js";
 import { LAMPORTS_PER_MICRO_LAMPORTS } from "../common";
 import { SolanaBlockMetaUpdateEvent } from "../types";
@@ -55,9 +55,13 @@ const jitodontfrontAccounts = [
     'jitodontfront111111111111234565432123456RX5',
 ]
 
+// 固定地址预构 PublicKey（避免每笔交易 base58 解码；模块加载时一次性）
+const jitodontfrontPubkeys = jitodontfrontAccounts.map(s => new PublicKey(s));
+const heliusTipPubkeys = HELIUS_TIP_ACCOUNTS.map(s => new PublicKey(s));
+
 function getJitoDontFrontAccount(): PublicKey {
-    const randomIndex = Math.floor(Math.random() * jitodontfrontAccounts.length);
-    return new PublicKey(jitodontfrontAccounts[randomIndex]);
+    const randomIndex = Math.floor(Math.random() * jitodontfrontPubkeys.length);
+    return jitodontfrontPubkeys[randomIndex];
 }
 
 
@@ -157,6 +161,7 @@ export class SolTransactionBuilder {
      * @returns 
      */
     buildTransactionForSwap(context: TradeContext, swapInstructions: TransactionInstruction[]): Transaction {
+        const _t0 = Date.now()
         const max_block_offset = context.trade_runtime.settings.strategy.max_block_offset
         // console.log(`buildTransactionForSwap, max_block_offset: ${max_block_offset}`)
 
@@ -185,12 +190,16 @@ export class SolTransactionBuilder {
         }
         let tip_instruction = SystemProgram.transfer({
             fromPubkey: this.keypair.publicKey,
-            toPubkey: new PublicKey(HELIUS_TIP_ACCOUNTS[Math.floor(Math.random() * HELIUS_TIP_ACCOUNTS.length)]),
+            toPubkey: heliusTipPubkeys[Math.floor(Math.random() * heliusTipPubkeys.length)],
             lamports: tip_lamports,
         })
         swapTx.instructions.push(tip_instruction)
 
-        swapTx.sign(this.keypair)
+        const _t1 = Date.now()
+        swapTx.sign(this.keypair)   // = compileMessage(serialize) + ed25519(tweetnacl) 签名
+        const _t2 = Date.now()
+        // 耗时拆分（debug 级，不刷屏）：assemble=组装指令+设字段；sign=编译消息+ed25519 签名
+        log_debug(`[txBuilder] build breakdown: assemble=${_t1 - _t0}ms sign=${_t2 - _t1}ms total=${_t2 - _t0}ms`)
 
         return swapTx
     }