@meteora-ag/dlmm 1.3.5 → 1.3.6-rc.1

package/dist/index.mjs

@@ -8066,49 +8066,14 @@ var DLMM = class {
       opt?.programId ?? LBCLMM_PROGRAM_IDS[cluster],
       provider
     );
-    const [positions, positionsV2] = await Promise.all([
-      program.account.position.all([
-        {
-          memcmp: {
-            bytes: bs58.encode(userPubKey.toBuffer()),
-            offset: 8 + 32
-          }
-        }
-      ]),
-      program.account.positionV2.all([
-        {
-          memcmp: {
-            bytes: bs58.encode(userPubKey.toBuffer()),
-            offset: 8 + 32
-          }
+    const positionsV2 = await program.account.positionV2.all([
+      {
+        memcmp: {
+          bytes: bs58.encode(userPubKey.toBuffer()),
+          offset: 8 + 32
         }
-      ])
+      }
     ]);
-    const binArrayPubkeySet = /* @__PURE__ */ new Set();
-    const lbPairSet = /* @__PURE__ */ new Set();
-    positions.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
-      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
-      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
-      const [lowerBinArrayPubKey] = deriveBinArray(
-        lbPair,
-        lowerBinArrayIndex,
-        program.programId
-      );
-      const [upperBinArrayPubKey] = deriveBinArray(
-        lbPair,
-        upperBinArrayIndex,
-        program.programId
-      );
-      binArrayPubkeySet.add(lowerBinArrayPubKey.toBase58());
-      binArrayPubkeySet.add(upperBinArrayPubKey.toBase58());
-      lbPairSet.add(lbPair.toBase58());
-    });
-    const binArrayPubkeyArray = Array.from(binArrayPubkeySet).map(
-      (pubkey) => new PublicKey6(pubkey)
-    );
-    const lbPairArray = Array.from(lbPairSet).map(
-      (pubkey) => new PublicKey6(pubkey)
-    );
     const binArrayPubkeySetV2 = /* @__PURE__ */ new Set();
     const lbPairSetV2 = /* @__PURE__ */ new Set();
     positionsV2.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
@@ -8136,60 +8101,24 @@ var DLMM = class {
     );
     const [clockAccInfo, ...binArraysAccInfo] = await chunkedGetMultipleAccountInfos(connection, [
       SYSVAR_CLOCK_PUBKEY,
-      ...binArrayPubkeyArray,
-      ...lbPairArray,
       ...binArrayPubkeyArrayV2,
       ...lbPairArrayV2
     ]);
-    const positionBinArraysMap = /* @__PURE__ */ new Map();
-    for (let i = 0; i < binArrayPubkeyArray.length; i++) {
-      const binArrayPubkey = binArrayPubkeyArray[i];
-      const binArrayAccInfoBuffer = binArraysAccInfo[i];
-      if (!binArrayAccInfoBuffer)
-        throw new Error(
-          `Bin Array account ${binArrayPubkey.toBase58()} not found`
-        );
-      const binArrayAccInfo = program.coder.accounts.decode(
-        "binArray",
-        binArrayAccInfoBuffer.data
-      );
-      positionBinArraysMap.set(binArrayPubkey.toBase58(), binArrayAccInfo);
-    }
-    const lbPairArraysMap = /* @__PURE__ */ new Map();
-    for (let i = binArrayPubkeyArray.length; i < binArrayPubkeyArray.length + lbPairArray.length; i++) {
-      const lbPairPubkey = lbPairArray[i - binArrayPubkeyArray.length];
-      const lbPairAccInfoBuffer = binArraysAccInfo[i];
-      if (!lbPairAccInfoBuffer)
-        throw new Error(`LB Pair account ${lbPairPubkey.toBase58()} not found`);
-      const lbPairAccInfo = program.coder.accounts.decode(
-        "lbPair",
-        lbPairAccInfoBuffer.data
-      );
-      lbPairArraysMap.set(lbPairPubkey.toBase58(), lbPairAccInfo);
-    }
-    const reservePublicKeys = Array.from(lbPairArraysMap.values()).map(({ reserveX, reserveY, tokenXMint, tokenYMint }) => [
-      reserveX,
-      reserveY,
-      tokenXMint,
-      tokenYMint
-    ]).flat();
     const positionBinArraysMapV2 = /* @__PURE__ */ new Map();
-    for (let i = binArrayPubkeyArray.length + lbPairArray.length; i < binArrayPubkeyArray.length + lbPairArray.length + binArrayPubkeyArrayV2.length; i++) {
-      const binArrayPubkey = binArrayPubkeyArrayV2[i - (binArrayPubkeyArray.length + lbPairArray.length)];
+    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 = binArrayPubkeyArray.length + lbPairArray.length + binArrayPubkeyArrayV2.length; i < binArraysAccInfo.length; i++) {
-      const lbPairPubkey = lbPairArrayV2[i - (binArrayPubkeyArray.length + lbPairArray.length + binArrayPubkeyArrayV2.length)];
+    for (let i = binArrayPubkeyArrayV2.length; i < binArraysAccInfo.length; i++) {
+      const lbPairPubkey = lbPairArrayV2[i - binArrayPubkeyArrayV2.length];
       const lbPairAccInfoBufferV2 = binArraysAccInfo[i];
       if (!lbPairAccInfoBufferV2)
         throw new Error(`LB Pair account ${lbPairPubkey.toBase58()} not found`);
@@ -8207,43 +8136,14 @@ var DLMM = class {
     ]).flat();
     const reserveAccountsInfo = await chunkedGetMultipleAccountInfos(
       program.provider.connection,
-      [...reservePublicKeys, ...reservePublicKeysV2]
+      reservePublicKeysV2
     );
-    const lbPairReserveMap = /* @__PURE__ */ new Map();
-    const lbPairMintMap = /* @__PURE__ */ new Map();
-    lbPairArray.forEach((lbPair, idx) => {
-      const index = idx * 4;
-      const reserveAccBufferX = reserveAccountsInfo[index];
-      const reserveAccBufferY = reserveAccountsInfo[index + 1];
-      if (!reserveAccBufferX || !reserveAccBufferY)
-        throw new Error(
-          `Reserve account for LB Pair ${lbPair.toBase58()} not found`
-        );
-      const reserveAccX = AccountLayout.decode(reserveAccBufferX.data);
-      const reserveAccY = AccountLayout.decode(reserveAccBufferY.data);
-      lbPairReserveMap.set(lbPair.toBase58(), {
-        reserveX: reserveAccX.amount,
-        reserveY: reserveAccY.amount
-      });
-      const mintXBuffer = reserveAccountsInfo[index + 2];
-      const mintYBuffer = reserveAccountsInfo[index + 3];
-      if (!mintXBuffer || !mintYBuffer)
-        throw new Error(
-          `Mint account for LB Pair ${lbPair.toBase58()} not found`
-        );
-      const mintX = MintLayout.decode(mintXBuffer.data);
-      const mintY = MintLayout.decode(mintYBuffer.data);
-      lbPairMintMap.set(lbPair.toBase58(), {
-        mintXDecimal: mintX.decimals,
-        mintYDecimal: mintY.decimals
-      });
-    });
     const lbPairReserveMapV2 = /* @__PURE__ */ new Map();
     const lbPairMintMapV2 = /* @__PURE__ */ new Map();
     lbPairArrayV2.forEach((lbPair, idx) => {
       const index = idx * 4;
-      const reserveAccBufferXV2 = reserveAccountsInfo[reservePublicKeys.length + index];
-      const reserveAccBufferYV2 = reserveAccountsInfo[reservePublicKeys.length + index + 1];
+      const reserveAccBufferXV2 = reserveAccountsInfo[index];
+      const reserveAccBufferYV2 = reserveAccountsInfo[index + 1];
       if (!reserveAccBufferXV2 || !reserveAccBufferYV2)
         throw new Error(
           `Reserve account for LB Pair ${lbPair.toBase58()} not found`
@@ -8254,8 +8154,8 @@ var DLMM = class {
         reserveX: reserveAccX.amount,
         reserveY: reserveAccY.amount
       });
-      const mintXBufferV2 = reserveAccountsInfo[reservePublicKeys.length + index + 2];
-      const mintYBufferV2 = reserveAccountsInfo[reservePublicKeys.length + index + 3];
+      const mintXBufferV2 = reserveAccountsInfo[index + 2];
+      const mintYBufferV2 = reserveAccountsInfo[index + 3];
       if (!mintXBufferV2 || !mintYBufferV2)
         throw new Error(
           `Mint account for LB Pair ${lbPair.toBase58()} not found`
@@ -8271,74 +8171,6 @@ var DLMM = class {
       clockAccInfo.data.readBigInt64LE(32).toString()
     ).toNumber();
     const positionsMap = /* @__PURE__ */ new Map();
-    for (let position of positions) {
-      const { account, publicKey: positionPubKey } = position;
-      const { upperBinId, lowerBinId, lbPair } = account;
-      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
-      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
-      const [lowerBinArrayPubKey] = deriveBinArray(
-        lbPair,
-        lowerBinArrayIndex,
-        program.programId
-      );
-      const [upperBinArrayPubKey] = deriveBinArray(
-        lbPair,
-        upperBinArrayIndex,
-        program.programId
-      );
-      const lowerBinArray = positionBinArraysMap.get(
-        lowerBinArrayPubKey.toBase58()
-      );
-      const upperBinArray = positionBinArraysMap.get(
-        upperBinArrayPubKey.toBase58()
-      );
-      const lbPairAcc = lbPairArraysMap.get(lbPair.toBase58());
-      const { mintXDecimal, mintYDecimal } = lbPairMintMap.get(
-        lbPair.toBase58()
-      );
-      const reserveXBalance = lbPairReserveMap.get(lbPair.toBase58())?.reserveX ?? BigInt(0);
-      const reserveYBalance = lbPairReserveMap.get(lbPair.toBase58())?.reserveY ?? BigInt(0);
-      const tokenX = {
-        publicKey: lbPairAcc.tokenXMint,
-        reserve: lbPairAcc.reserveX,
-        amount: reserveXBalance,
-        decimal: mintXDecimal
-      };
-      const tokenY = {
-        publicKey: lbPairAcc.tokenYMint,
-        reserve: lbPairAcc.reserveY,
-        amount: reserveYBalance,
-        decimal: mintYDecimal
-      };
-      const positionData = await DLMM.processPosition(
-        program,
-        0 /* V1 */,
-        lbPairAcc,
-        onChainTimestamp,
-        account,
-        mintXDecimal,
-        mintYDecimal,
-        lowerBinArray,
-        upperBinArray,
-        PublicKey6.default
-      );
-      if (positionData) {
-        positionsMap.set(lbPair.toBase58(), {
-          publicKey: lbPair,
-          lbPair: lbPairAcc,
-          tokenX,
-          tokenY,
-          lbPairPositionsData: [
-            ...positionsMap.get(lbPair.toBase58())?.lbPairPositionsData ?? [],
-            {
-              publicKey: positionPubKey,
-              positionData,
-              version: 0 /* V1 */
-            }
-          ]
-        });
-      }
-    }
     for (let position of positionsV2) {
       const { account, publicKey: positionPubKey } = position;
       const { upperBinId, lowerBinId, lbPair, feeOwner } = account;
@@ -8379,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,
@@ -8390,7 +8222,21 @@ var DLMM = class {
         lowerBinArray,
         upperBinArray,
         feeOwner
-      );
+      ) : {
+        totalXAmount: "0",
+        totalYAmount: "0",
+        positionBinData: [],
+        lastUpdatedAt: new BN10(0),
+        upperBinId,
+        lowerBinId,
+        feeX: new BN10(0),
+        feeY: new BN10(0),
+        rewardOne: new BN10(0),
+        rewardTwo: new BN10(0),
+        feeOwner,
+        totalClaimedFeeXAmount: new BN10(0),
+        totalClaimedFeeYAmount: new BN10(0)
+      };
       if (positionData) {
         positionsMap.set(lbPair.toBase58(), {
           publicKey: lbPair,
@@ -8410,56 +8256,6 @@ var DLMM = class {
     }
     return positionsMap;
   }
-  static async migratePosition(connection, positions, newPositions, walletPubkey, opt) {
-    const cluster = opt?.cluster || "mainnet-beta";
-    const provider = new AnchorProvider2(
-      connection,
-      {},
-      AnchorProvider2.defaultOptions()
-    );
-    const program = new Program3(
-      IDL,
-      opt?.programId ?? LBCLMM_PROGRAM_IDS[cluster],
-      provider
-    );
-    const positionsState = await program.account.position.fetchMultiple(
-      positions
-    );
-    const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash("confirmed");
-    return Promise.all(
-      positionsState.map(async ({ lbPair, lowerBinId }, idx) => {
-        const position = positions[idx];
-        const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
-        const upperBinArrayIndex = lowerBinArrayIndex.add(new BN10(1));
-        const [lowerBinArrayPubKey] = deriveBinArray(
-          lbPair,
-          lowerBinArrayIndex,
-          program.programId
-        );
-        const [upperBinArrayPubKey] = deriveBinArray(
-          lbPair,
-          upperBinArrayIndex,
-          program.programId
-        );
-        const migrateTx = await program.methods.migratePosition().accounts({
-          binArrayLower: lowerBinArrayPubKey,
-          binArrayUpper: upperBinArrayPubKey,
-          lbPair,
-          owner: walletPubkey,
-          positionV1: position,
-          positionV2: newPositions[idx],
-          program: program.programId,
-          rentReceiver: walletPubkey,
-          systemProgram: SystemProgram2.programId
-        }).transaction();
-        return new Transaction({
-          blockhash,
-          lastValidBlockHeight,
-          feePayer: walletPubkey
-        }).add(migrateTx);
-      })
-    );
-  }
   static getPricePerLamport(tokenXDecimal, tokenYDecimal, price) {
     return new Decimal5(price).mul(new Decimal5(10 ** (tokenYDecimal - tokenXDecimal))).toString();
   }
@@ -8951,20 +8747,6 @@ var DLMM = class {
   async getPositionsByUserAndLbPair(userPubKey) {
     const promiseResults = await Promise.all([
       this.getActiveBin(),
-      userPubKey && this.program.account.position.all([
-        {
-          memcmp: {
-            bytes: bs58.encode(userPubKey.toBuffer()),
-            offset: 8 + 32
-          }
-        },
-        {
-          memcmp: {
-            bytes: bs58.encode(this.pubkey.toBuffer()),
-            offset: 8
-          }
-        }
-      ]),
       userPubKey && this.program.account.positionV2.all([
         {
           memcmp: {
@@ -8980,7 +8762,7 @@ var DLMM = class {
         }
       ])
     ]);
-    const [activeBin, positions, positionsV2] = promiseResults;
+    const [activeBin, positionsV2] = promiseResults;
     if (!activeBin) {
       throw new Error("Error fetching active bin");
     }
@@ -8990,29 +8772,9 @@ var DLMM = class {
         userPositions: []
       };
     }
-    if (!positions || !positionsV2) {
+    if (!positionsV2) {
       throw new Error("Error fetching positions");
     }
-    const binArrayPubkeySet = /* @__PURE__ */ new Set();
-    positions.forEach(({ account: { upperBinId, lowerBinId } }) => {
-      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
-      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
-      const [lowerBinArrayPubKey] = deriveBinArray(
-        this.pubkey,
-        lowerBinArrayIndex,
-        this.program.programId
-      );
-      const [upperBinArrayPubKey] = deriveBinArray(
-        this.pubkey,
-        upperBinArrayIndex,
-        this.program.programId
-      );
-      binArrayPubkeySet.add(lowerBinArrayPubKey.toBase58());
-      binArrayPubkeySet.add(upperBinArrayPubKey.toBase58());
-    });
-    const binArrayPubkeyArray = Array.from(binArrayPubkeySet).map(
-      (pubkey) => new PublicKey6(pubkey)
-    );
     const binArrayPubkeySetV2 = /* @__PURE__ */ new Set();
     positionsV2.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
       const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
@@ -9038,28 +8800,13 @@ var DLMM = class {
       [
         this.pubkey,
         SYSVAR_CLOCK_PUBKEY,
-        ...binArrayPubkeyArray,
         ...binArrayPubkeyArrayV2
       ]
     );
     const [lbPairAccInfo, clockAccInfo, ...binArraysAccInfo] = lbPairAndBinArrays;
-    const positionBinArraysMap = /* @__PURE__ */ new Map();
-    for (let i = 0; i < binArrayPubkeyArray.length; i++) {
-      const binArrayPubkey = binArrayPubkeyArray[i];
-      const binArrayAccBuffer = binArraysAccInfo[i];
-      if (!binArrayAccBuffer)
-        throw new Error(
-          `Bin Array account ${binArrayPubkey.toBase58()} not found`
-        );
-      const binArrayAccInfo = this.program.coder.accounts.decode(
-        "binArray",
-        binArrayAccBuffer.data
-      );
-      positionBinArraysMap.set(binArrayPubkey.toBase58(), binArrayAccInfo);
-    }
     const positionBinArraysMapV2 = /* @__PURE__ */ new Map();
-    for (let i = binArrayPubkeyArray.length; i < binArraysAccInfo.length; i++) {
-      const binArrayPubkey = binArrayPubkeyArrayV2[i - binArrayPubkeyArray.length];
+    for (let i = 0; i < binArraysAccInfo.length; i++) {
+      const binArrayPubkey = binArrayPubkeyArrayV2[i];
       const binArrayAccBufferV2 = binArraysAccInfo[i];
       if (!binArrayAccBufferV2)
         throw new Error(
@@ -9076,45 +8823,6 @@ var DLMM = class {
     const onChainTimestamp = new BN10(
       clockAccInfo.data.readBigInt64LE(32).toString()
     ).toNumber();
-    const userPositions = await Promise.all(
-      positions.map(async ({ publicKey, account }) => {
-        const { lowerBinId, upperBinId } = account;
-        const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
-        const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
-        const [lowerBinArrayPubKey] = deriveBinArray(
-          this.pubkey,
-          lowerBinArrayIndex,
-          this.program.programId
-        );
-        const [upperBinArrayPubKey] = deriveBinArray(
-          this.pubkey,
-          upperBinArrayIndex,
-          this.program.programId
-        );
-        const lowerBinArray = positionBinArraysMap.get(
-          lowerBinArrayPubKey.toBase58()
-        );
-        const upperBinArray = positionBinArraysMap.get(
-          upperBinArrayPubKey.toBase58()
-        );
-        return {
-          publicKey,
-          positionData: await DLMM.processPosition(
-            this.program,
-            0 /* V1 */,
-            this.lbPair,
-            onChainTimestamp,
-            account,
-            this.tokenX.decimal,
-            this.tokenY.decimal,
-            lowerBinArray,
-            upperBinArray,
-            PublicKey6.default
-          ),
-          version: 0 /* V1 */
-        };
-      })
-    );
     const userPositionsV2 = await Promise.all(
       positionsV2.map(async ({ publicKey, account }) => {
         const { lowerBinId, upperBinId, feeOwner } = account;
@@ -9156,7 +8864,7 @@ var DLMM = class {
     );
     return {
       activeBin,
-      userPositions: [...userPositions, ...userPositionsV2]
+      userPositions: userPositionsV2
     };
   }
   async quoteCreatePosition({ strategy }) {
@@ -9217,6 +8925,93 @@ var DLMM = class {
       feePayer: user
     }).add(setCUIx, ...instructions);
   }
+  /**
+   * The function `getPosition` retrieves position information for a given public key and processes it
+   * using various data to return a `LbPosition` object.
+   * @param {PublicKey} positionPubKey - The `getPosition` function you provided is an asynchronous
+   * function that fetches position information based on a given public key. Here's a breakdown of the
+   * parameters used in the function:
+   * @returns The `getPosition` function returns a Promise that resolves to an object of type
+   * `LbPosition`. The object contains the following properties:
+   * - `publicKey`: The public key of the position account
+   * - `positionData`: Position Object
+   * - `version`: The version of the position (in this case, `Position.V2`)
+   */
+  async getPosition(positionPubKey) {
+    const positionAccountInfo = await this.program.account.positionV2.fetch(positionPubKey);
+    if (!positionAccountInfo) {
+      throw new Error(`Position account ${positionPubKey.toBase58()} not found`);
+    }
+    const { lowerBinId, upperBinId, feeOwner } = positionAccountInfo;
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+    const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
+    const [lowerBinArrayPubKey] = deriveBinArray(
+      this.pubkey,
+      lowerBinArrayIndex,
+      this.program.programId
+    );
+    const [upperBinArrayPubKey] = deriveBinArray(
+      this.pubkey,
+      upperBinArrayIndex,
+      this.program.programId
+    );
+    const [clockAccInfo, lowerBinArrayAccInfo, upperBinArrayAccInfo] = await chunkedGetMultipleAccountInfos(
+      this.program.provider.connection,
+      [
+        SYSVAR_CLOCK_PUBKEY,
+        lowerBinArrayPubKey,
+        upperBinArrayPubKey
+      ]
+    );
+    if (!lowerBinArrayAccInfo || !upperBinArrayAccInfo) {
+      return {
+        publicKey: positionPubKey,
+        positionData: {
+          totalXAmount: "0",
+          totalYAmount: "0",
+          positionBinData: [],
+          lastUpdatedAt: new BN10(0),
+          upperBinId,
+          lowerBinId,
+          feeX: new BN10(0),
+          feeY: new BN10(0),
+          rewardOne: new BN10(0),
+          rewardTwo: new BN10(0),
+          feeOwner,
+          totalClaimedFeeXAmount: new BN10(0),
+          totalClaimedFeeYAmount: new BN10(0)
+        },
+        version: 1 /* V2 */
+      };
+    }
+    const onChainTimestamp = new BN10(
+      clockAccInfo.data.readBigInt64LE(32).toString()
+    ).toNumber();
+    const lowerBinArray = this.program.coder.accounts.decode(
+      "binArray",
+      lowerBinArrayAccInfo.data
+    );
+    const upperBinArray = this.program.coder.accounts.decode(
+      "binArray",
+      upperBinArrayAccInfo.data
+    );
+    return {
+      publicKey: positionPubKey,
+      positionData: await DLMM.processPosition(
+        this.program,
+        1 /* V2 */,
+        this.lbPair,
+        onChainTimestamp,
+        positionAccountInfo,
+        this.tokenX.decimal,
+        this.tokenY.decimal,
+        lowerBinArray,
+        upperBinArray,
+        feeOwner
+      ),
+      version: 1 /* V2 */
+    };
+  }
   /**
    * The function `initializePositionAndAddLiquidityByStrategy` function is used to initializes a position and adds liquidity
    * @param {TInitializePositionAndAddLiquidityParamsByStrategy}
@@ -9940,9 +9735,13 @@ var DLMM = class {
     bps,
     shouldClaimAndClose = false
   }) {
-    const { lbPair, lowerBinId, owner, feeOwner } = await this.program.account.positionV2.fetch(position);
-    const { reserveX, reserveY, tokenXMint, tokenYMint } = await this.program.account.lbPair.fetch(lbPair);
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+    const lowerBinIdToRemove = Math.min(...binIds);
+    const upperBinIdToRemove = Math.max(...binIds);
+    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 BN10(positionLowerBinId));
     const upperBinArrayIndex = lowerBinArrayIndex.add(new BN10(1));
     const [binArrayLower] = deriveBinArray(
       lbPair,
@@ -10002,8 +9801,8 @@ var DLMM = class {
         lbPair: this.pubkey,
         sender: user,
         position,
-        reserveX,
-        reserveY,
+        reserveX: this.lbPair.reserveX,
+        reserveY: this.lbPair.reserveY,
         tokenProgram: TOKEN_PROGRAM_ID2,
         tokenXMint: this.tokenX.publicKey,
         tokenYMint: this.tokenY.publicKey,
@@ -10056,21 +9855,19 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const minBinId = Math.min(...binIds);
-    const maxBinId = Math.max(...binIds);
-    const minBinArrayIndex = binIdToBinArrayIndex(new BN10(minBinId));
-    const maxBinArrayIndex = binIdToBinArrayIndex(new BN10(maxBinId));
+    const minBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinIdToRemove));
+    const maxBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinIdToRemove));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
     const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
-    const removeLiquidityIx = await this.program.methods.removeLiquidityByRange(minBinId, maxBinId, bps.toNumber()).accounts({
+    const removeLiquidityTx = await this.program.methods.removeLiquidityByRange(lowerBinIdToRemove, upperBinIdToRemove, bps.toNumber()).accounts({
       position,
       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,
@@ -10080,7 +9877,7 @@ var DLMM = class {
     }).instruction();
     const instructions = [
       ...preInstructions,
-      removeLiquidityIx,
+      removeLiquidityTx,
       ...postInstructions
     ];
     const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
@@ -11885,12 +11682,7 @@ var DLMM = class {
     let totalYAmount = new Decimal5(0);
     bins.forEach((bin, idx) => {
       const binSupply = new Decimal5(bin.supply.toString());
-      let posShare;
-      if (bin.version === 1 && version === 0 /* V1 */) {
-        posShare = new Decimal5(posShares[idx].shln(64).toString());
-      } else {
-        posShare = new Decimal5(posShares[idx].toString());
-      }
+      const posShare = new Decimal5(posShares[idx].toString());
       const positionXAmount = binSupply.eq(new Decimal5("0")) ? new Decimal5("0") : posShare.mul(bin.xAmount.toString()).div(binSupply);
       const positionYAmount = binSupply.eq(new Decimal5("0")) ? new Decimal5("0") : posShare.mul(bin.yAmount.toString()).div(binSupply);
       totalXAmount = totalXAmount.add(positionXAmount);