@clonegod/ttd-sol-common 2.0.48 → 2.0.50

package/dist/trade/send/send_tx.d.ts

@@ -1,7 +1,7 @@
 import { Transaction, VersionedTransaction } from '@solana/web3.js';
+import { TradeContext } from '@clonegod/ttd-core/dist';
 export declare class TransactionSender {
     constructor();
-    sendTransaction(singedTransaction: Transaction | VersionedTransaction, swqos_only?: boolean): Promise<string>;
-    sendBundle(mainTx: Transaction | VersionedTransaction, tipTx: Transaction | VersionedTransaction, use_multi_ips?: boolean): Promise<string>;
+    sendTransaction(context: TradeContext, mainTx: Transaction | VersionedTransaction, swqos_only?: boolean): Promise<string>;
+    sendBundle(context: TradeContext, mainTx: Transaction | VersionedTransaction, tipTx: Transaction | VersionedTransaction, use_multi_ips?: boolean): Promise<string>;
 }
-export declare function serializeTransactionBase64(tx: Transaction | VersionedTransaction): string;

package/dist/trade/send/send_tx.js

@@ -1,23 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionSender = void 0;
-exports.serializeTransactionBase64 = serializeTransactionBase64;
 const web3_js_1 = require("@solana/web3.js");
 const helius_1 = require("./helius");
 const jito_1 = require("./jito");
 const common_1 = require("../../common");
