@meteora-ag/dlmm 1.0.41-rc.0 → 1.0.41-rc.1

package/README.md

@@ -233,4 +233,4 @@ try {
 | `claimAllRewards`                             | Claim swap fees and LM rewards for multiple positions owned by a specific owner                                               | `Promise<Transaction[]>`                                                                           |
 | `syncWithMarketPrice`                         | Sync the pool current active bin to match nearest market price bin                                                            | `Promise<Transaction>`                                                                             |
 | `getPairPubkeyIfExists`                       | Get existing pool address given parameter, if not return null                                                                 | `Promise<PublicKey                                                                       \| null>` |
-| `getMaxPrice`                                 | Get max price of the last bin that has liquidity on the ask side                                                              | `Promise<string                                                                       \| null>`    |
+| `getMaxPriceInBinArrays`                      | Get max price of the last bin that has liquidity given bin arrays                                                             | `Promise<string                                                                       \| null>`    |

package/dist/index.d.ts

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

package/dist/index.js

@@ -5838,15 +5838,16 @@ function extensionBitmapRange() {
 }
 function findSetBit(startIndex, endIndex, binArrayBitmapExtension) {
   const getBinArrayOffset = (binArrayIndex) => {
-    return binArrayIndex > 0 ? binArrayIndex % BIN_ARRAY_BITMAP_SIZE.toNumber() - 1 : Math.abs(binArrayIndex - 1) % BIN_ARRAY_BITMAP_SIZE.toNumber();
+    return binArrayIndex.gt(new (0, _anchor.BN)(0)) ? binArrayIndex.mod(BIN_ARRAY_BITMAP_SIZE) : binArrayIndex.add(new (0, _anchor.BN)(1)).neg().mod(BIN_ARRAY_BITMAP_SIZE);
   };
   const getBitmapOffset = (binArrayIndex) => {
-    return binArrayIndex > 0 ? binArrayIndex / BIN_ARRAY_BITMAP_SIZE.toNumber() - 1 : -(binArrayIndex + 1) / BIN_ARRAY_BITMAP_SIZE.toNumber() - 1;
+    return binArrayIndex.gt(new (0, _anchor.BN)(0)) ? binArrayIndex.div(BIN_ARRAY_BITMAP_SIZE).sub(new (0, _anchor.BN)(1)) : binArrayIndex.add(new (0, _anchor.BN)(1)).neg().div(BIN_ARRAY_BITMAP_SIZE).sub(new (0, _anchor.BN)(1));
   };
+  console.log("here", binArrayBitmapExtension.positiveBinArrayBitmap);
   if (startIndex <= endIndex) {
     for (let i = startIndex; i <= endIndex; i++) {
-      const binArrayOffset = getBinArrayOffset(i);
-      const bitmapOffset = getBitmapOffset(i);
+      const binArrayOffset = getBinArrayOffset(new (0, _anchor.BN)(i)).toNumber();
+      const bitmapOffset = getBitmapOffset(new (0, _anchor.BN)(i)).toNumber();
       const bitmapChunks = i > 0 ? binArrayBitmapExtension.positiveBinArrayBitmap[bitmapOffset] : binArrayBitmapExtension.negativeBinArrayBitmap[bitmapOffset];
       const bitmap = buildBitmapFromU64Arrays(bitmapChunks, 1 /* U512 */);
       if (bitmap.testn(binArrayOffset)) {
@@ -5855,8 +5856,8 @@ function findSetBit(startIndex, endIndex, binArrayBitmapExtension) {
     }
   } else {
     for (let i = startIndex; i >= endIndex; i--) {
-      const binArrayOffset = getBinArrayOffset(i);
-      const bitmapOffset = getBitmapOffset(i);
+      const binArrayOffset = getBinArrayOffset(new (0, _anchor.BN)(i)).toNumber();
+      const bitmapOffset = getBitmapOffset(new (0, _anchor.BN)(i)).toNumber();
       const bitmapChunks = i > 0 ? binArrayBitmapExtension.positiveBinArrayBitmap[bitmapOffset] : binArrayBitmapExtension.negativeBinArrayBitmap[bitmapOffset];
       const bitmap = buildBitmapFromU64Arrays(bitmapChunks, 1 /* U512 */);
       if (bitmap.testn(binArrayOffset)) {
@@ -9898,9 +9899,8 @@ var DLMM = class {
       lastValidBlockHeight
     }).add(syncWithMarketPriceTx);
   }
-  async getMaxPrice(binArrayAccounts) {
-    const binArrays = binArrayAccounts || await this.getBinArrayForSwap(false);
-    const sortedBinArrays = binArrays.sort(
+  async getMaxPriceInBinArrays(binArrayAccounts) {
+    const sortedBinArrays = binArrayAccounts.sort(
       ({ account: { index: indexA } }, { account: { index: indexB } }) => indexA.toNumber() - indexB.toNumber()
     );
     let count = sortedBinArrays.length - 1;