@meteora-ag/dlmm 1.0.39-rc.27 → 1.0.39-rc.29

package/dist/index.d.ts

@@ -4932,6 +4932,7 @@ declare class DLMM {
      * @returns a Promise that resolves to an array of BinArrayAccount objects.
      */
     getBinArrays(): Promise<BinArrayAccount[]>;
+    getBinArraysWithLiquidity(): Promise<BinArray>;
     /**
      * The function `getBinArrayAroundActiveBin` retrieves a specified number of `BinArrayAccount`
      * objects from the blockchain, based on the active bin and its surrounding bin arrays.
@@ -5311,7 +5312,7 @@ declare class DLMM {
      * @returns {Promise<Transaction>}
      */
     syncWithMarketPrice(marketPrice: number, owner: PublicKey): Promise<Transaction>;
-    getMaxPrice(binArrays?: BinArrayAccount[]): Promise<string>;
+    getMaxPrice(binArrayAccount: BinArray): Promise<string>;
     /** Private static method */
     private static getBinArrays;
     private static getClaimableLMReward;
@@ -5357,7 +5358,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

@@ -7521,6 +7521,23 @@ var DLMM = class {
       }
     ]);
   }
+  async getBinArraysWithLiquidity() {
+    const binArrayIndex = findNextBinArrayIndexWithLiquidity(
+      false,
+      new (0, _anchor.BN)(this.lbPair.parameters.maxBinId),
+      this.lbPair,
+      _nullishCoalesce(_optionalChain([this, 'access', _54 => _54.binArrayBitmapExtension, 'optionalAccess', _55 => _55.account]), () => ( null))
+    );
+    const [binArrayPubkey] = deriveBinArray(
+      this.pubkey,
+      binArrayIndex,
+      this.program.programId
+    );
+    const binArrayAccount = await this.program.account.binArray.fetch(
+      binArrayPubkey
+    );
+    return binArrayAccount;
+  }
   /**
    * The function `getBinArrayAroundActiveBin` retrieves a specified number of `BinArrayAccount`
    * objects from the blockchain, based on the active bin and its surrounding bin arrays.
@@ -7539,7 +7556,7 @@ var DLMM = class {
         swapForY,
         new (0, _anchor.BN)(activeIdToLoop),
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _54 => _54.binArrayBitmapExtension, 'optionalAccess', _55 => _55.account]), () => ( null))
+        _nullishCoalesce(_optionalChain([this, 'access', _56 => _56.binArrayBitmapExtension, 'optionalAccess', _57 => _57.account]), () => ( null))
       );
       if (binArrayIndex === null)
         shouldStop = true;
@@ -8975,7 +8992,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _optionalChain([this, 'access', _56 => _56.binArrayBitmapExtension, 'optionalAccess', _57 => _57.account]),
+        _optionalChain([this, 'access', _58 => _58.binArrayBitmapExtension, 'optionalAccess', _59 => _59.account]),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -9082,7 +9099,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _58 => _58.binArrayBitmapExtension, 'optionalAccess', _59 => _59.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _60 => _60.binArrayBitmapExtension, 'optionalAccess', _61 => _61.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -9808,7 +9825,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _60 => _60.binArrayBitmapExtension, 'optionalAccess', _61 => _61.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _62 => _62.binArrayBitmapExtension, 'optionalAccess', _63 => _63.account]), () => ( null))
     );
     if (toBinArrayIndex === null)
       return true;
@@ -9845,7 +9862,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _62 => _62.binArrayBitmapExtension, 'optionalAccess', _63 => _63.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _64 => _64.binArrayBitmapExtension, 'optionalAccess', _65 => _65.account]), () => ( null))
     );
     const accountsToFetch = [];
     const [binArrayBitMapExtensionPubkey] = deriveBinArrayBitmapExtension(
@@ -9876,13 +9893,13 @@ var DLMM = class {
     let fromBinArray = null;
     let toBinArray = null;
     let binArrayBitmapExtension = null;
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _64 => _64[0]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _66 => _66[0]])) {
       binArrayBitmapExtension = binArrayBitMapExtensionPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _65 => _65[1]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _67 => _67[1]])) {
       fromBinArray = fromBinArrayPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _66 => _66[2]]) && !!toBinArrayIndex) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _68 => _68[2]]) && !!toBinArrayIndex) {
       toBinArray = toBinArrayPubkey;
     }
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
@@ -9898,28 +9915,12 @@ 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(binArrayAccount) {
+    const { bins } = binArrayAccount;
+    const lastBinWithLiquidityIndex = bins.findLastIndex(
+      ({ amountX }) => !amountX.isZero()
     );
-    let count = sortedBinArrays.length - 1;
-    let binPriceWithLastLiquidity;
-    while (count >= 0) {
-      const binArray = sortedBinArrays[count];
-      if (binArray) {
-        const { bins } = binArray.account;
-        if (bins.every(({ amountX }) => amountX.isZero())) {
-          count--;
-        } else {
-          const lastBinWithLiquidityIndex = bins.findLastIndex(
-            ({ amountX }) => !amountX.isZero()
-          );
-          binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex].price.toString();
-          count = -1;
-        }
-      }
-    }
+    const binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex].price.toString();
     return this.fromPricePerLamport(
       Number(binPriceWithLastLiquidity) / (2 ** 64 - 1)
     );
@@ -10520,7 +10521,7 @@ var DLMMError = class extends Error {
       const anchorError = _anchor.AnchorError.parse(
         JSON.parse(JSON.stringify(error)).logs
       );
-      if (_optionalChain([anchorError, 'optionalAccess', _67 => _67.program, 'access', _68 => _68.toBase58, 'call', _69 => _69()]) === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
+      if (_optionalChain([anchorError, 'optionalAccess', _69 => _69.program, 'access', _70 => _70.toBase58, 'call', _71 => _71()]) === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
         _errorCode = anchorError.error.errorCode.number;
         _errorName = anchorError.error.errorCode.code;
         _errorMessage = anchorError.error.errorMessage;