@clonegod/ttd-sol-common 1.0.84 → 1.0.85

package/dist/common/context.js

@@ -44,7 +44,7 @@ class TradeContext {
             }
             this.slippage_bps = Math.min(100, Math.max(30, this.trade_runtime.settings.slippage_bps));
             this.aToB = this.pool_info.is_reverse_token ? !this.order_msg.aToB : this.order_msg.aToB;
-            this.solana_trade_runtime = (0, send_tx_1.create_solana_trade_runtime)(this.connection, this.trade_runtime, this.pool_info);
+            this.solana_trade_runtime = yield (0, send_tx_1.create_solana_trade_runtime)(this.connection, this.trade_runtime, this.pool_info);
         });
     }
 }

package/dist/helius_geyser_ws/subscribe_pool_change_by_geyser.js

@@ -43,11 +43,20 @@ const subscribe_pool_change_by_geyser = (geyser_ws_url, pool_list, eventEmitter)
         };
         ws_client.send(JSON.stringify(request));
     }
+    function startPing(ws) {
+        setInterval(() => {
+            if (ws.readyState === ws_1.default.OPEN) {
+                ws.ping();
+                console.log('Ping helius ws server');
+            }
+        }, 30000);
+    }
     ws_client.on('open', function open() {
         (0, dist_1.log_info)(`WebSocket is open`);
         pool_list.forEach((pool) => {
             subscribe_account_change(ws_client, pool);
         });
+        startPing(ws_client);
     });
     ws_client.on('message', function incoming(data) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/helius_geyser_ws/subscribe_wallet_transaction.js

@@ -48,9 +48,18 @@ const subscribe_wallet_transaction = (geyser_ws_url, wallet_token_account_list,
         };
         ws_client.send(JSON.stringify(request));
     }
