openzoo 0.49.15 → 0.49.17

package/README.md

@@ -218,11 +218,11 @@ Pin the key with `OPENZOO_TUNNEL_TOKEN` if your IDE stores it. Keys never leave
   - **USDC** — `EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v`
   - **TOKEN** — `EVULoNF4DeMBN4dGiZiDfpiiTfNZgoCvXWWgaV3epump`
 
-  Both are first-class: each is the underlying of a live Solana rail the zoo quotes (USDC → yUSDCx, TOKEN → wTOKENx). That's the whole funding story — the shim converts whichever the 402 quotes internally, at payment time, for exactly the amount needed.
-- **SOL is optional but nice.** The gateway sponsors payment-transaction fees. If the wallet holds a pinch of SOL (~0.003), the internal conversion settles as its own transaction first; with zero SOL the conversion rides inside the gateway-sponsored payment transaction instead.
-- **The same wallet file also holds an EVM key.** `npx openzoo address` prints both addresses: the Solana one, and the EVM one used by the Base and Robinhood Chain rails. Fund Base with plain **USDC on Base** (nothing is converted); for Robinhood Chain, hold the plain token you want to pay with (USDG or a quoted memecoin) plus a sliver of RH ETH for gas — conversion happens automatically at payment time.
+  Both are first-class, and both are the **exact mints the 402 quotes**. That is the whole funding story: fund one, spend it. Nothing is wrapped, converted, or deposited into a vault on the way — the shim signs one transfer of the mint the row names.
+- **SOL is optional.** The gateway sponsors payment-transaction fees, so a wallet already holding the quoted mint needs no SOL. Keep a pinch (~0.003) only for the rent if the token account does not exist yet.
+- **The same wallet file also holds an EVM key.** `npx openzoo address` prints both addresses: the Solana one, and the EVM one used by the Base and Robinhood Chain rails. Fund Base with **USDC on Base** and Robinhood Chain with **USDG** — canonical Paxos USDG, which implements EIP-3009 directly. Same rule as Solana: nothing is converted.
 - **Spend caps.** The proxy refuses any single quote above `OPENZOO_MAX_USD_PER_CALL` (default $0.50).
-- `npx openzoo balance` — funds on every rail, grouped per chain: Solana (USDC + TOKEN + SOL), Base (USDC + ETH), Robinhood Chain (USDG, the ODDBALLER / IOU / ROBINHOODS memecoins, ETH). USD value where a price is known; `$?` where not. `npx openzoo address` — both funding addresses.
+- `npx openzoo balance` — funds on every rail, grouped per chain: Solana (USDC + TOKEN + LEOS + SOL), Base (USDC + ETH), Robinhood Chain (USDG + ETH). USD value where a price is known; `$?` where not. `npx openzoo address` — both funding addresses.
 
 ## Honest pricing note
 
@@ -231,7 +231,7 @@ Two bases, reported per call in the 402 (`extra.pricing`):
 - **Big bodies price at a counterfactual discount** (~10× cheaper than buying the same call direct) — the zoo's leCore memory means it never forwards your whole body upstream, and passes most of the savings on. Measured numbers at [benches.openzoo.fun](https://benches.openzoo.fun).
 - **Asks against a bound corpus price on the small forwarded body.** That is not a discount trick: a few hundred tokens at OpenRouter rates is far below the counterfactual price of shipping the corpus, which is the whole point of binding once.
 
-The receipt names which base you got; `extra.billedUsd` / `extra.directUsd` / `extra.savedUsd` let you check the math. (Card subscription pricing is a different path.)
+The receipt names which base you got; `extra.billedUsd` / `extra.directUsd` / `extra.savedUsd` let you check the math. Pay-per-request is the only lane — there is no subscription or API key.
 
 ## Payment rails
 
@@ -239,11 +239,11 @@ All three rails have settled real payments (2026-08-14):
 
 | rail | network | status |
 |---|---|---|
-| **Solana** (default) | `solana:5eykt…` | **live** — Token-2022 payment `TransferChecked`, partial-signed, gateway pays fees. Settles daily; tested end-to-end against the production 402. Settlement uses a wrapped mint as internal plumbing; you only ever hold and send USDC or TOKEN. Funding wrap is a 9-account ix (program pulls the deposit; old 5-account wrap is rejected `0x6a`). |
+| **Solana** (default) | `solana:5eykt…` | **live** — `TransferChecked` of the raw native mint, partial-signed, gateway pays fees. The message is a fixed four-instruction layout the facilitator checks by position: compute-unit limit, compute-unit price, `TransferChecked` third, memo fourth. You hold and send exactly what the 402 quotes. |
 | Base | `eip155:8453` | **live** — standard x402 EIP-3009 `transferWithAuthorization` against native USDC, batched settle through the facilitator. Fund the wallet's EVM address with USDC on Base; nothing is converted. |
