@clonegod/ttd-sol-common 1.0.110 → 1.0.112

package/dist/appconfig/app_config.js

@@ -26,6 +26,7 @@ class AppConfig extends events_1.EventEmitter {
         this.env_args = new env_args_1.EnvArgs();
         let { chain_id, app_name } = this.env_args;
         this.app_full_name = app_name;
+        global.appConfig = this;
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/quote/log_quote_price.js

@@ -22,9 +22,9 @@ function log_quote_price(event_source, price_message, tx_hash) {
             time.price_time - time.stream_time,
             time.price_time - time.block_time,
         ];
-        setTimeout(() => {
+        if (event_source || tx_hash) {
             console.log(`> [${event_source}] - ${tx_hash}`);
-            console.log(price_time_str, ' - ', unique_orderbook_id, ' - ', String(price_id).padEnd(32), ' - ', pool_name.padEnd(12), ' - ', pair.padEnd(12), ' - ', String(quote_amount_usd).padEnd(4), ' - ', String(ask.price).padEnd(8), ' - ', String(bid.price).padEnd(8), ' - ', `${times.join(',')} ms`, '\n');
-        }, 0);
+        }
+        console.log(price_time_str, ' - ', unique_orderbook_id, ' - ', String(price_id).padEnd(32), ' - ', pool_name.padEnd(12), ' - ', pair.padEnd(12), ' - ', String(quote_amount_usd).padEnd(4), ' - ', String(ask.price).padEnd(8), ' - ', String(bid.price).padEnd(8), ' - ', `${times.join(',')} ms`, '\n');
     });
 }

package/dist/send_tx/get_jito_tip_floor.d.ts

@@ -1,2 +1 @@
 export declare function get_latest_jito_tip(speed: string, fee_max_cap: number): Promise<number>;
-export declare const subscribe_jito_tips: () => Promise<void>;

package/dist/send_tx/get_jito_tip_floor.js

@@ -8,25 +8,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.subscribe_jito_tips = void 0;
 exports.get_latest_jito_tip = get_latest_jito_tip;
 const dist_1 = require("@clonegod/ttd-common/dist");
 const web3_js_1 = require("@solana/web3.js");
-const ws_1 = __importDefault(require("ws"));
-var jito_tip_floor;
 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.00018;
 const JITO_TIP_MIN = 0.00008;
 const JITO_TIP_MAX = 0.001;
+function get_jito_tip_floor_from_cache() {
+    return __awaiter(this, void 0, void 0, function* () {
+        let tip_floor = null;
+        try {
+            let appConfig = global.appConfig;
+            let { key, value } = yield appConfig.arb_cache.loading_cache.get(dist_1.CHAIN_ID.SOLANA, 'jito', 'tip', true);
+            if (value) {
+                tip_floor = JSON.parse(value);
+            }
+        }
+        catch (err) {
+            (0, dist_1.log_error)('get_jito_tip_floor_from_cache error!', err);
+        }
+        if (tip_floor && tip_floor["landed_tips_75th_percentile"] > 0) {
+            return tip_floor;
+        }
+        return null;
+    });
+}
 function get_jito_tip_floor() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             let res = yield (yield fetch(jito_tip_stats_url)).json();
-            (0, dist_1.log_info)(`get_jito_tip_floor,res=`, res);
+            (0, dist_1.log_debug)(`get_jito_tip_floor, res=`, res);
             return res[0];
         }
         catch (err) {
@@ -37,6 +50,7 @@ function get_jito_tip_floor() {
 function get_latest_jito_tip(speed, fee_max_cap) {
     return __awaiter(this, void 0, void 0, function* () {
         let tip_sol = JITO_TIP_DEFAULT;
+        let jito_tip_floor = yield get_jito_tip_floor_from_cache();
         if (!jito_tip_floor) {
             jito_tip_floor = yield get_jito_tip_floor();
         }
@@ -69,49 +83,3 @@ function get_latest_jito_tip(speed, fee_max_cap) {
         return tip_lamports;
     });
 }
-const jito_tip_ws_url = 'ws://bundles-api-rest.jito.wtf/api/v1/bundles/tip_stream';
-const subscribe_jito_tips = () => __awaiter(void 0, void 0, void 0, function* () {
-    if (process.env.SUB_JITO_TIPS !== 'true') {
-        (0, dist_1.log_info)(`subscribe_jito_tips, process.env.SUB_JITO_TIPS=${process.env.SUB_JITO_TIPS}, skip!`);
-        return;
-    }
-    (0, dist_1.log_info)(`subscribe_jito_tips`, jito_tip_ws_url);
-    var ws_client = new ws_1.default(jito_tip_ws_url);
-    function startPing(ws) {
-        setInterval(() => {
-            if (ws.readyState === ws_1.default.OPEN) {
-                ws.ping();
-                (0, dist_1.log_debug)('Ping ws server');
-            }
-        }, 30000);
-    }
-    ws_client.on('open', function open() {
-        (0, dist_1.log_info)(`WebSocket is open`);
-        startPing(ws_client);
-    });
-    ws_client.on('message', function incoming(data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const messageStr = data.toString('utf8');
-            (0, dist_1.log_debug)('[subscribe_jito_tips] Received:', messageStr);
-            try {
-                jito_tip_floor = JSON.parse(messageStr)[0];
-            }
-            catch (e) {
-                (0, dist_1.log_error)('[subscribe_jito_tips] Failed to parse JSON:', e);
-                ws_client.close();
-            }
-        });
-    });
-    ws_client.on('error', function error(err) {
-        (0, dist_1.log_error)(`WebSocket error:`, err);
-        ws_client.close();
-    });
-    ws_client.on('close', function close() {
-        return __awaiter(this, void 0, void 0, function* () {
-            (0, dist_1.log_warn)(`Socket is closed. Reconnect will be attempted in few seconds`);
-            yield (0, dist_1.sleep)(3000);
-            (0, exports.subscribe_jito_tips)();
-        });
-    });
-});
-exports.subscribe_jito_tips = subscribe_jito_tips;

package/package.json

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