@clonegod/ttd-core 2.0.98 → 2.1.0

package/dist/cache/loading_cache.d.ts

@@ -59,4 +59,9 @@ export declare class LoadingCache {
             [x: string]: string;
         };
     }>;
+    push_block_info(chain_id: CHAIN_ID, block_info: string): Promise<boolean>;
+    get_block_info(chain_id: CHAIN_ID, offset: number, limit?: number): Promise<{
+        key: string;
+        blocks: string[];
+    }>;
 }

package/dist/cache/loading_cache.js

@@ -229,5 +229,27 @@ class LoadingCache {
             return data;
         });
     }
+    push_block_info(chain_id, block_info) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const key = this.get_key(chain_id, 'b', 'block');
+            yield this.redis_client.lPush(key, block_info);
+            this.redis_client.lTrim(key, 0, 149).then(res => {
+                (0, index_1.log_info)(`push_block_info, res=${res}`);
+            }).catch(err => {
+                (0, index_1.log_warn)(`push_block_info, err=${err.message}`);
+            });
+            return true;
+        });
+    }
+    get_block_info(chain_id_1, offset_1) {
+        return __awaiter(this, arguments, void 0, function* (chain_id, offset, limit = 1) {
+            const key = this.get_key(chain_id, 'b', 'block');
+            const blocks = yield this.redis_client.lRange(key, offset, offset + limit - 1);
+            return {
+                key,
+                blocks
+            };
+        });
+    }
 }
 exports.LoadingCache = LoadingCache;

package/dist/token/price/get_solana_token_price.js

@@ -18,6 +18,7 @@ const axios_1 = __importDefault(require("axios"));
 const index_1 = require("../../index");
 const gecko_terminal_1 = require("./gecko_terminal");
 const price_cache_1 = require("./price_cache");
+const defi_llama_1 = require("./defi_llama");
 function get_solana_token_price_info(addresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const result = new Map();
@@ -34,6 +35,12 @@ function get_solana_token_price_info(addresses) {
                 batchSize: 10,
                 batchDelay: 1000,
             },
+            {
+                name: 'DefiLlama',
+                fetchFn: (address_list) => (0, defi_llama_1.fetchPriceFromDefiLlama)(index_1.CHAIN_ID.SOLANA, address_list),
+                batchSize: 10,
+                batchDelay: 1000,
+            },
             {
                 name: 'GeckoTerminal',
                 fetchFn: (address_list) => (0, gecko_terminal_1.fetchPriceFromGeckoTerminal)(index_1.CHAIN_ID.SOLANA, address_list),
@@ -99,19 +106,19 @@ function fetchPriceFromJupiter(addresses) {
         const timeout = 10000;
         const maxRetries = 2;
         const retrysleepMs = 500;
-        const url = `https://api.jup.ag/price/v2?ids=${addresses.join(',')}&showExtraInfo=false`;
+        const url = `https://lite-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) {
             try {
                 const response = yield axios_1.default.get(url, { timeout });
-                if (response.data.data) {
+                if (response.data) {
                     for (const address of addresses) {
                         const key = address;
-                        if (response.data.data[key] !== undefined) {
+                        if (response.data[key] !== undefined) {
                             result.set(address, {
                                 address: address,
-                                price: response.data.data[key]['price'].toString(),
+                                price: response.data[key]['usdPrice'].toString(),
                                 symbol: '',
                                 name: '',
                                 update_time: currentTime
@@ -145,6 +152,5 @@ if (require.main === module) {
             "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN",
             "MEW1gQWJ3nEXg2qgERiKu7FAFj79PHvQVREQUzScPP5",
         ];
-        console.log(yield get_solana_token_price_info(addresses));
     }))();
 }

package/package.json

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

package/types/index.d.ts

@@ -168,6 +168,7 @@ export interface TradeStrategyType {
     fee_max_cap: number,                       // 动态GAS的上限
     tip_ratio: number                          // tip 占总gas的比例（gas=priority_fee + tip_fee）
     tip_up_ratio: number                       // tip上浮比例
+    block_offset?: number                      // Solana特定：交易在提交之后的指定slot偏移内有效
     // evm chain
     evm_gas_limit: number                      // 300000
     evm_gas_price_gwei: number                 // 1.1 Gwei
@@ -742,6 +743,11 @@ export declare class LoadingCache {
             [x: string]: string;
         };
     }>;
+    push_block_info(chain_id: CHAIN_ID, block_info: string): Promise<boolean>;
+    get_block_info(chain_id: CHAIN_ID, offset: number, limit?: number): Promise<{
+        key: string;
+        blocks: string[];
+    }>;
 }
 
 export declare class RedisCommand {