@atomiqlabs/chain-solana 12.0.7 → 12.0.9

package/dist/solana/chain/modules/SolanaEvents.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaEvents = void 0;
 const SolanaModule_1 = require("../SolanaModule");
 const web3_js_1 = require("@solana/web3.js");
+const Utils_1 = require("../../../utils/Utils");
 class SolanaEvents extends SolanaModule_1.SolanaModule {
     constructor() {
         super(...arguments);
@@ -39,6 +40,7 @@ class SolanaEvents extends SolanaModule_1.SolanaModule {
      * @param commitment
      */
     async getTransactionsForAddress(account, options, commitment) {
+        const limit = 100;
         //Try to use getPriorityFeeEstimate api of Helius
         const response = await this.connection._rpcRequest("getTransactionsForAddress", [
             account.toString(),
@@ -46,7 +48,7 @@ class SolanaEvents extends SolanaModule_1.SolanaModule {
                 ...options,
                 transactionDetails: "full",
                 sortOrder: "desc",
-                limit: 100,
+                limit,
                 commitment: commitment ?? "confirmed",
                 encoding: "jsonParsed",
                 maxSupportedTransactionVersion: 0
@@ -139,7 +141,7 @@ class SolanaEvents extends SolanaModule_1.SolanaModule {
                     }
                 };
             }),
-            paginationToken: response.result.paginationToken
+            paginationToken: response.result.data.length < limit ? null : response.result.paginationToken
         };
     }
     async _findInTxsTFA(topicKey, processor, abortSignal, startBlockheight) {
@@ -149,13 +151,13 @@ class SolanaEvents extends SolanaModule_1.SolanaModule {
             let filters = startBlockheight != null ? {
                 slot: { gte: startBlockheight }
             } : {};
-            const tfaResult = await this.getTransactionsForAddress(topicKey, {
+            const tfaResult = await (0, Utils_1.tryWithRetries)(() => this.getTransactionsForAddress(topicKey, {
                 paginationToken,
                 filters: {
                     ...filters,
                     status: "succeeded"
                 }
-            }, "confirmed");
+            }, "confirmed"), undefined, undefined, abortSignal);
             if (tfaResult == null) {
                 //Not supported
                 return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "12.0.7",
+  "version": "12.0.9",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/solana/chain/modules/SolanaEvents.ts

@@ -2,6 +2,7 @@ import {SolanaModule} from "../SolanaModule";
 import {ConfirmedSignatureInfo, ParsedTransactionWithMeta, PublicKey} from "@solana/web3.js";
 import {sign} from "tweetnacl";
 import {ProgramEvent} from "../../program/modules/SolanaProgramEvents";
+import {tryWithRetries} from "../../../utils/Utils";
 
 export class SolanaEvents extends SolanaModule {
 
@@ -54,6 +55,8 @@ export class SolanaEvents extends SolanaModule {
         data: ParsedTransactionWithMeta[],
         paginationToken?: string
     }> {
+        const limit = 100;
+
         //Try to use getPriorityFeeEstimate api of Helius
         const response = await (this.connection as any)._rpcRequest("getTransactionsForAddress", [
             account.toString(),
@@ -61,7 +64,7 @@ export class SolanaEvents extends SolanaModule {
                 ...options,
                 transactionDetails: "full",
                 sortOrder: "desc",
-                limit: 100,
+                limit,
                 commitment: commitment ?? "confirmed",
                 encoding: "jsonParsed",
                 maxSupportedTransactionVersion: 0
@@ -153,7 +156,7 @@ export class SolanaEvents extends SolanaModule {
                     }
                 }
             }),
-            paginationToken: response.result.paginationToken
+            paginationToken: response.result.data.length<limit ? null : response.result.paginationToken
         };
     }
 
@@ -169,13 +172,16 @@ export class SolanaEvents extends SolanaModule {
             let filters = startBlockheight!=null ? {
                 slot: {gte: startBlockheight}
             } : {};
-            const tfaResult = await this.getTransactionsForAddress(topicKey, {
-                paginationToken,
-                filters: {
-                    ...filters,
-                    status: "succeeded"
-                }
-            }, "confirmed");
+            const tfaResult = await tryWithRetries(
+                () => this.getTransactionsForAddress(topicKey, {
+                    paginationToken,
+                    filters: {
+                        ...filters,
+                        status: "succeeded"
+                    }
+                }, "confirmed"),
+                undefined, undefined, abortSignal
+            );
 
             if(tfaResult==null) {
                 //Not supported