@meteora-ag/dlmm 1.0.39-rc.10 → 1.0.39-rc.12

package/dist/index.mjs

@@ -9906,23 +9906,30 @@ var DLMM = class {
   }
   async getLastPrice(minPrice) {
     const binArrays = await this.getBinArrays();
-    let count = 0;
+    let count = binArrays.length - 1;
     let binPriceWithLastLiquidity = minPrice;
-    while (count <= binArrays.length - 1) {
+    while (count >= 0) {
       const binArray = binArrays[count];
       if (binArray) {
         const bins = binArray.account.bins;
-        if (bins[bins.length - 1].liquiditySupply.gt(new BN9(0))) {
-          count++;
+        console.log(
+          "\u{1F680} ~ DLMM ~ getLastPrice ~ bins:",
+          bins.map(({ amountX, amountY }) => ({
+            amountX: amountX.toString(),
+            amountY: amountY.toString()
+          }))
+        );
+        if (bins.every(({ liquiditySupply }) => liquiditySupply.isZero())) {
+          count--;
         } else {
-          const lastBinWithLiquidityIndex = bins.findIndex(
-            ({ liquiditySupply }) => liquiditySupply.isZero()
+          const lastBinWithLiquidityIndex = bins.findLastIndex(
+            ({ liquiditySupply }) => !liquiditySupply.isZero()
           );
           console.log(
-            bins[lastBinWithLiquidityIndex - 1].amountX.toString(),
-            bins[lastBinWithLiquidityIndex - 1].amountY.toString()
+            bins[lastBinWithLiquidityIndex].amountX.toString(),
+            bins[lastBinWithLiquidityIndex].amountY.toString()
           );
-          binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex - 1].price.toString();
+          binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex].price.toString();
           count = binArrays.length;
         }
       }