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

package/README.md

@@ -233,3 +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>`    |

package/dist/index.d.ts

@@ -1227,11 +1227,6 @@ type LbClmm = {
                     isMut: true;
                     isSigner: false;
                 },
-                {
-                    name: "feeOwner";
-                    isMut: false;
-                    isSigner: true;
-                },
                 {
                     name: "tokenXProgram";
                     isMut: false;
@@ -5316,7 +5311,7 @@ declare class DLMM {
      * @returns {Promise<Transaction>}
      */
     syncWithMarketPrice(marketPrice: number, owner: PublicKey): Promise<Transaction>;
-    getLastPrice(): Promise<string>;
+    getMaxPrice(binArrayAccounts: BinArrayAccount[]): Promise<string>;
     /** Private static method */
     private static getBinArrays;
     private static getClaimableLMReward;
@@ -5362,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

@@ -1231,11 +1231,6 @@ var IDL = {
           isMut: true,
           isSigner: false
         },
-        {
-          name: "feeOwner",
-          isMut: false,
-          isSigner: true
-        },
         {
           name: "tokenXProgram",
           isMut: false,
@@ -9087,10 +9082,9 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _optionalChain([this, 'access', _58 => _58.binArrayBitmapExtension, 'optionalAccess', _59 => _59.account]),
+        _nullishCoalesce(_optionalChain([this, 'access', _58 => _58.binArrayBitmapExtension, 'optionalAccess', _59 => _59.account]), () => ( null)),
         binArrays
       );
-      console.log("\u{1F680} ~ DLMM ~ binArrayAccountToSwap:", binArrayAccountToSwap);
       if (binArrayAccountToSwap == null) {
         throw new Error("Insufficient liquidity");
       }
@@ -9904,27 +9898,31 @@ 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(binArrayAccounts) {
+    const binArrays = binArrayAccounts || await this.getBinArrayForSwap(false);
+    const sortedBinArrays = binArrays.sort(
+      ({ account: { index: indexA } }, { account: { index: indexB } }) => indexA.toNumber() - indexB.toNumber()
+    );
+    let count = sortedBinArrays.length - 1;
+    let binPriceWithLastLiquidity;
+    while (count >= 0) {
+      const binArray = sortedBinArrays[count];
       if (binArray) {
-        const bins = binArray.account.bins;
-        if (bins[bins.length - 1].liquiditySupply.gt(new (0, _anchor.BN)(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 this.fromPricePerLamport(
+      Number(binPriceWithLastLiquidity) / (2 ** 64 - 1)
+    );
   }
   /** Private static method */
   static async getBinArrays(program, lbPairPubkey) {