@tapforce/pod-bridge-sdk 1.1.4 → 1.1.6

package/dist/clients/tracker/client.d.ts

@@ -37,7 +37,6 @@ export declare class PodBridgeTrackerClient {
     /**
      * Batch check claim status for multiple deposits
      * @param deposits Array of deposits to check
-     * @param fromBlock Starting block to query claims from
      */
     private updateClaimStatus;
     /**

package/dist/clients/tracker/client.js

@@ -66,7 +66,8 @@ class PodBridgeTrackerClient {
                         to: parsed.args.to,
                         token: parsed.args.token,
                         amount: parsed.args.amount.toString(),
-                        isClaimed: false
+                        isClaimed: false,
+                        isClaimable: false
                     });
                 }
             }
@@ -86,7 +87,8 @@ class PodBridgeTrackerClient {
                         to: parsed.args.to,
                         token: ethers_1.ethers.ZeroAddress, // Native token
                         amount: parsed.args.amount.toString(),
-                        isClaimed: false
+                        isClaimed: false,
+                        isClaimable: false
                     });
                 }
             }
@@ -142,7 +144,8 @@ class PodBridgeTrackerClient {
                         to: parsed.args.to,
                         token: parsed.args.token,
                         amount: parsed.args.amount.toString(),
-                        isClaimed: false
+                        isClaimed: false,
+                        isClaimable: false
                     });
                 }
             }
@@ -162,7 +165,8 @@ class PodBridgeTrackerClient {
                         to: parsed.args.to,
                         token: ethers_1.ethers.ZeroAddress,
                         amount: parsed.args.amount.toString(),
-                        isClaimed: false
+                        isClaimed: false,
+                        isClaimable: false
                     });
                 }
             }
@@ -224,41 +228,41 @@ class PodBridgeTrackerClient {
     /**
      * Batch check claim status for multiple deposits
      * @param deposits Array of deposits to check
-     * @param fromBlock Starting block to query claims from
      */
-    async updateClaimStatus(deposits, fromBlock) {
-        var _a;
+    async updateClaimStatus(deposits) {
         if (deposits.length === 0) {
             return;
         }
         console.log('updateClaimStatus');
         try {
-            const startBlock = (_a = fromBlock !== null && fromBlock !== void 0 ? fromBlock : this.config.pod.deploymentBlock) !== null && _a !== void 0 ? _a : 0;
-            const currentBlock = await this.podProvider.getBlockNumber();
-            const BLOCK_BATCH_SIZE = 10000;
+            // Get unique recipient addresses from deposits
+            const uniqueRecipients = [...new Set(deposits.map(d => d.to))];
+            console.log('Querying claims for recipients:', uniqueRecipients);
+            // Get claim events from destination chain (POD) filtered by recipient addresses
+            // Note: POD uses timestamps instead of traditional blocks
             const allClaimLogs = [];
             const allClaimNativeLogs = [];
-            // Get claim events from destination chain in batches
-            const claimFilter = this.podBridge.filters.Claim();
-            const claimNativeFilter = this.podBridge.filters.ClaimNative();
-            for (let start = startBlock; start <= currentBlock; start += BLOCK_BATCH_SIZE) {
-                const end = Math.min(start + BLOCK_BATCH_SIZE - 1, currentBlock);
-                console.log('updateClaimStatus', start, end);
+            // Query claims for each unique recipient
+            for (const recipient of uniqueRecipients) {
+                const claimFilter = this.podBridge.filters.Claim(null, // id - any
+                null, // claimer - any
+                recipient // to - filter by recipient
+                );
+                const claimNativeFilter = this.podBridge.filters.ClaimNative(null, // id - any
+                null, // claimer - any
+                recipient // to - filter by recipient
+                );
                 const [claimLogs, claimNativeLogs] = await Promise.all([
-                    this.podBridge.queryFilter(claimFilter, start, end),
-                    this.podBridge.queryFilter(claimNativeFilter, start, end)
+                    this.podBridge.queryFilter(claimFilter),
+                    this.podBridge.queryFilter(claimNativeFilter)
                 ]);
-                console.log('claimLogs', claimLogs);
-                console.log('claimNativeLogs', claimNativeLogs);
                 allClaimLogs.push(...claimLogs);
                 allClaimNativeLogs.push(...claimNativeLogs);
-                // Add small delay to avoid rate limiting
-                if (start + BLOCK_BATCH_SIZE <= currentBlock) {
-                    await new Promise(resolve => setTimeout(resolve, 100));
-                }
             }
             const claimLogs = allClaimLogs;
             const claimNativeLogs = allClaimNativeLogs;
+            console.log('claimLogs', claimLogs);
+            console.log('claimNativeLogs', claimNativeLogs);
             // Create a map of claimed request IDs
             const claimedMap = new Map();
             for (const log of [...claimLogs, ...claimNativeLogs]) {
@@ -274,6 +278,9 @@ class PodBridgeTrackerClient {
                     });
                 }
             }
+            // Get current block to check finalization
+            const currentBlock = await this.bridgedProvider.getBlockNumber();
+            const finalizedBlock = currentBlock - 15; // ~15 minutes on Sepolia
             // Update deposit status
             for (const deposit of deposits) {
                 const claimInfo = claimedMap.get(deposit.requestId);
@@ -283,10 +290,23 @@ class PodBridgeTrackerClient {
                     deposit.claimedAt = claimInfo.timestamp;
                     deposit.claimedBy = claimInfo.claimer;
                 }
+                // Check if deposit is claimable (finalized and not claimed)
+                deposit.isClaimable = deposit.blockNumber <= finalizedBlock && !deposit.isClaimed;
             }
         }
         catch (error) {
             console.error('Error checking claim status:', error);
+            // Fallback: Still calculate isClaimable based on finalization even if claim check fails
+            try {
+                const currentBlock = await this.bridgedProvider.getBlockNumber();
+                const finalizedBlock = currentBlock - 15;
+                for (const deposit of deposits) {
+                    deposit.isClaimable = deposit.blockNumber <= finalizedBlock && !deposit.isClaimed;
+                }
+            }
+            catch (fallbackError) {
+                console.error('Error calculating isClaimable:', fallbackError);
+            }
         }
     }
     /**

package/dist/libs/types/pod-bridge.types.d.ts

@@ -30,6 +30,7 @@ export interface BridgeRequest {
     token: string;
     amount: string;
     isClaimed: boolean;
+    isClaimable: boolean;
     claimedTxHash?: string;
     claimedAt?: number;
     claimedBy?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapforce/pod-bridge-sdk",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "SDK for interacting with Bridges between pod and other chains",
   "keywords": [
     "pod",