@meteora-ag/dlmm 1.3.1-sam.0 → 1.3.3

package/dist/index.mjs

@@ -7588,6 +7588,8 @@ import {
   MintLayout,
   NATIVE_MINT as NATIVE_MINT2,
   TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID2,
+  createAssociatedTokenAccountInstruction as createAssociatedTokenAccountInstruction2,
+  createTransferInstruction,
   getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2
 } from "@solana/spl-token";
 
@@ -7975,14 +7977,49 @@ var DLMM = class {
       opt?.programId ?? LBCLMM_PROGRAM_IDS[cluster],
       provider
     );
-    const positionsV2 = await program.account.positionV2.all([
-      {
-        memcmp: {
-          bytes: bs58.encode(userPubKey.toBuffer()),
-          offset: 8 + 32
+    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 binArrayPubkeySet = /* @__PURE__ */ new Set();
+    const lbPairSet = /* @__PURE__ */ new Set();
+    positions.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
+      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(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 } }) => {
@@ -8010,12 +8047,46 @@ 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 = 0; i < binArrayPubkeyArrayV2.length; i++) {
-      const binArrayPubkey = binArrayPubkeyArrayV2[i];
+    for (let i = binArrayPubkeyArray.length + lbPairArray.length; i < binArrayPubkeyArray.length + lbPairArray.length + binArrayPubkeyArrayV2.length; i++) {
+      const binArrayPubkey = binArrayPubkeyArrayV2[i - (binArrayPubkeyArray.length + lbPairArray.length)];
       const binArrayAccInfoBufferV2 = binArraysAccInfo[i];
       if (!binArrayAccInfoBufferV2)
         throw new Error(
@@ -8028,8 +8099,8 @@ var DLMM = class {
       positionBinArraysMapV2.set(binArrayPubkey.toBase58(), binArrayAccInfo);
     }
     const lbPairArraysMapV2 = /* @__PURE__ */ new Map();
-    for (let i = binArrayPubkeyArrayV2.length; i < binArraysAccInfo.length; i++) {
-      const lbPairPubkey = lbPairArrayV2[i - binArrayPubkeyArrayV2.length];
+    for (let i = binArrayPubkeyArray.length + lbPairArray.length + binArrayPubkeyArrayV2.length; i < binArraysAccInfo.length; i++) {
+      const lbPairPubkey = lbPairArrayV2[i - (binArrayPubkeyArray.length + lbPairArray.length + binArrayPubkeyArrayV2.length)];
       const lbPairAccInfoBufferV2 = binArraysAccInfo[i];
       if (!lbPairAccInfoBufferV2)
         throw new Error(`LB Pair account ${lbPairPubkey.toBase58()} not found`);
@@ -8047,14 +8118,43 @@ var DLMM = class {
     ]).flat();
     const reserveAccountsInfo = await chunkedGetMultipleAccountInfos(
       program.provider.connection,
-      reservePublicKeysV2
+      [...reservePublicKeys, ...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[index];
-      const reserveAccBufferYV2 = reserveAccountsInfo[index + 1];
+      const reserveAccBufferXV2 = reserveAccountsInfo[reservePublicKeys.length + index];
+      const reserveAccBufferYV2 = reserveAccountsInfo[reservePublicKeys.length + index + 1];
       if (!reserveAccBufferXV2 || !reserveAccBufferYV2)
         throw new Error(
           `Reserve account for LB Pair ${lbPair.toBase58()} not found`
@@ -8065,8 +8165,8 @@ var DLMM = class {
         reserveX: reserveAccX.amount,
         reserveY: reserveAccY.amount
       });
-      const mintXBufferV2 = reserveAccountsInfo[index + 2];
-      const mintYBufferV2 = reserveAccountsInfo[index + 3];
+      const mintXBufferV2 = reserveAccountsInfo[reservePublicKeys.length + index + 2];
+      const mintYBufferV2 = reserveAccountsInfo[reservePublicKeys.length + index + 3];
       if (!mintXBufferV2 || !mintYBufferV2)
         throw new Error(
           `Mint account for LB Pair ${lbPair.toBase58()} not found`
@@ -8082,6 +8182,74 @@ 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 BN9(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(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;
@@ -8153,6 +8321,56 @@ 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 Program2(
+      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 BN9(lowerBinId));
+        const upperBinArrayIndex = lowerBinArrayIndex.add(new BN9(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 Decimal4(price).mul(new Decimal4(10 ** (tokenYDecimal - tokenXDecimal))).toString();
   }
@@ -8644,6 +8862,20 @@ 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: {
@@ -8659,7 +8891,7 @@ var DLMM = class {
         }
       ])
     ]);
-    const [activeBin, positionsV2] = promiseResults;
+    const [activeBin, positions, positionsV2] = promiseResults;
     if (!activeBin) {
       throw new Error("Error fetching active bin");
     }
@@ -8669,9 +8901,29 @@ var DLMM = class {
         userPositions: []
       };
     }
-    if (!positionsV2) {
+    if (!positions || !positionsV2) {
       throw new Error("Error fetching positions");
     }
+    const binArrayPubkeySet = /* @__PURE__ */ new Set();
+    positions.forEach(({ account: { upperBinId, lowerBinId } }) => {
+      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(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 BN9(lowerBinId));
@@ -8697,13 +8949,28 @@ 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 = 0; i < binArraysAccInfo.length; i++) {
-      const binArrayPubkey = binArrayPubkeyArrayV2[i];
+    for (let i = binArrayPubkeyArray.length; i < binArraysAccInfo.length; i++) {
+      const binArrayPubkey = binArrayPubkeyArrayV2[i - binArrayPubkeyArray.length];
       const binArrayAccBufferV2 = binArraysAccInfo[i];
       if (!binArrayAccBufferV2)
         throw new Error(
@@ -8720,6 +8987,45 @@ var DLMM = class {
     const onChainTimestamp = new BN9(
       clockAccInfo.data.readBigInt64LE(32).toString()
     ).toNumber();
+    const userPositions = await Promise.all(
+      positions.map(async ({ publicKey, account }) => {
+        const { lowerBinId, upperBinId } = account;
+        const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
+        const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(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;
@@ -8761,7 +9067,7 @@ var DLMM = class {
     );
     return {
       activeBin,
-      userPositions: userPositionsV2
+      userPositions: [...userPositions, ...userPositionsV2]
     };
   }
   async quoteCreatePosition({ strategy }) {
@@ -8817,72 +9123,6 @@ var DLMM = class {
       feePayer: user
     }).add(setComputeUnitLimitIx, createPositionIx, ...createBinArrayIxs);
   }
-  /**
-   * 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 BN9(lowerBinId));
-    const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(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
-      ]
-    );
-    const onChainTimestamp = new BN9(
-      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}
@@ -9561,40 +9801,9 @@ var DLMM = class {
     bps,
     shouldClaimAndClose = false
   }) {
-    const lowerBinIdToRemove = Math.min(...binIds);
-    const upperBinIdToRemove = Math.max(...binIds);
-    const [lowerBinArrayPubKey] = deriveBinArray(this.pubkey, binIdToBinArrayIndex(new BN9(binIds[0])), this.program.programId);
-    const [upperBinArrayPubKey] = deriveBinArray(this.pubkey, binIdToBinArrayIndex(new BN9(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) {
-      throw new Error("No liquidity to remove");
-    }
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(positionLowerBinId));
+    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 BN9(lowerBinId));
     const upperBinArrayIndex = lowerBinArrayIndex.add(new BN9(1));
     const [binArrayLower] = deriveBinArray(
       lbPair,
@@ -9710,11 +9919,13 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const minBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinIdToRemove));
-    const maxBinArrayIndex = binIdToBinArrayIndex(new BN9(upperBinIdToRemove));
+    const minBinId = Math.min(...binIds);
+    const maxBinId = Math.max(...binIds);
+    const minBinArrayIndex = binIdToBinArrayIndex(new BN9(minBinId));
+    const maxBinArrayIndex = binIdToBinArrayIndex(new BN9(maxBinId));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
     const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
-    const removeLiquidityTx = await this.program.methods.removeLiquidityByRange(lowerBinIdToRemove, upperBinIdToRemove, bps.toNumber()).accounts({
+    const removeLiquidityTx = await this.program.methods.removeLiquidityByRange(minBinId, maxBinId, bps.toNumber()).accounts({
       position,
       lbPair,
       userTokenX,
@@ -10027,6 +10238,7 @@ var DLMM = class {
   }) {
     const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [computeBudgetIx()];
+    const postInstructions = [];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
       { ataPubKey: userTokenOut, ix: createOutTokenAccountIx }
@@ -10051,8 +10263,9 @@ var DLMM = class {
         BigInt(maxInAmount.toString())
       );
       preInstructions.push(...wrapSOLIx);
+      const closeWrappedSOLIx = await unwrapSOLInstruction(user);
+      closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const postInstructions = [];
     if (outToken.equals(NATIVE_MINT2)) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
@@ -10112,6 +10325,7 @@ var DLMM = class {
   }) {
     const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [computeBudgetIx()];
+    const postInstructions = [];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
       { ataPubKey: userTokenOut, ix: createOutTokenAccountIx }
@@ -10136,8 +10350,9 @@ var DLMM = class {
         BigInt(inAmount.toString())
       );
       preInstructions.push(...wrapSOLIx);
+      const closeWrappedSOLIx = await unwrapSOLInstruction(user);
+      closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const postInstructions = [];
     if (outToken.equals(NATIVE_MINT2)) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
@@ -10201,6 +10416,7 @@ var DLMM = class {
   }) {
     const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [computeBudgetIx()];
+    const postInstructions = [];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
       { ataPubKey: userTokenOut, ix: createOutTokenAccountIx }
@@ -10225,8 +10441,9 @@ var DLMM = class {
         BigInt(inAmount.toString())
       );
       preInstructions.push(...wrapSOLIx);
+      const closeWrappedSOLIx = await unwrapSOLInstruction(user);
+      closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const postInstructions = [];
     if (outToken.equals(NATIVE_MINT2)) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
@@ -10660,6 +10877,175 @@ var DLMM = class {
       addLiquidityIxs
     };
   }
+  /**
+  * The `seedLiquidity` function create multiple grouped instructions. The grouped instructions will be either [initialize bin array + initialize position instructions] or [deposit instruction] combination.
+  * @param
+  *    - `payer`: The public key of the tx payer.
+  *    - `base`: Base key
+  *    - `seedAmount`: Token X lamport amount to be seeded to the pool.
+  *    - `price`: TokenX/TokenY Price in UI format
+  *    - `roundingUp`: Whether to round up the price
+  *    - `positionOwner`: The owner of the position
+  *    - `feeOwner`: Position fee owner
+  *    - `operator`: Operator of the position. Operator able to manage the position on behalf of the position owner. However, liquidity withdrawal issue by the operator can only send to the position owner.
+  *    - `lockReleasePoint`: The lock release point of the position.
+  *    - `shouldSeedPositionOwner` (optional): Whether to send 1 lamport amount of token X to the position owner to prove ownership.
+  * 
+  * The returned instructions need to be executed sequentially if it was separated into multiple transactions.
+  * @returns {Promise<TransactionInstruction[]>}
+  */
+  async seedLiquiditySingleBin(payer, base, seedAmount, price, roundingUp, positionOwner, feeOwner, operator, lockReleasePoint, shouldSeedPositionOwner = false) {
+    const pricePerLamport = DLMM.getPricePerLamport(
+      this.tokenX.decimal,
+      this.tokenY.decimal,
+      price
+    );
+    const binIdNumber = DLMM.getBinIdFromPrice(
+      pricePerLamport,
+      this.lbPair.binStep,
+      !roundingUp
+    );
+    const binId = new BN9(binIdNumber);
+    const lowerBinArrayIndex = binIdToBinArrayIndex(binId);
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN9(1));
+    const [lowerBinArray] = deriveBinArray(this.pubkey, lowerBinArrayIndex, this.program.programId);
+    const [upperBinArray] = deriveBinArray(this.pubkey, upperBinArrayIndex, this.program.programId);
+    const [positionPda] = derivePosition(this.pubkey, base, binId, new BN9(1), this.program.programId);
+    const preInstructions = [];
+    const [
+      { ataPubKey: userTokenX, ix: createPayerTokenXIx },
+      { ataPubKey: userTokenY, ix: createPayerTokenYIx }
+    ] = await Promise.all([
+      getOrCreateATAInstruction(
+        this.program.provider.connection,
+        this.tokenX.publicKey,
+        operator,
+        payer
+      ),
+      getOrCreateATAInstruction(
+        this.program.provider.connection,
+        this.tokenY.publicKey,
+        operator,
+        payer
+      )
+    ]);
+    createPayerTokenXIx && preInstructions.push(createPayerTokenXIx);
+    createPayerTokenYIx && preInstructions.push(createPayerTokenYIx);
+    let [binArrayBitmapExtension] = deriveBinArrayBitmapExtension(
+      this.pubkey,
+      this.program.programId
+    );
+    const accounts = await this.program.provider.connection.getMultipleAccountsInfo([
+      lowerBinArray,
+      upperBinArray,
+      positionPda,
+      binArrayBitmapExtension
+    ]);
+    if (isOverflowDefaultBinArrayBitmap(lowerBinArrayIndex)) {
+      const bitmapExtensionAccount = accounts[3];
+      if (!bitmapExtensionAccount) {
+        preInstructions.push(await this.program.methods.initializeBinArrayBitmapExtension().accounts({
+          binArrayBitmapExtension,
+          funder: payer,
+          lbPair: this.pubkey
+        }).instruction());
+      }
+    } else {
+      binArrayBitmapExtension = this.program.programId;
+    }
+    const operatorTokenX = getAssociatedTokenAddressSync2(
+      this.lbPair.tokenXMint,
+      operator,
+      true
+    );
+    const positionOwnerTokenX = getAssociatedTokenAddressSync2(
+      this.lbPair.tokenXMint,
+      positionOwner,
+      true
+    );
+    if (shouldSeedPositionOwner) {
+      const positionOwnerTokenXAccount = await this.program.provider.connection.getAccountInfo(positionOwnerTokenX);
+      if (positionOwnerTokenXAccount) {
+        const account = AccountLayout.decode(positionOwnerTokenXAccount.data);
+        if (account.amount == BigInt(0)) {
+          const transferIx = createTransferInstruction(operatorTokenX, positionOwnerTokenX, payer, 1);
+          preInstructions.push(transferIx);
+        }
+      } else {
+        const createPositionOwnerTokenXIx = createAssociatedTokenAccountInstruction2(payer, positionOwnerTokenX, positionOwner, this.lbPair.tokenXMint);
+        preInstructions.push(createPositionOwnerTokenXIx);
+        const transferIx = createTransferInstruction(operatorTokenX, positionOwnerTokenX, payer, 1);
+        preInstructions.push(transferIx);
+      }
+    }
+    const lowerBinArrayAccount = accounts[0];
+    const upperBinArrayAccount = accounts[1];
+    const positionAccount = accounts[2];
+    if (!lowerBinArrayAccount) {
+      preInstructions.push(
+        await this.program.methods.initializeBinArray(lowerBinArrayIndex).accounts({
+          binArray: lowerBinArray,
+          funder: payer,
+          lbPair: this.pubkey
+        }).instruction()
+      );
+    }
+    if (!upperBinArrayAccount) {
+      preInstructions.push(
+        await this.program.methods.initializeBinArray(upperBinArrayIndex).accounts({
+          binArray: upperBinArray,
+          funder: payer,
+          lbPair: this.pubkey
+        }).instruction()
+      );
+    }
+    if (!positionAccount) {
+      preInstructions.push(
+        await this.program.methods.initializePositionByOperator(
+          binId.toNumber(),
+          1,
+          feeOwner,
+          lockReleasePoint
+        ).accounts({
+          payer,
+          base,
+          position: positionPda,
+          lbPair: this.pubkey,
+          owner: positionOwner,
+          operator,
+          operatorTokenX,
+          ownerTokenX: positionOwnerTokenX
+        }).instruction()
+      );
+    }
+    const binLiquidityDist = {
+      binId: binIdNumber,
+      distributionX: BASIS_POINT_MAX,
+      distributionY: 0
+    };
+    const addLiquidityParams = {
+      amountX: seedAmount,
+      amountY: new BN9(0),
+      binLiquidityDist: [binLiquidityDist]
+    };
+    const depositLiquidityIx = await this.program.methods.addLiquidity(addLiquidityParams).accounts({
+      position: positionPda,
+      lbPair: this.pubkey,
+      binArrayBitmapExtension,
+      userTokenX,
+      userTokenY,
+      reserveX: this.lbPair.reserveX,
+      reserveY: this.lbPair.reserveY,
+      tokenXMint: this.lbPair.tokenXMint,
+      tokenYMint: this.lbPair.tokenYMint,
+      binArrayLower: lowerBinArray,
+      binArrayUpper: upperBinArray,
+      sender: operator,
+      tokenXProgram: TOKEN_PROGRAM_ID2,
+      tokenYProgram: TOKEN_PROGRAM_ID2
+    }).instruction();
+    return [...preInstructions, depositLiquidityIx];
+  }
   /**
    * Initializes bin arrays for the given bin array indexes if it wasn't initialized.
    *
@@ -11268,7 +11654,12 @@ var DLMM = class {
     let totalYAmount = new Decimal4(0);
     bins.forEach((bin, idx) => {
       const binSupply = new Decimal4(bin.supply.toString());
-      const posShare = new Decimal4(posShares[idx].toString());
+      let posShare;
+      if (bin.version === 1 && version === 0 /* V1 */) {
+        posShare = new Decimal4(posShares[idx].shln(64).toString());
+      } else {
+        posShare = new Decimal4(posShares[idx].toString());
+      }
       const positionXAmount = binSupply.eq(new Decimal4("0")) ? new Decimal4("0") : posShare.mul(bin.xAmount.toString()).div(binSupply);
       const positionYAmount = binSupply.eq(new Decimal4("0")) ? new Decimal4("0") : posShare.mul(bin.yAmount.toString()).div(binSupply);
       totalXAmount = totalXAmount.add(positionXAmount);