pinpet-sdk 2.1.17 → 2.1.19

package/dist/pinpet-sdk.cjs.js

@@ -41917,12 +41917,12 @@ decimal.exports;
 
 var decimalExports = decimal.exports;
 
-const Decimal = decimalExports;
+const Decimal$1 = 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.set({ precision: 50, rounding: Decimal.ROUND_HALF_UP }); 
+Decimal$1.set({ precision: 50, rounding: Decimal$1.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('30');
+    static INITIAL_SOL_RESERVE_DECIMAL = new Decimal$1('30');
 
     /**
      * Initial Token reserve amount, represented as Decimal
      * @type {Decimal}
      */
-    static INITIAL_TOKEN_RESERVE_DECIMAL = new Decimal('1073000000');
+    static INITIAL_TOKEN_RESERVE_DECIMAL = new Decimal$1('1073000000');
 
     /**
      * Initial constant K value, represented as Decimal
      * @type {Decimal}
      */
-    static INITIAL_K_DECIMAL = new Decimal('32190000000');
+    static INITIAL_K_DECIMAL = new Decimal$1('32190000000');
 
     /**
      * Minimum price that can appear, below this price may cause overflow
@@ -41970,33 +41970,33 @@ 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('0.000000000001'); // 1e-12
+    static INITIAL_MIN_PRICE_DECIMAL = new Decimal$1('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('100000000000000000000000');
+    static PRICE_PRECISION_FACTOR_DECIMAL =   new Decimal$1('100000000000000000000000');
 
     /**
      * Decimal representation of Token precision factor = 1000000000 (10^9)
      * @type {Decimal}
      */
-    static TOKEN_PRECISION_FACTOR_DECIMAL = new Decimal('1000000000');
+    static TOKEN_PRECISION_FACTOR_DECIMAL = new Decimal$1('1000000000');
 
     /**
      * Decimal representation of SOL precision factor = 1000000000
      * @type {Decimal}
      */
-    static SOL_PRECISION_FACTOR_DECIMAL = new Decimal('1000000000');
+    static SOL_PRECISION_FACTOR_DECIMAL = new Decimal$1('1000000000');
 
 
     /**
      * Maximum price for u128 (matches PRICE_CALCULATION_LIMIT in Rust)
      * @type {bigint}
      */
-    static MAX_U128_PRICE = 50000000000000000000000000000000n;
+    static MAX_U128_PRICE = 70000000000000000000000000000n;
 
 
     /**
@@ -42018,7 +42018,7 @@ class CurveAMM$8 {
         if (typeof price === 'bigint') {
             price = price.toString();
         }
-        const priceDecimal = new Decimal(price);
+        const priceDecimal = new Decimal$1(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(price);
+        const priceDecimal = new Decimal$1(price);
         // Use old precision factor 10^15
-        const oldPrecisionFactor = new Decimal('1000000000000000');
+        const oldPrecisionFactor = new Decimal$1('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('1000000000000000');
+        const oldPrecisionFactor = new Decimal$1('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('1000000000000000');
+        const oldPrecisionFactor = new Decimal$1('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(amount);
+        const amountDecimal = new Decimal$1(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(amount);
+        const amountDecimal = new Decimal$1(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(initialVirtualSol);
-        const token = new Decimal(initialVirtualToken);
+        const sol = new Decimal$1(initialVirtualSol);
+        const token = new Decimal$1(initialVirtualToken);
         return sol.mul(token);
     }
 
@@ -42241,8 +42241,8 @@ class CurveAMM$8 {
      * @returns {bigint|null} u128格式的初始价格
      */
     static getInitialPriceWithParams(initialVirtualSol, initialVirtualToken) {
-        const sol = new Decimal(initialVirtualSol);
-        const token = new Decimal(initialVirtualToken);
+        const sol = new Decimal$1(initialVirtualSol);
+        const token = new Decimal$1(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('0.0000001'); // 10^-7
+        const warningPrice = new Decimal$1('0.0000001'); // 10^-7
         if (price.lt(warningPrice)) {
             // Only log once per execution to avoid spam (use a static flag)
             if (!this._tinyPriceWarningShown) {
@@ -43039,7 +43039,7 @@ class CurveAMM$8 {
         if (typeof price === 'bigint') {
             price = price.toString();
         }
-        const priceDecimal = new Decimal(price);
+        const priceDecimal = new Decimal$1(price);
         const convertedPrice = priceDecimal.div(this.PRICE_PRECISION_FACTOR_DECIMAL);
         return convertedPrice.toFixed(decimalPlaces);
     }
@@ -46030,6 +46030,7 @@ var long_shrot_stop = {
 };
 
 const CurveAMM$5 = curve_amm;
+const Decimal = decimalExports;
 
 
 /**
@@ -46146,13 +46147,14 @@ function calcLiqTokenBuy$1(price, buyTokenAmount, orders, onceMaxOrder, passOrde
 
   try {
     const priceBigInt = BigInt(price);
-    const initialVirtualSolBigInt = BigInt(initialVirtualSol.toString());
-    const initialVirtualTokenBigInt = BigInt(initialVirtualToken.toString());
+    const initialVirtualSolDecimal = new Decimal(initialVirtualSol).div(CurveAMM$5.SOL_PRECISION_FACTOR_DECIMAL);
+    const initialVirtualTokenDecimal = new Decimal(initialVirtualToken).div(CurveAMM$5.TOKEN_PRECISION_FACTOR_DECIMAL);
+
     [, result.ideal_lp_sol_amount] = CurveAMM$5.buyFromPriceWithTokenOutputWithParams(
       priceBigInt,
       buyTokenAmountBigInt,
-      initialVirtualSolBigInt,
-      initialVirtualTokenBigInt
+      initialVirtualSolDecimal,
+      initialVirtualTokenDecimal
     );
     // console.log(`理想计算: 当前价格=${priceBigInt}, 目标代币=${buyTokenAmountBigInt}, 理想SOL=${result.ideal_lp_sol_amount}`);
   } catch (error) {
@@ -46162,7 +46164,18 @@ function calcLiqTokenBuy$1(price, buyTokenAmount, orders, onceMaxOrder, passOrde
 
   // orders 长度为0 时要单独计算
   if (orders.length === 0) {
-    [result.free_lp_sol_amount_sum, result.free_lp_token_amount_sum] = CurveAMM$5.buyFromPriceToPrice(BigInt(price), CurveAMM$5.MAX_U128_PRICE);
+    
+
+    const initialVirtualSolDecimal = new Decimal(initialVirtualSol).div(CurveAMM$5.SOL_PRECISION_FACTOR_DECIMAL);
+    const initialVirtualTokenDecimal = new Decimal(initialVirtualToken).div(CurveAMM$5.TOKEN_PRECISION_FACTOR_DECIMAL);
+
+
+    [result.free_lp_sol_amount_sum, result.free_lp_token_amount_sum] = CurveAMM$5.buyFromPriceToPriceWithParams(
+      BigInt(price),
+      CurveAMM$5.MAX_U128_PRICE,
+      initialVirtualSolDecimal,
+      initialVirtualTokenDecimal
+    );
     result.has_infinite_lp = true;
     result.real_lp_sol_amount = result.ideal_lp_sol_amount;
     return result
@@ -46210,7 +46223,14 @@ function calcLiqTokenBuy$1(price, buyTokenAmount, orders, onceMaxOrder, passOrde
     // 如果存在价格间隙，计算自由流动性
     if (endPrice > startPrice) {
       try {
-        const gapLiquidity = CurveAMM$5.buyFromPriceToPrice(startPrice, endPrice);
+        const initialVirtualSolDecimal = new Decimal(initialVirtualSol).div(CurveAMM$5.SOL_PRECISION_FACTOR_DECIMAL);
+        const initialVirtualTokenDecimal = new Decimal(initialVirtualToken).div(CurveAMM$5.TOKEN_PRECISION_FACTOR_DECIMAL);
+        const gapLiquidity = CurveAMM$5.buyFromPriceToPriceWithParams(
+          startPrice,
+          endPrice,
+          initialVirtualSolDecimal,
+          initialVirtualTokenDecimal
+        );
         if (gapLiquidity && Array.isArray(gapLiquidity) && gapLiquidity.length === 2) {
           const [solAmount, tokenAmount] = gapLiquidity;
 
@@ -46348,7 +46368,14 @@ function calcLiqTokenBuy$1(price, buyTokenAmount, orders, onceMaxOrder, passOrde
 
     if (maxPrice > lastEndPrice) {
       try {
-        const infiniteLiquidity = CurveAMM$5.buyFromPriceToPrice(lastEndPrice, maxPrice);
+        const initialVirtualSolDecimal = new Decimal(initialVirtualSol).div(CurveAMM$5.SOL_PRECISION_FACTOR_DECIMAL);
+        const initialVirtualTokenDecimal = new Decimal(initialVirtualToken).div(CurveAMM$5.TOKEN_PRECISION_FACTOR_DECIMAL);
+        const infiniteLiquidity = CurveAMM$5.buyFromPriceToPriceWithParams(
+          lastEndPrice,
+          maxPrice,
+          initialVirtualSolDecimal,
+          initialVirtualTokenDecimal
+        );
         if (infiniteLiquidity && Array.isArray(infiniteLiquidity) && infiniteLiquidity.length === 2) {
           const [solAmount, tokenAmount] = infiniteLiquidity;
 
@@ -46505,13 +46532,15 @@ function calcLiqTokenSell$1(price, sellTokenAmount, orders, onceMaxOrder, passOr
   // 计算理想情况下卖出能获得的SOL数量
   try {
     const priceBigInt = BigInt(price);
-    const initialVirtualSolBigInt = BigInt(initialVirtualSol.toString());
-    const initialVirtualTokenBigInt = BigInt(initialVirtualToken.toString());
+    const initialVirtualSolDecimal = new Decimal(initialVirtualSol).div(CurveAMM$5.SOL_PRECISION_FACTOR_DECIMAL);
+    const initialVirtualTokenDecimal = new Decimal(initialVirtualToken).div(CurveAMM$5.TOKEN_PRECISION_FACTOR_DECIMAL);
+
+    //console.log("initialVirtualSolDecimal,initialVirtualTokenDecimal = ",initialVirtualSolDecimal.toString(),initialVirtualTokenDecimal.toString());
     [, result.ideal_lp_sol_amount] = CurveAMM$5.sellFromPriceWithTokenInputWithParams(
       priceBigInt,
       sellTokenAmountBigInt,
-      initialVirtualSolBigInt,
-      initialVirtualTokenBigInt
+      initialVirtualSolDecimal,
+      initialVirtualTokenDecimal
     );
     // console.log(`理想计算: 当前价格=${priceBigInt}, 卖出代币=${sellTokenAmountBigInt}, 理想SOL=${result.ideal_lp_sol_amount}`);
   } catch (error) {
@@ -46520,13 +46549,13 @@ function calcLiqTokenSell$1(price, sellTokenAmount, orders, onceMaxOrder, passOr
 
   // orders 长度为0 时要单独计算
   if (orders.length === 0) {
-    const initialVirtualSolBigInt = BigInt(initialVirtualSol.toString());
-    const initialVirtualTokenBigInt = BigInt(initialVirtualToken.toString());
+    const initialVirtualSolDecimal = new Decimal(initialVirtualSol).div(CurveAMM$5.SOL_PRECISION_FACTOR_DECIMAL);
+    const initialVirtualTokenDecimal = new Decimal(initialVirtualToken).div(CurveAMM$5.TOKEN_PRECISION_FACTOR_DECIMAL);
     const sellResult = CurveAMM$5.sellFromPriceToPriceWithParams(
       BigInt(price),
       CurveAMM$5.MIN_U128_PRICE,
-      initialVirtualSolBigInt,
-      initialVirtualTokenBigInt
+      initialVirtualSolDecimal,
+      initialVirtualTokenDecimal
     );
     if (sellResult) {
       [result.free_lp_token_amount_sum, result.free_lp_sol_amount_sum] = sellResult;
@@ -46583,7 +46612,14 @@ function calcLiqTokenSell$1(price, sellTokenAmount, orders, onceMaxOrder, passOr
     // 如果存在价格间隙（卖出时startPrice应该大于endPrice）
     if (startPrice > endPrice) {
       try {
-        const gapLiquidity = CurveAMM$5.sellFromPriceToPrice(startPrice, endPrice);
+        const initialVirtualSolDecimal = new Decimal(initialVirtualSol).div(CurveAMM$5.SOL_PRECISION_FACTOR_DECIMAL);
+        const initialVirtualTokenDecimal = new Decimal(initialVirtualToken).div(CurveAMM$5.TOKEN_PRECISION_FACTOR_DECIMAL);
+        const gapLiquidity = CurveAMM$5.sellFromPriceToPriceWithParams(
+          startPrice,
+          endPrice,
+          initialVirtualSolDecimal,
+          initialVirtualTokenDecimal
+        );
         if (gapLiquidity && Array.isArray(gapLiquidity) && gapLiquidity.length === 2) {
           const [tokenAmount, solAmount] = gapLiquidity;
 
@@ -46711,7 +46747,14 @@ function calcLiqTokenSell$1(price, sellTokenAmount, orders, onceMaxOrder, passOr
     if (lastEndPrice > minPrice) {
 
       try {
-        const infiniteLiquidity = CurveAMM$5.sellFromPriceToPrice(lastEndPrice, minPrice);
+        const initialVirtualSolDecimal = new Decimal(initialVirtualSol).div(CurveAMM$5.SOL_PRECISION_FACTOR_DECIMAL);
+        const initialVirtualTokenDecimal = new Decimal(initialVirtualToken).div(CurveAMM$5.TOKEN_PRECISION_FACTOR_DECIMAL);
+        const infiniteLiquidity = CurveAMM$5.sellFromPriceToPriceWithParams(
+          lastEndPrice,
+          minPrice,
+          initialVirtualSolDecimal,
+          initialVirtualTokenDecimal
+        );
         if (infiniteLiquidity && Array.isArray(infiniteLiquidity) && infiniteLiquidity.length === 2) {
           const [tokenAmount, solAmount] = infiniteLiquidity;
 
@@ -46789,7 +46832,7 @@ const { calcLiqTokenBuy, calcLiqTokenSell } = calcLiq;
 async function simulateTokenBuy$1(mint, buyTokenAmount, passOrder = null, lastPrice = null, ordersData = null) {
   // 获取价格和订单数据
 
-  console.log('simulateTokenBuy', mint, buyTokenAmount, passOrder, lastPrice, ordersData);
+  //console.log('simulateTokenBuy', mint, buyTokenAmount, passOrder, lastPrice, ordersData);
 
   let price = lastPrice;
   if (!price) {
@@ -46817,11 +46860,6 @@ async function simulateTokenBuy$1(mint, buyTokenAmount, passOrder = null, lastPr
     throw new Error(`Failed to get curve account data: ${error.message}`);
   }
 
-  // console.log('simulateTokenBuy 获取的数据:');
-  // console.log('价格:', price);
-  // console.log('订单数量:', orders.length);
-  // orders.forEach((order, i) => console.log(`订单${i}: start=${order.lock_lp_start_price}, end=${order.lock_lp_end_price}, sol=${order.lock_lp_sol_amount}, token=${order.lock_lp_token_amount}`));
-
   // 调用 calcLiqTokenBuy 进行流动性计算（传入动态流动池参数）
   try {
     const liqResult = calcLiqTokenBuy(
@@ -46954,6 +46992,8 @@ async function simulateTokenSell$1(mint, sellTokenAmount, passOrder = null, last
     price = await this.sdk.data.price(mint);
   }
 
+  //console.log("price=",price);
+
   let orders;
   if (!ordersData) {
     const ordersResponse = await this.sdk.data.orders(mint, {
@@ -47363,7 +47403,7 @@ function calcLiqSolBuy$1(price, buySolAmount, orders, onceMaxOrder, passOrderID
         ? new Decimal(initialVirtualToken.toString()).div(CurveAMM$4.TOKEN_PRECISION_FACTOR_DECIMAL)
         : CurveAMM$4.INITIAL_TOKEN_RESERVE_DECIMAL;
 
-    console.log("calcLiqSolBuy: virtualSol,virtualToken=",virtualSol,virtualToken);
+    //console.log("calcLiqSolBuy: virtualSol,virtualToken=",virtualSol,virtualToken)
 
 
     // 3. 处理空订单情况（第一阶段）