@clonegod/ttd-sol-common 1.0.116 → 1.0.118

package/dist/helius_sdk_v1.4.0/RpcClient.d.ts

@@ -51,5 +51,5 @@ export declare class RpcClient {
     sendSmartTransactionWithTipMixed(solana_trade_runtime: SolanaTradeRuntimeType, instructions: TransactionInstruction[], signers: Signer[], lookupTables?: AddressLookupTableAccount[], tipAmount?: number, region?: JitoRegion, feePayer?: Signer, lastValidBlockHeightOffset?: number): Promise<string>;
     sendJitoTransaction(serializedTransaction: string, jitoApiUrl: string): Promise<string>;
     get_last_blockhash_slot(connections: Connection[]): Promise<RpcResponseAndContext<BlockhashWithExpiryBlockHeight>>;
-    check_bundle_result(bundle_id: string, timeoutMs?: number): Promise<void>;
+    try_get_bundle_failed_result(txid: string, bundle_id: string, timeoutMs?: number): Promise<void>;
 }

package/dist/helius_sdk_v1.4.0/RpcClient.js

@@ -19,6 +19,7 @@ const axios_1 = __importDefault(require("axios"));
 const types_1 = require("./types");
 const get_signature_1 = require("../send_tx/get_signature");
 const dist_1 = require("@clonegod/ttd-common/dist");
+const common_1 = require("../common");
 const jito_1 = require("../jito");
 class RpcClient {
     constructor(connection, id) {
@@ -579,7 +580,7 @@ class RpcClient {
                 let jitoApiUrl = `${types_1.JITO_API_URLS[region]}/api/v1/bundles`;
                 this.sendJitoTransaction(serializedTransaction, `${types_1.JITO_API_URLS['Default']}/api/v1/transactions?bundleOnly=true`);
                 const bundleId = yield this.sendJitoBundle([serializedTransaction], jitoApiUrl);
-                this.check_bundle_result(bundleId);
+                this.try_get_bundle_failed_result(txid, bundleId);
                 (0, dist_1.log_info)(`sendJitoBundle finish`, {
                     jitoApiUrl,
                     txid,
@@ -609,7 +610,7 @@ class RpcClient {
                     }
                     yield new Promise((resolve) => setTimeout(resolve, interval));
                 }
-                let err = new Error('Bundle failed to confirm within the timeout period');
+                let err = new Error('Bundle failed to confirm within the timeout period:' + timeout + 'ms');
                 (0, dist_1.log_error)(`Bundle failed to confirm, txid=${txid}`, err);
                 throw err;
             }), 0);
@@ -712,7 +713,7 @@ class RpcClient {
                 });
                 const currentBlockHeight = yield solana_trade_runtime.connection.getBlockHeight();
                 const lastValidBlockHeight = Math.min(blockhash.lastValidBlockHeight, currentBlockHeight + lastValidBlockHeightOffset);
-                const timeout = 60000;
+                const timeout = 10000;
                 const interval = 5000;
                 const startTime = Date.now();
                 while (Date.now() - startTime < timeout ||
@@ -735,7 +736,7 @@ class RpcClient {
                     }
                     yield new Promise((resolve) => setTimeout(resolve, interval));
                 }
-                let err = new Error('Bundle failed to confirm within the timeout period');
+                let err = new Error('Bundle failed to confirm within the timeout period:' + timeout + 'ms');
                 (0, dist_1.log_error)(`Bundle failed to confirm, txid=${txid}`, err);
                 throw err;
             }), 0);
@@ -797,19 +798,49 @@ class RpcClient {
             return last_blockhash_slot;
         });
     }
