@clonegod/ttd-sol-common 1.0.129 → 1.0.131

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

@@ -42,7 +42,7 @@ export declare class RpcClient {
     }): Promise<TransactionSignature>;
     addTipInstruction(instructions: TransactionInstruction[], feePayer: PublicKey, tipAccount: string, tipAmount: number): void;
     createSmartTransactionWithTip(solana_trade_runtime: SolanaTradeRuntimeType, instructions: TransactionInstruction[], signers: Signer[], lookupTables?: AddressLookupTableAccount[], tipAmount?: number, feePayer?: Signer): Promise<SmartTransactionContext>;
-    sendJitoBundle(serializedTransactions: string[], jitoApiUrl: string): Promise<string>;
+    sendJitoBundle(serializedTransactions: string[], encoding: string, jitoApiUrl: string): Promise<string>;
     getBundleStatuses(bundleIds: string[], jitoApiUrl: string): Promise<any>;
     sendSmartTransactionWithTip(solana_trade_runtime: SolanaTradeRuntimeType, instructions: TransactionInstruction[], signers: Signer[], lookupTables?: AddressLookupTableAccount[], tipAmount?: number, region?: JitoRegion, feePayer?: Signer, lastValidBlockHeightOffset?: number): Promise<string>;
     getNftEditions(params: DAS.GetNftEditionsRequest): Promise<DAS.GetNftEditionsResponse>;

package/dist/helius_sdk_v1.4.0/RpcClient.js

@@ -525,13 +525,18 @@ class RpcClient {
             return this.createSmartTransaction(solana_trade_runtime, instructions, signers, lookupTables, feePayer);
         });
     }
-    sendJitoBundle(serializedTransactions, jitoApiUrl) {
+    sendJitoBundle(serializedTransactions, encoding, jitoApiUrl) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield axios_1.default.post(jitoApiUrl, {
                 jsonrpc: '2.0',
                 id: 1,
                 method: 'sendBundle',
-                params: [serializedTransactions],
+                params: [
+                    serializedTransactions,
+                    {
+                        "encoding": encoding
+                    }
+                ]
             }, {
                 headers: { 'Content-Type': 'application/json' },
             });
@@ -543,6 +548,9 @@ class RpcClient {
     }
     getBundleStatuses(bundleIds, jitoApiUrl) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!bundleIds || bundleIds.length == 0 || bundleIds[0] == null) {
+                return;
+            }
             const response = yield axios_1.default.post(jitoApiUrl, {
                 jsonrpc: '2.0',
                 id: 1,
@@ -573,8 +581,15 @@ class RpcClient {
             setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                 const encoding = 'base64';
                 const serializedTransaction = transaction.serialize({ verifySignatures: false }).toString(encoding);
-                let jitoApiUrl = `${types_1.JITO_API_URLS[region]}/api/v1/bundles`;
-                const bundleId = yield this.send_tx_to_all_jito_region(serializedTransaction, encoding);
+                let jito_region = process.env.JITO_REGION || region;
+                let jitoApiUrl = `${types_1.JITO_API_URLS[jito_region]}/api/v1/bundles`;
+                const bundleId = yield this.sendJitoBundle([serializedTransaction], encoding, jitoApiUrl);
+                (0, dist_1.log_info)(`sendJitoBundle`, {
+                    txid,
+                    jitoApiUrl,
+                    encoding,
+                    bundleId
+                });
                 this.try_get_bundle_failed_result(txid, bundleId);
                 const currentBlockHeight = yield solana_trade_runtime.connection.getBlockHeight();
                 const lastValidBlockHeight = Math.min(blockhash.lastValidBlockHeight, currentBlockHeight + lastValidBlockHeightOffset);
@@ -702,11 +717,12 @@ class RpcClient {
                 });
                 const currentBlockHeight = yield solana_trade_runtime.connection.getBlockHeight();
                 const lastValidBlockHeight = Math.min(blockhash.lastValidBlockHeight, currentBlockHeight + lastValidBlockHeightOffset);
-                const timeout = 10000;
-                const interval = 5000;
+                const timeout = 70000;
+                const interval = 10000;
                 const startTime = Date.now();
                 while (Date.now() - startTime < timeout ||
                     (yield this.connection.getBlockHeight()) <= lastValidBlockHeight) {
+                    yield new Promise((resolve) => setTimeout(resolve, interval));
                     const bundleStatuses = yield this.getBundleStatuses([bundleId], jitoApiUrl);
                     (0, dist_1.log_info)(`getBundleStatuses`, {
                         txid,
@@ -723,7 +739,6 @@ class RpcClient {
                             return bundleStatuses.value[0].transactions[0];
                         }
                     }
-                    yield new Promise((resolve) => setTimeout(resolve, interval));
                 }
                 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);

package/package.json

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