agentwallet-mcp 1.7.4 → 1.7.5

package/README.md

@@ -52,7 +52,9 @@ Add to your config:
 }
 ```
 
-> `AGENTWALLET_WALLET_ID` is optional. Set it to enable x402 auto-pay — when you exceed the free tier without a credit card, the MCP server will automatically pay for operations with USDC from this wallet.
+> `AGENTWALLET_WALLET_ID` is optional. Set it to enable x402 auto-pay: when you exceed the free tier without a credit card, the MCP server automatically pays for operations with USDC from this wallet.
+>
+> **Auto-pay safety cap.** `AGENTWALLET_MAX_AUTOPAY` (optional, default `1`) is the maximum amount, in human-readable units of the asset, that x402 auto-pay will authorize for a single payment. Any 402 requirement above this cap is rejected instead of paid, so a malformed or tampered payment requirement cannot drain the wallet. Raise it only if you genuinely need larger automatic payments (for example `"5"` to allow up to 5 USDC per call).
 
 ### Claude Code
 

package/build/index.js

@@ -12,6 +12,7 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { z } from 'zod';
+import { deriveX402Payment } from './x402-payment.js';
 // ─── Configuration ──────────────────────────────────────────────
 const API_BASE = process.env.AGENTWALLET_API_URL || 'https://hifriendbot.com/wp-json/agentwallet/v1';
 const API_USER = process.env.AGENTWALLET_USER || '';
@@ -55,15 +56,19 @@ async function handleX402Payment(x402Data, originalPath, originalMethod, origina
         throw new Error('402 Payment Required but no payment options available.');
     }
     const accept = accepts[0]; // Use first option
-    const tokenAddress = accept.extra?.token || '';
-    const amount = accept.maxAmountRequired;
     const payTo = accept.payTo;
-    const decimals = accept.requiredDecimals || 6;
     // Determine chain_id from network string (CAIP-2, plain name, or raw ID)
     const network = accept.network || '';
     const chainId = resolveChainId(network) ?? 8453;
-    // Convert human-readable amount to raw (e.g. "0.01" with 6 decimals = "10000")
-    const rawAmount = parseUnits(amount, decimals);
+    // x402 maxAmountRequired is ALREADY in base/atomic units (e.g. "10000" =
+    // 0.01 USDC at 6 decimals) and must be used directly. The previous code ran
+    // it through parseUnits(), which re-scaled it by 10**decimals and overpaid by
+    // that factor (1,000,000x for USDC). deriveX402Payment uses it directly (like
+    // the pay_x402 tool) and enforces a hard ceiling so a malformed or malicious
+    // 402 response cannot drain the wallet. AGENTWALLET_MAX_AUTOPAY is in
+    // human-readable units of the asset; default 1.
+    const maxAutopay = process.env.AGENTWALLET_MAX_AUTOPAY || '1';
+    const { tokenAddress, rawAmount, decimals } = deriveX402Payment(accept, maxAutopay);
     // Send payment using our wallet (with X-AGW-SKIP-X402 to prevent recursion)
     let txHash;
     try {

package/build/x402-payment.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Pure helpers for x402 auto-pay amount/token derivation.
+ *
+ * Isolated from the server bootstrap in index.ts so the funds-sensitive amount
+ * math can be unit-tested without starting the MCP server.
+ */
+export interface X402AcceptLike {
+    maxAmountRequired: string;
+    requiredDecimals?: number;
+    asset?: string;
+    extra?: {
+        token?: string;
+    };
+}
+/**
+ * Derive the on-chain transfer parameters from an x402 payment requirement.
+ *
+ * CRITICAL: x402 `maxAmountRequired` is ALREADY denominated in base/atomic
+ * units (e.g. "10000" = 0.01 USDC at 6 decimals). It MUST be used directly.
+ * Running it through parseUnits() re-scales it by 10**decimals and overpays by
+ * that factor (1,000,000x for USDC). This mirrors the pay_x402 tool, which has
+ * always used maxAmountRequired directly.
+ *
+ * Also enforces a hard ceiling so a malformed or malicious 402 response can
+ * never authorize a transfer larger than `maxAutopayHuman` units of the asset.
+ *
+ * @param accept           the chosen x402 accept option
+ * @param maxAutopayHuman  max auto-pay, in human-readable units of the asset
+ */
+export declare function deriveX402Payment(accept: X402AcceptLike, maxAutopayHuman: string): {
+    tokenAddress: string;
+    rawAmount: string;
+    decimals: number;
+};

package/build/x402-payment.js

@@ -0,0 +1,46 @@
+/**
+ * Pure helpers for x402 auto-pay amount/token derivation.
+ *
+ * Isolated from the server bootstrap in index.ts so the funds-sensitive amount
+ * math can be unit-tested without starting the MCP server.
+ */
+/** Convert a human-readable decimal amount (e.g. "0.01") to base/atomic units. */
+function toBaseUnits(amount, decimals) {
+    if (!/^\d+(\.\d+)?$/.test(amount)) {
+        throw new Error(`Invalid amount "${amount}".`);
+    }
+    const [whole, frac = ''] = amount.split('.');
+    const fracPadded = frac.slice(0, decimals).padEnd(decimals, '0');
+    return BigInt(whole + fracPadded).toString();
+}
+/**
+ * Derive the on-chain transfer parameters from an x402 payment requirement.
+ *
+ * CRITICAL: x402 `maxAmountRequired` is ALREADY denominated in base/atomic
+ * units (e.g. "10000" = 0.01 USDC at 6 decimals). It MUST be used directly.
+ * Running it through parseUnits() re-scales it by 10**decimals and overpays by
+ * that factor (1,000,000x for USDC). This mirrors the pay_x402 tool, which has
+ * always used maxAmountRequired directly.
+ *
+ * Also enforces a hard ceiling so a malformed or malicious 402 response can
+ * never authorize a transfer larger than `maxAutopayHuman` units of the asset.
+ *
+ * @param accept           the chosen x402 accept option
+ * @param maxAutopayHuman  max auto-pay, in human-readable units of the asset
+ */
+export function deriveX402Payment(accept, maxAutopayHuman) {
+    const decimals = accept.requiredDecimals || 6;
+    // Standard x402 uses `asset` for the token address; AgentWallet's own server
+    // currently emits it under extra.token. Prefer the standard field, fall back.
+    const tokenAddress = accept.asset || accept.extra?.token || '';
+    const rawAmount = accept.maxAmountRequired;
+    if (!/^\d+$/.test(rawAmount)) {
+        throw new Error(`x402 auto-pay: invalid maxAmountRequired "${rawAmount}" (expected an integer base-unit amount).`);
+    }
+    const capRaw = toBaseUnits(maxAutopayHuman, decimals);
+    if (BigInt(rawAmount) > BigInt(capRaw)) {
+        throw new Error(`x402 auto-pay blocked: required amount (${rawAmount} base units) exceeds the ` +
+            `AGENTWALLET_MAX_AUTOPAY cap of ${maxAutopayHuman}. Raise AGENTWALLET_MAX_AUTOPAY to allow it.`);
+    }
+    return { tokenAddress, rawAmount, decimals };
+}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "agentwallet-mcp",
   "mcpName": "io.github.hifriendbot/agentwallet",
-  "version": "1.7.4",
-  "description": "MCP server for AgentWallet — lets AI agents create wallets, sign transactions, broadcast on EVM + Solana, pay x402 invoices, and accept x402 payments",
+  "version": "1.7.5",
+  "description": "MCP server for AgentWallet: lets AI agents create wallets, sign transactions, broadcast on EVM + Solana, pay x402 invoices, and accept x402 payments",
   "type": "module",
   "main": "build/index.js",
   "bin": {
@@ -16,6 +16,7 @@
   "scripts": {
     "build": "tsc",
     "start": "node build/index.js",
+    "test": "node test/x402-payment.test.mjs",
     "prepublishOnly": "npm run build"
   },
   "keywords": [
@@ -46,7 +47,7 @@
   ],
   "author": "HiFriendbot (https://hifriendbot.com)",
   "license": "MIT",
-  "homepage": "https://hifriendbot.com/agentwallet",
+  "homepage": "https://hifriendbot.com/wallet/",
   "engines": {
     "node": ">=18.0.0"
   },