@clonegod/ttd-core 3.0.7 → 3.0.9

package/dist/quote/on_quote_response.d.ts

@@ -1,3 +1,3 @@
 import { StandardPoolInfoType, QuoteResultType } from "../../types";
 import { AppConfig } from "../app_config";
-export declare function on_quote_respose(appConfig: AppConfig, pool_info: StandardPoolInfoType, quote_amount_usd: number, execution_price: number, stream_time: number, quote_start_time: number, slot_info: string, result: [QuoteResultType, QuoteResultType, number], txid: string, push_price_message?: boolean): void;
+export declare function on_quote_respose(appConfig: AppConfig, pool_info: StandardPoolInfoType, quote_amount_usd: number, execution_price: number, stream_time: number, quote_start_time: number, slot_info: string, result: [QuoteResultType, QuoteResultType, number], txid: string, push_price_message?: boolean, source?: string): void;

package/dist/quote/on_quote_response.js

@@ -5,7 +5,7 @@ const analyze_1 = require("../analyze");
 const log_quote_price_1 = require("./log_quote_price");
 const publish_quote_price_1 = require("./publish_quote_price");
 const to_price_message_1 = require("./to_price_message");
-function on_quote_respose(appConfig, pool_info, quote_amount_usd, execution_price, stream_time, quote_start_time, slot_info, result, txid, push_price_message = true) {
+function on_quote_respose(appConfig, pool_info, quote_amount_usd, execution_price, stream_time, quote_start_time, slot_info, result, txid, push_price_message = true, source = "") {
     const quote_end_time = new Date().getTime();
     const quote_ask_price = Number(result[0].price);
     const quote_bid_price = Number(result[1].price);
@@ -19,7 +19,7 @@ function on_quote_respose(appConfig, pool_info, quote_amount_usd, execution_pric
         price_time,
         total_quote_time: price_time - stream_time
     };
-    (0, to_price_message_1.to_price_message)(appConfig, quote_amount_usd, execution_price, quote_ask_price, quote_bid_price, pool_info, time, slot_info)
+    (0, to_price_message_1.to_price_message)(appConfig, quote_amount_usd, execution_price, quote_ask_price, quote_bid_price, pool_info, time, slot_info, source)
         .then((price_msg) => {
         if (push_price_message) {
             (0, publish_quote_price_1.publish_quote_price)(appConfig, price_msg);

package/dist/quote/to_price_message.d.ts

@@ -1,5 +1,5 @@
 import { StandardPoolInfoType, QuoteTimeInfoType, PriceMessageType } from '../../types';
 import { AppConfig } from '../app_config';
 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): 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, slot?: string, source?: string): Promise<PriceMessageType>;
 export declare function normalize_pair_name(priceMessage: PriceMessageType): void;

package/dist/quote/to_price_message.js

@@ -30,8 +30,8 @@ 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) {
-    return __awaiter(this, void 0, void 0, function* () {
+function to_price_message(appConfig_1, quote_amount_usd_1, tx_price_1, quote_ask_price_1, quote_bid_price_1, pool_info_1, time_1, slot_1) {
+    return __awaiter(this, arguments, void 0, function* (appConfig, quote_amount_usd, tx_price, quote_ask_price, quote_bid_price, pool_info, time, slot, source = "") {
         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);
         let _dex_id = dex_id;
@@ -79,7 +79,9 @@ function to_price_message(appConfig, quote_amount_usd, tx_price, quote_ask_price
                 quantity: quote_amount_usd
             },
             time,
-            slot
+            slot,
+            blockNumber: slot ? parseInt(slot, 10) || undefined : undefined,
+            source: source !== null && source !== void 0 ? source : ""
         };
         normalize_pair_name(price_message);
         return price_message;

package/dist/token/price/defi_llama.js

@@ -17,18 +17,20 @@ const axios_1 = __importDefault(require("axios"));
 const index_1 = require("../../index");
 function fetchPriceFromDefiLlama(network, addresses) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const result = new Map();
         const currentTime = (0, index_1.getCurDateTime)();
         const timeout = 10000;
-        const maxRetries = 3;
+        const maxRetries = 1;
         const retrysleepMs = 1000;
         const addressString = addresses.map(address => `${network.toLowerCase()}:${address}`).join(',');
         const url = `https://coins.llama.fi/prices/current/${addressString}`;
         console.log(url);
         (0, index_1.log_debug)(`[fetchPriceFromDefiLlama] Requesting prices for ${addresses.length} tokens`);
-        let retryCount = 0;
-        while (retryCount <= maxRetries) {
+        let attempt = 0;
+        while (attempt <= maxRetries) {
             try {
+                attempt++;
                 const response = yield axios_1.default.get(url, { timeout });
                 let tokenPrices = response.data['coins'];
                 if (tokenPrices) {
@@ -51,10 +53,14 @@ function fetchPriceFromDefiLlama(network, addresses) {
                 break;
             }
             catch (error) {
-                retryCount++;
-                (0, index_1.log_warn)(`[fetchPriceFromDefiLlama] Request failed (attempt ${retryCount}/${maxRetries}): ${error instanceof Error ? error.message : String(error)}`);
-                if (retryCount <= maxRetries) {
-                    const currentRetrysleep = retrysleepMs * retryCount;
+                const status = axios_1.default.isAxiosError(error) ? (_a = error.response) === null || _a === void 0 ? void 0 : _a.status : undefined;
+                (0, index_1.log_warn)(`[fetchPriceFromDefiLlama] Request failed (attempt ${attempt}/${maxRetries + 1}): ${error instanceof Error ? error.message : String(error)}`);
+                if (status === 429) {
+                    (0, index_1.log_warn)(`[fetchPriceFromDefiLlama] Rate limited (429). Skip retries and fallback to next channel immediately.`);
+                    break;
+                }
+                if (attempt <= maxRetries) {
+                    const currentRetrysleep = retrysleepMs * attempt;
                     (0, index_1.log_debug)(`[fetchPriceFromDefiLlama] Retrying in ${currentRetrysleep}ms...`);
                     yield (0, index_1.sleep)(currentRetrysleep);
                 }

package/dist/token/price/gecko_terminal.js

@@ -17,18 +17,20 @@ const axios_1 = __importDefault(require("axios"));
 const index_1 = require("../../index");
 function fetchPriceFromGeckoTerminal(network, addresses) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const result = new Map();
         const currentTime = (0, index_1.getCurDateTime)();
         const timeout = 10000;
-        const maxRetries = 3;
+        const maxRetries = 1;
         const retrysleepMs = 1000;
         const addressString = addresses.join(',');
         const url = `https://api.geckoterminal.com/api/v2/simple/networks/${network.toLowerCase()}/token_price/${addressString}`;
         console.log(url);
         (0, index_1.log_debug)(`[fetchPriceFromGeckoTerminal] Requesting prices for ${addresses.length} tokens`);
-        let retryCount = 0;
-        while (retryCount <= maxRetries) {
+        let attempt = 0;
+        while (attempt <= maxRetries) {
             try {
+                attempt++;
                 const response = yield axios_1.default.get(url, { timeout });
                 if (response.data && response.data.data && response.data.data.attributes && response.data.data.attributes.token_prices) {
                     const tokenPrices = response.data.data.attributes.token_prices;
@@ -57,10 +59,14 @@ function fetchPriceFromGeckoTerminal(network, addresses) {
                 break;
             }
             catch (error) {
-                retryCount++;
-                (0, index_1.log_warn)(`[fetchPriceFromGeckoTerminal] Request failed (attempt ${retryCount}/${maxRetries}): ${error instanceof Error ? error.message : String(error)}`);
-                if (retryCount <= maxRetries) {
-                    const currentRetrysleep = retrysleepMs * retryCount;
+                const status = axios_1.default.isAxiosError(error) ? (_a = error.response) === null || _a === void 0 ? void 0 : _a.status : undefined;
+                (0, index_1.log_warn)(`[fetchPriceFromGeckoTerminal] Request failed (attempt ${attempt}/${maxRetries + 1}): ${error instanceof Error ? error.message : String(error)}`);
+                if (status === 429) {
+                    (0, index_1.log_warn)(`[fetchPriceFromGeckoTerminal] Rate limited (429). Skip retries and fallback to next channel immediately.`);
+                    break;
+                }
+                if (attempt <= maxRetries) {
+                    const currentRetrysleep = retrysleepMs * attempt;
                     (0, index_1.log_debug)(`[fetchPriceFromGeckoTerminal] Retrying in ${currentRetrysleep}ms...`);
                     yield (0, index_1.sleep)(currentRetrysleep);
                 }

package/dist/token/price/get_solana_token_price.js

@@ -101,16 +101,18 @@ function get_solana_token_price_info(addresses) {
 }
 function fetchPriceFromJupiter(addresses) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const result = new Map();
         const currentTime = (0, index_1.getCurDateTime)();
         const timeout = 6000;
-        const maxRetries = 2;
-        const retrysleepMs = 500;
+        const maxRetries = 1;
+        const retrysleepMs = 1000;
         const url = (process.env.JUPITER_PRICE_API || 'https://api.jup.ag/price/v3') + `?ids=${addresses.join(',')}`;
         (0, index_1.log_debug)(`[fetchPriceFromJupiter] Requesting Jupiter API for ${addresses.length} tokens`);
-        let retryCount = 0;
-        while (retryCount <= maxRetries) {
+        let attempt = 0;
+        while (attempt <= maxRetries) {
             try {
+                attempt++;
                 const response = yield axios_1.default.get(url, {
                     headers: {
                         'x-api-key': process.env.JUPITER_API_KEY
@@ -138,10 +140,14 @@ function fetchPriceFromJupiter(addresses) {
                 break;
             }
             catch (error) {
-                retryCount++;
-                (0, index_1.log_warn)(`[fetchPriceFromJupiter] Request failed (attempt ${retryCount}/${maxRetries}): ${error instanceof Error ? error.message : String(error)}, url: ${url}`);
-                if (retryCount <= maxRetries) {
-                    const currentRetrysleep = retrysleepMs * retryCount;
+                const status = axios_1.default.isAxiosError(error) ? (_a = error.response) === null || _a === void 0 ? void 0 : _a.status : undefined;
+                (0, index_1.log_warn)(`[fetchPriceFromJupiter] Request failed (attempt ${attempt}/${maxRetries + 1}): ${error instanceof Error ? error.message : String(error)}, url: ${url}`);
+                if (status === 429) {
+                    (0, index_1.log_warn)(`[fetchPriceFromJupiter] Rate limited (429). Skip retries and fallback to next channel immediately.`);
+                    break;
+                }
+                if (attempt <= maxRetries) {
+                    const currentRetrysleep = retrysleepMs * attempt;
                     (0, index_1.log_debug)(`[fetchPriceFromJupiter] Retrying in ${currentRetrysleep}ms...`);
                     yield (0, index_1.sleep)(currentRetrysleep);
                 }

package/package.json

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

@@ -295,7 +295,9 @@ export interface PriceMessageType {
     bid: PriceType
     time: QuoteTimeInfoType         // quote 耗时数据
     slot: string                    // 询价生成的价格，所对应的slot (account, vaultA, vaultB)
+    blockNumber?: number            // 报价基于的区块号
     quote_source?: QuoteSourceType  // 触发本次询价的事件源信息
+    source?: string                 // 报价来源：rpc:v1, QuickNode:v2, YYWS:v3
 }
 
 export interface QuoteSourceType {
@@ -344,6 +346,12 @@ export interface Ladder {
     // 询价生成的价格，所对应的slot (account, vaultA, vaultB)
     slot: string
 
+    // 区块号
+    blockNumber?: string
+
+    // ��格来源: "rpc:v1" | "{provider_id}:v2" | "{provider_id}:v3"
+    source?: string
+
     // unique_orderbook_id 价格更新时间
     price_id: string
     price_time: string