pinpet-sdk 2.1.29 → 2.1.31

package/dist/pinpet-sdk.cjs.js

@@ -15703,8 +15703,8 @@ class TradingModule$1 {
       )
       : null;
 
-    // 6. Get fee recipient accounts from curve account
-    const curveAccountInfo = await this.sdk.chain.getCurveAccount(mint);
+    // 6. Get fee recipient accounts from curve account (skipBalances: only need addresses)
+    const curveAccountInfo = await this.sdk.chain.getCurveAccount(mint, { skipBalances: true });
     const feeRecipientAccount = new PublicKey$6(curveAccountInfo.feeRecipient);
     const baseFeeRecipientAccount = new PublicKey$6(curveAccountInfo.baseFeeRecipient);
 
@@ -15839,8 +15839,8 @@ class TradingModule$1 {
       )
       : null;
 
-    // 6. Get fee recipient accounts from curve account
-    const curveAccountInfo = await this.sdk.chain.getCurveAccount(mint);
+    // 6. Get fee recipient accounts from curve account (skipBalances: only need addresses)
+    const curveAccountInfo = await this.sdk.chain.getCurveAccount(mint, { skipBalances: true });
     const feeRecipientAccount = new PublicKey$6(curveAccountInfo.feeRecipient);
     const baseFeeRecipientAccount = new PublicKey$6(curveAccountInfo.baseFeeRecipient);
 
@@ -16219,8 +16219,8 @@ class TradingModule$1 {
       this.sdk.programId
     );
 
-    // 4. 从 curve account 获取手续费接收账户 / Get fee recipient accounts from curve account
-    const curveAccountInfo = await this.sdk.chain.getCurveAccount(mint);
+    // 4. 从 curve account 获取手续费接收账户 / Get fee recipient accounts from curve account (skipBalances: only need addresses)
+    const curveAccountInfo = await this.sdk.chain.getCurveAccount(mint, { skipBalances: true });
     const feeRecipientAccount = new PublicKey$6(curveAccountInfo.feeRecipient);
     const baseFeeRecipientAccount = new PublicKey$6(curveAccountInfo.baseFeeRecipient);
 
@@ -16368,8 +16368,8 @@ class TradingModule$1 {
       this.sdk.programId
     );
 
-    // 4. 从 curve account 获取手续费接收账户 / Get fee recipient accounts from curve account
-    const curveAccountInfo = await this.sdk.chain.getCurveAccount(mint);
+    // 4. 从 curve account 获取手续费接收账户 / Get fee recipient accounts from curve account (skipBalances: only need addresses)
+    const curveAccountInfo = await this.sdk.chain.getCurveAccount(mint, { skipBalances: true });
     const feeRecipientAccount = new PublicKey$6(curveAccountInfo.feeRecipient);
     const baseFeeRecipientAccount = new PublicKey$6(curveAccountInfo.baseFeeRecipient);
 
