@meteora-ag/dlmm 1.6.0-rc.30 → 1.6.0-rc.32

package/dist/index.mjs

@@ -19,7 +19,7 @@ import {
   SystemProgram as SystemProgram2,
   Transaction
 } from "@solana/web3.js";
-import Decimal8 from "decimal.js";
+import Decimal9 from "decimal.js";
 
 // src/dlmm/constants/index.ts
 import { LAMPORTS_PER_SOL, PublicKey } from "@solana/web3.js";
@@ -12939,6 +12939,9 @@ function buildLiquidityStrategyParameters(amountX, amountY, minDeltaId, maxDelta
   };
 }
 
+// src/dlmm/helpers/index.ts
+import Decimal8 from "decimal.js";
+
 // src/dlmm/helpers/lbPair.ts
 import { PublicKey as PublicKey8 } from "@solana/web3.js";
 import { TOKEN_2022_PROGRAM_ID as TOKEN_2022_PROGRAM_ID2, TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID2 } from "@solana/spl-token";
@@ -13668,10 +13671,20 @@ function getBinCount(minBinId, maxBinId) {
   return maxBinId - minBinId + 1;
 }
 function getSlippageMaxAmount(amount, slippage) {
-  return slippage == 100 ? U64_MAX : amount.muln(100 + slippage).divn(100);
+  if (slippage == 100) {
+    return U64_MAX;
+  }
+  const amountDecimal = new Decimal8(amount.toString());
+  const slippageAppliedAmount = new BN18(
+    amountDecimal.mul(new Decimal8(100 + slippage)).div(new Decimal8(100)).floor().toString()
+  );
+  return slippageAppliedAmount;
 }
 function getSlippageMinAmount(amount, slippage) {
-  return amount.muln(100 - slippage).divn(100);
+  const amountDecimal = new Decimal8(amount.toString());
+  return new BN18(
+    amountDecimal.mul(new Decimal8(100 - slippage)).div(new Decimal8(100)).ceil().toString()
+  );
 }
 function getPositionCountByBinCount(binCount) {
   return Math.ceil(binCount / MAX_BINS_PER_POSITION.toNumber());
@@ -14792,11 +14805,11 @@ var DLMM = class {
     return positionsMap;
   }
   static getPricePerLamport(tokenXDecimal, tokenYDecimal, price) {
-    return new Decimal8(price).mul(new Decimal8(10 ** (tokenYDecimal - tokenXDecimal))).toString();
+    return new Decimal9(price).mul(new Decimal9(10 ** (tokenYDecimal - tokenXDecimal))).toString();
   }
   static getBinIdFromPrice(price, binStep, min) {
-    const binStepNum = new Decimal8(binStep).div(new Decimal8(BASIS_POINT_MAX));
-    const binId = new Decimal8(price).log().dividedBy(new Decimal8(1).add(binStepNum).log());
+    const binStepNum = new Decimal9(binStep).div(new Decimal9(BASIS_POINT_MAX));
+    const binId = new Decimal9(price).log().dividedBy(new Decimal9(1).add(binStepNum).log());
     return (min ? binId.floor() : binId.ceil()).toNumber();
   }
   /**
@@ -15412,8 +15425,8 @@ var DLMM = class {
    */
   static calculateFeeInfo(baseFactor, binStep, baseFeePowerFactor) {
     const baseFeeRate = new BN21(baseFactor).mul(new BN21(binStep)).mul(new BN21(10)).mul(new BN21(10).pow(new BN21(baseFeePowerFactor ?? 0)));
-    const baseFeeRatePercentage = new Decimal8(baseFeeRate.toString()).mul(new Decimal8(100)).div(new Decimal8(FEE_PRECISION.toString()));
-    const maxFeeRatePercentage = new Decimal8(MAX_FEE_RATE.toString()).mul(new Decimal8(100)).div(new Decimal8(FEE_PRECISION.toString()));
+    const baseFeeRatePercentage = new Decimal9(baseFeeRate.toString()).mul(new Decimal9(100)).div(new Decimal9(FEE_PRECISION.toString()));
+    const maxFeeRatePercentage = new Decimal9(MAX_FEE_RATE.toString()).mul(new Decimal9(100)).div(new Decimal9(FEE_PRECISION.toString()));
     return {
       baseFeeRatePercentage,
       maxFeeRatePercentage
@@ -15431,7 +15444,7 @@ var DLMM = class {
       this.lbPair.binStep,
       this.lbPair.parameters.baseFeePowerFactor
     );
-    const protocolFeePercentage = new Decimal8(protocolShare.toString()).mul(new Decimal8(100)).div(new Decimal8(BASIS_POINT_MAX));
+    const protocolFeePercentage = new Decimal9(protocolShare.toString()).mul(new Decimal9(100)).div(new Decimal9(BASIS_POINT_MAX));
     return {
       baseFeeRatePercentage,
       maxFeeRatePercentage,
@@ -15463,7 +15476,7 @@ var DLMM = class {
       sParameters3,
       vParameterClone
     );
-    return new Decimal8(totalFee.toString()).div(new Decimal8(FEE_PRECISION.toString())).mul(100);
+    return new Decimal9(totalFee.toString()).div(new Decimal9(FEE_PRECISION.toString())).mul(100);
   }
   /**
    * The function `getEmissionRate` returns the emission rates for two rewards.
@@ -15476,8 +15489,8 @@ var DLMM = class {
       ({ rewardRate, rewardDurationEnd }) => now > rewardDurationEnd.toNumber() ? void 0 : rewardRate
     );
     return {
-      rewardOne: rewardOneEmissionRate ? new Decimal8(rewardOneEmissionRate.toString()).div(PRECISION) : void 0,
-      rewardTwo: rewardTwoEmissionRate ? new Decimal8(rewardTwoEmissionRate.toString()).div(PRECISION) : void 0
+      rewardOne: rewardOneEmissionRate ? new Decimal9(rewardOneEmissionRate.toString()).div(PRECISION) : void 0,
+      rewardTwo: rewardTwoEmissionRate ? new Decimal9(rewardTwoEmissionRate.toString()).div(PRECISION) : void 0
     };
   }
   /**
@@ -15570,8 +15583,8 @@ var DLMM = class {
    * @returns {string} real price of bin
    */
   fromPricePerLamport(pricePerLamport) {
-    return new Decimal8(pricePerLamport).div(
-      new Decimal8(
+    return new Decimal9(pricePerLamport).div(
+      new Decimal9(
         10 ** (this.tokenY.mint.decimals - this.tokenX.mint.decimals)
       )
     ).toString();
@@ -15729,12 +15742,12 @@ var DLMM = class {
     const lowerBinArrayIndex = binIdToBinArrayIndex(currentMinBinId);
     const upperBinArrayIndex = binIdToBinArrayIndex(currentMaxBinId);
     const binArraysCount = (await this.binArraysToBeCreate(lowerBinArrayIndex, upperBinArrayIndex)).length;
-    const binArrayCost = new Decimal8(binArraysCount).mul(
-      new Decimal8(BIN_ARRAY_FEE)
+    const binArrayCost = new Decimal9(binArraysCount).mul(
+      new Decimal9(BIN_ARRAY_FEE)
     );
     return {
-      positionExtendCost: new Decimal8(positionExtendCost).div(
-        new Decimal8(LAMPORTS_PER_SOL2)
+      positionExtendCost: new Decimal9(positionExtendCost).div(
+        new Decimal9(LAMPORTS_PER_SOL2)
       ),
       binArrayCost
     };
@@ -15742,7 +15755,10 @@ var DLMM = class {
   async quoteCreatePosition({ strategy }) {
     const { minBinId, maxBinId } = strategy;
     const binCount = maxBinId - minBinId + 1;
-    const positionCount = Math.floor(binCount / MAX_BINS_PER_POSITION.toNumber()) + 1;
+    let positionCount = Math.floor(binCount / MAX_BINS_PER_POSITION.toNumber());
+    if (binCount % MAX_BINS_PER_POSITION.toNumber() > 0) {
+      positionCount++;
+    }
     let positionReallocCost = 0;
     let lastUpperBinId = minBinId;
     for (let i = 0; i < positionCount; i++) {
@@ -17107,7 +17123,7 @@ var DLMM = class {
       activeId.toNumber(),
       this.lbPair.binStep
     );
-    const priceImpact = startPrice.sub(endPrice).abs().div(startPrice).mul(new Decimal8(100));
+    const priceImpact = startPrice.sub(endPrice).abs().div(startPrice).mul(new Decimal9(100));
     actualInAmount = calculateTransferFeeIncludedAmount(
       actualInAmount.add(feeAmount),
       inMint,
@@ -17294,7 +17310,7 @@ var DLMM = class {
       ),
       swapForY
     );
-    const priceImpact = new Decimal8(totalOutAmount.toString()).sub(new Decimal8(outAmountWithoutSlippage.toString())).div(new Decimal8(outAmountWithoutSlippage.toString())).mul(new Decimal8(100)).abs();
+    const priceImpact = new Decimal9(totalOutAmount.toString()).sub(new Decimal9(outAmountWithoutSlippage.toString())).div(new Decimal9(outAmountWithoutSlippage.toString())).mul(new Decimal9(100)).abs();
     const endPrice = getPriceOfBinByBinId(
       lastFilledActiveBinId.toNumber(),
       this.lbPair.binStep
@@ -17903,11 +17919,11 @@ var DLMM = class {
     let totalBinArraysCount = new BN21(0);
     let totalBinArraysLamports = new BN21(0);
     let binArrayBitmapLamports = new BN21(0);
-    const toLamportMultiplier = new Decimal8(
+    const toLamportMultiplier = new Decimal9(
       10 ** (this.tokenY.mint.decimals - this.tokenX.mint.decimals)
     );
-    const minPricePerLamport = new Decimal8(minPrice).mul(toLamportMultiplier);
-    const maxPricePerLamport = new Decimal8(maxPrice).mul(toLamportMultiplier);
+    const minPricePerLamport = new Decimal9(minPrice).mul(toLamportMultiplier);
+    const maxPricePerLamport = new Decimal9(maxPrice).mul(toLamportMultiplier);
     const minBinId = new BN21(
       DLMM.getBinIdFromPrice(minPricePerLamport, this.lbPair.binStep, false)
     );
@@ -19393,8 +19409,8 @@ var DLMM = class {
     if (!bins.length)
       return null;
     const positionData = [];
-    let totalXAmount = new Decimal8(0);
-    let totalYAmount = new Decimal8(0);
+    let totalXAmount = new Decimal9(0);
+    let totalYAmount = new Decimal9(0);
     const ZERO = new BN21(0);
     let feeX = ZERO;
     let feeY = ZERO;
@@ -19405,8 +19421,8 @@ var DLMM = class {
       const posBinRewardInfo = positionRewardInfos[idx];
       const positionXAmount = binSupply.eq(ZERO) ? ZERO : posShare.mul(bin.xAmount).div(binSupply);
       const positionYAmount = binSupply.eq(ZERO) ? ZERO : posShare.mul(bin.yAmount).div(binSupply);
-      totalXAmount = totalXAmount.add(new Decimal8(positionXAmount.toString()));
-      totalYAmount = totalYAmount.add(new Decimal8(positionYAmount.toString()));
+      totalXAmount = totalXAmount.add(new Decimal9(positionXAmount.toString()));
+      totalYAmount = totalYAmount.add(new Decimal9(positionYAmount.toString()));
       const feeInfo = feeInfos[idx];
       const newFeeX = mulShr(
         posShares[idx].shrn(SCALE_OFFSET),
@@ -19570,7 +19586,7 @@ var DLMM = class {
               rewardPerTokenStored: [ZERO, ZERO],
               price: pricePerLamport,
               version: 2,
-              pricePerToken: new Decimal8(pricePerLamport).mul(new Decimal8(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
+              pricePerToken: new Decimal9(pricePerLamport).mul(new Decimal9(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
             });
           } else {
             const bin = binArray.bins[i];
@@ -19584,7 +19600,7 @@ var DLMM = class {
               rewardPerTokenStored: bin.rewardPerTokenStored,
               price: pricePerLamport,
               version: binArray.version,
-              pricePerToken: new Decimal8(pricePerLamport).mul(new Decimal8(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
+              pricePerToken: new Decimal9(pricePerLamport).mul(new Decimal9(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
             });
           }
         }