@meteora-ag/dlmm 1.0.52-rc.8 → 1.0.53

package/dist/index.d.ts

@@ -5293,6 +5293,7 @@ interface SwapQuote {
     minOutAmount: BN;
     priceImpact: Decimal;
     binArraysPubkey: any[];
+    endPrice: Decimal;
 }
 interface SwapQuoteExactOut {
     inAmount: BN;
@@ -5605,12 +5606,6 @@ declare class DLMM {
      * @returns an object with two properties: "binId" which is a number, and "price" which is a string.
      */
     getActiveBin(): Promise<BinLiquidity>;
-    /**
-     * The function get the price of a bin based on its bin ID.
-     * @param {number} binId - The `binId` parameter is a number that represents the ID of a bin.
-     * @returns {number} the calculated price of a bin based on the provided binId.
-     */
-    getPriceOfBinByBinId(binId: number): string;
     /**
      * The function get bin ID based on a given price and a boolean flag indicating whether to
      * round down or up.
@@ -5931,7 +5926,6 @@ declare class DLMM {
     private static getClaimableSwapFee;
     private static processPosition;
     private static getBinsBetweenLowerAndUpperBound;
-    private static getPriceOfBinByBinId;
     /** Private method */
     private processXYAmountDistribution;
     private getBins;

package/dist/index.js

@@ -8570,17 +8570,6 @@ var DLMM = class {
     );
     return activeBinState;
   }
-  /**
-   * The function get the price of a bin based on its bin ID.
-   * @param {number} binId - The `binId` parameter is a number that represents the ID of a bin.
-   * @returns {number} the calculated price of a bin based on the provided binId.
-   */
-  getPriceOfBinByBinId(binId) {
-    const binStepNum = new (0, _decimaljs2.default)(this.lbPair.binStep).div(
-      new (0, _decimaljs2.default)(BASIS_POINT_MAX)
-    );
-    return new (0, _decimaljs2.default)(1).add(new (0, _decimaljs2.default)(binStepNum)).pow(new (0, _decimaljs2.default)(binId)).toString();
-  }
   /**
    * The function get bin ID based on a given price and a boolean flag indicating whether to
    * round down or up.
@@ -9859,9 +9848,15 @@ var DLMM = class {
         }
       }
     }
-    const startPrice = this.getPriceOfBinByBinId(startBinId.toNumber());
-    const endPrice = this.getPriceOfBinByBinId(activeId.toNumber());
-    const priceImpact = new (0, _decimaljs2.default)(startPrice).sub(new (0, _decimaljs2.default)(endPrice)).abs().div(new (0, _decimaljs2.default)(startPrice)).mul(new (0, _decimaljs2.default)(100));
+    const startPrice = getPriceOfBinByBinId(
+      startBinId.toNumber(),
+      this.lbPair.binStep
+    );
+    const endPrice = getPriceOfBinByBinId(
+      activeId.toNumber(),
+      this.lbPair.binStep
+    );
+    const priceImpact = startPrice.sub(endPrice).abs().div(startPrice).mul(new (0, _decimaljs2.default)(100));
     const maxInAmount = actualInAmount.mul(new (0, _anchor.BN)(BASIS_POINT_MAX).add(allowedSlippage)).div(new (0, _anchor.BN)(BASIS_POINT_MAX));
     return {
       inAmount: actualInAmount,
@@ -9972,6 +9967,10 @@ var DLMM = class {
     );
     const priceImpact = new (0, _decimaljs2.default)(actualOutAmount.toString()).sub(new (0, _decimaljs2.default)(outAmountWithoutSlippage.toString())).div(new (0, _decimaljs2.default)(outAmountWithoutSlippage.toString())).mul(new (0, _decimaljs2.default)(100));
     const minOutAmount = actualOutAmount.mul(new (0, _anchor.BN)(BASIS_POINT_MAX).sub(allowedSlippage)).div(new (0, _anchor.BN)(BASIS_POINT_MAX));
+    const endPrice = getPriceOfBinByBinId(
+      activeId.toNumber(),
+      this.lbPair.binStep
+    );
     return {
       consumedInAmount: inAmount,
       outAmount: actualOutAmount,
@@ -9979,7 +9978,8 @@ var DLMM = class {
       protocolFee: protocolFeeAmount,
       minOutAmount,
       priceImpact,
-      binArraysPubkey: [...binArraysForSwap.keys()]
+      binArraysPubkey: [...binArraysForSwap.keys()],
+      endPrice
     };
   }
   async swapExactOut({
@@ -11005,33 +11005,33 @@ var DLMM = class {
     const amount0AfterFee = amount0.sub(fee);
     const amountOut = isWithdrawForY ? mulShr(price, amount0AfterFee, SCALE_OFFSET, 1 /* Down */) : shlDiv(amount0AfterFee, price, SCALE_OFFSET, 1 /* Down */);
     return {
-      withdrawAmount: amount1.add(amountOut > maxAmountOut ? maxAmountOut : amountOut)
+      withdrawAmount: amount1.add(amountOut.gt(maxAmountOut) ? maxAmountOut : amountOut)
     };
   }
   async getWithdrawSingleSideAmount(positionPubkey, isWithdrawForY) {
     let totalWithdrawAmount = new (0, _anchor.BN)(0);
-    let _lowerBinArray;
-    let _upperBinArray;
+    let lowerBinArray;
+    let upperBinArray;
     const position = await this.program.account.positionV2.fetch(
       positionPubkey
     );
     const lowerBinArrayIdx = binIdToBinArrayIndex(new (0, _anchor.BN)(position.lowerBinId));
-    const [lowerBinArray] = deriveBinArray(
+    const [lowerBinArrayPubKey] = deriveBinArray(
       position.lbPair,
       lowerBinArrayIdx,
       this.program.programId
     );
     const upperBinArrayIdx = lowerBinArrayIdx.add(new (0, _anchor.BN)(1));
-    const [upperBinArray] = deriveBinArray(
+    const [upperBinArrayPubKey] = deriveBinArray(
       position.lbPair,
       upperBinArrayIdx,
       this.program.programId
     );
-    [_lowerBinArray, _upperBinArray] = await this.program.account.binArray.fetchMultiple([
-      lowerBinArray,
-      upperBinArray
+    [lowerBinArray, upperBinArray] = await this.program.account.binArray.fetchMultiple([
+      lowerBinArrayPubKey,
+      upperBinArrayPubKey
     ]);
-    if (!_lowerBinArray || !_upperBinArray)
+    if (!lowerBinArray || !upperBinArray)
       throw new Error("BinArray not found");
     for (let idx = 0; idx < position.liquidityShares.length; idx++) {
       const shareToRemove = position.liquidityShares[idx];
@@ -11040,7 +11040,7 @@ var DLMM = class {
       }
       const binId = new (0, _anchor.BN)(position.lowerBinId).add(new (0, _anchor.BN)(idx));
       const binArrayIndex = binIdToBinArrayIndex(binId);
-      const binArray = binArrayIndex.eq(lowerBinArrayIdx) ? _lowerBinArray : _upperBinArray;
+      const binArray = binArrayIndex.eq(lowerBinArrayIdx) ? lowerBinArray : upperBinArray;
       const bin = getBinFromBinArray(binId.toNumber(), binArray);
       if (isWithdrawForY) {
         if (binId.gt(new (0, _anchor.BN)(this.lbPair.activeId))) {
@@ -11288,10 +11288,10 @@ var DLMM = class {
       binArray.bins.forEach((bin, idx) => {
         const binId = lowerBinIdForBinArray.toNumber() + idx;
         if (binId >= lowerBinId && binId <= upperBinId) {
-          const pricePerLamport = this.getPriceOfBinByBinId(
-            lbPair.binStep,
-            binId
-          );
+          const pricePerLamport = getPriceOfBinByBinId(
+            binId,
+            lbPair.binStep
+          ).toString();
           bins.push({
             binId,
             xAmount: bin.amountX,
@@ -11312,10 +11312,10 @@ var DLMM = class {
         binArray.bins.forEach((bin, idx) => {
           const binId = lowerBinIdForBinArray.toNumber() + idx;
           if (binId >= lowerBinId && binId <= upperBinId) {
-            const pricePerLamport = this.getPriceOfBinByBinId(
-              lbPair.binStep,
-              binId
-            );
+            const pricePerLamport = getPriceOfBinByBinId(
+              binId,
+              lbPair.binStep
+            ).toString();
             bins.push({
               binId,
               xAmount: bin.amountX,
@@ -11331,10 +11331,6 @@ var DLMM = class {
     }
     return bins;
   }
-  static getPriceOfBinByBinId(binStep, binId) {
-    const binStepNum = new (0, _decimaljs2.default)(binStep).div(new (0, _decimaljs2.default)(BASIS_POINT_MAX));
-    return new (0, _decimaljs2.default)(1).add(new (0, _decimaljs2.default)(binStepNum)).pow(new (0, _decimaljs2.default)(binId)).toString();
-  }
   /** Private method */
   processXYAmountDistribution(xYAmountDistribution) {
     let currentBinId = null;
@@ -11373,8 +11369,6 @@ var DLMM = class {
         const [lowerBinId2, upperBinId2] = getBinArrayLowerUpperBinId(lowerBinArrayIndex);
         const binArrayBins = [];
         for (let i = lowerBinId2.toNumber(); i <= upperBinId2.toNumber(); i++) {
-          const binId = new (0, _anchor.BN)(i);
-          const pricePerLamport = this.getPriceOfBinByBinId(binId.toNumber());
           binArrayBins.push({
             amountX: new (0, _anchor.BN)(0),
             amountY: new (0, _anchor.BN)(0),
@@ -11399,7 +11393,10 @@ var DLMM = class {
       binArray.bins.forEach((bin, idx) => {
         const binId = lowerBinIdForBinArray.toNumber() + idx;
         if (binId >= lowerBinId && binId <= upperBinId) {
-          const pricePerLamport = this.getPriceOfBinByBinId(binId);
+          const pricePerLamport = getPriceOfBinByBinId(
+            binId,
+            this.lbPair.binStep
+          ).toString();
           bins.push({
             binId,
             xAmount: bin.amountX,
@@ -11440,7 +11437,10 @@ var DLMM = class {
         binArray.bins.forEach((bin, idx) => {
           const binId = lowerBinIdForBinArray.toNumber() + idx;
           if (binId >= lowerBinId && binId <= upperBinId) {
-            const pricePerLamport = this.getPriceOfBinByBinId(binId);
+            const pricePerLamport = getPriceOfBinByBinId(
+              binId,
+              this.lbPair.binStep
+            ).toString();
             bins.push({
               binId,
               xAmount: bin.amountX,