@meteora-ag/dlmm 1.0.2-abcd12345.1 → 1.0.3

package/dist/index.js

@@ -6126,17 +6126,58 @@ var DLMM = class {
       this.pubkey,
       this.program.programId
     )[0];
-    const binArrayBitmapExtensionState = await this.program.account.binArrayBitmapExtension.fetchNullable(
-      binArrayBitmapExtensionPubkey
+    const [
+      lbPairAccountInfo,
+      binArrayBitmapExtensionAccountInfo,
+      reserveXAccountInfo,
+      reserveYAccountInfo
+    ] = await chunkedGetMultipleAccountInfos(this.program.provider.connection, [
+      this.pubkey,
+      binArrayBitmapExtensionPubkey,
+      this.lbPair.reserveX,
+      this.lbPair.reserveY
+    ]);
+    const lbPairState = this.program.coder.accounts.decode(
+      "lbPair",
+      lbPairAccountInfo.data
     );
-    if (binArrayBitmapExtensionState) {
-      this.binArrayBitmapExtension = {
-        account: binArrayBitmapExtensionState,
-        publicKey: binArrayBitmapExtensionPubkey
-      };
+    if (binArrayBitmapExtensionAccountInfo) {
+      const binArrayBitmapExtensionState = this.program.coder.accounts.decode(
+        "binArrayBitmapExtension",
+        binArrayBitmapExtensionAccountInfo.data
+      );
+      if (binArrayBitmapExtensionState) {
+        this.binArrayBitmapExtension = {
+          account: binArrayBitmapExtensionState,
+          publicKey: binArrayBitmapExtensionPubkey
+        };
+      }
     }
-    const newLbPair = await this.program.account.lbPair.fetch(this.pubkey);
-    this.lbPair = newLbPair;
+    const reserveXBalance = _spltoken.AccountLayout.decode(reserveXAccountInfo.data);
+    const reserveYBalance = _spltoken.AccountLayout.decode(reserveYAccountInfo.data);
+    const [tokenXDecimal, tokenYDecimal] = await Promise.all([
+      getTokenDecimals(
+        this.program.provider.connection,
+        lbPairState.tokenXMint
+      ),
+      getTokenDecimals(
+        this.program.provider.connection,
+        lbPairState.tokenYMint
+      )
+    ]);
+    this.tokenX = {
+      amount: reserveXBalance.amount,
+      decimal: tokenXDecimal,
+      publicKey: lbPairState.tokenXMint,
+      reserve: lbPairState.reserveX
+    };
+    this.tokenY = {
+      amount: reserveYBalance.amount,
+      decimal: tokenYDecimal,
+      publicKey: lbPairState.tokenYMint,
+      reserve: lbPairState.reserveY
+    };
+    this.lbPair = lbPairState;
   }
   /**
    * The function `getBinArrays` returns an array of `BinArrayAccount` objects
@@ -7145,7 +7186,7 @@ var DLMM = class {
     const maxBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(maxBinId));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
     const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
-    const removeLiquidityTx = await this.program.methods.removeAllLiquidity().accounts({
+    const removeLiquidityTx = await this.program.methods.removeLiquidity(binLiquidityReduction).accounts({
       position,
       lbPair,
       userTokenX,
@@ -7733,10 +7774,6 @@ var DLMM = class {
       liquidityShares: posShares,
       lastUpdatedAt
     } = positionAccount;
-    console.log(
-      "\u{1F680} ~ DLMM ~ posShares:",
-      posShares.map((a) => a.toString())
-    );
     const bins = this.getBinsBetweenLowerAndUpperBound(
       lbPair,
       lowerBinId,
@@ -7754,16 +7791,7 @@ var DLMM = class {
     let totalXAmount = new (0, _decimaljs2.default)(0);
     let totalYAmount = new (0, _decimaljs2.default)(0);
     bins.forEach((bin, idx) => {
-      console.log(
-        "\u{1F680} ~ DLMM ~ bins.forEach ~ bin:",
-        bin.xAmount.toString(),
-        bin.yAmount.toString()
-      );
       const binSupply = new (0, _decimaljs2.default)(bin.supply.toString());
-      console.log(
-        "\u{1F680} ~ DLMM ~ bins.forEach ~ binSupply:",
-        binSupply.toString()
-      );
       let posShare;
       if (bin.version === 1 && version === 0 /* V1 */) {
         posShare = new (0, _decimaljs2.default)(posShares[idx].shln(64).toString());
@@ -7771,15 +7799,7 @@ var DLMM = class {
         posShare = new (0, _decimaljs2.default)(posShares[idx].toString());
       }
       const positionXAmount = binSupply.eq(new (0, _decimaljs2.default)("0")) ? new (0, _decimaljs2.default)("0") : posShare.mul(bin.xAmount.toString()).div(binSupply).floor();
-      console.log(
-        "\u{1F680} ~ DLMM ~ bins.forEach ~ positionXAmount:",
-        positionXAmount.toString()
-      );
       const positionYAmount = binSupply.eq(new (0, _decimaljs2.default)("0")) ? new (0, _decimaljs2.default)("0") : posShare.mul(bin.yAmount.toString()).div(binSupply).floor();
-      console.log(
-        "\u{1F680} ~ DLMM ~ bins.forEach ~ positionYAmount:",
-        positionYAmount.toString()
-      );
       totalXAmount = totalXAmount.add(positionXAmount);
       totalYAmount = totalYAmount.add(positionYAmount);
       positionData.push({