-| Robinhood Chain | `eip155:4663` | **live** — EIP-3009, batched settle through the facilitator. Hold the plain token a row is quoted in (USDG, or the ODDBALLER / IOU / ROBINHOODS memecoins) and the shim converts exactly enough at payment time, automatically — two small on-chain steps paid from the wallet's own RH ETH. No gas? The error says exactly how much ETH to send and where. Default rail selection skips this chain unless `OPENZOO_ENABLE_RH=1`; `OPENZOO_RAIL=robinhood` forces it outright. |
+| Robinhood Chain | `eip155:4663` | **live** — EIP-3009, batched settle through the facilitator, against canonical Paxos USDG. Fund the wallet's EVM address with USDG; nothing is converted, and no gas token is needed to pay. Default rail selection skips this chain unless `OPENZOO_ENABLE_RH=1`; `OPENZOO_RAIL=robinhood` forces it outright. |
 
-`npx openzoo` prints the rails off a live 402 at startup, and the funding line is derived from those rails — so a new chain (the wrapped RH memecoin twins are in-deploy, for example) shows up without this package shipping again.
+`npx openzoo` prints the rails off a live 402 at startup, and the funding line is derived from those rails — so a new chain shows up without this package shipping again.
 
 The rail is chosen from the 402's `accepts[]` itself (Solana first). **Steer it with `OPENZOO_RAIL=solana|base|robinhood`** — the picker then uses only that rail, and errors clearly if the live 402 does not offer it. Amounts are always taken as raw units from the 402, and Solana decimals are read from the mint **on-chain** — never hardcoded. (The zoo's own pasted prompt used to hardcode `decimals = 6`; this package deliberately does not copy the bug.)
 

package/bin/openzoo.js

@@ -103,8 +103,6 @@ usage:
   npx openzoo vscode [path]   same, for VS Code
   npx openzoo editor [path]   whichever is installed (Cursor wins if both)
   npx openzoo claude [dir]        Claude Code CLI on the zoo (x402 per turn); --desktop for the app
-  npx openzoo xbot                @openzoobot on X: 1 free question per account, then x402
-                                    --once (single poll) --dry-run (answer, do not post)
                                           by default, --terminal for the Claude Code CLI
   npx openzoo launch <cmd> [args]   launch a TERMINAL Messages API client
                                     (claude, aider...) already pointed at the zoo
