cryptoiz-mcp 4.15.4 → 4.15.5

package/index.js

@@ -9,7 +9,7 @@ import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprot
 import { Connection, Keypair, PublicKey, Transaction, SystemProgram, VersionedTransaction, TransactionMessage } from '@solana/web3.js';
 import bs58 from 'bs58';
 
-var VERSION = 'v4.15.4';
+var VERSION = 'v4.15.5';
 var GATEWAY = 'https://rehqwsypjnjirhuiapqh.supabase.co/functions/v1/mcp-x402-gateway';
 var RECIPIENT = 'DsKmdkYx49Xc1WhqMUAztwhdYPTqieyC98VmnnJdgpXX';
 var USDC_MINT = 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
@@ -41,9 +41,14 @@ function findATA(wallet, mint) {
 }
 
 // ===== V2: Build partially-signed tx for Dexter facilitator =====
-// Dexter pays gas (feePayer), user only signs the transfer
-// Tx MUST contain 3 instructions in order: SetComputeUnitLimit, SetComputeUnitPrice, SPL Transfer
+// Reference: @x402/svm exact/client/scheme.ts (Coinbase reference SDK)
+// Tx MUST contain exactly 4 instructions in this order:
+//   1. SetComputeUnitLimit (20000)
+//   2. SetComputeUnitPrice (1 microLamport)
+//   3. TransferChecked (SPL Token)
+//   4. Memo (random 16-byte nonce hex)
 var COMPUTE_BUDGET_PROGRAM = 'ComputeBudget111111111111111111111111111111';
+var MEMO_PROGRAM = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
 
 async function buildV2PaymentPayload(amount, feePayerAddr) {
   var kp = getKeypair();
@@ -53,62 +58,59 @@ async function buildV2PaymentPayload(amount, feePayerAddr) {
   var recipientATA = findATA(RECIPIENT, USDC_MINT);
   var feePayerPk = new PublicKey(feePayerAddr);
   var computeBudgetPk = new PublicKey(COMPUTE_BUDGET_PROGRAM);
+  var memoProgramPk = new PublicKey(MEMO_PROGRAM);
+  var tokenProgramPk = new PublicKey(TOKEN_PROGRAM);
+  var usdcMintPk = new PublicKey(USDC_MINT);
 
-  // Instruction 1: SetComputeUnitLimit (instruction index 2, u32 units)
+  // Instruction 1: SetComputeUnitLimit = 20000 (per @x402/svm constants)
   var setLimitData = Buffer.alloc(5);
   setLimitData.writeUInt8(2, 0);
-  setLimitData.writeUInt32LE(200000, 1);
-  var setLimitIx = {
-    programId: computeBudgetPk,
-    keys: [],
-    data: setLimitData,
-  };
+  setLimitData.writeUInt32LE(20000, 1);
+  var setLimitIx = { programId: computeBudgetPk, keys: [], data: setLimitData };
 
-  // Instruction 2: SetComputeUnitPrice (instruction index 3, u64 microLamports)
+  // Instruction 2: SetComputeUnitPrice = 1 microLamport (per @x402/svm constants)
   var setPriceData = Buffer.alloc(9);
   setPriceData.writeUInt8(3, 0);
-  setPriceData.writeUInt32LE(50000, 1); // 50000 microLamports
+  setPriceData.writeUInt32LE(1, 1);
   setPriceData.writeUInt32LE(0, 5);
-  var setPriceIx = {
-    programId: computeBudgetPk,
-    keys: [],
-    data: setPriceData,
-  };
+  var setPriceIx = { programId: computeBudgetPk, keys: [], data: setPriceData };
 
-  // Instruction 3: SPL Token TransferChecked (NOT Transfer!)
-  // x402 SVM spec requires TransferChecked (instruction index 12)
-  // Accounts: [source_ata, mint, destination_ata, authority]
-  // Data: [12, amount_u64_LE, decimals_u8]
-  var tokenProgramPk = new PublicKey(TOKEN_PROGRAM);
-  var usdcMintPk = new PublicKey(USDC_MINT);
+  // Instruction 3: TransferChecked (SPL Token)
+  // Accounts order: [source, mint, destination, authority]
   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 },
   ];