@@ -45223,7 +45223,7 @@ async function simulateLongStopLoss$1(mint, buyTokenAmount, 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 中的转换方式一致
@@ -45543,7 +45543,7 @@ async function simulateShortStopLoss$1(mint, sellTokenAmount, stopLossPrice, las
 
         // 如果没有传入 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 中的转换方式一致
@@ -45791,19 +45791,19 @@ async function simulateShortStopLoss$1(mint, sellTokenAmount, stopLossPrice, las
  * @since 2.0.0
  * @version 2.0.0 - 从返回 prev_order_pda/next_order_pda 改为返回 close_insert_indices
  */
-async function simulateLongSolStopLoss$1(mint, buySolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null) {
+async function simulateLongSolStopLoss$1(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$1(curveAccount.initialVirtualSol.toString()).div(CurveAMM$6.SOL_PRECISION_FACTOR_DECIMAL).toString();
             if (initialVirtualToken === null) initialVirtualToken = new Decimal$1(curveAccount.initialVirtualToken.toString()).div(CurveAMM$6.TOKEN_PRECISION_FACTOR_DECIMAL).toString();
         }
@@ -45975,19 +45975,19 @@ async function simulateLongSolStopLoss$1(mint, buySolAmount, stopLossPrice, last
  * @since 2.0.0
  * @version 2.0.0 - 从返回 prev_order_pda/next_order_pda 改为返回 close_insert_indices
  */
-async function simulateShortSolStopLoss$1(mint, sellSolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null) {
+async function simulateShortSolStopLoss$1(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$1(curveAccount.initialVirtualSol.toString()).div(CurveAMM$6.SOL_PRECISION_FACTOR_DECIMAL).toString();
             if (initialVirtualToken === null) initialVirtualToken = new Decimal$1(curveAccount.initialVirtualToken.toString()).div(CurveAMM$6.TOKEN_PRECISION_FACTOR_DECIMAL).toString();
         }
@@ -46916,7 +46916,7 @@ const { calcLiqTokenBuy, calcLiqTokenSell } = calcLiq;
  *   - suggestedTokenAmount: {string} Recommended token amount to buy based on available liquidity
  *   - suggestedSolAmount: {string} Required SOL amount for suggested token purchase
  */
-async function simulateTokenBuy$1(mint, buyTokenAmount, passOrder = null, lastPrice = null, ordersData = null) {
+async function simulateTokenBuy$1(mint, buyTokenAmount, passOrder = null, lastPrice = null, ordersData = null, curveData = null) {
   // 获取价格和订单数据
 
   //console.log('simulateTokenBuy', mint, buyTokenAmount, passOrder, lastPrice, ordersData);
@@ -46939,12 +46939,13 @@ async function simulateTokenBuy$1(mint, buyTokenAmount, 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}`);
+    }
   }
 
   // 调用 calcLiqTokenBuy 进行流动性计算（传入动态流动池参数）
@@ -47072,7 +47073,7 @@ async function simulateTokenBuy$1(mint, buyTokenAmount, passOrder = null, lastPr
  *   - suggestedTokenAmount: {string} Recommended token amount to sell based on available liquidity
  *   - suggestedSolAmount: {string} Expected SOL amount from suggested token sale
  */
-async function simulateTokenSell$1(mint, sellTokenAmount, passOrder = null, lastPrice = null, ordersData = null) {
+async function simulateTokenSell$1(mint, sellTokenAmount, passOrder = null, lastPrice = null, ordersData = null, curveData = null) {
   // 获取价格和订单数据
   let price = lastPrice;
   if (!price) {
@@ -47094,12 +47095,13 @@ async function simulateTokenSell$1(mint, sellTokenAmount, passOrder = null, last
     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 获取的数据:');
@@ -47743,8 +47745,8 @@ class SimulatorModule$1 {
      *   - 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);
     }
 
     /**
@@ -47770,8 +47772,8 @@ class SimulatorModule$1 {
      *   - 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);
     }
 
     /**
@@ -47810,8 +47812,8 @@ class SimulatorModule$1 {
      * @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);
     }
 
     /**
@@ -47824,8 +47826,8 @@ class SimulatorModule$1 {
      * @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);
     }
 
     /**
@@ -47904,15 +47906,13 @@ class SimulatorModule$1 {
                 };
             }
 
-            // 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 {
@@ -47928,7 +47928,6 @@ class SimulatorModule$1 {
             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;
 
@@ -47938,8 +47937,8 @@ class SimulatorModule$1 {
 
             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 {
@@ -48025,10 +48024,12 @@ class SimulatorModule$1 {
                 };
             }
 
-            // 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 {
@@ -48101,6 +48102,21 @@ const { Buffer: Buffer$3 } = require$$3__default["default"];
 class ChainModule$1 {
   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();
+    }
   }
 
   /**
@@ -48142,6 +48158,12 @@ class ChainModule$1 {
    * @returns {string} returns.poolTokenAccount - Pool token account address, stores tokens in the liquidity pool
    * @returns {string} returns.poolSolAccount - Pool SOL account address, stores native SOL in the liquidity pool
    *
+   * **Token Supply Information:**
+   * @returns {bigint} returns.totalSupply - Total token supply (smallest unit)
+   * @returns {number} returns.decimals - Token decimal places
+   * @returns {bigint} returns.initialBorrowPool - Initial borrow pool size = totalSupply - initialVirtualToken
+   * @returns {bigint} returns.circulatingSupply - Circulating supply = totalSupply - borrowTokenReserve
+   *
    * **Balance Information:**
    * @returns {number} returns.baseFeeRecipientBalance - SOL balance of base fee recipient address (lamports)
    * @returns {number} returns.feeRecipientBalance - SOL balance of fee recipient address (lamports)
@@ -48229,10 +48251,23 @@ class ChainModule$1 {
    * @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$3(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()]
@@ -48290,18 +48325,28 @@ class ChainModule$1 {
         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;
+      let tokenSupply = { value: { amount: '0', decimals: 0 } };
+
+      if (!skipBalances) {
+        [
+          baseFeeRecipientBalance,
+          feeRecipientBalance,
+          poolTokenBalance,
+          poolSolBalance,
+          tokenSupply
+        ] = 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),
+          this.sdk.connection.getTokenSupply(mintPubkey)
+        ]);
+      }
 
       // Convert data format
       const convertedData = {
@@ -48340,6 +48385,13 @@ class ChainModule$1 {
         poolType: decodedData.poolType,                           // u8, 0=普通版, 1=高级版
         borrowPoolRatio: decodedData.borrowPoolRatio,            // u8, 5-30表示5%-30%
 
+        // Token Supply 信息
+        totalSupply: BigInt(tokenSupply.value.amount),
+        decimals: tokenSupply.value.decimals,
+        initialBorrowPool: BigInt(tokenSupply.value.amount) - BigInt(decodedData.initialVirtualToken.toString()),
+        circulatingSupply: BigInt(decodedData.initialVirtualToken.toString())
+          + (BigInt(tokenSupply.value.amount) - BigInt(decodedData.initialVirtualToken.toString()) - BigInt(decodedData.borrowTokenReserve.toString())),
+
         // SOL balance information
         baseFeeRecipientBalance: baseFeeRecipientBalance,  // Unit: lamports
         feeRecipientBalance: feeRecipientBalance,          // Unit: lamports
@@ -48357,6 +48409,13 @@ class ChainModule$1 {
         }
       };
 
+      // 写入缓存
+      this._curveAccountCache.set(mintKey, {
+        data: convertedData,
+        timestamp: Date.now(),
+        skipBalances: skipBalances
+      });
+
       // Return converted data
       return convertedData;
 
@@ -48413,58 +48472,13 @@ class ChainModule$1 {
     }
 
     try {
-      // Parameter validation and conversion
-      let mintPubkey;
-      try {
-        mintPubkey = typeof mint === 'string' ? new PublicKey$3(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$3.findProgramAddressSync(
-        [
-          Buffer$3.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`);
-        }
+      // 复用 getCurveAccount 缓存，避免重复 fetch 同一个账户
+      const curveData = await this.getCurveAccount(mint, { skipBalances: true });
+      const price = curveData.price;
 
-        // Manually decode with BorshAccountsCoder
-        const accountsCoder = new anchor$2.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}`);
-          }
-        }
-      }
-
-      // 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$2.getInitialPrice();
         if (initialPrice === null) {
           throw new Error('price: Unable to calculate initial price');
@@ -48560,14 +48574,16 @@ class ChainModule$1 {
       // 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$3(mint);
+      const [orderbookPubkey] = PublicKey$3.findProgramAddressSync(
+        [Buffer$3.from(seed), mintPubkey.toBuffer()],
+        this.sdk.programId
+      );
 
       // Get OrderBook account data
-      const orderbookPubkey = new PublicKey$3(orderbookAddress);
       const accountInfo = await this.sdk.connection.getAccountInfo(orderbookPubkey);
 
       if (!accountInfo) {
@@ -49018,15 +49034,15 @@ class ChainModule$1 {
         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$3(mint);
+      const [orderbookPubkey] = PublicKey$3.findProgramAddressSync(
+        [Buffer$3.from(seed), mintPubkey.toBuffer()],
+        this.sdk.programId
+      );
 
       // Get OrderBook account data
-      const orderbookPubkey = new PublicKey$3(orderbookAddress);
       const accountInfo = await this.sdk.connection.getAccountInfo(orderbookPubkey);
 
       if (!accountInfo) {
@@ -49229,10 +49245,18 @@ class ChainModule$1 {
       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$3(mint);
+      const [upOrderbookPubkey] = PublicKey$3.findProgramAddressSync(
+        [Buffer$3.from('up_orderbook'), mintPubkey.toBuffer()],
+        this.sdk.programId
+      );
+      const [downOrderbookPubkey] = PublicKey$3.findProgramAddressSync(
+        [Buffer$3.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 = [];
@@ -49760,7 +49784,7 @@ class OrderUtils$2 {
 
 var orderUtils = OrderUtils$2;
 
-var address = "CYdRzRacZ5kTc9Ht3U7mFhbsyxG3sZGEzC4cNf2Gjg2W";
+var address = "F2FzigE1Z374iDvreiM6hZQe6oGXgomJfv8PyybvUXye";
 var metadata = {
 	name: "pinpet",
 	version: "0.1.0",
@@ -52334,476 +52358,471 @@ var errors = [
 	},
 	{
 		code: 6021,
-		name: "CloseShortImpossibleState",
-		msg: "Close short impossible state: current_total should always be greater than remaining_close_reduced_sol_with_fee"
-	},
-	{
-		code: 6022,
 		name: "FeeSplitCalculationOverflow",
 		msg: "Fee split calculation overflow"
 	},
 	{
-		code: 6023,
+		code: 6022,
 		name: "FeeAccumulationOverflow",
 		msg: "Fee accumulation overflow"
 	},
 	{
-		code: 6024,
+		code: 6023,
 		name: "PartnerFeeAdditionOverflow",
 		msg: "Partner fee addition overflow"
 	},
 	{
-		code: 6025,
+		code: 6024,
 		name: "BaseFeeAdditionOverflow",
 		msg: "Base fee addition overflow"
 	},
 	{
-		code: 6026,
+		code: 6025,
 		name: "PoolFeeDeductionOverflow",
 		msg: "Pool fee deduction overflow"
 	},
 	{
-		code: 6027,
+		code: 6026,
 		name: "FeeRandomDiscountOverflow",
 		msg: "Fee random discount calculation overflow"
 	},
 	{
-		code: 6028,
+		code: 6027,
 		name: "SolReserveAdditionOverflow",
 		msg: "SOL reserve addition overflow"
 	},
 	{
-		code: 6029,
+		code: 6028,
 		name: "SolReserveDeductionOverflow",
 		msg: "SOL reserve deduction overflow"
 	},
 	{
-		code: 6030,
+		code: 6029,
 		name: "TokenReserveAdditionOverflow",
 		msg: "Token reserve addition overflow"
 	},
 	{
-		code: 6031,
+		code: 6030,
 		name: "LamportsAdditionOverflow",
 		msg: "Lamports addition overflow"
 	},
 	{
-		code: 6032,
+		code: 6031,
 		name: "LamportsDeductionOverflow",
 		msg: "Lamports deduction overflow"
 	},
 	{
-		code: 6033,
+		code: 6032,
 		name: "DeadlineCalculationOverflow",
 		msg: "Deadline calculation overflow"
 	},
 	{
-		code: 6034,
+		code: 6033,
 		name: "FeeDiscountFlagOverflow",
 		msg: "Fee discount flag calculation overflow"
 	},
 	{
-		code: 6035,
+		code: 6034,
 		name: "Unauthorized",
 		msg: "Unauthorized operation"
 	},
 	{
-		code: 6036,
+		code: 6035,
 		name: "RequiredParameter",
 		msg: "All parameters are required during initialization"
 	},
 	{
-		code: 6037,
+		code: 6036,
 		name: "CurveCalculationError",
 		msg: "Curve calculation error"
 	},
 	{
-		code: 6038,
+		code: 6037,
 		name: "InitialPriceCalculationError",
 		msg: "Initial price calculation failed"
 	},
 	{
-		code: 6039,
+		code: 6038,
 		name: "BuyReserveRecalculationError",
 		msg: "Reserve recalculation failed (after buy)"
 	},
 	{
-		code: 6040,
+		code: 6039,
 		name: "SellReserveRecalculationError",
 		msg: "Reserve recalculation failed (after sell)"
 	},
 	{
-		code: 6041,
+		code: 6040,
 		name: "TotalAmountWithFeeError",
 		msg: "Total amount with fee calculation failed"
 	},
 	{
-		code: 6042,
+		code: 6041,
 		name: "AmountAfterFeeError",
 		msg: "Amount after fee calculation failed"
 	},
 	{
-		code: 6043,
+		code: 6042,
 		name: "BuyPriceRangeCalculationError",
 		msg: "Buy price range calculation failed"
 	},
 	{
-		code: 6044,
+		code: 6043,
 		name: "SellPriceRangeCalculationError",
 		msg: "Sell price range calculation failed"
 	},
 	{
-		code: 6045,
+		code: 6044,
 		name: "PriceAtStopLossBoundary",
 		msg: "Price has reached stop-loss boundary, head order must be liquidated first"
 	},
 	{
-		code: 6046,
+		code: 6045,
 		name: "RemainingRangeCalculationError",
 		msg: "Remaining range calculation failed"
 	},
 	{
-		code: 6047,
+		code: 6046,
 		name: "FullRangeCalculationError",
 		msg: "Full range calculation failed"
 	},
 	{
-		code: 6048,
+		code: 6047,
 		name: "BuyFromPriceWithTokenNoneError",
 		msg: "Curve function returned None: buy_from_price_with_token_output"
 	},
 	{
-		code: 6049,
+		code: 6048,
 		name: "SellFromPriceWithTokenNoneError",
 		msg: "Curve function returned None: sell_from_price_with_token_input"
 	},
 	{
-		code: 6050,
+		code: 6049,
 		name: "ExceedsMaxSolAmount",
 		msg: "Required SOL amount exceeds user-set maximum"
 	},
 	{
-		code: 6051,
+		code: 6050,
 		name: "InsufficientSolOutput",
 		msg: "Insufficient SOL output"
 	},
 	{
-		code: 6052,
+		code: 6051,
 		name: "InsufficientRepayment",
 		msg: "Insufficient proceeds to repay loan"
 	},
 	{
-		code: 6053,
+		code: 6052,
 		name: "InsufficientBorrowingReserve",
 		msg: "Insufficient borrowing reserve"
 	},
 	{
-		code: 6054,
+		code: 6053,
 		name: "InsufficientTokenSale",
 		msg: "Insufficient token sale amount"
 	},
 	{
-		code: 6055,
+		code: 6054,
 		name: "InsufficientLiquidity",
 		msg: "Insufficient liquidity in current order"
 	},
 	{
-		code: 6056,
+		code: 6055,
 		name: "InsufficientMarketLiquidity",
 		msg: "Insufficient market liquidity, cannot satisfy trade even after liquidating all stop-loss orders"
 	},
 	{
-		code: 6057,
+		code: 6056,
 		name: "TokenAmountDifferenceOutOfRange",
 		msg: "Token amount difference exceeds valid range in margin trade"
 	},
 	{
-		code: 6058,
+		code: 6057,
 		name: "BorrowAmountMismatch",
 		msg: "Borrow amount mismatch with locked tokens"
 	},
 	{
-		code: 6059,
+		code: 6058,
 		name: "CloseFeeCalculationError",
 		msg: "Close fee calculation error"
 	},
 	{
-		code: 6060,
+		code: 6059,
 		name: "InsufficientMargin",
 		msg: "Insufficient margin"
 	},
 	{
-		code: 6061,
+		code: 6060,
 		name: "InsufficientMinimumMargin",
 		msg: "Margin below minimum requirement"
 	},
 	{
-		code: 6062,
+		code: 6061,
 		name: "InvalidAccountOwner",
 		msg: "Invalid account owner"
 	},
 	{
-		code: 6063,
+		code: 6062,
 		name: "SellAmountExceedsOrderAmount",
 		msg: "Sell amount exceeds order's token holdings"
 	},
 	{
-		code: 6064,
+		code: 6063,
 		name: "OrderNotExpiredMustCloseByOwner",
 		msg: "Non-expired order must be closed by owner"
 	},
 	{
-		code: 6065,
+		code: 6064,
 		name: "SettlementAddressMustBeOwnerAddress",
 		msg: "Settlement address must be owner address"
 	},
 	{
-		code: 6066,
+		code: 6065,
 		name: "BuyAmountExceedsOrderAmount",
 		msg: "Buy amount exceeds order's token holdings"
 	},
 	{
-		code: 6067,
+		code: 6066,
 		name: "InsufficientTradeAmount",
 		msg: "Trade amount below minimum requirement"
 	},
 	{
-		code: 6068,
+		code: 6067,
 		name: "SolAmountTooLarge",
 		msg: "SOL amount exceeds maximum limit (10000000 SOL per transaction)"
 	},
 	{
-		code: 6069,
+		code: 6068,
 		name: "RemainingTokenAmountTooSmall",
 		msg: "Remaining token amount below minimum trade requirement"
 	},
 	{
-		code: 6070,
+		code: 6069,
 		name: "TradeCooldownNotExpired",
 		msg: "Trade cooldown period not expired, please try again later"
 	},
 	{
-		code: 6071,
+		code: 6070,
 		name: "ExceedApprovalAmount",
 		msg: "Sell amount exceeds approved amount, please call approval function first"
 	},
 	{
-		code: 6072,
+		code: 6071,
 		name: "CooldownNotInitialized",
 		msg: "Sell trade requires calling approval or buy function first to initialize cooldown PDA"
 	},
 	{
-		code: 6073,
+		code: 6072,
 		name: "CannotCloseCooldownWithBalance",
 		msg: "Cannot close cooldown PDA with non-zero token balance"
 	},
 	{
-		code: 6074,
+		code: 6073,
 		name: "PriceCalculationError",
 		msg: "Price calculation error"
 	},
 	{
-		code: 6075,
+		code: 6074,
 		name: "InvalidPartnerFeeRecipientAccount",
 		msg: "Invalid partner fee recipient account"
 	},
 	{
-		code: 6076,
+		code: 6075,
 		name: "InvalidBaseFeeRecipientAccount",
 		msg: "Invalid base fee recipient account"
 	},
 	{
-		code: 6077,
+		code: 6076,
 		name: "InvalidOrderbookAddress",
 		msg: "Orderbook address does not match curve account orderbook"
 	},
 	{
-		code: 6078,
+		code: 6077,
 		name: "InvalidFeePercentage",
 		msg: "Fee percentage must be between 0-100"
 	},
 	{
-		code: 6079,
+		code: 6078,
 		name: "InvalidFeeRate",
 		msg: "Fee rate exceeds maximum limit (10%)"
 	},
 	{
-		code: 6080,
+		code: 6079,
 		name: "InvalidCustomFeeRate",
 		msg: "Custom fee rate must be between 1000 (1%) and 5000 (5%)"
 	},
 	{
-		code: 6081,
+		code: 6080,
 		name: "InvalidBorrowDuration",
 		msg: "Borrow duration out of valid range (3-30 days)"
 	},
 	{
-		code: 6082,
+		code: 6081,
 		name: "InvalidStopLossPrice",
 		msg: "Stop loss price does not meet minimum interval requirement"
 	},
 	{
-		code: 6083,
+		code: 6082,
 		name: "NoProfitableFunds",
 		msg: "No profitable funds to transfer"
 	},
 	{
-		code: 6084,
+		code: 6083,
 		name: "InsufficientPoolFunds",
 		msg: "Insufficient pool funds"
 	},
 	{
-		code: 6085,
+		code: 6084,
 		name: "InsufficientPoolBalance",
 		msg: "Pool SOL account balance would fall below minimum required balance"
 	},
 	{
-		code: 6086,
+		code: 6085,
 		name: "OrderBookManagerOverflow",
 		msg: "Math operation overflow"
 	},
 	{
-		code: 6087,
+		code: 6086,
 		name: "OrderBookManagerInvalidSlotIndex",
 		msg: "Invalid slot index"
 	},
 	{
-		code: 6088,
+		code: 6087,
 		name: "OrderBookManagerInvalidAccountData",
 		msg: "Invalid account data"
 	},
 	{
-		code: 6089,
+		code: 6088,
 		name: "OrderBookManagerExceedsMaxCapacity",
 		msg: "New capacity exceeds maximum limit"
 	},
 	{
-		code: 6090,
+		code: 6089,
 		name: "OrderBookManagerExceedsAccountSizeLimit",
 		msg: "Account size exceeds 10MB limit"
 	},
 	{
-		code: 6091,
+		code: 6090,
 		name: "OrderBookManagerOrderIdMismatch",
 		msg: "Order ID mismatch"
 	},
 	{
-		code: 6092,
+		code: 6091,
 		name: "OrderBookManagerEmptyOrderBook",
 		msg: "Order book is empty"
 	},
 	{
-		code: 6093,
+		code: 6092,
 		name: "OrderBookManagerAccountNotWritable",
 		msg: "Account is not writable"
 	},
 	{
-		code: 6094,
+		code: 6093,
 		name: "OrderBookManagerNotRentExempt",
 		msg: "Account not rent-exempt"
 	},
 	{
-		code: 6095,
+		code: 6094,
 		name: "OrderBookManagerInvalidRentBalance",
 		msg: "Invalid rent balance"
 	},
 	{
-		code: 6096,
+		code: 6095,
 		name: "OrderBookManagerInsufficientFunds",
 		msg: "Insufficient funds"
 	},
 	{
-		code: 6097,
+		code: 6096,
 		name: "OrderBookManagerInvalidAccountOwner",
 		msg: "OrderBook account owner mismatch"
 	},
 	{
-		code: 6098,
+		code: 6097,
 		name: "OrderBookManagerDataOutOfBounds",
 		msg: "Data access out of bounds"
 	},
 	{
-		code: 6099,
+		code: 6098,
 		name: "NoValidInsertPosition",
 		msg: "Cannot find valid insert position, all candidates failed due to price range overlap"
 	},
 	{
-		code: 6100,
+		code: 6099,
 		name: "EmptyCloseInsertIndices",
 		msg: "close_insert_indices array cannot be empty"
 	},
 	{
-		code: 6101,
+		code: 6100,
 		name: "TooManyCloseInsertIndices",
 		msg: "close_insert_indices array cannot exceed 20 elements"
 	},
 	{
-		code: 6102,
+		code: 6101,
 		name: "CloseOrderNotFound",
 		msg: "Specified close order not found"
 	},
 	{
-		code: 6103,
+		code: 6102,
 		name: "LinkedListDeleteCountMismatch",
 		msg: "Linked list delete count mismatch: count inconsistent before/after deletion"
 	},
 	{
-		code: 6104,
+		code: 6103,
 		name: "NameTooLong",
 		msg: "Token name too long, max 32 bytes"
 	},
 	{
-		code: 6105,
+		code: 6104,
 		name: "NameEmpty",
 		msg: "Token name cannot be empty"
 	},
 	{
-		code: 6106,
+		code: 6105,
 		name: "SymbolTooLong",
 		msg: "Token symbol too long, max 10 bytes"
 	},
 	{
-		code: 6107,
+		code: 6106,
 		name: "SymbolEmpty",
 		msg: "Token symbol cannot be empty"
 	},
 	{
-		code: 6108,
+		code: 6107,
 		name: "UriTooLong",
 		msg: "URI too long, max 200 bytes"
 	},
 	{
-		code: 6109,
+		code: 6108,
 		name: "UriEmpty",
 		msg: "URI cannot be empty"
 	},
 	{
-		code: 6110,
+		code: 6109,
 		name: "IncompleteAdvancedPoolParams",
 		msg: "Incomplete advanced pool parameters: custom_lp_sol, custom_lp_token, custom_borrow_ratio, custom_borrow_duration must be provided together"
 	},
 	{
-		code: 6111,
+		code: 6110,
 		name: "InvalidInitialVirtualSol",
 		msg: "Initial virtual SOL out of valid range"
 	},
 	{
-		code: 6112,
+		code: 6111,
 		name: "InvalidInitialVirtualToken",
 		msg: "Initial virtual Token out of valid range"
 	},
 	{
-		code: 6113,
+		code: 6112,
 		name: "InvalidBorrowPoolRatio",
 		msg: "Borrow pool ratio out of valid range"
 	},
 	{
-		code: 6114,
+		code: 6113,
 		name: "BorrowTokenCalculationOverflow",
 		msg: "Borrow pool token amount calculation overflow"
 	},
 	{
-		code: 6115,
+		code: 6114,
 		name: "BorrowTokenAmountZero",
 		msg: "Borrow pool token amount cannot be zero"
 	}