@meteora-ag/dlmm 1.0.39-rc.16 → 1.0.39-rc.18

package/dist/index.d.ts

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

package/dist/index.js

@@ -9904,35 +9904,22 @@ var DLMM = class {
       lastValidBlockHeight
     }).add(syncWithMarketPriceTx);
   }
-  async getLastPrice(minPrice) {
-    const binArrays = await this.getBinArrays();
-    console.log(
-      "\u{1F680} ~ DLMM ~ getLastPrice ~ bins:",
-      binArrays.flatMap(
-        ({ account: { bins } }) => bins.map(({ amountX, amountY }) => ({
-          amountX: amountX.toString(),
-          amountY: amountY.toString()
-        }))
-      )
-    );
-    let count = 0;
+  async getMaxPrice(minPrice, binArrays) {
+    const _binArrays = binArrays || await this.getBinArrays();
+    let count = _binArrays.length - 1;
     let binPriceWithLastLiquidity = minPrice;
-    while (count <= binArrays.length - 1) {
-      const binArray = binArrays[count];
+    while (count >= 0) {
+      const binArray = _binArrays[count];
       if (binArray) {
         const bins = binArray.account.bins;
-        if (bins.every(({ amountX }) => !amountX.isZero())) {
+        if (bins.every(({ amountX }) => amountX.isZero())) {
           count--;
         } else {
-          const lastBinWithLiquidityIndex = bins.findIndex(
-            ({ liquiditySupply }) => liquiditySupply.isZero()
-          );
-          console.log(
-            bins[lastBinWithLiquidityIndex - 1].amountX.toString(),
-            bins[lastBinWithLiquidityIndex - 1].amountY.toString()
+          const lastBinWithLiquidityIndex = bins.findLastIndex(
+            ({ amountX }) => !amountX.isZero()
           );
-          binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex - 1].price.toString();
-          count = binArrays.length;
+          binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex].price.toString();
+          count = -1;
         }
       }
     }