moltspay 1.2.0 → 1.2.1

package/dist/server/index.js

@@ -48,8 +48,8 @@ var BaseFacilitator = class {
 var import_fs = require("fs");
 var path = __toESM(require("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 = [
     path.join(process.cwd(), ".env"),
@@ -84,31 +84,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");
@@ -160,23 +162,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,
@@ -202,17 +204,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,
@@ -247,13 +247,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"})`;
   }
 };
 
@@ -507,9 +513,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];
 }
@@ -603,11 +627,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 chain = provider.chain || "base";
     const network = CHAIN_TO_NETWORK[chain] || this.networkId;
@@ -817,7 +844,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, {
@@ -943,7 +970,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,
@@ -1188,7 +1215,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,