@clonegod/ttd-sol-common 1.0.164 → 1.0.165

package/dist/helius_sdk_v1.4.0/RpcClient.js

@@ -519,9 +519,11 @@ class RpcClient {
             if (!signers.length) {
                 throw new Error('The transaction must have at least one signer');
             }
-            const randomTipAccount = types_1.JITO_TIP_ACCOUNTS[Math.floor(Math.random() * types_1.JITO_TIP_ACCOUNTS.length)];
-            const payerKey = feePayer ? feePayer.publicKey : signers[0].publicKey;
-            this.addTipInstruction(instructions, payerKey, randomTipAccount, tipAmount);
+            if (!solana_trade_runtime.jito_use_separate_tx) {
+                const randomTipAccount = types_1.JITO_TIP_ACCOUNTS[Math.floor(Math.random() * types_1.JITO_TIP_ACCOUNTS.length)];
+                const payerKey = feePayer ? feePayer.publicKey : signers[0].publicKey;
+                this.addTipInstruction(instructions, payerKey, randomTipAccount, tipAmount);
+            }
             return this.createSmartTransaction(solana_trade_runtime, instructions, signers, lookupTables, feePayer);
         });
     }
@@ -580,25 +582,36 @@ class RpcClient {
             let txid = (0, get_signature_1.getSignature)(transaction);
             setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                 const encoding = 'base64';
-                const serializedTransaction = transaction.serialize({ verifySignatures: false }).toString(encoding);
+                const serializedMainTx = transaction.serialize({ verifySignatures: false }).toString(encoding);
                 let jito_region = process.env.JITO_REGION || region;
                 let jitoApiUrl = `${types_1.JITO_API_URLS[jito_region]}/api/v1/bundles`;
                 const send_tx_jito_url = process.env.SEND_TX_JITO_URL || '';
                 const send_tx_jito_stratgy = process.env.SEND_TX_JITO_STRATEGY || '';
                 if (!(0, dist_1.isEmpty)(send_tx_jito_url) && send_tx_jito_stratgy === 'mul_ips') {
+                    let { jito_use_separate_tx } = solana_trade_runtime;
+                    let group_id = solana_trade_runtime.group.id;
+                    let encoded_tx = serializedMainTx;
+                    if (jito_use_separate_tx) {
+                        let serializedTipTx = (yield axios_1.default.get(`${process.env.JITO_CREATE_TIP_TX_URL}?group_id=${group_id}&blockhash=${blockhash}&encoding=${encoding}&tip_amount=${tipAmount}`)).data.data;
+                        encoded_tx = [serializedMainTx, serializedTipTx].join(',');
+                    }
                     const send_result = yield (0, dist_1.postJSON)(send_tx_jito_url, {
                         encoding,
-                        encoded_tx: serializedTransaction,
+                        encoded_tx: serializedMainTx,
                         txid,
-                        trace_id: ''
+                        trace_id: '',
+                        group_id,
+                        blockhash,
+                        tip_amount: tipAmount,
                     });
                     (0, dist_1.log_info)(`sendJitoBundle (mul_ips)`, {
                         txid,
+                        jito_use_separate_tx,
                         send_result
                     });
                     return;
                 }
-                let bundleId = yield this.sendJitoBundle([serializedTransaction], encoding, jitoApiUrl);
+                let bundleId = yield this.sendJitoBundle([serializedMainTx], encoding, jitoApiUrl);
                 (0, dist_1.log_info)(`sendJitoBundle`, {
                     txid,
                     jitoApiUrl,

package/dist/send_tx/helius_client.js

@@ -13,6 +13,7 @@ exports.HeliusClient = void 0;
 const dist_1 = require("@clonegod/ttd-common/dist");
 const helius_sdk_v1_4_0_1 = require("../helius_sdk_v1.4.0");
 const strategy_util_1 = require("./strategy_util");
+const sol_gas_cache_1 = require("./sol_gas_cache");
 class HeliusClient {
     constructor(signers) {
         this.cluster = 'mainnet-beta';
@@ -65,12 +66,13 @@ class HeliusClient {
         return __awaiter(this, arguments, void 0, function* (solana_trade_runtime, instructions, addressLookupTableAccounts = []) {
             (0, dist_1.log_info)(`send_transaction_by_jito, start`);
             let start_time = Date.now();
-            let tipAmount = solana_trade_runtime.tip_amount;
+            let { tip_amount: jito_tip_fee, priority_fee } = solana_trade_runtime;
             let jito_region = (0, strategy_util_1.get_jito_region)();
             let rpc = this.helius_mainnet.rpc;
-            let txid = yield rpc.sendSmartTransactionWithTip(solana_trade_runtime, instructions, this.signers, addressLookupTableAccounts, tipAmount, jito_region);
+            let txid = yield rpc.sendSmartTransactionWithTip(solana_trade_runtime, instructions, this.signers, addressLookupTableAccounts, jito_tip_fee, jito_region);
+            (0, sol_gas_cache_1.set_sol_gas_fee)(txid, { priority_fee, jito_tip_fee });
             (0, dist_1.log_info)(`send_transaction_by_jito, end`, {
-                tipAmount,
+                jito_tip_fee,
                 jito_region,
                 txid,
                 take_time: Date.now() - start_time

package/dist/send_tx/index.d.ts

@@ -1,3 +1,4 @@
 export * from './get_signature';
 export * from './helius_client';
 export * from './strategy_util';
+export * from './sol_gas_cache';

package/dist/send_tx/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./get_signature"), exports);
 __exportStar(require("./helius_client"), exports);
 __exportStar(require("./strategy_util"), exports);
+__exportStar(require("./sol_gas_cache"), exports);

package/dist/send_tx/sol_gas_cache.d.ts

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

package/dist/send_tx/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/send_tx/strategy_util.js

@@ -25,6 +25,7 @@ function create_solana_trade_runtime(connection, trade_runtime, pool_info) {
             cu_limit = 35000;
         }
         let cu_price = Math.ceil(priority_fee * constants_1.ONE_MILLION / cu_limit);
+        let jito_use_separate_tx = process.env.JITO_USE_SEPARATE_TIP_TX === 'true';
         (0, dist_1.log_info)(`trade_strategy & gas`, {
             trade_strategy,
             total_gas,
@@ -38,7 +39,8 @@ function create_solana_trade_runtime(connection, trade_runtime, pool_info) {
             priority_fee,
             cu_limit,
             cu_price,
-            tip_amount });
+            tip_amount,
+            jito_use_separate_tx });
         return solana_trade_runtime;
     });
 }

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-common/dist");
+const send_tx_1 = require("../send_tx");
 class TransactionResultParser {
     constructor(env_args, wallet_pubkey, event_emitter) {
         this.env_args = env_args;
@@ -41,8 +42,17 @@ class TransactionResultParser {
             }
         }
         const base_fee = 5000;
-        const total_fee = preBalances[0] - postBalances[0];
-        const priority_fee = Math.abs(total_fee - base_fee);
+        let priority_fee = 0;
+        let total_fee = 0;
+        let sol_gas_fee = (0, send_tx_1.get_sol_gas_fee)(txid);
+        if (sol_gas_fee) {
+            priority_fee = sol_gas_fee.priority_fee + sol_gas_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 = {
             base_fee,
             priority_fee,

package/package.json

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

package/types/index.d.ts

@@ -34,7 +34,10 @@ export interface GasFeeType {
     total_fee: number
 }
 
-
+export interface SolanaGasFeeType {
+    priority_fee: number
+    jito_tip_fee: number
+}
 
 export interface SolanaTradeRuntimeType extends TradeRuntimeType {
     // common connection
@@ -53,6 +56,8 @@ export interface SolanaTradeRuntimeType extends TradeRuntimeType {
     cu_limit: number
 
     tip_amount: number
+
+    jito_use_separate_tx: boolean
 }