@clonegod/ttd-core 3.1.57 → 3.1.59

package/dist/alert/registry.d.ts

@@ -24,7 +24,6 @@ export declare const ALERT_TYPES: {
     readonly QUOTE_POOL_INIT_FAILED: AlertTypeDef;
     readonly QUOTE_V2_STALL: AlertTypeDef;
     readonly QUOTE_VERIFY_HIGH_DRIFT: AlertTypeDef;
-    readonly QUOTE_HOOK_FEE_CHANGE: AlertTypeDef;
     readonly TRADE_NONCE_DESYNC: AlertTypeDef;
     readonly TRADE_CALLER_LOW_BALANCE: AlertTypeDef;
     readonly TRADE_TX_PENDING_TOO_LONG: AlertTypeDef;

package/dist/alert/registry.js

@@ -138,7 +138,6 @@ exports.ALERT_TYPES = {
     QUOTE_POOL_INIT_FAILED: def('quote.pool_init_failed', 'critical', { display: '池子初始化失败', ttl_ms: 0, enable: true }),
     QUOTE_V2_STALL: def('quote.v2_stall', 'warn', { display: 'V2 事件流停摆（降级 V1）', ttl_ms: 60000, enable: true, auto_resolve_on_recheck: true }),
     QUOTE_VERIFY_HIGH_DRIFT: def('quote.verify_high_drift', 'warn', { display: '报价反校验偏差超阈值', ttl_ms: 300000, enable: true }),
-    QUOTE_HOOK_FEE_CHANGE: def('quote.hook_fee_change', 'info', { display: 'Hook 动态 fee 变化', ttl_ms: 0, enable: true, kind: 'event' }),
     TRADE_NONCE_DESYNC: def('trade.nonce_desync', 'critical', { display: 'Nonce 不同步', ttl_ms: 30000, enable: true, auto_resolve_on_recheck: true }),
     TRADE_CALLER_LOW_BALANCE: def('trade.caller_low_balance', 'warn', { display: 'Caller 余额不足', ttl_ms: 300000, enable: true }),
     TRADE_TX_PENDING_TOO_LONG: def('trade.tx_pending_too_long', 'warn', { display: '交易长时间未上链', ttl_ms: 60000, enable: true }),

package/dist/quote/depth_tier.d.ts

@@ -28,10 +28,12 @@ export interface OrderbookTier {
     pct: number;
     price: number;
     amount: number;
+    usdValue: number;
 }
 export interface OrderbookEntry {
     price: number;
     amount: number;
+    usdValue: number;
     tiers: OrderbookTier[];
 }
 export declare function toOrderbookEntry(q: QuoteEntry): OrderbookEntry;

package/dist/quote/depth_tier.js

@@ -7,7 +7,8 @@ function toOrderbookEntry(q) {
     return {
         price: q.price,
         amount: q.amount,
-        tiers: q.tiers.map(t => ({ pct: t.pct, price: t.price, amount: t.amount })),
+        usdValue: q.amount_in_usd,
+        tiers: q.tiers.map(t => ({ pct: t.pct, price: t.price, amount: t.amount, usdValue: t.amount_in_usd })),
     };
 }
 const PCT_LEVEL_DEFAULT = [0.1, 0.2, 0.3, 0.5, 1.0];

package/dist/quote/on_quote_response.js

@@ -21,13 +21,13 @@ function on_quote_response(opts) {
         price_time: priceTime,
         total_quote_time: priceTime - streamTime
     };
-    (0, to_price_message_1.to_price_message)(appConfig, quoteAmountUsd, 0, quoteAskPrice, quoteBidPrice, poolInfo, time, String(blockNumber), source, depth)
+    (0, to_price_message_1.to_price_message)(appConfig, quoteAmountUsd, 0, quoteAskPrice, quoteBidPrice, poolInfo, time, blockNumber, source, depth)
         .then((price_msg) => {
         if (pushPriceMessage) {
             (0, publish_quote_price_1.publish_quote_price)(appConfig, price_msg);
         }
         (0, log_quote_price_1.log_quote_price)(String(blockNumber), price_msg, txid);
-        (0, analyze_1.report_data_to_analyze)('PriceMessageType', Object.assign(Object.assign({}, price_msg), { quote_source: { slot: String(blockNumber), block: null, txid } }));
+        (0, analyze_1.report_data_to_analyze)('PriceMessageType', Object.assign(Object.assign({}, price_msg), { quote_source: { block_number: blockNumber, txid } }));
         if (depth) {
             (0, analyze_1.report_data_to_analyze)('DepthLevels', {
                 price_id: price_msg.price_id,

package/dist/quote/to_price_message.d.ts

@@ -2,5 +2,5 @@ import { StandardPoolInfoType, QuoteTimeInfoType, PriceMessageType } from '../..
 import { AppConfig } from '../appconfig';
 import { QuoteDepthOutput } from './depth_tier';
 export declare const get_quote_token_decimals: (pool_info: StandardPoolInfoType) => number;
-export declare function to_price_message(appConfig: AppConfig, quote_amount_usd: number, tx_price: number, quote_ask_price: number, quote_bid_price: number, pool_info: StandardPoolInfoType, time: QuoteTimeInfoType, slot: string | undefined, source: string, depth?: QuoteDepthOutput): Promise<PriceMessageType>;
+export declare function to_price_message(appConfig: AppConfig, quote_amount_usd: number, tx_price: number, quote_ask_price: number, quote_bid_price: number, pool_info: StandardPoolInfoType, time: QuoteTimeInfoType, blockNumber: number, source: string, depth?: QuoteDepthOutput): Promise<PriceMessageType>;
 export declare function normalize_pair_name(priceMessage: PriceMessageType): void;

package/dist/quote/to_price_message.js

@@ -26,7 +26,7 @@ const get_quote_token_decimals = (pool_info) => {
     return decimals;
 };
 exports.get_quote_token_decimals = get_quote_token_decimals;
-function to_price_message(appConfig, quote_amount_usd, tx_price, quote_ask_price, quote_bid_price, pool_info, time, slot, source, depth) {
+function to_price_message(appConfig, quote_amount_usd, tx_price, quote_ask_price, quote_bid_price, pool_info, time, blockNumber, source, depth) {
     return __awaiter(this, void 0, void 0, function* () {
         let { pool_address, tokenA, tokenB } = pool_info;
         let { dex_id, pool_name, fee_rate, is_reverse_token } = yield appConfig.arb_cache.get_one_pool_info(pool_address);
@@ -40,8 +40,8 @@ function to_price_message(appConfig, quote_amount_usd, tx_price, quote_ask_price
         let mid_price;
         let fee_rate_bps;
         if (depth) {
-            ask = depth.ask;
-            bid = depth.bid;
+            ask = quote_ask_price > 0 ? Object.assign(Object.assign({}, depth.ask), { price: quote_ask_price.toFixed(12) }) : depth.ask;
+            bid = quote_bid_price > 0 ? Object.assign(Object.assign({}, depth.bid), { price: quote_bid_price.toFixed(12) }) : depth.bid;
             mid_price = depth.mid_price;
             fee_rate_bps = depth.fee_rate_bps;
         }
@@ -84,8 +84,7 @@ function to_price_message(appConfig, quote_amount_usd, tx_price, quote_ask_price
             ask,
             bid,
             time,
-            slot: slot !== null && slot !== void 0 ? slot : '',
-            blockNumber: slot ? parseInt(slot, 10) || undefined : undefined,
+            blockNumber: blockNumber > 0 ? blockNumber : undefined,
             source: source !== null && source !== void 0 ? source : '',
         };
         normalize_pair_name(price_message);

package/dist/trade/abstract_tx_check.js

@@ -51,7 +51,7 @@ class AbstractTransactionResultCheck {
     }
     map_swap_result_to_tx_result(swap_result) {
         var _a;
-        let { success, error_code, wallet, block_number, block_time: order_block_time, txid, tx_price, tokenA, tokenB, gas_fee } = swap_result;
+        let { success, error_code, wallet, block_number, tx_index, block_time: order_block_time, txid, tx_price, tokenA, tokenB, gas_fee } = swap_result;
         if (this.context.ui_tip_amount) {
             gas_fee.priority_fee = this.context.ui_tip_amount;
             gas_fee.total_fee = gas_fee.base_fee + gas_fee.priority_fee;
@@ -81,6 +81,7 @@ class AbstractTransactionResultCheck {
             total_order_time,
         };
         time.order_block_number = block_number || 0;
+        time.order_tx_index = tx_index || 0;
         const _marks = (_a = this.context) === null || _a === void 0 ? void 0 : _a._execution_marks;
         if (_marks) {
             ;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-core",
-    "version": "3.1.57",
+    "version": "3.1.59",
     "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

@@ -285,15 +285,15 @@ export interface PriceMessageType {
     /** 买方报价：同上，两种形态共存 */
     bid: QuoteEntry | PriceType
     time: QuoteTimeInfoType         // quote 耗时数据
-    slot: string                    // 询价生成的价格，所对应的slot (account, vaultA, vaultB)
-    blockNumber?: number            // 报价基于的区块号
+    /** 报价基于的区块号；0 / 缺失表示无 block 信息（如 PriceFeed 路径） */
+    blockNumber: number
     quote_source?: QuoteSourceType  // 触发本次询价的事件源信息
     source?: string                 // 报价来源：rpc:v1, QuickNode:v2, YYWS:v3
 }
 
 export interface QuoteSourceType {
-    slot: string
-    block: string
+    /** 触发本次询价的事件所在 block；0 表示无 block 信息 */
+    block_number: number
     txid: string
 }
 
@@ -349,15 +349,11 @@ export interface Ladder {
     /** 默认主档（0.2%）目标价；字符串以保持 wire 兼容性 */
     price: string
     /** 默认主档（0.2%）可成交 base token 数量 */
-    amount: string
+    qty: string
+    /** 默认主档（0.2%）该档位 USD 估值 */
+    usd_value: string
     /** 多档完整数据（按 pct 升序：0.1, 0.2, 0.3, 0.5, 1.0） */
-    tiers: { pct: number; price: string; amount: string }[]
-
-    // 询价生成的价格，所对应的slot (account, vaultA, vaultB)
-    slot: string
-
-    // 区块号
-    blockNumber?: string
+    tiers: { pct: number; price: string; qty: string; usd_value: string }[]
 
     // 价格来源: "rpc:v1" | "{provider_id}:v2" | "{provider_id}:v3"
     source?: string
@@ -428,6 +424,8 @@ export interface StandardSwapDetailType {
     txid: string,
     block_time: number
     block_number: number
+    /** 交易在区块内的位置（从 receipt.transactionIndex 读）；解析失败则 0 */
+    tx_index: number
 
     pool_address: string
     tokenA: TokenBalanceChangeType
@@ -940,7 +938,6 @@ export interface AnalyzeTierLevelType {
     amount_in_usd: number
     fee: number
     fee_usd: number
-    cumulative_usd: number
     tick_move?: string
 }
 
@@ -1026,6 +1023,8 @@ export interface AnalyzeQuoteSnapshotType {
     bid: string
     block_number: number
     source_txid: string
+    /** 报价来源标签: 'rpc:v1' | '{provider}:v2' | '{provider}:v3' */
+    source?: string
     stream_recv_time: number
     price_ready_time: number
 }