agentwallet-mcp 1.10.2 → 1.10.3

package/build/index.js

@@ -410,6 +410,18 @@ function resolveChainId(network) {
     return null;
 }
 // ─── Server ──────────────────────────────────────────────────────
+/**
+ * Destination address shape, EVM or Solana.
+ *
+ * The contract-address params were regex-guarded but the DESTINATION on every
+ * transfer tool was a bare z.string(), so a truncated or mistyped address went
+ * straight into a signed transaction. On-chain sends are irreversible, and the
+ * chain will happily accept any well-formed address, so the cheapest place to
+ * catch a malformed one is before it is signed. This does not validate the
+ * EIP-55 checksum, only the shape; a wrong-but-well-formed address is still the
+ * caller's responsibility.
+ */
+const AddressSchema = z.string().regex(/^(0x[a-fA-F0-9]{40}|[1-9A-HJ-NP-Za-km-z]{32,44})$/, 'Must be a 0x-prefixed 40-hex EVM address or a base58 Solana address');
 const server = new McpServer({
     name: 'agentwallet',
     version: '1.10.1',
@@ -528,7 +540,7 @@ server.tool('sign_transaction', 'Sign a transaction with a wallet\'s private key
     'For EVM: returns signed raw transaction hex. For Solana: returns base64 signed transaction. ' +
     'Does NOT broadcast — use send_transaction for sign + broadcast.', {
     wallet_id: z.number().int().describe('Wallet ID'),
-    to: z.string().describe('Destination address (0x-prefixed for EVM, Base58 for Solana)'),
+    to: AddressSchema.describe('Destination address (0x-prefixed for EVM, Base58 for Solana)'),
     chain_id: z.number().int().optional().describe('Chain ID (defaults to wallet\'s default)'),
     value: z.string().default('0').describe('Value in wei/lamports (decimal string)'),
     data: z.string().default('').describe('Hex-encoded calldata (0x-prefixed) for EVM contract calls'),
@@ -570,7 +582,7 @@ server.tool('send_transaction', 'Sign and broadcast a transaction. ' +
     'Returns the transaction hash (EVM) or signature (Solana) on success. ' +
     'The transaction is signed server-side and broadcast via RPC.', {
     wallet_id: z.number().int().describe('Wallet ID'),
-    to: z.string().describe('Destination address (0x-prefixed for EVM, Base58 for Solana)'),
+    to: AddressSchema.describe('Destination address (0x-prefixed for EVM, Base58 for Solana)'),
     chain_id: z.number().int().optional().describe('Chain ID (defaults to wallet\'s default)'),
     value: z.string().default('0').describe('Value in wei/lamports (decimal string)'),
     data: z.string().default('').describe('Hex-encoded calldata (0x-prefixed) for EVM contract calls'),
@@ -612,7 +624,7 @@ server.tool('transfer', 'Send native tokens (ETH, AVAX, BNB, POL, PLS, SOL) to a
     'Specify the amount in human-readable format (e.g. "0.1" for 0.1 ETH). ' +
     'The amount is converted to wei/lamports automatically. Signs and broadcasts the transaction.', {
     wallet_id: z.number().int().describe('Wallet ID to send from'),
-    to: z.string().describe('Destination address (0x-prefixed for EVM, Base58 for Solana)'),
+    to: AddressSchema.describe('Destination address (0x-prefixed for EVM, Base58 for Solana)'),
     amount: z.string().describe('Amount to send in human-readable format (e.g. "0.1" for 0.1 ETH)'),
     chain_id: z.number().int().describe('Chain ID (1=Ethereum, 8453=Base, 42161=Arbitrum, 10=Optimism, 137=Polygon, 43114=Avalanche, 56=BSC, 7777777=Zora, 369=PulseChain, 900=Solana, 901=Solana Devnet)'),
 }, async ({ wallet_id, to, amount, chain_id }) => {
@@ -675,7 +687,7 @@ server.tool('transfer_token', 'Send ERC-20 tokens (EVM) or SPL tokens (Solana) t
     'Signs and broadcasts the transaction. Use get_chains to find stablecoin addresses.', {
     wallet_id: z.number().int().describe('Wallet ID to send from'),
     token: z.string().describe('Token address (0x-prefixed ERC-20 contract for EVM, Base58 mint for Solana)'),
-    to: z.string().describe('Recipient address (0x-prefixed for EVM, Base58 for Solana)'),
+    to: AddressSchema.describe('Recipient address (0x-prefixed for EVM, Base58 for Solana)'),
     amount: z.string().describe('Amount in human-readable format (e.g. "100" for 100 USDC)'),
     chain_id: z.number().int().describe('Chain ID'),
     decimals: z.number().int().default(18).describe('Token decimals (6 for USDC, 18 for most tokens)'),

package/build/local-solana.js

@@ -14,6 +14,7 @@
 import { readFileSync } from 'node:fs';
 import { Connection, Keypair, PublicKey, SystemProgram, Transaction, TransactionInstruction, sendAndConfirmTransaction, LAMPORTS_PER_SOL, } from '@solana/web3.js';
 import bs58 from 'bs58';
+import { lookupTrustedDecimals } from './x402-payment.js';
 /* ── Program IDs ─────────────────────────────────────────────────── */
 const TOKEN_PROGRAM = new PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
 const TOKEN_2022_PROGRAM = new PublicKey('TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb');
@@ -114,6 +115,34 @@ function assertWithinSolCap(lamports) {
         throw new Error(`Blocked by local guard: amount exceeds AGENTWALLET_MAX_TX_SOL (${cap} SOL).`);
     }
 }
+/**
+ * Bound SPL movement. AGENTWALLET_MAX_TX_SOL only ever covered native SOL, so
+ * an SPL transfer, which is how USDC moves on Solana and the whole point of the
+ * x402 rail here, went out with no local ceiling at all. Mirrors
+ * AGENTWALLET_MAX_TX_TOKEN on the EVM side and uses the same variable so an
+ * operator sets one token cap, not one per chain family.
+ *
+ * Decimals for the cap come from the trusted table when the mint is known.
+ * The caller-supplied value is not used for the ceiling: an inflated one would
+ * inflate the cap exactly like the x402 bypass. When the mint is unknown we
+ * assume 6, the tightest common value, so it fails closed.
+ */
+function assertWithinSplCap(mint, rawAmount) {
+    const cap = (process.env.AGENTWALLET_MAX_TX_TOKEN || '').trim();
+    if (!cap)
+        return;
+    if (!/^\d+(\.\d+)?$/.test(cap)) {
+        throw new Error(`AGENTWALLET_MAX_TX_TOKEN must be a decimal number, got "${cap}".`);
+    }
+    const decimals = lookupTrustedDecimals(900, mint) ?? 6;
+    const [whole, frac = ''] = cap.split('.');
+    const capRaw = BigInt(whole + frac.padEnd(decimals, '0').slice(0, decimals));
+    if (rawAmount > capRaw) {
+        throw new Error(`Blocked by local guard: SPL transfer of ${rawAmount} base units exceeds ` +
+            `AGENTWALLET_MAX_TX_TOKEN (${cap}, evaluated at ${decimals} decimals). ` +
+            `Raise the cap deliberately if this is intended.`);
+    }
+}
 /* ── Reads ───────────────────────────────────────────────────────── */
 export async function localSolBalance(chainId = 900) {
     const conn = connection(chainId);
@@ -161,6 +190,11 @@ export async function localSplBalance(mintStr, chainId = 900) {
 export async function localSolTransfer(to, lamports, chainId = 900) {
     const amount = BigInt(lamports);
     assertWithinSolCap(amount);
+    // Number() silently loses precision past 2**53 lamports. Refuse rather than
+    // sign a transaction for an amount other than the one that was requested.
+    if (amount > BigInt(Number.MAX_SAFE_INTEGER)) {
+        throw new Error(`Amount ${lamports} lamports exceeds safe integer range and was refused.`);
+    }
     const conn = connection(chainId);
     const payer = getSolanaKeypair();
     const tx = new Transaction().add(SystemProgram.transfer({
@@ -216,6 +250,9 @@ function createAtaIdempotentIx(payer, ata, owner, mint, tokenProgram) {
  * not exist, using the idempotent instruction so a race cannot fail the send.
  */
 export async function localSplTransfer(mintStr, to, rawAmount, decimals, chainId = 900) {
+    // Checked before any RPC round trip: a blocked transfer should cost nothing
+    // and should not announce itself to the RPC provider first.
+    assertWithinSplCap(mintStr, BigInt(rawAmount));
     const conn = connection(chainId);
     const payer = getSolanaKeypair();
     const mint = new PublicKey(mintStr);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "agentwallet-mcp",
   "mcpName": "io.github.hifriendbot/agentwallet",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "description": "MCP server for AgentWallet: self-custody local signing on EVM and Solana, or hosted wallets. Sign, broadcast, pay x402 invoices, and accept x402 payments.",
   "type": "module",
   "main": "build/index.js",
@@ -16,7 +16,7 @@
   "scripts": {
     "build": "tsc",
     "start": "node build/index.js",
-    "test": "node test/x402-payment.test.mjs && node test/token-cap.test.mjs && node test/local-mode.test.mjs && node test/ssrf-guard.test.mjs",
+    "test": "node test/x402-payment.test.mjs && node test/token-cap.test.mjs && node test/spl-cap.test.mjs && node test/local-mode.test.mjs && node test/ssrf-guard.test.mjs",
     "prepublishOnly": "npm run build"
   },
   "keywords": [