@zeroxyz/cli 0.0.7 → 0.0.8

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command as Command8 } from "commander";
 // package.json
 var package_default = {
   name: "@zeroxyz/cli",
-  version: "0.0.7",
+  version: "0.0.8",
   type: "module",
   bin: {
     zero: "dist/index.js",
@@ -26,8 +26,9 @@ var package_default = {
     dev: "tsx src/index.ts",
     cli: "ZERO_API_URL=http://localhost:1111 tsx src/index.ts",
     "test:integration": "vitest run --project integration",
+    "test:online": "vitest run --project online",
     "test:unit": "vitest run --project unit",
-    test: "pnpm run test:integration",
+    test: "pnpm run test:unit && pnpm run test:integration",
     typecheck: "tsc"
   },
   dependencies: {
@@ -43,7 +44,10 @@ var package_default = {
     zod: "^4.3.5"
   },
   devDependencies: {
+    "@hono/node-server": "^1.19.13",
     "@types/node": "^25.0.7",
+    "@x402/hono": "^2.9.0",
+    hono: "^4.12.12",
     tsup: "^8.5.1",
     tsx: "^4.21.0",
     typescript: "^5.9.3",
@@ -105,7 +109,7 @@ var configCommand = (_appContext) => new Command("config").description("View or
 import { Command as Command2 } from "commander";
 var detectPaymentRequirement = (headers, status) => {
   if (status !== 402) return null;
-  const x402Header = headers.get("x-payment-required");
+  const x402Header = headers.get("payment-required") ?? headers.get("x-payment-required");
   if (x402Header) {
     try {
       const decoded = JSON.parse(
@@ -929,7 +933,7 @@ import {
   encodePaymentSignatureHeader
 } from "@x402/core/http";
 import { ExactEvmScheme } from "@x402/evm/exact/client";
-import { Challenge } from "mppx";
+import { Challenge, Receipt } from "mppx";
 import { Mppx, tempo } from "mppx/client";
 import {
   createPublicClient,
@@ -937,11 +941,16 @@ import {
   formatUnits,
   http
 } from "viem";
-import { base } from "viem/chains";
+import { base, baseSepolia } from "viem/chains";
 var USDC_BASE = "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913";
+var USDC_BASE_SEPOLIA = "0x036CbD53842c5426634e7929541eC2318f3dCF7e";
 var USDC_TEMPO = "0x20c000000000000000000000b9537d11c60e8b50";
+var PATHUSD_TEMPO = "0x20c0000000000000000000000000000000000000";
 var BASE_CHAIN_ID = 8453;
 var TEMPO_CHAIN_ID = 4217;
+var TEMPO_TESTNET_CHAIN_ID = 42431;
+var X402_PAYMENT_MAX_ATTEMPTS = 6;
+var X402_PAYMENT_RETRY_DELAY_MS = 300;
 var calculateBuffer = (baseBalance) => {
   const twentyFivePercent = baseBalance / 4n;
   const twoDollars = 2000000n;
@@ -955,6 +964,14 @@ var tempoChain = {
     default: { http: ["https://rpc.tempo.xyz"] }
   }
 };
+var tempoTestnetChain = {
+  id: TEMPO_TESTNET_CHAIN_ID,
+  name: "Tempo Testnet",
+  nativeCurrency: { name: "USD", symbol: "USD", decimals: 18 },
+  rpcUrls: {
+    default: { http: ["https://rpc.moderato.tempo.xyz"] }
+  }
+};
 var ERC20_BALANCE_ABI = [
   {
     inputs: [{ name: "account", type: "address" }],
@@ -1053,47 +1070,84 @@ var PaymentService = class {
     }
     throw new Error("Unrecognized 402 payment protocol");
   };
-  payX402 = async (url, request, raw, maxPay) => {
-    const headerValue = Buffer.from(JSON.stringify(raw)).toString("base64");
-    const paymentRequired = decodePaymentRequiredHeader(headerValue);
-    const requirement = paymentRequired.accepts[0];
-    if (!requirement) {
-      throw new Error("No accepted payment methods in x402 challenge");
+  toX402RawChallenge = (headerValue) => {
+    try {
+      return JSON.parse(Buffer.from(headerValue, "base64").toString("utf8"));
+    } catch {
+      return { encoded: headerValue };
     }
-    const amountUsdc = formatUnits(BigInt(requirement.amount), 6);
-    if (maxPay && Number.parseFloat(amountUsdc) > Number.parseFloat(maxPay)) {
-      throw new Error(
-        `Payment of ${amountUsdc} USDC exceeds --max-pay ${maxPay}`
-      );
+  };
+  toX402HeaderValue = (raw) => {
+    const encoded = raw?.encoded;
+    if (typeof encoded === "string" && encoded.length > 0) {
+      return encoded;
     }
+    return Buffer.from(JSON.stringify(raw)).toString("base64");
+  };
+  payX402 = async (url, request, raw, maxPay) => {
     const client = this.getX402Client();
-    const paymentPayload = await client.createPaymentPayload(paymentRequired);
-    const signatureHeader = encodePaymentSignatureHeader(paymentPayload);
-    const retryResponse = await fetch(url, {
-      method: request.method,
-      headers: {
-        ...request.headers,
-        "PAYMENT-SIGNATURE": signatureHeader
-      },
-      body: request.body
-    });
-    let txHash = null;
-    const paymentResponseHeader = retryResponse.headers.get("payment-response");
-    if (paymentResponseHeader) {
-      try {
-        const settlement = decodePaymentResponseHeader(paymentResponseHeader);
-        txHash = settlement.transaction ?? null;
-      } catch {
+    let currentRaw = raw;
+    let amountUsdc = "0";
+    for (let attempt = 1; attempt <= X402_PAYMENT_MAX_ATTEMPTS; attempt++) {
+      const headerValue = this.toX402HeaderValue(currentRaw);
+      const paymentRequired = decodePaymentRequiredHeader(headerValue);
+      const requirement = paymentRequired.accepts[0];
+      if (!requirement) {
+        throw new Error("No accepted payment methods in x402 challenge");
       }
+      amountUsdc = formatUnits(BigInt(requirement.amount), 6);
+      if (maxPay && Number.parseFloat(amountUsdc) > Number.parseFloat(maxPay)) {
+        throw new Error(
+          `Payment of ${amountUsdc} USDC exceeds --max-pay ${maxPay}`
+        );
+      }
+      const paymentPayload = await client.createPaymentPayload(paymentRequired);
+      const signatureHeader = encodePaymentSignatureHeader(paymentPayload);
+      const retryResponse = await fetch(url, {
+        method: request.method,
+        headers: {
+          ...request.headers,
+          "PAYMENT-SIGNATURE": signatureHeader
+        },
+        body: request.body
+      });
+      if (retryResponse.status === 402) {
+        if (attempt >= X402_PAYMENT_MAX_ATTEMPTS) {
+          throw new Error(
+            `x402 payment failed after ${X402_PAYMENT_MAX_ATTEMPTS} attempts`
+          );
+        }
+        const nextHeader = retryResponse.headers.get("payment-required") ?? retryResponse.headers.get("x-payment-required");
+        if (!nextHeader) {
+          throw new Error(
+            "x402 payment retry returned 402 without payment-required header"
+          );
+        }
+        currentRaw = this.toX402RawChallenge(nextHeader);
+        await new Promise(
+          (resolve) => setTimeout(resolve, attempt * X402_PAYMENT_RETRY_DELAY_MS)
+        );
+        continue;
+      }
+      let txHash = null;
+      const paymentResponseHeader = retryResponse.headers.get("payment-response") ?? retryResponse.headers.get("x-payment-response");
+      if (paymentResponseHeader) {
+        try {
+          const settlement = decodePaymentResponseHeader(paymentResponseHeader);
+          txHash = settlement.transaction ?? null;
+        } catch {
+        }
+      }
+      return {
+        response: retryResponse,
+        protocol: "x402",
+        chain: "base",
+        txHash,
+        amount: amountUsdc,
+        asset: "USDC"
+      };
     }
-    return {
-      response: retryResponse,
-      protocol: "x402",
-      chain: "base",
-      txHash,
-      amount: amountUsdc,
-      asset: "USDC"
-    };
+    throw new Error("x402 payment failed");
   };
   payMpp = async (url, request, raw, maxPay) => {
     const wwwAuth = raw?.["www-authenticate"] ?? "";
@@ -1102,15 +1156,25 @@ var PaymentService = class {
       headers: { "www-authenticate": wwwAuth }
     });
     const challenge = Challenge.fromResponse(challengeResponse);
-    const amountRaw = challenge.request.amount;
+    const challengeRequest = challenge.request;
+    const amountRaw = challengeRequest.amount;
     const amountUsdc = formatUnits(BigInt(amountRaw), 6);
     if (maxPay && Number.parseFloat(amountUsdc) > Number.parseFloat(maxPay)) {
       throw new Error(
         `Payment of ${amountUsdc} USDC exceeds --max-pay ${maxPay}`
       );
     }
-    const tempoBalance = await this.getBalanceRaw("tempo");
+    const methodDetails = challengeRequest.methodDetails;
+    const challengeChainId = challengeRequest.chainId ?? methodDetails?.chainId;
+    const isTestnet = challengeChainId === TEMPO_TESTNET_CHAIN_ID;
+    const balanceChain = isTestnet ? "tempo-testnet" : "tempo";
+    const tempoBalance = await this.getBalanceRaw(balanceChain);
     if (tempoBalance < BigInt(amountRaw)) {
+      if (isTestnet) {
+        throw new Error(
+          `Insufficient pathUSD on Tempo testnet: have ${formatUnits(tempoBalance, 6)}, need ${amountUsdc}. Fund your wallet with the Tempo testnet faucet: https://docs.tempo.xyz/quickstart/faucet`
+        );
+      }
       await this.bridgeToTempo(BigInt(amountRaw));
     }
     const mppx = this.getMppxClient();
@@ -1124,24 +1188,42 @@ var PaymentService = class {
       },
       body: request.body
     });
+    let txHash = null;
+    try {
+      const receipt = Receipt.fromResponse(retryResponse);
+      txHash = receipt.reference ?? null;
+    } catch {
+    }
     return {
       response: retryResponse,
       protocol: "mpp",
       chain: "tempo",
-      txHash: null,
-      // MPP pull mode — server broadcasts, tx hash not returned in response
+      txHash,
       amount: amountUsdc,
       asset: "USDC"
     };
   };
+  resolveChainConfig = (chain) => {
+    switch (chain) {
+      case "base":
+        return { viemChain: base, token: USDC_BASE };
+      case "base-sepolia":
+        return { viemChain: baseSepolia, token: USDC_BASE_SEPOLIA };
+      case "tempo":
+        return { viemChain: tempoChain, token: USDC_TEMPO };
+      case "tempo-testnet":
+        return { viemChain: tempoTestnetChain, token: PATHUSD_TEMPO };
+    }
+  };
   getBalanceRaw = async (chain) => {
     if (!this.account) return 0n;
+    const { viemChain, token } = this.resolveChainConfig(chain);
     const client = createPublicClient({
-      chain: chain === "base" ? base : tempoChain,
+      chain: viemChain,
       transport: http()
     });
     const balance = await client.readContract({
-      address: chain === "base" ? USDC_BASE : USDC_TEMPO,
+      address: token,
       abi: ERC20_BALANCE_ABI,
       functionName: "balanceOf",
       args: [this.account.address]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zeroxyz/cli",
-	"version": "0.0.7",
+	"version": "0.0.8",
 	"type": "module",
 	"bin": {
 		"zero": "dist/index.js",
@@ -20,8 +20,9 @@
 		"dev": "tsx src/index.ts",
 		"cli": "ZERO_API_URL=http://localhost:1111 tsx src/index.ts",
 		"test:integration": "vitest run --project integration",
+		"test:online": "vitest run --project online",
 		"test:unit": "vitest run --project unit",
-		"test": "pnpm run test:integration",
+		"test": "pnpm run test:unit && pnpm run test:integration",
 		"typecheck": "tsc"
 	},
 	"dependencies": {
@@ -37,7 +38,10 @@
 		"zod": "^4.3.5"
 	},
 	"devDependencies": {
+		"@hono/node-server": "^1.19.13",
 		"@types/node": "^25.0.7",
+		"@x402/hono": "^2.9.0",
+		"hono": "^4.12.12",
 		"tsup": "^8.5.1",
 		"tsx": "^4.21.0",
 		"typescript": "^5.9.3",