moltspay 0.9.3 → 0.9.6

package/dist/cli/index.js

@@ -43,7 +43,20 @@ var CHAINS = {
     name: "Base",
     chainId: 8453,
     rpc: "https://mainnet.base.org",
+    tokens: {
+      USDC: {
+        address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+        decimals: 6,
+        symbol: "USDC"
+      },
+      USDT: {
+        address: "0xfde4C96c8593536E31F229EA8f37b2ADa2699bb2",
+        decimals: 6,
+        symbol: "USDT"
+      }
+    },
     usdc: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+    // deprecated, for backward compat
     explorer: "https://basescan.org/address/",
     explorerTx: "https://basescan.org/tx/",
     avgBlockTime: 2
@@ -52,6 +65,18 @@ var CHAINS = {
     name: "Polygon",
     chainId: 137,
     rpc: "https://polygon-rpc.com",
+    tokens: {
+      USDC: {
+        address: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
+        decimals: 6,
+        symbol: "USDC"
+      },
+      USDT: {
+        address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
+        decimals: 6,
+        symbol: "USDT"
+      }
+    },
     usdc: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
     explorer: "https://polygonscan.com/address/",
     explorerTx: "https://polygonscan.com/tx/",
@@ -61,6 +86,18 @@ var CHAINS = {
     name: "Ethereum",
     chainId: 1,
     rpc: "https://eth.llamarpc.com",
+    tokens: {
+      USDC: {
+        address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+        decimals: 6,
+        symbol: "USDC"
+      },
+      USDT: {
+        address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+        decimals: 6,
+        symbol: "USDT"
+      }
+    },
     usdc: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
     explorer: "https://etherscan.io/address/",
     explorerTx: "https://etherscan.io/tx/",
@@ -71,6 +108,19 @@ var CHAINS = {
     name: "Base Sepolia",
     chainId: 84532,
     rpc: "https://sepolia.base.org",
+    tokens: {
+      USDC: {
+        address: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+        decimals: 6,
+        symbol: "USDC"
+      },
+      USDT: {
+        address: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+        // Same as USDC on testnet (no official USDT)
+        decimals: 6,
+        symbol: "USDT"
+      }
+    },
     usdc: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
     explorer: "https://sepolia.basescan.org/address/",
     explorerTx: "https://sepolia.basescan.org/tx/",
@@ -80,6 +130,19 @@ var CHAINS = {
     name: "Sepolia",
     chainId: 11155111,
     rpc: "https://rpc.sepolia.org",
+    tokens: {
+      USDC: {
+        address: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
+        decimals: 6,
+        symbol: "USDC"
+      },
+      USDT: {
+        address: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
+        // Same as USDC on testnet
+        decimals: 6,
+        symbol: "USDT"
+      }
+    },
     usdc: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
     explorer: "https://sepolia.etherscan.io/address/",
     explorerTx: "https://sepolia.etherscan.io/tx/",
@@ -166,8 +229,13 @@ var MoltsPayClient = class {
    * 
    * This is GASLESS for the client - server pays gas to claim payment.
    * This is PAY-FOR-SUCCESS - payment only claimed if service succeeds.
+   * 
+   * @param serverUrl - Server URL
+   * @param service - Service ID
+   * @param params - Service parameters
+   * @param options - Payment options (token selection)
    */
-  async pay(serverUrl, service, params) {
+  async pay(serverUrl, service, params, options = {}) {
     if (!this.wallet || !this.walletData) {
       throw new Error("Client not initialized. Run: npx moltspay init");
     }
@@ -214,12 +282,25 @@ var MoltsPayClient = class {
     }
     const amount = Number(amountRaw) / 1e6;
     this.checkLimits(amount);
-    console.log(`[MoltsPay] Signing payment: $${amount} USDC (gasless)`);
+    let token = options.token || "USDC";
+    if (options.autoSelect) {
+      const balances = await this.getBalance();
+      if (balances.usdc >= amount) {
+        token = "USDC";
+      } else if (balances.usdt >= amount) {
+        token = "USDT";
+      } else {
+        throw new Error(`Insufficient balance: need $${amount}, have ${balances.usdc} USDC / ${balances.usdt} USDT`);
+      }
+    }
+    console.log(`[MoltsPay] Signing payment: $${amount} ${token} (gasless)`);
     const payTo = req.payTo || req.resource;
     if (!payTo) {
       throw new Error("Missing payTo address in payment requirements");
     }
-    const authorization = await this.signEIP3009(payTo, amount, chain);
+    const authorization = await this.signEIP3009(payTo, amount, chain, token);
+    const tokenConfig = chain.tokens[token];
+    const tokenName = token === "USDC" ? "USD Coin" : "Tether USD";
     const payload = {
       x402Version: X402_VERSION,
       payload: authorization,
@@ -227,11 +308,11 @@ var MoltsPayClient = class {
       accepted: {
         scheme: "exact",
         network,
-        asset: req.asset || chain.usdc,
+        asset: tokenConfig.address,
         amount: amountRaw,
         payTo,
         maxTimeoutSeconds: req.maxTimeoutSeconds || 300,
-        extra: req.extra || { name: "USD Coin", version: "2" }
+        extra: req.extra || { name: tokenName, version: "2" }
       }
     };
     const paymentHeader = Buffer.from(JSON.stringify(payload)).toString("base64");
@@ -255,12 +336,14 @@ var MoltsPayClient = class {
   /**
    * Sign EIP-3009 transferWithAuthorization (GASLESS)
    * This only signs - no on-chain transaction, no gas needed.
+   * Supports both USDC and USDT.
    */
-  async signEIP3009(to, amount, chain) {
+  async signEIP3009(to, amount, chain, token = "USDC") {
     const validAfter = 0;
     const validBefore = Math.floor(Date.now() / 1e3) + 3600;
     const nonce = import_ethers.ethers.hexlify(import_ethers.ethers.randomBytes(32));
-    const value = BigInt(Math.floor(amount * 1e6)).toString();
+    const tokenConfig = chain.tokens[token];
+    const value = BigInt(Math.floor(amount * 10 ** tokenConfig.decimals)).toString();
     const authorization = {
       from: this.wallet.address,
       to,
@@ -269,11 +352,12 @@ var MoltsPayClient = class {
       validBefore: validBefore.toString(),
       nonce
     };
+    const tokenName = token === "USDC" ? "USD Coin" : "Tether USD";
     const domain = {
-      name: "USD Coin",
+      name: tokenName,
       version: "2",
       chainId: chain.chainId,
-      verifyingContract: chain.usdc
+      verifyingContract: tokenConfig.address
     };
     const types = {
       TransferWithAuthorization: [
@@ -408,7 +492,7 @@ var MoltsPayClient = class {
     return { address: wallet.address, configDir };
   }
   /**
-   * Get wallet balance
+   * Get wallet balance (USDC, USDT, and native token)
    */
   async getBalance() {
     if (!this.wallet) {
@@ -421,12 +505,15 @@ var MoltsPayClient = class {
       throw new Error(`Unknown chain: ${this.config.chain}`);
     }
     const provider = new import_ethers.ethers.JsonRpcProvider(chain.rpc);
-    const nativeBalance = await provider.getBalance(this.wallet.address);
-    const usdcAbi = ["function balanceOf(address) view returns (uint256)"];
-    const usdc = new import_ethers.ethers.Contract(chain.usdc, usdcAbi, provider);
-    const usdcBalance = await usdc.balanceOf(this.wallet.address);
+    const tokenAbi = ["function balanceOf(address) view returns (uint256)"];
+    const [nativeBalance, usdcBalance, usdtBalance] = await Promise.all([
+      provider.getBalance(this.wallet.address),
+      new import_ethers.ethers.Contract(chain.tokens.USDC.address, tokenAbi, provider).balanceOf(this.wallet.address),
+      new import_ethers.ethers.Contract(chain.tokens.USDT.address, tokenAbi, provider).balanceOf(this.wallet.address)
+    ]);
     return {
-      usdc: parseFloat(import_ethers.ethers.formatUnits(usdcBalance, 6)),
+      usdc: parseFloat(import_ethers.ethers.formatUnits(usdcBalance, chain.tokens.USDC.decimals)),
+      usdt: parseFloat(import_ethers.ethers.formatUnits(usdtBalance, chain.tokens.USDT.decimals)),
       native: parseFloat(import_ethers.ethers.formatEther(nativeBalance))
     };
   }
@@ -886,16 +973,24 @@ var X402_VERSION3 = 2;
 var PAYMENT_REQUIRED_HEADER2 = "x-payment-required";
 var PAYMENT_HEADER2 = "x-payment";
 var PAYMENT_RESPONSE_HEADER = "x-payment-response";
-var USDC_ADDRESSES = {
-  "eip155:8453": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-  // Base mainnet
-  "eip155:84532": "0x036CbD53842c5426634e7929541eC2318f3dCF7e"
-  // Base Sepolia
+var TOKEN_ADDRESSES = {
+  "eip155:8453": {
+    USDC: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+    USDT: "0xfde4C96c8593536E31F229EA8f37b2ADa2699bb2"
+  },
+  "eip155:84532": {
+    USDC: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+    USDT: "0x036CbD53842c5426634e7929541eC2318f3dCF7e"
+    // Same as USDC on testnet
+  }
 };
-var USDC_DOMAIN = {
-  name: "USD Coin",
-  version: "2"
+var TOKEN_DOMAINS = {
+  USDC: { name: "USD Coin", version: "2" },
+  USDT: { name: "Tether USD", version: "2" }
 };
+function getAcceptedCurrencies(config) {
+  return config.acceptedCurrencies ?? [config.currency];
+}
 function loadEnvFile2() {
   const envPaths = [
     path2.join(process.cwd(), ".env"),
@@ -1007,6 +1102,9 @@ var MoltsPayServer = class {
       if (url.pathname === "/services" && req.method === "GET") {
         return this.handleGetServices(res);
       }
+      if (url.pathname === "/.well-known/agent-services.json" && req.method === "GET") {
+        return this.handleAgentServicesDiscovery(res);
+      }
       if (url.pathname === "/health" && req.method === "GET") {
         return await this.handleHealthCheck(res);
       }
@@ -1030,6 +1128,44 @@ var MoltsPayServer = class {
       this.sendJson(res, 500, { error: err.message || "Internal error" });
     }
   }
+  /**
+   * GET /.well-known/agent-services.json - Standard discovery endpoint
+   */
+  handleAgentServicesDiscovery(res) {
+    const services = this.manifest.services.map((s) => ({
+      id: s.id,
+      name: s.name,
+      description: s.description,
+      price: s.price,
+      currency: s.currency,
+      acceptedCurrencies: getAcceptedCurrencies(s),
+      input: s.input,
+      output: s.output,
+      available: this.skills.has(s.id)
+    }));
+    this.sendJson(res, 200, {
+      version: "1.0",
+      provider: {
+        name: this.manifest.provider.name,
+        description: this.manifest.provider.description,
+        wallet: this.manifest.provider.wallet,
+        chain: this.manifest.provider.chain || "base"
+      },
+      services,
+      endpoints: {
+        services: "/services",
+        execute: "/execute",
+        health: "/health"
+      },
+      payment: {
+        protocol: "x402",
+        version: X402_VERSION3,
+        network: this.networkId,
+        schemes: ["exact"],
+        mainnet: this.useMainnet
+      }
+    });
+  }
   /**
    * GET /services - List available services
    */
@@ -1040,6 +1176,7 @@ var MoltsPayServer = class {
       description: s.description,
       price: s.price,
       currency: s.currency,
+      acceptedCurrencies: getAcceptedCurrencies(s),
       input: s.input,
       output: s.output,
       available: this.skills.has(s.id)
@@ -1106,7 +1243,14 @@ var MoltsPayServer = class {
     if (!validation.valid) {
       return this.sendJson(res, 402, { error: validation.error });
     }
-    const requirements = this.buildPaymentRequirements(skill.config);
+    const paymentToken = this.detectPaymentToken(payment);
+    if (paymentToken && !this.isTokenAccepted(skill.config, paymentToken)) {
+      const accepted = getAcceptedCurrencies(skill.config);
+      return this.sendJson(res, 402, {
+        error: `Token ${paymentToken} not accepted. Accepted: ${accepted.join(", ")}`
+      });
+    }
+    const requirements = this.buildPaymentRequirements(skill.config, paymentToken);
     console.log(`[MoltsPay] Verifying payment...`);
     const verifyResult = await this.registry.verify(payment, requirements);
     if (!verifyResult.valid) {
@@ -1116,10 +1260,16 @@ var MoltsPayServer = class {
       });
     }
     console.log(`[MoltsPay] Verified by ${verifyResult.facilitator}`);
-    console.log(`[MoltsPay] Executing skill: ${service}`);
+    const timeoutSeconds = parseInt(process.env.SKILL_TIMEOUT_SECONDS || "1200");
+    console.log(`[MoltsPay] Executing skill: ${service} (timeout: ${timeoutSeconds}s)`);
     let result;
     try {
-      result = await skill.handler(params || {});
+      result = await Promise.race([
+        skill.handler(params || {}),
+        new Promise(
+          (_, reject) => setTimeout(() => reject(new Error(`Skill timeout after ${timeoutSeconds}s`)), timeoutSeconds * 1e3)
+        )
+      ]);
     } catch (err) {
       console.error("[MoltsPay] Skill execution failed:", err.message);
       return this.sendJson(res, 500, {
@@ -1155,12 +1305,15 @@ var MoltsPayServer = class {
   }
   /**
    * Return 402 with x402 payment requirements (v2 format)
+   * Includes requirements for all accepted currencies
    */
   sendPaymentRequired(config, res) {
-    const requirements = this.buildPaymentRequirements(config);
+    const acceptedTokens = getAcceptedCurrencies(config);
+    const accepts = acceptedTokens.map((token) => this.buildPaymentRequirements(config, token));
     const paymentRequired = {
       x402Version: X402_VERSION3,
-      accepts: [requirements],
+      accepts,
+      acceptedCurrencies: acceptedTokens,
       resource: {
         url: `/execute?service=${config.id}`,
         description: `${config.name} - $${config.price} ${config.currency}`,
@@ -1175,6 +1328,7 @@ var MoltsPayServer = class {
     res.end(JSON.stringify({
       error: "Payment required",
       message: `Service requires $${config.price} ${config.currency}`,
+      acceptedCurrencies: acceptedTokens,
       x402: paymentRequired
     }, null, 2));
   }
@@ -1197,20 +1351,47 @@ var MoltsPayServer = class {
   }
   /**
    * Build payment requirements for facilitator
+   * Returns requirements for the primary currency (USDC by default)
+   * Server accepts any of the acceptedCurrencies
    */
-  buildPaymentRequirements(config) {
+  buildPaymentRequirements(config, token) {
     const amountInUnits = Math.floor(config.price * 1e6).toString();
-    const usdcAddress = USDC_ADDRESSES[this.networkId];
+    const acceptedTokens = getAcceptedCurrencies(config);
+    const selectedToken = token && acceptedTokens.includes(token) ? token : acceptedTokens[0];
+    const tokenAddresses = TOKEN_ADDRESSES[this.networkId] || {};
+    const tokenAddress = tokenAddresses[selectedToken];
+    const tokenDomain = TOKEN_DOMAINS[selectedToken] || TOKEN_DOMAINS.USDC;
     return {
       scheme: "exact",
       network: this.networkId,
-      asset: usdcAddress,
+      asset: tokenAddress,
       amount: amountInUnits,
       payTo: this.manifest.provider.wallet,
       maxTimeoutSeconds: 300,
-      extra: USDC_DOMAIN
+      extra: tokenDomain
     };
   }
+  /**
+   * Detect which token is being used in the payment
+   */
+  detectPaymentToken(payment) {
+    const asset = payment.accepted?.asset || payment.payload?.asset;
+    if (!asset) return void 0;
+    const tokenAddresses = TOKEN_ADDRESSES[this.networkId] || {};
+    for (const [symbol, address] of Object.entries(tokenAddresses)) {
+      if (address.toLowerCase() === asset.toLowerCase()) {
+        return symbol;
+      }
+    }
+    return void 0;
+  }
+  /**
+   * Check if payment token is accepted for service
+   */
+  isTokenAccepted(config, token) {
+    const accepted = getAcceptedCurrencies(config);
+    return accepted.includes(token);
+  }
   async readBody(req) {
     return new Promise((resolve2, reject) => {
       let body = "";
@@ -1328,9 +1509,15 @@ var MoltsPayServer = class {
           error: `Service not found: ${service}`
         });
       }
+      const timeoutSeconds = parseInt(process.env.SKILL_TIMEOUT_SECONDS || "1200");
       let result;
       try {
-        result = await skill.handler(params || {});
+        result = await Promise.race([
+          skill.handler(params || {}),
+          new Promise(
+            (_, reject) => setTimeout(() => reject(new Error(`Skill timeout after ${timeoutSeconds}s`)), timeoutSeconds * 1e3)
+          )
+        ]);
         console.log(`[MoltsPay] /proxy: Skill succeeded, now settling payment...`);
       } catch (err) {
         console.error(`[MoltsPay] /proxy: Skill failed: ${err.message} - NOT settling`);
@@ -1404,18 +1591,22 @@ var MoltsPayServer = class {
   /**
    * Build payment requirements for proxy endpoint (uses provided wallet)
    */
-  buildProxyPaymentRequirements(config, wallet) {
+  buildProxyPaymentRequirements(config, wallet, token) {
     const amountInUnits = Math.floor(config.price * 1e6).toString();
-    const usdcAddress = USDC_ADDRESSES[this.networkId];
+    const acceptedTokens = getAcceptedCurrencies(config);
+    const selectedToken = token && acceptedTokens.includes(token) ? token : acceptedTokens[0];
+    const tokenAddresses = TOKEN_ADDRESSES[this.networkId] || {};
+    const tokenAddress = tokenAddresses[selectedToken];
+    const tokenDomain = TOKEN_DOMAINS[selectedToken] || TOKEN_DOMAINS.USDC;
     return {
       scheme: "exact",
       network: this.networkId,
-      asset: usdcAddress,
+      asset: tokenAddress,
       amount: amountInUnits,
       payTo: wallet,
       // Use provided wallet, not manifest
       maxTimeoutSeconds: 300,
-      extra: USDC_DOMAIN
+      extra: tokenDomain
     };
   }
   /**
@@ -1548,7 +1739,7 @@ program.command("status").description("Show wallet status and balance").option("
     return;
   }
   const config = client.getConfig();
-  let balance = { usdc: 0, native: 0 };
+  let balance = { usdc: 0, usdt: 0, native: 0 };
   try {
     balance = await client.getBalance();
   } catch (err) {
@@ -1565,7 +1756,7 @@ program.command("status").description("Show wallet status and balance").option("
     console.log("\n\u{1F4CA} MoltsPay Status\n");
     console.log(`   Wallet: ${client.address}`);
     console.log(`   Chain: ${config.chain}`);
-    console.log(`   Balance: ${balance.usdc.toFixed(2)} USDC`);
+    console.log(`   Balance: ${balance.usdc.toFixed(2)} USDC | ${balance.usdt.toFixed(2)} USDT`);
     console.log(`   Native: ${balance.native.toFixed(6)} ETH`);
     console.log("");
     console.log("   Limits:");
@@ -1809,7 +2000,7 @@ program.command("stop").description("Stop the running MoltsPay server").action(a
     process.exit(1);
   }
 });
-program.command("pay <server> <service> [params]").description("Pay for a service and get the result").option("--prompt <text>", "Prompt for the service").option("--image <path>", "Image URL or local file path").option("--json", "Output raw JSON only").action(async (server, service, paramsJson, options) => {
+program.command("pay <server> <service> [params]").description("Pay for a service and get the result").option("--prompt <text>", "Prompt for the service").option("--image <path>", "Image URL or local file path").option("--token <token>", "Token to pay with (USDC or USDT)", "USDC").option("--json", "Output raw JSON only").action(async (server, service, paramsJson, options) => {
   const client = new MoltsPayClient();
   if (!client.isInitialized) {
     console.error("\u274C Wallet not initialized. Run: npx moltspay init");
@@ -1844,6 +2035,7 @@ program.command("pay <server> <service> [params]").description("Pay for a servic
     process.exit(1);
   }
   const imageDisplay = params.image_url || (params.image_base64 ? `[local file: ${options.image}]` : null);
+  const token = (options.token || "USDC").toUpperCase();
   if (!options.json) {
     console.log(`
 \u{1F4B3} MoltsPay - Paying for service
@@ -1852,11 +2044,12 @@ program.command("pay <server> <service> [params]").description("Pay for a servic
     console.log(`   Service: ${service}`);
     console.log(`   Prompt: ${params.prompt}`);
     if (imageDisplay) console.log(`   Image: ${imageDisplay}`);
+    console.log(`   Token: ${token}`);
     console.log(`   Wallet: ${client.address}`);
     console.log("");
   }
   try {
-    const result = await client.pay(server, service, params);
+    const result = await client.pay(server, service, params, { token });
     if (options.json) {
       console.log(JSON.stringify(result));
     } else {