@tapforce/pod-bridge-sdk 1.2.3 → 1.2.5

package/README.md

@@ -110,6 +110,11 @@ const receipt = await tx.wait();
 Deposits on Pod require manual claim on ETH with aggregated validator signatures.
 
 ```typescript
+import { 
+  PodToSourceChainActionClient,
+  extractAggregatedSignaturesWithValidators 
+} from '@tapforce/pod-bridge-sdk';
+
 const client = new PodToSourceChainActionClient(actionConfig);
 
 // Step 1: Deposit on Pod
@@ -123,17 +128,26 @@ const depositTx = client.deposit({
 const tx = await podSigner.sendTransaction(depositTx);
 const receipt = await tx.wait();
 
-// Step 2: Get aggregated signatures from your indexer/API
-// (Implementation depends on your backend)
+// Step 2: Get the receipt with validator signatures
+const podReceipt = await podProvider.send('eth_getTransactionReceipt', [tx.hash]);
+
+// Step 3: Get committee for v-value recovery
+const committee = await podProvider.send('pod_getCommittee', {});
 
-// Step 3: Claim on ETH
+// Step 4: Extract aggregated signatures (65-byte format with correct v-values)
+const aggregatedSignatures = extractAggregatedSignaturesWithValidators(
+  podReceipt,
+  committee.validators  // [[0, "02..."], [1, "03..."], ...] compressed pubkeys
+);
+
+// Step 5: Claim on ETH
 const claimTx = client.claim({
   claimData: {
     ethTokenAddress: '0xETH_TOKEN_ADDRESS', // Token on ETH (different from Pod)
     amount: ethers.parseEther('1'),
     to: '0x...',                            // Recipient
     committeeEpoch: 0,                      // Hardcoded for now
-    aggregatedSignatures: '0x...',          // 65-byte signatures (r,s,v) concatenated
+    aggregatedSignatures,                   // 65-byte signatures (r,s,v) concatenated
     depositTxHash: tx.hash                  // Deposit TX hash from Pod
   },
   from: '0x...'
@@ -269,30 +283,68 @@ interface ClaimProofData {
 
 ### Signature Recovery Helpers
 
-Pod uses 64-byte signatures without the parity bit (v), but the ETH contract requires 65-byte (r,s,v) format.
-The helpers exactly match the Rust implementation - they try both recovery IDs and verify against the public key.
+Pod returns DER-encoded 64-byte signatures without the parity bit (v), but the ETH contract requires 65-byte (r,s,v) format.
+The SDK handles this by trying both v values (27/28) and verifying against the committee's validator public keys.
 
 ```typescript
 import { 
+  extractAggregatedSignaturesWithValidators,
   extractAggregatedSignatures,
-  recoverSignature65B,
-  addressFromPublicKey 
+  parseDerSignature,
+  addressFromPublicKey,
+  recoverSignatureWithoutPubkey
 } from '@tapforce/pod-bridge-sdk';
 
-// Recommended: Extract signatures directly from Pod receipt
+// Recommended: Extract with validator verification (correct v-values)
 const podReceipt = await podProvider.send('eth_getTransactionReceipt', [depositTxHash]);