+const sol_gas_cache_1 = require("../sol_gas_cache");
 class TransactionSender {
     constructor() {
     }
-    async sendTransaction(singedTransaction, swqos_only = true) {
-        const singedTxBase64 = serializeTransactionBase64(singedTransaction);
+    async sendTransaction(context, mainTx, swqos_only = true) {
+        const mainTxHash = (0, common_1.getSignature)(mainTx);
+        set_transaciton_gas_cost(mainTxHash, context);
+        const singedTxBase64 = serializeTransactionBase64(mainTx);
         return await (0, helius_1.sendTxWithHelius)(singedTxBase64, swqos_only);
     }
-    async sendBundle(mainTx, tipTx, use_multi_ips = false) {
+    async sendBundle(context, mainTx, tipTx, use_multi_ips = false) {
+        const mainTxHash = (0, common_1.getSignature)(mainTx);
+        set_transaciton_gas_cost(mainTxHash, context);
         const mainTxBase64 = serializeTransactionBase64(mainTx);
         const tipTxBase64 = serializeTransactionBase64(tipTx);
         if (use_multi_ips) {
-            const mainTxHash = (0, common_1.getSignature)(mainTx);
             return await (0, jito_1.sendBundleWithJitoMultiIps)(mainTxHash, mainTxBase64, tipTxBase64);
         }
         else {
@@ -36,3 +39,7 @@ function serializeTransactionBase64(tx) {
     }
     return buffer.toString('base64');
 }
+function set_transaciton_gas_cost(txid, context) {
+    const { sol_priority_fee, sol_tip_fee } = context.trade_runtime.settings.strategy;
+    (0, sol_gas_cache_1.set_sol_gas_fee)(txid, { base_fee: 5000, priority_fee: sol_priority_fee + sol_tip_fee, total_fee: 5000 + sol_priority_fee + sol_tip_fee });
+}

package/dist/trade/tx_builder.d.ts

@@ -13,6 +13,7 @@ export declare class SolTransactionBuilder {
     init(): Promise<void>;
     private handleBlockUpdateEvent;
     private getPreInstructions;
+    private createComputeUnitLimitWithJitoDontFront;
     private getPostInstructions;
     buildTransactionForSwap(context: TradeContext, swapInstructions: TransactionInstruction[]): Transaction;
     buildTransactionForTipJito(context: TradeContext): Transaction;

package/dist/trade/tx_builder.js

@@ -7,6 +7,46 @@ const common_1 = require("../common");
 const helius_1 = require("./send/helius");
 const jito_1 = require("./send/jito");
 const jito_tip_wallets_1 = require("./jito_tip_wallets");
+const jitodontfrontAccounts = [
+    'jitodontfront111111111111111111111111111111',
+    'jitodontfront111111111111111111111111111123',
+    'jitodontfront111111111111234565432123456782',
+    'jitodontfront111111111111111111111111111118',
+    'jitodontfront111111111111111111111111111183',
+    'jitodontfront11111111111111111111111111111o',
+    'jitodontfront1111111111111111111111111111of',
+    'jitodontfront111111111111111111111111111116',
+    'jitodontfront11111111111111111111111111116b',
+    'jitodontfront11111111111111111111111111111a',
+    'jitodontfront1111111111111111111111111111aJ',
+    'jitodontfront11111111111111111111111111111J',
+    'jitodontfront1111111111111111111111111111JR',
+    'jitodontfront11111111111111111111111111111U',
+    'jitodontfront1111111111111111111111111111UU',
+    'jitodontfront11111111111111111111111111111g',
+    'jitodontfront1111111111111111111111111111gt',
+    'jitodontfront11111111111111111111111111111F',
+    'jitodontfront1111111111111111111111111111Ff',
+    'jitodontfront11111111111111111111111111111v',
+    'jitodontfront1111111111111111111111111111vw',
+    'jitodontfront1111111111111111111111111111UA',
+    'jitodontfront111111111111111111111111111bcv',
+    'jitodontfront111111111111111111111111111Svm',
+    'jitodontfront111111111111111111111111111Zj2',
+    'jitodontfront111111111111111111111111111wja',
+    'jitodontfront111111111111111111111111111r3j',
+    'jitodontfront111111111111111111111111111LAG',
+    'jitodontfront111111111111111111111111111iej',
+    'jitodontfront111111111111111111111111111mxb',
+    'jitodontfront111111111111111111111111111m9D',
+    'jitodontfront111111111111111111111111111rjQ',
+    'jitodontfront1111111111111111111111111111wP',
+    'jitodontfront111111111111234565432123456RX5',
+];
+function getJitoDontFrontAccount() {
+    const randomIndex = Math.floor(Math.random() * jitodontfrontAccounts.length);
+    return new web3_js_1.PublicKey(jitodontfrontAccounts[randomIndex]);
+}
 class SolTransactionBuilder {
     constructor(appConfig) {
         this.appConfig = appConfig;
@@ -28,14 +68,25 @@ class SolTransactionBuilder {
         const cu_limit = context.pool_info.cu_limit || 600000;
         const sol_priority_fee_lamports = context.trade_runtime.settings.strategy.sol_priority_fee;
         const priorityFeeMicroLamports = Math.floor((sol_priority_fee_lamports * common_1.LAMPORTS_PER_MICRO_LAMPORTS) / cu_limit);
-        const computeBudgetInstruction = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-            units: cu_limit,
-        });
+        const computeBudgetInstruction = this.createComputeUnitLimitWithJitoDontFront(cu_limit);
         const priorityFeeInstruction = web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
             microLamports: priorityFeeMicroLamports,
         });
         return [computeBudgetInstruction, priorityFeeInstruction];
     }
+    createComputeUnitLimitWithJitoDontFront(units) {
+        const jitoDontFrontAccount = getJitoDontFrontAccount();
+        const data = Buffer.alloc(5);
+        data.writeUInt8(2, 0);
+        data.writeUInt32LE(units, 1);
+        return new web3_js_1.TransactionInstruction({
+            keys: [
+                { pubkey: jitoDontFrontAccount, isSigner: false, isWritable: false },
+            ],
+            programId: web3_js_1.ComputeBudgetProgram.programId,
+            data: data,
+        });
+    }
     getPostInstructions(context) {
         return [];
     }

package/package.json

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

package/src/trade/send/send_tx.ts

@@ -2,6 +2,8 @@ import { Transaction, VersionedTransaction } from '@solana/web3.js';
 import { sendTxWithHelius } from './helius';
 import { sendBundleWithJito, sendBundleWithJitoMultiIps } from './jito';
 import { getSignature } from '../../common';
+import { TradeContext } from '@clonegod/ttd-core/dist';
+import { set_sol_gas_fee } from '../sol_gas_cache';
 
 
 /**
@@ -17,12 +19,15 @@ export class TransactionSender {
      * - swqos_only=true, 需给 helius 发送至少5000lamports的通道使用费
      * - swqos_only=false, 需给helius 发送至少0.0002SOL的小费，会同时向jito发送交易
      * 
-     * @param singedTransaction 签名后的交易
+     * @param mainTx 签名后的交易
      * @param swqos_only true：swqos ；false: swqos + jito
      * @returns txhash
      */
-    async sendTransaction(singedTransaction: Transaction | VersionedTransaction, swqos_only:boolean=true): Promise<string> {
-        const singedTxBase64 = serializeTransactionBase64(singedTransaction)
+    async sendTransaction(context:TradeContext, mainTx: Transaction | VersionedTransaction, swqos_only:boolean=true): Promise<string> {
+        const mainTxHash = getSignature(mainTx)
+        set_transaciton_gas_cost(mainTxHash, context)
+
+        const singedTxBase64 = serializeTransactionBase64(mainTx)
         return await sendTxWithHelius(singedTxBase64, swqos_only)
     }
 
@@ -36,11 +41,14 @@ export class TransactionSender {
      * @param use_multi_ips true：多节点；false: 单节点
      * @returns bundleId
      */
-    async sendBundle(mainTx: Transaction | VersionedTransaction, tipTx: Transaction | VersionedTransaction, use_multi_ips: boolean=false): Promise<string> {
+    async sendBundle(context:TradeContext, mainTx: Transaction | VersionedTransaction, tipTx: Transaction | VersionedTransaction, use_multi_ips: boolean=false): Promise<string> {
+        const mainTxHash = getSignature(mainTx)
+        set_transaciton_gas_cost(mainTxHash, context)
+
         const mainTxBase64 = serializeTransactionBase64(mainTx)
         const tipTxBase64 = serializeTransactionBase64(tipTx)
+        
         if(use_multi_ips) {
-            const mainTxHash = getSignature(mainTx)
             return await sendBundleWithJitoMultiIps(mainTxHash, mainTxBase64, tipTxBase64)
         } else {
             return await sendBundleWithJito(mainTxBase64, tipTxBase64)
@@ -53,7 +61,7 @@ export class TransactionSender {
 /**
  * 序列化交易为 base64 字符串
  */
-export function serializeTransactionBase64(tx: Transaction | VersionedTransaction): string {
+function serializeTransactionBase64(tx: Transaction | VersionedTransaction): string {
     let buffer:Buffer
     if (tx instanceof VersionedTransaction) {
         buffer = Buffer.from(tx.serialize())
@@ -64,3 +72,11 @@ export function serializeTransactionBase64(tx: Transaction | VersionedTransactio
     }
     return buffer.toString('base64')
 }
+
+
+// 缓存交易的gas支出
+function set_transaciton_gas_cost(txid:string, context:TradeContext) {
+    const {sol_priority_fee, sol_tip_fee} = context.trade_runtime.settings.strategy
+    set_sol_gas_fee(txid, {base_fee: 5000, priority_fee: sol_priority_fee + sol_tip_fee, total_fee: 5000 + sol_priority_fee + sol_tip_fee})
+}
+

package/src/trade/tx_builder.ts

@@ -7,6 +7,61 @@ import { HELIUS_TIP_ACCOUNTS } from "./send/helius";
 import { getJitoTipAccount } from "./send/jito";
 import { JitoTipWalletManager } from "./jito_tip_wallets";
 
+/**
+ * Jito Sandwich Mitigation: jitodontfront 账户
+ * 用于防止三明治攻击，包含此账户的交易必须在 bundle 的第一个位置（索引 0）
+ * 参考: https://docs.jito.wtf/lowlatencytxnsend/#sandwich-mitigation
+ * 
+ * 重要说明：
+ * 1. 账户不需要在链上存在，但必须是有效的 pubkey
+ * 2. 账户应标记为只读（isWritable: false）以优化落地速度
+ * 3. （可选）可以使用唯一的 jitodontfront 变体用于应用程序
+ * 
+ * 可以通过环境变量 JITO_DONT_FRONT_ACCOUNT 自定义账户，否则从默认列表中随机选择
+ */
+
+const jitodontfrontAccounts = [
+    'jitodontfront111111111111111111111111111111',
+    'jitodontfront111111111111111111111111111123',
+    'jitodontfront111111111111234565432123456782',
+    'jitodontfront111111111111111111111111111118',
+    'jitodontfront111111111111111111111111111183',
+    'jitodontfront11111111111111111111111111111o',
+    'jitodontfront1111111111111111111111111111of',
+    'jitodontfront111111111111111111111111111116',
+    'jitodontfront11111111111111111111111111116b',
+    'jitodontfront11111111111111111111111111111a',
+    'jitodontfront1111111111111111111111111111aJ',
+    'jitodontfront11111111111111111111111111111J',
+    'jitodontfront1111111111111111111111111111JR',
+    'jitodontfront11111111111111111111111111111U',
+    'jitodontfront1111111111111111111111111111UU',
+    'jitodontfront11111111111111111111111111111g',
+    'jitodontfront1111111111111111111111111111gt',
+    'jitodontfront11111111111111111111111111111F',
+    'jitodontfront1111111111111111111111111111Ff',
+    'jitodontfront11111111111111111111111111111v',
+    'jitodontfront1111111111111111111111111111vw',
+    'jitodontfront1111111111111111111111111111UA',
+    'jitodontfront111111111111111111111111111bcv',
+    'jitodontfront111111111111111111111111111Svm',
+    'jitodontfront111111111111111111111111111Zj2',
+    'jitodontfront111111111111111111111111111wja',
+    'jitodontfront111111111111111111111111111r3j',
+    'jitodontfront111111111111111111111111111LAG',
+    'jitodontfront111111111111111111111111111iej',
+    'jitodontfront111111111111111111111111111mxb',
+    'jitodontfront111111111111111111111111111m9D',
+    'jitodontfront111111111111111111111111111rjQ',
+    'jitodontfront1111111111111111111111111111wP',
+    'jitodontfront111111111111234565432123456RX5',
+]
+
+function getJitoDontFrontAccount(): PublicKey {
+    const randomIndex = Math.floor(Math.random() * jitodontfrontAccounts.length);
+    return new PublicKey(jitodontfrontAccounts[randomIndex]);
+}
+
 
 export class SolTransactionBuilder {
     appConfig: SolanaTradeAppConfig
@@ -47,10 +102,8 @@ export class SolTransactionBuilder {
         const priorityFeeMicroLamports = Math.floor((sol_priority_fee_lamports * LAMPORTS_PER_MICRO_LAMPORTS) / cu_limit)
         // console.log('getPreInstructions', { cu_limit, sol_priority_fee_lamports, priorityFeeMicroLamports, })
 
-        // set compute budget instruction
-        const computeBudgetInstruction = ComputeBudgetProgram.setComputeUnitLimit({
-            units: cu_limit,
-        })
+        // set compute budget instruction with jitodontfront
+        const computeBudgetInstruction = this.createComputeUnitLimitWithJitoDontFront(cu_limit)
 
         // set priority fee instruction
         const priorityFeeInstruction = ComputeBudgetProgram.setComputeUnitPrice({
@@ -60,7 +113,37 @@ export class SolTransactionBuilder {
         return [computeBudgetInstruction, priorityFeeInstruction]
     }
 
-    
+    /**
+     * 创建带有 jitodontfront 账户的 SetComputeUnitLimit 指令
+     * 将 jitodontfront 账户直接添加到 Compute Budget 指令中，用于防止三明治攻击
+     * 参考: 
+     * - https://docs.jito.wtf/lowlatencytxnsend/#sandwich-mitigation
+     * 
+     * 重要说明：
+     * 1. 包含 jitodontfront 账户的交易必须在 bundle 的第一个位置（索引 0）
+     * 2. 账户标记为只读（isWritable: false）以优化落地速度
+     * 3. 账户不需要在链上存在，但必须是有效的 pubkey
+     * 4. （可选）可以通过环境变量 JITO_DONT_FRONT_ACCOUNT 使用唯一的变体
+     */
+    private createComputeUnitLimitWithJitoDontFront(units: number): TransactionInstruction {
+        const jitoDontFrontAccount = getJitoDontFrontAccount();
+
+        // 构造 Compute Budget SetComputeUnitLimit 指令数据
+        // 1 字节鉴别符（2 表示 SetComputeUnitLimit）+ 4 字节 units（小端序）
+        const data = Buffer.alloc(5);
+        data.writeUInt8(2, 0); // 鉴别符：2 表示 SetComputeUnitLimit
+        data.writeUInt32LE(units, 1); // 设置计算单元（小端序）
+
+        return new TransactionInstruction({
+            keys: [
+                { pubkey: jitoDontFrontAccount, isSigner: false, isWritable: false }, // jitodontfront 账户，标记为只读
+            ],
+            programId: ComputeBudgetProgram.programId, // Compute Budget 程序 ID
+            data: data,
+        });
+    }
+
+
     // post-instructions
     private getPostInstructions(context: TradeContext): TransactionInstruction[] {
         return []
@@ -87,21 +170,21 @@ export class SolTransactionBuilder {
         swapTx.lastValidBlockHeight = this.recentBlockheight + max_block_offset
         swapTx.feePayer = this.keypair.publicKey
 
-        const {sol_bundle_only, sol_tip_fee} = context.trade_runtime.settings.strategy
+        const { sol_bundle_only, sol_tip_fee } = context.trade_runtime.settings.strategy
 
         // sol_bundle_only = false, 使用 Helius Sender
         // sol_bundle_only = true, 使用 Jito Bundle - 不需要给Helius小费
-        if(!sol_bundle_only) {
+        if (!sol_bundle_only) {
             // 使用 Helius Sender:
             // 1、swqos_only: 至少 5000 lamports 小费
             //   -> transaction must send a tip of at least 5000 lamports to one of the following Helius wallets: [xxx, ...]
             // 2、swqos + jito: 至少 0.0002 SOL 小费 -> lamports = 0.0002 * LAMPORTS_PER_SOL
             //   -> Requires minimum 0.0002 SOL tip.
             let tip_lamports = sol_tip_fee
-            if(tip_lamports < 5000) {
+            if (tip_lamports < 5000) {
                 tip_lamports = 5000
             }
-            if(tip_lamports > 300000) {
+            if (tip_lamports > 300000) {
                 tip_lamports = 300000
             }
             let tip_instruction = SystemProgram.transfer({
@@ -127,19 +210,19 @@ export class SolTransactionBuilder {
         const max_block_offset = context.trade_runtime.settings.strategy.max_block_offset
 
         let tipPayer = this.jitoTipWalletManager.getNextWallet(groupId)
-        if(!tipPayer) {
+        if (!tipPayer) {
             tipPayer = this.keypair
         }
 
         let tipAccount = getJitoTipAccount()
         let tip_lamports = context.trade_runtime.settings.strategy.sol_tip_fee
-        if(tip_lamports < 5000) {
+        if (tip_lamports < 5000) {
             tip_lamports = 5000
         }
-        if(tip_lamports > 300000) {
+        if (tip_lamports > 300000) {
             tip_lamports = 300000
         }
-        
+
         const jitoTipTx = new Transaction();
         jitoTipTx.add(
             SystemProgram.transfer({