openzoo 0.9.1 → 0.9.2

package/lib/pay.js

@@ -3,7 +3,7 @@ import { getAssociatedTokenAddressSync } from '@solana/spl-token';
 import { config, fundingLine } from './config.js';
 import { loadOrCreateWallet } from './wallet.js';
 import {
-  parse402, pickAccept, railOf, buildPaymentOnline, tokenBalance,
+  parse402, orderAccepts, railOf, buildPaymentOnline, tokenBalance,
   receiptLine, decodeSettleHeader,
 } from './x402.js';
 import { buildEvmPayment, evmTokenBalance } from './evm.js';
@@ -180,15 +180,41 @@ export class PayClient {
 
     const quote = parse402(await first.json());
     // config.rail (OPENZOO_RAIL) steers every front — proxy, demo, MCP — since
-    // they all pay through this one call site.
-    const accept = pickAccept(quote, config.token, { allowRH: this.allowRH, forceRail: config.rail });
-    const billedUsd = Number(accept?.extra?.billedUsd ?? NaN);
-    if (Number.isFinite(billedUsd) && billedUsd > config.maxUsdPerCall) {
-      throw new QuoteTooHighError(billedUsd, quote);
-    }
-
+    // they all pay through this one call site. The wallet pays with whatever
+    // it HOLDS: every offered row is tried best-first, and only when NONE is
+    // affordable does the call fail — never because the first-choice asset
+    // alone ran dry while another funded one sat in the wallet.
+    const candidates = orderAccepts(quote, config.token, { allowRH: this.allowRH, forceRail: config.rail });
     onStage?.('quoted');
-    const payment = await this.buildPaymentFor(accept, onStage);
+    let accept = null;
+    let payment = null;
+    const fundErrs = [];
+    let tooHigh = null;
+    for (const cand of candidates) {
+      const billedUsd = Number(cand?.extra?.billedUsd ?? NaN);
+      if (Number.isFinite(billedUsd) && billedUsd > config.maxUsdPerCall) {
+        tooHigh = tooHigh || new QuoteTooHighError(billedUsd, quote);
+        continue;
+      }
+      try {
+        payment = await this.buildPaymentFor(cand, onStage);
+        accept = cand;
+        break;
+      } catch (e) {
+        const funding = e instanceof UnderfundedError
+          || e?.name === 'UnderlyingShortError' || e?.name === 'NeedsGasError';
+        if (!funding) throw e;
+        fundErrs.push({ sym: cand?.extra?.symbol || cand?.asset, err: e });
+      }
+    }
+    if (!payment) {
+      if (!fundErrs.length && tooHigh) throw tooHigh;
+      if (fundErrs.length === 1) throw fundErrs[0].err;
+      throw new UnderfundedError(candidates[0], null, this.address, {
+        line: `No offered payment row is affordable from this wallet (tried ${fundErrs.length}):\n`
+          + fundErrs.map(({ sym, err }) => `  · ${sym}: ${err.message.replace(/^openzoo wallet underfunded: /, '')}`).join('\n'),
+      });
+    }
     onStage?.('paying');
     const response = await fetch(url, {
       ...init,

package/lib/x402.js

@@ -74,8 +74,20 @@ export function evmChainId(network) {
  * but RH stays opt-in for DEFAULT selection because its settlement asset has
  * no auto-conversion path here.
  */
-export function pickAccept(body, preferredSymbol, { allowRH = false, forceRail = null } = {}) {
+/**
+ * ALL payable rows from a 402, best-first. The wallet pays with whatever it
+ * HOLDS — the caller walks this list and takes the first affordable row, so
+ * a wallet rich in TOKEN but short of USDC pays the TOKEN row instead of
+ * erroring on the USDC one. Preference order within the list: the preferred
+ * symbol, then the rest of Solana (sponsored fees), then Base, then Robinhood
+ * (gated — paying there costs the wallet its own gas).
+ */
+export function orderAccepts(body, preferredSymbol, { allowRH = false, forceRail = null } = {}) {
   const rows = parse402(body).accepts.filter((a) => a?.scheme === 'exact');
+  const bySym = (list) => [
+    ...list.filter((a) => a?.extra?.symbol === preferredSymbol),
+    ...list.filter((a) => a?.extra?.symbol !== preferredSymbol),
+  ];
   if (forceRail) {
     const want = String(forceRail).toLowerCase();
     if (!['solana', 'base', 'robinhood', 'evm'].includes(want)) {
@@ -88,19 +100,24 @@ export function pickAccept(body, preferredSymbol, { allowRH = false, forceRail =
         `OPENZOO_RAIL=${want} but the live 402 offers no ${want} rail (offered: ${offered.join(', ') || 'none'})`,
       );
     }
-    return match.find((a) => a?.extra?.symbol === preferredSymbol) || match[0];
+    return bySym(match);
+  }
+  const out = [
+    ...bySym(rows.filter((a) => railOf(a) === 'solana')),
+    ...rows.filter((a) => railOf(a) === 'base'),
+    ...rows.filter((a) => railOf(a) === 'evm'),
+    ...(allowRH ? rows.filter((a) => railOf(a) === 'robinhood') : []),
+  ];
+  if (!out.length) {
+    throw new Error(rows.some((a) => railOf(a) === 'robinhood')
+      ? 'only Robinhood Chain rails offered — set OPENZOO_ENABLE_RH=1 or OPENZOO_RAIL=robinhood to use them (the rail settles; you must hold its settlement asset, see https://x402.accrue.fund/start)'
+      : 'no payable rail in 402 accepts[]');
   }
-  const sol = rows.filter((a) => railOf(a) === 'solana');
-  if (sol.length) return sol.find((a) => a?.extra?.symbol === preferredSymbol) || sol[0];
-  const base = rows.filter((a) => railOf(a) === 'base');
-  if (base.length) return base[0];
-  const evm = rows.filter((a) => railOf(a) === 'evm');
-  if (evm.length) return evm[0];
-  const rh = rows.filter((a) => railOf(a) === 'robinhood');
-  if (allowRH && rh.length) return rh[0];
-  throw new Error(rh.length
-    ? 'only Robinhood Chain rails offered — set OPENZOO_ENABLE_RH=1 or OPENZOO_RAIL=robinhood to use them (the rail settles; you must hold its settlement asset, see https://x402.accrue.fund/start)'
-    : 'no payable rail in 402 accepts[]');
+  return out;
+}
+
+export function pickAccept(body, preferredSymbol, opts = {}) {
+  return orderAccepts(body, preferredSymbol, opts)[0];
 }
 
 const mintCache = new Map();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Local x402-paying proxy + MCP server for openzoo.fun — point any OpenAI-compatible harness (Cursor, Claude Code, aider, SDKs) at localhost and it pays per call from a local burner wallet. Solana and Base rails live; Robinhood experimental.",
   "license": "MIT",
   "type": "module",