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

package/dist/index.d.ts

@@ -5311,7 +5311,7 @@ declare class DLMM {
      * @returns {Promise<Transaction>}
      */
     syncWithMarketPrice(marketPrice: number, owner: PublicKey): Promise<Transaction>;
-    getMaxPrice(binArrayAccount: BinArray): Promise<string>;
+    getMaxPrice(binArrayAccounts: BinArrayAccount[]): Promise<string>;
     /** Private static method */
     private static getBinArrays;
     private static getClaimableLMReward;

package/dist/index.js

@@ -9898,12 +9898,28 @@ var DLMM = class {
       lastValidBlockHeight
     }).add(syncWithMarketPriceTx);
   }
-  async getMaxPrice(binArrayAccount) {
-    const { bins } = binArrayAccount;
-    const lastBinWithLiquidityIndex = bins.findLastIndex(
-      ({ amountX }) => !amountX.isZero()
+  async getMaxPrice(binArrayAccounts) {
+    const binArrays = binArrayAccounts || await this.getBinArrayForSwap(false);
+    const sortedBinArrays = binArrays.sort(
+      ({ account: { index: indexA } }, { account: { index: indexB } }) => indexA.toNumber() - indexB.toNumber()
     );
-    const binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex].price.toString();
+    let count = sortedBinArrays.length - 1;
+    let binPriceWithLastLiquidity;
+    while (count >= 0) {
+      const binArray = sortedBinArrays[count];
+      if (binArray) {
+        const bins = binArray.account.bins.reverse();
+        if (bins.every(({ amountX }) => amountX.isZero())) {
+          count--;
+        } else {
+          const lastBinWithLiquidityIndex = bins.findLastIndex(
+            ({ amountX }) => !amountX.isZero()
+          );
+          binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex].price.toString();
+          count = -1;
+        }
+      }
+    }
     return this.fromPricePerLamport(
       Number(binPriceWithLastLiquidity) / (2 ** 64 - 1)
     );