@clonegod/ttd-sol-common 2.0.42 → 2.0.43

package/dist/trade/tx_builder.js

@@ -48,19 +48,22 @@ class SolTransactionBuilder {
         swapTx.recentBlockhash = this.recentBlockhash;
         swapTx.lastValidBlockHeight = this.recentBlockheight + max_block_offset;
         swapTx.feePayer = this.keypair.publicKey;
-        let tip_lamports = context.trade_runtime.settings.strategy.sol_tip_fee;
-        if (tip_lamports < 5000) {
-            tip_lamports = 5000;
-        }
-        if (tip_lamports > 300000) {
-            tip_lamports = 300000;
+        const { sol_bundle_only, sol_tip_fee } = context.trade_runtime.settings.strategy;
+        if (!sol_bundle_only) {
+            let tip_lamports = sol_tip_fee;
+            if (tip_lamports < 5000) {
+                tip_lamports = 5000;
+            }
+            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);
         }
-        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;
     }

package/package.json

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

package/src/trade/tx_builder.ts

@@ -87,24 +87,30 @@ export class SolTransactionBuilder {
         swapTx.lastValidBlockHeight = this.recentBlockheight + max_block_offset
         swapTx.feePayer = this.keypair.publicKey
 
-        // 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
-        }
-        if(tip_lamports > 300000) {
-            tip_lamports = 300000
+        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) {
+            // 使用 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) {
+                tip_lamports = 5000
+            }
+            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)
         }
-        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)
 

package/src/types/index.ts

@@ -58,6 +58,7 @@ export interface SolanaPoolAccountUpdateEventData {
     pool_name: string
     data: {
         slot: number
+        // tx_index: number
         tx_hash: string
         pool_account: string
         pool_account_data: string