moltspay 0.7.1 → 0.8.0

package/dist/cli/index.mjs

@@ -11,7 +11,7 @@ import { spawn } from "child_process";
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
-import { Wallet } from "ethers";
+import { Wallet, ethers } from "ethers";
 
 // src/chains/index.ts
 var CHAINS = {
@@ -70,11 +70,11 @@ function getChain(name) {
   }
   return config;
 }
-function getChainById(chainId) {
-  return Object.values(CHAINS).find((c) => c.chainId === chainId);
-}
 
 // src/client/index.ts
+var X402_VERSION = 2;
+var PAYMENT_REQUIRED_HEADER = "x-payment-required";
+var PAYMENT_HEADER = "x-payment";
 var DEFAULT_CONFIG = {
   chain: "base",
   limits: {
@@ -138,43 +138,112 @@ var MoltsPayClient = class {
     return res.json();
   }
   /**
-   * Pay for a service and get the result
+   * Pay for a service and get the result (x402 protocol)
+   * 
+   * This is GASLESS for the client - server pays gas to claim payment.
+   * This is PAY-FOR-SUCCESS - payment only claimed if service succeeds.
    */
   async pay(serverUrl, service, params) {
-    if (!this.wallet) {
+    if (!this.wallet || !this.walletData) {
       throw new Error("Client not initialized. Run: npx moltspay init");
     }
-    const payRes = await fetch(`${serverUrl}/pay`, {
+    console.log(`[MoltsPay] Requesting service: ${service}`);
+    const initialRes = await fetch(`${serverUrl}/execute`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ service, params })
     });
-    if (payRes.status !== 402) {
-      const err = await payRes.json();
-      throw new Error(err.error || "Unexpected response");
-    }
-    const paymentReq = await payRes.json();
-    const { payment } = paymentReq;
-    this.checkLimits(payment.amount);
-    console.log(`[MoltsPay] Paying $${payment.amount} ${payment.currency} to ${payment.wallet}`);
-    const txHash = await this.executePayment(payment);
-    console.log(`[MoltsPay] Payment tx: ${txHash}`);
-    const verifyRes = await fetch(`${serverUrl}/verify`, {
+    if (initialRes.status !== 402) {
+      const data = await initialRes.json();
+      if (initialRes.ok && data.result) {
+        return data.result;
+      }
+      throw new Error(data.error || "Unexpected response");
+    }
+    const paymentRequiredHeader = initialRes.headers.get(PAYMENT_REQUIRED_HEADER);
+    if (!paymentRequiredHeader) {
+      throw new Error("Missing x-payment-required header");
+    }
+    let requirements;
+    try {
+      const decoded = Buffer.from(paymentRequiredHeader, "base64").toString("utf-8");
+      requirements = JSON.parse(decoded);
+      if (!Array.isArray(requirements)) {
+        requirements = [requirements];
+      }
+    } catch {
+      throw new Error("Invalid x-payment-required header");
+    }
+    const chain = getChain(this.config.chain);
+    const network = `eip155:${chain.chainId}`;
+    const req = requirements.find((r) => r.scheme === "exact" && r.network === network);
+    if (!req) {
+      throw new Error(`No matching payment option for ${network}`);
+    }
+    const amount = Number(req.maxAmountRequired) / 1e6;
+    this.checkLimits(amount);
+    console.log(`[MoltsPay] Signing payment: $${amount} USDC (gasless)`);
+    const authorization = await this.signEIP3009(req.resource, amount, chain);
+    const payload = {
+      x402Version: X402_VERSION,
+      scheme: "exact",
+      network,
+      payload: authorization
+    };
+    const paymentHeader = Buffer.from(JSON.stringify(payload)).toString("base64");
+    console.log(`[MoltsPay] Sending request with payment...`);
+    const paidRes = await fetch(`${serverUrl}/execute`, {
       method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        chargeId: payment.chargeId,
-        txHash
-      })
+      headers: {
+        "Content-Type": "application/json",
+        [PAYMENT_HEADER]: paymentHeader
+      },
+      body: JSON.stringify({ service, params })
     });
-    if (!verifyRes.ok) {
-      const err = await verifyRes.json();
-      throw new Error(err.error || "Verification failed");
+    const result = await paidRes.json();
+    if (!paidRes.ok) {
+      throw new Error(result.error || "Service execution failed");
     }
-    const result = await verifyRes.json();
-    this.recordSpending(payment.amount);
+    this.recordSpending(amount);
+    console.log(`[MoltsPay] Success! Payment: ${result.payment?.status || "claimed"}`);
     return result.result;
   }
+  /**
+   * Sign EIP-3009 transferWithAuthorization (GASLESS)
+   * This only signs - no on-chain transaction, no gas needed.
+   */
+  async signEIP3009(to, amount, chain) {
+    const validAfter = 0;
+    const validBefore = Math.floor(Date.now() / 1e3) + 3600;
+    const nonce = ethers.hexlify(ethers.randomBytes(32));
+    const value = BigInt(Math.floor(amount * 1e6)).toString();
+    const authorization = {
+      from: this.wallet.address,
+      to,
+      value,
+      validAfter: validAfter.toString(),
+      validBefore: validBefore.toString(),
+      nonce
+    };
+    const domain = {
+      name: "USD Coin",
+      version: "2",
+      chainId: chain.chainId,
+      verifyingContract: chain.usdc
+    };
+    const types = {
+      TransferWithAuthorization: [
+        { name: "from", type: "address" },
+        { name: "to", type: "address" },
+        { name: "value", type: "uint256" },
+        { name: "validAfter", type: "uint256" },
+        { name: "validBefore", type: "uint256" },
+        { name: "nonce", type: "bytes32" }
+      ]
+    };
+    const signature = await this.wallet.signTypedData(domain, types, authorization);
+    return { authorization, signature };
+  }
   /**
    * Check spending limits
    */
@@ -201,36 +270,6 @@ var MoltsPayClient = class {
   recordSpending(amount) {
     this.todaySpending += amount;
   }
-  /**
-   * Execute payment on-chain
-   */
-  async executePayment(payment) {
-    let chain;
-    try {
-      chain = getChain(payment.chain);
-    } catch {
-      throw new Error(`Unknown chain: ${payment.chain}`);
-    }
-    const { ethers: ethers2 } = await import("ethers");
-    const provider = new ethers2.JsonRpcProvider(chain.rpc);
-    const signer = new ethers2.Wallet(this.walletData.privateKey, provider);
-    const usdcAddress = chain.usdc;
-    const usdcAbi = [
-      "function transfer(address to, uint256 amount) returns (bool)",
-      "function balanceOf(address account) view returns (uint256)"
-    ];
-    const usdc = new ethers2.Contract(usdcAddress, usdcAbi, signer);
-    const amountInUnits = ethers2.parseUnits(payment.amount.toString(), 6);
-    const balance = await usdc.balanceOf(this.wallet.address);
-    if (balance < amountInUnits) {
-      throw new Error(
-        `Insufficient USDC balance: ${ethers2.formatUnits(balance, 6)} < ${payment.amount}`
-      );
-    }
-    const tx = await usdc.transfer(payment.wallet, amountInUnits);
-    const receipt = await tx.wait();
-    return receipt.hash;
-  }
   // --- Config & Wallet Management ---
   loadConfig() {
     const configPath = join(this.configDir, "config.json");
@@ -290,15 +329,14 @@ var MoltsPayClient = class {
     } catch {
       throw new Error(`Unknown chain: ${this.config.chain}`);
     }
-    const { ethers: ethers2 } = await import("ethers");
-    const provider = new ethers2.JsonRpcProvider(chain.rpc);
+    const provider = new ethers.JsonRpcProvider(chain.rpc);
     const nativeBalance = await provider.getBalance(this.wallet.address);
     const usdcAbi = ["function balanceOf(address) view returns (uint256)"];
-    const usdc = new ethers2.Contract(chain.usdc, usdcAbi, provider);
+    const usdc = new ethers.Contract(chain.usdc, usdcAbi, provider);
     const usdcBalance = await usdc.balanceOf(this.wallet.address);
     return {
-      usdc: parseFloat(ethers2.formatUnits(usdcBalance, 6)),
-      native: parseFloat(ethers2.formatEther(nativeBalance))
+      usdc: parseFloat(ethers.formatUnits(usdcBalance, 6)),
+      native: parseFloat(ethers.formatEther(nativeBalance))
     };
   }
 };
@@ -306,99 +344,38 @@ var MoltsPayClient = class {
 // src/server/index.ts
 import { readFileSync as readFileSync2 } from "fs";
 import { createServer } from "http";
-
-// src/verify/index.ts
-import { ethers } from "ethers";
-var TRANSFER_EVENT_TOPIC = ethers.id("Transfer(address,address,uint256)");
-async function verifyPayment(params) {
-  const { txHash, expectedAmount, expectedTo } = params;
-  let chain;
-  try {
-    if (typeof params.chain === "number") {
-      chain = getChainById(params.chain);
-    } else {
-      chain = getChain(params.chain || "base");
-    }
-    if (!chain) {
-      return { verified: false, error: `Unsupported chain: ${params.chain}` };
-    }
-  } catch (e) {
-    return { verified: false, error: `Unsupported chain: ${params.chain}` };
-  }
-  try {
-    const provider = new ethers.JsonRpcProvider(chain.rpc);
-    const receipt = await provider.getTransactionReceipt(txHash);
-    if (!receipt) {
-      return { verified: false, error: "Transaction not found or not confirmed" };
-    }
-    if (receipt.status !== 1) {
-      return { verified: false, error: "Transaction failed" };
-    }
-    const usdcAddress = chain.usdc?.toLowerCase();
-    if (!usdcAddress) {
-      return { verified: false, error: `Chain ${chain.name} USDC address not configured` };
-    }
-    for (const log of receipt.logs) {
-      if (log.address.toLowerCase() !== usdcAddress) {
-        continue;
-      }
-      if (log.topics.length < 3 || log.topics[0] !== TRANSFER_EVENT_TOPIC) {
-        continue;
-      }
-      const from = "0x" + log.topics[1].slice(-40);
-      const to = "0x" + log.topics[2].slice(-40);
-      const amountRaw = BigInt(log.data);
-      const amount = Number(amountRaw) / 1e6;
-      if (expectedTo && to.toLowerCase() !== expectedTo.toLowerCase()) {
-        continue;
-      }
-      if (amount < expectedAmount) {
-        return {
-          verified: false,
-          error: `Insufficient amount: received ${amount} USDC, expected ${expectedAmount} USDC`,
-          amount,
-          from,
-          to,
-          txHash,
-          blockNumber: receipt.blockNumber
-        };
-      }
-      return {
-        verified: true,
-        amount,
-        from,
-        to,
-        txHash,
-        blockNumber: receipt.blockNumber
-      };
-    }
-    return { verified: false, error: "No USDC transfer found" };
-  } catch (e) {
-    return { verified: false, error: e.message || String(e) };
-  }
-}
-
-// src/server/index.ts
-function generateChargeId() {
-  return "ch_" + Math.random().toString(36).substring(2, 15);
-}
+import { ethers as ethers2 } from "ethers";
+var X402_VERSION2 = 2;
+var PAYMENT_REQUIRED_HEADER2 = "x-payment-required";
+var PAYMENT_HEADER2 = "x-payment";
 var MoltsPayServer = class {
   manifest;
   skills = /* @__PURE__ */ new Map();
-  charges = /* @__PURE__ */ new Map();
   options;
+  provider = null;
+  wallet = null;
   constructor(servicesPath, options = {}) {
     const content = readFileSync2(servicesPath, "utf-8");
     this.manifest = JSON.parse(content);
     this.options = {
       port: options.port || 3e3,
       host: options.host || "0.0.0.0",
-      chargeExpirySecs: options.chargeExpirySecs || 300
-      // 5 minutes
+      privateKey: options.privateKey || process.env.MOLTSPAY_PRIVATE_KEY
     };
+    if (this.options.privateKey) {
+      try {
+        const chain = getChain(this.manifest.provider.chain);
+        this.provider = new ethers2.JsonRpcProvider(chain.rpc);
+        this.wallet = new ethers2.Wallet(this.options.privateKey, this.provider);
+        console.log(`[MoltsPay] Payment wallet: ${this.wallet.address}`);
+      } catch (err) {
+        console.warn("[MoltsPay] Warning: Could not initialize wallet for payment claims");
+      }
+    }
     console.log(`[MoltsPay] Loaded ${this.manifest.services.length} services from ${servicesPath}`);
     console.log(`[MoltsPay] Provider: ${this.manifest.provider.name}`);
-    console.log(`[MoltsPay] Wallet: ${this.manifest.provider.wallet}`);
+    console.log(`[MoltsPay] Receive wallet: ${this.manifest.provider.wallet}`);
+    console.log(`[MoltsPay] Protocol: x402 (gasless, pay-for-success)`);
   }
   /**
    * Register a skill handler for a service
@@ -425,10 +402,8 @@ var MoltsPayServer = class {
     server.listen(p, this.options.host, () => {
       console.log(`[MoltsPay] Server listening on http://${this.options.host}:${p}`);
       console.log(`[MoltsPay] Endpoints:`);
-      console.log(`  GET  /services  - List available services`);
-      console.log(`  POST /pay       - Create payment & execute service`);
-      console.log(`  POST /verify    - Verify payment & get result`);
-      console.log(`  GET  /status/:id - Check charge status`);
+      console.log(`  GET  /services     - List available services`);
+      console.log(`  POST /execute      - Execute service (x402 payment)`);
     });
   }
   async handleRequest(req, res) {
@@ -437,7 +412,8 @@ var MoltsPayServer = class {
     const method = req.method || "GET";
     res.setHeader("Access-Control-Allow-Origin", "*");
     res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
-    res.setHeader("Access-Control-Allow-Headers", "Content-Type");
+    res.setHeader("Access-Control-Allow-Headers", "Content-Type, X-Payment");
+    res.setHeader("Access-Control-Expose-Headers", "X-Payment-Required, X-Payment-Response");
     if (method === "OPTIONS") {
       res.writeHead(204);
       res.end();
@@ -447,17 +423,10 @@ var MoltsPayServer = class {
       if (method === "GET" && path === "/services") {
         return this.handleGetServices(res);
       }
-      if (method === "POST" && path === "/pay") {
+      if (method === "POST" && path === "/execute") {
         const body = await this.readBody(req);
-        return this.handlePay(body, res);
-      }
-      if (method === "POST" && path === "/verify") {
-        const body = await this.readBody(req);
-        return this.handleVerify(body, res);
-      }
-      if (method === "GET" && path.startsWith("/status/")) {
-        const chargeId = path.replace("/status/", "");
-        return this.handleStatus(chargeId, res);
+        const paymentHeader = req.headers[PAYMENT_HEADER2];
+        return this.handleExecute(body, paymentHeader, res);
       }
       this.sendJson(res, 404, { error: "Not found" });
     } catch (err) {
@@ -469,6 +438,7 @@ var MoltsPayServer = class {
    * GET /services - List available services
    */
   handleGetServices(res) {
+    const chain = getChain(this.manifest.provider.chain);
     const services = this.manifest.services.map((s) => ({
       id: s.id,
       name: s.name,
@@ -481,14 +451,20 @@ var MoltsPayServer = class {
     }));
     this.sendJson(res, 200, {
       provider: this.manifest.provider,
-      services
+      services,
+      x402: {
+        version: X402_VERSION2,
+        network: `eip155:${chain.chainId}`,
+        schemes: ["exact"]
+      }
     });
   }
   /**
-   * POST /pay - Create payment request
+   * POST /execute - Execute service with x402 payment
    * Body: { service: string, params: object }
+   * Header: X-Payment (optional - if missing, returns 402)
    */
-  handlePay(body, res) {
+  async handleExecute(body, paymentHeader, res) {
     const { service, params } = body;
     if (!service) {
       return this.sendJson(res, 400, { error: "Missing service" });
@@ -502,113 +478,129 @@ var MoltsPayServer = class {
         return this.sendJson(res, 400, { error: `Missing required param: ${key}` });
       }
     }
-    const chargeId = generateChargeId();
-    const now = Date.now();
-    const charge = {
-      id: chargeId,
-      service,
-      params: params || {},
-      amount: skill.config.price,
-      currency: skill.config.currency,
-      status: "pending",
-      createdAt: now,
-      expiresAt: now + this.options.chargeExpirySecs * 1e3
-    };
-    this.charges.set(chargeId, charge);
-    const paymentRequest = {
-      chargeId,
-      service,
-      amount: charge.amount,
-      currency: charge.currency,
-      wallet: this.manifest.provider.wallet,
-      chain: this.manifest.provider.chain,
-      expiresAt: charge.expiresAt
-    };
-    this.sendJson(res, 402, {
-      message: "Payment required",
-      payment: paymentRequest
-    });
-  }
-  /**
-   * POST /verify - Verify payment and execute skill
-   * Body: { chargeId: string, txHash: string }
-   */
-  async handleVerify(body, res) {
-    const { chargeId, txHash } = body;
-    if (!chargeId || !txHash) {
-      return this.sendJson(res, 400, { error: "Missing chargeId or txHash" });
-    }
-    const charge = this.charges.get(chargeId);
-    if (!charge) {
-      return this.sendJson(res, 404, { error: "Charge not found" });
-    }
-    if (Date.now() > charge.expiresAt) {
-      charge.status = "expired";
-      return this.sendJson(res, 400, { error: "Charge expired" });
-    }
-    if (charge.status === "completed") {
-      return this.sendJson(res, 200, {
-        status: "completed",
-        result: charge.result
-      });
+    if (!paymentHeader) {
+      return this.sendPaymentRequired(skill.config, res);
     }
+    let payment;
     try {
-      const verification = await verifyPayment({
-        txHash,
-        expectedTo: this.manifest.provider.wallet,
-        expectedAmount: charge.amount,
-        chain: this.manifest.provider.chain
-      });
-      if (!verification.verified) {
-        charge.status = "failed";
-        return this.sendJson(res, 400, {
-          error: "Payment verification failed",
-          reason: verification.error
-        });
-      }
-      charge.status = "paid";
-      charge.txHash = txHash;
-      charge.paidAt = Date.now();
-      const skill = this.skills.get(charge.service);
-      console.log(`[MoltsPay] Executing skill: ${charge.service}`);
-      const result = await skill.handler(charge.params);
-      charge.status = "completed";
-      charge.result = result;
-      charge.completedAt = Date.now();
-      this.sendJson(res, 200, {
-        status: "completed",
-        chargeId,
-        txHash,
-        result
-      });
+      const decoded = Buffer.from(paymentHeader, "base64").toString("utf-8");
+      payment = JSON.parse(decoded);
+    } catch {
+      return this.sendJson(res, 400, { error: "Invalid X-Payment header" });
+    }
+    const validation = this.validatePayment(payment, skill.config);
+    if (!validation.valid) {
+      return this.sendJson(res, 402, { error: validation.error });
+    }
+    console.log(`[MoltsPay] Executing skill: ${service}`);
+    let result;
+    try {
+      result = await skill.handler(params || {});
     } catch (err) {
-      console.error("[MoltsPay] Skill execution error:", err);
-      charge.status = "failed";
-      this.sendJson(res, 500, {
-        error: "Skill execution failed",
+      console.error("[MoltsPay] Skill execution failed:", err.message);
+      return this.sendJson(res, 500, {
+        error: "Service execution failed",
         message: err.message
       });
     }
+    console.log(`[MoltsPay] Skill succeeded, claiming payment...`);
+    let txHash = null;
+    try {
+      txHash = await this.claimPayment(payment);
+      console.log(`[MoltsPay] Payment claimed: ${txHash}`);
+    } catch (err) {
+      console.error("[MoltsPay] Payment claim failed:", err.message);
+    }
+    this.sendJson(res, 200, {
+      success: true,
+      result,
+      payment: txHash ? { txHash, status: "claimed" } : { status: "pending" }
+    });
   }
   /**
-   * GET /status/:chargeId - Check charge status
+   * Return 402 with x402 payment requirements
    */
-  handleStatus(chargeId, res) {
-    const charge = this.charges.get(chargeId);
-    if (!charge) {
-      return this.sendJson(res, 404, { error: "Charge not found" });
-    }
-    this.sendJson(res, 200, {
-      chargeId: charge.id,
-      service: charge.service,
-      amount: charge.amount,
-      currency: charge.currency,
-      status: charge.status,
-      txHash: charge.txHash,
-      result: charge.status === "completed" ? charge.result : void 0,
-      createdAt: charge.createdAt,
-      expiresAt: charge.expiresAt
+  sendPaymentRequired(config, res) {
+    const chain = getChain(this.manifest.provider.chain);
+    const amountInUnits = Math.floor(config.price * 1e6).toString();
+    const requirements = [{
+      scheme: "exact",
+      network: `eip155:${chain.chainId}`,
+      maxAmountRequired: amountInUnits,
+      resource: this.manifest.provider.wallet,
+      description: `${config.name} - $${config.price} ${config.currency}`
+    }];
+    const encoded = Buffer.from(JSON.stringify(requirements)).toString("base64");
+    res.writeHead(402, {
+      "Content-Type": "application/json",
+      [PAYMENT_REQUIRED_HEADER2]: encoded
     });
+    res.end(JSON.stringify({
+      error: "Payment required",
+      message: `Service requires $${config.price} ${config.currency}`,
+      x402: requirements[0]
+    }, null, 2));
+  }
+  /**
+   * Validate x402 payment payload
+   */
+  validatePayment(payment, config) {
+    if (payment.x402Version !== X402_VERSION2) {
+      return { valid: false, error: `Unsupported x402 version: ${payment.x402Version}` };
+    }
+    if (payment.scheme !== "exact") {
+      return { valid: false, error: `Unsupported scheme: ${payment.scheme}` };
+    }
+    const chain = getChain(this.manifest.provider.chain);
+    const expectedNetwork = `eip155:${chain.chainId}`;
+    if (payment.network !== expectedNetwork) {
+      return { valid: false, error: `Network mismatch: expected ${expectedNetwork}` };
+    }
+    const auth = payment.payload.authorization;
+    if (auth.to.toLowerCase() !== this.manifest.provider.wallet.toLowerCase()) {
+      return { valid: false, error: "Payment recipient mismatch" };
+    }
+    const amount = Number(auth.value) / 1e6;
+    if (amount < config.price) {
+      return { valid: false, error: `Insufficient amount: $${amount} < $${config.price}` };
+    }
+    const now = Math.floor(Date.now() / 1e3);
+    if (Number(auth.validBefore) < now) {
+      return { valid: false, error: "Payment authorization expired" };
+    }
+    if (Number(auth.validAfter) > now) {
+      return { valid: false, error: "Payment authorization not yet valid" };
+    }
+    return { valid: true };
+  }
+  /**
+   * Claim payment using transferWithAuthorization
+   */
+  async claimPayment(payment) {
+    if (!this.wallet || !this.provider) {
+      throw new Error("Wallet not configured for payment claims");
+    }
+    const chain = getChain(this.manifest.provider.chain);
+    const auth = payment.payload.authorization;
+    const sig = payment.payload.signature;
+    const { r, s, v } = ethers2.Signature.from(sig);
+    const usdcAbi = [
+      "function transferWithAuthorization(address from, address to, uint256 value, uint256 validAfter, uint256 validBefore, bytes32 nonce, uint8 v, bytes32 r, bytes32 s)"
+    ];
+    const usdc = new ethers2.Contract(chain.usdc, usdcAbi, this.wallet);
+    const tx = await usdc.transferWithAuthorization(
+      auth.from,
+      auth.to,
+      auth.value,
+      auth.validAfter,
+      auth.validBefore,
+      auth.nonce,
+      v,
+      r,
+      s
+    );
+    const receipt = await tx.wait();
+    return receipt.hash;
   }
   async readBody(req) {
     return new Promise((resolve2, reject) => {
@@ -786,7 +778,7 @@ program.command("services <url>").description("List services from a provider").o
     console.error("\u274C Error:", err.message);
   }
 });
-program.command("start <manifest>").description("Start MoltsPay server from services manifest").option("-p, --port <port>", "Port to listen on", "3000").option("--host <host>", "Host to bind", "0.0.0.0").action(async (manifest, options) => {
+program.command("start <manifest>").description("Start MoltsPay server from services manifest").option("-p, --port <port>", "Port to listen on", "3000").option("--host <host>", "Host to bind", "0.0.0.0").option("--private-key <key>", "Private key for claiming payments (or use MOLTSPAY_PRIVATE_KEY env)").action(async (manifest, options) => {
   const manifestPath = resolve(manifest);
   if (!existsSync2(manifestPath)) {
     console.error(`\u274C Manifest not found: ${manifestPath}`);
@@ -794,14 +786,16 @@ program.command("start <manifest>").description("Start MoltsPay server from serv
   }
   const port = parseInt(options.port, 10);
   const host = options.host;
+  const privateKey = options.privateKey || process.env.MOLTSPAY_PRIVATE_KEY;
   console.log(`
-\u{1F680} Starting MoltsPay Server
+\u{1F680} Starting MoltsPay Server (x402 protocol)
 `);
   console.log(`   Manifest: ${manifestPath}`);
   console.log(`   Port: ${port}`);
+  console.log(`   Payment claims: ${privateKey ? "enabled" : "disabled (no private key)"}`);
   console.log("");
   try {
-    const server = new MoltsPayServer(manifestPath, { port, host });
+    const server = new MoltsPayServer(manifestPath, { port, host, privateKey });
     const manifestContent = await import("fs").then(
       (fs) => JSON.parse(fs.readFileSync(manifestPath, "utf-8"))
     );
@@ -913,7 +907,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 <url>", "Image URL (for image-to-video)").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("--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");
@@ -929,11 +923,25 @@ program.command("pay <server> <service> [params]").description("Pay for a servic
     }
   }
   if (options.prompt) params.prompt = options.prompt;
-  if (options.image) params.image_url = options.image;
+  if (options.image) {
+    const imagePath = options.image;
+    if (imagePath.startsWith("http://") || imagePath.startsWith("https://")) {
+      params.image_url = imagePath;
+    } else {
+      const filePath = resolve(imagePath);
+      if (!existsSync2(filePath)) {
+        console.error(`\u274C Image file not found: ${filePath}`);
+        process.exit(1);
+      }
+      const imageData = readFileSync3(filePath);
+      params.image_base64 = imageData.toString("base64");
+    }
+  }
   if (!params.prompt) {
     console.error("\u274C Missing prompt. Use --prompt or pass JSON params");
     process.exit(1);
   }
+  const imageDisplay = params.image_url || (params.image_base64 ? `[local file: ${options.image}]` : null);
   if (!options.json) {
     console.log(`
 \u{1F4B3} MoltsPay - Paying for service
@@ -941,7 +949,7 @@ program.command("pay <server> <service> [params]").description("Pay for a servic
     console.log(`   Server: ${server}`);
     console.log(`   Service: ${service}`);
     console.log(`   Prompt: ${params.prompt}`);
-    if (params.image_url) console.log(`   Image: ${params.image_url}`);
+    if (imageDisplay) console.log(`   Image: ${imageDisplay}`);
     console.log(`   Wallet: ${client.address}`);
     console.log("");
   }