+    function startPing(ws) {
+        setInterval(() => {
+            if (ws.readyState === ws_1.default.OPEN) {
+                ws.ping();
+                console.log('Ping helius ws server');
+            }
+        }, 30000);
+    }
     ws_client.on('open', function open() {
         (0, dist_1.log_info)(`WebSocket is open`);
         subscribe_account_transaction();
+        startPing(ws_client);
     });
     ws_client.on('message', function incoming(data) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/helius_sdk_v1.4.0/RpcClient.js

@@ -574,9 +574,6 @@ class RpcClient {
             setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                 const serializedTransaction = bs58_1.default.encode(transaction.serialize());
                 let jitoApiUrl = `${types_1.JITO_API_URLS[region]}/api/v1/bundles`;
-                if (solana_trade_runtime.jito_plugin_url) {
-                    jitoApiUrl = solana_trade_runtime.jito_plugin_url;
-                }
                 this.sendJitoTransaction(serializedTransaction, `${types_1.JITO_API_URLS['Default']}/api/v1/transactions?bundleOnly=true`);
                 const bundleId = yield this.sendJitoBundle([serializedTransaction], jitoApiUrl);
                 (0, dist_1.log_info)(`sendJitoBundle finish`, {
@@ -702,9 +699,6 @@ class RpcClient {
             setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                 const serializedTransaction = bs58_1.default.encode(transaction.serialize());
                 let jitoApiUrl = `${types_1.JITO_API_URLS[region]}/api/v1/transactions?bundleOnly=true`;
-                if (solana_trade_runtime.jito_plugin_url) {
-                    jitoApiUrl = solana_trade_runtime.jito_plugin_url;
-                }
                 (0, dist_1.log_info)('sendSmartTransactionWithTipMixed, start');
                 this.sendTransaction(transaction);
                 this.sendJitoTransaction(serializedTransaction, `${types_1.JITO_API_URLS['Default']}/api/v1/transactions?bundleOnly=true`);

package/dist/send_tx/get_jito_tip_floor.d.ts

@@ -0,0 +1 @@
+export declare function get_current_jito_tip(speed: string): Promise<number>;

package/dist/send_tx/get_jito_tip_floor.js

@@ -0,0 +1,55 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get_current_jito_tip = get_current_jito_tip;
+const dist_1 = require("@clonegod/ttd-common/dist");
+const web3_js_1 = require("@solana/web3.js");
+var jito_tip_pct;
+const jito_tip_stats_url = process.env.JITO_TIP_FEE_STATS_URL || 'https://bundles.jito.wtf/api/v1/bundles/tip_floor';
+const JITO_TIP_DEFAULT = 0.00008;
+const JITO_TIP_MIN = 0.00004;
+const JITO_TIP_MAX = 0.0005;
+function get_jito_tip_floor() {
+    return __awaiter(this, void 0, void 0, function* () {
+        jito_tip_pct = (yield (yield fetch(jito_tip_stats_url)).json());
+        (0, dist_1.log_info)(`get_jito_tip_floor`, jito_tip_pct);
+    });
+}
+function refreshJitoTipsPct() {
+    setInterval(() => __awaiter(this, void 0, void 0, function* () {
+        get_jito_tip_floor();
+    }), 1 * 60 * 1000);
+}
+function get_current_jito_tip(speed) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let tip_sol = JITO_TIP_DEFAULT;
+        if (!jito_tip_pct) {
+            jito_tip_pct = yield get_jito_tip_floor();
+        }
+        if (speed === 'fast') {
+            tip_sol = jito_tip_pct['landed_tips_50th_percentile'];
+        }
+        if (speed === 'turbo') {
+            tip_sol = jito_tip_pct['landed_tips_75th_percentile'];
+        }
+        if (speed === 'ultra') {
+            tip_sol = jito_tip_pct['landed_tips_95th_percentile'];
+        }
+        if (tip_sol < JITO_TIP_MIN) {
+            tip_sol = JITO_TIP_MIN;
+        }
+        if (tip_sol > JITO_TIP_MAX) {
+            tip_sol = JITO_TIP_MAX;
+        }
+        let tip_lamports = Math.ceil((tip_sol * 1.02) * web3_js_1.LAMPORTS_PER_SOL);
+        return tip_lamports;
+    });
+}

package/dist/send_tx/strategy_util.d.ts

@@ -2,6 +2,6 @@ import { StandardPoolInfoType, TradeRuntimeType, TradeStrategyType } from "@clon
 import { JitoRegion } from "../helius_sdk_v1.4.0";
 import { Connection } from "@solana/web3.js";
 import { SolanaTradeRuntimeType } from "../../types";
-export declare function create_solana_trade_runtime(connection: Connection, trade_runtime: TradeRuntimeType, pool_info: StandardPoolInfoType): SolanaTradeRuntimeType;
-export declare function calculate_gas_fee(trade_strategy: TradeStrategyType): number;
+export declare function create_solana_trade_runtime(connection: Connection, trade_runtime: TradeRuntimeType, pool_info: StandardPoolInfoType): Promise<SolanaTradeRuntimeType>;
+export declare function calculate_gas_fee(trade_strategy: TradeStrategyType): Promise<number>;
 export declare function get_jito_region(): JitoRegion;

package/dist/send_tx/strategy_util.js

@@ -1,83 +1,96 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create_solana_trade_runtime = create_solana_trade_runtime;
 exports.calculate_gas_fee = calculate_gas_fee;
 exports.get_jito_region = get_jito_region;
 const dist_1 = require("@clonegod/ttd-common/dist");
 const constants_1 = require("../common/constants");
+const get_jito_tip_floor_1 = require("./get_jito_tip_floor");
 const DEFAULT_TIP_RATIO = 0.3;
 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 cu_price = Math.ceil(priority_fee * constants_1.ONE_MILLION / cu_limit);
-    let jito_plugin_url = '';
-    if (use_jito_plugin) {
-        jito_plugin_url = process.env.JITO_PLUGIN_URL;
-    }
-    (0, dist_1.log_info)(`trade_strategy & gas`, {
-        trade_strategy,
-        total_gas,
-        priority_fee,
-        cu_limit,
-        cu_price,
-        use_jito_plugin,
-        jito_plugin_url,
-        tip_amount
+    return __awaiter(this, void 0, void 0, function* () {
+        let trade_strategy = trade_runtime.settings.strategy;
+        let { total_gas, priority_fee, tip_amount } = yield get_priority_fee_and_tip(trade_strategy);
+        let { cu_limit } = pool_info;
+        if (isNaN(cu_limit) || cu_limit < 35000) {
+            cu_limit = 35000;
+        }
+        let cu_price = Math.ceil(priority_fee * constants_1.ONE_MILLION / cu_limit);
+        (0, dist_1.log_info)(`trade_strategy & gas`, {
+            trade_strategy,
+            total_gas,
+            priority_fee,
+            cu_limit,
+            cu_price,
+            tip_amount
+        });
+        let solana_trade_runtime = Object.assign(Object.assign({}, trade_runtime), { connection,
+            total_gas,
+            priority_fee,
+            cu_limit,
+            cu_price,
+            tip_amount });
+        return solana_trade_runtime;
     });
-    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,
-        tip_amount });
-    return solana_trade_runtime;
 }
 function get_priority_fee_and_tip(trade_strategy) {
-    let priority_fee = 0;
-    let tip_amount = 0;
-    let tip_ratio = trade_strategy.tip_ratio || DEFAULT_TIP_RATIO;
-    let total_gas = calculate_gas_fee(trade_strategy);
-    if (trade_strategy.broadcast_type === 'rpc') {
-        priority_fee = total_gas;
-        tip_amount = 0;
-    }
-    else if (trade_strategy.broadcast_type === 'jito') {
-        priority_fee = 0;
-        tip_amount = total_gas;
-    }
-    else if (trade_strategy.broadcast_type === 'mixed') {
-        if (tip_ratio < 0 || tip_ratio > 1) {
-            tip_ratio = DEFAULT_TIP_RATIO;
+    return __awaiter(this, void 0, void 0, function* () {
+        let priority_fee = 0;
+        let tip_amount = 0;
+        let tip_ratio = trade_strategy.tip_ratio || DEFAULT_TIP_RATIO;
+        let total_gas = yield calculate_gas_fee(trade_strategy);
+        if (trade_strategy.broadcast_type === 'rpc') {
+            priority_fee = total_gas;
+            tip_amount = 0;
         }
-        tip_amount = Math.ceil(total_gas * tip_ratio);
-        priority_fee = total_gas - tip_amount;
-    }
-    return {
-        total_gas,
-        priority_fee,
-        tip_amount
-    };
+        else if (trade_strategy.broadcast_type === 'jito') {
+            priority_fee = 0;
+            tip_amount = total_gas;
+        }
+        else if (trade_strategy.broadcast_type === 'mixed') {
+            if (tip_ratio < 0 || tip_ratio > 1) {
+                tip_ratio = DEFAULT_TIP_RATIO;
+            }
+            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;
-    switch (fee_mode) {
-        case "exact":
-            gas_fee = get_excat_fee_by_speed(speed, fee_exact);
-            break;
-        case "max_cap":
-            gas_fee = get_dynamic_fee_by_speed(speed, 50000, fee_max_cap);
-            break;
-        default:
-            throw new Error(`Not support fee_mode: ${fee_mode}`);
-    }
-    return gas_fee;
+    return __awaiter(this, void 0, void 0, function* () {
+        let { speed, fee_mode, fee_exact, fee_max_cap, broadcast_type } = trade_strategy;
+        let gas_fee = 1000;
+        switch (fee_mode) {
+            case "exact":
+                gas_fee = get_excat_fee_by_speed(speed, fee_exact);
+                break;
+            case "max_cap":
+                if (broadcast_type === 'jito') {
+                    gas_fee = yield (0, get_jito_tip_floor_1.get_current_jito_tip)(speed);
+                }
+                else {
+                    gas_fee = get_dynamic_fee_by_speed(speed, 50000, fee_max_cap);
+                }
+                break;
+            default:
+                throw new Error(`Not support fee_mode: ${fee_mode}`);
+        }
+        return gas_fee;
+    });
 }
 function get_excat_fee_by_speed(speed, fee_exact) {
     let factor = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-sol-common",
-    "version": "1.0.84",
+    "version": "1.0.85",
     "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.159",
+        "@clonegod/ttd-common": "^1.0.160",
         "@irys/sdk": "^0.2.10",
         "@metaplex-foundation/mpl-token-metadata": "^2.5.2",
         "@solana/web3.js": "1.91.6",

package/types/index.d.ts

@@ -52,8 +52,6 @@ export interface SolanaTradeRuntimeType extends TradeRuntimeType {
     // Compute Budget: SetComputeUnitLimit
     cu_limit: number
 
-    jito_plugin_url: string
-
     tip_amount: number
 }