@clonegod/ttd-sol-common 2.0.46 → 2.0.48

package/dist/trade/index.d.ts

@@ -4,3 +4,4 @@ export * from '../config/SolanaTradeAppConfig';
 export * from './tx_builder';
 export * from './send';
 export * from './jito_tip_wallets';
+export * from './sol_gas_cache';

package/dist/trade/index.js

@@ -20,3 +20,4 @@ __exportStar(require("../config/SolanaTradeAppConfig"), exports);
 __exportStar(require("./tx_builder"), exports);
 __exportStar(require("./send"), exports);
 __exportStar(require("./jito_tip_wallets"), exports);
+__exportStar(require("./sol_gas_cache"), exports);

package/dist/trade/send/jito.js

@@ -85,7 +85,7 @@ const sendBundleWithJito = async (mainTxBase64, tipTxBase64) => {
         id: 1,
         method: 'sendBundle',
         params: [
-            [tipTxBase64, mainTxBase64],
+            [mainTxBase64, tipTxBase64],
             {
                 "encoding": "base64"
             }
@@ -116,7 +116,7 @@ const sendBundleWithJitoMultiIps = async (mainTxHash, mainTxBase64, tipTxBase64)
         trace_id: '',
         txid: mainTxHash,
         encoding: 'base64',
-        encoded_tx: [tipTxBase64, mainTxBase64].join(','),
+        encoded_tx: [mainTxBase64, tipTxBase64].join(','),
         max_retry: 3
     };
     Promise.all(urls.map(async (url) => {

package/dist/trade/sol_gas_cache.d.ts

@@ -0,0 +1,3 @@
+import { TradeGasFeeType } from "@clonegod/ttd-core";
+export declare const set_sol_gas_fee: (txid: string, sol_gas_fee: TradeGasFeeType) => void;
+export declare const get_sol_gas_fee: (txid: string) => TradeGasFeeType;

package/dist/trade/sol_gas_cache.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get_sol_gas_fee = exports.set_sol_gas_fee = void 0;
+var tx_gas_map = new Map();
+const set_sol_gas_fee = (txid, sol_gas_fee) => {
+    tx_gas_map.set(txid, sol_gas_fee);
+};
+exports.set_sol_gas_fee = set_sol_gas_fee;
+const get_sol_gas_fee = (txid) => {
+    if (tx_gas_map.has(txid)) {
+        return tx_gas_map.get(txid);
+    }
+    return null;
+};
+exports.get_sol_gas_fee = get_sol_gas_fee;

package/dist/trade/tx_result_parse.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse_tx_failed_error_code = exports.TransactionResultParser = void 0;
 const dist_1 = require("@clonegod/ttd-core/dist");
+const sol_gas_cache_1 = require("./sol_gas_cache");
 class TransactionResultParser {
     constructor(env_args, wallet_pubkey, event_emitter) {
         this.env_args = env_args;
@@ -43,8 +44,15 @@ class TransactionResultParser {
         const base_fee = 5000;
         let priority_fee = 0;
         let total_fee = 0;
-        total_fee = preBalances[0] - postBalances[0];
-        priority_fee = Math.abs(total_fee - base_fee);
+        let sol_gas_fee = (0, sol_gas_cache_1.get_sol_gas_fee)(txid);
+        if (sol_gas_fee) {
+            priority_fee = sol_gas_fee.priority_fee;
+            total_fee = base_fee + priority_fee;
+        }
+        else {
+            total_fee = preBalances[0] - postBalances[0];
+            priority_fee = Math.abs(total_fee - base_fee);
+        }
         let gas_fee = {
             base_fee,
             priority_fee,

package/package.json

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

package/src/trade/index.ts

@@ -3,4 +3,6 @@ export * from './tx_result_parse'
 export * from '../config/SolanaTradeAppConfig'
 export * from './tx_builder'
 export * from './send'
-export * from './jito_tip_wallets'
+export * from './jito_tip_wallets'
+export * from './sol_gas_cache'
+

package/src/trade/send/jito.ts

@@ -54,12 +54,17 @@ export const sendBundleWithJito = async (mainTxBase64: string, tipTxBase64: stri
     // 使用共享的 axios 实例，复用连接池
     const client = getHttpClient(url)
 
+    // Bundle 顺序: [mainTx, tipTx]
+    // 根据 Jito Sandwich Mitigation 规则 (https://docs.jito.wtf/lowlatencytxnsend/#sandwich-mitigation):
+    // - 如果主交易包含 jitodontfront 账户，它必须在 bundle 的第一个位置（索引 0）
+    // - 允许的模式: [tx_with_dont_front, tip]
+    // - 不允许的模式: [tip, tx_with_dont_front]
     const requestData = {
         jsonrpc: '2.0',
         id: 1,
         method: 'sendBundle',
         params: [
-            [tipTxBase64, mainTxBase64],
+            [mainTxBase64, tipTxBase64],
             {
                 "encoding": "base64"
             }
@@ -96,11 +101,13 @@ export const sendBundleWithJitoMultiIps = async (mainTxHash: string, mainTxBase6
     let ips = (process.env.JITO_SEND_BUNDLE_SERVER_IPS || '127.0.0.1').split(',')
     let urls = ips.map(ip => `http://${ip}:10001/solana/send_tx`)
 
+    // Bundle 顺序: [mainTx, tipTx]
+    // 与 sendBundleWithJito 保持一致，符合 Jito Sandwich Mitigation 规则
     const body = {
         trace_id: '',
         txid: mainTxHash,
         encoding: 'base64',    // base64
-        encoded_tx: [tipTxBase64, mainTxBase64].join(','),  // main tx
+        encoded_tx: [mainTxBase64, tipTxBase64].join(','),  // bundle: mainTx, tipTx
         max_retry: 3
     }
 

package/src/trade/sol_gas_cache.ts

@@ -0,0 +1,22 @@
+import { TradeGasFeeType } from "@clonegod/ttd-core"
+
+var tx_gas_map:Map<string, TradeGasFeeType> = new Map()
+
+/**
+ * 将发送交易的gas费用缓存到内存中，用于后续的交易结果解析
+ * 
+ * @param txid 
+ * @param sol_gas_fee
+ */
+export const set_sol_gas_fee = (txid: string, sol_gas_fee: TradeGasFeeType) => {
+    tx_gas_map.set(txid, sol_gas_fee)
+}
+
+export const get_sol_gas_fee = (txid: string) : TradeGasFeeType => {
+    if(tx_gas_map.has(txid)) {
+       return tx_gas_map.get(txid)
+    }
+
+    return null
+}
+

package/src/trade/tx_result_parse.ts

@@ -3,6 +3,7 @@ import { StandardPoolInfoType, StandardSwapDetailType, TradeGasFeeType } from '@
 import { DEX_ID, log_info, TradeErrorCodeType } from '@clonegod/ttd-core/dist';
 import { ParsedTransactionWithMeta, PublicKey, TokenBalance } from '@solana/web3.js';
 import { EventEmitter } from 'events';
+import { get_sol_gas_fee } from './sol_gas_cache';
 
 export class TransactionResultParser {
 
@@ -68,8 +69,14 @@ export class TransactionResultParser {
         let priority_fee = 0
         let total_fee = 0
 
-        total_fee = preBalances[0] - postBalances[0]
-        priority_fee = Math.abs(total_fee - base_fee)
+        let sol_gas_fee = get_sol_gas_fee(txid)
+        if(sol_gas_fee) {
+            priority_fee = sol_gas_fee.priority_fee // priority fee + jito tip fee
+            total_fee = base_fee + priority_fee
+        } else {
+            total_fee = preBalances[0] - postBalances[0]
+            priority_fee = Math.abs(total_fee - base_fee)
+        }
 
 
         let gas_fee: TradeGasFeeType = {