@clonegod/ttd-sol-common 1.0.13 → 1.0.15

package/dist/index.d.ts

@@ -14,6 +14,7 @@ export declare enum LOCAL_EVENT_NAME {
 }
 export declare const subscribe_pool_change_by_geyser: (geyser_ws_url: string, pool_list: StandardPoolInfoType[], eventEmitter: EventEmitter) => Promise<void>;
 export declare class HeliusClient {
+    cluster: string;
     helius_mainnet: Helius;
     helius_staked: Helius;
     helius_qn: Helius;
@@ -22,5 +23,6 @@ export declare class HeliusClient {
     jito_tip_max: number;
     constructor(signers: Signer[], jito_tip_max?: number);
     send_smart_transaction(instructions: TransactionInstruction[], use_staked_endpint?: boolean): Promise<string>;
-    send_transaction_by_jito(instructions: TransactionInstruction[], tipAmount: number, region: JitoRegion): Promise<TransactionSignature>;
+    send_transaction_by_jito(instructions: TransactionInstruction[], tipAmount: number): Promise<TransactionSignature>;
 }
+export declare const get_jito_region: () => JitoRegion;

package/dist/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HeliusClient = exports.subscribe_pool_change_by_geyser = exports.LOCAL_EVENT_NAME = exports.COMMITMENT_LEVEL = exports.ONE_SOL_IN_LAMPORTS = void 0;
+exports.get_jito_region = exports.HeliusClient = exports.subscribe_pool_change_by_geyser = exports.LOCAL_EVENT_NAME = exports.COMMITMENT_LEVEL = exports.ONE_SOL_IN_LAMPORTS = void 0;
 const ws_1 = __importDefault(require("ws"));
 const dist_1 = require("@clonegod/ttd-common/dist");
 const helius_sdk_1 = require("helius-sdk");
@@ -105,13 +105,14 @@ const subscribe_pool_change_by_geyser = (geyser_ws_url, pool_list, eventEmitter)
 exports.subscribe_pool_change_by_geyser = subscribe_pool_change_by_geyser;
 class HeliusClient {
     constructor(signers, jito_tip_max = 500000) {
+        this.cluster = 'mainnet-beta';
         let helius_api_key = process.env.HELIUS_API_KEY;
         let helius_mainnet_endpoint = `https://mainnet.helius-rpc.com/?api-key=${helius_api_key}`;
         let helius_staked_endpoint = `https://staked.helius-rpc.com?api-key=${helius_api_key}`;
         let quicknode_endpoint = process.env.QUICKNODE_ENDPOINT;
-        this.helius_mainnet = new helius_sdk_1.Helius(null, null, null, helius_mainnet_endpoint);
-        this.helius_staked = new helius_sdk_1.Helius(null, null, null, helius_staked_endpoint);
-        this.helius_qn = new helius_sdk_1.Helius(null, null, null, quicknode_endpoint);
+        this.helius_mainnet = new helius_sdk_1.Helius('', this.cluster, 'helius-sdk', helius_mainnet_endpoint);
+        this.helius_staked = new helius_sdk_1.Helius('', this.cluster, 'helius-sdk', helius_staked_endpoint);
+        this.helius_qn = new helius_sdk_1.Helius('', this.cluster, 'helius-sdk', quicknode_endpoint);
         this.signers = signers;
         this.sendOptions = {
             skipPreflight: true,
@@ -123,8 +124,8 @@ class HeliusClient {
         return __awaiter(this, arguments, void 0, function* (instructions, use_staked_endpint = false) {
             (0, dist_1.log_info)(`send_smart_transaction, start`);
             let start_time = Date.now();
-            let helius_rpc = use_staked_endpint ? this.helius_staked.rpc : this.helius_mainnet.rpc;
-            let txid = yield helius_rpc.sendSmartTransaction(instructions, this.signers, [], this.sendOptions);
+            let rpc = use_staked_endpint ? this.helius_staked.rpc : this.helius_mainnet.rpc;
+            let txid = yield rpc.sendSmartTransaction(instructions, this.signers, [], this.sendOptions);
             (0, dist_1.log_info)(`send_smart_transaction, end`, {
                 txid,
                 use_staked_endpint,
@@ -133,14 +134,16 @@ class HeliusClient {
             return txid;
         });
     }
-    send_transaction_by_jito(instructions, tipAmount, region) {
+    send_transaction_by_jito(instructions, tipAmount) {
         return __awaiter(this, void 0, void 0, function* () {
             if (tipAmount > this.jito_tip_max) {
                 tipAmount = this.jito_tip_max;
+                (0, dist_1.log_warn)(`tipAmount too high!!! reset from ${tipAmount} to ${this.jito_tip_max}`);
             }
             (0, dist_1.log_info)(`send_transaction_by_jito, start`);
             let start_time = Date.now();
-            let txid = yield this.helius_qn.rpc.sendSmartTransactionWithTip(instructions, this.signers, [], tipAmount, region);
+            let rpc = this.helius_qn.rpc;
+            let txid = yield rpc.sendSmartTransactionWithTip(instructions, this.signers, [], tipAmount, (0, exports.get_jito_region)());
             (0, dist_1.log_info)(`send_transaction_by_jito, end`, {
                 txid,
                 take_time: Date.now() - start_time
@@ -150,3 +153,26 @@ class HeliusClient {
     }
 }
 exports.HeliusClient = HeliusClient;
+const get_jito_region = () => {
+    let jito_region;
+    let server_info = (0, dist_1.getServerInfo)();
+    switch (server_info.region) {
+        case 'fra':
+            jito_region = 'Frankfurt';
+            break;
+        case 'virginia':
+            jito_region = 'NY';
+            break;
+        case 'jp':
+            jito_region = 'Tokyo';
+            break;
+        default:
+            jito_region = 'Default';
+    }
+    (0, dist_1.log_debug)(`get_jito_region`, {
+        server_info,
+        jito_region
+    });
+    return jito_region;
+};
+exports.get_jito_region = get_jito_region;

package/package.json

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