@meteora-ag/dlmm 1.0.39-rc.1 → 1.0.39-rc.11

package/dist/index.d.ts

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

package/dist/index.js

@@ -9090,6 +9090,7 @@ var DLMM = class {
         _optionalChain([this, 'access', _58 => _58.binArrayBitmapExtension, 'optionalAccess', _59 => _59.account]),
         binArrays
       );
+      console.log("\u{1F680} ~ DLMM ~ binArrayAccountToSwap:", binArrayAccountToSwap);
       if (binArrayAccountToSwap == null) {
         throw new Error("Insufficient liquidity");
       }
@@ -9903,29 +9904,37 @@ var DLMM = class {
       lastValidBlockHeight
     }).add(syncWithMarketPriceTx);
   }
-  async getLastPrice() {
-    const { pricePerToken } = await this.getActiveBin();
+  async getLastPrice(minPrice) {
     const binArrays = await this.getBinArrays();
     let count = 0;
-    let binPriceWithLastLiquidity = pricePerToken;
+    let binPriceWithLastLiquidity = minPrice;
     while (count <= binArrays.length - 1) {
       const binArray = binArrays[count];
       if (binArray) {
         const bins = binArray.account.bins;
+        console.log(
+          "\u{1F680} ~ DLMM ~ getLastPrice ~ bins:",
+          bins.map(({ amountX, amountY }) => ({
+            amountX: amountX.toString(),
+            amountY: amountY.toString()
+          }))
+        );
         if (bins[bins.length - 1].liquiditySupply.gt(new (0, _anchor.BN)(0))) {
           count++;
         } else {
           const lastBinWithLiquidityIndex = bins.findIndex(
             ({ liquiditySupply }) => liquiditySupply.isZero()
           );
-          binPriceWithLastLiquidity = this.fromPricePerLamport(
-            bins[lastBinWithLiquidityIndex - 1].price.toNumber()
+          console.log(
+            bins[lastBinWithLiquidityIndex - 1].amountX.toString(),
+            bins[lastBinWithLiquidityIndex - 1].amountY.toString()
           );
+          binPriceWithLastLiquidity = bins[lastBinWithLiquidityIndex - 1].price.toString();
           count = binArrays.length;
         }
       }
     }
-    return binPriceWithLastLiquidity;
+    return Number(binPriceWithLastLiquidity) / (2 ** 64 - 1);
   }
   /** Private static method */
   static async getBinArrays(program, lbPairPubkey) {