cryptoiz-mcp 4.16.8 → 4.16.10

package/index.js

@@ -1,5 +1,5 @@
 'use strict';
-var VERSION = 'v4.16.8';
+var VERSION = 'v4.16.10';
 var GATEWAY = 'https://rehqwsypjnjirhuiapqh.supabase.co/functions/v1/mcp-x402-gateway';
 var TOOL_ENDPOINTS = {
   get_whale_alpha: 'https://rehqwsypjnjirhuiapqh.supabase.co/functions/v1/mcp-alpha-scanner',
@@ -18,6 +18,7 @@ var SOL_RPC = 'https://api.mainnet-beta.solana.com';
 var TOKEN_PROGRAM = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
 var ATA_PROGRAM = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
 var MEMO_PROGRAM = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
+var COMPUTE_BUDGET_PROGRAM = 'ComputeBudget111111111111111111111111111111';
 
 var _updateNotified = false;
 function notifyUpdate(data, headers) {
@@ -29,11 +30,16 @@ function notifyUpdate(data, headers) {
   console.error('[cryptoiz-mcp] UPDATE: ' + VERSION + ' -> ' + latest + ' | Run: ' + cmd);
 }
 
-var Connection = require('@solana/web3.js').Connection;
-var PublicKey = require('@solana/web3.js').PublicKey;
-var Transaction = require('@solana/web3.js').Transaction;
-var Keypair = require('@solana/web3.js').Keypair;
-var _bs58mod = require('bs58'); var bs58 = _bs58mod.default || _bs58mod;
+var solana = require('@solana/web3.js');
+var Connection = solana.Connection;
+var PublicKey = solana.PublicKey;
+var Transaction = solana.Transaction;
+var TransactionMessage = solana.TransactionMessage;
+var VersionedTransaction = solana.VersionedTransaction;
+var Keypair = solana.Keypair;
+// Fix bs58 v6 ESM-only issue: support both CJS (v5) and ESM-compiled (v6)
+var _bs58mod = require('bs58');
+var bs58 = _bs58mod.default || _bs58mod;
 var Server = require('@modelcontextprotocol/sdk/server/index.js').Server;
 var StdioServerTransport = require('@modelcontextprotocol/sdk/server/stdio.js').StdioServerTransport;
 var CallToolRequestSchema = require('@modelcontextprotocol/sdk/types.js').CallToolRequestSchema;
@@ -53,27 +59,75 @@ function findATA(wallet, mint) {
   return PublicKey.findProgramAddressSync([walletPk.toBuffer(), tokPk.toBuffer(), mintPk.toBuffer()], ataPk)[0];
 }
 
-// V1: direct on-chain USDC transfer + x402 memo for indexer
+// V2: Dexter gas-sponsored. 4-ix tx: Limit + Price + TransferChecked + Memo(nonce)
+// Dexter pays SOL gas — user only needs USDC
+async function buildV2PaymentPayload(amount, feePayerAddr) {
+  var kp = getKeypair();
+  var conn = new Connection(SOL_RPC, 'confirmed');
+  var userATA = findATA(kp.publicKey.toBase58(), USDC_MINT);
+  var recipientATA = findATA(RECIPIENT, USDC_MINT);
+  var feePayerPk = new PublicKey(feePayerAddr);
+  var computeBudgetPk = new PublicKey(COMPUTE_BUDGET_PROGRAM);
+  var tokenProgramPk = new PublicKey(TOKEN_PROGRAM);
+  var usdcMintPk = new PublicKey(USDC_MINT);
+  // ComputeUnitLimit(20000)
+  var setLimitData = Buffer.alloc(5);
+  setLimitData[0] = 0x02;
+  setLimitData.writeUInt32LE(20000, 1);
+  var setLimitIx = { programId: computeBudgetPk, keys: [], data: setLimitData };
+  // ComputeUnitPrice(1)
+  var setPriceData = Buffer.alloc(9);
+  setPriceData[0] = 0x03;
+  setPriceData.writeBigUInt64LE(BigInt(1), 1);
+  var setPriceIx = { programId: computeBudgetPk, keys: [], data: setPriceData };
+  // TransferChecked
+  var transferKeys = [
+    { pubkey: userATA, isSigner: false, isWritable: true },
+    { pubkey: usdcMintPk, isSigner: false, isWritable: false },
+    { pubkey: recipientATA, isSigner: false, isWritable: true },
+    { pubkey: kp.publicKey, isSigner: true, isWritable: false },
+  ];
+  var transferData = Buffer.alloc(10);
+  transferData[0] = 0x0c;
+  transferData.writeUInt32LE(amount & 0xFFFFFFFF, 1);
+  transferData.writeUInt32LE(Math.floor(amount / 0x100000000) & 0xFFFFFFFF, 5);
+  transferData[9] = 6;
+  var transferIx = { programId: tokenProgramPk, keys: transferKeys, data: transferData };
+  // FIX v4.16.10: NO Memo instruction in V2 — Dexter scheme_exact_svm whitelist
+  // only allows ComputeBudget + SPL Token + Lighthouse. Memo would be rejected.
+  var bh = await conn.getLatestBlockhash('confirmed');
+  var message = new TransactionMessage({
+    payerKey: feePayerPk,
+    recentBlockhash: bh.blockhash,
+    instructions: [setLimitIx, setPriceIx, transferIx],
+  }).compileToV0Message();
+  var vtx = new VersionedTransaction(message);
+  vtx.sign([kp]);
+  var txB64 = Buffer.from(vtx.serialize()).toString('base64');
+  console.error('[cryptoiz-mcp] V2 tx built (Dexter gas-sponsored), 3 ix: limit+price+transferChecked');
+  return txB64;
+}
+
+// V1: direct on-chain, user pays SOL gas (fallback only)
 async function sendUSDC(amount, toolName) {
   var kp = getKeypair();
   var conn = new Connection(SOL_RPC, 'confirmed');
   var userATA = findATA(kp.publicKey.toBase58(), USDC_MINT);
   var recipientATA = findATA(RECIPIENT, USDC_MINT);
-  // TransferChecked ix
   var keys = [
     { pubkey: userATA, isSigner: false, isWritable: true },
     { pubkey: new PublicKey(USDC_MINT), isSigner: false, isWritable: false },
     { pubkey: recipientATA, isSigner: false, isWritable: true },
     { pubkey: kp.publicKey, isSigner: true, isWritable: false },
   ];
-  var data = Buffer.alloc(9);
+  // FIX v4.16.10: TransferChecked needs 10 bytes (1 disc + 8 amount + 1 decimals)
+  var data = Buffer.alloc(10);
   data[0] = 0x0c;
   data.writeUInt32LE(amount & 0xFFFFFFFF, 1);
   data.writeUInt32LE(Math.floor(amount / 0x100000000) & 0xFFFFFFFF, 5);
-  data[8] = 6;
+  data[9] = 6;
   var transferIx = { programId: new PublicKey(TOKEN_PROGRAM), keys: keys, data: data };
-  // Memo ix for x402scan indexer
-  var nonce = Date.now().toString(16) + Math.floor(Math.random() * 0xffff).toString(16);
+  var nonce = Date.now().toString(16) + Math.floor(Math.random()*0xffff).toString(16);
   var memoIx = {
     programId: new PublicKey(MEMO_PROGRAM),
     keys: [],
@@ -86,7 +140,7 @@ async function sendUSDC(amount, toolName) {
   tx.sign(kp);
   var sig = await conn.sendRawTransaction(tx.serialize(), { skipPreflight: false });
   await conn.confirmTransaction({ signature: sig, blockhash: bh.blockhash, lastValidBlockHeight: bh.lastValidBlockHeight }, 'confirmed');
-  console.error('[cryptoiz-mcp] TX: ' + sig);
+  console.error('[cryptoiz-mcp] V1 TX: ' + sig);
   return sig;
 }
 
@@ -101,22 +155,78 @@ async function callTool(toolName, args) {
   if (toolName === 'get_whale_divergence' && args && args.timeframe) queryParts.push('tf=' + args.timeframe);
   if (toolName === 'get_token_ca' && args && args.name) queryParts.push('name=' + encodeURIComponent(args.name));
   var url = (TOOL_ENDPOINTS[toolName] || GATEWAY) + '?' + queryParts.join('&');
+
   // Step 1: discovery
   var resp1 = await fetch(url, { headers: clientHeaders() });
   if (resp1.status === 200) { var d = await resp1.json(); notifyUpdate(d, resp1.headers); return d; }
   if (resp1.status !== 402) throw new Error('Server error ' + resp1.status + ': ' + (await resp1.text()).substring(0, 200));
+
   // Step 2: parse payment requirements
   var payReq = null;
+  var useV2 = false;
   var prHeader = resp1.headers.get('payment-required');
-  if (prHeader) { try { var arr = JSON.parse(Buffer.from(prHeader, 'base64').toString('utf8')); if (arr && arr[0]) payReq = arr[0]; } catch(_e) {} }
-  if (!payReq) { var b402 = await resp1.json(); if (b402 && b402.accepts && b402.accepts[0]) payReq = b402.accepts[0]; }
+  if (prHeader) {
+    try {
+      var arr = JSON.parse(Buffer.from(prHeader, 'base64').toString('utf8'));
+      if (arr && arr[0]) { payReq = arr[0]; useV2 = true; }
+    } catch(_e) {}
+  }
+  if (!payReq) {
+    var b402 = await resp1.json();
+    if (b402 && b402.accepts && b402.accepts[0]) payReq = b402.accepts[0];
+  }
   if (!payReq) throw new Error('No payment requirements in 402');
+
   var amount = parseInt(payReq.maxAmountRequired || payReq.amount || '10000');
-  console.error('[cryptoiz-mcp] Paying ' + (amount/1000000).toFixed(4) + ' USDC for ' + toolName);
-  // Step 3: V1 direct transfer
-  var sig = await sendUSDC(amount, toolName);
-  // Step 4: submit
-  var resp2 = await fetch(url, { headers: clientHeaders({ 'x-payment': Buffer.from(JSON.stringify({ signature: sig })).toString('base64') }) });
+  var hasFeePayer = payReq.extra && payReq.extra.feePayer;
+  var paymentHeader = '';
+  var headerName = '';
+
+  // Step 3: Try V2 Dexter (gas-sponsored by Dexter — user only needs USDC)
+  if (useV2 && hasFeePayer) {
+    console.error('[cryptoiz-mcp] V2 mode: Dexter gas-sponsored, paying ' + (amount/1000000).toFixed(4) + ' USDC');
+    try {
+      var txB64 = await buildV2PaymentPayload(amount, payReq.extra.feePayer);
+      // FIX v4.16.10: x402Version:2 (was 1), add 'accepted' (chosen PaymentRequirements
+      // verbatim — Dexter /verify needs this to match amount/asset/payTo). Removed bogus
+      // signature field — V2 schema only has payload.transaction.
+      var v2Payload = {
+        x402Version: 2,
+        scheme: 'exact',
+        network: payReq.network || 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+        accepted: payReq,
+        payload: { transaction: txB64 },
+        extensions: {}
+      };
+      paymentHeader = Buffer.from(JSON.stringify(v2Payload)).toString('base64');
+      headerName = 'payment-signature';
+    } catch(v2Err) {
+      console.error('[cryptoiz-mcp] V2 build failed: ' + v2Err.message + ' -> fallback V1');
+      useV2 = false;
+    }
+  }
+
+  // Step 4: V1 fallback (user pays gas — only if V2 failed)
+  if (!paymentHeader) {
+    console.error('[cryptoiz-mcp] V1 fallback: direct on-chain transfer');
+    var sig = await sendUSDC(amount, toolName);
+    paymentHeader = Buffer.from(JSON.stringify({ signature: sig })).toString('base64');
+    headerName = 'x-payment';
+  }
+
+  // Step 5: submit payment
+  var headers2 = {};
+  headers2[headerName] = paymentHeader;
+  var resp2 = await fetch(url, { headers: clientHeaders(headers2) });
+
+  // Step 6: if V2 failed at server, retry with V1
+  if (resp2.status !== 200 && useV2) {
+    console.error('[cryptoiz-mcp] V2 settle failed, trying V1 fallback...');
+    var fallbackSig = await sendUSDC(amount, toolName);
+    var v1Header = Buffer.from(JSON.stringify({ signature: fallbackSig })).toString('base64');
+    resp2 = await fetch(url, { headers: clientHeaders({ 'x-payment': v1Header }) });
+  }
+
   if (resp2.status !== 200) throw new Error('Payment failed ' + resp2.status + ': ' + (await resp2.text()).substring(0, 300));
   var data = await resp2.json();
   notifyUpdate(data, resp2.headers);
@@ -131,7 +241,7 @@ var TOOLS = [
   { name: 'get_whale_distribution', description: 'Distribution phase tokens. Cost: $0.02 USDC', inputSchema: { type: 'object', properties: {}, additionalProperties: false } },
   { name: 'get_btc_regime', description: 'BTC macro regime. Cost: $0.01 USDC', inputSchema: { type: 'object', properties: {}, additionalProperties: false } },
   { name: 'get_btc_futures_signal', description: 'BTC futures signal. Cost: $0.03 USDC', inputSchema: { type: 'object', properties: {}, additionalProperties: false } },
-  { name: 'get_token_ca', description: 'Token contract address by name. FREE', inputSchema: { type: 'object', properties: { name: { type: 'string' } }, required: ['name'], additionalProperties: false } },
+  { name: 'get_token_ca', description: 'Token contract address. FREE', inputSchema: { type: 'object', properties: { name: { type: 'string' } }, required: ['name'], additionalProperties: false } },
   { name: 'get_status', description: 'CryptoIZ MCP status. FREE', inputSchema: { type: 'object', properties: {}, additionalProperties: false } },
 ];
 
@@ -149,6 +259,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 async function main() {
   var transport = new StdioServerTransport();
   await server.connect(transport);
-  console.error('[cryptoiz-mcp] ' + VERSION + ' running (V1 direct)');
+  console.error('[cryptoiz-mcp] ' + VERSION + ' running (V2 Dexter gas-sponsored + V1 fallback)');
 }
 main().catch(console.error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptoiz-mcp",
-  "version": "4.16.8",
+  "version": "4.16.10",
   "description": "CryptoIZ MCP Server - Solana DEX whale intelligence via Claude Desktop with x402 USDC micropayments",
   "main": "index.js",
   "type": "commonjs",
@@ -8,14 +8,24 @@
     "cryptoiz-mcp": "./index.js",
     "cryptoiz-mcp-setup": "./setup.js"
   },
-  "files": ["index.js", "setup.js", "package.json", "README.md"],
+  "files": [
+    "index.js",
+    "setup.js",
+    "package.json",
+    "README.md"
+  ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.4",
     "@solana/web3.js": "^1.95.8",
     "bs58": "^6.0.0"
   },
-  "engines": { "node": ">=18.0.0" },
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "author": "CryptoIZ",
   "license": "MIT",
-  "repository": { "type": "git", "url": "git+https://github.com/dadang11/cryptoiz-mcp.git" }
-}
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/dadang11/cryptoiz-mcp.git"
+  }
+}