pinpet-sdk 2.1.28 → 2.1.30

package/src/modules/chain.js

@@ -14,6 +14,21 @@ const { Buffer } = require('buffer');
 class ChainModule {
   constructor(sdk) {
     this.sdk = sdk;
+    // getCurveAccount 缓存：key = mint string, value = { data, timestamp }
+    this._curveAccountCache = new Map();
+    this._CACHE_TTL = 10000; // 10 秒 TTL
+  }
+
+  /**
+   * 清除指定 mint 的 curveAccount 缓存（交易后调用）
+   * @param {string} [mint] - 指定 mint 地址，不传则清除全部
+   */
+  invalidateCurveCache(mint) {
+    if (mint) {
+      this._curveAccountCache.delete(typeof mint === 'string' ? mint : mint.toString());
+    } else {
+      this._curveAccountCache.clear();
+    }
   }
 
   /**
@@ -142,10 +157,23 @@ class ChainModule {
    * @version 2.0.0 - Updated to use new OrderBook structure (up_orderbook/down_orderbook instead of upHead/downHead)
    * @author SpinPet SDK Team
    */
-  async getCurveAccount(mint) {
+  async getCurveAccount(mint, options = {}) {
+    const { skipBalances = false } = options;
     try {
       // Parameter validation and conversion
       const mintPubkey = typeof mint === 'string' ? new PublicKey(mint) : mint;
+      const mintKey = mintPubkey.toString();
+
+      // 检查缓存
+      const cached = this._curveAccountCache.get(mintKey);
+      if (cached && (Date.now() - cached.timestamp < this._CACHE_TTL)) {
+        // 缓存命中：如果请求包含余额但缓存没有，需要重新获取余额部分
+        if (!skipBalances && cached.skipBalances) {
+          // 缓存是 skipBalances 的，但现在需要余额，需要补充查询
+        } else {
+          return cached.data;
+        }
+      }
 
       // Calculate curve_account PDA address
       // Use the same seeds as in the contract: [b"borrowing_curve", mint_account.key().as_ref()]
@@ -203,18 +231,25 @@ class ChainModule {
         this.sdk.programId
       );
 
-      // Query all balances concurrently
-      const [
-        baseFeeRecipientBalance,
-        feeRecipientBalance,
-        poolTokenBalance,
-        poolSolBalance
-      ] = await Promise.all([
-        this.sdk.connection.getBalance(decodedData.baseFeeRecipient),
-        this.sdk.connection.getBalance(decodedData.feeRecipient),
-        this.sdk.connection.getTokenAccountBalance(poolTokenAccountPDA).catch(() => ({ value: { amount: '0' } })),
-        this.sdk.connection.getBalance(poolSolAccountPDA)
-      ]);
+      // Query balances (skip if not needed)
+      let baseFeeRecipientBalance = 0;
+      let feeRecipientBalance = 0;
+      let poolTokenBalance = { value: { amount: '0' } };
+      let poolSolBalance = 0;
+
+      if (!skipBalances) {
+        [
+          baseFeeRecipientBalance,
+          feeRecipientBalance,
+          poolTokenBalance,
+          poolSolBalance
+        ] = await Promise.all([
+          this.sdk.connection.getBalance(decodedData.baseFeeRecipient),
+          this.sdk.connection.getBalance(decodedData.feeRecipient),
+          this.sdk.connection.getTokenAccountBalance(poolTokenAccountPDA).catch(() => ({ value: { amount: '0' } })),
+          this.sdk.connection.getBalance(poolSolAccountPDA)
+        ]);
+      }
 
       // Convert data format
       const convertedData = {
@@ -270,6 +305,13 @@ class ChainModule {
         }
       };
 
+      // 写入缓存
+      this._curveAccountCache.set(mintKey, {
+        data: convertedData,
+        timestamp: Date.now(),
+        skipBalances: skipBalances
+      });
+
       // Return converted data
       return convertedData;
 
@@ -326,58 +368,13 @@ class ChainModule {
     }
 
     try {
-      // Parameter validation and conversion
-      let mintPubkey;
-      try {
-        mintPubkey = typeof mint === 'string' ? new PublicKey(mint) : mint;
-      } catch (pubkeyError) {
-        throw new Error(`Invalid mint address: ${mint}`);
-      }
-
-      // Validate mintPubkey
-      if (!mintPubkey || typeof mintPubkey.toBuffer !== 'function') {
-        throw new Error(`Invalid mintPubkey`);
-      }
-
-      // Calculate curve_account PDA address
-      const [curveAccountPDA] = PublicKey.findProgramAddressSync(
-        [
-          Buffer.from("borrowing_curve"),
-          mintPubkey.toBuffer()
-        ],
-        this.sdk.programId
-      );
-
-      // Use Anchor program to fetch account data directly
-      let decodedData;
-      try {
-        decodedData = await this.sdk.program.account.borrowingBondingCurve.fetch(curveAccountPDA);
-      } catch (fetchError) {
-        // If fetch fails, use raw method
-        const accountInfo = await this.sdk.connection.getAccountInfo(curveAccountPDA);
-        if (!accountInfo) {
-          throw new Error(`curve_account does not exist`);
-        }
-
-        // Manually decode with BorshAccountsCoder
-        const accountsCoder = new anchor.BorshAccountsCoder(this.sdk.program.idl);
-
-        try {
-          decodedData = accountsCoder.decode('BorrowingBondingCurve', accountInfo.data);
-        } catch (decodeError1) {
-          try {
-            decodedData = accountsCoder.decode('borrowingBondingCurve', accountInfo.data);
-          } catch (decodeError2) {
-            throw new Error(`Cannot decode account data: ${decodeError1.message}`);
-          }
-        }
-      }
+      // 复用 getCurveAccount 缓存，避免重复 fetch 同一个账户
+      const curveData = await this.getCurveAccount(mint, { skipBalances: true });
+      const price = curveData.price;
 
-      // Check price data and return
-      if (decodedData.price && decodedData.price.toString() !== '0') {
-        return decodedData.price.toString();
+      if (price && price !== 0n) {
+        return price.toString();
       } else {
-        // If no price data, return initial price
         const initialPrice = CurveAMM.getInitialPrice();
         if (initialPrice === null) {
           throw new Error('price: Unable to calculate initial price');
@@ -473,14 +470,16 @@ class ChainModule {
       // Convert API type to orderbook direction
       // "up_orders" = short orders = upOrderbook (orderType=2)
       // "down_orders" = long orders = downOrderbook (orderType=1)
-      const orderbookField = orderType === 'up_orders' ? 'upOrderbook' : 'downOrderbook';
+      const seed = orderType === 'up_orders' ? 'up_orderbook' : 'down_orderbook';
 
-      // Get curve_account data to get orderbook address
-      const curveData = await this.getCurveAccount(mint);
-      const orderbookAddress = curveData[orderbookField];
+      // 本地计算 orderbook PDA，避免调用 getCurveAccount（省 5 个 RPC）
+      const mintPubkey = new PublicKey(mint);
+      const [orderbookPubkey] = PublicKey.findProgramAddressSync(
+        [Buffer.from(seed), mintPubkey.toBuffer()],
+        this.sdk.programId
+      );
 
       // Get OrderBook account data
-      const orderbookPubkey = new PublicKey(orderbookAddress);
       const accountInfo = await this.sdk.connection.getAccountInfo(orderbookPubkey);
 
       if (!accountInfo) {
@@ -931,15 +930,15 @@ class ChainModule {
         throw new Error('debug_orders: order type must be "up_orders" or "down_orders"');
       }
 
-      // Convert API type to orderbook direction
-      const orderbookField = orderType === 'up_orders' ? 'upOrderbook' : 'downOrderbook';
-
-      // Get curve_account data to get orderbook address
-      const curveData = await this.getCurveAccount(mint);
-      const orderbookAddress = curveData[orderbookField];
+      // 本地计算 orderbook PDA，避免调用 getCurveAccount（省 5 个 RPC）
+      const seed = orderType === 'up_orders' ? 'up_orderbook' : 'down_orderbook';
+      const mintPubkey = new PublicKey(mint);
+      const [orderbookPubkey] = PublicKey.findProgramAddressSync(
+        [Buffer.from(seed), mintPubkey.toBuffer()],
+        this.sdk.programId
+      );
 
       // Get OrderBook account data
-      const orderbookPubkey = new PublicKey(orderbookAddress);
       const accountInfo = await this.sdk.connection.getAccountInfo(orderbookPubkey);
 
       if (!accountInfo) {
@@ -1142,10 +1141,18 @@ class ChainModule {
       const page = 1; // Always return page 1
       const orderBy = options.order_by || 'start_time_desc';
 
-      // Get curve_account data to get both OrderBook addresses
-      const curveData = await this.getCurveAccount(mint);
-      const upOrderbookAddress = curveData.upOrderbook;   // Short orders (orderType=2)
-      const downOrderbookAddress = curveData.downOrderbook; // Long orders (orderType=1)
+      // 本地计算 orderbook PDA，避免调用 getCurveAccount（省 5 个 RPC）
+      const mintPubkey = new PublicKey(mint);
+      const [upOrderbookPubkey] = PublicKey.findProgramAddressSync(
+        [Buffer.from('up_orderbook'), mintPubkey.toBuffer()],
+        this.sdk.programId
+      );
+      const [downOrderbookPubkey] = PublicKey.findProgramAddressSync(
+        [Buffer.from('down_orderbook'), mintPubkey.toBuffer()],
+        this.sdk.programId
+      );
+      const upOrderbookAddress = upOrderbookPubkey.toString();   // Short orders (orderType=2)
+      const downOrderbookAddress = downOrderbookPubkey.toString(); // Long orders (orderType=1)
 
       // Collect all user orders from both OrderBooks
       const allUserOrders = [];

package/src/modules/simulator/buy_sell_token.js

@@ -26,7 +26,7 @@ const { calcLiqTokenBuy, calcLiqTokenSell } = require('./calcLiq');
  *   - suggestedTokenAmount: {string} Recommended token amount to buy based on available liquidity
  *   - suggestedSolAmount: {string} Required SOL amount for suggested token purchase
  */
-async function simulateTokenBuy(mint, buyTokenAmount, passOrder = null, lastPrice = null, ordersData = null) {
+async function simulateTokenBuy(mint, buyTokenAmount, passOrder = null, lastPrice = null, ordersData = null, curveData = null) {
   // 获取价格和订单数据
 
   //console.log('simulateTokenBuy', mint, buyTokenAmount, passOrder, lastPrice, ordersData);
@@ -49,12 +49,13 @@ async function simulateTokenBuy(mint, buyTokenAmount, passOrder = null, lastPric
     orders = ordersData.data.orders.slice(0, this.sdk.MAX_ORDERS_COUNT + 1);
   }
 
-  // 获取动态流动池参数
-  let curveData;
-  try {
-    curveData = await this.sdk.chain.getCurveAccount(mint);
-  } catch (error) {
-    throw new Error(`Failed to get curve account data: ${error.message}`);
+  // 获取动态流动池参数（支持外部传入，避免重复请求）
+  if (!curveData) {
+    try {
+      curveData = await this.sdk.chain.getCurveAccount(mint, { skipBalances: true });
+    } catch (error) {
+      throw new Error(`Failed to get curve account data: ${error.message}`);
+    }
   }
 
   // 调用 calcLiqTokenBuy 进行流动性计算（传入动态流动池参数）
@@ -182,7 +183,7 @@ async function simulateTokenBuy(mint, buyTokenAmount, passOrder = null, lastPric
  *   - suggestedTokenAmount: {string} Recommended token amount to sell based on available liquidity
  *   - suggestedSolAmount: {string} Expected SOL amount from suggested token sale
  */
-async function simulateTokenSell(mint, sellTokenAmount, passOrder = null, lastPrice = null, ordersData = null) {
+async function simulateTokenSell(mint, sellTokenAmount, passOrder = null, lastPrice = null, ordersData = null, curveData = null) {
   // 获取价格和订单数据
   let price = lastPrice;
   if (!price) {
@@ -204,12 +205,13 @@ async function simulateTokenSell(mint, sellTokenAmount, passOrder = null, lastPr
     orders = ordersData.data.orders.slice(0, this.sdk.MAX_ORDERS_COUNT + 1);
   }
 
-  // 获取动态流动池参数
-  let curveData;
-  try {
-    curveData = await this.sdk.chain.getCurveAccount(mint);
-  } catch (error) {
-    throw new Error(`Failed to get curve account data: ${error.message}`);
+  // 获取动态流动池参数（支持外部传入，避免重复请求）
+  if (!curveData) {
+    try {
+      curveData = await this.sdk.chain.getCurveAccount(mint, { skipBalances: true });
+    } catch (error) {
+      throw new Error(`Failed to get curve account data: ${error.message}`);
+    }
   }
 
   // console.log('simulateTokenSell 获取的数据:');

package/src/modules/simulator/long_shrot_stop.js

@@ -134,7 +134,7 @@ async function simulateLongStopLoss(mint, buyTokenAmount, stopLossPrice, lastPri
 
         // 如果没有传入 borrowFee 或池子参数，从链上一次性获取
         if (borrowFee === null || initialVirtualSol === null || initialVirtualToken === null) {
-            const curveAccount = await this.sdk.chain.getCurveAccount(mint);
+            const curveAccount = await this.sdk.chain.getCurveAccount(mint, { skipBalances: true });
             if (borrowFee === null) borrowFee = curveAccount.borrowFee;
             // 链上返回的是 u64 原始单位（lamports/最小单位），需要除以 10^9 转为人类可读单位
             // 与 calcLiq.js 中的转换方式一致
@@ -454,7 +454,7 @@ async function simulateShortStopLoss(mint, sellTokenAmount, stopLossPrice, lastP
 
         // 如果没有传入 borrowFee 或池子参数，从链上一次性获取
         if (borrowFee === null || initialVirtualSol === null || initialVirtualToken === null) {
-            const curveAccount = await this.sdk.chain.getCurveAccount(mint);
+            const curveAccount = await this.sdk.chain.getCurveAccount(mint, { skipBalances: true });
             if (borrowFee === null) borrowFee = curveAccount.borrowFee;
             // 链上返回的是 u64 原始单位（lamports/最小单位），需要除以 10^9 转为人类可读单位
             // 与 calcLiq.js 中的转换方式一致
@@ -702,19 +702,19 @@ async function simulateShortStopLoss(mint, sellTokenAmount, stopLossPrice, lastP
  * @since 2.0.0
  * @version 2.0.0 - 从返回 prev_order_pda/next_order_pda 改为返回 close_insert_indices
  */
-async function simulateLongSolStopLoss(mint, buySolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null) {
+async function simulateLongSolStopLoss(mint, buySolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null, curveAccount = null) {
     try {
         // Parameter validation
         if (!mint || !buySolAmount || !stopLossPrice) {
             throw new Error('Missing required parameters');
         }
 
-        // 如果没有传入 borrowFee 或池子参数，从链上一次性获取
+        // 如果没有传入 borrowFee 或池子参数，从链上一次性获取（支持外部传入 curveAccount 避免重复 RPC）
         if (borrowFee === null || initialVirtualSol === null || initialVirtualToken === null) {
-            const curveAccount = await this.sdk.chain.getCurveAccount(mint);
+            if (!curveAccount) {
+                curveAccount = await this.sdk.chain.getCurveAccount(mint, { skipBalances: true });
+            }
             if (borrowFee === null) borrowFee = curveAccount.borrowFee;
-            // 链上返回的是 u64 原始单位（lamports/最小单位），需要除以 10^9 转为人类可读单位
-            // 与 calcLiq.js 中的转换方式一致
             if (initialVirtualSol === null) initialVirtualSol = new Decimal(curveAccount.initialVirtualSol.toString()).div(CurveAMM.SOL_PRECISION_FACTOR_DECIMAL).toString();
             if (initialVirtualToken === null) initialVirtualToken = new Decimal(curveAccount.initialVirtualToken.toString()).div(CurveAMM.TOKEN_PRECISION_FACTOR_DECIMAL).toString();
         }
@@ -886,19 +886,19 @@ async function simulateLongSolStopLoss(mint, buySolAmount, stopLossPrice, lastPr
  * @since 2.0.0
  * @version 2.0.0 - 从返回 prev_order_pda/next_order_pda 改为返回 close_insert_indices
  */
-async function simulateShortSolStopLoss(mint, sellSolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null) {
+async function simulateShortSolStopLoss(mint, sellSolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null, curveAccount = null) {
     try {
         // Parameter validation
         if (!mint || !sellSolAmount || !stopLossPrice) {
             throw new Error('Missing required parameters');
         }
 
-        // 如果没有传入 borrowFee 或池子参数，从链上一次性获取
+        // 如果没有传入 borrowFee 或池子参数，从链上一次性获取（支持外部传入 curveAccount 避免重复 RPC）
         if (borrowFee === null || initialVirtualSol === null || initialVirtualToken === null) {
-            const curveAccount = await this.sdk.chain.getCurveAccount(mint);
+            if (!curveAccount) {
+                curveAccount = await this.sdk.chain.getCurveAccount(mint, { skipBalances: true });
+            }
             if (borrowFee === null) borrowFee = curveAccount.borrowFee;
-            // 链上返回的是 u64 原始单位（lamports/最小单位），需要除以 10^9 转为人类可读单位
-            // 与 calcLiq.js 中的转换方式一致
             if (initialVirtualSol === null) initialVirtualSol = new Decimal(curveAccount.initialVirtualSol.toString()).div(CurveAMM.SOL_PRECISION_FACTOR_DECIMAL).toString();
             if (initialVirtualToken === null) initialVirtualToken = new Decimal(curveAccount.initialVirtualToken.toString()).div(CurveAMM.TOKEN_PRECISION_FACTOR_DECIMAL).toString();
         }

package/src/modules/simulator/utils.js

@@ -13,9 +13,9 @@ const MIN_STOP_LOSS_PERCENT = 40; // 4.0%
 
 // Maximum number of candidate indices to include in close_insert_indices
 // This represents: 1 main position + N nodes before + N nodes after
-// Must be an odd number >= 1 (e.g., 21 = 1 main + 10 before + 10 after)
-// The contract accepts up to 20, we use 21 to provide more flexibility
-const MAX_CANDIDATE_INDICES = 31;
+// Must be an odd number >= 1 (e.g., 41 = 1 main + 20 before + 20 after)
+// The contract accepts up to 41
+const MAX_CANDIDATE_INDICES = 19;
 
 
 // Validate MAX_CANDIDATE_INDICES constant

package/src/modules/simulator.js

@@ -43,8 +43,8 @@ class SimulatorModule {
      *   - suggestedTokenAmount: {string} Recommended token amount to buy based on available liquidity
      *   - suggestedSolAmount: {string} Required SOL amount for suggested token purchase
      */
-    async simulateTokenBuy(mint, buyTokenAmount, passOrder = null, lastPrice = null, ordersData = null) {
-        return simulateTokenBuy.call(this, mint, buyTokenAmount, passOrder, lastPrice, ordersData);
+    async simulateTokenBuy(mint, buyTokenAmount, passOrder = null, lastPrice = null, ordersData = null, curveData = null) {
+        return simulateTokenBuy.call(this, mint, buyTokenAmount, passOrder, lastPrice, ordersData, curveData);
     }
 
     /**
@@ -70,8 +70,8 @@ class SimulatorModule {
      *   - suggestedTokenAmount: {string} Recommended token amount to sell based on available liquidity
      *   - suggestedSolAmount: {string} Expected SOL amount from suggested token sale
      */
-    async simulateTokenSell(mint, sellTokenAmount, passOrder = null, lastPrice = null, ordersData = null) {
-        return simulateTokenSell.call(this, mint, sellTokenAmount, passOrder, lastPrice, ordersData);
+    async simulateTokenSell(mint, sellTokenAmount, passOrder = null, lastPrice = null, ordersData = null, curveData = null) {
+        return simulateTokenSell.call(this, mint, sellTokenAmount, passOrder, lastPrice, ordersData, curveData);
     }
 
     /**
@@ -110,8 +110,8 @@ class SimulatorModule {
      * @param {number} borrowFee - Borrow fee rate, default 2000 (2000/100000 = 0.02%)
      * @returns {Promise<Object>} Stop loss analysis result (same as simulateLongStopLoss)
      */
-    async simulateLongSolStopLoss(mint, buySolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null) {
-        return simulateLongSolStopLoss.call(this, mint, buySolAmount, stopLossPrice, lastPrice, ordersData, borrowFee);
+    async simulateLongSolStopLoss(mint, buySolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null, curveAccount = null) {
+        return simulateLongSolStopLoss.call(this, mint, buySolAmount, stopLossPrice, lastPrice, ordersData, borrowFee, initialVirtualSol, initialVirtualToken, curveAccount);
     }
 
     /**
@@ -124,8 +124,8 @@ class SimulatorModule {
      * @param {number} borrowFee - Borrow fee rate, default 2000 (2000/100000 = 0.02%)
      * @returns {Promise<Object>} Stop loss analysis result (same as simulateShortStopLoss)
      */
-    async simulateShortSolStopLoss(mint, sellSolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null) {
-        return simulateShortSolStopLoss.call(this, mint, sellSolAmount, stopLossPrice, lastPrice, ordersData, borrowFee);
+    async simulateShortSolStopLoss(mint, sellSolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null, curveAccount = null) {
+        return simulateShortSolStopLoss.call(this, mint, sellSolAmount, stopLossPrice, lastPrice, ordersData, borrowFee, initialVirtualSol, initialVirtualToken, curveAccount);
     }
 
     /**
@@ -204,15 +204,13 @@ class SimulatorModule {
                 };
             }
 
-            // Get current price and orders data
-            const priceResult = await this.sdk.data.price(mint);
-            const ordersResult = await this.sdk.data.orders(mint, { type: 'down_orders' });
-
-            console.log("ordersResult:",ordersResult)
-
-            const upOrdersResult = await this.sdk.data.orders(mint, { type: 'up_orders' });
-            console.log("upOrdersResult:",upOrdersResult);
-            console.log("upOrdersResult:",upOrdersResult.data.orders);
+            // Get current price, orders data, and curve account in parallel
+            const [priceResult, ordersResult, upOrdersResult, curveAccount] = await Promise.all([
+                this.sdk.data.price(mint),
+                this.sdk.data.orders(mint, { type: 'down_orders' }),
+                this.sdk.data.orders(mint, { type: 'up_orders' }),
+                this.sdk.chain.getCurveAccount(mint, { skipBalances: true })
+            ]);
 
             if (!priceResult || !ordersResult) {
                 return {
@@ -228,7 +226,6 @@ class SimulatorModule {
             const currentPrice = typeof priceResult === 'string' ? BigInt(priceResult) : BigInt(priceResult.last_price || priceResult);
 
             // Get curve account data for initialVirtualSol and initialVirtualToken
-            const curveAccount = await this.sdk.chain.getCurveAccount(mint);
             const initialVirtualSol = curveAccount.initialVirtualSol;
             const initialVirtualToken = curveAccount.initialVirtualToken;
 
@@ -238,8 +235,8 @@ class SimulatorModule {
 
             const estimatedTokenAmount = reSolBuy.tokenAmount;
 
-            // Call simulateTokenBuy with estimated amount
-            const tokenBuyResult = await this.simulateTokenBuy(mint, estimatedTokenAmount, null, priceResult, ordersResult);
+            // Call simulateTokenBuy with estimated amount, pass curveAccount to avoid duplicate RPC
+            const tokenBuyResult = await this.simulateTokenBuy(mint, estimatedTokenAmount, null, priceResult, ordersResult, curveAccount);
 
             // Transform result to match simulateBuy format
             return {
@@ -325,10 +322,12 @@ class SimulatorModule {
                 };
             }
 
-            // Get current price and orders data
+            // Get current price and orders data in parallel
             // For sell transactions, we need down_orders (long orders that provide buy liquidity)
-            const priceResult = await this.sdk.data.price(mint);
-            const ordersResult = await this.sdk.data.orders(mint, { type: 'down_orders' });
+            const [priceResult, ordersResult] = await Promise.all([
+                this.sdk.data.price(mint),
+                this.sdk.data.orders(mint, { type: 'down_orders' })
+            ]);
 
             if (!priceResult || !ordersResult) {
                 return {

package/src/modules/token.js

@@ -1,4 +1,4 @@
-const { ComputeBudgetProgram, PublicKey, Transaction, Keypair, SystemProgram, SYSVAR_RENT_PUBKEY, VersionedTransaction, TransactionMessage } = require('@solana/web3.js');
+const { ComputeBudgetProgram, PublicKey, Transaction, Keypair, SystemProgram, SYSVAR_RENT_PUBKEY } = require('@solana/web3.js');
 const { TOKEN_PROGRAM_ID, getAssociatedTokenAddress, createAssociatedTokenAccountInstruction, ASSOCIATED_TOKEN_PROGRAM_ID } = require('@solana/spl-token');
 const anchor = require('@coral-xyz/anchor');
 // 统一使用 buffer 包，所有平台一致
@@ -235,13 +235,8 @@ class TokenModule {
   }
 
   /**
-   * Create token and buy in one transaction (使用 VersionedTransaction v0)
-   * 将 create 和 buy 两个指令合并到一个 v0 交易中，一次签名提交
-   *
-   * 注意：返回的 transaction 是 VersionedTransaction 类型（非 Legacy Transaction）
-   * - feePayer 和 recentBlockhash 已在 SDK 端设置，网站端不需要再设置
-   * - 签名方式：先 transaction.sign([mintKeypair])，再 phantom.signTransaction(tx)
-   * - 发送方式：connection.sendRawTransaction(signedTx.serialize())
+   * Create token and buy in one transaction
+   * 将 create 和 buy 两个指令合并到一个交易中，一次签名提交
    *
    * @param {Object} params - Creation and buy parameters
    * @param {Keypair} params.mint - Token mint keypair
@@ -261,20 +256,7 @@ class TokenModule {
    *
    * @param {Object} options - Optional parameters
    * @param {number} options.computeUnits - Compute units limit, default 1800000
-   * @returns {Promise<Object>} Object containing VersionedTransaction, signers, accounts and blockhashInfo
-   *
-   * @example
-   * // Node.js 环境
-   * const result = await sdk.token.createAndBuy({...});
-   * result.transaction.sign([wallet, ...result.signers]);
-   * const sig = await connection.sendRawTransaction(result.transaction.serialize());
-   *
-   * @example
-   * // 浏览器 Phantom 环境
-   * const result = await sdk.token.createAndBuy({...});
-   * result.transaction.sign(result.signers);          // mint keypair 先签名
-   * const signed = await phantom.signTransaction(result.transaction); // Phantom 追加 payer 签名
-   * const sig = await connection.sendRawTransaction(signed.serialize());
+   * @returns {Promise<Object>} Object containing transaction, signers and account info
    */
   async createAndBuy({
     mint,
@@ -293,7 +275,7 @@ class TokenModule {
   }, options = {}) {
     const { computeUnits = 1800000 } = options;
 
-    console.log('Token Module - CreateAndBuy (VersionedTransaction):', {
+    console.log('Token Module - CreateAndBuy:', {
       mint: mint.publicKey.toString(),
       name,
       symbol,
@@ -329,6 +311,7 @@ class TokenModule {
     console.log('Step 2: Fetching fee recipient accounts from params...');
 
     // 直接从 SDK 配置中获取手续费接收账户（这些在 SDK 初始化时已经设置）
+    // 避免使用 program.account.params.fetch() 因为可能有 provider 配置问题
     const feeRecipientAccount = this.sdk.feeRecipient;
     const baseFeeRecipientAccount = this.sdk.baseFeeRecipient;
 
@@ -419,54 +402,42 @@ class TokenModule {
       })
       .instruction();
 
-    // 7. 收集所有指令
-    console.log('Step 6: Building VersionedTransaction (v0)...');
-    const instructions = [];
+    // 7. 合并交易：create + buy
+    console.log('Step 6: Merging create and buy transactions...');
+    const transaction = new Transaction();
 
     // 设置计算单元限制
     const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
       units: computeUnits
     });
-    instructions.push(modifyComputeUnits);
+    transaction.add(modifyComputeUnits);
 
     // 添加 create 交易的所有指令（跳过 create 中的计算单元指令）
     createResult.transaction.instructions.forEach(ix => {
+      // 跳过 create 交易中的计算单元指令（我们已经添加了）
       if (ix.programId.equals(ComputeBudgetProgram.programId)) {
         return;
       }
-      instructions.push(ix);
+      transaction.add(ix);
     });
 
     // 添加 ATA 创建指令（如果需要）
     if (createAtaIx) {
-      instructions.push(createAtaIx);
+      transaction.add(createAtaIx);
     }
 
-    // 添加 buy 指令
-    instructions.push(buyIx);
-
-    // 8. 获取最新 blockhash 并构建 VersionedTransaction
-    const blockhashResult = await this.sdk.connection.getLatestBlockhash('confirmed');
+    // 添加 buy 指令 
+    transaction.add(buyIx);
 
-    const messageV0 = new TransactionMessage({
-      payerKey: payer,
-      recentBlockhash: blockhashResult.blockhash,
-      instructions: instructions,
-    }).compileToV0Message();
-
-    const transaction = new VersionedTransaction(messageV0);
-
-    // 9. 用 mint keypair 预签名（调用方只需 payer 签名）
-    transaction.sign([mint]);
-
-    console.log('CreateAndBuy VersionedTransaction built successfully:');
-    console.log('  Total instructions:', instructions.length);
+    console.log('CreateAndBuy transaction built successfully:');
+    console.log('  Total instructions:', transaction.instructions.length);
     console.log('  Compute units:', computeUnits);
-    console.log('  mint keypair pre-signed, caller only needs payer signature');
+    console.log('  Signers required:', [payer.toString(), mint.publicKey.toString()]);
 
-    // 10. 返回 VersionedTransaction（mint 已预签名）
+    // 8. 返回合并后的交易
     return {
-      transaction,  // 已包含 mint 签名
+      transaction,
+      signers: [mint],  // mint keypair 需要签名
       accounts: {
         // create 的账户
         ...createResult.accounts,
@@ -475,23 +446,10 @@ class TokenModule {
         cooldown: cooldownPDA,
         feeRecipientAccount,
         baseFeeRecipientAccount
-      },
-      // 返回 blockhash 信息供调用方确认交易使用
-      blockhashInfo: {
-        blockhash: blockhashResult.blockhash,
-        lastValidBlockHeight: blockhashResult.lastValidBlockHeight
       }
     };
   }
 
-  /**
-   * createAndBuy 的别名（功能完全相同）
-   * 保留此方法以保持向后兼容
-   */
-  async createAndBuySign(params, options = {}) {
-    return this.createAndBuy(params, options);
-  }
-
 }
 
 module.exports = TokenModule;