@meteora-ag/dlmm 1.0.49-rc.2 → 1.0.50-rc.0

package/dist/index.mjs

@@ -8485,17 +8485,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 Decimal4(this.lbPair.binStep).div(
-      new Decimal4(BASIS_POINT_MAX)
-    );
-    return new Decimal4(1).add(new Decimal4(binStepNum)).pow(new Decimal4(binId)).toString();
-  }
   /**
    * The function get bin ID based on a given price and a boolean flag indicating whether to
    * round down or up.
@@ -9704,9 +9693,15 @@ var DLMM = class {
         }
       }
     }
-    const startPrice = this.getPriceOfBinByBinId(startBinId.toNumber());
-    const endPrice = this.getPriceOfBinByBinId(activeId.toNumber());
-    const priceImpact = new Decimal4(startPrice).sub(new Decimal4(endPrice)).abs().div(new Decimal4(startPrice)).mul(new Decimal4(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 Decimal4(100));
     const maxInAmount = actualInAmount.mul(new BN9(BASIS_POINT_MAX).add(allowedSlippage)).div(new BN9(BASIS_POINT_MAX));
     return {
       inAmount: actualInAmount,
@@ -9810,6 +9805,10 @@ var DLMM = class {
     );
     const priceImpact = new Decimal4(actualOutAmount.toString()).sub(new Decimal4(outAmountWithoutSlippage.toString())).div(new Decimal4(outAmountWithoutSlippage.toString())).mul(new Decimal4(100));
     const minOutAmount = actualOutAmount.mul(new BN9(BASIS_POINT_MAX).sub(allowedSlippage)).div(new BN9(BASIS_POINT_MAX));
+    const endPrice = getPriceOfBinByBinId(
+      activeId.toNumber(),
+      this.lbPair.binStep
+    );
     return {
       consumedInAmount: inAmount,
       outAmount: actualOutAmount,
@@ -9817,7 +9816,8 @@ var DLMM = class {
       protocolFee: protocolFeeAmount,
       minOutAmount,
       priceImpact,
-      binArraysPubkey: [...binArraysForSwap.keys()]
+      binArraysPubkey: [...binArraysForSwap.keys()],
+      endPrice
     };
   }
   async swapExactOut({
@@ -10738,7 +10738,7 @@ var DLMM = class {
     }).add(syncWithMarketPriceTx);
   }
   async getMaxPriceInBinArrays(binArrayAccounts) {
-    const sortedBinArrays = [...binArrayAccounts].sort(
+    const sortedBinArrays = binArrayAccounts.sort(
       ({ account: { index: indexA } }, { account: { index: indexB } }) => indexA.toNumber() - indexB.toNumber()
     );
     let count = sortedBinArrays.length - 1;
@@ -10746,7 +10746,7 @@ var DLMM = class {
     while (count >= 0) {
       const binArray = sortedBinArrays[count];
       if (binArray) {
-        const bins = binArray.account.bins;
+        const bins = binArray.account.bins.reverse();
         if (bins.every(({ amountX }) => amountX.isZero())) {
           count--;
         } else {
@@ -10988,10 +10988,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,
@@ -11012,10 +11012,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,
@@ -11031,10 +11031,6 @@ var DLMM = class {
     }
     return bins;
   }
-  static getPriceOfBinByBinId(binStep, binId) {
-    const binStepNum = new Decimal4(binStep).div(new Decimal4(BASIS_POINT_MAX));
-    return new Decimal4(1).add(new Decimal4(binStepNum)).pow(new Decimal4(binId)).toString();
-  }
   /** Private method */
   processXYAmountDistribution(xYAmountDistribution) {
     let currentBinId = null;
@@ -11073,8 +11069,6 @@ var DLMM = class {
         const [lowerBinId2, upperBinId2] = getBinArrayLowerUpperBinId(lowerBinArrayIndex);
         const binArrayBins = [];
         for (let i = lowerBinId2.toNumber(); i <= upperBinId2.toNumber(); i++) {
-          const binId = new BN9(i);
-          const pricePerLamport = this.getPriceOfBinByBinId(binId.toNumber());
           binArrayBins.push({
             amountX: new BN9(0),
             amountY: new BN9(0),
@@ -11099,7 +11093,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,
@@ -11140,7 +11137,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,