moltspay 0.8.1 → 0.8.3

package/dist/index.js

@@ -2905,7 +2905,7 @@ function alphabet(letters) {
   };
 }
 // @__NO_SIDE_EFFECTS__
-function join3(separator = "") {
+function join4(separator = "") {
   astr("join", separator);
   return {
     encode: (from) => {
@@ -3112,10 +3112,10 @@ var init_esm = __esm({
       convertRadix2,
       radix,
       radix2,
-      join: join3,
+      join: join4,
       padding
     };
-    genBase58 = /* @__NO_SIDE_EFFECTS__ */ (abc) => /* @__PURE__ */ chain(/* @__PURE__ */ radix(58), /* @__PURE__ */ alphabet(abc), /* @__PURE__ */ join3(""));
+    genBase58 = /* @__NO_SIDE_EFFECTS__ */ (abc) => /* @__PURE__ */ chain(/* @__PURE__ */ radix(58), /* @__PURE__ */ alphabet(abc), /* @__PURE__ */ join4(""));
     base58 = /* @__PURE__ */ genBase58("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
     createBase58check = (sha2566) => /* @__PURE__ */ chain(checksum(4, (data) => sha2566(sha2566(data))), base58);
   }
@@ -3263,14 +3263,14 @@ var init_esm2 = __esm({
         }
         this.pubHash = hash160(this.pubKey);
       }
-      derive(path2) {
-        if (!/^[mM]'?/.test(path2)) {
+      derive(path3) {
+        if (!/^[mM]'?/.test(path3)) {
           throw new Error('Path must start with "m" or "M"');
         }
-        if (/^[mM]'?$/.test(path2)) {
+        if (/^[mM]'?$/.test(path3)) {
           return this;
         }
-        const parts = path2.replace(/^[mM]'?\//, "").split("/");
+        const parts = path3.replace(/^[mM]'?\//, "").split("/");
         let child = this;
         for (const c of parts) {
           const m = /^(\d+)('?)$/.exec(c);
@@ -9631,8 +9631,8 @@ var init_privateKeyToAccount = __esm({
 });
 
 // node_modules/viem/_esm/accounts/hdKeyToAccount.js
-function hdKeyToAccount(hdKey_, { accountIndex = 0, addressIndex = 0, changeIndex = 0, path: path2, ...options } = {}) {
-  const hdKey = hdKey_.derive(path2 || `m/44'/60'/${accountIndex}'/${changeIndex}/${addressIndex}`);
+function hdKeyToAccount(hdKey_, { accountIndex = 0, addressIndex = 0, changeIndex = 0, path: path3, ...options } = {}) {
+  const hdKey = hdKey_.derive(path3 || `m/44'/60'/${accountIndex}'/${changeIndex}/${addressIndex}`);
   const account = privateKeyToAccount(toHex(hdKey.privateKey), options);
   return {
     ...account,
@@ -30369,84 +30369,7 @@ init_cjs_shims();
 init_cjs_shims();
 var import_fs = require("fs");
 var import_http = require("http");
-
-// src/chains/index.ts
-init_cjs_shims();
-var CHAINS = {
-  // ============ Mainnet ============
-  base: {
-    name: "Base",
-    chainId: 8453,
-    rpc: "https://mainnet.base.org",
-    usdc: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-    explorer: "https://basescan.org/address/",
-    explorerTx: "https://basescan.org/tx/",
-    avgBlockTime: 2
-  },
-  polygon: {
-    name: "Polygon",
-    chainId: 137,
-    rpc: "https://polygon-rpc.com",
-    usdc: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
-    explorer: "https://polygonscan.com/address/",
-    explorerTx: "https://polygonscan.com/tx/",
-    avgBlockTime: 2
-  },
-  ethereum: {
-    name: "Ethereum",
-    chainId: 1,
-    rpc: "https://eth.llamarpc.com",
-    usdc: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-    explorer: "https://etherscan.io/address/",
-    explorerTx: "https://etherscan.io/tx/",
-    avgBlockTime: 12
-  },
-  // ============ Testnet ============
-  base_sepolia: {
-    name: "Base Sepolia",
-    chainId: 84532,
-    rpc: "https://sepolia.base.org",
-    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",
-    usdc: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
-    explorer: "https://sepolia.etherscan.io/address/",
-    explorerTx: "https://sepolia.etherscan.io/tx/",
-    avgBlockTime: 12
-  }
-};
-function getChain(name) {
-  const config = CHAINS[name];
-  if (!config) {
-    throw new Error(`Unsupported chain: ${name}. Supported: ${Object.keys(CHAINS).join(", ")}`);
-  }
-  return config;
-}
-function listChains() {
-  return Object.keys(CHAINS);
-}
-function getChainById(chainId) {
-  return Object.values(CHAINS).find((c) => c.chainId === chainId);
-}
-var ERC20_ABI = [
-  "function balanceOf(address owner) view returns (uint256)",
-  "function transfer(address to, uint256 amount) returns (bool)",
-  "function approve(address spender, uint256 amount) returns (bool)",
-  "function allowance(address owner, address spender) view returns (uint256)",
-  "function decimals() view returns (uint8)",
-  "function symbol() view returns (string)",
-  "function name() view returns (string)",
-  "function nonces(address owner) view returns (uint256)",
-  "function permit(address owner, address spender, uint256 value, uint256 deadline, uint8 v, bytes32 r, bytes32 s)",
-  "event Transfer(address indexed from, address indexed to, uint256 value)",
-  "event Approval(address indexed owner, address indexed spender, uint256 value)"
-];
+var path = __toESM(require("path"));
 
 // src/server/types.ts
 init_cjs_shims();
@@ -30456,24 +30379,100 @@ var X402_VERSION = 2;
 var PAYMENT_REQUIRED_HEADER = "x-payment-required";
 var PAYMENT_HEADER = "x-payment";
 var PAYMENT_RESPONSE_HEADER = "x-payment-response";
-var DEFAULT_FACILITATOR_URL = "https://x402.org/facilitator";
+var FACILITATOR_TESTNET = "https://www.x402.org/facilitator";
+var FACILITATOR_MAINNET = "https://api.cdp.coinbase.com/platform/v2/x402";
+var USDC_ADDRESSES = {
+  "eip155:8453": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+  // Base mainnet
+  "eip155:84532": "0x036CbD53842c5426634e7929541eC2318f3dCF7e"
+  // Base Sepolia
+};
+var USDC_DOMAIN = {
+  name: "USD Coin",
+  version: "2"
+};
+function loadEnvFiles() {
+  try {
+    const dotenv = require("dotenv");
+    const envPaths = [
+      path.join(process.cwd(), ".env"),
+      path.join(process.env.HOME || "", ".moltspay", ".env")
+    ];
+    for (const envPath of envPaths) {
+      if ((0, import_fs.existsSync)(envPath)) {
+        dotenv.config({ path: envPath });
+        console.log(`[MoltsPay] Loaded config from ${envPath}`);
+        break;
+      }
+    }
+  } catch {
+  }
+}
+function getCDPConfig() {
+  loadEnvFiles();
+  return {
+    useMainnet: process.env.USE_MAINNET?.toLowerCase() === "true",
+    apiKeyId: process.env.CDP_API_KEY_ID,
+    apiKeySecret: process.env.CDP_API_KEY_SECRET
+  };
+}
+async function getCDPAuthHeaders(method, urlPath, body) {
+  const config = getCDPConfig();
+  if (!config.apiKeyId || !config.apiKeySecret) {
+    throw new Error("CDP_API_KEY_ID and CDP_API_KEY_SECRET required for mainnet");
+  }
+  try {
+    const { getAuthHeaders } = await import("@coinbase/cdp-sdk/auth");
+    const headers = await getAuthHeaders({
+      apiKeyId: config.apiKeyId,
+      apiKeySecret: config.apiKeySecret,
+      requestMethod: method,
+      requestHost: "api.cdp.coinbase.com",
+      requestPath: urlPath,
+      requestBody: body
+    });
+    return headers;
+  } catch (err) {
+    console.error("[MoltsPay] Failed to generate CDP auth headers:", err.message);
+    throw err;
+  }
+}
 var MoltsPayServer = class {
   manifest;
   skills = /* @__PURE__ */ new Map();
   options;
+  cdpConfig;
   facilitatorUrl;
+  networkId;
   constructor(servicesPath, options = {}) {
+    this.cdpConfig = getCDPConfig();
     const content = (0, import_fs.readFileSync)(servicesPath, "utf-8");
     this.manifest = JSON.parse(content);
     this.options = {
       port: options.port || 3e3,
       host: options.host || "0.0.0.0"
     };
-    this.facilitatorUrl = options.facilitatorUrl || DEFAULT_FACILITATOR_URL;
+    if (this.cdpConfig.useMainnet) {
+      if (!this.cdpConfig.apiKeyId || !this.cdpConfig.apiKeySecret) {
+        console.warn("[MoltsPay] WARNING: USE_MAINNET=true but CDP keys not set!");
+        console.warn("[MoltsPay] Set CDP_API_KEY_ID and CDP_API_KEY_SECRET in ~/.moltspay/.env");
+      }
+      this.facilitatorUrl = FACILITATOR_MAINNET;
+      this.networkId = "eip155:8453";
+    } else {
+      this.facilitatorUrl = options.facilitatorUrl || FACILITATOR_TESTNET;
+      this.networkId = "eip155:84532";
+    }
+    const networkName = this.cdpConfig.useMainnet ? "Base mainnet" : "Base Sepolia (testnet)";
+    const facilitatorName = this.cdpConfig.useMainnet ? "CDP" : "x402.org";
     console.log(`[MoltsPay] Loaded ${this.manifest.services.length} services from ${servicesPath}`);
     console.log(`[MoltsPay] Provider: ${this.manifest.provider.name}`);
     console.log(`[MoltsPay] Receive wallet: ${this.manifest.provider.wallet}`);
-    console.log(`[MoltsPay] Facilitator: ${this.facilitatorUrl}`);
+    console.log(`[MoltsPay] Network: ${this.networkId} (${networkName})`);
+    console.log(`[MoltsPay] Facilitator: ${facilitatorName} (${this.facilitatorUrl})`);
+    if (this.cdpConfig.useMainnet && this.cdpConfig.apiKeyId) {
+      console.log(`[MoltsPay] CDP API Key: ${this.cdpConfig.apiKeyId.slice(0, 8)}...`);
+    }
     console.log(`[MoltsPay] Protocol: x402 (gasless for both client AND server)`);
   }
   /**
@@ -30534,7 +30533,6 @@ var MoltsPayServer = class {
    * GET /services - List available services
    */
   handleGetServices(res) {
-    const chain2 = getChain(this.manifest.provider.chain);
     const services = this.manifest.services.map((s) => ({
       id: s.id,
       name: s.name,
@@ -30550,16 +30548,15 @@ var MoltsPayServer = class {
       services,
       x402: {
         version: X402_VERSION,
-        network: `eip155:${chain2.chainId}`,
+        network: this.networkId,
         schemes: ["exact"],
-        facilitator: this.facilitatorUrl
+        facilitator: this.cdpConfig.useMainnet ? "cdp" : "x402.org",
+        mainnet: this.cdpConfig.useMainnet
       }
     });
   }
   /**
    * POST /execute - Execute service with x402 payment
-   * Body: { service: string, params: object }
-   * Header: X-Payment (optional - if missing, returns 402)
    */
   async handleExecute(body, paymentHeader, res) {
     const { service, params } = body;
@@ -30634,17 +30631,8 @@ var MoltsPayServer = class {
    * Return 402 with x402 payment requirements
    */
   sendPaymentRequired(config, res) {
-    const chain2 = getChain(this.manifest.provider.chain);
-    const amountInUnits = Math.floor(config.price * 1e6).toString();
-    const requirements = [{
-      scheme: "exact",
-      network: `eip155:${chain2.chainId}`,
-      maxAmountRequired: amountInUnits,
-      resource: this.manifest.provider.wallet,
-      description: `${config.name} - $${config.price} ${config.currency}`,
-      // Include facilitator info for client
-      extra: JSON.stringify({ facilitator: this.facilitatorUrl })
-    }];
+    const requirements = [this.buildPaymentRequirements(config)];
+    requirements[0].description = `${config.name} - $${config.price} ${config.currency}`;
     const encoded = Buffer.from(JSON.stringify(requirements)).toString("base64");
     res.writeHead(402, {
       "Content-Type": "application/json",
@@ -30657,7 +30645,7 @@ var MoltsPayServer = class {
     }, null, 2));
   }
   /**
-   * Basic payment validation (before calling facilitator)
+   * Basic payment validation
    */
   validatePayment(payment, config) {
     if (payment.x402Version !== X402_VERSION) {
@@ -30666,37 +30654,57 @@ var MoltsPayServer = class {
     if (payment.scheme !== "exact") {
       return { valid: false, error: `Unsupported scheme: ${payment.scheme}` };
     }
-    const chain2 = getChain(this.manifest.provider.chain);
-    const expectedNetwork = `eip155:${chain2.chainId}`;
-    if (payment.network !== expectedNetwork) {
-      return { valid: false, error: `Network mismatch: expected ${expectedNetwork}` };
+    if (payment.network !== this.networkId) {
+      return { valid: false, error: `Network mismatch: expected ${this.networkId}, got ${payment.network}` };
     }
     return { valid: true };
   }
   /**
-   * Verify payment with facilitator
+   * Build complete payment requirements for facilitator
+   */
+  buildPaymentRequirements(config) {
+    const amountInUnits = Math.floor(config.price * 1e6).toString();
+    const usdcAddress = USDC_ADDRESSES[this.networkId];
+    return {
+      scheme: "exact",
+      network: this.networkId,
+      maxAmountRequired: amountInUnits,
+      amount: amountInUnits,
+      asset: usdcAddress,
+      payTo: this.manifest.provider.wallet,
+      maxTimeoutSeconds: 300,
+      extra: USDC_DOMAIN
+    };
+  }
+  /**
+   * Verify payment with facilitator (testnet or CDP)
    */
   async verifyWithFacilitator(payment, config) {
     try {
-      const chain2 = getChain(this.manifest.provider.chain);
-      const amountInUnits = Math.floor(config.price * 1e6).toString();
-      const requirements = {
-        scheme: "exact",
-        network: `eip155:${chain2.chainId}`,
-        maxAmountRequired: amountInUnits,
-        resource: this.manifest.provider.wallet
+      const requirements = this.buildPaymentRequirements(config);
+      const requestBody = {
+        paymentPayload: payment,
+        paymentRequirements: requirements
       };
+      console.log("[MoltsPay] Verify request:", JSON.stringify(requestBody, null, 2));
+      let headers = { "Content-Type": "application/json" };
+      if (this.cdpConfig.useMainnet) {
+        const authHeaders = await getCDPAuthHeaders(
+          "POST",
+          "/platform/v2/x402/verify",
+          requestBody
+        );
+        headers = { ...headers, ...authHeaders };
+      }
       const response = await fetch(`${this.facilitatorUrl}/verify`, {
         method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          paymentPayload: payment,
-          paymentRequirements: requirements
-        })
+        headers,
+        body: JSON.stringify(requestBody)
       });
       const result = await response.json();
+      console.log("[MoltsPay] Verify response:", JSON.stringify(result, null, 2));
       if (!response.ok || !result.isValid) {
-        return { valid: false, error: result.invalidReason || "Verification failed" };
+        return { valid: false, error: result.invalidReason || result.error || "Verification failed" };
       }
       return { valid: true };
     } catch (err) {
@@ -30707,25 +30715,28 @@ var MoltsPayServer = class {
    * Settle payment with facilitator (execute on-chain transfer)
    */
   async settleWithFacilitator(payment, config) {
-    const chain2 = getChain(this.manifest.provider.chain);
-    const amountInUnits = Math.floor(config.price * 1e6).toString();
-    const requirements = {
-      scheme: "exact",
-      network: `eip155:${chain2.chainId}`,
-      maxAmountRequired: amountInUnits,
-      resource: this.manifest.provider.wallet
+    const requirements = this.buildPaymentRequirements(config);
+    const requestBody = {
+      paymentPayload: payment,
+      paymentRequirements: requirements
     };
+    let headers = { "Content-Type": "application/json" };
+    if (this.cdpConfig.useMainnet) {
+      const authHeaders = await getCDPAuthHeaders(
+        "POST",
+        "/platform/v2/x402/settle",
+        requestBody
+      );
+      headers = { ...headers, ...authHeaders };
+    }
     const response = await fetch(`${this.facilitatorUrl}/settle`, {
       method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        paymentPayload: payment,
-        paymentRequirements: requirements
-      })
+      headers,
+      body: JSON.stringify(requestBody)
     });
     const result = await response.json();
-    if (!response.ok) {
-      throw new Error(result.error || "Settlement failed");
+    if (!response.ok || !result.success) {
+      throw new Error(result.error || result.errorReason || "Settlement failed");
     }
     return {
       transaction: result.transaction,
@@ -30763,6 +30774,84 @@ var import_os = require("os");
 var import_path = require("path");
 var import_ethers = require("ethers");
 
+// src/chains/index.ts
+init_cjs_shims();
+var CHAINS = {
+  // ============ Mainnet ============
+  base: {
+    name: "Base",
+    chainId: 8453,
+    rpc: "https://mainnet.base.org",
+    usdc: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+    explorer: "https://basescan.org/address/",
+    explorerTx: "https://basescan.org/tx/",
+    avgBlockTime: 2
+  },
+  polygon: {
+    name: "Polygon",
+    chainId: 137,
+    rpc: "https://polygon-rpc.com",
+    usdc: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
+    explorer: "https://polygonscan.com/address/",
+    explorerTx: "https://polygonscan.com/tx/",
+    avgBlockTime: 2
+  },
+  ethereum: {
+    name: "Ethereum",
+    chainId: 1,
+    rpc: "https://eth.llamarpc.com",
+    usdc: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+    explorer: "https://etherscan.io/address/",
+    explorerTx: "https://etherscan.io/tx/",
+    avgBlockTime: 12
+  },
+  // ============ Testnet ============
+  base_sepolia: {
+    name: "Base Sepolia",
+    chainId: 84532,
+    rpc: "https://sepolia.base.org",
+    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",
+    usdc: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
+    explorer: "https://sepolia.etherscan.io/address/",
+    explorerTx: "https://sepolia.etherscan.io/tx/",
+    avgBlockTime: 12
+  }
+};
+function getChain(name) {
+  const config = CHAINS[name];
+  if (!config) {
+    throw new Error(`Unsupported chain: ${name}. Supported: ${Object.keys(CHAINS).join(", ")}`);
+  }
+  return config;
+}
+function listChains() {
+  return Object.keys(CHAINS);
+}
+function getChainById(chainId) {
+  return Object.values(CHAINS).find((c) => c.chainId === chainId);
+}
+var ERC20_ABI = [
+  "function balanceOf(address owner) view returns (uint256)",
+  "function transfer(address to, uint256 amount) returns (bool)",
+  "function approve(address spender, uint256 amount) returns (bool)",
+  "function allowance(address owner, address spender) view returns (uint256)",
+  "function decimals() view returns (uint8)",
+  "function symbol() view returns (string)",
+  "function name() view returns (string)",
+  "function nonces(address owner) view returns (uint256)",
+  "function permit(address owner, address spender, uint256 value, uint256 deadline, uint8 v, bytes32 r, bytes32 s)",
+  "event Transfer(address indexed from, address indexed to, uint256 value)",
+  "event Approval(address indexed owner, address indexed spender, uint256 value)"
+];
+
 // src/client/types.ts
 init_cjs_shims();
 
@@ -31145,20 +31234,20 @@ function loadWallet(options = {}) {
   }
 }
 function getWalletAddress(storagePath) {
-  const path2 = storagePath || (0, import_path2.join)(DEFAULT_STORAGE_DIR, DEFAULT_STORAGE_FILE);
-  if (!(0, import_fs3.existsSync)(path2)) {
+  const path3 = storagePath || (0, import_path2.join)(DEFAULT_STORAGE_DIR, DEFAULT_STORAGE_FILE);
+  if (!(0, import_fs3.existsSync)(path3)) {
     return null;
   }
   try {
-    const data = JSON.parse((0, import_fs3.readFileSync)(path2, "utf8"));
+    const data = JSON.parse((0, import_fs3.readFileSync)(path3, "utf8"));
     return data.address;
   } catch {
     return null;
   }
 }
 function walletExists(storagePath) {
-  const path2 = storagePath || (0, import_path2.join)(DEFAULT_STORAGE_DIR, DEFAULT_STORAGE_FILE);
-  return (0, import_fs3.existsSync)(path2);
+  const path3 = storagePath || (0, import_path2.join)(DEFAULT_STORAGE_DIR, DEFAULT_STORAGE_FILE);
+  return (0, import_fs3.existsSync)(path3);
 }
 
 // src/verify/index.ts
@@ -31301,8 +31390,8 @@ async function waitForTransaction(txHash, chain2 = "base", confirmations = 1, ti
 // src/cdp/index.ts
 init_cjs_shims();
 var fs = __toESM(require("fs"));
-var path = __toESM(require("path"));
-var DEFAULT_STORAGE_DIR2 = path.join(process.env.HOME || ".", ".moltspay");
+var path2 = __toESM(require("path"));
+var DEFAULT_STORAGE_DIR2 = path2.join(process.env.HOME || ".", ".moltspay");
 var CDP_CONFIG_FILE = "cdp-wallet.json";
 function isCDPAvailable() {
   try {
@@ -31324,7 +31413,7 @@ function getCDPCredentials(config) {
 async function initCDPWallet(config = {}) {
   const storageDir = config.storageDir || DEFAULT_STORAGE_DIR2;
   const chain2 = config.chain || "base";
-  const storagePath = path.join(storageDir, CDP_CONFIG_FILE);
+  const storagePath = path2.join(storageDir, CDP_CONFIG_FILE);
   if (fs.existsSync(storagePath)) {
     try {
       const data = JSON.parse(fs.readFileSync(storagePath, "utf-8"));
@@ -31386,7 +31475,7 @@ async function initCDPWallet(config = {}) {
 }
 function loadCDPWallet(config = {}) {
   const storageDir = config.storageDir || DEFAULT_STORAGE_DIR2;
-  const storagePath = path.join(storageDir, CDP_CONFIG_FILE);
+  const storagePath = path2.join(storageDir, CDP_CONFIG_FILE);
   if (!fs.existsSync(storagePath)) {
     return null;
   }