-const aggregatedSignatures = extractAggregatedSignatures(podReceipt, msgHash);
-
-// Low-level: Recover single signature (matches Rust recover_65b_signature)
-const sig65 = recoverSignature65B(
-  r,           // r component (32 bytes hex)
-  s,           // s component (32 bytes hex)
-  msgHash,     // message hash that was signed
-  publicKey    // signer's public key (to verify recovery)
+const committee = await podProvider.send('pod_getCommittee', {});
+const aggregatedSignatures = extractAggregatedSignaturesWithValidators(
+  podReceipt,
+  committee.validators  // [[index, compressedPubKey], ...]
 );
 
-// Utility: Derive address from public key
-const address = addressFromPublicKey(publicKey);
+// Alternative: Extract without validator verification (may have wrong v-values)
+const sigs = extractAggregatedSignatures(podReceipt);
+
+// Low-level: Parse DER signature to r,s components
+const { r, s } = parseDerSignature(derEncodedSig);
+
+// Low-level: Recover 65-byte signature without pubkey (tries v=27 first)
+const sig65 = recoverSignatureWithoutPubkey(r, s, msgHash);
+
+// Utility: Derive address from uncompressed public key
+const address = addressFromPublicKey(uncompressedPubKey);
+```
+
+#### Pod Receipt Format
+
+```typescript
+interface PodTransactionReceipt {
+  // ... standard fields ...
+  attested_tx: {
+    hash: string;           // Hash signed by validators
+    committee_epoch: number;
+  };
+  signatures: {
+    "0": string;  // DER-encoded signature from validator 0
+    "1": string;  // DER-encoded signature from validator 1
+    // ...
+  };
+}
+```
+
+#### Committee Format
+
+```typescript
+// pod_getCommittee response
+{
+  validators: [
+    [0, "024ee7..."],  // [index, compressed_secp256k1_pubkey]
+    [1, "025c59..."],
+    // ...
+  ],
+  quorum_size: 3
+}
 ```
 
 ## Events

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

@@ -6,7 +6,7 @@ import { PodBridgeConfig, BridgeRequest, BridgeRequestWithType } from "../../lib
  * to provide a unified view of bridge activity across both chains.
  *
  * Bridge Architecture:
- * - ETH -> Pod: deposits on ETH, AUTO-CLAIM on Pod (no claim needed)
+ * - ETH -> Pod: deposits on ETH, claimable on Pod once Sepolia block is finalized
  * - Pod -> ETH: deposits on Pod, claims on ETH with aggregated validator signatures
  * - Only ERC20 tokens supported (wrap ETH to WETH)
  *
@@ -15,7 +15,6 @@ import { PodBridgeConfig, BridgeRequest, BridgeRequestWithType } from "../../lib
  *   - 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
  */
 export declare class PodBridgeTrackerClient {
@@ -46,19 +45,17 @@ export declare class PodBridgeTrackerClient {
     /**
      * Check if deposits can be claimed
      *
-     * New architecture:
-     * - ETH -> Pod: AUTO-CLAIM on Pod, no manual claim needed (always returns false)
+     * - ETH -> Pod: Claimable once the Sepolia deposit block is finalized
      * - Pod -> ETH: Manual claim needed on ETH with aggregated signatures
      *
      * @param deposit The bridge request to check
-     * @returns True if the deposit can be manually claimed (only Pod -> ETH direction)
+     * @returns True if the deposit can be claimed
      */
     canBeClaimed(deposit: BridgeRequest): Promise<boolean>;
     /**
      * Batch check claim status for multiple deposits
      *
-     * New architecture:
-     * - ETH -> Pod: AUTO-CLAIM on Pod (mark as claimed after finalization)
+     * - ETH -> Pod: isClaimed=false, isClaimable=true once Sepolia block is finalized
      * - Pod -> ETH: Check claim events on Source Chain
      *
      * @private
@@ -67,8 +64,7 @@ export declare class PodBridgeTrackerClient {
     /**
      * Batch check if multiple requests have been processed on-chain
      *
-     * New architecture:
-     * - ETH -> Pod: Auto-claimed after finalization
+     * - ETH -> Pod: Not auto-claimed; isClaimed reflects actual claim status
      * - Pod -> ETH: Check claim events on Source Chain
      *
      * @param deposits Array of deposits to check

package/dist/clients/tracker/client.js

@@ -11,7 +11,7 @@ const pod_tracker_service_1 = require("./pod-tracker.service");
  * to provide a unified view of bridge activity across both chains.
  *
  * Bridge Architecture:
- * - ETH -> Pod: deposits on ETH, AUTO-CLAIM on Pod (no claim needed)
+ * - ETH -> Pod: deposits on ETH, claimable on Pod once Sepolia block is finalized
  * - Pod -> ETH: deposits on Pod, claims on ETH with aggregated validator signatures
  * - Only ERC20 tokens supported (wrap ETH to WETH)
  *
@@ -20,7 +20,6 @@ const pod_tracker_service_1 = require("./pod-tracker.service");
  *   - 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 {
@@ -107,18 +106,17 @@ class PodBridgeTrackerClient {
     /**
      * Check if deposits can be claimed
      *
-     * New architecture:
-     * - ETH -> Pod: AUTO-CLAIM on Pod, no manual claim needed (always returns false)
+     * - ETH -> Pod: Claimable once the Sepolia deposit block is finalized
      * - Pod -> ETH: Manual claim needed on ETH with aggregated signatures
      *
      * @param deposit The bridge request to check
-     * @returns True if the deposit can be manually claimed (only Pod -> ETH direction)
+     * @returns True if the deposit can be claimed
      */
     async canBeClaimed(deposit) {
-        // ETH -> Pod deposits have AUTO-CLAIM on Pod, no manual claim needed
         if (deposit.deposit.chain === pod_bridge_types_1.BridgeChain.SOURCE_CHAIN) {
-            // Auto-claim on Pod - nothing to claim manually
-            return false;
+            // ETH -> Pod: claimable once the deposit block is finalized on Sepolia
+            const isFinalized = await this.sourceChainTracker.isBlockFinalized(deposit.deposit.blockNumber);
+            return isFinalized && !deposit.isClaimed;
         }
         else {
             // POD -> ETH deposits need manual claim on ETH
@@ -129,8 +127,7 @@ class PodBridgeTrackerClient {
     /**
      * Batch check claim status for multiple deposits
      *
-     * New architecture:
-     * - ETH -> Pod: AUTO-CLAIM on Pod (mark as claimed after finalization)
+     * - ETH -> Pod: isClaimed=false, isClaimable=true once Sepolia block is finalized
      * - Pod -> ETH: Check claim events on Source Chain
      *
      * @private
@@ -200,8 +197,7 @@ class PodBridgeTrackerClient {
     /**
      * Batch check if multiple requests have been processed on-chain
      *
-     * New architecture:
-     * - ETH -> Pod: Auto-claimed after finalization
+     * - ETH -> Pod: Not auto-claimed; isClaimed reflects actual claim status
      * - Pod -> ETH: Check claim events on Source Chain
      *
      * @param deposits Array of deposits to check
@@ -210,8 +206,6 @@ class PodBridgeTrackerClient {
     async areRequestsProcessed(deposits) {
         if (deposits.length === 0)
             return [];
-        // 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 Source Chain for Pod -> ETH deposits
@@ -220,8 +214,8 @@ class PodBridgeTrackerClient {
             : 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;
+                // ETH -> Pod: isClaimed is set during updateClaimStatus
+                return d.isClaimed;
             }
             else {
                 // Pod -> ETH: Check claim event on Source Chain

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

@@ -110,11 +110,20 @@ class SourceChainTrackerService {
     async getClaimEvents(deposits) {
         const uniqueRecipients = [...new Set(deposits.map(d => d.deposit.destination))];
         const allClaimLogs = [];
+        const startBlock = this.config.deploymentBlock ?? 0;
+        const currentBlock = await this.provider.getBlockNumber();
+        const BLOCK_BATCH_SIZE = 10000;
         for (const recipient of uniqueRecipients) {
             // 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);
+            for (let start = startBlock; start <= currentBlock; start += BLOCK_BATCH_SIZE) {
+                const end = Math.min(start + BLOCK_BATCH_SIZE - 1, currentBlock);
+                const claimLogs = await this.bridge.queryFilter(claimFilter, start, end);
+                allClaimLogs.push(...claimLogs);
+                if (start + BLOCK_BATCH_SIZE <= currentBlock) {
+                    await new Promise(resolve => setTimeout(resolve, 100));
+                }
+            }
         }
         console.log(`[SourceChain] Found ${allClaimLogs.length} claims`);
         const claimedMap = new Map();

package/package.json

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