@meteora-ag/dlmm 1.0.39-rc.26 → 1.0.39-rc.28

package/dist/index.d.ts

@@ -5311,7 +5311,7 @@ declare class DLMM {
      * @returns {Promise<Transaction>}
      */
     syncWithMarketPrice(marketPrice: number, owner: PublicKey): Promise<Transaction>;
-    getMaxPrice(binArrays?: BinArrayAccount[]): Promise<string>;
+    getMaxPrice(): Promise<string>;
     /** Private static method */
     private static getBinArrays;
     private static getClaimableLMReward;
@@ -5357,7 +5357,7 @@ declare function getBinArrayLowerUpperBinId(binArrayIndex: BN): BN[];
 declare function isBinIdWithinBinArray(activeId: BN, binArrayIndex: BN): boolean;
 declare function getBinFromBinArray(binId: number, binArray: BinArray): Bin;
 declare function findNextBinArrayIndexWithLiquidity(swapForY: boolean, activeId: BN, lbPairState: LbPair, binArrayBitmapExtension: BinArrayBitmapExtension | null): BN | null;
-declare function findNextBinArrayWithLiquidity(swapForY: boolean, activeBinId: BN, lbPairState: LbPair, binArrayBitmapExtension: BinArrayBitmapExtension, binArrays: BinArrayAccount[]): BinArrayAccount | null;
+declare function findNextBinArrayWithLiquidity(swapForY: boolean, activeBinId: BN, lbPairState: LbPair, binArrayBitmapExtension: BinArrayBitmapExtension | null, binArrays: BinArrayAccount[]): BinArrayAccount | null;
 
 declare function getPriceOfBinByBinId(binId: number, binStep: number): Decimal;
 /** private */

package/dist/index.js

@@ -9898,39 +9898,26 @@ var DLMM = class {
       lastValidBlockHeight
     }).add(syncWithMarketPriceTx);
   }
-  async getMaxPrice(binArrays) {
-    const _binArrays = binArrays || await this.getBinArrays();
-    const sortedBinArrays = _binArrays.sort(
-      ({ account: { index: indexA } }, { account: { index: indexB } }) => indexA.toNumber() - indexB.toNumber()
+  async getMaxPrice() {
+    const binArrayIndex = findNextBinArrayIndexWithLiquidity(
+      false,
+      new (0, _anchor.BN)(this.lbPair.parameters.maxBinId),
+      this.lbPair,
+      _nullishCoalesce(_optionalChain([this, 'access', _67 => _67.binArrayBitmapExtension, 'optionalAccess', _68 => _68.account]), () => ( null))
     );
-    console.log(
-      "\u{1F680} ~ binArrays:",
-      _optionalChain([sortedBinArrays, 'optionalAccess', _67 => _67.flatMap, 'call', _68 => _68(
-        ({ account: { bins } }) => bins.map(({ amountX, amountY, price }) => ({
-          amountX: amountX.toString(),
-          amountY: amountY.toString(),
-          price: this.fromPricePerLamport(Number(price) / (2 ** 64 - 1))
-        }))
-      )])
+    const [binArrayPubkey] = deriveBinArray(
+      this.pubkey,
+      binArrayIndex,
+      this.program.programId
     );
-    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;
-        }
-      }
-    }
-    console.log(binPriceWithLastLiquidity);
+    const binArrayAccount = await this.program.account.binArray.fetch(
+      binArrayPubkey
+    );
+    const { bins } = binArrayAccount;
+    const lastBinWithLiquidityIndex = bins.findLastIndex(
+      ({ amountX }) => !amountX.isZero()
+    );
+    const binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex].price.toString();
     return this.fromPricePerLamport(
       Number(binPriceWithLastLiquidity) / (2 ** 64 - 1)
     );