-    check_bundle_result(bundle_id_1) {
-        return __awaiter(this, arguments, void 0, function* (bundle_id, timeoutMs = 10000) {
+    try_get_bundle_failed_result(txid_1, bundle_id_1) {
+        return __awaiter(this, arguments, void 0, function* (txid, bundle_id, timeoutMs = 90000) {
+            let url = `https://bundles.jito.wtf/api/v1/bundles/get_bundle_error/${bundle_id}`;
+            let check_interval = parseInt(process.env.CHECK_BUNDLE_ERROR_INTERVAL_MILLS || '7000');
             let start = Date.now();
             while (Date.now() - start < timeoutMs) {
                 try {
-                    let rs = yield fetch(`https://bundles.jito.wtf/api/v1/bundles/get_bundle_error/${bundle_id}`);
-                    let jsonObj = yield rs.json();
-                    console.log('get_bundle_error, res=', jsonObj);
+                    let err_result = yield (yield fetch(url)).json();
+                    if (err_result && err_result.length > 0) {
+                        (0, dist_1.log_warn)('get_bundle_error, res=', { url, txid, check_interval, timeoutMs, err_result });
+                        let appConfig = global.appConfig;
+                        let mock_failed_tx = {
+                            params: {
+                                result: {
+                                    signature: txid,
+                                    slot: -1,
+                                    transaction: {
+                                        transaction: {
+                                            signatures: [txid]
+                                        },
+                                        version: 0,
+                                        meta: {
+                                            err: JSON.stringify(err_result),
+                                            logMessages: [],
+                                            preBalances: [0],
+                                            postBalances: [0]
+                                        }
+                                    }
+                                }
+                            }
+                        };
+                        appConfig.emit(common_1.LOCAL_EVENT_NAME.EVENT_WALLET_TRANSACTION + '#' + txid, JSON.stringify(mock_failed_tx));
+                        break;
+                    }
+                    else {
+                        (0, dist_1.log_debug)('get_bundle_error, res=', { url, check_interval, rs: err_result });
+                    }
                 }
                 catch (err) {
                     console.error('get_bundle_error, error!', err);
+                    break;
                 }
-                yield new Promise(resolve => setTimeout(resolve, 1000));
+                yield new Promise(resolve => setTimeout(resolve, check_interval));
             }
         });
     }

package/dist/trade/handle_order_message.js

@@ -59,11 +59,9 @@ const try_lock_order_msg = (appConfig, order_msg) => __awaiter(void 0, void 0, v
 exports.try_lock_order_msg = try_lock_order_msg;
 const handle_order_message = (appConfig, trade, message) => __awaiter(void 0, void 0, void 0, function* () {
     (0, dist_1.new_line)(3);
-    setTimeout(() => {
-        console.log(`=================================================================================`);
-        console.log(`|                              NEW ORDER MESSAGE                                |`);
-        console.log(`=================================================================================`);
-    }, 0);
+    console.log(`=================================================================================`);
+    console.log(`|                              NEW ORDER MESSAGE                                |`);
+    console.log(`=================================================================================`);
     (0, dist_1.log_info)(`handle_order_message, on message: `, message);
     let order_event_message = JSON.parse(message);
     if (dist_1.LOG.debug) {

package/dist/trade/tx_result_check.js

@@ -71,11 +71,9 @@ class TransactionResultChecker {
                 else {
                     this.event_emitter.emit(dist_1.TRANSACTION_STATE_FAILED, trade_result);
                 }
-                setTimeout(() => {
-                    console.log('<----------------------------------------------------');
-                    console.dir(trade_result, { depth: 8 });
-                    console.log('---------------------------------------------------->');
-                }, 0);
+                console.log('<----------------------------------------------------');
+                console.dir(trade_result, { depth: 8 });
+                console.log('---------------------------------------------------->');
             }
             catch (err) {
                 (0, dist_1.log_error)('parse geyser stream message error!', err);
@@ -114,11 +112,11 @@ class TransactionResultChecker {
                                 this.event_emitter.emit(dist_1.TRANSACTION_STATE_FAILED, trade_result);
                             }
                         }
-                        setTimeout(() => {
+                        if (dist_1.LOG.debug) {
                             console.log('<====================================================');
                             console.dir(trade_result, { depth: 8 });
                             console.log('====================================================>');
-                        }, 0);
+                        }
                     }
                     else {
                         clearInterval(intervalId);

package/package.json

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