@0xbow/privacy-pools-core-sdk 0.0.0-c084059 → 0.0.0-c42a71a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xbow/privacy-pools-core-sdk",
-  "version": "0.0.0-c084059",
+  "version": "0.0.0-c42a71a",
   "description": "Typescript SDK for the Privacy Pool protocol",
   "repository": "https://github.com/0xbow-io/privacy-pools-core",
   "license": "Apache-2.0",

package/src/core/account.service.ts

@@ -488,12 +488,7 @@ export class AccountService {
 
       const depositMap = new Map<Hash, DepositEvent>();
       for (const event of depositEvents) {
-        const existingEvent = depositMap.get(event.precommitment);
-
-        // If no existing event, or current event is older (earlier block), use current event
-        if (!existingEvent || event.blockNumber < existingEvent.blockNumber) {
-          depositMap.set(event.precommitment, event);
-        }
+        depositMap.set(event.precommitment, event);
       }
 
       return depositMap;
@@ -626,7 +621,12 @@ export class AccountService {
     scope: Hash,
     depositEvents: Map<Hash, DepositEvent>
   ): void {
-    for (let index = BigInt(0); index < depositEvents.size; index++) {
+    const MAX_CONSECUTIVE_MISSES = 10; // Large enough to avoid and tx failures
+
+    const foundIndices = new Set<bigint>();
+    let consecutiveMisses = 0;
+
+    for (let index = BigInt(0); ; index++) {
       // Generate nullifier, secret, and precommitment for this index
       const { nullifier, secret, precommitment } = this.createDepositSecrets(
         scope,
@@ -637,9 +637,18 @@ export class AccountService {
       const event = depositEvents.get(precommitment);
 
       if (!event) {
-        break; // No more deposits found, exit the loop
+        consecutiveMisses++;
+        if (consecutiveMisses >= MAX_CONSECUTIVE_MISSES) {
+          break;
+        }
+        continue;
       }
 
+      // Can reset counter in case if user had any tx failures for
+      // newer deposits
+      consecutiveMisses = 0;
+      foundIndices.add(index);
+
       // Create a new pool account for this deposit
       this.addPoolAccount(
         scope,
@@ -650,6 +659,8 @@ export class AccountService {
         event.blockNumber,
         event.transactionHash
       );
+
+      this.logger.debug(`Found deposit at index ${index} for scope ${scope}`);
     }
   }