@clonegod/ttd-sol-common 1.0.77 → 1.0.79

package/dist/helius_sdk_v1.4.0/RpcClient.js

@@ -418,9 +418,6 @@ class RpcClient {
             if (solana_trade_runtime.settings.strategy.broadcast_type === 'jito') {
                 priorityFeeEstimate = 1;
             }
-            if (solana_trade_runtime.settings.strategy.broadcast_type === 'mixed') {
-                priorityFeeEstimate = Math.ceil(priorityFeeEstimate * 0.7);
-            }
             const computeBudgetIx = web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: priorityFeeEstimate,
             });

package/dist/send_tx/helius_client.js

@@ -65,7 +65,7 @@ class HeliusClient {
         return __awaiter(this, void 0, void 0, function* () {
             (0, dist_1.log_info)(`send_transaction_by_jito, start`);
             let start_time = Date.now();
-            let tipAmount = solana_trade_runtime.priority_fee;
+            let tipAmount = solana_trade_runtime.tip_amount;
             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, [], tipAmount, jito_region);
@@ -82,10 +82,10 @@ class HeliusClient {
         return __awaiter(this, void 0, void 0, function* () {
             (0, dist_1.log_info)(`send_transaction_mixed, start`);
             let start_time = Date.now();
-            let tipAmount = Math.ceil(solana_trade_runtime.priority_fee * 0.3);
+            let tipAmount = solana_trade_runtime.tip_amount;
             let jito_region = (0, strategy_util_1.get_jito_region)();
             let rpc = use_staked_endpint ? this.helius_staked.rpc : this.helius_mainnet.rpc;
-            let txid = yield rpc.sendSmartTransactionWithTip(solana_trade_runtime, instructions, this.signers, [], tipAmount, jito_region);
+            let txid = yield rpc.sendSmartTransactionWithTipMixed(solana_trade_runtime, instructions, this.signers, [], tipAmount, jito_region);
             (0, dist_1.log_info)(`send_transaction_mixed, end`, {
                 tipAmount,
                 jito_region,

package/dist/send_tx/strategy_util.js

@@ -7,11 +7,11 @@ const dist_1 = require("@clonegod/ttd-common/dist");
 const constants_1 = require("../common/constants");
 function create_solana_trade_runtime(connection, trade_runtime, pool_info) {
     let trade_strategy = trade_runtime.settings.strategy;
+    let { total_gas, priority_fee, tip_amount } = get_priority_fee_and_tip(trade_strategy);
     let { cu_limit, use_jito_plugin } = pool_info;
     if (isNaN(cu_limit) || cu_limit < 35000) {
         cu_limit = 35000;
     }
-    let priority_fee = calculate_gas_fee(trade_strategy);
     let cu_price = Math.ceil(priority_fee * constants_1.ONE_MILLION / cu_limit);
     let jito_plugin_url = '';
     if (use_jito_plugin) {
@@ -19,20 +19,50 @@ function create_solana_trade_runtime(connection, trade_runtime, pool_info) {
     }
     (0, dist_1.log_info)(`trade_strategy & gas`, {
         trade_strategy,
+        total_gas,
         priority_fee,
         cu_limit,
         cu_price,
         use_jito_plugin,
-        jito_plugin_url
+        jito_plugin_url,
+        tip_amount
     });
     let solana_trade_runtime = Object.assign(Object.assign({}, trade_runtime), { connection,
+        total_gas,
         priority_fee,
         cu_limit,
         cu_price,
         use_jito_plugin,
-        jito_plugin_url });
+        jito_plugin_url,
+        tip_amount });
     return solana_trade_runtime;
 }
+function get_priority_fee_and_tip(trade_strategy) {
+    let priority_fee = 0;
+    let tip_amount = 0;
+    let total_gas = calculate_gas_fee(trade_strategy);
+    if (trade_strategy.broadcast_type === 'rpc') {
+        priority_fee = total_gas;
+        tip_amount = 0;
+    }
+    if (trade_strategy.broadcast_type === 'jito') {
+        priority_fee = 0;
+        tip_amount = total_gas;
+    }
+    else if (trade_strategy.broadcast_type === 'mixed') {
+        let tip_ratio = trade_strategy.tip_ratio;
+        if (Number.isNaN(tip_ratio) || tip_ratio <= 0) {
+            tip_ratio = 0.3;
+        }
+        tip_amount = Math.ceil(total_gas * tip_ratio);
+        priority_fee = total_gas - tip_amount;
+    }
+    return {
+        total_gas,
+        priority_fee,
+        tip_amount
+    };
+}
 function calculate_gas_fee(trade_strategy) {
     let { speed, fee_mode, fee_exact, fee_max_cap, } = trade_strategy;
     let gas_fee = 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-sol-common",
-    "version": "1.0.77",
+    "version": "1.0.79",
     "description": "",
     "main": "dist/index.js",
     "types": "types/index.d.ts",
@@ -13,7 +13,7 @@
         "push": "npm run build && npm publish"
     },
     "dependencies": {
-        "@clonegod/ttd-common": "^1.0.158",
+        "@clonegod/ttd-common": "^1.0.159",
         "@irys/sdk": "^0.2.10",
         "@metaplex-foundation/mpl-token-metadata": "^2.5.2",
         "@solana/web3.js": "1.91.6",

package/types/index.d.ts

@@ -40,6 +40,9 @@ export interface SolanaTradeRuntimeType extends TradeRuntimeType {
     // common connection
     connection: Connection
 
+    // total pay gas for one tx
+    total_gas: number
+
     // priority fee
     priority_fee: number
 
@@ -50,6 +53,8 @@ export interface SolanaTradeRuntimeType extends TradeRuntimeType {
     cu_limit: number
 
     jito_plugin_url: string
+
+    tip_amount: number
 }