@meteora-ag/dlmm 1.3.3 → 1.3.4

package/dist/index.js

@@ -1,4 +1,16 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/dlmm/index.ts
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/dlmm/index.ts
+var _anchor = require('@coral-xyz/anchor');
+var _bytes = require('@coral-xyz/anchor/dist/cjs/utils/bytes');
+
+
+
+
+
+
+
+
+var _spltoken = require('@solana/spl-token');
+
 
 
 
@@ -6,6 +18,10 @@
 
 
 var _web3js = require('@solana/web3.js');
+var _decimaljs = require('decimal.js'); var _decimaljs2 = _interopRequireDefault(_decimaljs);
+
+// src/dlmm/constants/index.ts
+
 
 // src/dlmm/idl.ts
 var IDL = {
@@ -5260,7 +5276,6 @@ var IDL = {
 
 // src/dlmm/constants/index.ts
 
-var _anchor = require('@coral-xyz/anchor');
 var LBCLMM_PROGRAM_IDS = {
   devnet: "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo",
   localhost: "LbVRzDTvBDEcrthxfZ4RL6yiq3uZw8bS6MwtdY6UhFQ",
@@ -5309,66 +5324,48 @@ var ILM_BASE = new (0, _web3js.PublicKey)(
   "MFGQxwAmB91SwuYX36okv2Qmdc9aMuHTwWGUrp4AtB1"
 );
 
-// src/dlmm/types/index.ts
-var _borsh = require('@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 BitmapType = /* @__PURE__ */ ((BitmapType2) => {
-  BitmapType2[BitmapType2["U1024"] = 0] = "U1024";
-  BitmapType2[BitmapType2["U512"] = 1] = "U512";
-  return BitmapType2;
-})(BitmapType || {});
-var ClockLayout = _borsh.struct.call(void 0, [
-  _borsh.u64.call(void 0, "slot"),
-  _borsh.i64.call(void 0, "epochStartTimestamp"),
-  _borsh.u64.call(void 0, "epoch"),
-  _borsh.u64.call(void 0, "leaderScheduleEpoch"),
-  _borsh.i64.call(void 0, "unixTimestamp")
-]);
-var PairStatus = /* @__PURE__ */ ((PairStatus2) => {
-  PairStatus2[PairStatus2["Enabled"] = 0] = "Enabled";
-  PairStatus2[PairStatus2["Disabled"] = 1] = "Disabled";
-  return PairStatus2;
-})(PairStatus || {});
-
-// src/dlmm/index.ts
+// src/dlmm/error.ts
 
+var DLMMError = class extends Error {
+  
+  
+  
+  constructor(error) {
+    let _errorCode = 0;
+    let _errorName = "Something went wrong";
+    let _errorMessage = "Something went wrong";
+    if (error instanceof Error) {
+      const anchorError = _anchor.AnchorError.parse(
+        JSON.parse(JSON.stringify(error)).logs
+      );
+      if (_optionalChain([anchorError, 'optionalAccess', _18 => _18.program, 'access', _19 => _19.toBase58, 'call', _20 => _20()]) === 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 {
+  
+  
+  constructor(name, message) {
+    super();
+    this.name = name;
+    this.message = message;
+  }
+};
 
 // src/dlmm/helpers/index.ts
 
@@ -5381,7 +5378,7 @@ var PairStatus = /* @__PURE__ */ ((PairStatus2) => {
 
 
 
-var _spltoken = require('@solana/spl-token');
+
 
 
 
@@ -5390,7 +5387,7 @@ var _spltoken = require('@solana/spl-token');
 
 // src/dlmm/helpers/math.ts
 
-var _decimaljs = require('decimal.js'); var _decimaljs2 = _interopRequireDefault(_decimaljs);
+
 
 // src/dlmm/helpers/u64xu64_math.ts
 var _bnjs = require('bn.js'); var _bnjs2 = _interopRequireDefault(_bnjs);
@@ -6344,6 +6341,14 @@ function generateBinAmount(amount, binStep, binId, tokenXDecimal, tokenYDecimal,
   return new (0, _anchor.BN)(c1.sub(c0).floor().toString());
 }
 
+// src/dlmm/helpers/index.ts
+var _helpers = require('@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
 
 function sortTokenMints(tokenX, tokenY) {
@@ -6461,6 +6466,105 @@ function deriveReserve(token, lbPair, programId) {
 // src/dlmm/helpers/binArray.ts
 
 
+
+// src/dlmm/types/index.ts
+
+
+
+
+var _borsh = require('@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 (0, _decimaljs2.default)(pricePerLamport).mul(new (0, _decimaljs2.default)(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
+    };
+  }
+  BinLiquidity3.fromBin = fromBin;
+  function empty(binId, binStep, baseTokenDecimal, quoteTokenDecimal, version) {
+    const pricePerLamport = getPriceOfBinByBinId(
+      binId,
+      binStep
+    ).toString();
+    return {
+      binId,
+      xAmount: new (0, _anchor.BN)(0),
+      yAmount: new (0, _anchor.BN)(0),
+      supply: new (0, _anchor.BN)(0),
+      price: pricePerLamport,
+      version,
+      pricePerToken: new (0, _decimaljs2.default)(pricePerLamport).mul(new (0, _decimaljs2.default)(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
+    };
+  }
+  BinLiquidity3.empty = empty;
+})(BinLiquidity || (BinLiquidity = exports.BinLiquidity = {}));
+var BitmapType = /* @__PURE__ */ ((BitmapType2) => {
+  BitmapType2[BitmapType2["U1024"] = 0] = "U1024";
+  BitmapType2[BitmapType2["U512"] = 1] = "U512";
+  return BitmapType2;
+})(BitmapType || {});
+var ClockLayout = _borsh.struct.call(void 0, [
+  _borsh.u64.call(void 0, "slot"),
+  _borsh.i64.call(void 0, "epochStartTimestamp"),
+  _borsh.u64.call(void 0, "epoch"),
+  _borsh.u64.call(void 0, "leaderScheduleEpoch"),
+  _borsh.i64.call(void 0, "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 (0, _anchor.BN)(1));
@@ -6708,6 +6812,16 @@ 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
 
@@ -7449,7 +7563,7 @@ async function getTokensMintFromPoolAddress(connection, poolAddress, opt) {
   );
   const program = new (0, _anchor.Program)(
     IDL,
-    LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _18 => _18.cluster]), () => ( "mainnet-beta"))],
+    LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _21 => _21.cluster]), () => ( "mainnet-beta"))],
     provider
   );
   const poolAccount = await program.account.lbPair.fetchNullable(
@@ -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(
@@ -7523,7 +7641,7 @@ async function getTokenBalance(conn, tokenAccount) {
 var parseLogs = (eventParser, logs) => {
   if (!logs.length)
     throw new Error("No logs found");
-  for (const event of _optionalChain([eventParser, 'optionalAccess', _19 => _19.parseLogs, 'call', _20 => _20(logs)])) {
+  for (const event of _optionalChain([eventParser, 'optionalAccess', _22 => _22.parseLogs, 'call', _23 => _23(logs)])) {
     return event.data;
   }
   throw new Error("No events found");
@@ -7574,66 +7692,37 @@ async function chunkedGetMultipleAccountInfos(connection, pks, chunkSize = 100)
   )).flat();
   return accountInfos;
 }
-var computeBudgetIx = () => {
-  return _web3js.ComputeBudgetProgram.setComputeUnitLimit({
-    units: 14e5
-  });
-};
-
-// src/dlmm/index.ts
-var _bytes = require('@coral-xyz/anchor/dist/cjs/utils/bytes');
-
-
-
-
-
-
-
-
-
-
-
-// src/dlmm/error.ts
-
-var DLMMError = class extends Error {
-  
-  
-  
-  constructor(error) {
-    let _errorCode = 0;
-    let _errorName = "Something went wrong";
-    let _errorMessage = "Something went wrong";
-    if (error instanceof Error) {
-      const anchorError = _anchor.AnchorError.parse(
-        JSON.parse(JSON.stringify(error)).logs
-      );
-      if (_optionalChain([anchorError, 'optionalAccess', _21 => _21.program, 'access', _22 => _22.toBase58, 'call', _23 => _23()]) === 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 {
-  
-  
-  constructor(name, message) {
-    super();
-    this.name = name;
-    this.message = message;
+  buffer = Math.max(0, buffer);
+  buffer = Math.min(1, buffer);
+  const estimatedComputeUnitUsage = await _helpers.getSimulationComputeUnits.call(void 0, 
+    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 _web3js.ComputeBudgetProgram.setComputeUnitLimit({ units });
 };
 
 // src/dlmm/index.ts
@@ -8785,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 };
   }
@@ -9099,7 +9188,6 @@ var DLMM = class {
     maxBinId,
     user
   }) {
-    const setComputeUnitLimitIx = computeBudgetIx();
     const createPositionIx = await this.program.methods.initializePosition(minBinId, maxBinId - minBinId + 1).accounts({
       payer: user,
       position: positionPubKey,
@@ -9116,12 +9204,18 @@ var DLMM = class {
       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 (0, _web3js.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
@@ -9145,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,
@@ -9246,13 +9339,24 @@ var DLMM = class {
       tokenYProgram: _spltoken.TOKEN_PROGRAM_ID
     };
     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 (0, _web3js.Transaction)({
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(createPositionTx);
+    }).add(...instructions);
   }
   /**
    * The function `initializePositionAndAddLiquidityByWeight` function is used to initializes a position and adds liquidity
@@ -9351,7 +9455,6 @@ 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 (0, _anchor.BN)(minBinId));
@@ -9416,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 (0, _web3js.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) {
@@ -9443,7 +9561,7 @@ var DLMM = class {
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(addLiqTx);
+    }).add(...mainInstructions);
     transactions.push(mainTx);
     if (postInstructions.length) {
       const postInstructionsTx = new (0, _web3js.Transaction)({
@@ -9478,8 +9596,6 @@ 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 (0, _anchor.BN)(minBinId));
     const maxBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(maxBinId));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
@@ -9573,13 +9689,24 @@ var DLMM = class {
       tokenYProgram: _spltoken.TOKEN_PROGRAM_ID
     };
     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 (0, _web3js.Transaction)({
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(createPositionTx);
+    }).add(...instructions);
   }
   /**
    * The `addLiquidityByWeight` function is used to add liquidity to existing position
@@ -9699,7 +9826,6 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const setComputeUnitLimitIx = computeBudgetIx();
     const liquidityParams = {
       amountX: totalXAmount,
       amountY: totalYAmount,
@@ -9744,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 (0, _web3js.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) {
@@ -9771,7 +9910,7 @@ var DLMM = class {
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(addLiqTx);
+    }).add(...mainInstructions);
     transactions.push(mainTx);
     if (postInstructions.length) {
       const postInstructionsTx = new (0, _web3js.Transaction)({
@@ -9816,8 +9955,6 @@ var DLMM = class {
       this.program.programId
     );
     const preInstructions = [];
-    const setComputeUnitLimitIx = computeBudgetIx();
-    preInstructions.push(setComputeUnitLimitIx);
     const walletToReceiveFee = feeOwner.equals(_web3js.PublicKey.default) ? user : feeOwner;
     const [
       { ataPubKey: userTokenX, ix: createPayerTokenXIx },
@@ -9925,7 +10062,7 @@ var DLMM = class {
     const maxBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(maxBinId));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
     const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
-    const removeLiquidityTx = await this.program.methods.removeLiquidityByRange(minBinId, maxBinId, bps.toNumber()).accounts({
+    const removeLiquidityIx = await this.program.methods.removeLiquidityByRange(minBinId, maxBinId, bps.toNumber()).accounts({
       position,
       lbPair,
       userTokenX,
@@ -9940,26 +10077,43 @@ var DLMM = class {
       tokenXProgram: _spltoken.TOKEN_PROGRAM_ID,
       tokenYProgram: _spltoken.TOKEN_PROGRAM_ID,
       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 (0, _web3js.Transaction)({
         blockhash,
         lastValidBlockHeight,
         feePayer: user
-      }).add(...secondTransactionsIx);
+      }).add(setCUIx2, ...secondTransactionsIx);
       const mainTx = new (0, _web3js.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 (0, _web3js.Transaction)({
         blockhash,
         lastValidBlockHeight,
         feePayer: user
-      }).add(removeLiquidityTx);
+      }).add(...instructions);
     }
   }
   /**
@@ -10237,7 +10391,7 @@ 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 },
@@ -10280,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,
@@ -10294,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 (0, _web3js.Transaction)({
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(swapTx);
+    }).add(...instructions);
   }
   /**
    * Returns a transaction to be signed and sent by user performing swap.
@@ -10324,7 +10485,7 @@ 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 },
@@ -10367,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()
@@ -10385,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 (0, _web3js.Transaction)({
       blockhash,
       lastValidBlockHeight,
       feePayer: user
-    }).add(swapTx);
+    }).add(...instructions);
   }
   /**
    * Returns a transaction to be signed and sent by user performing swap.
@@ -10415,7 +10583,7 @@ 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 },
@@ -10458,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,
@@ -10474,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 (0, _web3js.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.
@@ -10499,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 (0, _web3js.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
@@ -10530,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) => {
@@ -10537,7 +10726,7 @@ var DLMM = class {
           feePayer: owner,
           blockhash,
           lastValidBlockHeight
-        }).add(computeBudgetIx()).add(...claimAllTx);
+        }).add(setCUIx).add(...claimAllTx);
       })
     );
   }
@@ -10596,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 (0, _web3js.Transaction)({
           feePayer: owner,
-          blockhash: recentBlockhash,
+          blockhash,
           lastValidBlockHeight
-        }).add(computeBudgetIx()).add(...claimAllTx);
+        }).add(setCUIx).add(...claimAllTx);
       })
     );
   }
@@ -10670,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 (0, _web3js.Transaction)({
           feePayer: owner,
           blockhash,
           lastValidBlockHeight
-        }).add(computeBudgetIx());
+        }).add(setCUIx);
         if (preInstructions.length)
           tx.add(...preInstructions);
         tx.add(...claimAllTx);
@@ -10773,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(
@@ -10812,8 +11020,15 @@ 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 (0, _anchor.BN)(0)).gt(new (0, _anchor.BN)(0));
       if (!positionDeposited) {
@@ -10869,7 +11084,12 @@ var DLMM = class {
             }).instruction()
           );
         }
-        addLiquidityIxs.push(instructions);
+        addLiquidityIxs.push([
+          _web3js.ComputeBudgetProgram.setComputeUnitLimit({
+            units: DEFAULT_ADD_LIQUIDITY_CU
+          }),
+          ...instructions
+        ]);
       }
     }
     return {
@@ -11114,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,
@@ -11222,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 (0, _web3js.Transaction)({
           feePayer: owner,
           blockhash,
           lastValidBlockHeight
-        }).add(computeBudgetIx());
+        }).add(setCUIx);
         if (preInstructions.length)
           tx.add(...preInstructions);
         tx.add(...claimAllTx);
@@ -11787,106 +12018,39 @@ var DLMM = class {
       binIds
     };
   }
-  async getBins(lbPairPubKey, lowerBinId, upperBinId, baseTokenDecimal, quoteTokenDecimal, lowerBinArrays, upperBinArrays) {
+  async getBins(lbPairPubKey, lowerBinId, upperBinId, baseTokenDecimal, quoteTokenDecimal, lowerBinArray, upperBinArray) {
     const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
     const upperBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinId));
-    let bins = [];
-    if (lowerBinArrayIndex.eq(upperBinArrayIndex)) {
-      const [binArrayPubKey] = deriveBinArray(
-        lbPairPubKey,
-        lowerBinArrayIndex,
-        this.program.programId
-      );
-      const binArray = await _asyncNullishCoalesce(lowerBinArrays, async () => ( 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 (0, _anchor.BN)(0),
-            amountY: new (0, _anchor.BN)(0),
-            liquiditySupply: new (0, _anchor.BN)(0),
-            rewardPerTokenStored: [new (0, _anchor.BN)(0), new (0, _anchor.BN)(0)],
-            amountXIn: new (0, _anchor.BN)(0),
-            amountYIn: new (0, _anchor.BN)(0),
-            feeAmountXPerTokenStored: new (0, _anchor.BN)(0),
-            feeAmountYPerTokenStored: new (0, _anchor.BN)(0),
-            price: new (0, _anchor.BN)(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 (0, _decimaljs2.default)(pricePerLamport).mul(new (0, _decimaljs2.default)(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 (0, _decimaljs2.default)(pricePerLamport).mul(new (0, _decimaljs2.default)(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString()
-            });
-          }
-        });
-      });
-    }
-    return bins;
+    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 (0, _anchor.BN)(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(
@@ -12167,5 +12331,9 @@ var src_default = DLMM;
 
 
 
-exports.ADMIN = ADMIN; exports.ActivationType = ActivationType; exports.BASIS_POINT_MAX = BASIS_POINT_MAX; exports.BIN_ARRAY_BITMAP_SIZE = BIN_ARRAY_BITMAP_SIZE; exports.BIN_ARRAY_FEE = BIN_ARRAY_FEE; exports.BitmapType = BitmapType; exports.ClockLayout = ClockLayout; exports.DLMMError = DLMMError; exports.DlmmSdkError = DlmmSdkError; exports.EXTENSION_BINARRAY_BITMAP_SIZE = EXTENSION_BINARRAY_BITMAP_SIZE; exports.FEE_PRECISION = FEE_PRECISION; exports.IDL = IDL; exports.ILM_BASE = ILM_BASE; exports.LBCLMM_PROGRAM_IDS = LBCLMM_PROGRAM_IDS; exports.MAX_ACTIVE_BIN_SLIPPAGE = MAX_ACTIVE_BIN_SLIPPAGE; exports.MAX_BIN_ARRAY_SIZE = MAX_BIN_ARRAY_SIZE; exports.MAX_BIN_LENGTH_ALLOWED_IN_ONE_TX = MAX_BIN_LENGTH_ALLOWED_IN_ONE_TX; exports.MAX_BIN_PER_POSITION = MAX_BIN_PER_POSITION; exports.MAX_BIN_PER_TX = MAX_BIN_PER_TX; exports.MAX_CLAIM_ALL_ALLOWED = MAX_CLAIM_ALL_ALLOWED; exports.MAX_FEE_RATE = MAX_FEE_RATE; exports.Network = Network; exports.POSITION_FEE = POSITION_FEE; exports.PRECISION = PRECISION; exports.PairStatus = PairStatus; exports.PairType = PairType; exports.PositionVersion = PositionVersion; exports.SCALE = SCALE; exports.SCALE_OFFSET = SCALE_OFFSET; exports.SIMULATION_USER = SIMULATION_USER; exports.Strategy = Strategy; exports.StrategyType = StrategyType; exports.autoFillXByStrategy = autoFillXByStrategy; exports.autoFillXByWeight = autoFillXByWeight; exports.autoFillYByStrategy = autoFillYByStrategy; exports.autoFillYByWeight = autoFillYByWeight; exports.binIdToBinArrayIndex = binIdToBinArrayIndex; exports.calculateBidAskDistribution = calculateBidAskDistribution; exports.calculateNormalDistribution = calculateNormalDistribution; exports.calculateSpotDistribution = calculateSpotDistribution; exports.chunkedFetchMultipleBinArrayBitmapExtensionAccount = chunkedFetchMultipleBinArrayBitmapExtensionAccount; exports.chunkedFetchMultiplePoolAccount = chunkedFetchMultiplePoolAccount; exports.chunkedGetMultipleAccountInfos = chunkedGetMultipleAccountInfos; exports.chunks = chunks; exports.computeBudgetIx = computeBudgetIx; exports.computeFee = computeFee; exports.computeFeeFromAmount = computeFeeFromAmount; exports.computeProtocolFee = computeProtocolFee; exports.default = src_default; exports.deriveBinArray = deriveBinArray; exports.deriveBinArrayBitmapExtension = deriveBinArrayBitmapExtension; exports.deriveCustomizablePermissionlessLbPair = deriveCustomizablePermissionlessLbPair; exports.deriveLbPair = deriveLbPair; exports.deriveLbPair2 = deriveLbPair2; exports.deriveOracle = deriveOracle; exports.derivePermissionLbPair = derivePermissionLbPair; exports.derivePosition = derivePosition; exports.derivePresetParameter = derivePresetParameter; exports.derivePresetParameter2 = derivePresetParameter2; exports.deriveReserve = deriveReserve; exports.findNextBinArrayIndexWithLiquidity = findNextBinArrayIndexWithLiquidity; exports.findNextBinArrayWithLiquidity = findNextBinArrayWithLiquidity; exports.fromWeightDistributionToAmount = fromWeightDistributionToAmount; exports.fromWeightDistributionToAmountOneSide = fromWeightDistributionToAmountOneSide; exports.getBaseFee = getBaseFee; exports.getBinArrayLowerUpperBinId = getBinArrayLowerUpperBinId; exports.getBinArraysRequiredByPositionRange = getBinArraysRequiredByPositionRange; exports.getBinFromBinArray = getBinFromBinArray; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getOutAmount = getOutAmount; exports.getPriceOfBinByBinId = getPriceOfBinByBinId; exports.getTokenBalance = getTokenBalance; exports.getTokenDecimals = getTokenDecimals; exports.getTokensMintFromPoolAddress = getTokensMintFromPoolAddress; exports.getTotalFee = getTotalFee; exports.getVariableFee = getVariableFee; exports.isBinIdWithinBinArray = isBinIdWithinBinArray; exports.isOverflowDefaultBinArrayBitmap = isOverflowDefaultBinArrayBitmap; exports.parseLogs = parseLogs; exports.swapExactInQuoteAtBin = swapExactInQuoteAtBin; exports.swapExactOutQuoteAtBin = swapExactOutQuoteAtBin; exports.toAmountAskSide = toAmountAskSide; exports.toAmountBidSide = toAmountBidSide; exports.toAmountBothSide = toAmountBothSide; exports.toAmountsBothSideByStrategy = toAmountsBothSideByStrategy; exports.toAmountsOneSideByStrategy = toAmountsOneSideByStrategy; exports.toStrategyParameters = toStrategyParameters; exports.toWeightDistribution = toWeightDistribution; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.wrapSOLInstruction = wrapSOLInstruction;
+
+
+
+
+exports.ADMIN = ADMIN; exports.ActivationType = ActivationType; exports.BASIS_POINT_MAX = BASIS_POINT_MAX; exports.BIN_ARRAY_BITMAP_SIZE = BIN_ARRAY_BITMAP_SIZE; exports.BIN_ARRAY_FEE = BIN_ARRAY_FEE; exports.BinLiquidity = BinLiquidity; exports.BitmapType = BitmapType; exports.ClockLayout = ClockLayout; exports.DLMMError = DLMMError; exports.DlmmSdkError = DlmmSdkError; exports.EXTENSION_BINARRAY_BITMAP_SIZE = EXTENSION_BINARRAY_BITMAP_SIZE; exports.FEE_PRECISION = FEE_PRECISION; exports.IDL = IDL; exports.ILM_BASE = ILM_BASE; exports.LBCLMM_PROGRAM_IDS = LBCLMM_PROGRAM_IDS; exports.MAX_ACTIVE_BIN_SLIPPAGE = MAX_ACTIVE_BIN_SLIPPAGE; exports.MAX_BIN_ARRAY_SIZE = MAX_BIN_ARRAY_SIZE; exports.MAX_BIN_LENGTH_ALLOWED_IN_ONE_TX = MAX_BIN_LENGTH_ALLOWED_IN_ONE_TX; exports.MAX_BIN_PER_POSITION = MAX_BIN_PER_POSITION; exports.MAX_BIN_PER_TX = MAX_BIN_PER_TX; exports.MAX_CLAIM_ALL_ALLOWED = MAX_CLAIM_ALL_ALLOWED; exports.MAX_FEE_RATE = MAX_FEE_RATE; exports.Network = Network; exports.POSITION_FEE = POSITION_FEE; exports.PRECISION = PRECISION; exports.PairStatus = PairStatus; exports.PairType = PairType; exports.PositionVersion = PositionVersion; exports.SCALE = SCALE; exports.SCALE_OFFSET = SCALE_OFFSET; exports.SIMULATION_USER = SIMULATION_USER; exports.Strategy = Strategy; exports.StrategyType = StrategyType; exports.autoFillXByStrategy = autoFillXByStrategy; exports.autoFillXByWeight = autoFillXByWeight; exports.autoFillYByStrategy = autoFillYByStrategy; exports.autoFillYByWeight = autoFillYByWeight; exports.binIdToBinArrayIndex = binIdToBinArrayIndex; exports.calculateBidAskDistribution = calculateBidAskDistribution; exports.calculateNormalDistribution = calculateNormalDistribution; exports.calculateSpotDistribution = calculateSpotDistribution; exports.chunkedFetchMultipleBinArrayBitmapExtensionAccount = chunkedFetchMultipleBinArrayBitmapExtensionAccount; exports.chunkedFetchMultiplePoolAccount = chunkedFetchMultiplePoolAccount; exports.chunkedGetMultipleAccountInfos = chunkedGetMultipleAccountInfos; exports.chunks = chunks; exports.computeFee = computeFee; exports.computeFeeFromAmount = computeFeeFromAmount; exports.computeProtocolFee = computeProtocolFee; exports.default = src_default; exports.deriveBinArray = deriveBinArray; exports.deriveBinArrayBitmapExtension = deriveBinArrayBitmapExtension; exports.deriveCustomizablePermissionlessLbPair = deriveCustomizablePermissionlessLbPair; exports.deriveLbPair = deriveLbPair; exports.deriveLbPair2 = deriveLbPair2; exports.deriveOracle = deriveOracle; exports.derivePermissionLbPair = derivePermissionLbPair; exports.derivePosition = derivePosition; exports.derivePresetParameter = derivePresetParameter; exports.derivePresetParameter2 = derivePresetParameter2; exports.deriveReserve = deriveReserve; exports.enumerateBins = enumerateBins; exports.findNextBinArrayIndexWithLiquidity = findNextBinArrayIndexWithLiquidity; exports.findNextBinArrayWithLiquidity = findNextBinArrayWithLiquidity; exports.fromWeightDistributionToAmount = fromWeightDistributionToAmount; exports.fromWeightDistributionToAmountOneSide = fromWeightDistributionToAmountOneSide; exports.getBaseFee = getBaseFee; exports.getBinArrayLowerUpperBinId = getBinArrayLowerUpperBinId; exports.getBinArraysRequiredByPositionRange = getBinArraysRequiredByPositionRange; exports.getBinFromBinArray = getBinFromBinArray; exports.getEstimatedComputeUnitIxWithBuffer = getEstimatedComputeUnitIxWithBuffer; exports.getEstimatedComputeUnitUsageWithBuffer = getEstimatedComputeUnitUsageWithBuffer; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getOutAmount = getOutAmount; exports.getPriceOfBinByBinId = getPriceOfBinByBinId; exports.getTokenBalance = getTokenBalance; exports.getTokenDecimals = getTokenDecimals; exports.getTokensMintFromPoolAddress = getTokensMintFromPoolAddress; exports.getTotalFee = getTotalFee; exports.getVariableFee = getVariableFee; exports.isBinIdWithinBinArray = isBinIdWithinBinArray; exports.isOverflowDefaultBinArrayBitmap = isOverflowDefaultBinArrayBitmap; exports.parseLogs = parseLogs; exports.range = range; exports.swapExactInQuoteAtBin = swapExactInQuoteAtBin; exports.swapExactOutQuoteAtBin = swapExactOutQuoteAtBin; exports.toAmountAskSide = toAmountAskSide; exports.toAmountBidSide = toAmountBidSide; exports.toAmountBothSide = toAmountBothSide; exports.toAmountsBothSideByStrategy = toAmountsBothSideByStrategy; exports.toAmountsOneSideByStrategy = toAmountsOneSideByStrategy; exports.toStrategyParameters = toStrategyParameters; exports.toWeightDistribution = toWeightDistribution; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.wrapSOLInstruction = wrapSOLInstruction;
 //# sourceMappingURL=index.js.map