tx-indexer 0.1.0 → 0.2.0

package/dist/index.js

@@ -1226,31 +1226,68 @@ function createIndexer(options) {
     },
     async getTransactions(walletAddress, options2 = {}) {
       const { limit = 10, before, until, filterSpam = true, spamConfig } = options2;
-      const signatures = await fetchWalletSignatures(client.rpc, walletAddress, {
-        limit,
-        before,
-        until
-      });
-      if (signatures.length === 0) {
-        return [];
+      if (!filterSpam) {
+        const signatures = await fetchWalletSignatures(client.rpc, walletAddress, {
+          limit,
+          before,
+          until
+        });
+        if (signatures.length === 0) {
+          return [];
+        }
+        const signatureObjects = signatures.map(
+          (sig) => parseSignature(sig.signature)
+        );
+        const transactions = await fetchTransactionsBatch(
+          client.rpc,
+          signatureObjects
+        );
+        const classified = transactions.map((tx) => {
+          tx.protocol = detectProtocol(tx.programIds);
+          const legs = transactionToLegs(tx, walletAddress);
+          const classification = classifyTransaction(legs, walletAddress, tx);
+          return { tx, classification, legs };
+        });
+        return classified;
       }
-      const signatureObjects = signatures.map(
-        (sig) => parseSignature(sig.signature)
-      );
-      const transactions = await fetchTransactionsBatch(
-        client.rpc,
-        signatureObjects
-      );
-      const classified = transactions.map((tx) => {
-        tx.protocol = detectProtocol(tx.programIds);
-        const legs = transactionToLegs(tx, walletAddress);
-        const classification = classifyTransaction(legs, walletAddress, tx);
-        return { tx, classification, legs };
-      });
-      if (filterSpam) {
-        return filterSpamTransactions(classified, spamConfig);
+      const accumulated = [];
+      let currentBefore = before;
+      const MAX_ITERATIONS = 10;
+      let iteration = 0;
+      while (accumulated.length < limit && iteration < MAX_ITERATIONS) {
+        iteration++;
+        const batchSize = iteration === 1 ? limit : limit * 2;
+        const signatures = await fetchWalletSignatures(client.rpc, walletAddress, {
+          limit: batchSize,
+          before: currentBefore,
+          until
+        });
+        if (signatures.length === 0) {
+          break;
+        }
+        const signatureObjects = signatures.map(
+          (sig) => parseSignature(sig.signature)
+        );
+        const transactions = await fetchTransactionsBatch(
+          client.rpc,
+          signatureObjects
+        );
+        const classified = transactions.map((tx) => {
+          tx.protocol = detectProtocol(tx.programIds);
+          const legs = transactionToLegs(tx, walletAddress);
+          const classification = classifyTransaction(legs, walletAddress, tx);
+          return { tx, classification, legs };
+        });
+        const nonSpam = filterSpamTransactions(classified, spamConfig);
+        accumulated.push(...nonSpam);
+        const lastSignature = signatures[signatures.length - 1];
+        if (lastSignature) {
+          currentBefore = parseSignature(lastSignature.signature);
+        } else {
+          break;
+        }
       }
-      return classified;
+      return accumulated.slice(0, limit);
     },
     async getTransaction(signature2, walletAddress) {
       const tx = await fetchTransaction(client.rpc, signature2);