moltspay 1.2.0 → 1.2.1

package/dist/index.mjs

@@ -30350,8 +30350,8 @@ init_esm_shims();
 import { readFileSync, existsSync } from "fs";
 import * as path2 from "path";
 var X402_VERSION = 2;
-var CDP_MAINNET_URL = "https://api.cdp.coinbase.com/platform/v2/x402";
-var CDP_TESTNET_URL = "https://www.x402.org/facilitator";
+var CDP_URL = "https://api.cdp.coinbase.com/platform/v2/x402";
+var TESTNET_CHAIN_IDS = [84532];
 function loadEnvFile() {
   const envPaths = [
     path2.join(process.cwd(), ".env"),
@@ -30386,31 +30386,33 @@ var CDPFacilitator = class extends BaseFacilitator {
   displayName = "Coinbase CDP";
   supportedNetworks;
   endpoint;
-  useMainnet;
   apiKeyId;
   apiKeySecret;
   constructor(config = {}) {
     super();
     loadEnvFile();
-    this.useMainnet = config.useMainnet ?? process.env.USE_MAINNET?.toLowerCase() === "true";
     this.apiKeyId = config.apiKeyId || process.env.CDP_API_KEY_ID;
     this.apiKeySecret = config.apiKeySecret || process.env.CDP_API_KEY_SECRET;
-    this.endpoint = this.useMainnet ? CDP_MAINNET_URL : CDP_TESTNET_URL;
-    this.supportedNetworks = this.useMainnet ? ["eip155:8453", "eip155:137"] : ["eip155:8453", "eip155:84532", "eip155:137"];
-    if (this.useMainnet && (!this.apiKeyId || !this.apiKeySecret)) {
-      console.warn("[CDPFacilitator] WARNING: Mainnet mode but missing CDP credentials!");
-      console.warn("[CDPFacilitator] Set CDP_API_KEY_ID and CDP_API_KEY_SECRET");
+    this.endpoint = CDP_URL;
+    this.supportedNetworks = [
+      "eip155:8453",
+      // Base mainnet
+      "eip155:137",
+      // Polygon mainnet
+      "eip155:84532"
+      // Base Sepolia (testnet)
+    ];
+    if (!this.apiKeyId || !this.apiKeySecret) {
+      console.warn("[CDPFacilitator] WARNING: Missing CDP credentials!");
+      console.warn("[CDPFacilitator] Set CDP_API_KEY_ID and CDP_API_KEY_SECRET in ~/.moltspay/.env");
     }
   }
   /**
    * Get auth headers for CDP API requests
    */
   async getAuthHeaders(method, urlPath, body) {
-    if (!this.useMainnet) {
-      return {};
-    }
     if (!this.apiKeyId || !this.apiKeySecret) {
-      throw new Error("CDP credentials required for mainnet");
+      throw new Error("CDP credentials required. Set CDP_API_KEY_ID and CDP_API_KEY_SECRET");
     }
     try {
       const { getAuthHeaders } = await import("@coinbase/cdp-sdk/auth");
@@ -30462,23 +30464,23 @@ var CDPFacilitator = class extends BaseFacilitator {
         paymentPayload,
         paymentRequirements: requirements
       };
+      console.log("[CDP Verify] Payload:", JSON.stringify(paymentPayload, null, 2));
+      const authHeaders = await this.getAuthHeaders(
+        "POST",
+        "/platform/v2/x402/verify",
+        requestBody
+      );
       const headers = {
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        ...authHeaders
       };
-      if (this.useMainnet) {
-        const authHeaders = await this.getAuthHeaders(
-          "POST",
-          "/platform/v2/x402/verify",
-          requestBody
-        );
-        Object.assign(headers, authHeaders);
-      }
       const response = await fetch(`${this.endpoint}/verify`, {
         method: "POST",
         headers,
         body: JSON.stringify(requestBody)
       });
       const result = await response.json();
+      console.log("[CDP Verify] Response:", response.status, JSON.stringify(result));
       if (!response.ok || !result.isValid) {
         return {
           valid: false,
@@ -30504,17 +30506,15 @@ var CDPFacilitator = class extends BaseFacilitator {
         paymentPayload,
         paymentRequirements: requirements
       };
+      const authHeaders = await this.getAuthHeaders(
+        "POST",
+        "/platform/v2/x402/settle",
+        requestBody
+      );
       const headers = {
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        ...authHeaders
       };
-      if (this.useMainnet) {
-        const authHeaders = await this.getAuthHeaders(
-          "POST",
-          "/platform/v2/x402/settle",
-          requestBody
-        );
-        Object.assign(headers, authHeaders);
-      }
       const response = await fetch(`${this.endpoint}/settle`, {
         method: "POST",
         headers,
@@ -30549,13 +30549,19 @@ var CDPFacilitator = class extends BaseFacilitator {
       freeQuota: 1e3
     };
   }
+  /**
+   * Check if a chain ID is testnet
+   */
+  static isTestnet(chainId) {
+    return TESTNET_CHAIN_IDS.includes(chainId);
+  }
   /**
    * Get configuration summary (for logging)
    */
   getConfigSummary() {
-    const mode = this.useMainnet ? "mainnet" : "testnet";
     const hasCredentials = !!(this.apiKeyId && this.apiKeySecret);
-    return `CDP Facilitator (${mode}, credentials: ${hasCredentials ? "yes" : "no"})`;
+    const networks = this.supportedNetworks.join(", ");
+    return `CDP Facilitator (networks: ${networks}, credentials: ${hasCredentials ? "yes" : "no"})`;
   }
 };
 
@@ -30823,9 +30829,27 @@ var CHAIN_TO_NETWORK = {
   "polygon": "eip155:137"
 };
 var TOKEN_DOMAINS = {
-  USDC: { name: "USD Coin", version: "2" },
-  USDT: { name: "Tether USD", version: "2" }
+  // Base mainnet
+  "eip155:8453": {
+    USDC: { name: "USD Coin", version: "2" },
+    USDT: { name: "Tether USD", version: "2" }
+  },
+  // Base Sepolia testnet - USDC uses 'USDC' not 'USD Coin'
+  "eip155:84532": {
+    USDC: { name: "USDC", version: "2" },
+    USDT: { name: "USDC", version: "2" }
+    // Same contract as USDC on testnet
+  },
+  // Polygon mainnet
+  "eip155:137": {
+    USDC: { name: "USD Coin", version: "2" },
+    USDT: { name: "(PoS) Tether USD", version: "2" }
+  }
 };
+function getTokenDomain(network, token) {
+  const networkDomains = TOKEN_DOMAINS[network] || TOKEN_DOMAINS["eip155:8453"];
+  return networkDomains[token] || { name: "USD Coin", version: "2" };
+}
 function getAcceptedCurrencies(config) {
   return config.acceptedCurrencies ?? [config.currency];
 }
@@ -30919,11 +30943,14 @@ var MoltsPayServer = class {
   getProviderChains() {
     const provider = this.manifest.provider;
     if (provider.chains && provider.chains.length > 0) {
-      return provider.chains.map((c) => ({
-        network: c.network || CHAIN_TO_NETWORK[c.chain] || "eip155:8453",
-        wallet: c.wallet || provider.wallet,
-        tokens: c.tokens || ["USDC"]
-      }));
+      return provider.chains.map((c) => {
+        const chainName = typeof c === "string" ? c : c.chain;
+        return {
+          network: CHAIN_TO_NETWORK[chainName] || "eip155:8453",
+          wallet: (typeof c === "object" ? c.wallet : null) || provider.wallet,
+          tokens: (typeof c === "object" ? c.tokens : null) || ["USDC"]
+        };
+      });
     }
     const chain2 = provider.chain || "base";
     const network = CHAIN_TO_NETWORK[chain2] || this.networkId;
@@ -31133,7 +31160,7 @@ var MoltsPayServer = class {
     const paymentNetwork = payment.accepted?.network || payment.network || this.networkId;
     const paymentWallet = this.getWalletForNetwork(paymentNetwork);
     const requirements = this.buildPaymentRequirements(skill.config, paymentNetwork, paymentWallet, paymentToken);
-    console.log(`[MoltsPay] Verifying payment...`);
+    console.log(`[MoltsPay] Verifying payment on ${paymentNetwork}...`);
     const verifyResult = await this.registry.verify(payment, requirements);
     if (!verifyResult.valid) {
       return this.sendJson(res, 402, {
@@ -31259,7 +31286,7 @@ var MoltsPayServer = class {
     const selectedToken = token && acceptedTokens.includes(token) ? token : acceptedTokens[0];
     const tokenAddresses = TOKEN_ADDRESSES[selectedNetwork] || {};
     const tokenAddress = tokenAddresses[selectedToken];
-    const tokenDomain = TOKEN_DOMAINS[selectedToken] || TOKEN_DOMAINS.USDC;
+    const tokenDomain = getTokenDomain(selectedNetwork, selectedToken);
     return {
       scheme: "exact",
       network: selectedNetwork,
@@ -31504,7 +31531,7 @@ var MoltsPayServer = class {
     const selectedToken = token && acceptedTokens.includes(token) ? token : acceptedTokens[0];
     const tokenAddresses = TOKEN_ADDRESSES[networkId] || TOKEN_ADDRESSES[this.networkId] || {};
     const tokenAddress = tokenAddresses[selectedToken];
-    const tokenDomain = TOKEN_DOMAINS[selectedToken] || TOKEN_DOMAINS.USDC;
+    const tokenDomain = getTokenDomain(networkId, selectedToken);
     return {
       scheme: "exact",
       network: networkId,
@@ -31563,12 +31590,15 @@ var CHAINS = {
       USDC: {
         address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
         decimals: 6,
-        symbol: "USDC"
+        symbol: "USDC",
+        eip712Name: "USD Coin"
+        // EIP-712 domain name
       },
       USDT: {
         address: "0xfde4C96c8593536E31F229EA8f37b2ADa2699bb2",
         decimals: 6,
-        symbol: "USDT"
+        symbol: "USDT",
+        eip712Name: "Tether USD"
       }
     },
     usdc: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
@@ -31585,12 +31615,15 @@ var CHAINS = {
       USDC: {
         address: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
         decimals: 6,
-        symbol: "USDC"
+        symbol: "USDC",
+        eip712Name: "USD Coin"
       },
       USDT: {
         address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
         decimals: 6,
-        symbol: "USDT"
+        symbol: "USDT",
+        eip712Name: "(PoS) Tether USD"
+        // Polygon uses this name
       }
     },
     usdc: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
@@ -31598,27 +31631,6 @@ var CHAINS = {
     explorerTx: "https://polygonscan.com/tx/",
     avgBlockTime: 2
   },
-  ethereum: {
-    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/",
-    avgBlockTime: 12
-  },
   // ============ Testnet ============
   base_sepolia: {
     name: "Base Sepolia",
@@ -31628,41 +31640,23 @@ var CHAINS = {
       USDC: {
         address: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
         decimals: 6,
-        symbol: "USDC"
+        symbol: "USDC",
+        eip712Name: "USDC"
+        // Testnet USDC uses 'USDC' not 'USD Coin'
       },
       USDT: {
         address: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
         // Same as USDC on testnet (no official USDT)
         decimals: 6,
-        symbol: "USDT"
+        symbol: "USDT",
+        eip712Name: "USDC"
+        // Uses same contract as USDC
       }
     },
     usdc: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
     explorer: "https://sepolia.basescan.org/address/",
     explorerTx: "https://sepolia.basescan.org/tx/",
     avgBlockTime: 2
-  },
-  sepolia: {
-    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/",
-    avgBlockTime: 12
   }
 };
 function getChain(name) {
@@ -31847,7 +31841,7 @@ Server accepts: ${serverChains.join(", ")}`
       } else {
         throw new Error(
           `Server accepts: ${serverChains.join(", ")}
-Please specify: --chain base  or  --chain polygon`
+Please specify: --chain base, --chain polygon, or --chain base_sepolia`
         );
       }
     }
@@ -31889,13 +31883,19 @@ Please specify: --chain base  or  --chain polygon`
     if (!payTo) {
       throw new Error("Missing payTo address in payment requirements");
     }
-    const authorization = await this.signEIP3009(payTo, amount, chain2, token);
+    const domainOverride = req.extra && typeof req.extra === "object" && req.extra.name ? { name: req.extra.name, version: req.extra.version || "2" } : void 0;
+    const authorization = await this.signEIP3009(payTo, amount, chain2, token, domainOverride);
     const tokenConfig = chain2.tokens[token];
-    const tokenName = token === "USDC" ? "USD Coin" : "Tether USD";
+    const extra = req.extra && typeof req.extra === "object" ? req.extra : {
+      name: tokenConfig.eip712Name || "USD Coin",
+      version: "2"
+    };
     const payload = {
       x402Version: X402_VERSION3,
+      scheme: "exact",
+      network,
       payload: authorization,
-      // v2 requires 'accepted' field with the requirements being fulfilled
+      // { authorization: {...}, signature: "0x..." }
       accepted: {
         scheme: "exact",
         network,
@@ -31903,7 +31903,7 @@ Please specify: --chain base  or  --chain polygon`
         amount: amountRaw,
         payTo,
         maxTimeoutSeconds: req.maxTimeoutSeconds || 300,
-        extra: req.extra || { name: tokenName, version: "2" }
+        extra
       }
     };
     const paymentHeader = Buffer.from(JSON.stringify(payload)).toString("base64");
@@ -31933,7 +31933,7 @@ Please specify: --chain base  or  --chain polygon`
    * This only signs - no on-chain transaction, no gas needed.
    * Supports both USDC and USDT.
    */
-  async signEIP3009(to, amount, chain2, token = "USDC") {
+  async signEIP3009(to, amount, chain2, token = "USDC", domainOverride) {
     const validAfter = 0;
     const validBefore = Math.floor(Date.now() / 1e3) + 3600;
     const nonce = ethers.hexlify(ethers.randomBytes(32));
@@ -31947,10 +31947,11 @@ Please specify: --chain base  or  --chain polygon`
       validBefore: validBefore.toString(),
       nonce
     };
-    const tokenName = token === "USDC" ? "USD Coin" : "Tether USD";
+    const tokenName = domainOverride?.name || tokenConfig.eip712Name || (token === "USDC" ? "USD Coin" : "Tether USD");
+    const tokenVersion = domainOverride?.version || "2";
     const domain = {
       name: tokenName,
-      version: "2",
+      version: tokenVersion,
       chainId: chain2.chainId,
       verifyingContract: tokenConfig.address
     };
@@ -32119,7 +32120,7 @@ Please specify: --chain base  or  --chain polygon`
     if (!this.wallet) {
       throw new Error("Client not initialized");
     }
-    const supportedChains = ["base", "polygon"];
+    const supportedChains = ["base", "polygon", "base_sepolia"];
     const tokenAbi = ["function balanceOf(address) view returns (uint256)"];
     const results = {};
     await Promise.all(