@zeroxyz/cli 0.0.9 → 0.0.10

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.9",
+  version: "0.0.10",
   type: "module",
   bin: {
     zero: "dist/index.js",
@@ -151,11 +151,13 @@ var fetchCommand = (appContext2) => new Command2("fetch").description("Fetch a c
       if (options.data && !headers["content-type"]) {
         headers["content-type"] = "application/json";
       }
+      const log = (msg) => console.error(`  ${msg}`);
       const requestInit = {
         method: options.data ? "POST" : "GET",
         headers,
         body: options.data
       };
+      log(`Calling ${url}...`);
       const response = await fetch(url, requestInit);
       const paymentReq = detectPaymentRequirement(
         response.headers,
@@ -164,11 +166,15 @@ var fetchCommand = (appContext2) => new Command2("fetch").description("Fetch a c
       let finalResponse;
       let paymentMeta;
       if (paymentReq) {
+        log(
+          `Payment required (${paymentReq.protocol}) \u2014 preparing payment...`
+        );
         const result = await paymentService.handlePayment(
           url,
           requestInit,
           paymentReq,
-          options.maxPay
+          options.maxPay,
+          log
         );
         finalResponse = result.response;
         paymentMeta = {
@@ -178,6 +184,9 @@ var fetchCommand = (appContext2) => new Command2("fetch").description("Fetch a c
           amount: result.amount,
           asset: result.asset
         };
+        log(
+          `Paid ${result.amount} ${result.asset} via ${result.protocol} on ${result.chain}`
+        );
       } else {
         finalResponse = response;
       }
@@ -953,6 +962,7 @@ var ApiService = class {
 // src/services/payment-service.ts
 import {
   adaptViemWallet,
+  convertViemChainToRelayChain,
   createClient as createRelayClient,
   getClient as getRelayClient,
   MAINNET_RELAY_API
@@ -978,6 +988,12 @@ var PATHUSD_TEMPO = "0x20c0000000000000000000000000000000000000";
 var BASE_CHAIN_ID = 8453;
 var TEMPO_CHAIN_ID = 4217;
 var TEMPO_TESTNET_CHAIN_ID = 42431;
+var DEFAULT_MAX_DEPOSIT = "100";
+var buildRelayClientOptions = () => ({
+  baseApiUrl: MAINNET_RELAY_API,
+  source: "zero-cli",
+  chains: [convertViemChainToRelayChain(base)]
+});
 var calculateBuffer = (baseBalance) => {
   const twentyFivePercent = baseBalance / 4n;
   const twoDollars = 2000000n;
@@ -1016,14 +1032,11 @@ var PaymentService = class {
   relayInitialized = false;
   ensureRelayClient = () => {
     if (!this.relayInitialized) {
-      createRelayClient({
-        baseApiUrl: MAINNET_RELAY_API,
-        source: "zero-cli"
-      });
+      createRelayClient(buildRelayClientOptions());
       this.relayInitialized = true;
     }
   };
-  bridgeToTempo = async (requiredAmount) => {
+  bridgeToTempo = async (requiredAmount, onProgress) => {
     if (!this.account) throw new Error("No wallet configured");
     this.ensureRelayClient();
     const baseBalance = await this.getBalanceRaw("base");
@@ -1034,6 +1047,9 @@ var PaymentService = class {
         `Insufficient Base USDC to bridge: have ${formatUnits(baseBalance, 6)}, need ${formatUnits(bridgeAmount, 6)} (${formatUnits(requiredAmount, 6)} + ${formatUnits(buffer, 6)} buffer)`
       );
     }
+    onProgress?.(
+      `Bridging ${formatUnits(bridgeAmount, 6)} USDC from Base to Tempo...`
+    );
     const walletClient = createWalletClient({
       account: this.account,
       chain: base,
@@ -1047,7 +1063,10 @@ var PaymentService = class {
       amount: bridgeAmount.toString(),
       tradeType: "EXACT_INPUT",
       user: this.account.address,
-      recipient: this.account.address
+      recipient: this.account.address,
+      options: {
+        usePermit: true
+      }
     });
     let bridgeTxHash = null;
     await getRelayClient().actions.execute({
@@ -1061,17 +1080,25 @@ var PaymentService = class {
     });
     return bridgeTxHash;
   };
-  handlePayment = async (url, request, paymentRequirement, maxPay) => {
+  handlePayment = async (url, request, paymentRequirement, maxPay, onProgress) => {
     if (!this.account) {
       throw new Error(
         "No wallet configured \u2014 run `zero init` or set ZERO_PRIVATE_KEY"
       );
     }
     if (paymentRequirement.protocol === "x402") {
+      onProgress?.("Paying via x402 on Base...");
       return this.payX402(url, request, paymentRequirement.raw, maxPay);
     }
     if (paymentRequirement.protocol === "mpp") {
-      return this.payMpp(url, request, paymentRequirement.raw, maxPay);
+      onProgress?.("Paying via MPP on Tempo...");
+      return this.payMpp(
+        url,
+        request,
+        paymentRequirement.raw,
+        maxPay,
+        onProgress
+      );
     }
     throw new Error("Unrecognized 402 payment protocol");
   };
@@ -1120,16 +1147,35 @@ var PaymentService = class {
       asset: "USDC"
     };
   };
-  payMpp = async (url, request, _raw, maxPay) => {
+  payMpp = async (url, request, _raw, maxPay, onProgress) => {
     if (!this.account) throw new Error("No wallet configured");
     let capturedAmount = "0";
     const mppx = Mppx.create({
       polyfill: false,
-      methods: [tempo({ account: this.account })],
+      methods: [
+        tempo({
+          account: this.account,
+          maxDeposit: maxPay ?? DEFAULT_MAX_DEPOSIT
+        })
+      ],
       onChallenge: async (challenge) => {
         const challengeRequest = challenge.request;
-        const amountRaw = challengeRequest.amount;
-        capturedAmount = formatUnits(BigInt(amountRaw), 6);
+        const intent = challenge.intent;
+        let requiredRaw;
+        if (intent === "session") {
+          const suggestedDeposit = challengeRequest.suggestedDeposit;
+          if (suggestedDeposit) {
+            requiredRaw = BigInt(suggestedDeposit);
+          } else {
+            const depositStr = maxPay ?? DEFAULT_MAX_DEPOSIT;
+            requiredRaw = BigInt(
+              Math.floor(Number.parseFloat(depositStr) * 1e6)
+            );
+          }
+        } else {
+          requiredRaw = BigInt(challengeRequest.amount);
+        }
+        capturedAmount = formatUnits(requiredRaw, 6);
         if (maxPay && Number.parseFloat(capturedAmount) > Number.parseFloat(maxPay)) {
           throw new Error(
             `Payment of ${capturedAmount} USDC exceeds --max-pay ${maxPay}`
@@ -1139,14 +1185,15 @@ var PaymentService = class {
         const challengeChainId = challengeRequest.chainId ?? methodDetails?.chainId;
         const isTestnet = challengeChainId === TEMPO_TESTNET_CHAIN_ID;
         const balanceChain = isTestnet ? "tempo-testnet" : "tempo";
+        onProgress?.(`Checking Tempo balance...`);
         const tempoBalance = await this.getBalanceRaw(balanceChain);
-        if (tempoBalance < BigInt(amountRaw)) {
+        if (tempoBalance < requiredRaw) {
           if (isTestnet) {
             throw new Error(
               `Insufficient pathUSD on Tempo testnet: have ${formatUnits(tempoBalance, 6)}, need ${capturedAmount}. Fund your wallet with the Tempo testnet faucet: https://docs.tempo.xyz/quickstart/faucet`
             );
           }
-          await this.bridgeToTempo(BigInt(amountRaw));
+          await this.bridgeToTempo(requiredRaw, onProgress);
         }
         return void 0;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zeroxyz/cli",
-	"version": "0.0.9",
+	"version": "0.0.10",
 	"type": "module",
 	"bin": {
 		"zero": "dist/index.js",