@@ -185,15 +183,6 @@ async function main() {
     case 'mcp':
       await (await import('../lib/mcp.js')).startMcp();
       break;
-    case 'xbot': {
-      const rest = process.argv.slice(3);
-      await (await import('../lib/xbot.js')).runXBot({
-        once: rest.includes('--once'),
-        dryRun: rest.includes('--dry-run'),
-        seed: rest.includes('--seed'),
-      });
-      break;
-    }
     case 'claude':
       await (await import('../lib/launch.js')).launchClaude(process.argv.slice(3));
       break;

package/lib/config.js

@@ -9,13 +9,13 @@ export const config = {
   // rate-limits hard under any real load (429s during demos). OPENZOO_RPC
   // overrides for anyone who wants their own.
   rpcUrl: process.env.OPENZOO_RPC || 'https://eu.fluxrpc.com?key=ab9278e1-6430-41ab-aee0-ac6b759a1fe4',
-  // Which accepts[] row to pay with, by extra.symbol (internal rail selector).
-  // wTOKENx3 (the HSyC twin of TOKEN, fixed wrap program) is the DEFAULT
-  // preference: a wallet holding TOKEN wraps-and-pays in TOKEN. The picker
-  // walks best-first and takes the first AFFORDABLE row, so wallets without
-  // TOKEN fall through to yUSDCx/USDC exactly as before. OPENZOO_TOKEN
-  // overrides.
-  token: process.env.OPENZOO_TOKEN || 'wTOKENx3',
+  // Which accepts[] row to prefer, by extra.symbol (internal rail selector).
+  // TOKEN is the default so a wallet holding it spends it. The picker walks
+  // best-first and takes the first AFFORDABLE row, so wallets without TOKEN
+  // fall through to USDC. This named the wTOKENx3 twin until the gateway went
+  // native — a symbol no row carries any more, which silently disabled the
+  // preference rather than erroring. OPENZOO_TOKEN overrides.
+  token: process.env.OPENZOO_TOKEN || 'TOKEN',
   // Force a rail: 'solana' | 'base' | 'robinhood'. Unset -> Solana-first order.
   // pickAccept errors clearly when the live 402 does not offer the forced rail.
   rail: (process.env.OPENZOO_RAIL || '').toLowerCase() || null,
@@ -32,18 +32,16 @@ export const config = {
 };
 
 /**
- * Assets a user can fund the burner wallet with. Both are first-class: each is
- * the underlying of a live Solana rail the zoo quotes (USDC -> yUSDCx,
- * TOKEN -> wTOKENx), and the shim wraps whichever one it needs at payment time,
- * for exactly the amount needed. Never mention one of these without the other.
+ * Assets a user can fund the burner wallet with. All three are first-class and
+ * these are the EXACT mints the 402 quotes — fund one, spend it, no conversion
+ * step. Never mention one of these without the others.
  */
 export const FUNDING_ASSETS = [
   { symbol: 'USDC', mint: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v' },
   { symbol: 'TOKEN', mint: 'EVULoNF4DeMBN4dGiZiDfpiiTfNZgoCvXWWgaV3epump' },
-  // LEOS settles through the wLEOSx twin, on the same terms as TOKEN. NINE
-  // decimals, and a LEGACY SPL mint rather than Token-2022 — balance reads must
-  // not assume either, so nothing here hardcodes them; decimals come off the
-  // mint on chain.
+  // LEOS is NINE decimals, and a LEGACY SPL mint rather than Token-2022 —
+  // balance reads must not assume either, so nothing here hardcodes them;
+  // decimals come off the mint on chain.
   { symbol: 'LEOS', mint: '5xgsnby6P9zqGK71J7H4yJLxzqPvNbC7rDZxNzjHmj7e' },
 ];
 
@@ -54,27 +52,45 @@ export const LEOS_MINT = FUNDING_ASSETS[2].mint;
 /**
  * EVM-side balances `openzoo balance` reports, grouped by rail. `usd` is a
  * known price (stables); null means "no honest price here" and the CLI prints
- * `?` rather than inventing one. The memecoins are Robinhood Chain ERC-20s
- * (18 decimals, verified on-chain 2026-08-14); their wrapped x402 twins are
- * in-deploy and will appear in the 402 itself when live.
+ * `?` rather than inventing one.
+ *
+ * ONLY LIST WHAT THE 402 ACCEPTS. The Robinhood memecoins (ODDBALLER / IOU /
+ * ROBINHOODS) were removed 2026-08-24 along with every wrapped rail: they were
+ * only ever payable through X402Wrapper twins the payer had to mint first, and
+ * the gateway no longer offers them. Reporting a balance the user cannot spend
+ * reads as "you have funds" and then fails at payment.
  */
 export const EVM_FUNDING_ASSETS = {
   base: [
     { symbol: 'USDC', address: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', decimals: 6, usd: 1 },
   ],
   robinhood: [
+    // Canonical Paxos USDG, pinned by ADDRESS: six impersonators on this chain
+    // answer symbol() == "USDG" with 41k-111k holders each.
     { symbol: 'USDG', address: '0x5fc5360D0400a0Fd4f2af552ADD042D716F1d168', decimals: 6, usd: 1 },
-    { symbol: 'ODDBALLER', address: '0x923eb7BD5B84a1a114CB57212cE2F2e87AE60E2A', decimals: 18, usd: null },
-    // note rides into the banner CA block: IOU is accepted by design, but its
-    // 402 row fails closed whenever DexScreener has no pool to price it from.
-    { symbol: 'IOU', address: '0xf391999FACbEE613D4024191Dd31060540BF0bEd', decimals: 18, usd: null, note: 'accepted — quoting paused while its price feed is down' },
-    { symbol: 'ROBINHOODS', address: '0xC42cF61C16aaC797b991cf9C1ac8Ae70bA74A286', decimals: 18, usd: null },
+  ],
+  arbitrum: [
+    { symbol: 'USDC', address: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831', decimals: 6, usd: 1 },
+  ],
+  optimism: [
+    { symbol: 'USDC', address: '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85', decimals: 6, usd: 1 },
+  ],
+  world: [
+    { symbol: 'USDC', address: '0x79A02482A880bCE3F13e09Da970dC34db4CD24d1', decimals: 6, usd: 1 },
   ],
 };
 
 /** RPC endpoint for an EVM rail name. */
 export function evmRpcFor(rail) {
-  return rail === 'base' ? config.baseRpcUrl : rail === 'robinhood' ? config.rhRpcUrl : null;
+  // A rail with no RPC here reports NO balance at all — silently. Every entry
+  // in EVM_FUNDING_ASSETS needs a row, or `openzoo balance` just omits the
+  // chain and the user concludes they hold nothing there.
+  if (rail === 'base') return config.baseRpcUrl;
+  if (rail === 'robinhood') return config.rhRpcUrl;
+  if (rail === 'arbitrum') return process.env.OPENZOO_ARBITRUM_RPC || 'https://arb1.arbitrum.io/rpc';
+  if (rail === 'optimism') return process.env.OPENZOO_OPTIMISM_RPC || 'https://mainnet.optimism.io';
+  if (rail === 'world') return process.env.OPENZOO_WORLD_RPC || 'https://worldchain-mainnet.gateway.tenderly.co';
+  return null;
 }
 
 /**
@@ -87,27 +103,19 @@ export function fundingLine(address) {
 }
 
 /**
- * What a user funds each rail with — UNDERLYING assets only, and only assets
- * this shim can actually spend from. The settlement mints the 402 quotes are
- * internal plumbing and never appear in user-facing copy.
- *
- * Solana: quoted in settlement mints, converted from plain USDC / TOKEN at
- *   payment time (lib/wrap.js).
- * Base:   quoted in native USDC — funded and spent as-is, no conversion.
- * Robinhood: the rail settles (real payments 2026-08-14) and the shim
- *   auto-converts at payment time (lib/evmwrap.js: approve + deposit into the
- *   quoted vault, discovered on-chain via asset() — never hardcoded). Fund
- *   with the PLAIN tokens; the two conversion txs are the wallet's own, so a
- *   sliver of RH ETH for gas is also needed — the `note` rides the hint.
+ * What a user funds each rail with. Every rail is quoted in the mint the user
+ * funds — fund it, spend it, nothing in between. This list used to distinguish
+ * "underlying" from the settlement mint because the 402 named Token-2022 and
+ * ERC-4626 twins the shim minted at payment time; that distinction is gone
+ * along with the twins, and the two are now the same asset on every rail.
  */
 export const RAIL_FUNDING = {
   solana: { label: 'Solana', assets: ['USDC', 'TOKEN', 'LEOS'] },
   base: { label: 'Base', assets: ['USDC'] },
-  robinhood: {
-    label: 'Robinhood Chain',
-    assets: ['USDG', 'ODDBALLER', 'IOU', 'ROBINHOODS'],
-    note: 'plus a sliver of RH ETH for the conversion gas',
-  },
+  robinhood: { label: 'Robinhood Chain', assets: ['USDG'] },
+  arbitrum: { label: 'Arbitrum', assets: ['USDC'] },
+  optimism: { label: 'Optimism', assets: ['USDC'] },
+  world: { label: 'World Chain', assets: ['USDC'] },
 };
 
 /**
@@ -163,7 +171,6 @@ export function unfundableRails(liveRailNames) {
  * What the resource will actually settle, right now, read off a live 402 —
  * never a hardcoded claim. Rails the code implements but the zoo is not
  * currently offering are reported separately so nobody funds a dead lane.
- * Underlying assets only: the wrapped settlement mints are internal plumbing.
  */
 export async function liveRails() {
   const r = await fetchHeaders(`${config.apiBase}/v1/chat/completions`, {

package/lib/demo.js

@@ -2,7 +2,6 @@ import { config, fundingLine } from './config.js';
 import { PayClient, UnderfundedError } from './pay.js';
 import { parse402, pickAccept, tokenBalance } from './x402.js';
 import { startSpinner, postWithUploadSignal } from './spinner.js';
-import { resolvePool, poolState, depositForShares } from './wrap.js';
 import { bindCorpus, askWithContext } from './hrr.js';
 import { forgetContext } from './contexts.js';
 
@@ -49,17 +48,15 @@ async function quoteFor(bodyObj, headers = {}) {
   }
 }
 
-/** Can the wallet cover this quote (directly or by converting its USDC)? */
+/**
+ * Can the wallet cover this quote? The 402 names the raw mint the wallet
+ * already holds, so this is one balance read — it used to also price the
+ * wallet's plain token against a wrap pool, which no longer exists.
+ */
 async function coverage(connection, owner, accept) {
   const need = BigInt(accept.maxAmountRequired);
   const have = await tokenBalance(connection, owner, accept.asset);
-  if (have.raw >= need) return { covered: true, usdcUi: null };
-  const pool = await resolvePool(connection, accept.asset).catch(() => null);
-  if (!pool) return { covered: false, usdcUi: 0 };
-  const { reserves, supply } = await poolState(connection, pool);
-  const deposit = depositForShares(need - have.raw, reserves, supply);
-  const underlying = await tokenBalance(connection, owner, pool.underlying.toBase58());
-  return { covered: underlying.raw >= deposit, usdcUi: underlying.ui ?? 0 };
+  return { covered: have.raw >= need, usdcUi: have.ui ?? 0 };
 }
 
 export async function runDemo() {
@@ -135,7 +132,7 @@ export async function runDemo() {
   if (!cov.covered) {
     console.log('3) wallet not funded yet, so stopping before payment.');
     console.log(`   quote : ≈ $${Number(x.billedUsd).toFixed(6)}`);
-    console.log(`   wallet: $${(cov.usdcUi ?? 0).toFixed(2)} USDC`);
+    console.log(`   wallet: ${cov.usdcUi ?? 0} ${accept.extra?.symbol || 'of the quoted asset'}`);
     console.log(`   fund  : ${fundingLine(pub)}`);
     console.log('   then re-run `npx openzoo demo`.');
     return;

package/lib/evm.js

@@ -1,7 +1,7 @@
 import crypto from 'node:crypto';
 import { createPublicClient, http } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
-import { evmChainId } from './x402.js';
+import { evmChainId, paymentEnvelope, encodeEnvelope } from './x402.js';
 
 const ERC20_ABI = [
   { type: 'function', name: 'balanceOf', stateMutability: 'view', inputs: [{ name: 'a', type: 'address' }], outputs: [{ type: 'uint256' }] },
@@ -26,10 +26,17 @@ export async function evmNativeBalance({ rpcUrl, owner }) {
 /**
  * EVM rails (Base eip155:8453; Robinhood Chain eip155:4663 behind OPENZOO_ENABLE_RH).
  *
- * Standard x402 v1 EVM "exact" scheme: an EIP-3009 transferWithAuthorization
- * typed-data signature; the facilitator submits it. X-PAYMENT = base64 of
- *   { x402Version: 1, scheme: "exact", network: "<as offered>",
- *     payload: { signature, authorization: { from, to, value, validAfter, validBefore, nonce } } }
+ * x402 EVM "exact" scheme: an EIP-3009 transferWithAuthorization typed-data
+ * signature; the facilitator submits it. The envelope (paymentEnvelope in
+ * x402.js) carries `resource` and the verbatim `accepted` row alongside the
+ * payload — a CDP facilitator validates the payload against a schema and
+ * answers "'paymentPayload' is invalid: must match one of [x402V2Pay…]"
+ * without either, before it looks at the money. MEASURED 2026-08-25.
+ *
+ * The typed data is still signed against the chain id parsed from the ROW's
+ * network: `verifyNetworkFor` may rewrite the envelope's network to whatever
+ * the verifier enforces ("base"), but the EIP-712 domain has to name the chain
+ * the token actually lives on or the signature recovers to nobody.
  *
  * IMPORTANT — the decimals landmine does not exist here BY CONSTRUCTION:
  * authorization.value is the raw uint256 straight from maxAmountRequired.
@@ -41,7 +48,7 @@ export async function evmNativeBalance({ rpcUrl, owner }) {
  * Chain (eip155:4663), both via EIP-3009 batched settlement through the
  * facilitator. Steer to a rail with OPENZOO_RAIL.
  */
-export async function buildEvmPayment({ accept, evmPrivateKey }) {
+export async function buildEvmPayment({ accept, evmPrivateKey, challenge }) {
   const chainId = evmChainId(accept.network);
   if (!chainId) throw new Error(`cannot parse EVM chain id from network ${accept.network}`);
   const account = privateKeyToAccount(evmPrivateKey);
@@ -77,22 +84,18 @@ export async function buildEvmPayment({ accept, evmPrivateKey }) {
     message: authorization,
   });
 
-  const envelope = {
-    x402Version: 1,
-    scheme: accept.scheme,
-    network: accept.network,
-    payload: {
-      signature,
-      authorization: {
-        ...authorization,
-        value: authorization.value.toString(),
-        validAfter: authorization.validAfter.toString(),
-        validBefore: authorization.validBefore.toString(),
-      },
+  const payload = {
+    signature,
+    authorization: {
+      ...authorization,
+      value: authorization.value.toString(),
+      validAfter: authorization.validAfter.toString(),
+      validBefore: authorization.validBefore.toString(),
     },
   };
   return {
-    header: Buffer.from(JSON.stringify(envelope), 'utf8').toString('base64'),
+    header: encodeEnvelope(paymentEnvelope(challenge, accept, payload)),
+    payload,
     ownerSignature: signature,
     from: account.address,
   };