@tapforce/pod-bridge-sdk 1.1.8 → 1.1.9

package/README.md

@@ -1,6 +1,6 @@
 # Pod Bridge SDK
 
-TypeScript SDK for interacting with the Pod Bridge - enabling cross-chain token transfers between POD and other EVM chains (e.g., Sepolia).
+TypeScript SDK for interacting with Bridges between POD and other chains - enabling cross-chain token transfers between POD and other EVM chains (e.g., Sepolia).
 
 ## Features
 
@@ -34,8 +34,8 @@ pnpm add @tapforce/pod-bridge-sdk
 
 ```typescript
 import { 
-  BridgedToPodActionClient,
-  PodToBridgedActionClient,
+  SourceChainToPodActionClient,
+  PodToSourceChainActionClient,
   PodBridgeTrackerClient,
   PodBridgeConfig 
 } from '@tapforce/pod-bridge-sdk';
@@ -47,13 +47,13 @@ Create a configuration object with source and destination chain details:
 
 ```typescript
 const config: PodBridgeConfig = {
-  bridged: {
+  sourceChain: {
     rpcUrl: 'https://sepolia.infura.io/v3/YOUR_KEY',
     contractAddress: '0x...', // Source chain bridge contract
     deploymentBlock: 9502541  // Optional: Start indexing from deployment block (avoids querying empty blocks)
   },
   pod: {
-    rpcUrl: 'https://pod-rpc.example.com',
+    rpcUrl: 'https://rpc.v1.dev.pod.network',
     contractAddress: '0x...', // Destination chain bridge contract
     deploymentBlock: 0        // Optional: POD deployment block
   }
@@ -66,30 +66,30 @@ const config: PodBridgeConfig = {
 
 The SDK provides two action clients for different bridge directions:
 
-- **`BridgedToPodActionClient`**: For Bridged → POD transfers (e.g., Sepolia → POD)
-- **`PodToBridgedActionClient`**: For POD → Bridged transfers (e.g., POD → Sepolia)
+- **`SourceChainToPodActionClient`**: For Source Chain → POD transfers (e.g., Sepolia → POD)
+- **`PodToSourceChainActionClient`**: For POD → Source Chain transfers (e.g., POD → Sepolia)
 
 #### Configuration for Action Clients
 
 ```typescript
 const actionConfig = {
-  bridged: {
-    contractAddress: '0x...' // Bridged chain bridge contract (e.g., Sepolia)
+  sourceChain: {
+    contractAddress: '0x...' // Source chain bridge contract (e.g., Sepolia)
   },
   pod: {
     contractAddress: '0x...' // POD chain bridge contract
   }
 };
 
-const bridgedToPodClient = new BridgedToPodActionClient(actionConfig);
-const podToBridgedClient = new PodToBridgedActionClient(actionConfig);
+const sourceChainToPodClient = new SourceChainToPodActionClient(actionConfig);
+const podToSourceChainClient = new PodToSourceChainActionClient(actionConfig);
 ```
 
-#### Deposit from Bridged Chain (e.g., Sepolia → POD)
+#### Deposit from Source Chain (e.g., Sepolia → POD)
 
 ```typescript
-// Create unsigned transaction for ERC20 deposit on Bridged chain
-const unsignedTx = bridgedToPodClient.depositToken({
+// Create unsigned transaction for ERC20 deposit on Source chain
+const unsignedTx = sourceChainToPodClient.depositToken({
   token: '0x...', // ERC20 token address
   amount: '1000000000000000000', // Amount in wei (1 token with 18 decimals)
   destinationWalletAddress: '0x...', // Recipient address on POD
@@ -97,7 +97,7 @@ const unsignedTx = bridgedToPodClient.depositToken({
 });
 
 // Deposit native tokens
-const unsignedNativeTx = bridgedToPodClient.depositNative({
+const unsignedNativeTx = sourceChainToPodClient.depositNative({
   amount: '1000000000000000000', // Amount in wei (1 ETH)
   destinationWalletAddress: '0x...', // Recipient address on POD
   from: '0x...' // Optional: sender address
@@ -107,13 +107,13 @@ const unsignedNativeTx = bridgedToPodClient.depositNative({
 // const tx = await signer.sendTransaction(unsignedTx);
 ```
 
-#### Claim on POD from Bridged Chain Deposits
+#### Claim on POD from Source Chain Deposits
 
-For claiming on POD from Bridged chain deposits, use block number-based claims:
+For claiming on POD from Source chain deposits, use block number-based claims:
 
 ```typescript
 // Create unsigned claim transaction for ERC20 on POD
-const unsignedTx = bridgedToPodClient.claimWithBlockNumber({
+const unsignedTx = sourceChainToPodClient.claimWithBlockNumber({
   id: '123', // Request ID from deposit event
   token: '0x...', // Token address on source chain
   blockNumber: 12345678, // Block number of deposit on source chain
@@ -121,49 +121,49 @@ const unsignedTx = bridgedToPodClient.claimWithBlockNumber({
 });
 
 // For native tokens
-const unsignedNativeTx = bridgedToPodClient.claimNativeWithBlockNumber({
+const unsignedNativeTx = sourceChainToPodClient.claimNativeWithBlockNumber({
   id: '123',
   blockNumber: 12345678,
   from: '0x...'
 });
 ```
 
-#### Deposit from POD (POD → Bridged Chain)
+#### Deposit from POD (POD → Source Chain)
 
 ```typescript
 // Create unsigned transaction for ERC20 deposit on POD
-const unsignedTx = podToBridgedClient.depositToken({
+const unsignedTx = podToSourceChainClient.depositToken({
   token: '0x...', // ERC20 token address
   amount: '1000000000000000000', // Amount in wei
-  destinationWalletAddress: '0x...', // Recipient address on Bridged chain
+  destinationWalletAddress: '0x...', // Recipient address on Source chain
   from: '0x...' // Optional: sender address
 });
 
 // Deposit native tokens
-const unsignedNativeTx = podToBridgedClient.depositNative({
+const unsignedNativeTx = podToSourceChainClient.depositNative({
   amount: '1000000000000000000',
   destinationWalletAddress: '0x...',
   from: '0x...'
 });
 ```
 
-#### Claim on Bridged Chain from POD Deposits
+#### Claim on Source Chain from POD Deposits
 
-For claiming on Bridged chain from POD deposits, use certificate-based claims. First, get the certified log from the POD deposit transaction:
+For claiming on Source chain from POD deposits, use certificate-based claims. First, get the certified log from the POD deposit transaction:
 
 ```typescript
 // Get certified log from POD deposit transaction
 const depositTxHash = '0x...'; // Transaction hash of deposit on POD
 const certifiedLog = await trackerClient.getDepositCertifiedLog(depositTxHash);
 
-// Create unsigned claim transaction for ERC20 on Bridged chain
-const unsignedTx = podToBridgedClient.claimWithCertificate({
+// Create unsigned claim transaction for ERC20 on Source chain
+const unsignedTx = podToSourceChainClient.claimWithCertificate({
   certifiedLog,
   from: '0x...' // Optional: claimer address
 });
 
 // For native tokens
-const unsignedNativeTx = podToBridgedClient.claimNativeWithCertificate({
+const unsignedNativeTx = podToSourceChainClient.claimNativeWithCertificate({
   certifiedLog,
   from: '0x...'
 });
@@ -188,13 +188,16 @@ const deposits = await trackerClient.getDepositsSentBy(
 
 deposits.forEach(deposit => {
   console.log(`Request ID: ${deposit.requestId}`);
-  console.log(`From: ${deposit.from} -> To: ${deposit.to}`);
-  console.log(`Token: ${deposit.token}`);
-  console.log(`Amount: ${deposit.amount}`);
+  console.log(`Deposit Chain: ${deposit.deposit.chain}`);
+  console.log(`From: ${deposit.deposit.from} -> To: ${deposit.deposit.to}`);
+  console.log(`Token: ${deposit.deposit.token}`);
+  console.log(`Amount: ${deposit.deposit.amount}`);
+  console.log(`Block: ${deposit.deposit.blockNumber}, Time: ${deposit.deposit.timestamp}`);
   console.log(`Claimed: ${deposit.isClaimed}`);
-  if (deposit.isClaimed) {
-    console.log(`Claimed by: ${deposit.claimedBy}`);
-    console.log(`Claimed tx: ${deposit.claimedTxHash}`);
+  if (deposit.isClaimed && deposit.claim) {
+    console.log(`Claim Chain: ${deposit.claim.chain}`);
+    console.log(`Claimed by: ${deposit.claim.claimer}`);
+    console.log(`Claimed tx: ${deposit.claim.txHash}`);
   }
 });
 ```
@@ -250,25 +253,25 @@ processedStatuses.forEach((isProcessed, index) => {
 
 ## API Reference
 
-### BridgedToPodActionClient
+### SourceChainToPodActionClient
 
-Handles transactions for Bridged → POD direction.
+Handles transactions for Source Chain → POD direction.
 
 #### Constructor
 
 ```typescript
-new BridgedToPodActionClient(config: PodBridgeActionsClientConfig)
+new SourceChainToPodActionClient(config: PodBridgeActionsClientConfig)
 ```
 
 #### Methods
 
-- **`depositToken(args)`**: Create unsigned transaction for ERC20 deposit on Bridged chain
+- **`depositToken(args)`**: Create unsigned transaction for ERC20 deposit on Source chain
   - `token`: Token address
   - `amount`: Amount in wei (string | bigint)
   - `destinationWalletAddress`: Recipient address on POD
   - `from?`: Optional sender address
 
-- **`depositNative(args)`**: Create unsigned transaction for native token deposit on Bridged chain
+- **`depositNative(args)`**: Create unsigned transaction for native token deposit on Source chain
   - `amount`: Amount in wei (string | bigint)
   - `destinationWalletAddress`: Recipient address on POD
   - `from?`: Optional sender address
@@ -276,22 +279,22 @@ new BridgedToPodActionClient(config: PodBridgeActionsClientConfig)
 - **`claimWithBlockNumber(args)`**: Create unsigned transaction for claiming on POD with block number
   - `id`: Request ID
   - `token`: Token address
-  - `blockNumber`: Block number of deposit on Bridged chain
+  - `blockNumber`: Block number of deposit on Source chain
   - `from?`: Optional claimer address
 
 - **`claimNativeWithBlockNumber(args)`**: Create unsigned transaction for claiming native tokens on POD with block number
   - `id`: Request ID
-  - `blockNumber`: Block number of deposit on Bridged chain
+  - `blockNumber`: Block number of deposit on Source chain
   - `from?`: Optional claimer address
 
-### PodToBridgedActionClient
+### PodToSourceChainActionClient
 
-Handles transactions for POD → Bridged direction.
+Handles transactions for POD → Source Chain direction.
 
 #### Constructor
 
 ```typescript
-new PodToBridgedActionClient(config: PodBridgeActionsClientConfig)
+new PodToSourceChainActionClient(config: PodBridgeActionsClientConfig)
 ```
 
 #### Methods
@@ -299,19 +302,19 @@ new PodToBridgedActionClient(config: PodBridgeActionsClientConfig)
 - **`depositToken(args)`**: Create unsigned transaction for ERC20 deposit on POD
   - `token`: Token address
   - `amount`: Amount in wei (string | bigint)
-  - `destinationWalletAddress`: Recipient address on Bridged chain
+  - `destinationWalletAddress`: Recipient address on Source chain
   - `from?`: Optional sender address
 
 - **`depositNative(args)`**: Create unsigned transaction for native token deposit on POD
   - `amount`: Amount in wei (string | bigint)
-  - `destinationWalletAddress`: Recipient address on Bridged chain
+  - `destinationWalletAddress`: Recipient address on Source chain
   - `from?`: Optional sender address
 
-- **`claimWithCertificate(args)`**: Create unsigned transaction for claiming on Bridged chain with certificate
+- **`claimWithCertificate(args)`**: Create unsigned transaction for claiming on Source chain with certificate
   - `certifiedLog`: Certified log from POD certificate system
   - `from?`: Optional claimer address
 
-- **`claimNativeWithCertificate(args)`**: Create unsigned transaction for claiming native tokens on Bridged chain with certificate
+- **`claimNativeWithCertificate(args)`**: Create unsigned transaction for claiming native tokens on Source chain with certificate
   - `certifiedLog`: Certified log from POD certificate system
   - `from?`: Optional claimer address
 
@@ -334,7 +337,7 @@ new PodToBridgedActionClient(config: PodBridgeActionsClientConfig)
 - **`areRequestsProcessed(deposits)`**: Batch check if requests are processed
   - Returns: `Promise<boolean[]>`
 
-- **`getDepositCertifiedLog(txHash)`**: Get certified log for claiming on Sepolia from POD deposit
+- **`getDepositCertifiedLog(txHash)`**: Get certified log for claiming on Source chain from POD deposit
   - `txHash`: Transaction hash of deposit on POD
   - Returns: `Promise<CertifiedLog>` with attestations and merkle proof
 
@@ -343,19 +346,40 @@ new PodToBridgedActionClient(config: PodBridgeActionsClientConfig)
 ### BridgeRequest
 
 ```typescript
+enum BridgeChain {
+  SOURCE_CHAIN = 'sourceChain',
+  POD = 'pod'
+}
+
 interface BridgeRequest {
   requestId: string;
-  blockNumber: number;
-  timestamp: number;
-  txHash: string;
-  from: string;
-  to: string;
-  token: string; // Token address or ZeroAddress for native
-  amount: string; // Amount in wei
+  
+  // Deposit information
+  deposit: {
+    chain: BridgeChain;        // Which chain the deposit occurred on
+    txHash: string;
+    from: string;              // Sender address
+    to: string;                // Recipient address on destination chain
+    token: string;             // Token address (or 0x0 for native)
+    amount: string;            // Amount in wei
+    chainId: number;
+    blockNumber: number;       // Block number (for POD, this is essentially a timestamp)
+    timestamp: number;         // Unix timestamp
+  };
+  
+  // Claim information (optional, only if claimed)
+  claim?: {
+    chain: BridgeChain;        // Which chain the claim occurred on
+    txHash: string;
+    claimer: string;           // Address that claimed
+    chainId: number;
+    blockNumber: number;       // Block number (for POD, this is essentially a timestamp)
+    timestamp: number;         // Unix timestamp
+  };
+  
+  // Status
   isClaimed: boolean;
-  claimedTxHash?: string;
-  claimedAt?: number;
-  claimedBy?: string;
+  isClaimable: boolean;        // Can be claimed (finalized and not yet claimed)
 }
 ```
 
@@ -401,12 +425,12 @@ interface CertifiedLog {
 The SDK supports two bridge implementations:
 
 1. **BridgeDepositWithdraw** (Certificate-based)
-   - Used for claiming on Sepolia from POD deposits
+   - Used for claiming on Source chain from POD deposits
    - Requires certified logs from POD's certificate system
    - Methods: `claimWithCertificate`, `claimNativeWithCertificate`
 
 2. **BridgeMintBurn** (Precompile-based)
-   - Used for claiming on POD from Sepolia deposits
+   - Used for claiming on POD from Source chain deposits
    - Uses block number verification via precompiles
    - Methods: `claimWithBlockNumber`, `claimNativeWithBlockNumber`
 
@@ -416,11 +440,11 @@ The SDK supports two bridge implementations:
 
 ```typescript
 import { ethers } from 'ethers';
-import { BridgedToPodActionClient, PodBridgeTrackerClient } from '@tapforce/pod-bridge-sdk';
+import { SourceChainToPodActionClient, PodBridgeTrackerClient } from '@tapforce/pod-bridge-sdk';
 
 // Setup
 const trackerConfig = {
-  bridged: {
+  sourceChain: {
     rpcUrl: 'https://sepolia.infura.io/v3/YOUR_KEY',
     contractAddress: '0xSepoliaBridgeContract'
   },
@@ -431,13 +455,13 @@ const trackerConfig = {
 };
 
 const actionConfig = {
-  bridged: { contractAddress: '0xSepoliaBridgeContract' },
+  sourceChain: { contractAddress: '0xSepoliaBridgeContract' },
   pod: { contractAddress: '0xPodBridgeContract' }
 };
 
-const actionClient = new BridgedToPodActionClient(actionConfig);
+const actionClient = new SourceChainToPodActionClient(actionConfig);
 const trackerClient = new PodBridgeTrackerClient(trackerConfig);
-const sepoliaProvider = new ethers.JsonRpcProvider(trackerConfig.bridged.rpcUrl);
+const sepoliaProvider = new ethers.JsonRpcProvider(trackerConfig.sourceChain.rpcUrl);
 const sepoliaSigner = new ethers.Wallet('PRIVATE_KEY', sepoliaProvider);
 
 // Step 1: Deposit tokens on Sepolia
@@ -456,15 +480,15 @@ const deposits = await trackerClient.getDepositsSentBy(await sepoliaSigner.getAd
 const latestDeposit = deposits[0];
 
 console.log(`Request ID: ${latestDeposit.requestId}`);
-console.log(`Amount: ${ethers.formatEther(latestDeposit.amount)}`);
+console.log(`Amount: ${ethers.formatEther(latestDeposit.deposit.amount)}`);
 
 // Step 3: Wait for finality and claim on POD
 const canClaim = await trackerClient.canBeClaimed(latestDeposit);
 if (canClaim) {
   const claimTx = actionClient.claimWithBlockNumber({
     id: latestDeposit.requestId,
-    token: latestDeposit.token,
-    blockNumber: latestDeposit.blockNumber
+    token: latestDeposit.deposit.token,
+    blockNumber: latestDeposit.deposit.blockNumber
   });
   
   // Submit claim on POD
@@ -480,11 +504,11 @@ if (canClaim) {
 
 ```typescript
 import { ethers } from 'ethers';
-import { PodToBridgedActionClient, PodBridgeTrackerClient } from '@tapforce/pod-bridge-sdk';
+import { PodToSourceChainActionClient, PodBridgeTrackerClient } from '@tapforce/pod-bridge-sdk';
 
 // Setup
 const trackerConfig = {
-  bridged: {
+  sourceChain: {
     rpcUrl: 'https://sepolia.infura.io/v3/YOUR_KEY',
     contractAddress: '0xSepoliaBridgeContract'
   },
@@ -495,11 +519,11 @@ const trackerConfig = {
 };
 
 const actionConfig = {
-  bridged: { contractAddress: '0xSepoliaBridgeContract' },
+  sourceChain: { contractAddress: '0xSepoliaBridgeContract' },
   pod: { contractAddress: '0xPodBridgeContract' }
 };
 
-const actionClient = new PodToBridgedActionClient(actionConfig);
+const actionClient = new PodToSourceChainActionClient(actionConfig);
 const trackerClient = new PodBridgeTrackerClient(trackerConfig);
 const podProvider = new ethers.JsonRpcProvider(trackerConfig.pod.rpcUrl);
 const podSigner = new ethers.Wallet('PRIVATE_KEY', podProvider);
@@ -524,7 +548,7 @@ const claimTx = actionClient.claimWithCertificate({
   certifiedLog
 });
 
-const sepoliaProvider = new ethers.JsonRpcProvider(trackerConfig.bridged.rpcUrl);
+const sepoliaProvider = new ethers.JsonRpcProvider(trackerConfig.sourceChain.rpcUrl);
 const sepoliaSigner = new ethers.Wallet('PRIVATE_KEY', sepoliaProvider);
 const claim = await sepoliaSigner.sendTransaction(claimTx);
 await claim.wait();

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

@@ -1,12 +1,16 @@
 import { PodBridgeConfig, BridgeRequest, BridgeRequestWithType, CertifiedLog } from "../../libs/types/pod-bridge.types";
 export declare class PodBridgeTrackerClient {
     private readonly config;
-    private readonly bridgedProvider;
+    private readonly sourceChainProvider;
     private readonly podProvider;
-    private readonly bridgedBridge;
+    private readonly sourceChainBridge;
     private readonly podBridge;
     private readonly iface;
+    private sourceChainId;
+    private podChainId;
     constructor(config: PodBridgeConfig);
+    private initChainIds;
+    private ensureChainIds;
     /**
      * Get all deposits SENT by an address
      * @param address The address that sent deposits
@@ -33,7 +37,7 @@ export declare class PodBridgeTrackerClient {
      * @param deposit The bridge request to check
      * @returns True if the deposit can be claimed
      */
-    canBeClaimed(deposit: Pick<BridgeRequest, 'isClaimed' | 'blockNumber'>): Promise<boolean>;
+    canBeClaimed(deposit: BridgeRequest): Promise<boolean>;
     /**
      * Batch check claim status for multiple deposits
      * @param deposits Array of deposits to check

package/dist/clients/tracker/client.js

@@ -7,14 +7,40 @@ const bridge_abi_1 = require("../../libs/abi/bridge.abi");
 class PodBridgeTrackerClient {
     constructor(config) {
         this.config = config;
+        this.sourceChainId = null;
+        this.podChainId = null;
         // Initialize providers
-        this.bridgedProvider = new ethers_1.ethers.JsonRpcProvider(config.sourceChain.rpcUrl);
+        this.sourceChainProvider = new ethers_1.ethers.JsonRpcProvider(config.sourceChain.rpcUrl);
         this.podProvider = new ethers_1.ethers.JsonRpcProvider(config.pod.rpcUrl);
         // Initialize contract instances
-        this.bridgedBridge = new ethers_1.Contract(config.sourceChain.contractAddress, bridge_abi_1.POD_BRIDGE_ABI, this.bridgedProvider);
+        this.sourceChainBridge = new ethers_1.Contract(config.sourceChain.contractAddress, bridge_abi_1.POD_BRIDGE_ABI, this.sourceChainProvider);
         this.podBridge = new ethers_1.Contract(config.pod.contractAddress, bridge_abi_1.POD_BRIDGE_ABI, this.podProvider);
         // Interface for parsing logs
         this.iface = new ethers_1.Interface(bridge_abi_1.POD_BRIDGE_ABI);
+        // Fetch chain IDs asynchronously
+        this.initChainIds();
+    }
+    async initChainIds() {
+        try {
+            const sourceNetwork = await this.sourceChainProvider.getNetwork();
+            this.sourceChainId = Number(sourceNetwork.chainId);
+        }
+        catch (error) {
+            console.error('Failed to fetch chain IDs:', error);
+        }
+        try {
+            const podNetwork = await this.podProvider.getNetwork();
+            this.podChainId = Number(podNetwork.chainId);
+        }
+        catch (error) {
+            this.podChainId = 1293;
+            console.error('Failed to fetch chain IDs:', error);
+        }
+    }
+    async ensureChainIds() {
+        if (this.sourceChainId === null || this.podChainId === null) {
+            await this.initChainIds();
+        }
     }
     /**
      * Get all deposits SENT by an address
@@ -24,25 +50,26 @@ class PodBridgeTrackerClient {
      */
     async getDepositsSentBy(address, fromBlock) {
         var _a;
+        await this.ensureChainIds();
         const startBlock = (_a = fromBlock !== null && fromBlock !== void 0 ? fromBlock : this.config.sourceChain.deploymentBlock) !== null && _a !== void 0 ? _a : 0;
         const deposits = [];
-        const currentBlock = await this.bridgedProvider.getBlockNumber();
+        const currentBlock = await this.sourceChainProvider.getBlockNumber();
         const BLOCK_BATCH_SIZE = 10000;
         console.log('currentBlock', currentBlock);
         for (let start = startBlock; start <= currentBlock; start += BLOCK_BATCH_SIZE) {
             const end = Math.min(start + BLOCK_BATCH_SIZE - 1, currentBlock);
             // With improved events, we can filter by 'from' directly!
-            const depositFilter = this.bridgedBridge.filters.Deposit(null, // id
+            const depositFilter = this.sourceChainBridge.filters.Deposit(null, // id
             address, // from (indexed) - Filter by sender!
             null // to
             );
-            const depositNativeFilter = this.bridgedBridge.filters.DepositNative(null, // id
+            const depositNativeFilter = this.sourceChainBridge.filters.DepositNative(null, // id
             address, // from (indexed) - Filter by sender!
             null // to
             );
             const [depositLogs, depositNativeLogs] = await Promise.all([
-                this.bridgedBridge.queryFilter(depositFilter, start, end),
-                this.bridgedBridge.queryFilter(depositNativeFilter, start, end)
+                this.sourceChainBridge.queryFilter(depositFilter, start, end),
+                this.sourceChainBridge.queryFilter(depositNativeFilter, start, end)
             ]);
             console.log('depositLogs', depositLogs);
             console.log('depositNativeLogs', depositNativeLogs);
@@ -59,18 +86,19 @@ class PodBridgeTrackerClient {
                 if (parsed) {
                     deposits.push({
                         requestId: parsed.args.id.toString(),
-                        blockNumber: Number(parsed.args.blockNumber),
-                        timestamp: Number(parsed.args.timestamp),
-                        txHash: log.transactionHash,
-                        from: parsed.args.from,
-                        to: parsed.args.to,
-                        token: parsed.args.token,
-                        amount: parsed.args.amount.toString(),
+                        deposit: {
+                            chain: pod_bridge_types_1.BridgeChain.SOURCE_CHAIN,
+                            txHash: log.transactionHash,
+                            from: parsed.args.from,
+                            to: parsed.args.to,
+                            token: parsed.args.token,
+                            amount: parsed.args.amount.toString(),
+                            chainId: this.sourceChainId,
+                            blockNumber: Number(parsed.args.blockNumber),
+                            timestamp: Number(parsed.args.timestamp)
+                        },
                         isClaimed: false,
-                        isClaimable: false,
-                        claimedTxHash: null,
-                        claimedAt: null,
-                        claimedBy: null
+                        isClaimable: false
                     });
                 }
             }
@@ -83,25 +111,26 @@ class PodBridgeTrackerClient {
                 if (parsed) {
                     deposits.push({
                         requestId: parsed.args.id.toString(),
-                        blockNumber: Number(parsed.args.blockNumber),
-                        timestamp: Number(parsed.args.timestamp),
-                        txHash: log.transactionHash,
-                        from: parsed.args.from,
-                        to: parsed.args.to,
-                        token: ethers_1.ethers.ZeroAddress, // Native token
-                        amount: parsed.args.amount.toString(),
+                        deposit: {
+                            chain: pod_bridge_types_1.BridgeChain.SOURCE_CHAIN,
+                            txHash: log.transactionHash,
+                            from: parsed.args.from,
+                            to: parsed.args.to,
+                            token: ethers_1.ethers.ZeroAddress, // Native token
+                            amount: parsed.args.amount.toString(),
+                            chainId: this.sourceChainId,
+                            blockNumber: Number(parsed.args.blockNumber),
+                            timestamp: Number(parsed.args.timestamp)
+                        },
                         isClaimed: false,
-                        isClaimable: false,
-                        claimedTxHash: null,
-                        claimedAt: null,
-                        claimedBy: null
+                        isClaimable: false
                     });
                 }
             }
         }
         // Check claim status (queries POD chain, not bridged)
         await this.updateClaimStatus(deposits);
-        return deposits.sort((a, b) => b.timestamp - a.timestamp);
+        return deposits.sort((a, b) => b.deposit.timestamp - a.deposit.timestamp);
     }
     /**
      * Get all deposits RECEIVED by an address
@@ -111,24 +140,25 @@ class PodBridgeTrackerClient {
      */
     async getDepositsReceivedBy(address, fromBlock) {
         var _a;
+        await this.ensureChainIds();
         const startBlock = (_a = fromBlock !== null && fromBlock !== void 0 ? fromBlock : this.config.sourceChain.deploymentBlock) !== null && _a !== void 0 ? _a : 0;
         const deposits = [];
-        const currentBlock = await this.bridgedProvider.getBlockNumber();
+        const currentBlock = await this.sourceChainProvider.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);
             // With improved events, we can filter by 'to' directly!
-            const depositFilter = this.bridgedBridge.filters.Deposit(null, // id
+            const depositFilter = this.sourceChainBridge.filters.Deposit(null, // id
             null, // from
             address // to (indexed) - Filter by recipient!
             );
-            const depositNativeFilter = this.bridgedBridge.filters.DepositNative(null, // id
+            const depositNativeFilter = this.sourceChainBridge.filters.DepositNative(null, // id
             null, // from
             address // to (indexed) - Filter by recipient!
             );
             const [depositLogs, depositNativeLogs] = await Promise.all([
-                this.bridgedBridge.queryFilter(depositFilter, start, end),
-                this.bridgedBridge.queryFilter(depositNativeFilter, start, end)
+                this.sourceChainBridge.queryFilter(depositFilter, start, end),
+                this.sourceChainBridge.queryFilter(depositNativeFilter, start, end)
             ]);
             // Add small delay to avoid rate limiting
             if (start + BLOCK_BATCH_SIZE <= currentBlock) {
@@ -143,18 +173,19 @@ class PodBridgeTrackerClient {
                 if (parsed) {
                     deposits.push({
                         requestId: parsed.args.id.toString(),
-                        blockNumber: Number(parsed.args.blockNumber),
-                        timestamp: Number(parsed.args.timestamp),
-                        txHash: log.transactionHash,
-                        from: parsed.args.from,
-                        to: parsed.args.to,
-                        token: parsed.args.token,
-                        amount: parsed.args.amount.toString(),
+                        deposit: {
+                            chain: pod_bridge_types_1.BridgeChain.SOURCE_CHAIN,
+                            txHash: log.transactionHash,
+                            from: parsed.args.from,
+                            to: parsed.args.to,
+                            token: parsed.args.token,
+                            amount: parsed.args.amount.toString(),
+                            chainId: this.sourceChainId,
+                            blockNumber: Number(parsed.args.blockNumber),
+                            timestamp: Number(parsed.args.timestamp)
+                        },
                         isClaimed: false,
-                        isClaimable: false,
-                        claimedTxHash: null,
-                        claimedAt: null,
-                        claimedBy: null
+                        isClaimable: false
                     });
                 }
             }
@@ -167,25 +198,26 @@ class PodBridgeTrackerClient {
                 if (parsed) {
                     deposits.push({
                         requestId: parsed.args.id.toString(),
-                        blockNumber: Number(parsed.args.blockNumber),
-                        timestamp: Number(parsed.args.timestamp),
-                        txHash: log.transactionHash,
-                        from: parsed.args.from,
-                        to: parsed.args.to,
-                        token: ethers_1.ethers.ZeroAddress,
-                        amount: parsed.args.amount.toString(),
+                        deposit: {
+                            chain: pod_bridge_types_1.BridgeChain.SOURCE_CHAIN,
+                            txHash: log.transactionHash,
+                            from: parsed.args.from,
+                            to: parsed.args.to,
+                            token: ethers_1.ethers.ZeroAddress,
+                            amount: parsed.args.amount.toString(),
+                            chainId: this.sourceChainId,
+                            blockNumber: Number(parsed.args.blockNumber),
+                            timestamp: Number(parsed.args.timestamp)
+                        },
                         isClaimed: false,
-                        isClaimable: false,
-                        claimedTxHash: null,
-                        claimedAt: null,
-                        claimedBy: null
+                        isClaimable: false
                     });
                 }
             }
         }
         // Check claim status (queries POD chain, not bridged)
         await this.updateClaimStatus(deposits);
-        return deposits.sort((a, b) => b.timestamp - a.timestamp);
+        return deposits.sort((a, b) => b.deposit.timestamp - a.deposit.timestamp);
     }
     /**
      * Get ALL deposits for an address (both sent and received)
@@ -212,20 +244,20 @@ class PodBridgeTrackerClient {
         const allDeposits = [...sentWithType, ...receivedWithType];
         const uniqueDeposits = new Map();
         for (const deposit of allDeposits) {
-            const key = `${deposit.requestId}-${deposit.txHash}`;
+            const key = `${deposit.requestId}-${deposit.deposit.txHash}`;
             if (!uniqueDeposits.has(key)) {
                 uniqueDeposits.set(key, deposit);
             }
             else {
                 // If deposit appears in both (sent to self), mark as both
                 const existing = uniqueDeposits.get(key);
-                if (existing.from === address && existing.to === address) {
+                if (existing.deposit.from === address && existing.deposit.to === address) {
                     uniqueDeposits.set(key, { ...existing, type: pod_bridge_types_1.DepositType.SENT });
                 }
             }
         }
         return Array.from(uniqueDeposits.values())
-            .sort((a, b) => b.timestamp - a.timestamp);
+            .sort((a, b) => b.deposit.timestamp - a.deposit.timestamp);
     }
     /**
      * Check if deposits can be claimed (block finalized on source chain)
@@ -233,9 +265,9 @@ class PodBridgeTrackerClient {
      * @returns True if the deposit can be claimed
      */
     async canBeClaimed(deposit) {
-        const currentBlock = await this.bridgedProvider.getBlockNumber();
+        const currentBlock = await this.sourceChainProvider.getBlockNumber();
         const finalizedBlock = currentBlock - 15; // ~15 minutes on Sepolia
-        return deposit.blockNumber <= finalizedBlock && !deposit.isClaimed;
+        return deposit.deposit.blockNumber <= finalizedBlock && !deposit.isClaimed;
     }
     /**
      * Batch check claim status for multiple deposits
@@ -248,7 +280,7 @@ class PodBridgeTrackerClient {
         console.log('updateClaimStatus');
         try {
             // Get unique recipient addresses from deposits
-            const uniqueRecipients = [...new Set(deposits.map(d => d.to))];
+            const uniqueRecipients = [...new Set(deposits.map(d => d.deposit.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
@@ -291,29 +323,34 @@ class PodBridgeTrackerClient {
                 }
             }
             // Get current block to check finalization
-            const currentBlock = await this.bridgedProvider.getBlockNumber();
+            const currentBlock = await this.sourceChainProvider.getBlockNumber();
             const finalizedBlock = currentBlock - 64; // 2 epoch (32 x 2 blocks) ~15 minutes on Sepolia
             // Update deposit status
             for (const deposit of deposits) {
                 const claimInfo = claimedMap.get(deposit.requestId);
                 if (claimInfo) {
                     deposit.isClaimed = true;
-                    deposit.claimedTxHash = claimInfo.txHash;
-                    deposit.claimedAt = claimInfo.timestamp;
-                    deposit.claimedBy = claimInfo.claimer;
+                    deposit.claim = {
+                        chain: pod_bridge_types_1.BridgeChain.POD,
+                        txHash: claimInfo.txHash,
+                        claimer: claimInfo.claimer,
+                        chainId: this.podChainId,
+                        blockNumber: 0, // POD has single block - using timestamp
+                        timestamp: claimInfo.timestamp
+                    };
                 }
                 // Check if deposit is claimable (finalized and not claimed)
-                deposit.isClaimable = deposit.blockNumber <= finalizedBlock && !deposit.isClaimed;
+                deposit.isClaimable = deposit.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 currentBlock = await this.sourceChainProvider.getBlockNumber();
                 const finalizedBlock = currentBlock - 64; // 2 epoch (32 x 2 blocks) ~15 minutes on Sepolia
                 for (const deposit of deposits) {
-                    deposit.isClaimable = deposit.blockNumber <= finalizedBlock && !deposit.isClaimed;
+                    deposit.isClaimable = deposit.deposit.blockNumber <= finalizedBlock && !deposit.isClaimed;
                 }
             }
             catch (fallbackError) {
@@ -331,9 +368,9 @@ class PodBridgeTrackerClient {
             return [];
         try {
             const ids = deposits.map(d => d.requestId);
-            const tokens = deposits.map(d => d.token);
-            const amounts = deposits.map(d => d.amount);
-            const tos = deposits.map(d => d.to);
+            const tokens = deposits.map(d => d.deposit.token);
+            const amounts = deposits.map(d => d.deposit.amount);
+            const tos = deposits.map(d => d.deposit.to);
             return await this.podBridge.areRequestsProcessed(ids, tokens, amounts, tos);
         }
         catch (error) {
@@ -342,7 +379,7 @@ class PodBridgeTrackerClient {
             const results = [];
             for (const deposit of deposits) {
                 try {
-                    const hash = this.computeRequestHash(deposit.requestId, deposit.token, deposit.amount, deposit.to);
+                    const hash = this.computeRequestHash(deposit.requestId, deposit.deposit.token, deposit.deposit.amount, deposit.deposit.to);
                     const isProcessed = await this.podBridge.processedRequests(hash);
                     results.push(isProcessed);
                 }

package/dist/index.d.ts

@@ -2,4 +2,4 @@ export { PodToSourceChainActionClient } from './clients/action/pod-to-source-cha
 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, DepositType, UnsignedTransaction, CertifiedLog, PodAttestation, PodMetadata, PodTransactionReceipt, PodBridgeActionsClientConfig, PodBridgeChainConfig } from './libs/types/pod-bridge.types';
+export { PodBridgeConfig, BridgeRequest, BridgeRequestWithType, BridgeChain, DepositType, UnsignedTransaction, CertifiedLog, PodAttestation, PodMetadata, PodTransactionReceipt, 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.POD_BRIDGE_ABI = exports.PodBridgeTrackerClient = exports.SourceChainToPodActionClient = exports.PodToSourceChainActionClient = void 0;
+exports.DepositType = exports.BridgeChain = exports.POD_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");
@@ -10,4 +10,5 @@ Object.defineProperty(exports, "PodBridgeTrackerClient", { enumerable: true, get
 var bridge_abi_1 = require("./libs/abi/bridge.abi");
 Object.defineProperty(exports, "POD_BRIDGE_ABI", { enumerable: true, get: function () { return bridge_abi_1.POD_BRIDGE_ABI; } });
 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/types/pod-bridge.types.d.ts

@@ -20,20 +20,33 @@ export interface PodBridgeActionsClientConfig {
         contractAddress: string;
     };
 }
+export declare enum BridgeChain {
+    SOURCE_CHAIN = "sourceChain",
+    POD = "pod"
+}
 export interface BridgeRequest {
     requestId: string;
-    blockNumber: number;
-    timestamp: number;
-    txHash: string;
-    from: string;
-    to: string;
-    token: string;
-    amount: string;
+    deposit: {
+        chain: BridgeChain;
+        txHash: string;
+        from: string;
+        to: string;
+        token: string;
+        amount: string;
+        chainId: number;
+        blockNumber: number;
+        timestamp: number;
+    };
+    claim?: {
+        chain: BridgeChain;
+        txHash: string;
+        claimer: string;
+        chainId: number;
+        blockNumber: number;
+        timestamp: number;
+    };
     isClaimed: boolean;
     isClaimable: boolean;
-    claimedTxHash: string | null;
-    claimedAt: number | null;
-    claimedBy: string | null;
 }
 export declare enum DepositType {
     SENT = "sent",

package/dist/libs/types/pod-bridge.types.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DepositType = void 0;
+exports.DepositType = exports.BridgeChain = void 0;
+var BridgeChain;
+(function (BridgeChain) {
+    BridgeChain["SOURCE_CHAIN"] = "sourceChain";
+    BridgeChain["POD"] = "pod";
+})(BridgeChain || (exports.BridgeChain = BridgeChain = {}));
 var DepositType;
 (function (DepositType) {
     DepositType["SENT"] = "sent";

package/package.json

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