-  // TransferChecked data: instruction_index(1) + amount_u64(8) + decimals(1) = 10 bytes
   var transferData = Buffer.alloc(10);
-  transferData.writeUInt8(12, 0); // TransferChecked instruction index
+  transferData.writeUInt8(12, 0); // TransferChecked = instruction index 12
   var lo = amount & 0xFFFFFFFF;
   var hi = Math.floor(amount / 0x100000000) & 0xFFFFFFFF;
   transferData.writeUInt32LE(lo, 1);
   transferData.writeUInt32LE(hi, 5);
   transferData.writeUInt8(6, 9); // USDC decimals = 6
-  var transferIx = {
-    programId: tokenProgramPk,
-    keys: transferKeys,
-    data: transferData,
-  };
+  var transferIx = { programId: tokenProgramPk, keys: transferKeys, data: transferData };
+
+  // Instruction 4: Memo with random 16-byte nonce (per @x402/svm reference)
+  var nonceBytes = new Uint8Array(16);
+  for (var i = 0; i < 16; i++) { nonceBytes[i] = Math.floor(Math.random() * 256); }
+  var nonceHex = '';
+  for (var j = 0; j < 16; j++) {
+    var h = nonceBytes[j].toString(16);
+    nonceHex = nonceHex + (h.length < 2 ? '0' + h : h);
+  }
+  var memoData = Buffer.from(nonceHex, 'utf8');
+  var memoIx = { programId: memoProgramPk, keys: [], data: memoData };
 
   // Get recent blockhash
   var bhResult = await conn.getLatestBlockhash('confirmed');
 
-  // Build V0 message: feePayer = Dexter, 3 instructions in required order
+  // Build V0 message: feePayer = Dexter, 4 instructions in spec order
   var message = new TransactionMessage({
     payerKey: feePayerPk,
     recentBlockhash: bhResult.blockhash,
-    instructions: [setLimitIx, setPriceIx, transferIx],
+    instructions: [setLimitIx, setPriceIx, transferIx, memoIx],
   }).compileToV0Message();
 
   var vtx = new VersionedTransaction(message);
@@ -119,7 +121,7 @@ async function buildV2PaymentPayload(amount, feePayerAddr) {
   var serialized = vtx.serialize();
   var txB64 = Buffer.from(serialized).toString('base64');
 
-  console.error('[cryptoiz-mcp] V2 tx built: 3 ix (ComputeLimit + ComputePrice + TransferChecked), feePayer=' + feePayerAddr.substring(0, 8) + '...');
+  console.error('[cryptoiz-mcp] V2 tx: 4 ix (Limit=20000 + Price=1 + TransferChecked + Memo), feePayer=' + feePayerAddr.substring(0, 8) + '..., nonce=' + nonceHex.substring(0, 8) + '...');
   return txB64;
 }
 
@@ -237,17 +239,15 @@ async function callTool(toolName, args) {
   var headerName = '';
 
   if (useV2 && paymentRequirements.extra && paymentRequirements.extra.feePayer) {
-    // V2: Build partially-signed tx, Dexter pays gas
+    // V2: Build partially-signed tx with 4 instructions, Dexter pays gas
     var v2FeePayer = paymentRequirements.extra.feePayer;
-    console.error('[cryptoiz-mcp] V2 mode: building 3-instruction tx for Dexter, feePayer=' + v2FeePayer.substring(0, 8) + '...');
+    console.error('[cryptoiz-mcp] V2 mode: 4-ix tx (Limit+Price+TransferChecked+Memo), feePayer=' + v2FeePayer.substring(0, 8) + '...');
     try {
       var txB64 = await buildV2PaymentPayload(amount, v2FeePayer);
 
-      // Build V2 payment payload per x402 spec
+      // Payload format per @x402/svm reference: only x402Version + payload.transaction
       var v2Payload = {
         x402Version: 2,
-        scheme: 'exact',
-        network: paymentRequirements.network || 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
         payload: {
           transaction: txB64,
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptoiz-mcp",
-  "version": "4.15.4",
+  "version": "4.15.5",
   "description": "CryptoIZ MCP Server - Solana DEX trading signals via Claude Desktop with x402 USDC micropayments (V2 Dexter facilitator)",
   "main": "index.js",
   "type": "module",