@meteora-ag/dlmm 1.3.1 → 1.3.4

package/dist/index.mjs

@@ -1,11 +1,27 @@
 // src/dlmm/index.ts
+import { AnchorProvider as AnchorProvider2, BN as BN10, Program as Program3 } from "@coral-xyz/anchor";
+import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
+import {
+  AccountLayout,
+  MintLayout,
+  NATIVE_MINT as NATIVE_MINT2,
+  TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID2,
+  createAssociatedTokenAccountInstruction as createAssociatedTokenAccountInstruction2,
+  createTransferInstruction,
+  getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2
+} from "@solana/spl-token";
 import {
+  ComputeBudgetProgram as ComputeBudgetProgram2,
   PublicKey as PublicKey6,
-  Transaction,
+  SYSVAR_CLOCK_PUBKEY,
   SYSVAR_RENT_PUBKEY,
   SystemProgram as SystemProgram2,
-  SYSVAR_CLOCK_PUBKEY
+  Transaction
 } from "@solana/web3.js";
+import Decimal5 from "decimal.js";
+
+// src/dlmm/constants/index.ts
+import { PublicKey } from "@solana/web3.js";
 
 // src/dlmm/idl.ts
 var IDL = {
@@ -5259,7 +5275,6 @@ var IDL = {
 };
 
 // src/dlmm/constants/index.ts
-import { PublicKey } from "@solana/web3.js";
 import { BN } from "@coral-xyz/anchor";
 var LBCLMM_PROGRAM_IDS = {
   devnet: "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo",
@@ -5309,66 +5324,48 @@ var ILM_BASE = new PublicKey(
   "MFGQxwAmB91SwuYX36okv2Qmdc9aMuHTwWGUrp4AtB1"
 );
 
-// src/dlmm/types/index.ts
-import { u64, i64, struct } from "@coral-xyz/borsh";
-var PositionVersion = /* @__PURE__ */ ((PositionVersion2) => {
-  PositionVersion2[PositionVersion2["V1"] = 0] = "V1";
-  PositionVersion2[PositionVersion2["V2"] = 1] = "V2";
-  return PositionVersion2;
-})(PositionVersion || {});
-var PairType = /* @__PURE__ */ ((PairType2) => {
-  PairType2[PairType2["Permissionless"] = 0] = "Permissionless";
-  PairType2[PairType2["Permissioned"] = 1] = "Permissioned";
-  return PairType2;
-})(PairType || {});
-var Strategy = {
-  SpotOneSide: { spotOneSide: {} },
-  CurveOneSide: { curveOneSide: {} },
-  BidAskOneSide: { bidAskOneSide: {} },
-  SpotBalanced: { spotBalanced: {} },
-  CurveBalanced: { curveBalanced: {} },
-  BidAskBalanced: { bidAskBalanced: {} },
-  SpotImBalanced: { spotImBalanced: {} },
-  CurveImBalanced: { curveImBalanced: {} },
-  BidAskImBalanced: { bidAskImBalanced: {} }
+// src/dlmm/error.ts
+import { AnchorError } from "@coral-xyz/anchor";
+var DLMMError = class extends Error {
+  errorCode;
+  errorName;
+  errorMessage;
+  constructor(error) {
+    let _errorCode = 0;
+    let _errorName = "Something went wrong";
+    let _errorMessage = "Something went wrong";
+    if (error instanceof Error) {
+      const anchorError = AnchorError.parse(
+        JSON.parse(JSON.stringify(error)).logs
+      );
+      if (anchorError?.program.toBase58() === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
+        _errorCode = anchorError.error.errorCode.number;
+        _errorName = anchorError.error.errorCode.code;
+        _errorMessage = anchorError.error.errorMessage;
+      }
+    } else {
+      const idlError = IDL.errors.find((err) => err.code === error);
+      if (idlError) {
+        _errorCode = idlError.code;
+        _errorName = idlError.name;
+        _errorMessage = idlError.msg;
+      }
+    }
+    super(_errorMessage);
+    this.errorCode = _errorCode;
+    this.errorName = _errorName;
+    this.errorMessage = _errorMessage;
+  }
+};
+var DlmmSdkError = class extends Error {
+  name;
+  message;
+  constructor(name, message) {
+    super();
+    this.name = name;
+    this.message = message;
+  }
 };
-var StrategyType = /* @__PURE__ */ ((StrategyType2) => {
-  StrategyType2[StrategyType2["SpotOneSide"] = 0] = "SpotOneSide";
-  StrategyType2[StrategyType2["CurveOneSide"] = 1] = "CurveOneSide";
-  StrategyType2[StrategyType2["BidAskOneSide"] = 2] = "BidAskOneSide";
-  StrategyType2[StrategyType2["SpotImBalanced"] = 3] = "SpotImBalanced";
-  StrategyType2[StrategyType2["CurveImBalanced"] = 4] = "CurveImBalanced";
-  StrategyType2[StrategyType2["BidAskImBalanced"] = 5] = "BidAskImBalanced";
-  StrategyType2[StrategyType2["SpotBalanced"] = 6] = "SpotBalanced";
-  StrategyType2[StrategyType2["CurveBalanced"] = 7] = "CurveBalanced";
-  StrategyType2[StrategyType2["BidAskBalanced"] = 8] = "BidAskBalanced";
-  return StrategyType2;
-})(StrategyType || {});
-var ActivationType = /* @__PURE__ */ ((ActivationType2) => {
-  ActivationType2[ActivationType2["Slot"] = 0] = "Slot";
-  ActivationType2[ActivationType2["Timestamp"] = 1] = "Timestamp";
-  return ActivationType2;
-})(ActivationType || {});
-var BitmapType = /* @__PURE__ */ ((BitmapType2) => {
-  BitmapType2[BitmapType2["U1024"] = 0] = "U1024";
-  BitmapType2[BitmapType2["U512"] = 1] = "U512";
-  return BitmapType2;
-})(BitmapType || {});
-var ClockLayout = struct([
-  u64("slot"),
-  i64("epochStartTimestamp"),
-  u64("epoch"),
-  u64("leaderScheduleEpoch"),
-  i64("unixTimestamp")
-]);
-var PairStatus = /* @__PURE__ */ ((PairStatus2) => {
-  PairStatus2[PairStatus2["Enabled"] = 0] = "Enabled";
-  PairStatus2[PairStatus2["Disabled"] = 1] = "Disabled";
-  return PairStatus2;
-})(PairStatus || {});
-
-// src/dlmm/index.ts
-import { AnchorProvider as AnchorProvider2, BN as BN9, Program as Program2 } from "@coral-xyz/anchor";
 
 // src/dlmm/helpers/index.ts
 import {
@@ -6344,6 +6341,14 @@ function generateBinAmount(amount, binStep, binId, tokenXDecimal, tokenYDecimal,
   return new BN5(c1.sub(c0).floor().toString());
 }
 
+// src/dlmm/helpers/index.ts
+import { getSimulationComputeUnits } from "@solana-developers/helpers";
+
+// src/dlmm/helpers/computeUnit.ts
+var DEFAULT_ADD_LIQUIDITY_CU = 8e5;
+var MIN_CU_BUFFER = 5e4;
+var MAX_CU_BUFFER = 2e5;
+
 // src/dlmm/helpers/derive.ts
 import { PublicKey as PublicKey2 } from "@solana/web3.js";
 function sortTokenMints(tokenX, tokenY) {
@@ -6459,11 +6464,110 @@ function deriveReserve(token, lbPair, programId) {
 }
 
 // src/dlmm/helpers/binArray.ts
-import { BN as BN6 } from "@coral-xyz/anchor";
+import { BN as BN7 } from "@coral-xyz/anchor";
 import { PublicKey as PublicKey3 } from "@solana/web3.js";
+
+// src/dlmm/types/index.ts
+import {
+  BN as BN6
+} from "@coral-xyz/anchor";
+import Decimal4 from "decimal.js";
+import { u64, i64, struct } from "@coral-xyz/borsh";
+var PositionVersion = /* @__PURE__ */ ((PositionVersion2) => {
+  PositionVersion2[PositionVersion2["V1"] = 0] = "V1";
+  PositionVersion2[PositionVersion2["V2"] = 1] = "V2";
+  return PositionVersion2;
+})(PositionVersion || {});
+var PairType = /* @__PURE__ */ ((PairType2) => {
+  PairType2[PairType2["Permissionless"] = 0] = "Permissionless";
+  PairType2[PairType2["Permissioned"] = 1] = "Permissioned";
+  return PairType2;
+})(PairType || {});
+var Strategy = {
+  SpotOneSide: { spotOneSide: {} },
+  CurveOneSide: { curveOneSide: {} },
+  BidAskOneSide: { bidAskOneSide: {} },
+  SpotBalanced: { spotBalanced: {} },
+  CurveBalanced: { curveBalanced: {} },
+  BidAskBalanced: { bidAskBalanced: {} },
+  SpotImBalanced: { spotImBalanced: {} },
+  CurveImBalanced: { curveImBalanced: {} },
+  BidAskImBalanced: { bidAskImBalanced: {} }
+};
+var StrategyType = /* @__PURE__ */ ((StrategyType2) => {
+  StrategyType2[StrategyType2["SpotOneSide"] = 0] = "SpotOneSide";
+  StrategyType2[StrategyType2["CurveOneSide"] = 1] = "CurveOneSide";
+  StrategyType2[StrategyType2["BidAskOneSide"] = 2] = "BidAskOneSide";
+  StrategyType2[StrategyType2["SpotImBalanced"] = 3] = "SpotImBalanced";
+  StrategyType2[StrategyType2["CurveImBalanced"] = 4] = "CurveImBalanced";
+  StrategyType2[StrategyType2["BidAskImBalanced"] = 5] = "BidAskImBalanced";
+  StrategyType2[StrategyType2["SpotBalanced"] = 6] = "SpotBalanced";
+  StrategyType2[StrategyType2["CurveBalanced"] = 7] = "CurveBalanced";
+  StrategyType2[StrategyType2["BidAskBalanced"] = 8] = "BidAskBalanced";
+  return StrategyType2;
+})(StrategyType || {});
+var ActivationType = /* @__PURE__ */ ((ActivationType2) => {
+  ActivationType2[ActivationType2["Slot"] = 0] = "Slot";
+  ActivationType2[ActivationType2["Timestamp"] = 1] = "Timestamp";
+  return ActivationType2;
+})(ActivationType || {});
+var BinLiquidity;
+((BinLiquidity3) => {
+  function fromBin(bin, binId, binStep, baseTokenDecimal, quoteTokenDecimal, version) {
+    const pricePerLamport = getPriceOfBinByBinId(
+      binId,
+      binStep
+    ).toString();
+    return {
+      binId,
+      xAmount: bin.amountX,
+      yAmount: bin.amountY,
+      supply: bin.liquiditySupply,
+      price: pricePerLamport,
+      version,
+      pricePerToken: new Decimal4(pricePerLamport).mul(new Decimal4(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
+    };
+  }
+  BinLiquidity3.fromBin = fromBin;
+  function empty(binId, binStep, baseTokenDecimal, quoteTokenDecimal, version) {
+    const pricePerLamport = getPriceOfBinByBinId(
+      binId,
+      binStep
+    ).toString();
+    return {
+      binId,
+      xAmount: new BN6(0),
+      yAmount: new BN6(0),
+      supply: new BN6(0),
+      price: pricePerLamport,
+      version,
+      pricePerToken: new Decimal4(pricePerLamport).mul(new Decimal4(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
+    };
+  }
+  BinLiquidity3.empty = empty;
+})(BinLiquidity || (BinLiquidity = {}));
+var BitmapType = /* @__PURE__ */ ((BitmapType2) => {
+  BitmapType2[BitmapType2["U1024"] = 0] = "U1024";
+  BitmapType2[BitmapType2["U512"] = 1] = "U512";
+  return BitmapType2;
+})(BitmapType || {});
+var ClockLayout = struct([
+  u64("slot"),
+  i64("epochStartTimestamp"),
+  u64("epoch"),
+  u64("leaderScheduleEpoch"),
+  i64("unixTimestamp")
+]);
+var PairStatus = /* @__PURE__ */ ((PairStatus2) => {
+  PairStatus2[PairStatus2["Enabled"] = 0] = "Enabled";
+  PairStatus2[PairStatus2["Disabled"] = 1] = "Disabled";
+  return PairStatus2;
+})(PairStatus || {});
+
+// src/dlmm/helpers/binArray.ts
 function internalBitmapRange() {
   const lowerBinArrayIndex = BIN_ARRAY_BITMAP_SIZE.neg();
-  const upperBinArrayIndex = BIN_ARRAY_BITMAP_SIZE.sub(new BN6(1));
+  const upperBinArrayIndex = BIN_ARRAY_BITMAP_SIZE.sub(new BN7(1));
   return [lowerBinArrayIndex, upperBinArrayIndex];
 }
 function buildBitmapFromU64Arrays(u64Arrays, type) {
@@ -6472,7 +6576,7 @@ function buildBitmapFromU64Arrays(u64Arrays, type) {
       return b.toArrayLike(Buffer, "le", 8);
     })
   );
-  return new BN6(buffer, "le");
+  return new BN7(buffer, "le");
 }
 function bitmapTypeDetail(type) {
   if (type == 0 /* U1024 */) {
@@ -6513,24 +6617,24 @@ function leastSignificantBit(number, bitLength) {
 function extensionBitmapRange() {
   return [
     BIN_ARRAY_BITMAP_SIZE.neg().mul(
-      EXTENSION_BINARRAY_BITMAP_SIZE.add(new BN6(1))
+      EXTENSION_BINARRAY_BITMAP_SIZE.add(new BN7(1))
     ),
     BIN_ARRAY_BITMAP_SIZE.mul(
-      EXTENSION_BINARRAY_BITMAP_SIZE.add(new BN6(1))
-    ).sub(new BN6(1))
+      EXTENSION_BINARRAY_BITMAP_SIZE.add(new BN7(1))
+    ).sub(new BN7(1))
   ];
 }
 function findSetBit(startIndex, endIndex, binArrayBitmapExtension) {
   const getBinArrayOffset = (binArrayIndex) => {
-    return binArrayIndex.gt(new BN6(0)) ? binArrayIndex.mod(BIN_ARRAY_BITMAP_SIZE) : binArrayIndex.add(new BN6(1)).neg().mod(BIN_ARRAY_BITMAP_SIZE);
+    return binArrayIndex.gt(new BN7(0)) ? binArrayIndex.mod(BIN_ARRAY_BITMAP_SIZE) : binArrayIndex.add(new BN7(1)).neg().mod(BIN_ARRAY_BITMAP_SIZE);
   };
   const getBitmapOffset = (binArrayIndex) => {
-    return binArrayIndex.gt(new BN6(0)) ? binArrayIndex.div(BIN_ARRAY_BITMAP_SIZE).sub(new BN6(1)) : binArrayIndex.add(new BN6(1)).neg().div(BIN_ARRAY_BITMAP_SIZE).sub(new BN6(1));
+    return binArrayIndex.gt(new BN7(0)) ? binArrayIndex.div(BIN_ARRAY_BITMAP_SIZE).sub(new BN7(1)) : binArrayIndex.add(new BN7(1)).neg().div(BIN_ARRAY_BITMAP_SIZE).sub(new BN7(1));
   };
   if (startIndex <= endIndex) {
     for (let i = startIndex; i <= endIndex; i++) {
-      const binArrayOffset = getBinArrayOffset(new BN6(i)).toNumber();
-      const bitmapOffset = getBitmapOffset(new BN6(i)).toNumber();
+      const binArrayOffset = getBinArrayOffset(new BN7(i)).toNumber();
+      const bitmapOffset = getBitmapOffset(new BN7(i)).toNumber();
       const bitmapChunks = i > 0 ? binArrayBitmapExtension.positiveBinArrayBitmap[bitmapOffset] : binArrayBitmapExtension.negativeBinArrayBitmap[bitmapOffset];
       const bitmap = buildBitmapFromU64Arrays(bitmapChunks, 1 /* U512 */);
       if (bitmap.testn(binArrayOffset)) {
@@ -6539,8 +6643,8 @@ function findSetBit(startIndex, endIndex, binArrayBitmapExtension) {
     }
   } else {
     for (let i = startIndex; i >= endIndex; i--) {
-      const binArrayOffset = getBinArrayOffset(new BN6(i)).toNumber();
-      const bitmapOffset = getBitmapOffset(new BN6(i)).toNumber();
+      const binArrayOffset = getBinArrayOffset(new BN7(i)).toNumber();
+      const bitmapOffset = getBitmapOffset(new BN7(i)).toNumber();
       const bitmapChunks = i > 0 ? binArrayBitmapExtension.positiveBinArrayBitmap[bitmapOffset] : binArrayBitmapExtension.negativeBinArrayBitmap[bitmapOffset];
       const bitmap = buildBitmapFromU64Arrays(bitmapChunks, 1 /* U512 */);
       if (bitmap.testn(binArrayOffset)) {
@@ -6562,11 +6666,11 @@ function deriveBinArrayBitmapExtension(lbPair, programId) {
 }
 function binIdToBinArrayIndex(binId) {
   const { div: idx, mod } = binId.divmod(MAX_BIN_ARRAY_SIZE);
-  return binId.isNeg() && !mod.isZero() ? idx.sub(new BN6(1)) : idx;
+  return binId.isNeg() && !mod.isZero() ? idx.sub(new BN7(1)) : idx;
 }
 function getBinArrayLowerUpperBinId(binArrayIndex) {
   const lowerBinId = binArrayIndex.mul(MAX_BIN_ARRAY_SIZE);
-  const upperBinId = lowerBinId.add(MAX_BIN_ARRAY_SIZE).sub(new BN6(1));
+  const upperBinId = lowerBinId.add(MAX_BIN_ARRAY_SIZE).sub(new BN7(1));
   return [lowerBinId, upperBinId];
 }
 function isBinIdWithinBinArray(activeId, binArrayIndex) {
@@ -6601,18 +6705,18 @@ function findNextBinArrayIndexWithLiquidity(swapForY, activeId, lbPairState, bin
             binArrayBitmapExtension
           );
           if (binArrayIndex !== null) {
-            return new BN6(binArrayIndex);
+            return new BN7(binArrayIndex);
           } else {
             return null;
           }
         } else {
           const binArrayIndex = findSetBit(
             startBinArrayIndex.toNumber(),
-            BIN_ARRAY_BITMAP_SIZE.neg().sub(new BN6(1)).toNumber(),
+            BIN_ARRAY_BITMAP_SIZE.neg().sub(new BN7(1)).toNumber(),
             binArrayBitmapExtension
           );
           if (binArrayIndex !== null) {
-            return new BN6(binArrayIndex);
+            return new BN7(binArrayIndex);
           } else {
             startBinArrayIndex = BIN_ARRAY_BITMAP_SIZE.neg();
           }
@@ -6625,9 +6729,9 @@ function findNextBinArrayIndexWithLiquidity(swapForY, activeId, lbPairState, bin
             binArrayBitmapExtension
           );
           if (binArrayIndex !== null) {
-            return new BN6(binArrayIndex);
+            return new BN7(binArrayIndex);
           } else {
-            startBinArrayIndex = BIN_ARRAY_BITMAP_SIZE.sub(new BN6(1));
+            startBinArrayIndex = BIN_ARRAY_BITMAP_SIZE.sub(new BN7(1));
           }
         } else {
           const binArrayIndex = findSetBit(
@@ -6636,7 +6740,7 @@ function findNextBinArrayIndexWithLiquidity(swapForY, activeId, lbPairState, bin
             binArrayBitmapExtension
           );
           if (binArrayIndex !== null) {
-            return new BN6(binArrayIndex);
+            return new BN7(binArrayIndex);
           } else {
             return null;
           }
@@ -6651,22 +6755,22 @@ function findNextBinArrayIndexWithLiquidity(swapForY, activeId, lbPairState, bin
         bitmapType
       );
       if (swapForY) {
-        const upperBitRange = new BN6(bitmapDetail.bits - 1).sub(offset);
+        const upperBitRange = new BN7(bitmapDetail.bits - 1).sub(offset);
         const croppedBitmap = bitmap.shln(upperBitRange.toNumber());
         const msb = mostSignificantBit(croppedBitmap, bitmapDetail.bits);
         if (msb !== null) {
-          return startBinArrayIndex.sub(new BN6(msb));
+          return startBinArrayIndex.sub(new BN7(msb));
         } else {
-          startBinArrayIndex = lowerBinArrayIndex.sub(new BN6(1));
+          startBinArrayIndex = lowerBinArrayIndex.sub(new BN7(1));
         }
       } else {
         const lowerBitRange = offset;
         const croppedBitmap = bitmap.shrn(lowerBitRange.toNumber());
         const lsb = leastSignificantBit(croppedBitmap, bitmapDetail.bits);
         if (lsb !== null) {
-          return startBinArrayIndex.add(new BN6(lsb));
+          return startBinArrayIndex.add(new BN7(lsb));
         } else {
-          startBinArrayIndex = upperBinArrayIndex.add(new BN6(1));
+          startBinArrayIndex = upperBinArrayIndex.add(new BN7(1));
         }
       }
     }
@@ -6695,9 +6799,9 @@ function getBinArraysRequiredByPositionRange(pair, fromBinId, toBinId, programId
   const positionCount = getPositionCount(minBinId, maxBinId);
   const binArrays = /* @__PURE__ */ new Map();
   for (let i = 0; i < positionCount.toNumber(); i++) {
-    const lowerBinId = minBinId.add(MAX_BIN_PER_POSITION.mul(new BN6(i)));
+    const lowerBinId = minBinId.add(MAX_BIN_PER_POSITION.mul(new BN7(i)));
     const lowerBinArrayIndex = binIdToBinArrayIndex(lowerBinId);
-    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN6(1));
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN7(1));
     const [lowerBinArray] = deriveBinArray(pair, lowerBinArrayIndex, programId);
     const [upperBinArray] = deriveBinArray(pair, upperBinArrayIndex, programId);
     binArrays.set(lowerBinArray.toBase58(), lowerBinArrayIndex);
@@ -6708,19 +6812,29 @@ function getBinArraysRequiredByPositionRange(pair, fromBinId, toBinId, programId
     index
   }));
 }
+function* enumerateBins(binsById, lowerBinId, upperBinId, binStep, baseTokenDecimal, quoteTokenDecimal, version) {
+  for (let currentBinId = lowerBinId; currentBinId <= upperBinId; currentBinId++) {
+    const bin = binsById.get(currentBinId);
+    if (bin != null) {
+      yield BinLiquidity.fromBin(bin, currentBinId, binStep, baseTokenDecimal, quoteTokenDecimal, version);
+    } else {
+      yield BinLiquidity.empty(currentBinId, binStep, baseTokenDecimal, quoteTokenDecimal, version);
+    }
+  }
+}
 
 // src/dlmm/helpers/fee.ts
-import { BN as BN7 } from "@coral-xyz/anchor";
+import { BN as BN8 } from "@coral-xyz/anchor";
 function getBaseFee(binStep, sParameter) {
-  return new BN7(sParameter.baseFactor).mul(new BN7(binStep)).mul(new BN7(10));
+  return new BN8(sParameter.baseFactor).mul(new BN8(binStep)).mul(new BN8(10));
 }
 function getVariableFee(binStep, sParameter, vParameter) {
   if (sParameter.variableFeeControl > 0) {
-    const square_vfa_bin = new BN7(vParameter.volatilityAccumulator).mul(new BN7(binStep)).pow(new BN7(2));
-    const v_fee = new BN7(sParameter.variableFeeControl).mul(square_vfa_bin);
-    return v_fee.add(new BN7(99999999999)).div(new BN7(1e11));
+    const square_vfa_bin = new BN8(vParameter.volatilityAccumulator).mul(new BN8(binStep)).pow(new BN8(2));
+    const v_fee = new BN8(sParameter.variableFeeControl).mul(square_vfa_bin);
+    return v_fee.add(new BN8(99999999999)).div(new BN8(1e11));
   }
-  return new BN7(0);
+  return new BN8(0);
 }
 function getTotalFee(binStep, sParameter, vParameter) {
   const totalFee = getBaseFee(binStep, sParameter).add(
@@ -6731,30 +6845,30 @@ function getTotalFee(binStep, sParameter, vParameter) {
 function computeFee(binStep, sParameter, vParameter, inAmount) {
   const totalFee = getTotalFee(binStep, sParameter, vParameter);
   const denominator = FEE_PRECISION.sub(totalFee);
-  return inAmount.mul(totalFee).add(denominator).sub(new BN7(1)).div(denominator);
+  return inAmount.mul(totalFee).add(denominator).sub(new BN8(1)).div(denominator);
 }
 function computeFeeFromAmount(binStep, sParameter, vParameter, inAmountWithFees) {
   const totalFee = getTotalFee(binStep, sParameter, vParameter);
-  return inAmountWithFees.mul(totalFee).add(FEE_PRECISION.sub(new BN7(1))).div(FEE_PRECISION);
+  return inAmountWithFees.mul(totalFee).add(FEE_PRECISION.sub(new BN8(1))).div(FEE_PRECISION);
 }
 function computeProtocolFee(feeAmount, sParameter) {
-  return feeAmount.mul(new BN7(sParameter.protocolShare)).div(new BN7(BASIS_POINT_MAX));
+  return feeAmount.mul(new BN8(sParameter.protocolShare)).div(new BN8(BASIS_POINT_MAX));
 }
 function swapExactOutQuoteAtBin(bin, binStep, sParameter, vParameter, outAmount, swapForY) {
   if (swapForY && bin.amountY.isZero()) {
     return {
-      amountIn: new BN7(0),
-      amountOut: new BN7(0),
-      fee: new BN7(0),
-      protocolFee: new BN7(0)
+      amountIn: new BN8(0),
+      amountOut: new BN8(0),
+      fee: new BN8(0),
+      protocolFee: new BN8(0)
     };
   }
   if (!swapForY && bin.amountX.isZero()) {
     return {
-      amountIn: new BN7(0),
-      amountOut: new BN7(0),
-      fee: new BN7(0),
-      protocolFee: new BN7(0)
+      amountIn: new BN8(0),
+      amountOut: new BN8(0),
+      fee: new BN8(0),
+      protocolFee: new BN8(0)
     };
   }
   let maxAmountOut;
@@ -6790,18 +6904,18 @@ function swapExactOutQuoteAtBin(bin, binStep, sParameter, vParameter, outAmount,
 function swapExactInQuoteAtBin(bin, binStep, sParameter, vParameter, inAmount, swapForY) {
   if (swapForY && bin.amountY.isZero()) {
     return {
-      amountIn: new BN7(0),
-      amountOut: new BN7(0),
-      fee: new BN7(0),
-      protocolFee: new BN7(0)
+      amountIn: new BN8(0),
+      amountOut: new BN8(0),
+      fee: new BN8(0),
+      protocolFee: new BN8(0)
     };
   }
   if (!swapForY && bin.amountX.isZero()) {
     return {
-      amountIn: new BN7(0),
-      amountOut: new BN7(0),
-      fee: new BN7(0),
-      protocolFee: new BN7(0)
+      amountIn: new BN8(0),
+      amountOut: new BN8(0),
+      fee: new BN8(0),
+      protocolFee: new BN8(0)
     };
   }
   let maxAmountOut;
@@ -6848,7 +6962,7 @@ function getAmountIn(amountOut, price, swapForY) {
 }
 
 // src/dlmm/helpers/strategy.ts
-import { BN as BN8 } from "@coral-xyz/anchor";
+import { BN as BN9 } from "@coral-xyz/anchor";
 var DEFAULT_MAX_WEIGHT = 2e3;
 var DEFAULT_MIN_WEIGHT = 200;
 function toWeightSpotBalanced(minBinId, maxBinId) {
@@ -7008,7 +7122,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
           for (let bin of amounts) {
             amountsInBin.push({
               binId: bin.binId,
-              amountX: new BN8(0),
+              amountX: new BN9(0),
               amountY: bin.amount
             });
           }
@@ -7020,7 +7134,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
             amountsInBin.push({
               binId: bin.binId,
               amountX: bin.amount,
-              amountY: new BN8(0)
+              amountY: new BN9(0)
             });
           }
         }
@@ -7035,7 +7149,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
           for (let bin of amountsIntoBidSide) {
             amountsInBin.push({
               binId: bin.binId,
-              amountX: new BN8(0),
+              amountX: new BN9(0),
               amountY: bin.amount
             });
           }
@@ -7052,7 +7166,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
             amountsInBin.push({
               binId: bin.binId,
               amountX: bin.amount,
-              amountY: new BN8(0)
+              amountY: new BN9(0)
             });
           }
         }
@@ -7092,7 +7206,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
           for (let bin of amounts) {
             amountsInBin.push({
               binId: bin.binId,
-              amountX: new BN8(0),
+              amountX: new BN9(0),
               amountY: bin.amount
             });
           }
@@ -7104,7 +7218,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
             amountsInBin.push({
               binId: bin.binId,
               amountX: bin.amount,
-              amountY: new BN8(0)
+              amountY: new BN9(0)
             });
           }
         }
@@ -7119,7 +7233,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
           for (let bin of amountsIntoBidSide) {
             amountsInBin.push({
               binId: bin.binId,
-              amountX: new BN8(0),
+              amountX: new BN9(0),
               amountY: bin.amount
             });
           }
@@ -7136,7 +7250,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
             amountsInBin.push({
               binId: bin.binId,
               amountX: bin.amount,
-              amountY: new BN8(0)
+              amountY: new BN9(0)
             });
           }
         }
@@ -7176,7 +7290,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
           for (let bin of amounts) {
             amountsInBin.push({
               binId: bin.binId,
-              amountX: new BN8(0),
+              amountX: new BN9(0),
               amountY: bin.amount
             });
           }
@@ -7188,7 +7302,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
             amountsInBin.push({
               binId: bin.binId,
               amountX: bin.amount,
-              amountY: new BN8(0)
+              amountY: new BN9(0)
             });
           }
         }
@@ -7203,7 +7317,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
           for (let bin of amountsIntoBidSide) {
             amountsInBin.push({
               binId: bin.binId,
-              amountX: new BN8(0),
+              amountX: new BN9(0),
               amountY: bin.amount
             });
           }
@@ -7220,7 +7334,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
             amountsInBin.push({
               binId: bin.binId,
               amountX: bin.amount,
-              amountY: new BN8(0)
+              amountY: new BN9(0)
             });
           }
         }
@@ -7439,7 +7553,7 @@ function toStrategyParameters({
 }
 
 // src/dlmm/helpers/lbPair.ts
-import { AnchorProvider, Program } from "@coral-xyz/anchor";
+import { AnchorProvider, Program as Program2 } from "@coral-xyz/anchor";
 import { PublicKey as PublicKey4 } from "@solana/web3.js";
 async function getTokensMintFromPoolAddress(connection, poolAddress, opt) {
   const provider = new AnchorProvider(
@@ -7447,7 +7561,7 @@ async function getTokensMintFromPoolAddress(connection, poolAddress, opt) {
     {},
     AnchorProvider.defaultOptions()
   );
-  const program = new Program(
+  const program = new Program2(
     IDL,
     LBCLMM_PROGRAM_IDS[opt?.cluster ?? "mainnet-beta"],
     provider
@@ -7469,6 +7583,10 @@ function chunks(array, size) {
     (_, index) => array.slice(index * size, (index + 1) * size)
   );
 }
+function range(min, max, mapfn) {
+  const length = max - min + 1;
+  return Array.from({ length }, (_, i) => mapfn(min + i));
+}
 async function chunkedFetchMultiplePoolAccount(program, pks, chunkSize = 100) {
   const accounts = (await Promise.all(
     chunks(pks, chunkSize).map(
@@ -7574,64 +7692,37 @@ async function chunkedGetMultipleAccountInfos(connection, pks, chunkSize = 100)
   )).flat();
   return accountInfos;
 }
-var computeBudgetIx = () => {
-  return ComputeBudgetProgram.setComputeUnitLimit({
-    units: 14e5
-  });
-};
-
-// src/dlmm/index.ts
-import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
-import Decimal4 from "decimal.js";
-import {
-  AccountLayout,
-  MintLayout,
-  NATIVE_MINT as NATIVE_MINT2,
-  TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID2,
-  getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2
-} from "@solana/spl-token";
-
-// src/dlmm/error.ts
-import { AnchorError } from "@coral-xyz/anchor";
-var DLMMError = class extends Error {
-  errorCode;
-  errorName;
-  errorMessage;
-  constructor(error) {
-    let _errorCode = 0;
-    let _errorName = "Something went wrong";
-    let _errorMessage = "Something went wrong";
-    if (error instanceof Error) {
-      const anchorError = AnchorError.parse(
-        JSON.parse(JSON.stringify(error)).logs
-      );
-      if (anchorError?.program.toBase58() === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
-        _errorCode = anchorError.error.errorCode.number;
-        _errorName = anchorError.error.errorCode.code;
-        _errorMessage = anchorError.error.errorMessage;
-      }
-    } else {
-      const idlError = IDL.errors.find((err) => err.code === error);
-      if (idlError) {
-        _errorCode = idlError.code;
-        _errorName = idlError.name;
-        _errorMessage = idlError.msg;
-      }
-    }
-    super(_errorMessage);
-    this.errorCode = _errorCode;
-    this.errorName = _errorName;
-    this.errorMessage = _errorMessage;
+var getEstimatedComputeUnitUsageWithBuffer = async (connection, instructions, feePayer, buffer) => {
+  if (!buffer) {
+    buffer = 0.1;
   }
-};
-var DlmmSdkError = class extends Error {
-  name;
-  message;
-  constructor(name, message) {
-    super();
-    this.name = name;
-    this.message = message;
+  buffer = Math.max(0, buffer);
+  buffer = Math.min(1, buffer);
+  const estimatedComputeUnitUsage = await getSimulationComputeUnits(
+    connection,
+    instructions,
+    feePayer,
+    []
+  );
+  let extraComputeUnitBuffer = estimatedComputeUnitUsage * buffer;
+  if (extraComputeUnitBuffer > MAX_CU_BUFFER) {
+    extraComputeUnitBuffer = MAX_CU_BUFFER;
+  } else if (extraComputeUnitBuffer < MIN_CU_BUFFER) {
+    extraComputeUnitBuffer = MIN_CU_BUFFER;
   }
+  return estimatedComputeUnitUsage + extraComputeUnitBuffer;
+};
+var getEstimatedComputeUnitIxWithBuffer = async (connection, instructions, feePayer, buffer) => {
+  const units = await getEstimatedComputeUnitUsageWithBuffer(
+    connection,
+    instructions,
+    feePayer,
+    buffer
+  ).catch((error) => {
+    console.error("Error::getEstimatedComputeUnitUsageWithBuffer", error);
+    return 14e5;
+  });
+  return ComputeBudgetProgram.setComputeUnitLimit({ units });
 };
 
 // src/dlmm/index.ts
@@ -7663,7 +7754,7 @@ var DLMM = class {
       {},
       AnchorProvider2.defaultOptions()
     );
-    const program = new Program2(
+    const program = new Program3(
       IDL,
       opt?.programId ?? LBCLMM_PROGRAM_IDS[opt?.cluster ?? "mainnet-beta"],
       provider
@@ -7677,7 +7768,7 @@ var DLMM = class {
       {},
       AnchorProvider2.defaultOptions()
     );
-    const program = new Program2(
+    const program = new Program3(
       IDL,
       opt?.programId ?? LBCLMM_PROGRAM_IDS[cluster],
       provider
@@ -7724,7 +7815,7 @@ var DLMM = class {
       {},
       AnchorProvider2.defaultOptions()
     );
-    const program = new Program2(
+    const program = new Program3(
       IDL,
       opt?.programId ?? LBCLMM_PROGRAM_IDS[cluster],
       provider
@@ -7824,7 +7915,7 @@ var DLMM = class {
       {},
       AnchorProvider2.defaultOptions()
     );
-    const program = new Program2(
+    const program = new Program3(
       IDL,
       opt?.programId ?? LBCLMM_PROGRAM_IDS[cluster],
       provider
@@ -7944,7 +8035,7 @@ var DLMM = class {
       {},
       AnchorProvider2.defaultOptions()
     );
-    const program = new Program2(
+    const program = new Program3(
       IDL,
       opt?.programId ?? LBCLMM_PROGRAM_IDS[opt?.cluster ?? "mainnet-beta"],
       provider
@@ -7970,7 +8061,7 @@ var DLMM = class {
       {},
       AnchorProvider2.defaultOptions()
     );
-    const program = new Program2(
+    const program = new Program3(
       IDL,
       opt?.programId ?? LBCLMM_PROGRAM_IDS[cluster],
       provider
@@ -7996,8 +8087,8 @@ var DLMM = class {
     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 lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
       const [lowerBinArrayPubKey] = deriveBinArray(
         lbPair,
         lowerBinArrayIndex,
@@ -8021,8 +8112,8 @@ var DLMM = class {
     const binArrayPubkeySetV2 = /* @__PURE__ */ new Set();
     const lbPairSetV2 = /* @__PURE__ */ new Set();
     positionsV2.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
-      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
-      const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(upperBinId));
+      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
       const [lowerBinArrayPubKey] = deriveBinArray(
         lbPair,
         lowerBinArrayIndex,
@@ -8176,15 +8267,15 @@ var DLMM = class {
         mintYDecimal: mintY.decimals
       });
     });
-    const onChainTimestamp = new BN9(
+    const onChainTimestamp = new BN10(
       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 lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
       const [lowerBinArrayPubKey] = deriveBinArray(
         lbPair,
         lowerBinArrayIndex,
@@ -8251,8 +8342,8 @@ var DLMM = class {
     for (let position of positionsV2) {
       const { account, publicKey: positionPubKey } = position;
       const { upperBinId, lowerBinId, lbPair, feeOwner } = account;
-      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
-      const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(upperBinId));
+      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
       const [lowerBinArrayPubKey] = deriveBinArray(
         lbPair,
         lowerBinArrayIndex,
@@ -8326,7 +8417,7 @@ var DLMM = class {
       {},
       AnchorProvider2.defaultOptions()
     );
-    const program = new Program2(
+    const program = new Program3(
       IDL,
       opt?.programId ?? LBCLMM_PROGRAM_IDS[cluster],
       provider
@@ -8338,8 +8429,8 @@ var DLMM = class {
     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 lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+        const upperBinArrayIndex = lowerBinArrayIndex.add(new BN10(1));
         const [lowerBinArrayPubKey] = deriveBinArray(
           lbPair,
           lowerBinArrayIndex,
@@ -8370,11 +8461,11 @@ var DLMM = class {
     );
   }
   static getPricePerLamport(tokenXDecimal, tokenYDecimal, price) {
-    return new Decimal4(price).mul(new Decimal4(10 ** (tokenYDecimal - tokenXDecimal))).toString();
+    return new Decimal5(price).mul(new Decimal5(10 ** (tokenYDecimal - tokenXDecimal))).toString();
   }
   static getBinIdFromPrice(price, binStep, min) {
-    const binStepNum = new Decimal4(binStep).div(new Decimal4(BASIS_POINT_MAX));
-    const binId = new Decimal4(price).log().dividedBy(new Decimal4(1).add(binStepNum).log());
+    const binStepNum = new Decimal5(binStep).div(new Decimal5(BASIS_POINT_MAX));
+    const binId = new Decimal5(price).log().dividedBy(new Decimal5(1).add(binStepNum).log());
     return (min ? binId.floor() : binId.ceil()).toNumber();
   }
   /** Public methods */
@@ -8384,7 +8475,7 @@ var DLMM = class {
       {},
       AnchorProvider2.defaultOptions()
     );
-    const program = new Program2(
+    const program = new Program3(
       IDL,
       opt?.programId ?? LBCLMM_PROGRAM_IDS[opt.cluster],
       provider
@@ -8433,7 +8524,7 @@ var DLMM = class {
       {},
       AnchorProvider2.defaultOptions()
     );
-    const program = new Program2(
+    const program = new Program3(
       IDL,
       opt?.programId ?? LBCLMM_PROGRAM_IDS[opt.cluster],
       provider
@@ -8481,7 +8572,7 @@ var DLMM = class {
       {},
       AnchorProvider2.defaultOptions()
     );
-    const program = new Program2(
+    const program = new Program3(
       IDL,
       opt?.programId ?? LBCLMM_PROGRAM_IDS[opt.cluster],
       provider
@@ -8617,7 +8708,7 @@ var DLMM = class {
     while (!shouldStop) {
       const binArrayIndex = findNextBinArrayIndexWithLiquidity(
         swapForY,
-        new BN9(activeIdToLoop),
+        new BN10(activeIdToLoop),
         this.lbPair,
         this.binArrayBitmapExtension?.account ?? null
       );
@@ -8659,9 +8750,9 @@ var DLMM = class {
     return binArrays;
   }
   static calculateFeeInfo(baseFactor, binStep) {
-    const baseFeeRate = new BN9(baseFactor).mul(new BN9(binStep)).mul(new BN9(10));
-    const baseFeeRatePercentage = new Decimal4(baseFeeRate.toString()).mul(new Decimal4(100)).div(new Decimal4(FEE_PRECISION.toString()));
-    const maxFeeRatePercentage = new Decimal4(MAX_FEE_RATE.toString()).mul(new Decimal4(100)).div(new Decimal4(FEE_PRECISION.toString()));
+    const baseFeeRate = new BN10(baseFactor).mul(new BN10(binStep)).mul(new BN10(10));
+    const baseFeeRatePercentage = new Decimal5(baseFeeRate.toString()).mul(new Decimal5(100)).div(new Decimal5(FEE_PRECISION.toString()));
+    const maxFeeRatePercentage = new Decimal5(MAX_FEE_RATE.toString()).mul(new Decimal5(100)).div(new Decimal5(FEE_PRECISION.toString()));
     return {
       baseFeeRatePercentage,
       maxFeeRatePercentage
@@ -8675,7 +8766,7 @@ var DLMM = class {
   getFeeInfo() {
     const { baseFactor, protocolShare } = this.lbPair.parameters;
     const { baseFeeRatePercentage, maxFeeRatePercentage } = DLMM.calculateFeeInfo(baseFactor, this.lbPair.binStep);
-    const protocolFeePercentage = new Decimal4(protocolShare.toString()).mul(new Decimal4(100)).div(new Decimal4(BASIS_POINT_MAX));
+    const protocolFeePercentage = new Decimal5(protocolShare.toString()).mul(new Decimal5(100)).div(new Decimal5(BASIS_POINT_MAX));
     return {
       baseFeeRatePercentage,
       maxFeeRatePercentage,
@@ -8688,7 +8779,7 @@ var DLMM = class {
    */
   getDynamicFee() {
     let vParameterClone = Object.assign({}, this.lbPair.vParameters);
-    let activeId = new BN9(this.lbPair.activeId);
+    let activeId = new BN10(this.lbPair.activeId);
     const sParameters2 = this.lbPair.parameters;
     const currentTimestamp = Date.now() / 1e3;
     this.updateReference(
@@ -8707,7 +8798,7 @@ var DLMM = class {
       sParameters2,
       vParameterClone
     );
-    return new Decimal4(totalFee.toString()).div(new Decimal4(FEE_PRECISION.toString())).mul(100);
+    return new Decimal5(totalFee.toString()).div(new Decimal5(FEE_PRECISION.toString())).mul(100);
   }
   /**
    * The function `getEmissionRate` returns the emission rates for two rewards.
@@ -8720,8 +8811,8 @@ var DLMM = class {
       ({ rewardRate, rewardDurationEnd }) => now > rewardDurationEnd.toNumber() ? void 0 : rewardRate
     );
     return {
-      rewardOne: rewardOneEmissionRate ? new Decimal4(rewardOneEmissionRate.toString()).div(PRECISION) : void 0,
-      rewardTwo: rewardTwoEmissionRate ? new Decimal4(rewardTwoEmissionRate.toString()).div(PRECISION) : void 0
+      rewardOne: rewardOneEmissionRate ? new Decimal5(rewardOneEmissionRate.toString()).div(PRECISION) : void 0,
+      rewardTwo: rewardTwoEmissionRate ? new Decimal5(rewardTwoEmissionRate.toString()).div(PRECISION) : void 0
     };
   }
   /**
@@ -8783,15 +8874,15 @@ var DLMM = class {
    * @returns an object with two properties: "activeBin" and "bins". The value of "activeBin" is the
    * active bin ID of the lbPair, and the value of "bins" is an array of BinLiquidity objects.
    */
-  async getBinsBetweenLowerAndUpperBound(lowerBinId, upperBinId, lowerBinArrays, upperBinArrays) {
+  async getBinsBetweenLowerAndUpperBound(lowerBinId, upperBinId, lowerBinArray, upperBinArray) {
     const bins = await this.getBins(
       this.pubkey,
       lowerBinId,
       upperBinId,
       this.tokenX.decimal,
       this.tokenY.decimal,
-      lowerBinArrays,
-      upperBinArrays
+      lowerBinArray,
+      upperBinArray
     );
     return { activeBin: this.lbPair.activeId, bins };
   }
@@ -8814,7 +8905,7 @@ var DLMM = class {
    * @returns {string} real price of bin
    */
   fromPricePerLamport(pricePerLamport) {
-    return new Decimal4(pricePerLamport).div(new Decimal4(10 ** (this.tokenY.decimal - this.tokenX.decimal))).toString();
+    return new Decimal5(pricePerLamport).div(new Decimal5(10 ** (this.tokenY.decimal - this.tokenX.decimal))).toString();
   }
   /**
    * The function retrieves the active bin ID and its corresponding price.
@@ -8904,8 +8995,8 @@ var DLMM = class {
     }
     const binArrayPubkeySet = /* @__PURE__ */ new Set();
     positions.forEach(({ account: { upperBinId, lowerBinId } }) => {
-      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
-      const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(upperBinId));
+      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
       const [lowerBinArrayPubKey] = deriveBinArray(
         this.pubkey,
         lowerBinArrayIndex,
@@ -8924,8 +9015,8 @@ var DLMM = class {
     );
     const binArrayPubkeySetV2 = /* @__PURE__ */ new Set();
     positionsV2.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
-      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
-      const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(upperBinId));
+      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
       const [lowerBinArrayPubKey] = deriveBinArray(
         this.pubkey,
         lowerBinArrayIndex,
@@ -8982,14 +9073,14 @@ var DLMM = class {
     }
     if (!lbPairAccInfo)
       throw new Error(`LB Pair account ${this.pubkey.toBase58()} not found`);
-    const onChainTimestamp = new BN9(
+    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 BN9(lowerBinId));
-        const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(upperBinId));
+        const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+        const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
         const [lowerBinArrayPubKey] = deriveBinArray(
           this.pubkey,
           lowerBinArrayIndex,
@@ -9027,8 +9118,8 @@ var DLMM = class {
     const userPositionsV2 = await Promise.all(
       positionsV2.map(async ({ publicKey, account }) => {
         const { lowerBinId, upperBinId, feeOwner } = account;
-        const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
-        const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(upperBinId));
+        const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+        const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
         const [lowerBinArrayPubKey] = deriveBinArray(
           this.pubkey,
           lowerBinArrayIndex,
@@ -9070,10 +9161,10 @@ var DLMM = class {
   }
   async quoteCreatePosition({ strategy }) {
     const { minBinId, maxBinId } = strategy;
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(minBinId));
-    const upperBinArrayIndex = BN9.max(
-      binIdToBinArrayIndex(new BN9(maxBinId)),
-      lowerBinArrayIndex.add(new BN9(1))
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(minBinId));
+    const upperBinArrayIndex = BN10.max(
+      binIdToBinArrayIndex(new BN10(maxBinId)),
+      lowerBinArrayIndex.add(new BN10(1))
     );
     const binArraysCount = (await this.binArraysToBeCreate(lowerBinArrayIndex, upperBinArrayIndex)).length;
     const positionCount = Math.ceil((maxBinId - minBinId + 1) / MAX_BIN_PER_TX);
@@ -9097,29 +9188,34 @@ var DLMM = class {
     maxBinId,
     user
   }) {
-    const setComputeUnitLimitIx = computeBudgetIx();
     const createPositionIx = await this.program.methods.initializePosition(minBinId, maxBinId - minBinId + 1).accounts({
       payer: user,
       position: positionPubKey,
       lbPair: this.pubkey,
       owner: user
     }).instruction();
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(minBinId));
-    const upperBinArrayIndex = BN9.max(
-      lowerBinArrayIndex.add(new BN9(1)),
-      binIdToBinArrayIndex(new BN9(maxBinId))
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(minBinId));
+    const upperBinArrayIndex = BN10.max(
+      lowerBinArrayIndex.add(new BN10(1)),
+      binIdToBinArrayIndex(new BN10(maxBinId))
     );
     const createBinArrayIxs = await this.createBinArraysIfNeeded(
       upperBinArrayIndex,
       lowerBinArrayIndex,
       user
     );
+    const instructions = [createPositionIx, ...createBinArrayIxs];
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      instructions,
+      user
+    );
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return new Transaction({
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(setComputeUnitLimitIx, createPositionIx, ...createBinArrayIxs);
+    }).add(setCUIx, ...instructions);
   }
   /**
    * The function `initializePositionAndAddLiquidityByStrategy` function is used to initializes a position and adds liquidity
@@ -9143,8 +9239,7 @@ var DLMM = class {
   }) {
     const { maxBinId, minBinId } = strategy;
     const maxActiveBinSlippage = slippage ? Math.ceil(slippage / (this.lbPair.binStep / 100)) : MAX_ACTIVE_BIN_SLIPPAGE;
-    const setComputeUnitLimitIx = computeBudgetIx();
-    const preInstructions = [setComputeUnitLimitIx];
+    const preInstructions = [];
     const initializePositionIx = await this.program.methods.initializePosition(minBinId, maxBinId - minBinId + 1).accounts({
       payer: user,
       position: positionPubKey,
@@ -9152,15 +9247,15 @@ var DLMM = class {
       owner: user
     }).instruction();
     preInstructions.push(initializePositionIx);
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(minBinId));
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(minBinId));
     const [binArrayLower] = deriveBinArray(
       this.pubkey,
       lowerBinArrayIndex,
       this.program.programId
     );
-    const upperBinArrayIndex = BN9.max(
-      lowerBinArrayIndex.add(new BN9(1)),
-      binIdToBinArrayIndex(new BN9(maxBinId))
+    const upperBinArrayIndex = BN10.max(
+      lowerBinArrayIndex.add(new BN10(1)),
+      binIdToBinArrayIndex(new BN10(maxBinId))
     );
     const [binArrayUpper] = deriveBinArray(
       this.pubkey,
@@ -9214,8 +9309,8 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const minBinArrayIndex = binIdToBinArrayIndex(new BN9(minBinId));
-    const maxBinArrayIndex = binIdToBinArrayIndex(new BN9(maxBinId));
+    const minBinArrayIndex = binIdToBinArrayIndex(new BN10(minBinId));
+    const maxBinArrayIndex = binIdToBinArrayIndex(new BN10(maxBinId));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
     const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
     const activeId = this.lbPair.activeId;
@@ -9244,13 +9339,24 @@ var DLMM = class {
       tokenYProgram: TOKEN_PROGRAM_ID2
     };
     const programMethod = this.program.methods.addLiquidityByStrategy(liquidityParams);
-    const createPositionTx = await programMethod.accounts(addLiquidityAccounts).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
+    const addLiquidityIx = await programMethod.accounts(addLiquidityAccounts).instruction();
+    const instructions = [
+      ...preInstructions,
+      addLiquidityIx,
+      ...postInstructions
+    ];
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      instructions,
+      user
+    );
+    instructions.unshift(setCUIx);
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return new Transaction({
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(createPositionTx);
+    }).add(...instructions);
   }
   /**
    * The function `initializePositionAndAddLiquidityByWeight` function is used to initializes a position and adds liquidity
@@ -9287,15 +9393,15 @@ var DLMM = class {
       owner: user
     }).instruction();
     preInstructions.push(initializePositionIx);
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
     const [binArrayLower] = deriveBinArray(
       this.pubkey,
       lowerBinArrayIndex,
       this.program.programId
     );
-    const upperBinArrayIndex = BN9.max(
-      lowerBinArrayIndex.add(new BN9(1)),
-      binIdToBinArrayIndex(new BN9(upperBinId))
+    const upperBinArrayIndex = BN10.max(
+      lowerBinArrayIndex.add(new BN10(1)),
+      binIdToBinArrayIndex(new BN10(upperBinId))
     );
     const [binArrayUpper] = deriveBinArray(
       this.pubkey,
@@ -9349,11 +9455,10 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const setComputeUnitLimitIx = computeBudgetIx();
     const minBinId = Math.min(...binIds);
     const maxBinId = Math.max(...binIds);
-    const minBinArrayIndex = binIdToBinArrayIndex(new BN9(minBinId));
-    const maxBinArrayIndex = binIdToBinArrayIndex(new BN9(maxBinId));
+    const minBinArrayIndex = binIdToBinArrayIndex(new BN10(minBinId));
+    const maxBinArrayIndex = binIdToBinArrayIndex(new BN10(maxBinId));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
     const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
     const activeId = this.lbPair.activeId;
@@ -9414,19 +9519,34 @@ var DLMM = class {
     const isOneSideDeposit = totalXAmount.isZero() || totalYAmount.isZero();
     const programMethod = isOneSideDeposit ? this.program.methods.addLiquidityOneSide(oneSideLiquidityParams) : this.program.methods.addLiquidityByWeight(liquidityParams);
     if (xYAmountDistribution.length < MAX_BIN_LENGTH_ALLOWED_IN_ONE_TX) {
-      const addLiqTx2 = await programMethod.accounts(
+      const addLiqIx2 = await programMethod.accounts(
         isOneSideDeposit ? oneSideAddLiquidityAccounts : addLiquidityAccounts
-      ).preInstructions([setComputeUnitLimitIx, ...preInstructions]).postInstructions(postInstructions).transaction();
+      ).instruction();
+      const instructions = [...preInstructions, addLiqIx2, ...postInstructions];
+      const setCUIx2 = await getEstimatedComputeUnitIxWithBuffer(
+        this.program.provider.connection,
+        instructions,
+        user
+      );
+      instructions.unshift(setCUIx2);
       const { blockhash: blockhash2, lastValidBlockHeight: lastValidBlockHeight2 } = await this.program.provider.connection.getLatestBlockhash("confirmed");
       return new Transaction({
         blockhash: blockhash2,
         lastValidBlockHeight: lastValidBlockHeight2,
         feePayer: user
-      }).add(addLiqTx2);
+      }).add(...instructions);
     }
-    const addLiqTx = await programMethod.accounts(
+    const addLiqIx = await programMethod.accounts(
       isOneSideDeposit ? oneSideAddLiquidityAccounts : addLiquidityAccounts
-    ).preInstructions([setComputeUnitLimitIx]).transaction();
+    ).instruction();
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      [addLiqIx],
+      user,
+      DEFAULT_ADD_LIQUIDITY_CU
+      // The function return multiple transactions that dependent on each other, simulation will fail
+    );
+    const mainInstructions = [setCUIx, addLiqIx];
     const transactions = [];
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     if (preInstructions.length) {
@@ -9441,7 +9561,7 @@ var DLMM = class {
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(addLiqTx);
+    }).add(...mainInstructions);
     transactions.push(mainTx);
     if (postInstructions.length) {
       const postInstructionsTx = new Transaction({
@@ -9476,10 +9596,8 @@ var DLMM = class {
     const { maxBinId, minBinId } = strategy;
     const maxActiveBinSlippage = slippage ? Math.ceil(slippage / (this.lbPair.binStep / 100)) : MAX_ACTIVE_BIN_SLIPPAGE;
     const preInstructions = [];
-    const setComputeUnitLimitIx = computeBudgetIx();
-    preInstructions.push(setComputeUnitLimitIx);
-    const minBinArrayIndex = binIdToBinArrayIndex(new BN9(minBinId));
-    const maxBinArrayIndex = binIdToBinArrayIndex(new BN9(maxBinId));
+    const minBinArrayIndex = binIdToBinArrayIndex(new BN10(minBinId));
+    const maxBinArrayIndex = binIdToBinArrayIndex(new BN10(maxBinId));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
     const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
     const strategyParameters = toStrategyParameters(strategy);
@@ -9487,9 +9605,9 @@ var DLMM = class {
       positionPubKey
     );
     const lowerBinArrayIndex = binIdToBinArrayIndex(
-      new BN9(positionAccount.lowerBinId)
+      new BN10(positionAccount.lowerBinId)
     );
-    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN9(1));
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN10(1));
     const [binArrayLower] = deriveBinArray(
       this.pubkey,
       lowerBinArrayIndex,
@@ -9571,13 +9689,24 @@ var DLMM = class {
       tokenYProgram: TOKEN_PROGRAM_ID2
     };
     const programMethod = this.program.methods.addLiquidityByStrategy(liquidityParams);
-    const createPositionTx = await programMethod.accounts(addLiquidityAccounts).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
+    const addLiquidityIx = await programMethod.accounts(addLiquidityAccounts).instruction();
+    const instructions = [
+      ...preInstructions,
+      addLiquidityIx,
+      ...postInstructions
+    ];
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      instructions,
+      user
+    );
+    instructions.unshift(setCUIx);
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return new Transaction({
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(createPositionTx);
+    }).add(...instructions);
   }
   /**
    * The `addLiquidityByWeight` function is used to add liquidity to existing position
@@ -9614,8 +9743,8 @@ var DLMM = class {
       );
     const minBinId = Math.min(...binIds);
     const maxBinId = Math.max(...binIds);
-    const minBinArrayIndex = binIdToBinArrayIndex(new BN9(minBinId));
-    const maxBinArrayIndex = binIdToBinArrayIndex(new BN9(maxBinId));
+    const minBinArrayIndex = binIdToBinArrayIndex(new BN10(minBinId));
+    const maxBinArrayIndex = binIdToBinArrayIndex(new BN10(maxBinId));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
     const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
     const activeId = this.lbPair.activeId;
@@ -9633,16 +9762,16 @@ var DLMM = class {
       throw new Error("No liquidity to add");
     }
     const lowerBinArrayIndex = binIdToBinArrayIndex(
-      new BN9(positionAccount.lowerBinId)
+      new BN10(positionAccount.lowerBinId)
     );
     const [binArrayLower] = deriveBinArray(
       this.pubkey,
       lowerBinArrayIndex,
       this.program.programId
     );
-    const upperBinArrayIndex = BN9.max(
-      lowerBinArrayIndex.add(new BN9(1)),
-      binIdToBinArrayIndex(new BN9(positionAccount.upperBinId))
+    const upperBinArrayIndex = BN10.max(
+      lowerBinArrayIndex.add(new BN10(1)),
+      binIdToBinArrayIndex(new BN10(positionAccount.upperBinId))
     );
     const [binArrayUpper] = deriveBinArray(
       this.pubkey,
@@ -9697,7 +9826,6 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const setComputeUnitLimitIx = computeBudgetIx();
     const liquidityParams = {
       amountX: totalXAmount,
       amountY: totalYAmount,
@@ -9742,19 +9870,32 @@ var DLMM = class {
     const isOneSideDeposit = totalXAmount.isZero() || totalYAmount.isZero();
     const programMethod = isOneSideDeposit ? this.program.methods.addLiquidityOneSide(oneSideLiquidityParams) : this.program.methods.addLiquidityByWeight(liquidityParams);
     if (xYAmountDistribution.length < MAX_BIN_LENGTH_ALLOWED_IN_ONE_TX) {
-      const addLiqTx2 = await programMethod.accounts(
+      const addLiqIx2 = await programMethod.accounts(
         isOneSideDeposit ? oneSideAddLiquidityAccounts : addLiquidityAccounts
-      ).preInstructions([setComputeUnitLimitIx, ...preInstructions]).postInstructions(postInstructions).transaction();
+      ).instruction();
+      const instructions = [...preInstructions, addLiqIx2, ...postInstructions];
+      const setCUIx2 = await getEstimatedComputeUnitIxWithBuffer(
+        this.program.provider.connection,
+        instructions,
+        user
+      );
+      instructions.unshift(setCUIx2);
       const { blockhash: blockhash2, lastValidBlockHeight: lastValidBlockHeight2 } = await this.program.provider.connection.getLatestBlockhash("confirmed");
       return new Transaction({
         blockhash: blockhash2,
         lastValidBlockHeight: lastValidBlockHeight2,
         feePayer: user
-      }).add(addLiqTx2);
+      }).add(...instructions);
     }
-    const addLiqTx = await programMethod.accounts(
+    const addLiqIx = await programMethod.accounts(
       isOneSideDeposit ? oneSideAddLiquidityAccounts : addLiquidityAccounts
-    ).preInstructions([setComputeUnitLimitIx]).transaction();
+    ).instruction();
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      [addLiqIx],
+      user
+    );
+    const mainInstructions = [setCUIx, addLiqIx];
     const transactions = [];
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     if (preInstructions.length) {
@@ -9769,7 +9910,7 @@ var DLMM = class {
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(addLiqTx);
+    }).add(...mainInstructions);
     transactions.push(mainTx);
     if (postInstructions.length) {
       const postInstructionsTx = new Transaction({
@@ -9801,8 +9942,8 @@ var DLMM = class {
   }) {
     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 lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN10(1));
     const [binArrayLower] = deriveBinArray(
       lbPair,
       lowerBinArrayIndex,
@@ -9814,8 +9955,6 @@ var DLMM = class {
       this.program.programId
     );
     const preInstructions = [];
-    const setComputeUnitLimitIx = computeBudgetIx();
-    preInstructions.push(setComputeUnitLimitIx);
     const walletToReceiveFee = feeOwner.equals(PublicKey6.default) ? user : feeOwner;
     const [
       { ataPubKey: userTokenX, ix: createPayerTokenXIx },
@@ -9882,7 +10021,7 @@ var DLMM = class {
           user
         );
         rewardAtaIx && preInstructions.push(rewardAtaIx);
-        const claimRewardIx = await this.program.methods.claimReward(new BN9(i)).accounts({
+        const claimRewardIx = await this.program.methods.claimReward(new BN10(i)).accounts({
           lbPair: this.pubkey,
           sender: user,
           position,
@@ -9919,11 +10058,11 @@ var DLMM = class {
     }
     const minBinId = Math.min(...binIds);
     const maxBinId = Math.max(...binIds);
-    const minBinArrayIndex = binIdToBinArrayIndex(new BN9(minBinId));
-    const maxBinArrayIndex = binIdToBinArrayIndex(new BN9(maxBinId));
+    const minBinArrayIndex = binIdToBinArrayIndex(new BN10(minBinId));
+    const maxBinArrayIndex = binIdToBinArrayIndex(new BN10(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(minBinId, maxBinId, bps.toNumber()).accounts({
+    const removeLiquidityIx = await this.program.methods.removeLiquidityByRange(minBinId, maxBinId, bps.toNumber()).accounts({
       position,
       lbPair,
       userTokenX,
@@ -9938,26 +10077,43 @@ var DLMM = class {
       tokenXProgram: TOKEN_PROGRAM_ID2,
       tokenYProgram: TOKEN_PROGRAM_ID2,
       sender: user
-    }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
-    const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
+    }).instruction();
+    const instructions = [
+      ...preInstructions,
+      removeLiquidityIx,
+      ...postInstructions
+    ];
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      instructions,
+      user
+    );
+    instructions.unshift(setCUIx);
     if (secondTransactionsIx.length) {
+      const setCUIx2 = await getEstimatedComputeUnitIxWithBuffer(
+        this.program.provider.connection,
+        secondTransactionsIx,
+        user
+      );
+      const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
       const claimRewardsTx = new Transaction({
         blockhash,
         lastValidBlockHeight,
         feePayer: user
-      }).add(...secondTransactionsIx);
+      }).add(setCUIx2, ...secondTransactionsIx);
       const mainTx = new Transaction({
         blockhash,
         lastValidBlockHeight,
         feePayer: user
-      }).add(removeLiquidityTx);
+      }).add(...instructions);
       return [mainTx, claimRewardsTx];
     } else {
+      const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
       return new Transaction({
         blockhash,
         lastValidBlockHeight,
         feePayer: user
-      }).add(removeLiquidityTx);
+      }).add(...instructions);
     }
   }
   /**
@@ -9974,13 +10130,13 @@ var DLMM = class {
     const { lowerBinId } = await this.program.account.positionV2.fetch(
       position.publicKey
     );
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
     const [binArrayLower] = deriveBinArray(
       this.pubkey,
       lowerBinArrayIndex,
       this.program.programId
     );
-    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN9(1));
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN10(1));
     const [binArrayUpper] = deriveBinArray(
       this.pubkey,
       upperBinArrayIndex,
@@ -10021,7 +10177,7 @@ var DLMM = class {
     const currentTimestamp = Date.now() / 1e3;
     let outAmountLeft = outAmount;
     let vParameterClone = Object.assign({}, this.lbPair.vParameters);
-    let activeId = new BN9(this.lbPair.activeId);
+    let activeId = new BN10(this.lbPair.activeId);
     const binStep = this.lbPair.binStep;
     const sParameters2 = this.lbPair.parameters;
     this.updateReference(
@@ -10032,9 +10188,9 @@ var DLMM = class {
     );
     let startBinId = activeId;
     let binArraysForSwap = /* @__PURE__ */ new Map();
-    let actualInAmount = new BN9(0);
-    let feeAmount = new BN9(0);
-    let protocolFeeAmount = new BN9(0);
+    let actualInAmount = new BN10(0);
+    let feeAmount = new BN10(0);
+    let protocolFeeAmount = new BN10(0);
     while (!outAmountLeft.isZero()) {
       let binArrayAccountToSwap = findNextBinArrayWithLiquidity(
         swapForY,
@@ -10077,9 +10233,9 @@ var DLMM = class {
       }
       if (!outAmountLeft.isZero()) {
         if (swapForY) {
-          activeId = activeId.sub(new BN9(1));
+          activeId = activeId.sub(new BN10(1));
         } else {
-          activeId = activeId.add(new BN9(1));
+          activeId = activeId.add(new BN10(1));
         }
       }
     }
@@ -10091,8 +10247,8 @@ var DLMM = class {
       activeId.toNumber(),
       this.lbPair.binStep
     );
-    const priceImpact = startPrice.sub(endPrice).abs().div(startPrice).mul(new Decimal4(100));
-    const maxInAmount = actualInAmount.mul(new BN9(BASIS_POINT_MAX).add(allowedSlippage)).div(new BN9(BASIS_POINT_MAX));
+    const priceImpact = startPrice.sub(endPrice).abs().div(startPrice).mul(new Decimal5(100));
+    const maxInAmount = actualInAmount.mul(new BN10(BASIS_POINT_MAX).add(allowedSlippage)).div(new BN10(BASIS_POINT_MAX));
     return {
       inAmount: actualInAmount,
       maxInAmount,
@@ -10125,7 +10281,7 @@ var DLMM = class {
     const currentTimestamp = Date.now() / 1e3;
     let inAmountLeft = inAmount;
     let vParameterClone = Object.assign({}, this.lbPair.vParameters);
-    let activeId = new BN9(this.lbPair.activeId);
+    let activeId = new BN10(this.lbPair.activeId);
     const binStep = this.lbPair.binStep;
     const sParameters2 = this.lbPair.parameters;
     this.updateReference(
@@ -10136,9 +10292,9 @@ var DLMM = class {
     );
     let startBin = null;
     let binArraysForSwap = /* @__PURE__ */ new Map();
-    let actualOutAmount = new BN9(0);
-    let feeAmount = new BN9(0);
-    let protocolFeeAmount = new BN9(0);
+    let actualOutAmount = new BN10(0);
+    let feeAmount = new BN10(0);
+    let protocolFeeAmount = new BN10(0);
     while (!inAmountLeft.isZero()) {
       let binArrayAccountToSwap = findNextBinArrayWithLiquidity(
         swapForY,
@@ -10188,9 +10344,9 @@ var DLMM = class {
       }
       if (!inAmountLeft.isZero()) {
         if (swapForY) {
-          activeId = activeId.sub(new BN9(1));
+          activeId = activeId.sub(new BN10(1));
         } else {
-          activeId = activeId.add(new BN9(1));
+          activeId = activeId.add(new BN10(1));
         }
       }
     }
@@ -10208,8 +10364,8 @@ var DLMM = class {
       ),
       swapForY
     );
-    const priceImpact = new Decimal4(actualOutAmount.toString()).sub(new Decimal4(outAmountWithoutSlippage.toString())).div(new Decimal4(outAmountWithoutSlippage.toString())).mul(new Decimal4(100));
-    const minOutAmount = actualOutAmount.mul(new BN9(BASIS_POINT_MAX).sub(allowedSlippage)).div(new BN9(BASIS_POINT_MAX));
+    const priceImpact = new Decimal5(actualOutAmount.toString()).sub(new Decimal5(outAmountWithoutSlippage.toString())).div(new Decimal5(outAmountWithoutSlippage.toString())).mul(new Decimal5(100));
+    const minOutAmount = actualOutAmount.mul(new BN10(BASIS_POINT_MAX).sub(allowedSlippage)).div(new BN10(BASIS_POINT_MAX));
     const endPrice = getPriceOfBinByBinId(
       activeId.toNumber(),
       this.lbPair.binStep
@@ -10235,7 +10391,8 @@ var DLMM = class {
     binArraysPubkey
   }) {
     const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
-    const preInstructions = [computeBudgetIx()];
+    const preInstructions = [];
+    const postInstructions = [];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
       { ataPubKey: userTokenOut, ix: createOutTokenAccountIx }
@@ -10260,8 +10417,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);
@@ -10276,7 +10434,7 @@ var DLMM = class {
         pubkey
       };
     });
-    const swapTx = await this.program.methods.swapExactOut(maxInAmount, outAmount).accounts({
+    const swapIx = await this.program.methods.swapExactOut(maxInAmount, outAmount).accounts({
       lbPair,
       reserveX,
       reserveY,
@@ -10290,13 +10448,20 @@ var DLMM = class {
       binArrayBitmapExtension: this.binArrayBitmapExtension ? this.binArrayBitmapExtension.publicKey : null,
       oracle,
       hostFeeIn: null
-    }).remainingAccounts(binArrays).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
+    }).remainingAccounts(binArrays).instruction();
+    const instructions = [...preInstructions, swapIx, ...postInstructions];
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      instructions,
+      user
+    );
+    instructions.unshift(setCUIx);
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return new Transaction({
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(swapTx);
+    }).add(...instructions);
   }
   /**
    * Returns a transaction to be signed and sent by user performing swap.
@@ -10320,7 +10485,8 @@ var DLMM = class {
     binArraysPubkey
   }) {
     const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
-    const preInstructions = [computeBudgetIx()];
+    const preInstructions = [];
+    const postInstructions = [];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
       { ataPubKey: userTokenOut, ix: createOutTokenAccountIx }
@@ -10345,8 +10511,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);
@@ -10361,7 +10528,7 @@ var DLMM = class {
         pubkey
       };
     });
-    const swapTx = await this.program.methods.swapWithPriceImpact(
+    const swapIx = await this.program.methods.swapWithPriceImpact(
       inAmount,
       this.lbPair.activeId,
       priceImpact.toNumber()
@@ -10379,13 +10546,20 @@ var DLMM = class {
       binArrayBitmapExtension: this.binArrayBitmapExtension ? this.binArrayBitmapExtension.publicKey : null,
       oracle,
       hostFeeIn: null
-    }).remainingAccounts(binArrays).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
+    }).remainingAccounts(binArrays).instruction();
+    const instructions = [...preInstructions, swapIx, ...postInstructions];
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      instructions,
+      user
+    );
+    instructions.unshift(setCUIx);
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return new Transaction({
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(swapTx);
+    }).add(...instructions);
   }
   /**
    * Returns a transaction to be signed and sent by user performing swap.
@@ -10409,7 +10583,8 @@ var DLMM = class {
     binArraysPubkey
   }) {
     const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
-    const preInstructions = [computeBudgetIx()];
+    const preInstructions = [];
+    const postInstructions = [];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
       { ataPubKey: userTokenOut, ix: createOutTokenAccountIx }
@@ -10434,8 +10609,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);
@@ -10450,7 +10626,7 @@ var DLMM = class {
         pubkey
       };
     });
-    const swapTx = await this.program.methods.swap(inAmount, minOutAmount).accounts({
+    const swapIx = await this.program.methods.swap(inAmount, minOutAmount).accounts({
       lbPair,
       reserveX,
       reserveY,
@@ -10466,13 +10642,20 @@ var DLMM = class {
       binArrayBitmapExtension: this.binArrayBitmapExtension ? this.binArrayBitmapExtension.publicKey : null,
       oracle,
       hostFeeIn: null
-    }).remainingAccounts(binArrays).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
+    }).remainingAccounts(binArrays).instruction();
+    const instructions = [...preInstructions, swapIx, ...postInstructions];
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      instructions,
+      user
+    );
+    instructions.unshift(setCUIx);
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return new Transaction({
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(swapTx);
+    }).add(...instructions);
   }
   /**
    * The claimLMReward function is used to claim rewards for a specific position owned by a specific owner.
@@ -10491,12 +10674,18 @@ var DLMM = class {
     });
     if (!claimTransactions.length)
       return;
+    const instructions = claimTransactions.map((t) => t.instructions).flat();
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      instructions,
+      owner
+    );
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return new Transaction({
       blockhash,
       lastValidBlockHeight,
       feePayer: owner
-    }).add(...claimTransactions);
+    }).add(setCUIx, ...claimTransactions);
   }
   /**
    * The `claimAllLMRewards` function is used to claim all liquidity mining rewards for a given owner
@@ -10522,6 +10711,14 @@ var DLMM = class {
       })
     )).flat();
     const chunkedClaimAllTx = chunks(claimAllTxs, MAX_CLAIM_ALL_ALLOWED);
+    if (chunkedClaimAllTx.length === 0)
+      return [];
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      // First tx simulation will success because it will create all the ATA. Then, we use the simulated CU as references for the rest
+      chunkedClaimAllTx[0].map((t) => t.instructions).flat(),
+      owner
+    );
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return Promise.all(
       chunkedClaimAllTx.map(async (claimAllTx) => {
@@ -10529,7 +10726,7 @@ var DLMM = class {
           feePayer: owner,
           blockhash,
           lastValidBlockHeight
-        }).add(computeBudgetIx()).add(...claimAllTx);
+        }).add(setCUIx).add(...claimAllTx);
       })
     );
   }
@@ -10588,14 +10785,22 @@ var DLMM = class {
       })
     )).flat();
     const chunkedClaimAllTx = chunks(claimAllTxs, MAX_CLAIM_ALL_ALLOWED);
+    if (chunkedClaimAllTx.length === 0)
+      return [];
+    const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+      this.program.provider.connection,
+      // First tx simulation will success because it will create all the ATA. Then, we use the simulated CU as references for the rest
+      chunkedClaimAllTx[0].map((t) => t.instructions).flat(),
+      owner
+    );
+    const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return Promise.all(
       chunkedClaimAllTx.map(async (claimAllTx) => {
-        const { recentBlockhash, lastValidBlockHeight } = claimAllTx[0];
         return new Transaction({
           feePayer: owner,
-          blockhash: recentBlockhash,
+          blockhash,
           lastValidBlockHeight
-        }).add(computeBudgetIx()).add(...claimAllTx);
+        }).add(setCUIx).add(...claimAllTx);
       })
     );
   }
@@ -10662,11 +10867,22 @@ var DLMM = class {
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return Promise.all(
       claimAllTxs.map(async (claimAllTx) => {
+        const mainInstructions = claimAllTx.map((t) => t.instructions).flat();
+        const instructions = [
+          ...preInstructions,
+          ...mainInstructions,
+          ...postInstructions
+        ];
+        const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+          this.program.provider.connection,
+          instructions,
+          owner
+        );
         const tx = new Transaction({
           feePayer: owner,
           blockhash,
           lastValidBlockHeight
-        }).add(computeBudgetIx());
+        }).add(setCUIx);
         if (preInstructions.length)
           tx.add(...preInstructions);
         tx.add(...claimAllTx);
@@ -10687,15 +10903,15 @@ var DLMM = class {
    * @returns {Promise<SeedLiquidityResponse>}
    */
   async seedLiquidity(owner, seedAmount, curvature, minPrice, maxPrice, base) {
-    const toLamportMultiplier = new Decimal4(
+    const toLamportMultiplier = new Decimal5(
       10 ** (this.tokenY.decimal - this.tokenX.decimal)
     );
-    const minPricePerLamport = new Decimal4(minPrice).mul(toLamportMultiplier);
-    const maxPricePerLamport = new Decimal4(maxPrice).mul(toLamportMultiplier);
-    const minBinId = new BN9(
+    const minPricePerLamport = new Decimal5(minPrice).mul(toLamportMultiplier);
+    const maxPricePerLamport = new Decimal5(maxPrice).mul(toLamportMultiplier);
+    const minBinId = new BN10(
       DLMM.getBinIdFromPrice(minPricePerLamport, this.lbPair.binStep, false)
     );
-    const maxBinId = new BN9(
+    const maxBinId = new BN10(
       DLMM.getBinIdFromPrice(maxPricePerLamport, this.lbPair.binStep, true)
     );
     if (minBinId.toNumber() < this.lbPair.activeId) {
@@ -10714,7 +10930,7 @@ var DLMM = class {
       maxBinId,
       k
     );
-    const decompressMultiplier = new BN9(10 ** this.tokenX.decimal);
+    const decompressMultiplier = new BN10(10 ** this.tokenX.decimal);
     let { compressedBinAmount, compressionLoss } = compressBinAmount(
       binDepositAmount,
       decompressMultiplier
@@ -10726,10 +10942,10 @@ var DLMM = class {
       compressedBinAmount,
       compressionLoss,
       decompressMultiplier,
-      new BN9(2 ** 32 - 1)
+      new BN10(2 ** 32 - 1)
       // u32
     );
-    const positionCount = getPositionCount(minBinId, maxBinId.sub(new BN9(1)));
+    const positionCount = getPositionCount(minBinId, maxBinId.sub(new BN10(1)));
     const seederTokenX = getAssociatedTokenAddressSync2(
       this.lbPair.tokenXMint,
       owner,
@@ -10739,8 +10955,8 @@ var DLMM = class {
     const addLiquidityIxs = [];
     const appendedInitBinArrayIx = /* @__PURE__ */ new Set();
     for (let i = 0; i < positionCount.toNumber(); i++) {
-      const lowerBinId = minBinId.add(MAX_BIN_PER_POSITION.mul(new BN9(i)));
-      const upperBinId = lowerBinId.add(MAX_BIN_PER_POSITION).sub(new BN9(1));
+      const lowerBinId = minBinId.add(MAX_BIN_PER_POSITION.mul(new BN10(i)));
+      const upperBinId = lowerBinId.add(MAX_BIN_PER_POSITION).sub(new BN10(1));
       const lowerBinArrayIndex = binIdToBinArrayIndex(lowerBinId);
       const upperBinArrayIndex = binIdToBinArrayIndex(upperBinId);
       const [positionPda, _bump] = derivePosition(
@@ -10765,7 +10981,7 @@ var DLMM = class {
         upperBinArray,
         positionPda
       ]);
-      let instructions = [computeBudgetIx()];
+      let instructions = [];
       const lowerBinArrayAccount = accounts[0];
       if (!lowerBinArrayAccount && !appendedInitBinArrayIx.has(lowerBinArray.toBase58())) {
         instructions.push(
@@ -10804,10 +11020,17 @@ var DLMM = class {
         );
       }
       if (instructions.length > 1) {
+        instructions.push(
+          await getEstimatedComputeUnitIxWithBuffer(
+            this.program.provider.connection,
+            instructions,
+            owner
+          )
+        );
         initializeBinArraysAndPositionIxs.push(instructions);
-        instructions = [computeBudgetIx()];
+        instructions = [];
       }
-      const positionDeposited = positionAccount && this.program.coder.accounts.decode("positionV2", positionAccount.data).liquidityShares.reduce((total, cur) => total.add(cur), new BN9(0)).gt(new BN9(0));
+      const positionDeposited = positionAccount && this.program.coder.accounts.decode("positionV2", positionAccount.data).liquidityShares.reduce((total, cur) => total.add(cur), new BN10(0)).gt(new BN10(0));
       if (!positionDeposited) {
         const cappedUpperBinId = Math.min(
           upperBinId.toNumber(),
@@ -10861,7 +11084,12 @@ var DLMM = class {
             }).instruction()
           );
         }
-        addLiquidityIxs.push(instructions);
+        addLiquidityIxs.push([
+          ComputeBudgetProgram2.setComputeUnitLimit({
+            units: DEFAULT_ADD_LIQUIDITY_CU
+          }),
+          ...instructions
+        ]);
       }
     }
     return {
@@ -10872,37 +11100,37 @@ var DLMM = class {
   /**
   * The `seedLiquidity` function create multiple grouped instructions. The grouped instructions will be either [initialize bin array + initialize position instructions] or [deposit instruction] combination.
   * @param
-  *    - `owner`: The public key of the positions owner.
+  *    - `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(owner, base, seedAmount, price, roundingUp, feeOwner, operator, lockReleasePoint) {
-    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);
+  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 BN10(binIdNumber);
     const lowerBinArrayIndex = binIdToBinArrayIndex(binId);
-    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN9(1));
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN10(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 operatorTokenX = getAssociatedTokenAddressSync2(
-      this.lbPair.tokenXMint,
-      operator,
-      true
-    );
-    const ownerTokenX = getAssociatedTokenAddressSync2(
-      this.lbPair.tokenXMint,
-      owner,
-      true
-    );
+    const [positionPda] = derivePosition(this.pubkey, base, binId, new BN10(1), this.program.programId);
     const preInstructions = [];
     const [
       { ataPubKey: userTokenX, ix: createPayerTokenXIx },
@@ -10911,17 +11139,22 @@ var DLMM = class {
       getOrCreateATAInstruction(
         this.program.provider.connection,
         this.tokenX.publicKey,
-        owner
+        operator,
+        payer
       ),
       getOrCreateATAInstruction(
         this.program.provider.connection,
         this.tokenY.publicKey,
-        owner
+        operator,
+        payer
       )
     ]);
     createPayerTokenXIx && preInstructions.push(createPayerTokenXIx);
     createPayerTokenYIx && preInstructions.push(createPayerTokenYIx);
-    let [binArrayBitmapExtension] = deriveBinArrayBitmapExtension(this.pubkey, this.program.programId);
+    let [binArrayBitmapExtension] = deriveBinArrayBitmapExtension(
+      this.pubkey,
+      this.program.programId
+    );
     const accounts = await this.program.provider.connection.getMultipleAccountsInfo([
       lowerBinArray,
       upperBinArray,
@@ -10933,13 +11166,38 @@ var DLMM = class {
       if (!bitmapExtensionAccount) {
         preInstructions.push(await this.program.methods.initializeBinArrayBitmapExtension().accounts({
           binArrayBitmapExtension,
-          funder: owner,
+          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];
@@ -10947,7 +11205,7 @@ var DLMM = class {
       preInstructions.push(
         await this.program.methods.initializeBinArray(lowerBinArrayIndex).accounts({
           binArray: lowerBinArray,
-          funder: owner,
+          funder: payer,
           lbPair: this.pubkey
         }).instruction()
       );
@@ -10956,22 +11214,27 @@ var DLMM = class {
       preInstructions.push(
         await this.program.methods.initializeBinArray(upperBinArrayIndex).accounts({
           binArray: upperBinArray,
-          funder: owner,
+          funder: payer,
           lbPair: this.pubkey
         }).instruction()
       );
     }
     if (!positionAccount) {
       preInstructions.push(
-        await this.program.methods.initializePositionByOperator(binId.toNumber(), 1, feeOwner, lockReleasePoint).accounts({
-          payer: owner,
+        await this.program.methods.initializePositionByOperator(
+          binId.toNumber(),
+          1,
+          feeOwner,
+          lockReleasePoint
+        ).accounts({
+          payer,
           base,
           position: positionPda,
           lbPair: this.pubkey,
-          owner,
+          owner: positionOwner,
           operator,
           operatorTokenX,
-          ownerTokenX
+          ownerTokenX: positionOwnerTokenX
         }).instruction()
       );
     }
@@ -10982,7 +11245,7 @@ var DLMM = class {
     };
     const addLiquidityParams = {
       amountX: seedAmount,
-      amountY: new BN9(0),
+      amountY: new BN10(0),
       binLiquidityDist: [binLiquidityDist]
     };
     const depositLiquidityIx = await this.program.methods.addLiquidity(addLiquidityParams).accounts({
@@ -10997,7 +11260,7 @@ var DLMM = class {
       tokenYMint: this.lbPair.tokenYMint,
       binArrayLower: lowerBinArray,
       binArrayUpper: upperBinArray,
-      sender: owner,
+      sender: operator,
       tokenXProgram: TOKEN_PROGRAM_ID2,
       tokenYProgram: TOKEN_PROGRAM_ID2
     }).instruction();
@@ -11071,7 +11334,7 @@ var DLMM = class {
       owner,
       true
     );
-    let initializePositionByOperatorTx = await this.program.methods.initializePositionByOperator(
+    const initializePositionByOperatorTx = await this.program.methods.initializePositionByOperator(
       lowerBinId.toNumber(),
       MAX_BIN_PER_POSITION.toNumber(),
       feeOwner,
@@ -11179,11 +11442,22 @@ var DLMM = class {
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return Promise.all(
       chunkedClaimAllTx.map(async (claimAllTx) => {
+        const mainIxs = claimAllTx.map((t) => t.instructions).flat();
+        const instructions = [
+          ...preInstructions,
+          ...mainIxs,
+          ...postInstructions
+        ];
+        const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
+          this.program.provider.connection,
+          instructions,
+          owner
+        );
         const tx = new Transaction({
           feePayer: owner,
           blockhash,
           lastValidBlockHeight
-        }).add(computeBudgetIx());
+        }).add(setCUIx);
         if (preInstructions.length)
           tx.add(...preInstructions);
         tx.add(...claimAllTx);
@@ -11205,12 +11479,12 @@ var DLMM = class {
       false
     );
     const marketPriceBinArrayIndex = binIdToBinArrayIndex(
-      new BN9(marketPriceBinId)
+      new BN10(marketPriceBinId)
     );
     const swapForY = marketPriceBinId < activeBinId;
     const toBinArrayIndex = findNextBinArrayIndexWithLiquidity(
       swapForY,
-      new BN9(activeBinId),
+      new BN10(activeBinId),
       this.lbPair,
       this.binArrayBitmapExtension?.account ?? null
     );
@@ -11243,11 +11517,11 @@ var DLMM = class {
         "Unable to sync with market price due to bin with liquidity between current and market price bin"
       );
     }
-    const fromBinArrayIndex = binIdToBinArrayIndex(new BN9(activeBinId));
+    const fromBinArrayIndex = binIdToBinArrayIndex(new BN10(activeBinId));
     const swapForY = marketPriceBinId < activeBinId;
     const toBinArrayIndex = findNextBinArrayIndexWithLiquidity(
       swapForY,
-      new BN9(activeBinId),
+      new BN10(activeBinId),
       this.lbPair,
       this.binArrayBitmapExtension?.account ?? null
     );
@@ -11344,7 +11618,7 @@ var DLMM = class {
     const amount1 = isWithdrawForY ? amountY : amountX;
     const remainAmountX = bin.amountX.sub(amountX);
     const remainAmountY = bin.amountY.sub(amountY);
-    if (amount0.eq(new BN9(0))) {
+    if (amount0.eq(new BN10(0))) {
       return {
         withdrawAmount: amount1
       };
@@ -11376,19 +11650,19 @@ var DLMM = class {
     };
   }
   async getWithdrawSingleSideAmount(positionPubkey, isWithdrawForY) {
-    let totalWithdrawAmount = new BN9(0);
+    let totalWithdrawAmount = new BN10(0);
     let lowerBinArray;
     let upperBinArray;
     const position = await this.program.account.positionV2.fetch(
       positionPubkey
     );
-    const lowerBinArrayIdx = binIdToBinArrayIndex(new BN9(position.lowerBinId));
+    const lowerBinArrayIdx = binIdToBinArrayIndex(new BN10(position.lowerBinId));
     const [lowerBinArrayPubKey] = deriveBinArray(
       position.lbPair,
       lowerBinArrayIdx,
       this.program.programId
     );
-    const upperBinArrayIdx = lowerBinArrayIdx.add(new BN9(1));
+    const upperBinArrayIdx = lowerBinArrayIdx.add(new BN10(1));
     const [upperBinArrayPubKey] = deriveBinArray(
       position.lbPair,
       upperBinArrayIdx,
@@ -11400,10 +11674,10 @@ var DLMM = class {
     ]);
     for (let idx = 0; idx < position.liquidityShares.length; idx++) {
       const shareToRemove = position.liquidityShares[idx];
-      if (shareToRemove.eq(new BN9(0))) {
+      if (shareToRemove.eq(new BN10(0))) {
         continue;
       }
-      const binId = new BN9(position.lowerBinId).add(new BN9(idx));
+      const binId = new BN10(position.lowerBinId).add(new BN10(idx));
       const binArrayIndex = binIdToBinArrayIndex(binId);
       const binArray = binArrayIndex.eq(lowerBinArrayIdx) ? lowerBinArray : upperBinArray;
       if (!binArray) {
@@ -11411,15 +11685,15 @@ var DLMM = class {
       }
       const bin = getBinFromBinArray(binId.toNumber(), binArray);
       if (isWithdrawForY) {
-        if (binId.gt(new BN9(this.lbPair.activeId))) {
+        if (binId.gt(new BN10(this.lbPair.activeId))) {
           break;
         }
       } else {
-        if (binId.lt(new BN9(this.lbPair.activeId))) {
+        if (binId.lt(new BN10(this.lbPair.activeId))) {
           continue;
         }
       }
-      const price = getQPriceFromId(binId, new BN9(this.lbPair.binStep));
+      const price = getQPriceFromId(binId, new BN10(this.lbPair.binStep));
       const { withdrawAmount } = this.getAmountOutWithdrawSingleSide(
         shareToRemove,
         price,
@@ -11463,20 +11737,20 @@ var DLMM = class {
     ]);
   }
   static async getClaimableLMReward(program, positionVersion, lbPair, onChainTimestamp, position, lowerBinArray, upperBinArray) {
-    const lowerBinArrayIdx = binIdToBinArrayIndex(new BN9(position.lowerBinId));
-    let rewards = [new BN9(0), new BN9(0)];
+    const lowerBinArrayIdx = binIdToBinArrayIndex(new BN10(position.lowerBinId));
+    let rewards = [new BN10(0), new BN10(0)];
     let _lowerBinArray = lowerBinArray;
     let _upperBinArray = upperBinArray;
     if (!lowerBinArray || !upperBinArray) {
       const lowerBinArrayIdx2 = binIdToBinArrayIndex(
-        new BN9(position.lowerBinId)
+        new BN10(position.lowerBinId)
       );
       const [lowerBinArray2] = deriveBinArray(
         position.lbPair,
         lowerBinArrayIdx2,
         program.programId
       );
-      const upperBinArrayIdx = lowerBinArrayIdx2.add(new BN9(1));
+      const upperBinArrayIdx = lowerBinArrayIdx2.add(new BN10(1));
       const [upperBinArray2] = deriveBinArray(
         position.lbPair,
         upperBinArrayIdx,
@@ -11490,7 +11764,7 @@ var DLMM = class {
     if (!_lowerBinArray || !_upperBinArray)
       throw new Error("BinArray not found");
     for (let i = position.lowerBinId; i <= position.upperBinId; i++) {
-      const binArrayIdx = binIdToBinArrayIndex(new BN9(i));
+      const binArrayIdx = binIdToBinArrayIndex(new BN10(i));
       const binArray = binArrayIdx.eq(lowerBinArrayIdx) ? _lowerBinArray : _upperBinArray;
       const binState = getBinFromBinArray(i, binArray);
       const binIdxInPosition = i - position.lowerBinId;
@@ -11501,7 +11775,7 @@ var DLMM = class {
         if (!pairRewardInfo.mint.equals(PublicKey6.default)) {
           let rewardPerTokenStored = binState.rewardPerTokenStored[j];
           if (i == lbPair.activeId && !binState.liquiditySupply.isZero()) {
-            const currentTime = new BN9(
+            const currentTime = new BN10(
               Math.min(
                 onChainTimestamp,
                 pairRewardInfo.rewardDurationEnd.toNumber()
@@ -11509,7 +11783,7 @@ var DLMM = class {
             );
             const delta2 = currentTime.sub(pairRewardInfo.lastUpdateTime);
             const liquiditySupply = binArray.version == 0 ? binState.liquiditySupply : binState.liquiditySupply.shrn(64);
-            const rewardPerTokenStoredDelta = pairRewardInfo.rewardRate.mul(delta2).div(new BN9(15)).div(liquiditySupply);
+            const rewardPerTokenStoredDelta = pairRewardInfo.rewardRate.mul(delta2).div(new BN10(15)).div(liquiditySupply);
             rewardPerTokenStored = rewardPerTokenStored.add(
               rewardPerTokenStoredDelta
             );
@@ -11533,21 +11807,21 @@ var DLMM = class {
     };
   }
   static async getClaimableSwapFee(program, positionVersion, position, lowerBinArray, upperBinArray) {
-    const lowerBinArrayIdx = binIdToBinArrayIndex(new BN9(position.lowerBinId));
-    let feeX = new BN9(0);
-    let feeY = new BN9(0);
+    const lowerBinArrayIdx = binIdToBinArrayIndex(new BN10(position.lowerBinId));
+    let feeX = new BN10(0);
+    let feeY = new BN10(0);
     let _lowerBinArray = lowerBinArray;
     let _upperBinArray = upperBinArray;
     if (!lowerBinArray || !upperBinArray) {
       const lowerBinArrayIdx2 = binIdToBinArrayIndex(
-        new BN9(position.lowerBinId)
+        new BN10(position.lowerBinId)
       );
       const [lowerBinArray2] = deriveBinArray(
         position.lbPair,
         lowerBinArrayIdx2,
         program.programId
       );
-      const upperBinArrayIdx = lowerBinArrayIdx2.add(new BN9(1));
+      const upperBinArrayIdx = lowerBinArrayIdx2.add(new BN10(1));
       const [upperBinArray2] = deriveBinArray(
         position.lbPair,
         upperBinArrayIdx,
@@ -11561,7 +11835,7 @@ var DLMM = class {
     if (!_lowerBinArray || !_upperBinArray)
       throw new Error("BinArray not found");
     for (let i = position.lowerBinId; i <= position.upperBinId; i++) {
-      const binArrayIdx = binIdToBinArrayIndex(new BN9(i));
+      const binArrayIdx = binIdToBinArrayIndex(new BN10(i));
       const binArray = binArrayIdx.eq(lowerBinArrayIdx) ? _lowerBinArray : _upperBinArray;
       const binState = getBinFromBinArray(i, binArray);
       const binIdxInPosition = i - position.lowerBinId;
@@ -11607,18 +11881,18 @@ var DLMM = class {
     if (bins[0].binId !== lowerBinId || bins[bins.length - 1].binId !== upperBinId)
       throw new Error("Bin ID mismatch");
     const positionData = [];
-    let totalXAmount = new Decimal4(0);
-    let totalYAmount = new Decimal4(0);
+    let totalXAmount = new Decimal5(0);
+    let totalYAmount = new Decimal5(0);
     bins.forEach((bin, idx) => {
-      const binSupply = new Decimal4(bin.supply.toString());
+      const binSupply = new Decimal5(bin.supply.toString());
       let posShare;
       if (bin.version === 1 && version === 0 /* V1 */) {
-        posShare = new Decimal4(posShares[idx].shln(64).toString());
+        posShare = new Decimal5(posShares[idx].shln(64).toString());
       } else {
-        posShare = new Decimal4(posShares[idx].toString());
+        posShare = new Decimal5(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);
+      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);
       totalYAmount = totalYAmount.add(positionYAmount);
       positionData.push({
@@ -11666,8 +11940,8 @@ var DLMM = class {
     };
   }
   static getBinsBetweenLowerAndUpperBound(lbPair, lowerBinId, upperBinId, baseTokenDecimal, quoteTokenDecimal, lowerBinArrays, upperBinArrays) {
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
-    const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(upperBinId));
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+    const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
     let bins = [];
     if (lowerBinArrayIndex.eq(upperBinArrayIndex)) {
       const binArray = lowerBinArrays;
@@ -11688,7 +11962,7 @@ var DLMM = class {
             supply: bin.liquiditySupply,
             price: pricePerLamport,
             version: binArray.version,
-            pricePerToken: new Decimal4(pricePerLamport).mul(new Decimal4(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
+            pricePerToken: new Decimal5(pricePerLamport).mul(new Decimal5(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
           });
         }
       });
@@ -11712,7 +11986,7 @@ var DLMM = class {
               supply: bin.liquiditySupply,
               price: pricePerLamport,
               version: binArray.version,
-              pricePerToken: new Decimal4(pricePerLamport).mul(new Decimal4(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
+              pricePerToken: new Decimal5(pricePerLamport).mul(new Decimal5(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
             });
           }
         });
@@ -11744,112 +12018,45 @@ var DLMM = class {
       binIds
     };
   }
-  async getBins(lbPairPubKey, lowerBinId, upperBinId, baseTokenDecimal, quoteTokenDecimal, lowerBinArrays, upperBinArrays) {
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
-    const upperBinArrayIndex = binIdToBinArrayIndex(new BN9(upperBinId));
-    let bins = [];
-    if (lowerBinArrayIndex.eq(upperBinArrayIndex)) {
-      const [binArrayPubKey] = deriveBinArray(
-        lbPairPubKey,
-        lowerBinArrayIndex,
-        this.program.programId
-      );
-      const binArray = lowerBinArrays ?? await this.program.account.binArray.fetch(binArrayPubKey).catch(() => {
-        const [lowerBinId2, upperBinId2] = getBinArrayLowerUpperBinId(lowerBinArrayIndex);
-        const binArrayBins = [];
-        for (let i = lowerBinId2.toNumber(); i <= upperBinId2.toNumber(); i++) {
-          binArrayBins.push({
-            amountX: new BN9(0),
-            amountY: new BN9(0),
-            liquiditySupply: new BN9(0),
-            rewardPerTokenStored: [new BN9(0), new BN9(0)],
-            amountXIn: new BN9(0),
-            amountYIn: new BN9(0),
-            feeAmountXPerTokenStored: new BN9(0),
-            feeAmountYPerTokenStored: new BN9(0),
-            price: new BN9(0)
-          });
-        }
-        return {
-          bins: binArrayBins,
-          index: lowerBinArrayIndex,
-          version: 1
-        };
-      });
-      const [lowerBinIdForBinArray] = getBinArrayLowerUpperBinId(
-        binArray.index
-      );
-      binArray.bins.forEach((bin, idx) => {
-        const binId = lowerBinIdForBinArray.toNumber() + idx;
-        if (binId >= lowerBinId && binId <= upperBinId) {
-          const pricePerLamport = getPriceOfBinByBinId(
-            binId,
-            this.lbPair.binStep
-          ).toString();
-          bins.push({
-            binId,
-            xAmount: bin.amountX,
-            yAmount: bin.amountY,
-            supply: bin.liquiditySupply,
-            price: pricePerLamport,
-            version: binArray.version,
-            pricePerToken: new Decimal4(pricePerLamport).mul(new Decimal4(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
-          });
-        }
-      });
-    } else {
-      const [lowerBinArrayPubKey] = deriveBinArray(
-        lbPairPubKey,
-        lowerBinArrayIndex,
-        this.program.programId
-      );
-      const [upperBinArrayPubKey] = deriveBinArray(
-        lbPairPubKey,
-        upperBinArrayIndex,
-        this.program.programId
-      );
-      const binArrays = await (async () => {
-        if (!lowerBinArrays || !upperBinArrays) {
-          return (await this.program.account.binArray.fetchMultiple([
-            lowerBinArrayPubKey,
-            upperBinArrayPubKey
-          ])).filter((binArray) => binArray !== null);
-        }
-        return [lowerBinArrays, upperBinArrays];
-      })();
-      binArrays.forEach((binArray) => {
-        if (!binArray)
-          return;
-        const [lowerBinIdForBinArray] = getBinArrayLowerUpperBinId(
-          binArray.index
-        );
-        binArray.bins.forEach((bin, idx) => {
-          const binId = lowerBinIdForBinArray.toNumber() + idx;
-          if (binId >= lowerBinId && binId <= upperBinId) {
-            const pricePerLamport = getPriceOfBinByBinId(
-              binId,
-              this.lbPair.binStep
-            ).toString();
-            bins.push({
-              binId,
-              xAmount: bin.amountX,
-              yAmount: bin.amountY,
-              supply: bin.liquiditySupply,
-              price: pricePerLamport,
-              version: binArray.version,
-              pricePerToken: new Decimal4(pricePerLamport).mul(new Decimal4(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
-            });
-          }
-        });
-      });
-    }
-    return bins;
+  async getBins(lbPairPubKey, lowerBinId, upperBinId, baseTokenDecimal, quoteTokenDecimal, lowerBinArray, upperBinArray) {
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+    const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
+    const hasCachedLowerBinArray = lowerBinArray != null;
+    const hasCachedUpperBinArray = upperBinArray != null;
+    const isSingleBinArray = lowerBinArrayIndex.eq(upperBinArrayIndex);
+    const lowerBinArrayIndexOffset = hasCachedLowerBinArray ? 1 : 0;
+    const upperBinArrayIndexOffset = hasCachedUpperBinArray ? -1 : 0;
+    const binArrayPubkeys = range(
+      lowerBinArrayIndex.toNumber() + lowerBinArrayIndexOffset,
+      upperBinArrayIndex.toNumber() + upperBinArrayIndexOffset,
+      (i) => deriveBinArray(lbPairPubKey, new BN10(i), this.program.programId)[0]
+    );
+    const fetchedBinArrays = binArrayPubkeys.length !== 0 ? await this.program.account.binArray.fetchMultiple(binArrayPubkeys) : [];
+    const binArrays = [
+      ...hasCachedLowerBinArray ? [lowerBinArray] : [],
+      ...fetchedBinArrays,
+      ...hasCachedUpperBinArray && !isSingleBinArray ? [upperBinArray] : []
+    ];
+    const binsById = new Map(binArrays.filter((x) => x != null).flatMap(({ bins, index }) => {
+      const [lowerBinId2] = getBinArrayLowerUpperBinId(index);
+      return bins.map((b, i) => [lowerBinId2.toNumber() + i, b]);
+    }));
+    const version = binArrays.length !== 0 ? binArrays[0].version : 1;
+    return Array.from(enumerateBins(
+      binsById,
+      lowerBinId,
+      upperBinId,
+      this.lbPair.binStep,
+      baseTokenDecimal,
+      quoteTokenDecimal,
+      version
+    ));
   }
   async binArraysToBeCreate(lowerBinArrayIndex, upperBinArrayIndex) {
     const binArrayIndexes = Array.from(
       { length: upperBinArrayIndex.sub(lowerBinArrayIndex).toNumber() + 1 },
       (_, index) => index + lowerBinArrayIndex.toNumber()
-    ).map((idx) => new BN9(idx));
+    ).map((idx) => new BN10(idx));
     const binArrays = [];
     for (const idx of binArrayIndexes) {
       const [binArrayPubKey] = deriveBinArray(
@@ -11867,7 +12074,7 @@ var DLMM = class {
     const binArrayIndexes = Array.from(
       { length: upperBinArrayIndex.sub(lowerBinArrayIndex).toNumber() + 1 },
       (_, index) => index + lowerBinArrayIndex.toNumber()
-    ).map((idx) => new BN9(idx));
+    ).map((idx) => new BN10(idx));
     for (const idx of binArrayIndexes) {
       const [binArray] = deriveBinArray(
         this.pubkey,
@@ -11915,14 +12122,14 @@ var DLMM = class {
     shouldIncludePreIx = true
   }) {
     const lowerBinArrayIndex = binIdToBinArrayIndex(
-      new BN9(position.positionData.lowerBinId)
+      new BN10(position.positionData.lowerBinId)
     );
     const [binArrayLower] = deriveBinArray(
       this.pubkey,
       lowerBinArrayIndex,
       this.program.programId
     );
-    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN9(1));
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN10(1));
     const [binArrayUpper] = deriveBinArray(
       this.pubkey,
       upperBinArrayIndex,
@@ -11940,7 +12147,7 @@ var DLMM = class {
         owner
       );
       ix && preInstructions.push(ix);
-      const claimTransaction = await this.program.methods.claimReward(new BN9(i)).accounts({
+      const claimTransaction = await this.program.methods.claimReward(new BN10(i)).accounts({
         lbPair: this.pubkey,
         sender: owner,
         position: position.publicKey,
@@ -11962,13 +12169,13 @@ var DLMM = class {
     shouldIncludePostIx = true
   }) {
     const { lowerBinId, feeOwner } = position.positionData;
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
     const [binArrayLower] = deriveBinArray(
       this.pubkey,
       lowerBinArrayIndex,
       this.program.programId
     );
-    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN9(1));
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN10(1));
     const [binArrayUpper] = deriveBinArray(
       this.pubkey,
       upperBinArrayIndex,
@@ -12039,6 +12246,7 @@ export {
   BASIS_POINT_MAX,
   BIN_ARRAY_BITMAP_SIZE,
   BIN_ARRAY_FEE,
+  BinLiquidity,
   BitmapType,
   ClockLayout,
   DLMMError,
@@ -12078,7 +12286,6 @@ export {
   chunkedFetchMultiplePoolAccount,
   chunkedGetMultipleAccountInfos,
   chunks,
-  computeBudgetIx,
   computeFee,
   computeFeeFromAmount,
   computeProtocolFee,
@@ -12094,6 +12301,7 @@ export {
   derivePresetParameter,
   derivePresetParameter2,
   deriveReserve,
+  enumerateBins,
   findNextBinArrayIndexWithLiquidity,
   findNextBinArrayWithLiquidity,
   fromWeightDistributionToAmount,
@@ -12102,6 +12310,8 @@ export {
   getBinArrayLowerUpperBinId,
   getBinArraysRequiredByPositionRange,
   getBinFromBinArray,
+  getEstimatedComputeUnitIxWithBuffer,
+  getEstimatedComputeUnitUsageWithBuffer,
   getOrCreateATAInstruction,
   getOutAmount,
   getPriceOfBinByBinId,
@@ -12113,6 +12323,7 @@ export {
   isBinIdWithinBinArray,
   isOverflowDefaultBinArrayBitmap,
   parseLogs,
+  range,
   swapExactInQuoteAtBin,
   swapExactOutQuoteAtBin,
   toAmountAskSide,