@clonegod/ttd-sol-common 2.0.18 → 2.0.20

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

@@ -1,3 +1,3 @@
 import { Transaction } from "@solana/web3.js";
 export declare const HELIUS_TIP_ACCOUNTS: string[];
-export declare const sendTxWithHelius: (signedTransaction: Transaction, tip_helius: boolean) => Promise<string>;
+export declare const sendTxWithHelius: (signedTransaction: Transaction, swqos_only: boolean) => Promise<string>;

package/dist/trade/send/helius.js

@@ -17,9 +17,9 @@ exports.HELIUS_TIP_ACCOUNTS = [
     "4vieeGHPYPG2MmyPRcYjdiDmmhN3ww7hsFNap8pVN3Ey",
     "4TQLFNWK8AovT1gFvda5jfw2oJeRMKEmw7aH6MGBJ3or"
 ];
-const sendTxWithHelius = async (signedTransaction, tip_helius) => {
+const sendTxWithHelius = async (signedTransaction, swqos_only) => {
     let url = process.env.HELIUS_SEND_TX_URL || 'http://tyo-sender.helius-rpc.com/fast';
-    if (!tip_helius) {
+    if (!swqos_only) {
         url = url + "?swqos_only=true";
     }
     const response = await axios_1.default.post(url, {

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

@@ -1,6 +1,6 @@
 import { Transaction } from '@solana/web3.js';
 export declare class TransactionSender {
     constructor();
-    sendTransaction(singedTransactions: Transaction[], tip_helius: boolean): Promise<string>;
+    sendTransaction(singedTransactions: Transaction[], swqos_only: boolean): Promise<string>;
     sendBundle(signedTransactions: Transaction[]): Promise<string>;
 }

package/dist/trade/send/send_tx.js

@@ -6,9 +6,9 @@ const jito_1 = require("./jito");
 class TransactionSender {
     constructor() {
     }
-    async sendTransaction(singedTransactions, tip_helius) {
+    async sendTransaction(singedTransactions, swqos_only) {
         if (singedTransactions.length === 1) {
-            return await (0, helius_1.sendTxWithHelius)(singedTransactions[0], tip_helius);
+            return await (0, helius_1.sendTxWithHelius)(singedTransactions[0], swqos_only);
         }
         else {
             return await this.sendBundle(singedTransactions);

package/dist/trade/tx_builder.d.ts

@@ -12,7 +12,6 @@ export declare class SolTransactionBuilder {
     private handleBlockUpdateEvent;
     private getPreInstructions;
     private getPostInstructions;
-    buildTransactionForSwap(context: TradeContext, swapInstructions: TransactionInstruction[], tip_helius: boolean): Transaction;
-    private getHeliusTipInstruction;
+    buildTransactionForSwap(context: TradeContext, swapInstructions: TransactionInstruction[]): Transaction;
     buildTransactionForTipJito(context: TradeContext, tipPayer?: Keypair): Transaction;
 }

package/dist/trade/tx_builder.js

@@ -37,7 +37,7 @@ class SolTransactionBuilder {
     getPostInstructions(context) {
         return [];
     }
-    buildTransactionForSwap(context, swapInstructions, tip_helius) {
+    buildTransactionForSwap(context, swapInstructions) {
         const max_block_offset = context.trade_runtime.settings.strategy.max_block_offset;
         const swapTx = new web3_js_1.Transaction();
         const preInstructions = this.getPreInstructions(context);
@@ -46,20 +46,21 @@ class SolTransactionBuilder {
         swapTx.recentBlockhash = this.recentBlockhash;
         swapTx.lastValidBlockHeight = this.recentBlockheight + max_block_offset;
         swapTx.feePayer = this.keypair.publicKey;
-        if (tip_helius) {
-            let jitoTipInstruction = this.getHeliusTipInstruction(context);
-            swapTx.instructions.push(jitoTipInstruction);
+        let tip_lamports = context.trade_runtime.settings.strategy.sol_tip_fee;
+        if (tip_lamports < 5000) {
+            tip_lamports = 5000;
         }
-        swapTx.sign(this.keypair);
-        return swapTx;
-    }
-    getHeliusTipInstruction(context) {
-        let tip_lamports = Math.min(context.trade_runtime.settings.strategy.sol_tip_fee, 0.0002 * web3_js_1.LAMPORTS_PER_SOL);
-        return web3_js_1.SystemProgram.transfer({
+        if (tip_lamports > 300000) {
+            tip_lamports = 300000;
+        }
+        let tip_instruction = web3_js_1.SystemProgram.transfer({
             fromPubkey: this.keypair.publicKey,
             toPubkey: new web3_js_1.PublicKey(helius_1.HELIUS_TIP_ACCOUNTS[Math.floor(Math.random() * helius_1.HELIUS_TIP_ACCOUNTS.length)]),
             lamports: tip_lamports,
         });
+        swapTx.instructions.push(tip_instruction);
+        swapTx.sign(this.keypair);
+        return swapTx;
     }
     buildTransactionForTipJito(context, tipPayer = undefined) {
         const max_block_offset = context.trade_runtime.settings.strategy.max_block_offset;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sol-common",
-  "version": "2.0.18",
+  "version": "2.0.20",
   "description": "",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -13,7 +13,7 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "2.1.4",
+    "@clonegod/ttd-core": "2.1.5",
     "@solana/web3.js": "1.91.6",
     "rpc-websockets": "7.10.0",
     "axios": "^1.2.3",

package/src/trade/send/helius.ts

@@ -17,10 +17,10 @@ export const HELIUS_TIP_ACCOUNTS = [
 /**
  * Jito + SWQOS
  */
-export const sendTxWithHelius = async (signedTransaction: Transaction, tip_helius: boolean): Promise<string> => {
+export const sendTxWithHelius = async (signedTransaction: Transaction, swqos_only: boolean): Promise<string> => {
     let url = process.env.HELIUS_SEND_TX_URL || 'http://tyo-sender.helius-rpc.com/fast'
-    
-    if (!tip_helius) {
+
+    if (!swqos_only) {
         url = url + "?swqos_only=true"
     }
     const response = await axios.post<{ result: string }>(url, {

package/src/trade/send/send_tx.ts

@@ -11,9 +11,9 @@ export class TransactionSender {
     constructor() {
     }
 
-    async sendTransaction(singedTransactions: Transaction[], tip_helius:boolean): Promise<string> {
+    async sendTransaction(singedTransactions: Transaction[], swqos_only:boolean): Promise<string> {
         if(singedTransactions.length === 1) {
-            return await sendTxWithHelius(singedTransactions[0], tip_helius)
+            return await sendTxWithHelius(singedTransactions[0], swqos_only)
         } else {
             return await this.sendBundle(singedTransactions)
         }

package/src/trade/tx_builder.ts

@@ -63,7 +63,13 @@ export class SolTransactionBuilder {
     }
 
 
-    buildTransactionForSwap(context: TradeContext, swapInstructions: TransactionInstruction[], tip_helius:boolean): Transaction {
+    /**
+     * 构建 Swap 交易指令
+     * @param context 
+     * @param swapInstructions 
+     * @returns 
+     */
+    buildTransactionForSwap(context: TradeContext, swapInstructions: TransactionInstruction[]): Transaction {
         const max_block_offset = context.trade_runtime.settings.strategy.max_block_offset
         // console.log(`buildTransactionForSwap, max_block_offset: ${max_block_offset}`)
 
@@ -77,25 +83,28 @@ export class SolTransactionBuilder {
         swapTx.lastValidBlockHeight = this.recentBlockheight + max_block_offset
         swapTx.feePayer = this.keypair.publicKey
 
-        if(tip_helius) {
-            let jitoTipInstruction = this.getHeliusTipInstruction(context)
-            swapTx.instructions.push(jitoTipInstruction)
+        // 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 = context.trade_runtime.settings.strategy.sol_tip_fee
+        if(tip_lamports < 5000) {
+            tip_lamports = 5000
         }
-
-        swapTx.sign(this.keypair)
-
-        return swapTx
-    }
-
-    private getHeliusTipInstruction(context: TradeContext): TransactionInstruction {
-        // Requires minimum 0.0002 SOL tip. (Helius)
-        // transaction must send a tip of at least 5000 lamports to one of the following Helius wallets: [xxx, ...]
-        let tip_lamports = Math.min(context.trade_runtime.settings.strategy.sol_tip_fee, 0.0002 * LAMPORTS_PER_SOL)
-        return SystemProgram.transfer({
+        if(tip_lamports > 300000) {
+            tip_lamports = 300000
+        }
+        let tip_instruction = SystemProgram.transfer({
             fromPubkey: this.keypair.publicKey,
             toPubkey: new PublicKey(HELIUS_TIP_ACCOUNTS[Math.floor(Math.random() * HELIUS_TIP_ACCOUNTS.length)]),
             lamports: tip_lamports,
         })
+        swapTx.instructions.push(tip_instruction)
+
+        swapTx.sign(this.keypair)
+
+        return swapTx
     }