pinpet-sdk 2.1.24 → 2.1.26

package/dist/pinpet-sdk.cjs.js

@@ -41917,12 +41917,12 @@ decimal.exports;
 
 var decimalExports = decimal.exports;
 
-const Decimal$1 = decimalExports;
+const Decimal$2 = decimalExports;
 
 // Configure Decimal.js to use 50-bit precision for better accuracy with tiny prices
 // Increased from 28 to 50 to handle extremely small prices (e.g., 0.000000041571)
 // ROUND_HALF_UP ensures consistent rounding behavior
-Decimal$1.set({ precision: 50, rounding: Decimal$1.ROUND_HALF_UP }); 
+Decimal$2.set({ precision: 50, rounding: Decimal$2.ROUND_HALF_UP }); 
 
 
 /**
@@ -41950,19 +41950,19 @@ class CurveAMM$8 {
      * Initial SOL reserve amount, represented as Decimal
      * @type {Decimal}
      */
-    static INITIAL_SOL_RESERVE_DECIMAL = new Decimal$1('30');
+    static INITIAL_SOL_RESERVE_DECIMAL = new Decimal$2('30');
 
     /**
      * Initial Token reserve amount, represented as Decimal
      * @type {Decimal}
      */
-    static INITIAL_TOKEN_RESERVE_DECIMAL = new Decimal$1('1073000000');
+    static INITIAL_TOKEN_RESERVE_DECIMAL = new Decimal$2('1073000000');
 
     /**
      * Initial constant K value, represented as Decimal
      * @type {Decimal}
      */
-    static INITIAL_K_DECIMAL = new Decimal$1('32190000000');
+    static INITIAL_K_DECIMAL = new Decimal$2('32190000000');
 
     /**
      * Minimum price that can appear, below this price may cause overflow
@@ -41970,26 +41970,26 @@ class CurveAMM$8 {
      * Reduced from 1e-9 to 1e-12 to support wider range of pool configurations
      * @type {Decimal}
      */
-    static INITIAL_MIN_PRICE_DECIMAL = new Decimal$1('0.000000000001'); // 1e-12
+    static INITIAL_MIN_PRICE_DECIMAL = new Decimal$2('0.000000000001'); // 1e-12
 
     /**
      * Decimal representation of precision factor = 10^23
      * @type {Decimal}
      */
     //static PRICE_PRECISION_FACTOR_DECIMAL = new Decimal('10000000000000000000000000000');
-    static PRICE_PRECISION_FACTOR_DECIMAL =   new Decimal$1('100000000000000000000000');
+    static PRICE_PRECISION_FACTOR_DECIMAL =   new Decimal$2('100000000000000000000000');
 
     /**
      * Decimal representation of Token precision factor = 1000000000 (10^9)
      * @type {Decimal}
      */
-    static TOKEN_PRECISION_FACTOR_DECIMAL = new Decimal$1('1000000000');
+    static TOKEN_PRECISION_FACTOR_DECIMAL = new Decimal$2('1000000000');
 
     /**
      * Decimal representation of SOL precision factor = 1000000000
      * @type {Decimal}
      */
