@zkp2p/cash 0.1.4 → 0.1.6

package/dist/index.js

@@ -607,10 +607,18 @@ function collectRelayTransactions(steps, sourceChainId) {
   for (const step of steps) {
     for (const item of step.items) {
       for (const tx of item.internalTxHashes ?? []) {
-        record({ hash: tx.txHash, chainId: tx.chainId });
+        record({
+          hash: tx.txHash,
+          chainId: tx.chainId,
+          ...tx.isBatchTx ? { isBatchTx: true } : {}
+        });
       }
       for (const tx of item.txHashes ?? []) {
-        record({ hash: tx.txHash, chainId: tx.chainId });
+        record({
+          hash: tx.txHash,
+          chainId: tx.chainId,
+          ...tx.isBatchTx ? { isBatchTx: true } : {}
+        });
       }
     }
   }
@@ -1330,6 +1338,97 @@ function createCashClient(options) {
     }
     throw errors.allowanceNotVisible(amount, lastReadError);
   }
+  async function waitForBaseSignerAfterRelay(client, cashoutSigner, sourceSigner, owner, sourceChainId, executed) {
+    if (sourceChainId !== BASE_CHAIN_ID) return;
+    const baseTransactions = (executed.transactions?.origin ?? []).filter(
+      (transaction) => transaction.chainId === BASE_CHAIN_ID
+    );
+    const batchIds = baseTransactions.filter((transaction) => transaction.isBatchTx === true).map((transaction) => transaction.hash);
+    const batchExecutionFailed = (cause) => errors.sourceExecutionFailed(cause, {
+      ...executed.requestId ? { requestId: executed.requestId } : {},
+      txHashes: executed.txHashes,
+      ...executed.transactions ? { transactions: executed.transactions } : {}
+    });
+    let batchTransactionHashes = [];
+    if (batchIds.length > 0) {
+      let batchError;
+      let batchesComplete = false;
+      let batchesSucceededWithoutReceipts = false;
+      for (let attempt = 0; attempt < 20; attempt++) {
+        try {
+          const statuses = await Promise.all(
+            batchIds.map((id) => sourceSigner.getCallsStatus({ id }))
+          );
+          if (statuses.some((status) => status.status === "failure")) {
+            throw batchExecutionFailed(new Error("Relay wallet call bundle failed"));
+          }
+          if (statuses.every((status) => status.status === "success")) {
+            const receiptGroups = statuses.map((status) => status.receipts ?? []);
+            if (receiptGroups.some((receipts) => receipts.length === 0)) {
+              batchError = new Error(
+                "Relay wallet call bundle did not include transaction receipts"
+              );
+              batchesSucceededWithoutReceipts = true;
+              break;
+            } else {
+              batchTransactionHashes = receiptGroups.flatMap(
+                (receipts) => receipts.map((receipt) => receipt.transactionHash)
+              );
+              batchesComplete = true;
+              break;
+            }
+          }
+        } catch (err) {
+          if (isCashError(err)) throw err;
+          batchError = err;
+        }
+        await sleep(250);
+      }
+      if (!batchesComplete) {
+        if (batchesSucceededWithoutReceipts) throw batchError;
+        throw batchExecutionFailed(
+          batchError ?? new Error("Relay wallet call bundle did not complete")
+        );
+      }
+    }
+    const hashes = [
+      ...baseTransactions.filter((transaction) => transaction.isBatchTx !== true).map((transaction) => transaction.hash),
+      ...batchTransactionHashes
+    ];
+    if (hashes.length === 0) return;
+    let transactions;
+    let lastLookupError;
+    for (let attempt = 0; attempt < 20; attempt++) {
+      try {
+        transactions = await Promise.all(
+          hashes.map((hash) => client.publicClient.getTransaction({ hash }))
+        );
+        break;
+      } catch (err) {
+        lastLookupError = err;
+        await sleep(250);
+      }
+    }
+    if (!transactions) throw lastLookupError;
+    const ownerNonces = transactions.filter((transaction) => transaction.from.toLowerCase() === owner.toLowerCase()).map((transaction) => transaction.nonce);
+    if (ownerNonces.length === 0) return;
+    const afterRelay = Math.max(...ownerNonces) + 1;
+    let lastNonceError;
+    for (let attempt = 0; attempt < 20; attempt++) {
+      try {
+        const pendingHex = await cashoutSigner.transport.request({
+          method: "eth_getTransactionCount",
+          params: [owner, "pending"]
+        });
+        if (Number(BigInt(pendingHex)) >= afterRelay) return;
+      } catch (err) {
+        lastNonceError = err;
+      }
+      await sleep(250);
+    }
+    if (lastNonceError) throw lastNonceError;
+    throw new Error(`Signer provider did not observe Relay nonce ${afterRelay - 1}`);
+  }
   return {
     capabilities,
     async sourceCapabilities() {
@@ -1401,6 +1500,22 @@ function createCashClient(options) {
           ...executed.transactions ? { transactions: executed.transactions } : {}
         };
         sourceResult = routedSource;
+        try {
+          await waitForBaseSignerAfterRelay(
+            client,
+            opts.signer,
+            sourceSigner,
+            owner,
+            input.source.chainId,
+            executed
+          );
+        } catch (err) {
+          if (isCashError(err)) throw err;
+          throw errors.sourceRouteCompletedCashoutFailed(
+            routedSource,
+            mapChainError("resolve same-chain Relay nonce", err)
+          );
+        }
         const attributedParams2 = { ...params2, txOverrides: attribution };
         const send2 = async () => {
           try {
@@ -1773,7 +1888,8 @@ var bigintString = z.string().regex(/^-?\d+$/, "expected a decimal bigint string
 var nonNegativeBigintString = z.string().regex(/^\d+$/, "expected a non-negative decimal bigint string");
 var relayTransactionJsonSchema = z.object({
   hash: z.string(),
-  chainId: z.number()
+  chainId: z.number(),
+  isBatchTx: z.boolean().optional()
 });
 var relayTransactionsJsonSchema = z.object({
   origin: z.array(relayTransactionJsonSchema),

package/dist/react.d.cts

@@ -1,5 +1,5 @@
 import { CurrencyType } from '@zkp2p/sdk';
-import { q as CashClient, E as EstimateInput, i as CashEstimate, B as CashoutOptions, h as CashoutResult, A as CashoutInput, T as TopUpResult, W as WithdrawResult, e as CashOrder } from './createCashClient-BbkfxILl.cjs';
+import { q as CashClient, E as EstimateInput, i as CashEstimate, B as CashoutOptions, h as CashoutResult, A as CashoutInput, T as TopUpResult, W as WithdrawResult, e as CashOrder } from './createCashClient-jUA_GNdh.cjs';
 import { WalletClient } from 'viem';
 import '@relayprotocol/relay-sdk';
 

package/dist/react.d.ts

@@ -1,5 +1,5 @@
 import { CurrencyType } from '@zkp2p/sdk';
-import { q as CashClient, E as EstimateInput, i as CashEstimate, B as CashoutOptions, h as CashoutResult, A as CashoutInput, T as TopUpResult, W as WithdrawResult, e as CashOrder } from './createCashClient-BbkfxILl.js';
+import { q as CashClient, E as EstimateInput, i as CashEstimate, B as CashoutOptions, h as CashoutResult, A as CashoutInput, T as TopUpResult, W as WithdrawResult, e as CashOrder } from './createCashClient-jUA_GNdh.js';
 import { WalletClient } from 'viem';
 import '@relayprotocol/relay-sdk';
 

package/dist/tools.cjs

@@ -2,7 +2,7 @@
 
 // package.json
 var package_default = {
-  version: "0.1.4"};
+  version: "0.1.6"};
 
 // src/tools/index.ts
 var bigintString = {

package/dist/tools.js

@@ -1,6 +1,6 @@
 // package.json
 var package_default = {
-  version: "0.1.4"};
+  version: "0.1.6"};
 
 // src/tools/index.ts
 var bigintString = {

package/llms.txt

@@ -3,8 +3,8 @@
 > Offramp-only SDK for the ZKP2P protocol: route any Relay-supported EVM source
 > asset to Base USDC, then cash out to fiat (Venmo, Revolut, Wise, Zelle, ...)
 > at the live Chainlink oracle market rate with zero spread and no centralized
-> off-ramp provider. The user is the maker, Peer handles the buyer side, and the
-> SDK exposes readable order state.
+> off-ramp provider. The user is the maker, a buyer pays them fiat and proves
+> the payment, and the SDK exposes readable order state.
 > Base-USDC flows are serializable through prepare paths; source-routed cashout
 > uses Relay execution first. React apps, Node services, and agent hosts use the
 > same typed surface.
@@ -59,9 +59,8 @@ Key facts:
 
 ## Links
 
-- Live demo: https://react-cashout-demo.vercel.app
-- Product page: https://peer.xyz/cash
 - npm: https://www.npmjs.com/package/@zkp2p/cash
+- Source: https://github.com/zkp2p/peer-cash
 
 ## Docs
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zkp2p/cash",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Peer Cash - offramp-only SDK for routing crypto to Base USDC, then cashing out to fiat at the live oracle market rate.",
   "license": "MIT",
   "author": "Peer (https://peer.xyz)",
@@ -12,7 +12,14 @@
   "publishConfig": {
     "access": "public"
   },
-  "homepage": "https://peer.xyz/cash",
+  "homepage": "https://github.com/zkp2p/peer-cash#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zkp2p/peer-cash.git"
+  },
+  "bugs": {
+    "url": "https://github.com/zkp2p/peer-cash/issues"
+  },
   "keywords": [
     "zkp2p",
     "peer",
@@ -98,7 +105,7 @@
   "dependencies": {
     "@relayprotocol/relay-sdk": "^6.1.3",
     "@zkp2p/sdk": "^0.8.1",
-    "zod": "^3.24.1"
+    "zod": "^3.25.76"
   },
   "peerDependencies": {
     "react": ">=18",
@@ -110,19 +117,19 @@
     }
   },
   "devDependencies": {
-    "@eslint/js": "^9.17.0",
-    "@types/node": "^22.10.2",
-    "@types/react": "^19.0.2",
+    "@eslint/js": "^9.39.5",
+    "@types/node": "^22.20.1",
+    "@types/react": "^19.2.17",
     "@types/react-test-renderer": "19.1.0",
-    "eslint": "^9.17.0",
-    "eslint-config-prettier": "^9.1.0",
-    "prettier": "^3.4.2",
-    "react": "^19.0.0",
+    "eslint": "^9.39.5",
+    "eslint-config-prettier": "^9.1.2",
+    "prettier": "^3.9.5",
+    "react": "^19.2.7",
     "react-test-renderer": "19.2.7",
-    "tsup": "^8.3.5",
-    "typescript": "^5.7.2",
-    "typescript-eslint": "^8.18.1",
-    "viem": "^2.55.0",
+    "tsup": "^8.5.1",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.63.0",
+    "viem": "^2.55.1",
     "vitest": "^4.1.10"
   }
 }