@envarai/envarpay 0.2.0-alpha.13 → 0.2.0-alpha.14

package/dist/commerce/chain.d.ts

@@ -14,7 +14,7 @@ export interface ExpiredUnusedProof {
     authorizationUsed: false;
 }
 /** Checks the canonical chain receipt and exact official-token Transfer. */
-export declare function evmReceiptVerifier(rpcUrls: Readonly<Record<string, string>>, confirmations?: number): (receipt: SettleResponse, payload: PaymentPayload, requirements: PaymentRequirements) => Promise<boolean>;
+export declare function evmReceiptVerifier(rpcUrls: Readonly<Record<string, string>>, confirmations?: number, confirmationWaitMs?: number): (receipt: SettleResponse, payload: PaymentPayload, requirements: PaymentRequirements) => Promise<boolean>;
 /** Locate an original EIP-3009 settlement even when facilitator lost its tx response. */
 export declare function evmSettlementRecovery(rpcUrls: Readonly<Record<string, string>>): {
     expiredUnusedProof: (payload: PaymentPayload, requirements: PaymentRequirements) => Promise<ExpiredUnusedProof | undefined>;

package/dist/commerce/chain.js

@@ -1,4 +1,4 @@
-import { createPublicClient, http, decodeEventLog, parseAbi } from 'viem';
+import { createPublicClient, http, decodeEventLog, parseAbi, TransactionReceiptNotFoundError } from 'viem';
 import { CommerceError } from './types.js';
 import { validateUrl } from './config.js';
 const abi = parseAbi(['event Transfer(address indexed from, address indexed to, uint256 value)']);
@@ -9,9 +9,11 @@ const officialUsdc = {
     'eip155:8453': '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
 };
 /** Checks the canonical chain receipt and exact official-token Transfer. */
-export function evmReceiptVerifier(rpcUrls, confirmations = 2) {
+export function evmReceiptVerifier(rpcUrls, confirmations = 2, confirmationWaitMs = 12000) {
     if (!Number.isInteger(confirmations) || confirmations < 1)
         throw new CommerceError('confirmation_policy', 'Positive confirmation depth required');
+    if (!Number.isInteger(confirmationWaitMs) || confirmationWaitMs < 0 || confirmationWaitMs > 30000)
+        throw new CommerceError('confirmation_policy', 'Confirmation wait must be between 0 and 30000 milliseconds');
     return async (receipt, payload, requirements) => {
         const rpc = rpcUrls[requirements.network];
         if (!rpc)
@@ -23,15 +25,38 @@ export function evmReceiptVerifier(rpcUrls, confirmations = 2) {
         const client = createPublicClient({ transport: http(rpc, { timeout: 15000, retryCount: 0 }) });
         if (await client.getChainId() !== chainId)
             return false;
-        const mined = await client.getTransactionReceipt({ hash: receipt.transaction });
-        if (mined.status !== 'success')
-            return false;
-        const block = await client.getBlock({ blockNumber: mined.blockNumber });
-        if (block.hash !== mined.blockHash)
-            return false;
-        const latest = await client.getBlockNumber();
-        if (latest - mined.blockNumber + 1n < BigInt(confirmations))
-            return false;
+        const deadline = Date.now() + confirmationWaitMs;
+        const wait = async () => {
+            const remaining = deadline - Date.now();
+            if (remaining <= 0)
+                return false;
+            await new Promise(resolve => setTimeout(resolve, Math.min(1000, remaining)));
+            return Date.now() < deadline;
+        };
+        let mined;
+        for (;;) {
+            try {
+                mined = await client.getTransactionReceipt({ hash: receipt.transaction });
+            }
+            catch (error) {
+                if (error instanceof TransactionReceiptNotFoundError) {
+                    if (await wait())
+                        continue;
+                    return false;
+                }
+                throw error;
+            }
+            if (mined.status !== 'success' || mined.transactionHash.toLowerCase() !== receipt.transaction.toLowerCase())
+                return false;
+            const block = await client.getBlock({ blockNumber: mined.blockNumber });
+            if (block.hash !== mined.blockHash)
+                return false;
+            const latest = await client.getBlockNumber({ cacheTime: 0 });
+            if (latest - mined.blockNumber + 1n >= BigInt(confirmations))
+                break;
+            if (!await wait())
+                return false;
+        }
         const auth = payload.payload.authorization;
         if (!auth?.from || !auth.nonce || auth.to?.toLowerCase() !== requirements.payTo.toLowerCase() || auth.value !== requirements.amount)
             return false;
@@ -131,8 +156,9 @@ export function evmSettlementRecovery(rpcUrls) {
             // RPC lookup; never reinterpret incomplete search as proof of non-payment.
             if (latest - BigInt(fromBlock) > 100000n)
                 throw new CommerceError('archive_reconciliation_required', 'Original authorization requires an archive log lookup');
-            for (let start = BigInt(fromBlock); start <= latest; start += 2000n) {
-                const end = start + 1999n < latest ? start + 1999n : latest;
+            // The default public Base RPCs limit eth_getLogs to 200-block ranges.
+            for (let start = BigInt(fromBlock); start <= latest; start += 200n) {
+                const end = start + 199n < latest ? start + 199n : latest;
                 const logs = await client.getLogs({ address: requirements.asset, event: authorizationAbi[0], args: { authorizer: auth.from, nonce: auth.nonce }, fromBlock: start, toBlock: end, strict: true });
                 const settled = logs.filter(log => !log.removed && log.transactionHash);
                 if (settled.length > 1)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@envarai/envarpay",
-  "version": "0.2.0-alpha.13",
+  "version": "0.2.0-alpha.14",
   "description": "Independent A2A service commerce, budgeted buyers and x402/MPP payments",
   "type": "module",
   "license": "MIT",