-    static SOL_PRECISION_FACTOR_DECIMAL = new Decimal$1('1000000000');
+    static SOL_PRECISION_FACTOR_DECIMAL = new Decimal$2('1000000000');
 
 
     /**
@@ -42018,7 +42018,7 @@ class CurveAMM$8 {
         if (typeof price === 'bigint') {
             price = price.toString();
         }
-        const priceDecimal = new Decimal$1(price);
+        const priceDecimal = new Decimal$2(price);
         return priceDecimal.div(this.PRICE_PRECISION_FACTOR_DECIMAL);
     } 
 
@@ -42068,9 +42068,9 @@ class CurveAMM$8 {
         if (typeof price === 'bigint') {
             price = price.toString();
         }
-        const priceDecimal = new Decimal$1(price);
+        const priceDecimal = new Decimal$2(price);
         // Use old precision factor 10^15
-        const oldPrecisionFactor = new Decimal$1('1000000000000000');
+        const oldPrecisionFactor = new Decimal$2('1000000000000000');
         return priceDecimal.div(oldPrecisionFactor);
     }
 
@@ -42083,7 +42083,7 @@ class CurveAMM$8 {
      */
     static decimalToU64(price) {
         // Directly use old precision factor for conversion
-        const oldPrecisionFactor = new Decimal$1('1000000000000000');
+        const oldPrecisionFactor = new Decimal$2('1000000000000000');
         const scaled = price.mul(oldPrecisionFactor);
         const floored = scaled.floor();
         if (floored.isNaN() || floored.isNegative() || floored.gt('18446744073709551615')) {
@@ -42102,7 +42102,7 @@ class CurveAMM$8 {
      */
     static decimalToU64Ceil(price) {
         // Directly use old precision factor for conversion
-        const oldPrecisionFactor = new Decimal$1('1000000000000000');
+        const oldPrecisionFactor = new Decimal$2('1000000000000000');
         const scaled = price.mul(oldPrecisionFactor);
         const ceiled = scaled.ceil();
         if (ceiled.isNaN() || ceiled.isNegative() || ceiled.gt('18446744073709551615')) {
@@ -42186,7 +42186,7 @@ class CurveAMM$8 {
         if (typeof amount === 'bigint') {
             amount = amount.toString();
         }
-        const amountDecimal = new Decimal$1(amount);
+        const amountDecimal = new Decimal$2(amount);
         return amountDecimal.div(this.TOKEN_PRECISION_FACTOR_DECIMAL);
     }
 
@@ -42200,7 +42200,7 @@ class CurveAMM$8 {
         if (typeof amount === 'bigint') {
             amount = amount.toString();
         }
-        const amountDecimal = new Decimal$1(amount);
+        const amountDecimal = new Decimal$2(amount);
         return amountDecimal.div(this.SOL_PRECISION_FACTOR_DECIMAL);
     }
 
@@ -42218,8 +42218,8 @@ class CurveAMM$8 {
      * const k2 = CurveAMM.calculateK(60, 1073000000);
      */
     static calculateK(initialVirtualSol, initialVirtualToken) {
-        const sol = new Decimal$1(initialVirtualSol);
-        const token = new Decimal$1(initialVirtualToken);
+        const sol = new Decimal$2(initialVirtualSol);
+        const token = new Decimal$2(initialVirtualToken);
         return sol.mul(token);
     }
 
@@ -42241,8 +42241,8 @@ class CurveAMM$8 {
      * @returns {bigint|null} u128格式的初始价格
      */
     static getInitialPriceWithParams(initialVirtualSol, initialVirtualToken) {
-        const sol = new Decimal$1(initialVirtualSol);
-        const token = new Decimal$1(initialVirtualToken);
+        const sol = new Decimal$2(initialVirtualSol);
+        const token = new Decimal$2(initialVirtualToken);
         const initialPrice = sol.div(token);
         return this.decimalToU128(initialPrice);
     }
@@ -42485,7 +42485,7 @@ class CurveAMM$8 {
         }
 
         // Warning for extremely small prices that may have precision issues
-        const warningPrice = new Decimal$1('0.0000001'); // 10^-7
+        const warningPrice = new Decimal$2('0.0000001'); // 10^-7
         if (price.lt(warningPrice)) {
             // Only log once per execution to avoid spam (use a static flag)
             if (!this._tinyPriceWarningShown) {
@@ -43028,6 +43028,36 @@ class CurveAMM$8 {
         }
     }
 
+    /**
+     * Calculate total amount including fee (with ceiling division, matching Rust contract)
+     *
+     * @param {bigint|string|number} solAmount - Net amount (base amount)
+     * @param {number} fee - Fee rate, expressed with FEE_DENOMINATOR as denominator
+     *                       Example: 1000 represents 1% fee (1000/100000)
+     *                               2000 represents 2% fee (2000/100000)
+     * @returns {bigint|null} Returns total amount including fee on success, null on failure
+     * Total amount calculation uses ceiling division (rounding up), matching Rust contract behavior
+     */
+    static calculateTotalAmountWithFee(solAmount, fee) {
+        try {
+            const amount = BigInt(solAmount.toString());
+            const feeBig = BigInt(fee);
+
+            // Check if fee rate is valid (must be less than or equal to 10%)
+            if (feeBig > MAX_FEE_RATE) {
+                return null;
+            }
+
+            // Ceiling division: (amount * (FEE_DENOMINATOR + fee) + FEE_DENOMINATOR - 1) / FEE_DENOMINATOR
+            const numerator = amount * (FEE_DENOMINATOR + feeBig);
+            const totalAmount = (numerator + FEE_DENOMINATOR - 1n) / FEE_DENOMINATOR;
+
+            return totalAmount;
+        } catch (error) {
+            return null;
+        }
+    }
+
     /**
      * Convert u128 price to readable decimal string format for display
      * 
@@ -43039,7 +43069,7 @@ class CurveAMM$8 {
         if (typeof price === 'bigint') {
             price = price.toString();
         }
-        const priceDecimal = new Decimal$1(price);
+        const priceDecimal = new Decimal$2(price);
         const convertedPrice = priceDecimal.div(this.PRICE_PRECISION_FACTOR_DECIMAL);
         return convertedPrice.toFixed(decimalPlaces);
     }
@@ -45058,6 +45088,7 @@ jsonBigint.exports.stringify = json_stringify;
 
 var jsonBigintExports = jsonBigint.exports;
 
+const Decimal$1 = decimalExports;
 const CurveAMM$6 = curve_amm;
 const {transformOrdersData , checkPriceRangeOverlap} = stop_loss_utils;
 const { PRICE_ADJUSTMENT_PERCENTAGE, MIN_STOP_LOSS_PERCENT } = utils$2;
@@ -45183,13 +45214,23 @@ jsonBigintExports({ storeAsString: false });
  * @since 2.0.0
  * @version 2.0.0 - 从返回 prev_order_pda/next_order_pda 改为返回 close_insert_indices
  */
-async function simulateLongStopLoss$1(mint, buyTokenAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = 2000) {
+async function simulateLongStopLoss$1(mint, buyTokenAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null) {
     try {
         // Parameter validation
         if (!mint || !buyTokenAmount || !stopLossPrice) {
             throw new Error('Missing required parameters');
         }
 
+        // 如果没有传入 borrowFee 或池子参数，从链上一次性获取
+        if (borrowFee === null || initialVirtualSol === null || initialVirtualToken === null) {
+            const curveAccount = await this.sdk.chain.getCurveAccount(mint);
+            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();
+        }
+
         // Get current price
         if (!lastPrice) {
             //console.log('Getting current price...');
@@ -45266,7 +45307,7 @@ async function simulateLongStopLoss$1(mint, buyTokenAmount, stopLossPrice, lastP
             // console.log(`  - buyTokenAmount: ${buyTokenAmount.toString()}`);
             // console.log(`  - Calling CurveAMM.sellFromPriceWithTokenInput...`);
 
-            const tradeResult = CurveAMM$6.sellFromPriceWithTokenInput(stopLossStartPrice, buyTokenAmount);
+            const tradeResult = CurveAMM$6.sellFromPriceWithTokenInputWithParams(stopLossStartPrice, buyTokenAmount, initialVirtualSol, initialVirtualToken);
 
             //console.log(`  - tradeResult:`, tradeResult);
 
@@ -45330,10 +45371,10 @@ async function simulateLongStopLoss$1(mint, buyTokenAmount, stopLossPrice, lastP
         let estimatedMargin = 0n;
         try {
             // 1. 计算从当前价格买入所需的SOL
-            const buyResult = CurveAMM$6.buyFromPriceWithTokenOutput(currentPrice, buyTokenAmount);
+            const buyResult = CurveAMM$6.buyFromPriceWithTokenOutputWithParams(currentPrice, buyTokenAmount, initialVirtualSol, initialVirtualToken);
             if (buyResult) {
                 const requiredSol = buyResult[1]; // SOL input amount
-                
+
                 // 2. 计算平仓时扣除手续费后的收益
                 const closeOutputSolAfterFee = CurveAMM$6.calculateAmountAfterFee(finalTradeAmount, borrowFee);
                 
@@ -45493,13 +45534,23 @@ async function simulateLongStopLoss$1(mint, buyTokenAmount, stopLossPrice, lastP
  * @since 2.0.0
  * @version 2.0.0 - 从返回 prev_order_pda/next_order_pda 改为返回 close_insert_indices
  */
-async function simulateShortStopLoss$1(mint, sellTokenAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = 2000) {
+async function simulateShortStopLoss$1(mint, sellTokenAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null) {
     try {
         // Parameter validation
         if (!mint || !sellTokenAmount || !stopLossPrice) {
             throw new Error('Missing required parameters');
         }
 
+        // 如果没有传入 borrowFee 或池子参数，从链上一次性获取
+        if (borrowFee === null || initialVirtualSol === null || initialVirtualToken === null) {
+            const curveAccount = await this.sdk.chain.getCurveAccount(mint);
+            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();
+        }
+
         // Get current price
         if (!lastPrice) {
             //console.log('Getting current price...');
@@ -45569,7 +45620,7 @@ async function simulateShortStopLoss$1(mint, sellTokenAmount, stopLossPrice, las
             // console.log(`  - sellTokenAmount: ${sellTokenAmount.toString()}`);
             // console.log(`  - Calling CurveAMM.buyFromPriceWithTokenOutput...`);
 
-            const tradeResult = CurveAMM$6.buyFromPriceWithTokenOutput(stopLossStartPrice, sellTokenAmount);
+            const tradeResult = CurveAMM$6.buyFromPriceWithTokenOutputWithParams(stopLossStartPrice, sellTokenAmount, initialVirtualSol, initialVirtualToken);
 
             //console.log(`  - tradeResult:`, tradeResult);
 
@@ -45629,24 +45680,24 @@ async function simulateShortStopLoss$1(mint, sellTokenAmount, stopLossPrice, las
         const leverage = Number((BigInt(10000) * currentPrice) / (executableStopLossPrice - currentPrice)) / 10000;
 
         // 计算保证金 / Calculate margin requirement
+        // 与合约公式一致 (long_short.rs 第890-894行):
+        //   real_margin_sol = close_buy_sol_with_fee - output_sol - fee_sol
+        //   其中 output_sol 是扣费后净SOL, fee_sol 是开仓手续费
+        //   展开: real_margin_sol = close_buy_sol_with_fee - raw_sell_sol
         let estimatedMargin = 0n;
+        let rawSellSol = 0n; // 卖出 token 获得的原始 SOL（未扣费），供调用方计算 minSolOutput
         try {
-            // 1. 计算从当前价格卖出代币获得的SOL（开仓收益，不含手续费）
-            const sellResult = CurveAMM$6.sellFromPriceWithTokenInput(currentPrice, sellTokenAmount);
+            // 1. 计算从当前价格卖出代币获得的原始SOL（未扣费）
+            const sellResult = CurveAMM$6.sellFromPriceWithTokenInputWithParams(currentPrice, sellTokenAmount, initialVirtualSol, initialVirtualToken);
             if (sellResult) {
-                const openingSolGain = sellResult[1]; // 卖出获得的SOL
-                
-                // 2. 计算开仓手续费
-                const openingFee = (openingSolGain * BigInt(borrowFee)) / 100000n;
-                
-                // 3. 计算平仓成本（含手续费）
-                const feeAmount = (finalTradeAmount * BigInt(borrowFee)) / 100000n;
-                const closeCostWithFee = finalTradeAmount + feeAmount;
-                
-                // 4. 计算保证金 = 平仓成本（含手续费） + 开仓手续费 - 开仓收益
-                //    开仓手续费是支出，应该加到成本中
-                if (closeCostWithFee + openingFee > openingSolGain) {
-                    estimatedMargin = closeCostWithFee + openingFee - openingSolGain;
+                rawSellSol = sellResult[1]; // 卖出获得的原始SOL（未扣费）
+
+                // 2. 计算平仓成本（含手续费，使用 ceiling 除法与合约一致）
+                const closeCostWithFee = CurveAMM$6.calculateTotalAmountWithFee(finalTradeAmount, borrowFee);
+
+                // 3. 保证金 = 平仓成本（含费） - 原始卖出SOL
+                if (closeCostWithFee !== null && closeCostWithFee > rawSellSol) {
+                    estimatedMargin = closeCostWithFee - rawSellSol;
                 }
             }
         } catch (marginError) {
@@ -45663,14 +45714,15 @@ async function simulateShortStopLoss$1(mint, sellTokenAmount, stopLossPrice, las
 
         return {
             executableStopLossPrice: executableStopLossPrice, // Calculated reasonable stop loss value
-            tradeAmount: finalTradeAmount, // SOL input amount
+            tradeAmount: finalTradeAmount, // SOL input amount (平仓时买回 token 需要的 SOL)
             stopLossPercentage: stopLossPercentage, // Stop loss percentage relative to current price
             leverage: leverage, // Leverage ratio
             currentPrice: currentPrice, // Current price
             iterations: iteration, // Number of adjustments
             originalStopLossPrice: BigInt(stopLossPrice), // Original stop loss price
             close_insert_indices: finalOverlapResult.close_insert_indices, // Candidate insertion indices for closing order
-            estimatedMargin: estimatedMargin // Estimated margin requirement in SOL (lamports)
+            estimatedMargin: estimatedMargin, // Estimated margin requirement in SOL (lamports)
+            rawSellSol: rawSellSol // 卖出 token 获得的原始 SOL（未扣费），用于调用方计算 minSolOutput
         };
 
     } catch (error) {
@@ -45739,13 +45791,23 @@ 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 = 2000) {
+async function simulateLongSolStopLoss$1(mint, buySolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null) {
     try {
         // Parameter validation
         if (!mint || !buySolAmount || !stopLossPrice) {
             throw new Error('Missing required parameters');
         }
 
+        // 如果没有传入 borrowFee 或池子参数，从链上一次性获取
+        if (borrowFee === null || initialVirtualSol === null || initialVirtualToken === null) {
+            const curveAccount = await this.sdk.chain.getCurveAccount(mint);
+            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();
+        }
+
         // Get current price if not provided
         let currentPrice;
         if (!lastPrice) {
@@ -45767,7 +45829,7 @@ async function simulateLongSolStopLoss$1(mint, buySolAmount, stopLossPrice, last
 
         // Calculate initial token amount from SOL amount using sellFromPriceWithSolOutput
         // This gives us how many tokens we can get when we later sell for buySolAmount SOL
-        const initialResult = CurveAMM$6.sellFromPriceWithSolOutput(currentPrice, buySolAmount);
+        const initialResult = CurveAMM$6.sellFromPriceWithSolOutputWithParams(currentPrice, buySolAmount, initialVirtualSol, initialVirtualToken);
         if (!initialResult) {
             throw new Error('Failed to calculate token amount from SOL amount');
         }
@@ -45799,7 +45861,7 @@ async function simulateLongSolStopLoss$1(mint, buySolAmount, stopLossPrice, last
             const mid = (left + right) / 2n;
             
             // 计算当前 token 数量的结果
-            const currentResult = await simulateLongStopLoss$1.call(this, mint, mid, stopLossPrice, lastPrice, ordersData, borrowFee);
+            const currentResult = await simulateLongStopLoss$1.call(this, mint, mid, stopLossPrice, lastPrice, ordersData, borrowFee, initialVirtualSol, initialVirtualToken);
             const currentMargin = currentResult.estimatedMargin;
             
             //console.log(`Binary search iteration ${iterations}: tokenAmount=${mid}, estimatedMargin=${currentMargin}, target=${buySolAmount}`);
@@ -45841,7 +45903,7 @@ async function simulateLongSolStopLoss$1(mint, buySolAmount, stopLossPrice, last
             //console.log(`No valid solution found (estimatedMargin < buySolAmount), using minimal tokenAmount`);
             buyTokenAmount = buyTokenAmount / 10n; // 使用更小的值
             if (buyTokenAmount <= 0n) buyTokenAmount = 1000000000n; // 最小值保护 (0.001 token with 9 decimals)
-            stopLossResult = await simulateLongStopLoss$1.call(this, mint, buyTokenAmount, stopLossPrice, lastPrice, ordersData, borrowFee);
+            stopLossResult = await simulateLongStopLoss$1.call(this, mint, buyTokenAmount, stopLossPrice, lastPrice, ordersData, borrowFee, initialVirtualSol, initialVirtualToken);
         }
 
         // if (iterations >= maxIterations) {
@@ -45913,13 +45975,23 @@ 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 = 2000) {
+async function simulateShortSolStopLoss$1(mint, sellSolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null, initialVirtualSol = null, initialVirtualToken = null) {
     try {
         // Parameter validation
         if (!mint || !sellSolAmount || !stopLossPrice) {
             throw new Error('Missing required parameters');
         }
 
+        // 如果没有传入 borrowFee 或池子参数，从链上一次性获取
+        if (borrowFee === null || initialVirtualSol === null || initialVirtualToken === null) {
+            const curveAccount = await this.sdk.chain.getCurveAccount(mint);
+            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();
+        }
+
         // Get current price if not provided
         let currentPrice;
         if (!lastPrice) {
@@ -45943,7 +46015,7 @@ async function simulateShortSolStopLoss$1(mint, sellSolAmount, stopLossPrice, la
 
         // Calculate initial token amount from SOL amount using buyFromPriceWithSolInput
         // This gives us how many tokens we need to buy later using sellSolAmount SOL
-        const initialResult = CurveAMM$6.buyFromPriceWithSolInput(currentPrice, sellSolAmount);
+        const initialResult = CurveAMM$6.buyFromPriceWithSolInputWithParams(currentPrice, sellSolAmount, initialVirtualSol, initialVirtualToken);
         if (!initialResult) {
             throw new Error('Failed to calculate token amount from SOL amount');
         }
@@ -45975,7 +46047,7 @@ async function simulateShortSolStopLoss$1(mint, sellSolAmount, stopLossPrice, la
             const mid = (left + right) / 2n;
             
             // 计算当前 token 数量的结果
-            const currentResult = await simulateShortStopLoss$1.call(this, mint, mid, stopLossPrice, lastPrice, ordersData, borrowFee);
+            const currentResult = await simulateShortStopLoss$1.call(this, mint, mid, stopLossPrice, lastPrice, ordersData, borrowFee, initialVirtualSol, initialVirtualToken);
             const currentMargin = currentResult.estimatedMargin;
             
             //console.log(`Binary search iteration ${iterations}: tokenAmount=${mid}, estimatedMargin=${currentMargin}, target=${sellSolAmount}`);
@@ -46017,7 +46089,7 @@ async function simulateShortSolStopLoss$1(mint, sellSolAmount, stopLossPrice, la
             //console.log(`No valid solution found (estimatedMargin < sellSolAmount), using minimal tokenAmount`);
             sellTokenAmount = sellTokenAmount / 10n; // 使用更小的值
             if (sellTokenAmount <= 0n) sellTokenAmount = 1000000000n; // 最小值保护 (0.001 token with 9 decimals)
-            stopLossResult = await simulateShortStopLoss$1.call(this, mint, sellTokenAmount, stopLossPrice, lastPrice, ordersData, borrowFee);
+            stopLossResult = await simulateShortStopLoss$1.call(this, mint, sellTokenAmount, stopLossPrice, lastPrice, ordersData, borrowFee, initialVirtualSol, initialVirtualToken);
         }
 
         // if (iterations >= maxIterations) {
@@ -47711,8 +47783,8 @@ class SimulatorModule$1 {
      * @param {Object|null} ordersData - Orders data, default null
      * @returns {Promise<Object>} Stop loss analysis result
      */
-    async simulateLongStopLoss(mint, buyTokenAmount, stopLossPrice, lastPrice = null, ordersData = null) {
-        return simulateLongStopLoss.call(this, mint, buyTokenAmount, stopLossPrice, lastPrice, ordersData);
+    async simulateLongStopLoss(mint, buyTokenAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null) {
+        return simulateLongStopLoss.call(this, mint, buyTokenAmount, stopLossPrice, lastPrice, ordersData, borrowFee);
     }
 
     /**
@@ -47724,8 +47796,8 @@ class SimulatorModule$1 {
      * @param {Object|null} ordersData - Orders data, default null
      * @returns {Promise<Object>} Stop loss analysis result
      */
-    async simulateShortStopLoss(mint, sellTokenAmount, stopLossPrice, lastPrice = null, ordersData = null) {
-        return simulateShortStopLoss.call(this, mint, sellTokenAmount, stopLossPrice, lastPrice, ordersData);
+    async simulateShortStopLoss(mint, sellTokenAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null) {
+        return simulateShortStopLoss.call(this, mint, sellTokenAmount, stopLossPrice, lastPrice, ordersData, borrowFee);
     }
 
     /**
@@ -47738,7 +47810,7 @@ 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 = 2000) {
+    async simulateLongSolStopLoss(mint, buySolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null) {
         return simulateLongSolStopLoss.call(this, mint, buySolAmount, stopLossPrice, lastPrice, ordersData, borrowFee);
     }
 
@@ -47752,7 +47824,7 @@ 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 = 2000) {
+    async simulateShortSolStopLoss(mint, sellSolAmount, stopLossPrice, lastPrice = null, ordersData = null, borrowFee = null) {
         return simulateShortSolStopLoss.call(this, mint, sellSolAmount, stopLossPrice, lastPrice, ordersData, borrowFee);
     }
 
@@ -49688,7 +49760,7 @@ class OrderUtils$2 {
 
 var orderUtils = OrderUtils$2;
 
-var address = "F2FzigE1Z374iDvreiM6hZQe6oGXgomJfv8PyybvUXye";
+var address = "CYdRzRacZ5kTc9Ht3U7mFhbsyxG3sZGEzC4cNf2Gjg2W";
 var metadata = {
 	name: "pinpet",
 	version: "0.1.0",
@@ -52262,471 +52334,476 @@ 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: 6022,
+		code: 6023,
 		name: "FeeAccumulationOverflow",
 		msg: "Fee accumulation overflow"
 	},
 	{
-		code: 6023,
+		code: 6024,
 		name: "PartnerFeeAdditionOverflow",
 		msg: "Partner fee addition overflow"
 	},
 	{
-		code: 6024,
+		code: 6025,
 		name: "BaseFeeAdditionOverflow",
 		msg: "Base fee addition overflow"
 	},
 	{
-		code: 6025,
+		code: 6026,
 		name: "PoolFeeDeductionOverflow",
 		msg: "Pool fee deduction overflow"
 	},
 	{
-		code: 6026,
+		code: 6027,
 		name: "FeeRandomDiscountOverflow",
 		msg: "Fee random discount calculation overflow"
 	},
 	{
-		code: 6027,
+		code: 6028,
 		name: "SolReserveAdditionOverflow",
 		msg: "SOL reserve addition overflow"
 	},
 	{
-		code: 6028,
+		code: 6029,
 		name: "SolReserveDeductionOverflow",
 		msg: "SOL reserve deduction overflow"
 	},
 	{
-		code: 6029,
+		code: 6030,
 		name: "TokenReserveAdditionOverflow",
 		msg: "Token reserve addition overflow"
 	},
 	{
-		code: 6030,
+		code: 6031,
 		name: "LamportsAdditionOverflow",
 		msg: "Lamports addition overflow"
 	},
 	{
-		code: 6031,
+		code: 6032,
 		name: "LamportsDeductionOverflow",
 		msg: "Lamports deduction overflow"
 	},
 	{
-		code: 6032,
+		code: 6033,
 		name: "DeadlineCalculationOverflow",
 		msg: "Deadline calculation overflow"
 	},
 	{
-		code: 6033,
+		code: 6034,
 		name: "FeeDiscountFlagOverflow",
 		msg: "Fee discount flag calculation overflow"
 	},
 	{
-		code: 6034,
+		code: 6035,
 		name: "Unauthorized",
 		msg: "Unauthorized operation"
 	},
 	{
-		code: 6035,
+		code: 6036,
 		name: "RequiredParameter",
 		msg: "All parameters are required during initialization"
 	},
 	{
-		code: 6036,
+		code: 6037,
 		name: "CurveCalculationError",
 		msg: "Curve calculation error"
 	},
 	{
-		code: 6037,
+		code: 6038,
 		name: "InitialPriceCalculationError",
 		msg: "Initial price calculation failed"
 	},
 	{
-		code: 6038,
+		code: 6039,
 		name: "BuyReserveRecalculationError",
 		msg: "Reserve recalculation failed (after buy)"
 	},
 	{
-		code: 6039,
+		code: 6040,
 		name: "SellReserveRecalculationError",
 		msg: "Reserve recalculation failed (after sell)"
 	},
 	{
-		code: 6040,
+		code: 6041,
 		name: "TotalAmountWithFeeError",
 		msg: "Total amount with fee calculation failed"
 	},
 	{
-		code: 6041,
+		code: 6042,
 		name: "AmountAfterFeeError",
 		msg: "Amount after fee calculation failed"
 	},
 	{
-		code: 6042,
+		code: 6043,
 		name: "BuyPriceRangeCalculationError",
 		msg: "Buy price range calculation failed"
 	},
 	{
-		code: 6043,
+		code: 6044,
 		name: "SellPriceRangeCalculationError",
 		msg: "Sell price range calculation failed"
 	},
 	{
-		code: 6044,
+		code: 6045,
 		name: "PriceAtStopLossBoundary",
 		msg: "Price has reached stop-loss boundary, head order must be liquidated first"
 	},
 	{
-		code: 6045,
+		code: 6046,
 		name: "RemainingRangeCalculationError",
 		msg: "Remaining range calculation failed"
 	},
 	{
-		code: 6046,
+		code: 6047,
 		name: "FullRangeCalculationError",
 		msg: "Full range calculation failed"
 	},
 	{
-		code: 6047,
+		code: 6048,
 		name: "BuyFromPriceWithTokenNoneError",
 		msg: "Curve function returned None: buy_from_price_with_token_output"
 	},
 	{
-		code: 6048,
+		code: 6049,
 		name: "SellFromPriceWithTokenNoneError",
 		msg: "Curve function returned None: sell_from_price_with_token_input"
 	},
 	{
-		code: 6049,
+		code: 6050,
 		name: "ExceedsMaxSolAmount",
 		msg: "Required SOL amount exceeds user-set maximum"
 	},
 	{
-		code: 6050,
+		code: 6051,
 		name: "InsufficientSolOutput",
 		msg: "Insufficient SOL output"
 	},
 	{
-		code: 6051,
+		code: 6052,
 		name: "InsufficientRepayment",
 		msg: "Insufficient proceeds to repay loan"
 	},
 	{
-		code: 6052,
+		code: 6053,
 		name: "InsufficientBorrowingReserve",
 		msg: "Insufficient borrowing reserve"
 	},
 	{
-		code: 6053,
+		code: 6054,
 		name: "InsufficientTokenSale",
 		msg: "Insufficient token sale amount"
 	},
 	{
-		code: 6054,
+		code: 6055,
 		name: "InsufficientLiquidity",
 		msg: "Insufficient liquidity in current order"
 	},
 	{
-		code: 6055,
+		code: 6056,
 		name: "InsufficientMarketLiquidity",
 		msg: "Insufficient market liquidity, cannot satisfy trade even after liquidating all stop-loss orders"
 	},
 	{
-		code: 6056,
+		code: 6057,
 		name: "TokenAmountDifferenceOutOfRange",
 		msg: "Token amount difference exceeds valid range in margin trade"
 	},
 	{
-		code: 6057,
+		code: 6058,
 		name: "BorrowAmountMismatch",
 		msg: "Borrow amount mismatch with locked tokens"
 	},
 	{
-		code: 6058,
+		code: 6059,
 		name: "CloseFeeCalculationError",
 		msg: "Close fee calculation error"
 	},
 	{
-		code: 6059,
+		code: 6060,
 		name: "InsufficientMargin",
 		msg: "Insufficient margin"
 	},
 	{
-		code: 6060,
+		code: 6061,
 		name: "InsufficientMinimumMargin",
 		msg: "Margin below minimum requirement"
 	},
 	{
-		code: 6061,
+		code: 6062,
 		name: "InvalidAccountOwner",
 		msg: "Invalid account owner"
 	},
 	{
-		code: 6062,
+		code: 6063,
 		name: "SellAmountExceedsOrderAmount",
 		msg: "Sell amount exceeds order's token holdings"
 	},
 	{
-		code: 6063,
+		code: 6064,
 		name: "OrderNotExpiredMustCloseByOwner",
 		msg: "Non-expired order must be closed by owner"
 	},
 	{
-		code: 6064,
+		code: 6065,
 		name: "SettlementAddressMustBeOwnerAddress",
 		msg: "Settlement address must be owner address"
 	},
 	{
-		code: 6065,
+		code: 6066,
 		name: "BuyAmountExceedsOrderAmount",
 		msg: "Buy amount exceeds order's token holdings"
 	},
 	{
-		code: 6066,
+		code: 6067,
 		name: "InsufficientTradeAmount",
 		msg: "Trade amount below minimum requirement"
 	},
 	{
-		code: 6067,
+		code: 6068,
 		name: "SolAmountTooLarge",
 		msg: "SOL amount exceeds maximum limit (10000000 SOL per transaction)"
 	},
 	{
-		code: 6068,
+		code: 6069,
 		name: "RemainingTokenAmountTooSmall",
 		msg: "Remaining token amount below minimum trade requirement"
 	},
 	{
-		code: 6069,
+		code: 6070,
 		name: "TradeCooldownNotExpired",
 		msg: "Trade cooldown period not expired, please try again later"
 	},
 	{
-		code: 6070,
+		code: 6071,
 		name: "ExceedApprovalAmount",
 		msg: "Sell amount exceeds approved amount, please call approval function first"
 	},
 	{
-		code: 6071,
+		code: 6072,
 		name: "CooldownNotInitialized",
 		msg: "Sell trade requires calling approval or buy function first to initialize cooldown PDA"
 	},
 	{
-		code: 6072,
+		code: 6073,
 		name: "CannotCloseCooldownWithBalance",
 		msg: "Cannot close cooldown PDA with non-zero token balance"
 	},
 	{
-		code: 6073,
+		code: 6074,
 		name: "PriceCalculationError",
 		msg: "Price calculation error"
 	},
 	{
-		code: 6074,
+		code: 6075,
 		name: "InvalidPartnerFeeRecipientAccount",
 		msg: "Invalid partner fee recipient account"
 	},
 	{
-		code: 6075,
+		code: 6076,
 		name: "InvalidBaseFeeRecipientAccount",
 		msg: "Invalid base fee recipient account"
 	},
 	{
-		code: 6076,
+		code: 6077,
 		name: "InvalidOrderbookAddress",
 		msg: "Orderbook address does not match curve account orderbook"
 	},
 	{
-		code: 6077,
+		code: 6078,
 		name: "InvalidFeePercentage",
 		msg: "Fee percentage must be between 0-100"
 	},
 	{
-		code: 6078,
+		code: 6079,
 		name: "InvalidFeeRate",
 		msg: "Fee rate exceeds maximum limit (10%)"
 	},
 	{
-		code: 6079,
+		code: 6080,
 		name: "InvalidCustomFeeRate",
 		msg: "Custom fee rate must be between 1000 (1%) and 5000 (5%)"
 	},
 	{
-		code: 6080,
+		code: 6081,
 		name: "InvalidBorrowDuration",
 		msg: "Borrow duration out of valid range (3-30 days)"
 	},
 	{
-		code: 6081,
+		code: 6082,
 		name: "InvalidStopLossPrice",
 		msg: "Stop loss price does not meet minimum interval requirement"
 	},
 	{
-		code: 6082,
+		code: 6083,
 		name: "NoProfitableFunds",
 		msg: "No profitable funds to transfer"
 	},
 	{
-		code: 6083,
+		code: 6084,
 		name: "InsufficientPoolFunds",
 		msg: "Insufficient pool funds"
 	},
 	{
-		code: 6084,
+		code: 6085,
 		name: "InsufficientPoolBalance",
 		msg: "Pool SOL account balance would fall below minimum required balance"
 	},
 	{
-		code: 6085,
+		code: 6086,
 		name: "OrderBookManagerOverflow",
 		msg: "Math operation overflow"
 	},
 	{
-		code: 6086,
+		code: 6087,
 		name: "OrderBookManagerInvalidSlotIndex",
 		msg: "Invalid slot index"
 	},
 	{
-		code: 6087,
+		code: 6088,
 		name: "OrderBookManagerInvalidAccountData",
 		msg: "Invalid account data"
 	},
 	{
-		code: 6088,
+		code: 6089,
 		name: "OrderBookManagerExceedsMaxCapacity",
 		msg: "New capacity exceeds maximum limit"
 	},
 	{
-		code: 6089,
+		code: 6090,
 		name: "OrderBookManagerExceedsAccountSizeLimit",
 		msg: "Account size exceeds 10MB limit"
 	},
 	{
-		code: 6090,
+		code: 6091,
 		name: "OrderBookManagerOrderIdMismatch",
 		msg: "Order ID mismatch"
 	},
 	{
-		code: 6091,
+		code: 6092,
 		name: "OrderBookManagerEmptyOrderBook",
 		msg: "Order book is empty"
 	},
 	{
-		code: 6092,
+		code: 6093,
 		name: "OrderBookManagerAccountNotWritable",
 		msg: "Account is not writable"
 	},
 	{
-		code: 6093,
+		code: 6094,
 		name: "OrderBookManagerNotRentExempt",
 		msg: "Account not rent-exempt"
 	},
 	{
-		code: 6094,
+		code: 6095,
 		name: "OrderBookManagerInvalidRentBalance",
 		msg: "Invalid rent balance"
 	},
 	{
-		code: 6095,
+		code: 6096,
 		name: "OrderBookManagerInsufficientFunds",
 		msg: "Insufficient funds"
 	},
 	{
-		code: 6096,
+		code: 6097,
 		name: "OrderBookManagerInvalidAccountOwner",
 		msg: "OrderBook account owner mismatch"
 	},
 	{
-		code: 6097,
+		code: 6098,
 		name: "OrderBookManagerDataOutOfBounds",
 		msg: "Data access out of bounds"
 	},
 	{
-		code: 6098,
+		code: 6099,
 		name: "NoValidInsertPosition",
 		msg: "Cannot find valid insert position, all candidates failed due to price range overlap"
 	},
 	{
-		code: 6099,
+		code: 6100,
 		name: "EmptyCloseInsertIndices",
 		msg: "close_insert_indices array cannot be empty"
 	},
 	{
-		code: 6100,
+		code: 6101,
 		name: "TooManyCloseInsertIndices",
 		msg: "close_insert_indices array cannot exceed 20 elements"
 	},
 	{
-		code: 6101,
+		code: 6102,
 		name: "CloseOrderNotFound",
 		msg: "Specified close order not found"
 	},
 	{
-		code: 6102,
+		code: 6103,
 		name: "LinkedListDeleteCountMismatch",
 		msg: "Linked list delete count mismatch: count inconsistent before/after deletion"
 	},
 	{
-		code: 6103,
+		code: 6104,
 		name: "NameTooLong",
 		msg: "Token name too long, max 32 bytes"
 	},
 	{
-		code: 6104,
+		code: 6105,
 		name: "NameEmpty",
 		msg: "Token name cannot be empty"
 	},
 	{
-		code: 6105,
+		code: 6106,
 		name: "SymbolTooLong",
 		msg: "Token symbol too long, max 10 bytes"
 	},
 	{
-		code: 6106,
+		code: 6107,
 		name: "SymbolEmpty",
 		msg: "Token symbol cannot be empty"
 	},
 	{
-		code: 6107,
+		code: 6108,
 		name: "UriTooLong",
 		msg: "URI too long, max 200 bytes"
 	},
 	{
-		code: 6108,
+		code: 6109,
 		name: "UriEmpty",
 		msg: "URI cannot be empty"
 	},
 	{
-		code: 6109,
+		code: 6110,
 		name: "IncompleteAdvancedPoolParams",
 		msg: "Incomplete advanced pool parameters: custom_lp_sol, custom_lp_token, custom_borrow_ratio, custom_borrow_duration must be provided together"
 	},
 	{
-		code: 6110,
+		code: 6111,
 		name: "InvalidInitialVirtualSol",
 		msg: "Initial virtual SOL out of valid range"
 	},
 	{
-		code: 6111,
+		code: 6112,
 		name: "InvalidInitialVirtualToken",
 		msg: "Initial virtual Token out of valid range"
 	},
 	{
-		code: 6112,
+		code: 6113,
 		name: "InvalidBorrowPoolRatio",
 		msg: "Borrow pool ratio out of valid range"
 	},
 	{
-		code: 6113,
+		code: 6114,
 		name: "BorrowTokenCalculationOverflow",
 		msg: "Borrow pool token amount calculation overflow"
 	},
 	{
-		code: 6114,
+		code: 6115,
 		name: "BorrowTokenAmountZero",
 		msg: "Borrow pool token amount cannot be zero"
 	}
@@ -53639,7 +53716,7 @@ const DEFAULT_NETWORKS = {
   MAINNET: {
     name: 'mainnet-beta',
     defaultDataSource: 'fast',
-    solanaEndpoint: 'https://melissa-ali6qz-fast-mainnet.helius-rpc.com',
+    solanaEndpoint: 'https://solana-rpc.pinpet.fun',
     pinPetFastApiUrl: 'https://api.pinpet.fun/',
     feeRecipient: 'CmDe8JRAPJ7QpZNCb4ArVEyzyxYoCNL7WZw5qXLePULn',
     baseFeeRecipient: '2xhAfEfnH8wg7ZGujSijJi4Zt4ge1ZuwMypo7etntgXA',
@@ -53648,7 +53725,7 @@ const DEFAULT_NETWORKS = {
   DEVNET: {
     name: 'devnet',
     defaultDataSource: 'fast',
-    solanaEndpoint: 'https://devnet.helius-rpc.com/?api-key=666f279b-0b08-41cd-97f4-461811d7fc7a',
+    solanaEndpoint: 'https://lu-ura5lv-fast-devnet.helius-rpc.com',
     pinPetFastApiUrl: 'https://devtestapi.pinpet.fun',
     feeRecipient: 'GesAj2dTn2wdNcxj4x8qsqS9aNRVPBPkE76aaqg7skxu',
     baseFeeRecipient: '5YHi1HsxobLiTD6NQfHJQpoPoRjMuNyXp4RroTvR6dKi',