@clonegod/ttd-sol-common 2.0.16 → 2.0.17

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

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

package/dist/trade/send/helius.js

@@ -17,9 +17,9 @@ exports.HELIUS_JITO_TIP_ACCOUNTS = [
     "4vieeGHPYPG2MmyPRcYjdiDmmhN3ww7hsFNap8pVN3Ey",
     "4TQLFNWK8AovT1gFvda5jfw2oJeRMKEmw7aH6MGBJ3or"
 ];
-const sendTxWithHelius = async (signedTransaction, send_jito = true) => {
+const sendTxWithHelius = async (signedTransaction, tip_helius_jito) => {
     let url = 'http://tyo-sender.helius-rpc.com/fast';
-    if (!send_jito) {
+    if (!tip_helius_jito) {
         url = url + "?swqos_only=true";
     }
     const response = await axios_1.default.post(url, {
@@ -35,7 +35,6 @@ const sendTxWithHelius = async (signedTransaction, send_jito = true) => {
             }
         ]
     });
-    console.dir(response.data, { depth: null });
     return response.data.result;
 };
 exports.sendTxWithHelius = sendTxWithHelius;

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[]): Promise<string>;
+    sendTransaction(singedTransactions: Transaction[], tip_helius_jito: boolean): Promise<string>;
     sendBundle(signedTransactions: Transaction[]): Promise<string>;
 }

package/dist/trade/send/send_tx.js

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

package/dist/trade/tx_builder.js

@@ -56,7 +56,7 @@ class SolTransactionBuilder {
         return swapTx;
     }
     getHeliusJitoTipInstruction(context) {
-        let tip_lamports = Math.max(context.trade_runtime.settings.strategy.sol_tip_fee, 0.0002 * web3_js_1.LAMPORTS_PER_SOL);
+        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({
             fromPubkey: this.keypair.publicKey,
             toPubkey: new web3_js_1.PublicKey(helius_1.HELIUS_JITO_TIP_ACCOUNTS[Math.floor(Math.random() * helius_1.HELIUS_JITO_TIP_ACCOUNTS.length)]),

package/package.json

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

package/src/trade/send/helius.ts

@@ -14,9 +14,12 @@ export const HELIUS_JITO_TIP_ACCOUNTS = [
     "4TQLFNWK8AovT1gFvda5jfw2oJeRMKEmw7aH6MGBJ3or"
 ]
 
-export const sendTxWithHelius = async (signedTransaction: Transaction, send_jito:boolean=true): Promise<string> => {
+/**
+ * Jito + SWQOS
+ */
+export const sendTxWithHelius = async (signedTransaction: Transaction, tip_helius_jito:boolean): Promise<string> => {
     let url = 'http://tyo-sender.helius-rpc.com/fast'
-    if(!send_jito) {
+    if(!tip_helius_jito) {
         url = url + "?swqos_only=true"
     }
     const response = await axios.post<{ result: string }>(url, {
@@ -32,7 +35,13 @@ export const sendTxWithHelius = async (signedTransaction: Transaction, send_jito
             }
         ]
     })
-    console.dir(response.data, { depth: null })
-    
+
+    // {
+    //     jsonrpc: '2.0',
+    //     id: '1764747765426',
+    //     result: '49b7P6SQ5rEDTwGbZs3xAt1QVmx3asSh74TSzoKd9Hsi7owc4KxGadUpyHrSoQDVABUzHqjauTab4EVmf5C2VhvP'
+    // }
+    // console.dir(response.data, { depth: null })
+
     return response.data.result;
 }

package/src/trade/send/send_tx.ts

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

package/src/trade/tx_builder.ts

@@ -91,7 +91,8 @@ export class SolTransactionBuilder {
     }
 
     getHeliusJitoTipInstruction(context: TradeContext): TransactionInstruction {
-        let tip_lamports = Math.max(context.trade_runtime.settings.strategy.sol_tip_fee, 0.0002 * LAMPORTS_PER_SOL)
+        // Requires minimum 0.0002 SOL tip. (Helius)
+        let tip_lamports = Math.min(context.trade_runtime.settings.strategy.sol_tip_fee, 0.0002 * LAMPORTS_PER_SOL)
         return SystemProgram.transfer({
             fromPubkey: this.keypair.publicKey,
             toPubkey: new PublicKey(HELIUS_JITO_TIP_ACCOUNTS[Math.floor(Math.random() * HELIUS_JITO_TIP_ACCOUNTS.length)]),