@tapforce/pod-bridge-sdk 1.1.17 → 1.2.1

package/dist/clients/tracker/client.js

@@ -11,13 +11,17 @@ const pod_tracker_service_1 = require("./pod-tracker.service");
  * to provide a unified view of bridge activity across both chains.
  *
  * Bridge Architecture:
- * - Source Chain (e.g., Sepolia): BridgeDepositWithdraw contract
- *   - Deposits lock tokens
- *   - Claims use POD certificates (requires attestations)
+ * - ETH -> Pod: deposits on ETH, AUTO-CLAIM on Pod (no claim needed)
+ * - Pod -> ETH: deposits on Pod, claims on ETH with aggregated validator signatures
+ * - Only ERC20 tokens supported (wrap ETH to WETH)
  *
- * - POD Chain: BridgeMintBurn contract
- *   - Deposits burn tokens (POD has instant finality - single block)
- *   - Claims use block number verification via precompiles
+ * Source Chain (e.g., Sepolia/ETH):
+ *   - Deposits lock ERC20 tokens (ETH -> Pod direction)
+ *   - Claims release ERC20 tokens with validator signatures (Pod -> ETH direction)
+ *
+ * POD Chain:
+ *   - Auto-claim for ETH -> Pod deposits (instant finality)
+ *   - Deposits for Pod -> ETH direction
  */
 class PodBridgeTrackerClient {
     constructor(config) {
@@ -101,24 +105,34 @@ class PodBridgeTrackerClient {
             .sort((a, b) => b.deposit.timestamp - a.deposit.timestamp);
     }
     /**
-     * Check if deposits can be claimed (block finalized on source chain)
+     * Check if deposits can be claimed
+     *
+     * New architecture:
+     * - ETH -> Pod: AUTO-CLAIM on Pod, no manual claim needed (always returns false)
+     * - Pod -> ETH: Manual claim needed on ETH with aggregated signatures
+     *
      * @param deposit The bridge request to check
-     * @returns True if the deposit can be claimed
+     * @returns True if the deposit can be manually claimed (only Pod -> ETH direction)
      */
     async canBeClaimed(deposit) {
-        // For source chain deposits, check if block is finalized
+        // ETH -> Pod deposits have AUTO-CLAIM on Pod, no manual claim needed
         if (deposit.deposit.chain === pod_bridge_types_1.BridgeChain.SOURCE_CHAIN) {
-            const isFinalized = await this.sourceChainTracker.isBlockFinalized(deposit.deposit.blockNumber);
-            return isFinalized && !deposit.isClaimed;
+            // Auto-claim on Pod - nothing to claim manually
+            return false;
         }
         else {
-            // POD deposits have instant finality
+            // POD -> ETH deposits need manual claim on ETH
+            // POD has instant finality, so always claimable if not already claimed
             return !deposit.isClaimed;
         }
     }
     /**
      * Batch check claim status for multiple deposits
-     * Claims are checked on the opposite chain from where the deposit was made
+     *
+     * New architecture:
+     * - ETH -> Pod: AUTO-CLAIM on Pod (mark as claimed after finalization)
+     * - Pod -> ETH: Check claim events on Source Chain
+     *
      * @private
      */
     async updateClaimStatus(deposits) {
@@ -127,82 +141,93 @@ class PodBridgeTrackerClient {
         }
         console.log('[TrackerClient] Updating claim status for', deposits.length, 'deposits');
         try {
-            // Separate deposits by their origin chain
-            const sourceChainDeposits = deposits.filter(d => d.deposit.chain === pod_bridge_types_1.BridgeChain.SOURCE_CHAIN);
             const podDeposits = deposits.filter(d => d.deposit.chain === pod_bridge_types_1.BridgeChain.POD);
-            // Fetch claim events from both chains in parallel
-            // Source chain deposits are claimed on POD, POD deposits are claimed on Source chain
-            const [podClaimEvents, sourceChainClaimEvents] = await Promise.all([
-                sourceChainDeposits.length > 0 ? this.podTracker.getClaimEvents(sourceChainDeposits) : Promise.resolve(new Map()),
-                podDeposits.length > 0 ? this.sourceChainTracker.getClaimEvents(podDeposits) : Promise.resolve(new Map())
-            ]);
-            // Combine both claim maps
-            const claimedMap = new Map([...podClaimEvents, ...sourceChainClaimEvents]);
+            // For Pod -> ETH deposits, check claim events on Source Chain
+            const sourceChainClaimEvents = podDeposits.length > 0
+                ? await this.sourceChainTracker.getClaimEvents(podDeposits)
+                : new Map();
             // Get finalized block for source chain
             const finalizedBlock = await this.sourceChainTracker.getFinalizedBlockNumber();
             // Update deposit status
-            for (const deposit of deposits) {
-                const claimInfo = claimedMap.get(deposit.requestId);
-                if (claimInfo) {
-                    deposit.isClaimed = true;
-                    deposit.claim = {
-                        chain: claimInfo.chain,
-                        txHash: claimInfo.txHash,
-                        claimer: claimInfo.claimer,
-                        chainId: claimInfo.chainId,
-                        blockNumber: claimInfo.blockNumber,
-                        timestamp: claimInfo.timestamp
-                    };
-                }
-                // Check if deposit is claimable (finalized and not claimed)
-                // For source chain deposits, check if source chain block is finalized
-                // For POD deposits, POD has instant finality (single block)
-                if (deposit.deposit.chain === pod_bridge_types_1.BridgeChain.SOURCE_CHAIN) {
-                    deposit.isClaimable = deposit.deposit.blockNumber <= finalizedBlock && !deposit.isClaimed;
+            for (const depositData of deposits) {
+                if (depositData.deposit.chain === pod_bridge_types_1.BridgeChain.SOURCE_CHAIN) {
+                    // ETH -> Pod: AUTO-CLAIM on Pod
+                    // Mark as "claimed" (auto-claimed) once the deposit is finalized
+                    const isFinalized = depositData.deposit.blockNumber <= finalizedBlock;
+                    depositData.isClaimed = isFinalized; // Auto-claimed after finalization
+                    depositData.isClaimable = false; // No manual claim needed
+                    if (isFinalized) {
+                        // Auto-claim doesn't have a separate claim tx, so we mark it as such
+                        depositData.claim = {
+                            chain: pod_bridge_types_1.BridgeChain.POD,
+                            txHash: 'auto-claim', // No separate claim TX
+                            claimer: depositData.deposit.destination,
+                            chainId: 1293, // Pod chain ID
+                            blockNumber: 0,
+                            timestamp: depositData.deposit.timestamp
+                        };
+                    }
                 }
                 else {
+                    // Pod -> ETH: Check manual claim on Source Chain
+                    const claimInfo = sourceChainClaimEvents.get(depositData.requestId);
+                    if (claimInfo) {
+                        depositData.isClaimed = true;
+                        depositData.claim = {
+                            chain: claimInfo.chain,
+                            txHash: claimInfo.txHash,
+                            claimer: claimInfo.claimer,
+                            chainId: claimInfo.chainId,
+                            blockNumber: claimInfo.blockNumber,
+                            timestamp: claimInfo.timestamp
+                        };
+                    }
                     // POD deposits are immediately claimable (instant finality)
-                    deposit.isClaimable = !deposit.isClaimed;
+                    depositData.isClaimable = !depositData.isClaimed;
                 }
             }
         }
         catch (error) {
             console.error('[TrackerClient] Error checking claim status:', error);
-            // Fallback: Still calculate isClaimable based on finalization even if claim check fails
-            try {
-                const finalizedBlock = await this.sourceChainTracker.getFinalizedBlockNumber();
-                for (const deposit of deposits) {
-                    if (deposit.deposit.chain === pod_bridge_types_1.BridgeChain.SOURCE_CHAIN) {
-                        deposit.isClaimable = deposit.deposit.blockNumber <= finalizedBlock && !deposit.isClaimed;
-                    }
-                    else {
-                        deposit.isClaimable = !deposit.isClaimed;
-                    }
+            // Fallback: Mark Pod deposits as claimable
+            for (const deposit of deposits) {
+                if (deposit.deposit.chain === pod_bridge_types_1.BridgeChain.POD) {
+                    deposit.isClaimable = !deposit.isClaimed;
                 }
             }
-            catch (fallbackError) {
-                console.error('[TrackerClient] Error calculating isClaimable:', fallbackError);
-            }
         }
     }
     /**
      * Batch check if multiple requests have been processed on-chain
+     *
+     * New architecture:
+     * - ETH -> Pod: Auto-claimed after finalization
+     * - Pod -> ETH: Check claim events on Source Chain
+     *
      * @param deposits Array of deposits to check
      * @returns Array of boolean values
      */
     async areRequestsProcessed(deposits) {
         if (deposits.length === 0)
             return [];
-        // Group deposits by destination chain (where they would be claimed)
-        const sourceChainDeposits = deposits.filter(d => d.deposit.chain === pod_bridge_types_1.BridgeChain.SOURCE_CHAIN);
+        // Get finalized block for ETH -> Pod auto-claim check
+        const finalizedBlock = await this.sourceChainTracker.getFinalizedBlockNumber();
+        // Group deposits by origin chain
         const podDeposits = deposits.filter(d => d.deposit.chain === pod_bridge_types_1.BridgeChain.POD);
-        // Check claims on both chains
-        const [podClaims, sourceChainClaims] = await Promise.all([
-            sourceChainDeposits.length > 0 ? this.podTracker.getClaimEvents(sourceChainDeposits) : Promise.resolve(new Map()),
-            podDeposits.length > 0 ? this.sourceChainTracker.getClaimEvents(podDeposits) : Promise.resolve(new Map())
-        ]);
-        const allClaims = new Map([...podClaims, ...sourceChainClaims]);
-        return deposits.map(d => allClaims.has(d.requestId));
+        // Check claims on Source Chain for Pod -> ETH deposits
+        const sourceChainClaims = podDeposits.length > 0
+            ? await this.sourceChainTracker.getClaimEvents(podDeposits)
+            : new Map();
+        return deposits.map(d => {
+            if (d.deposit.chain === pod_bridge_types_1.BridgeChain.SOURCE_CHAIN) {
+                // ETH -> Pod: Auto-claimed once finalized
+                return d.deposit.blockNumber <= finalizedBlock;
+            }
+            else {
+                // Pod -> ETH: Check claim event on Source Chain
+                return sourceChainClaims.has(d.requestId);
+            }
+        });
     }
 }
 exports.PodBridgeTrackerClient = PodBridgeTrackerClient;

package/dist/clients/tracker/pod-tracker.service.d.ts

@@ -1,11 +1,14 @@
-import { BridgeRequest, BridgeChain, PodBridgeChainConfig } from '../../libs/types/pod-bridge.types';
+import { BridgeRequest, PodBridgeChainConfig } from '../../libs/types/pod-bridge.types';
 /**
  * PodTrackerService - Handles tracking on the POD Chain
  *
+ * New architecture:
+ * - ETH -> Pod: auto-claim on Pod (no claim tracking needed on Pod)
+ * - Pod -> ETH: deposits are made here, claimed on ETH
+ * - Only ERC20 tokens supported (no native)
+ *
  * Responsibilities:
- * - Fetch deposits made on POD
- * - Fetch claims made on POD (from Source Chain deposits)
- * - Generate certified logs for claiming on Source Chain
+ * - Fetch deposits made on POD (Pod -> ETH direction)
  *
  * Note: POD uses a single-block architecture where blocks are essentially
  * timestamps. The chain has instant finality.
@@ -32,21 +35,7 @@ export declare class PodTrackerService {
     /**
      * Private method to fetch deposits from POD
      * POD uses a single-block architecture where blocks are essentially timestamps
+     * Event: Deposit(bytes32 indexed id, address indexed from, address indexed to, address token, uint256 amount)
      */
     private getDeposits;
-    /**
-     * Get claim events that occurred ON POD
-     * These are claims of Source Chain deposits (Source Chain → POD direction)
-     *
-     * @param deposits The Source Chain deposits to check for claims
-     * @returns Map of requestId to claim information
-     */
-    getClaimEvents(deposits: BridgeRequest[]): Promise<Map<string, {
-        chain: BridgeChain;
-        txHash: string;
-        timestamp: number;
-        claimer: string;
-        chainId: number;
-        blockNumber: number;
-    }>>;
 }

package/dist/clients/tracker/pod-tracker.service.js

@@ -4,14 +4,16 @@ exports.PodTrackerService = void 0;
 const ethers_1 = require("ethers");
 const pod_bridge_types_1 = require("../../libs/types/pod-bridge.types");
 const bridge_abi_1 = require("../../libs/abi/bridge.abi");
-const provider_builder_1 = require("../../libs/pod-sdk/src/provider/provider-builder");
 /**
  * PodTrackerService - Handles tracking on the POD Chain
  *
+ * New architecture:
+ * - ETH -> Pod: auto-claim on Pod (no claim tracking needed on Pod)
+ * - Pod -> ETH: deposits are made here, claimed on ETH
+ * - Only ERC20 tokens supported (no native)
+ *
  * Responsibilities:
- * - Fetch deposits made on POD
- * - Fetch claims made on POD (from Source Chain deposits)
- * - Generate certified logs for claiming on Source Chain
+ * - Fetch deposits made on POD (Pod -> ETH direction)
  *
  * Note: POD uses a single-block architecture where blocks are essentially
  * timestamps. The chain has instant finality.
@@ -20,9 +22,9 @@ class PodTrackerService {
     constructor(config) {
         this.config = config;
         this.chainId = null;
-        this.provider = new provider_builder_1.PodProvider(config.rpcUrl);
-        this.bridge = new ethers_1.Contract(config.contractAddress, bridge_abi_1.POD_BRIDGE_ABI, this.provider);
-        this.iface = new ethers_1.Interface(bridge_abi_1.POD_BRIDGE_ABI);
+        this.provider = config.provider;
+        this.bridge = new ethers_1.Contract(config.contractAddress, bridge_abi_1.BRIDGE_ABI, this.provider);
+        this.iface = new ethers_1.Interface(bridge_abi_1.BRIDGE_ABI);
         this.initChainId();
     }
     async initChainId() {
@@ -44,6 +46,7 @@ class PodTrackerService {
      * Note: POD has a single block, so blockNumber is essentially a timestamp
      */
     async getDepositsSentBy(address) {
+        // Filter by 'from' (second indexed param): Deposit(id, from, to, token, amount)
         return this.getDeposits({
             depositEventFilter: [null, address, null]
         });
@@ -53,6 +56,7 @@ class PodTrackerService {
      * Note: POD has a single block, so blockNumber is essentially a timestamp
      */
     async getDepositsReceivedBy(address) {
+        // Filter by 'to' (third indexed param): Deposit(id, from, to, token, amount)
         return this.getDeposits({
             depositEventFilter: [null, null, address]
         });
@@ -60,23 +64,22 @@ class PodTrackerService {
     /**
      * Private method to fetch deposits from POD
      * POD uses a single-block architecture where blocks are essentially timestamps
+     * Event: Deposit(bytes32 indexed id, address indexed from, address indexed to, address token, uint256 amount)
      */
     async getDeposits(options) {
         const deposits = [];
+        // Event: Deposit(bytes32 indexed id, address indexed from, address indexed to, address token, uint256 amount)
         const depositFilter = this.bridge.filters.Deposit(...options.depositEventFilter);
-        const depositNativeFilter = this.bridge.filters.DepositNative(...options.depositEventFilter);
-        const [depositLogs, depositNativeLogs] = await Promise.all([
-            this.bridge.queryFilter(depositFilter),
-            this.bridge.queryFilter(depositNativeFilter)
-        ]);
+        const depositLogs = await this.bridge.queryFilter(depositFilter);
         // Process deposits
-        for (const log of [...depositLogs, ...depositNativeLogs]) {
+        for (const log of depositLogs) {
             const parsed = this.iface.parseLog({
                 topics: [...log.topics],
                 data: log.data
             });
             if (parsed) {
-                const isNative = log.topics[0] === ethers_1.ethers.id('DepositNative(uint256,address,address,uint256,uint256,uint256)');
+                // Get block for timestamp
+                const block = await this.provider.getBlock(log.blockNumber);
                 deposits.push({
                     requestId: parsed.args.id.toString(),
                     deposit: {
@@ -84,11 +87,11 @@ class PodTrackerService {
                         txHash: log.transactionHash,
                         depositor: parsed.args.from,
                         destination: parsed.args.to,
-                        token: isNative ? ethers_1.ethers.ZeroAddress : parsed.args.token,
+                        token: parsed.args.token,
                         amount: parsed.args.amount.toString(),
                         chainId: this.chainId,
-                        blockNumber: Number(parsed.args.blockNumber), // On POD, this is essentially a timestamp
-                        timestamp: Number(parsed.args.timestamp)
+                        blockNumber: log.blockNumber, // On POD, this is essentially a timestamp
+                        timestamp: block ? Number(block.timestamp) : 0
                     },
                     isClaimed: false,
                     isClaimable: false
@@ -97,47 +100,5 @@ class PodTrackerService {
         }
         return deposits;
     }
-    /**
-     * Get claim events that occurred ON POD
-     * These are claims of Source Chain deposits (Source Chain → POD direction)
-     *
-     * @param deposits The Source Chain deposits to check for claims
-     * @returns Map of requestId to claim information
-     */
-    async getClaimEvents(deposits) {
-        await this.ensureChainId();
-        const uniqueRecipients = [...new Set(deposits.map(d => d.deposit.destination))];
-        const allClaimLogs = [];
-        const allClaimNativeLogs = [];
-        for (const recipient of uniqueRecipients) {
-            const claimFilter = this.bridge.filters.Claim(null, null, recipient);
-            const claimNativeFilter = this.bridge.filters.ClaimNative(null, null, recipient);
-            const [claimLogs, claimNativeLogs] = await Promise.all([
-                this.bridge.queryFilter(claimFilter),
-                this.bridge.queryFilter(claimNativeFilter)
-            ]);
-            allClaimLogs.push(...claimLogs);
-            allClaimNativeLogs.push(...claimNativeLogs);
-        }
-        console.log(`[POD] Found ${allClaimLogs.length} claims, ${allClaimNativeLogs.length} native claims`);
-        const claimedMap = new Map();
-        for (const log of [...allClaimLogs, ...allClaimNativeLogs]) {
-            const parsed = this.iface.parseLog({
-                topics: [...log.topics],
-                data: log.data
-            });
-            if (parsed) {
-                claimedMap.set(parsed.args.id.toString(), {
-                    chain: pod_bridge_types_1.BridgeChain.POD,
-                    txHash: log.transactionHash,
-                    timestamp: Number(parsed.args.timestamp),
-                    claimer: parsed.args.claimer,
-                    chainId: this.chainId,
-                    blockNumber: log.blockNumber
-                });
-            }
-        }
-        return claimedMap;
-    }
 }
 exports.PodTrackerService = PodTrackerService;

package/dist/clients/tracker/source-chain-tracker.service.d.ts

@@ -1,10 +1,15 @@
 import { BridgeRequest, BridgeChain, PodBridgeChainConfig } from '../../libs/types/pod-bridge.types';
 /**
- * SourceChainTrackerService - Handles tracking on the Source Chain (e.g., Sepolia)
+ * SourceChainTrackerService - Handles tracking on the Source Chain (e.g., Sepolia/ETH)
+ *
+ * New architecture:
+ * - ETH -> Pod: deposits are made here, auto-claimed on Pod
+ * - Pod -> ETH: claims are made here with aggregated validator signatures
+ * - Only ERC20 tokens supported (no native)
  *
  * Responsibilities:
- * - Fetch deposits made on Source Chain
- * - Fetch claims made on Source Chain (from POD deposits)
+ * - Fetch deposits made on Source Chain (ETH -> Pod direction)
+ * - Fetch claims made on Source Chain (Pod -> ETH direction)
  */
 export declare class SourceChainTrackerService {
     private readonly config;
@@ -30,6 +35,9 @@ export declare class SourceChainTrackerService {
     /**
      * Get claim events that occurred ON Source Chain
      * These are claims of POD deposits (POD → Source Chain direction)
+     * Event: Claim(bytes32 indexed id, address indexed to, address token, uint256 amount)
+     *
+     * Pod Deposit.id = ETH Claim.id - used to track if deposit was claimed
      *
      * @param deposits The POD deposits to check for claims
      * @returns Map of requestId to claim information

package/dist/clients/tracker/source-chain-tracker.service.js

@@ -5,19 +5,24 @@ const ethers_1 = require("ethers");
 const pod_bridge_types_1 = require("../../libs/types/pod-bridge.types");
 const bridge_abi_1 = require("../../libs/abi/bridge.abi");
 /**
- * SourceChainTrackerService - Handles tracking on the Source Chain (e.g., Sepolia)
+ * SourceChainTrackerService - Handles tracking on the Source Chain (e.g., Sepolia/ETH)
+ *
+ * New architecture:
+ * - ETH -> Pod: deposits are made here, auto-claimed on Pod
+ * - Pod -> ETH: claims are made here with aggregated validator signatures
+ * - Only ERC20 tokens supported (no native)
  *
  * Responsibilities:
- * - Fetch deposits made on Source Chain
- * - Fetch claims made on Source Chain (from POD deposits)
+ * - Fetch deposits made on Source Chain (ETH -> Pod direction)
+ * - Fetch claims made on Source Chain (Pod -> ETH direction)
  */
 class SourceChainTrackerService {
     constructor(config) {
         this.config = config;
         this.chainId = null;
-        this.provider = new ethers_1.ethers.JsonRpcProvider(config.rpcUrl);
-        this.bridge = new ethers_1.Contract(config.contractAddress, bridge_abi_1.SOURCE_CHAIN_BRIDGE_ABI, this.provider);
-        this.iface = new ethers_1.Interface(bridge_abi_1.SOURCE_CHAIN_BRIDGE_ABI);
+        this.provider = config.provider;
+        this.bridge = new ethers_1.Contract(config.contractAddress, bridge_abi_1.BRIDGE_ABI, this.provider);
+        this.iface = new ethers_1.Interface(bridge_abi_1.BRIDGE_ABI);
         this.initChainId();
     }
     async initChainId() {
@@ -33,8 +38,9 @@ class SourceChainTrackerService {
      * Get deposits sent by an address on Source Chain
      */
     async getDepositsSentBy(address, options) {
+        // Filter by 'from' (second indexed param): Deposit(id, from, to, token, amount)
         return this.getDeposits({
-            fromBlock: options === null || options === void 0 ? void 0 : options.fromBlock,
+            fromBlock: options?.fromBlock,
             depositEventFilter: [null, address, null]
         });
     }
@@ -42,36 +48,34 @@ class SourceChainTrackerService {
      * Get deposits received by an address on Source Chain
      */
     async getDepositsReceivedBy(address, options) {
+        // Filter by 'to' (third indexed param): Deposit(id, from, to, token, amount)
         return this.getDeposits({
-            fromBlock: options === null || options === void 0 ? void 0 : options.fromBlock,
+            fromBlock: options?.fromBlock,
             depositEventFilter: [null, null, address]
         });
     }
     async getDeposits(options) {
-        var _a, _b;
-        const startBlock = (_b = (_a = options === null || options === void 0 ? void 0 : options.fromBlock) !== null && _a !== void 0 ? _a : this.config.deploymentBlock) !== null && _b !== void 0 ? _b : 0;
+        const startBlock = options?.fromBlock ?? this.config.deploymentBlock ?? 0;
         const deposits = [];
         const currentBlock = await this.provider.getBlockNumber();
         const BLOCK_BATCH_SIZE = 10000;
         for (let start = startBlock; start <= currentBlock; start += BLOCK_BATCH_SIZE) {
             const end = Math.min(start + BLOCK_BATCH_SIZE - 1, currentBlock);
+            // Event: Deposit(bytes32 indexed id, address indexed from, address indexed to, address token, uint256 amount)
             const depositFilter = this.bridge.filters.Deposit(...options.depositEventFilter);
-            const depositNativeFilter = this.bridge.filters.DepositNative(...options.depositEventFilter);
-            const [depositLogs, depositNativeLogs] = await Promise.all([
-                this.bridge.queryFilter(depositFilter, start, end),
-                this.bridge.queryFilter(depositNativeFilter, start, end)
-            ]);
+            const depositLogs = await this.bridge.queryFilter(depositFilter, start, end);
             if (start + BLOCK_BATCH_SIZE <= currentBlock) {
                 await new Promise(resolve => setTimeout(resolve, 100));
             }
             // Process deposits
-            for (const log of [...depositLogs, ...depositNativeLogs]) {
+            for (const log of depositLogs) {
                 const parsed = this.iface.parseLog({
                     topics: [...log.topics],
                     data: log.data
                 });
                 if (parsed) {
-                    const isNative = log.topics[0] === ethers_1.ethers.id('DepositNative(uint256,address,address,uint256,uint256,uint256)');
+                    // Get block for timestamp
+                    const block = await this.provider.getBlock(log.blockNumber);
                     deposits.push({
                         requestId: parsed.args.id.toString(),
                         deposit: {
@@ -79,11 +83,11 @@ class SourceChainTrackerService {
                             txHash: log.transactionHash,
                             depositor: parsed.args.from,
                             destination: parsed.args.to,
-                            token: isNative ? ethers_1.ethers.ZeroAddress : parsed.args.token,
+                            token: parsed.args.token,
                             amount: parsed.args.amount.toString(),
                             chainId: this.chainId,
-                            blockNumber: Number(parsed.args.blockNumber),
-                            timestamp: Number(parsed.args.timestamp)
+                            blockNumber: log.blockNumber,
+                            timestamp: block ? Number(block.timestamp) : 0
                         },
                         isClaimed: false,
                         isClaimable: false
@@ -96,6 +100,9 @@ class SourceChainTrackerService {
     /**
      * Get claim events that occurred ON Source Chain
      * These are claims of POD deposits (POD → Source Chain direction)
+     * Event: Claim(bytes32 indexed id, address indexed to, address token, uint256 amount)
+     *
+     * Pod Deposit.id = ETH Claim.id - used to track if deposit was claimed
      *
      * @param deposits The POD deposits to check for claims
      * @returns Map of requestId to claim information
@@ -103,30 +110,28 @@ class SourceChainTrackerService {
     async getClaimEvents(deposits) {
         const uniqueRecipients = [...new Set(deposits.map(d => d.deposit.destination))];
         const allClaimLogs = [];
-        const allClaimNativeLogs = [];
         for (const recipient of uniqueRecipients) {
-            const claimFilter = this.bridge.filters.Claim(null, null, recipient);
-            const claimNativeFilter = this.bridge.filters.ClaimNative(null, null, recipient);
-            const [claimLogs, claimNativeLogs] = await Promise.all([
-                this.bridge.queryFilter(claimFilter),
-                this.bridge.queryFilter(claimNativeFilter)
-            ]);
+            // Event: Claim(bytes32 indexed id, address indexed to, address token, uint256 amount)
+            const claimFilter = this.bridge.filters.Claim(null, recipient);
+            const claimLogs = await this.bridge.queryFilter(claimFilter);
             allClaimLogs.push(...claimLogs);
-            allClaimNativeLogs.push(...claimNativeLogs);
         }
-        console.log(`[SourceChain] Found ${allClaimLogs.length} claims, ${allClaimNativeLogs.length} native claims`);
+        console.log(`[SourceChain] Found ${allClaimLogs.length} claims`);
         const claimedMap = new Map();
-        for (const log of [...allClaimLogs, ...allClaimNativeLogs]) {
+        for (const log of allClaimLogs) {
             const parsed = this.iface.parseLog({
                 topics: [...log.topics],
                 data: log.data
             });
             if (parsed) {
+                // Get block for timestamp
+                const block = await this.provider.getBlock(log.blockNumber);
+                // Pod Deposit.id = ETH Claim.id
                 claimedMap.set(parsed.args.id.toString(), {
                     chain: pod_bridge_types_1.BridgeChain.SOURCE_CHAIN,
                     txHash: log.transactionHash,
-                    timestamp: Number(parsed.args.timestamp),
-                    claimer: parsed.args.claimer,
+                    timestamp: block ? Number(block.timestamp) : 0,
+                    claimer: parsed.args.to,
                     chainId: this.chainId,
                     blockNumber: log.blockNumber
                 });

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export { PodToSourceChainActionClient } from './clients/action/pod-to-source-chain-client';
 export { SourceChainToPodActionClient } from './clients/action/source-chain-to-pod-client';
 export { PodBridgeTrackerClient } from './clients/tracker/client';
-export { POD_BRIDGE_ABI } from './libs/abi/bridge.abi';
-export { PodBridgeConfig, BridgeRequest, BridgeRequestWithType, BridgeChain, DepositType, UnsignedTransaction, CertifiedLog, PodBridgeActionsClientConfig, PodBridgeChainConfig, } from './libs/types/pod-bridge.types';
+export { BRIDGE_ABI, POD_BRIDGE_ABI, SOURCE_CHAIN_BRIDGE_ABI, } from './libs/abi/bridge.abi';
+export { recoverSignature65B, recoverAggregatedSignatures65B, computeDepositTxHash, extractAggregatedSignatures, extractAttestationInfo, addressFromPublicKey, } from './libs/helpers/signature-recovery.helper';
+export { PodBridgeConfig, BridgeRequest, BridgeRequestWithType, BridgeChain, DepositType, UnsignedTransaction, ClaimProofData, PodBridgeActionsClientConfig, PodBridgeChainConfig, } from './libs/types/pod-bridge.types';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DepositType = exports.BridgeChain = exports.POD_BRIDGE_ABI = exports.PodBridgeTrackerClient = exports.SourceChainToPodActionClient = exports.PodToSourceChainActionClient = void 0;
+exports.DepositType = exports.BridgeChain = exports.addressFromPublicKey = exports.extractAttestationInfo = exports.extractAggregatedSignatures = exports.computeDepositTxHash = exports.recoverAggregatedSignatures65B = exports.recoverSignature65B = exports.SOURCE_CHAIN_BRIDGE_ABI = exports.POD_BRIDGE_ABI = exports.BRIDGE_ABI = exports.PodBridgeTrackerClient = exports.SourceChainToPodActionClient = exports.PodToSourceChainActionClient = void 0;
 var pod_to_source_chain_client_1 = require("./clients/action/pod-to-source-chain-client");
 Object.defineProperty(exports, "PodToSourceChainActionClient", { enumerable: true, get: function () { return pod_to_source_chain_client_1.PodToSourceChainActionClient; } });
 var source_chain_to_pod_client_1 = require("./clients/action/source-chain-to-pod-client");
@@ -8,7 +8,16 @@ Object.defineProperty(exports, "SourceChainToPodActionClient", { enumerable: tru
 var client_1 = require("./clients/tracker/client");
 Object.defineProperty(exports, "PodBridgeTrackerClient", { enumerable: true, get: function () { return client_1.PodBridgeTrackerClient; } });
 var bridge_abi_1 = require("./libs/abi/bridge.abi");
+Object.defineProperty(exports, "BRIDGE_ABI", { enumerable: true, get: function () { return bridge_abi_1.BRIDGE_ABI; } });
 Object.defineProperty(exports, "POD_BRIDGE_ABI", { enumerable: true, get: function () { return bridge_abi_1.POD_BRIDGE_ABI; } });
+Object.defineProperty(exports, "SOURCE_CHAIN_BRIDGE_ABI", { enumerable: true, get: function () { return bridge_abi_1.SOURCE_CHAIN_BRIDGE_ABI; } });
+var signature_recovery_helper_1 = require("./libs/helpers/signature-recovery.helper");
+Object.defineProperty(exports, "recoverSignature65B", { enumerable: true, get: function () { return signature_recovery_helper_1.recoverSignature65B; } });
+Object.defineProperty(exports, "recoverAggregatedSignatures65B", { enumerable: true, get: function () { return signature_recovery_helper_1.recoverAggregatedSignatures65B; } });
+Object.defineProperty(exports, "computeDepositTxHash", { enumerable: true, get: function () { return signature_recovery_helper_1.computeDepositTxHash; } });
+Object.defineProperty(exports, "extractAggregatedSignatures", { enumerable: true, get: function () { return signature_recovery_helper_1.extractAggregatedSignatures; } });
+Object.defineProperty(exports, "extractAttestationInfo", { enumerable: true, get: function () { return signature_recovery_helper_1.extractAttestationInfo; } });
+Object.defineProperty(exports, "addressFromPublicKey", { enumerable: true, get: function () { return signature_recovery_helper_1.addressFromPublicKey; } });
 var pod_bridge_types_1 = require("./libs/types/pod-bridge.types");
 Object.defineProperty(exports, "BridgeChain", { enumerable: true, get: function () { return pod_bridge_types_1.BridgeChain; } });
 Object.defineProperty(exports, "DepositType", { enumerable: true, get: function () { return pod_bridge_types_1.DepositType; } });

package/dist/libs/abi/bridge.abi.d.ts

@@ -1,12 +1,10 @@
 /**
- * ABI for BridgeMintBurn contract on POD Chain
- * - Deposits burn tokens
- * - Claims use block number verification via precompiles
- */
-export declare const POD_BRIDGE_ABI: string[];
-/**
- * ABI for BridgeDepositWithdraw contract on Source Chain (e.g., Sepolia)
- * - Deposits lock tokens
- * - Claims use POD certificates with attestations and merkle proofs
+ * ABI for Bridge contract on Source Chain (ETH/Sepolia)
+ * New architecture:
+ * - ETH -> Pod: deposit on ETH, auto-claim on Pod (no claim needed)
+ * - Pod -> ETH: deposit on Pod, claim on ETH with aggregated validator signatures
+ * - Only ERC20 tokens supported (no native ETH - must wrap to WETH)
  */
+export declare const BRIDGE_ABI: string[];
 export declare const SOURCE_CHAIN_BRIDGE_ABI: string[];
+export declare const POD_BRIDGE_ABI: string[];