@meteora-ag/dlmm 1.3.6-rc.0 → 1.3.6

package/dist/index.js

@@ -8108,15 +8108,13 @@ var DLMM = class {
     for (let i = 0; i < binArrayPubkeyArrayV2.length; i++) {
       const binArrayPubkey = binArrayPubkeyArrayV2[i];
       const binArrayAccInfoBufferV2 = binArraysAccInfo[i];
-      if (!binArrayAccInfoBufferV2)
-        throw new Error(
-          `Bin Array account ${binArrayPubkey.toBase58()} not found`
+      if (binArrayAccInfoBufferV2) {
+        const binArrayAccInfo = program.coder.accounts.decode(
+          "binArray",
+          binArrayAccInfoBufferV2.data
         );
-      const binArrayAccInfo = program.coder.accounts.decode(
-        "binArray",
-        binArrayAccInfoBufferV2.data
-      );
-      positionBinArraysMapV2.set(binArrayPubkey.toBase58(), binArrayAccInfo);
+        positionBinArraysMapV2.set(binArrayPubkey.toBase58(), binArrayAccInfo);
+      }
     }
     const lbPairArraysMapV2 = /* @__PURE__ */ new Map();
     for (let i = binArrayPubkeyArrayV2.length; i < binArraysAccInfo.length; i++) {
@@ -8213,7 +8211,7 @@ var DLMM = class {
         amount: reserveYBalance,
         decimal: quoteTokenDecimal
       };
-      const positionData = await DLMM.processPosition(
+      const positionData = !!lowerBinArray && !!upperBinArray ? await DLMM.processPosition(
         program,
         1 /* V2 */,
         lbPairAcc,
@@ -8224,7 +8222,21 @@ var DLMM = class {
         lowerBinArray,
         upperBinArray,
         feeOwner
-      );
+      ) : {
+        totalXAmount: "0",
+        totalYAmount: "0",
+        positionBinData: [],
+        lastUpdatedAt: new (0, _anchor.BN)(0),
+        upperBinId,
+        lowerBinId,
+        feeX: new (0, _anchor.BN)(0),
+        feeY: new (0, _anchor.BN)(0),
+        rewardOne: new (0, _anchor.BN)(0),
+        rewardTwo: new (0, _anchor.BN)(0),
+        feeOwner,
+        totalClaimedFeeXAmount: new (0, _anchor.BN)(0),
+        totalClaimedFeeYAmount: new (0, _anchor.BN)(0)
+      };
       if (positionData) {
         positionsMap.set(lbPair.toBase58(), {
           publicKey: lbPair,
@@ -9725,35 +9737,8 @@ var DLMM = class {
   }) {
     const lowerBinIdToRemove = Math.min(...binIds);
     const upperBinIdToRemove = Math.max(...binIds);
-    const [lowerBinArrayPubKey] = deriveBinArray(this.pubkey, binIdToBinArrayIndex(new (0, _anchor.BN)(binIds[0])), this.program.programId);
-    const [upperBinArrayPubKey] = deriveBinArray(this.pubkey, binIdToBinArrayIndex(new (0, _anchor.BN)(binIds[binIds.length - 1])), this.program.programId);
-    const [positionAccInfo, lbPairAccInfo, upperBinArrayInfoAcc, lowerBinArrayInfoAcc] = await this.program.provider.connection.getMultipleAccountsInfo([
-      position,
-      this.pubkey,
-      upperBinArrayPubKey,
-      lowerBinArrayPubKey
-    ]);
-    const { lbPair, owner, feeOwner, upperBinId: positionUpperBinId, lowerBinId: positionLowerBinId } = this.program.coder.accounts.decode(
-      "positionV2",
-      positionAccInfo.data
-    );
-    const { reserveX, reserveY, tokenXMint, tokenYMint } = this.program.coder.accounts.decode(
-      "lbPair",
-      lbPairAccInfo.data
-    );
-    const upperBinArray = this.program.coder.accounts.decode("binArray", upperBinArrayInfoAcc.data);
-    const lowerBinArray = this.program.coder.accounts.decode("binArray", lowerBinArrayInfoAcc.data);
-    const bins = await this.getBins(
-      this.pubkey,
-      positionLowerBinId,
-      positionUpperBinId,
-      this.tokenX.decimal,
-      this.tokenY.decimal,
-      lowerBinArray,
-      upperBinArray
-    );
-    const positionHasNoLiquidity = bins.every(({ supply }) => supply.isZero());
-    if (positionHasNoLiquidity) {
+    const { lbPair, owner, feeOwner, lowerBinId: positionLowerBinId, liquidityShares } = await this.program.account.positionV2.fetch(position);
+    if (liquidityShares.every((share) => share.isZero())) {
       throw new Error("No liquidity to remove");
     }
     const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(positionLowerBinId));
@@ -9816,8 +9801,8 @@ var DLMM = class {
         lbPair: this.pubkey,
         sender: user,
         position,
-        reserveX,
-        reserveY,
+        reserveX: this.lbPair.reserveX,
+        reserveY: this.lbPair.reserveY,
         tokenProgram: _spltoken.TOKEN_PROGRAM_ID,
         tokenXMint: this.tokenX.publicKey,
         tokenYMint: this.tokenY.publicKey,
@@ -9879,10 +9864,10 @@ var DLMM = class {
       lbPair,
       userTokenX,
       userTokenY,
-      reserveX,
-      reserveY,
-      tokenXMint,
-      tokenYMint,
+      reserveX: this.lbPair.reserveX,
+      reserveY: this.lbPair.reserveY,
+      tokenXMint: this.tokenX.publicKey,
+      tokenYMint: this.tokenY.publicKey,
       binArrayLower,
       binArrayUpper,
       binArrayBitmapExtension,