cryptoiz-mcp 4.15.1 → 4.15.3

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.1';
+var VERSION = 'v4.15.3';
 var GATEWAY = 'https://rehqwsypjnjirhuiapqh.supabase.co/functions/v1/mcp-x402-gateway';
 var RECIPIENT = 'DsKmdkYx49Xc1WhqMUAztwhdYPTqieyC98VmnnJdgpXX';
 var USDC_MINT = 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
@@ -42,45 +42,66 @@ function findATA(wallet, mint) {
 
 // ===== V2: Build partially-signed tx for Dexter facilitator =====
 // Dexter pays gas (feePayer), user only signs the transfer
-async function buildV2PaymentPayload(amount) {
+// Tx MUST contain 3 instructions in order: SetComputeUnitLimit, SetComputeUnitPrice, SPL Transfer
+var COMPUTE_BUDGET_PROGRAM = 'ComputeBudget111111111111111111111111111111';
+
+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(DEXTER_FEE_PAYER);
+  var feePayerPk = new PublicKey(feePayerAddr);
+  var computeBudgetPk = new PublicKey(COMPUTE_BUDGET_PROGRAM);
+
+  // Instruction 1: SetComputeUnitLimit (instruction index 2, u32 units)
+  var setLimitData = Buffer.alloc(5);
+  setLimitData.writeUInt8(2, 0);
+  setLimitData.writeUInt32LE(200000, 1);
+  var setLimitIx = {
+    programId: computeBudgetPk,
+    keys: [],
+    data: setLimitData,
+  };
+
+  // Instruction 2: SetComputeUnitPrice (instruction index 3, u64 microLamports)
+  var setPriceData = Buffer.alloc(9);
+  setPriceData.writeUInt8(3, 0);
+  setPriceData.writeUInt32LE(50000, 1); // 50000 microLamports
+  setPriceData.writeUInt32LE(0, 5);
+  var setPriceIx = {
+    programId: computeBudgetPk,
+    keys: [],
+    data: setPriceData,
+  };
 
-  // Build SPL Token transfer instruction
+  // Instruction 3: SPL Token Transfer
   var tokenProgramPk = new PublicKey(TOKEN_PROGRAM);
-  var keys = [
+  var transferKeys = [
     { pubkey: userATA, isSigner: false, isWritable: true },
     { pubkey: recipientATA, isSigner: false, isWritable: true },
     { pubkey: kp.publicKey, isSigner: true, isWritable: false },
   ];
-
-  // SPL Token Transfer instruction data: instruction index 3 + u64 amount (LE)
-  var data = Buffer.alloc(9);
-  data.writeUInt8(3, 0); // Transfer instruction index
-  // Write amount as u64 LE
+  var transferData = Buffer.alloc(9);
+  transferData.writeUInt8(3, 0);
   var lo = amount & 0xFFFFFFFF;
   var hi = Math.floor(amount / 0x100000000) & 0xFFFFFFFF;
-  data.writeUInt32LE(lo, 1);
-  data.writeUInt32LE(hi, 5);
-
+  transferData.writeUInt32LE(lo, 1);
+  transferData.writeUInt32LE(hi, 5);
   var transferIx = {
     programId: tokenProgramPk,
-    keys: keys,
-    data: data,
+    keys: transferKeys,
+    data: transferData,
   };
 
   // Get recent blockhash
   var bhResult = await conn.getLatestBlockhash('confirmed');
 
-  // Build V0 message with Dexter as feePayer
+  // Build V0 message: feePayer = Dexter, 3 instructions in required order
   var message = new TransactionMessage({
     payerKey: feePayerPk,
     recentBlockhash: bhResult.blockhash,
-    instructions: [transferIx],
+    instructions: [setLimitIx, setPriceIx, transferIx],
   }).compileToV0Message();
 
   var vtx = new VersionedTransaction(message);
@@ -88,10 +109,10 @@ async function buildV2PaymentPayload(amount) {
   // Partially sign with user keypair only (Dexter signs as feePayer later)
   vtx.sign([kp]);
 
-  // Serialize and base64 encode
   var serialized = vtx.serialize();
   var txB64 = Buffer.from(serialized).toString('base64');
 
+  console.error('[cryptoiz-mcp] V2 tx built: 3 instructions (ComputeLimit + ComputePrice + Transfer), feePayer=' + feePayerAddr.substring(0, 8) + '...');
   return txB64;
 }
 
@@ -210,9 +231,10 @@ async function callTool(toolName, args) {
 
   if (useV2 && paymentRequirements.extra && paymentRequirements.extra.feePayer) {
     // V2: Build partially-signed tx, Dexter pays gas
-    console.error('[cryptoiz-mcp] V2 mode: building partial tx for Dexter gas sponsorship...');
+    var v2FeePayer = paymentRequirements.extra.feePayer;
+    console.error('[cryptoiz-mcp] V2 mode: building 3-instruction tx for Dexter, feePayer=' + v2FeePayer.substring(0, 8) + '...');
     try {
-      var txB64 = await buildV2PaymentPayload(amount);
+      var txB64 = await buildV2PaymentPayload(amount, v2FeePayer);
 
       // Build V2 payment payload per x402 spec
       var v2Payload = {
@@ -226,7 +248,7 @@ async function callTool(toolName, args) {
 
       paymentHeader = Buffer.from(JSON.stringify(v2Payload)).toString('base64');
       headerName = 'payment-signature';
-      console.error('[cryptoiz-mcp] V2 partial tx built, sending via PAYMENT-SIGNATURE header');
+      console.error('[cryptoiz-mcp] V2 tx ready, sending via payment-signature header');
     } catch(e) {
       console.error('[cryptoiz-mcp] V2 build failed: ' + e.message + ', falling back to V1');
       useV2 = false;
@@ -253,6 +275,27 @@ async function callTool(toolName, args) {
 
   var resp2 = await fetch(url, { headers: headers2 });
 
+  // V2 settle failed? Auto-fallback to V1
+  if (resp2.status !== 200 && useV2) {
+    var v2ErrBody = await resp2.text();
+    console.error('[cryptoiz-mcp] V2 settle failed (' + resp2.status + '): ' + v2ErrBody.substring(0, 200));
+    console.error('[cryptoiz-mcp] Auto-fallback to V1 (sendUSDC on-chain)...');
+    
+    try {
+      // V1: send USDC on-chain, retry with x-payment
+      var fallbackSig = await sendUSDC(amount);
+      console.error('[cryptoiz-mcp] V1 fallback TX confirmed: ' + fallbackSig);
+      
+      var v1FallbackPayload = { signature: fallbackSig };
+      var v1FallbackHeader = Buffer.from(JSON.stringify(v1FallbackPayload)).toString('base64');
+      
+      resp2 = await fetch(url, { headers: { 'x-payment': v1FallbackHeader } });
+    } catch(fallbackErr) {
+      console.error('[cryptoiz-mcp] V1 fallback also failed: ' + fallbackErr.message);
+      throw new Error('V2 failed (' + v2ErrBody.substring(0, 100) + '), V1 fallback also failed: ' + fallbackErr.message);
+    }
+  }
+
   if (resp2.status !== 200) {
     var errBody = await resp2.text();
     throw new Error('Payment failed (' + resp2.status + '): ' + errBody);

package/package.json

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