@meteora-ag/dlmm 1.0.39-rc.2 → 1.0.39-rc.21

package/dist/index.mjs

@@ -9087,7 +9087,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        this.binArrayBitmapExtension?.account,
+        this.binArrayBitmapExtension?.account ?? null,
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -9903,27 +9903,29 @@ var DLMM = class {
       lastValidBlockHeight
     }).add(syncWithMarketPriceTx);
   }
-  async getLastPrice() {
-    const { price } = await this.getActiveBin();
-    const binArrays = await this.getBinArrays();
-    let count = 0;
-    let binPriceWithLastLiquidity = price;
-    while (count <= binArrays.length - 1) {
-      const binArray = binArrays[count];
+  async getMaxPrice(minPrice, binArrays) {
+    const _binArrays = binArrays || await this.getBinArrays();
+    const sortedBinArrays = _binArrays.sort(
+      ({ account: { index: indexA } }, { account: { index: indexB } }) => indexA.toNumber() - indexB.toNumber()
+    );
+    let count = sortedBinArrays.length - 1;
+    let binPriceWithLastLiquidity = minPrice;
+    while (count >= 0) {
+      const binArray = sortedBinArrays[count];
       if (binArray) {
-        const bins = binArray.account.bins;
-        if (bins[bins.length - 1].liquiditySupply.gt(new BN9(0))) {
-          count++;
+        const bins = binArray.account.bins.reverse();
+        if (bins.every(({ amountX }) => amountX.isZero())) {
+          count--;
         } else {
-          const lastBinWithLiquidityIndex = bins.findIndex(
-            ({ liquiditySupply }) => liquiditySupply.isZero()
+          const lastBinWithLiquidityIndex = bins.findLastIndex(
+            ({ amountX }) => !amountX.isZero()
           );
-          binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex - 1].price.toString();
-          count = binArrays.length;
+          binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex].price.toString();
+          count = -1;
         }
       }
     }
-    return binPriceWithLastLiquidity;
+    return Number(binPriceWithLastLiquidity) / (2 ** 64 - 1);
   }
   /** Private static method */
   static async getBinArrays(program, lbPairPubkey) {