@meteora-ag/dlmm 1.3.13 → 1.3.14-sam.0

package/dist/index.js

@@ -25,7 +25,7 @@ var _decimaljs = require('decimal.js'); var _decimaljs2 = _interopRequireDefault
 
 // src/dlmm/idl.ts
 var IDL = {
-  "version": "0.8.5",
+  "version": "0.8.2",
   "name": "lb_clmm",
   "constants": [
     {
@@ -113,16 +113,6 @@ var IDL = {
       },
       "value": "15"
     },
-    {
-      "name": "ILM_PROTOCOL_SHARE",
-      "type": "u16",
-      "value": "2000"
-    },
-    {
-      "name": "PROTOCOL_SHARE",
-      "type": "u16",
-      "value": "500"
-    },
     {
       "name": "MAX_BIN_STEP",
       "type": "u16",
@@ -395,7 +385,7 @@ var IDL = {
           "isSigner": false
         },
         {
-          "name": "userTokenY",
+          "name": "rent",
           "isMut": false,
           "isSigner": false
         },
@@ -1974,40 +1964,7 @@ var IDL = {
       "args": []
     },
     {
-      "name": "updateBaseFeeParameters",
-      "accounts": [
-        {
-          "name": "lbPair",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "eventAuthority",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "program",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "feeParameter",
-          "type": {
-            "defined": "BaseFeeParameter"
-          }
-        }
-      ]
-    },
-    {
-      "name": "updateDynamicFeeParameters",
+      "name": "updateFeeParameters",
       "accounts": [
         {
           "name": "lbPair",
@@ -2034,7 +1991,7 @@ var IDL = {
         {
           "name": "feeParameter",
           "type": {
-            "defined": "DynamicFeeParameter"
+            "defined": "FeeParameter"
           }
         }
       ]
@@ -2217,7 +2174,7 @@ var IDL = {
       "args": []
     },
     {
-      "name": "setPairStatus",
+      "name": "togglePairStatus",
       "accounts": [
         {
           "name": "lbPair",
@@ -2230,12 +2187,7 @@ var IDL = {
           "isSigner": true
         }
       ],
-      "args": [
-        {
-          "name": "status",
-          "type": "u8"
-        }
-      ]
+      "args": []
     },
     {
       "name": "migratePosition",
@@ -3496,7 +3448,7 @@ var IDL = {
       }
     },
     {
-      "name": "BaseFeeParameter",
+      "name": "FeeParameter",
       "type": {
         "kind": "struct",
         "fields": [
@@ -3517,49 +3469,6 @@ var IDL = {
         ]
       }
     },
-    {
-      "name": "DynamicFeeParameter",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "filterPeriod",
-            "docs": [
-              "Filter period determine high frequency trading time window."
-            ],
-            "type": "u16"
-          },
-          {
-            "name": "decayPeriod",
-            "docs": [
-              "Decay period determine when the volatile fee start decay / decrease."
-            ],
-            "type": "u16"
-          },
-          {
-            "name": "reductionFactor",
-            "docs": [
-              "Reduction factor controls the volatile fee rate decrement rate."
-            ],
-            "type": "u16"
-          },
-          {
-            "name": "variableFeeControl",
-            "docs": [
-              "Used to scale the variable fee component depending on the dynamic of the market"
-            ],
-            "type": "u32"
-          },
-          {
-            "name": "maxVolatilityAccumulator",
-            "docs": [
-              "Maximum number of bin crossed can be accumulated. Used to cap volatile fee rate."
-            ],
-            "type": "u32"
-          }
-        ]
-      }
-    },
     {
       "name": "LiquidityParameterByStrategyOneSide",
       "type": {
@@ -4925,41 +4834,6 @@ var IDL = {
         }
       ]
     },
-    {
-      "name": "DynamicFeeParameterUpdate",
-      "fields": [
-        {
-          "name": "lbPair",
-          "type": "publicKey",
-          "index": false
-        },
-        {
-          "name": "filterPeriod",
-          "type": "u16",
-          "index": false
-        },
-        {
-          "name": "decayPeriod",
-          "type": "u16",
-          "index": false
-        },
-        {
-          "name": "reductionFactor",
-          "type": "u16",
-          "index": false
-        },
-        {
-          "name": "variableFeeControl",
-          "type": "u32",
-          "index": false
-        },
-        {
-          "name": "maxVolatilityAccumulator",
-          "type": "u32",
-          "index": false
-        }
-      ]
-    },
     {
       "name": "IncreaseObservation",
       "fields": [
@@ -5396,11 +5270,6 @@ var IDL = {
       "code": 6065,
       "name": "AlreadyPassPreActivationSwapPoint",
       "msg": "Already pass pre-activation swap point"
-    },
-    {
-      "code": 6066,
-      "name": "InvalidStatus",
-      "msg": "Invalid status"
     }
   ]
 };
@@ -6472,42 +6341,13 @@ function generateBinAmount(amount, binStep, binId, tokenXDecimal, tokenYDecimal,
   return new (0, _anchor.BN)(c1.sub(c0).floor().toString());
 }
 
-// src/dlmm/helpers/computeUnit.ts
+// 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;
-var getSimulationComputeUnits = async (connection, instructions, payer, lookupTables, commitment = "confirmed") => {
-  const testInstructions = [
-    // Set an arbitrarily high number in simulation
-    // so we can be sure the transaction will succeed
-    // and get the real compute units used
-    _web3js.ComputeBudgetProgram.setComputeUnitLimit({ units: 14e5 }),
-    ...instructions
-  ];
-  const testTransaction = new (0, _web3js.VersionedTransaction)(
-    new (0, _web3js.TransactionMessage)({
-      instructions: testInstructions,
-      payerKey: payer,
-      // RecentBlockhash can by any public key during simulation
-      // since 'replaceRecentBlockhash' is set to 'true' below
-      recentBlockhash: _web3js.PublicKey.default.toString()
-    }).compileToV0Message(lookupTables)
-  );
-  const rpcResponse = await connection.simulateTransaction(testTransaction, {
-    replaceRecentBlockhash: true,
-    sigVerify: false,
-    commitment
-  });
-  if (_optionalChain([rpcResponse, 'optionalAccess', _21 => _21.value, 'optionalAccess', _22 => _22.err])) {
-    const logs = _optionalChain([rpcResponse, 'access', _23 => _23.value, 'access', _24 => _24.logs, 'optionalAccess', _25 => _25.join, 'call', _26 => _26("\n  \u2022 ")]) || "No logs available";
-    throw new Error(
-      `Transaction simulation failed:
-  \u2022${logs}` + JSON.stringify(_optionalChain([rpcResponse, 'optionalAccess', _27 => _27.value, 'optionalAccess', _28 => _28.err]))
-    );
-  }
-  return rpcResponse.value.unitsConsumed || null;
-};
 
 // src/dlmm/helpers/derive.ts
 
@@ -6644,6 +6484,9 @@ var PairType = /* @__PURE__ */ ((PairType2) => {
   return PairType2;
 })(PairType || {});
 var Strategy = {
+  SpotOneSide: { spotOneSide: {} },
+  CurveOneSide: { curveOneSide: {} },
+  BidAskOneSide: { bidAskOneSide: {} },
   SpotBalanced: { spotBalanced: {} },
   CurveBalanced: { curveBalanced: {} },
   BidAskBalanced: { bidAskBalanced: {} },
@@ -6652,12 +6495,15 @@ var Strategy = {
   BidAskImBalanced: { bidAskImBalanced: {} }
 };
 var StrategyType = /* @__PURE__ */ ((StrategyType2) => {
-  StrategyType2[StrategyType2["SpotImBalanced"] = 0] = "SpotImBalanced";
-  StrategyType2[StrategyType2["CurveImBalanced"] = 1] = "CurveImBalanced";
-  StrategyType2[StrategyType2["BidAskImBalanced"] = 2] = "BidAskImBalanced";
-  StrategyType2[StrategyType2["SpotBalanced"] = 3] = "SpotBalanced";
-  StrategyType2[StrategyType2["CurveBalanced"] = 4] = "CurveBalanced";
-  StrategyType2[StrategyType2["BidAskBalanced"] = 5] = "BidAskBalanced";
+  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) => {
@@ -7209,10 +7055,53 @@ function toWeightBidAsk(minBinId, maxBinId, activeId) {
   }
   return distributions;
 }
+function toAmountsOneSideByStrategy(activeId, binStep, minBinId, maxBinId, amount, strategyType, depositForY) {
+  let weights = [];
+  switch (strategyType) {
+    case 6 /* SpotBalanced */:
+    case 7 /* CurveBalanced */:
+    case 8 /* BidAskBalanced */:
+    case 3 /* SpotImBalanced */:
+    case 4 /* CurveImBalanced */:
+    case 5 /* BidAskImBalanced */: {
+      throw "Invalid Strategy Parameters";
+    }
+    case 0 /* SpotOneSide */: {
+      weights = toWeightSpotBalanced(minBinId, maxBinId);
+      break;
+    }
+    case 1 /* CurveOneSide */: {
+      if (depositForY) {
+        weights = toWeightAscendingOrder(minBinId, maxBinId);
+      } else {
+        weights = toWeightDecendingOrder(minBinId, maxBinId);
+      }
+      break;
+    }
+    case 2 /* BidAskOneSide */: {
+      if (depositForY) {
+        weights = toWeightDecendingOrder(minBinId, maxBinId);
+      } else {
+        weights = toWeightAscendingOrder(minBinId, maxBinId);
+      }
+      break;
+    }
+  }
+  if (depositForY) {
+    return toAmountBidSide(activeId, amount, weights);
+  } else {
+    return toAmountAskSide(activeId, binStep, amount, weights);
+  }
+}
 function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amountX, amountY, amountXInActiveBin, amountYInActiveBin, strategyType) {
   const isSingleSideX = amountY.isZero();
   switch (strategyType) {
-    case 0 /* SpotImBalanced */: {
+    case 0 /* SpotOneSide */:
+    case 1 /* CurveOneSide */:
+    case 2 /* BidAskOneSide */: {
+      throw "Invalid Strategy Parameters";
+    }
+    case 3 /* SpotImBalanced */: {
       if (activeId < minBinId || activeId > maxBinId) {
         const weights = toWeightSpotBalanced(minBinId, maxBinId);
         return toAmountBothSide(
@@ -7284,7 +7173,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
       }
       return amountsInBin;
     }
-    case 1 /* CurveImBalanced */: {
+    case 4 /* CurveImBalanced */: {
       if (activeId < minBinId) {
         let weights = toWeightDecendingOrder(minBinId, maxBinId);
         return toAmountBothSide(
@@ -7368,7 +7257,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
       }
       return amountsInBin;
     }
-    case 2 /* BidAskImBalanced */: {
+    case 5 /* BidAskImBalanced */: {
       if (activeId < minBinId) {
         const weights = toWeightAscendingOrder(minBinId, maxBinId);
         return toAmountBothSide(
@@ -7452,7 +7341,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
       }
       return amountsInBin;
     }
-    case 3 /* SpotBalanced */: {
+    case 6 /* SpotBalanced */: {
       let weights = toWeightSpotBalanced(minBinId, maxBinId);
       return toAmountBothSide(
         activeId,
@@ -7464,7 +7353,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
         weights
       );
     }
-    case 4 /* CurveBalanced */: {
+    case 7 /* CurveBalanced */: {
       let weights = toWeightCurve(minBinId, maxBinId, activeId);
       return toAmountBothSide(
         activeId,
@@ -7476,7 +7365,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
         weights
       );
     }
-    case 5 /* BidAskBalanced */: {
+    case 8 /* BidAskBalanced */: {
       let weights = toWeightBidAsk(minBinId, maxBinId, activeId);
       return toAmountBothSide(
         activeId,
@@ -7492,12 +7381,15 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
 }
 function autoFillYByStrategy(activeId, binStep, amountX, amountXInActiveBin, amountYInActiveBin, minBinId, maxBinId, strategyType) {
   switch (strategyType) {
-    case 0 /* SpotImBalanced */:
-    case 1 /* CurveImBalanced */:
-    case 2 /* BidAskImBalanced */: {
+    case 0 /* SpotOneSide */:
+    case 1 /* CurveOneSide */:
+    case 2 /* BidAskOneSide */:
+    case 3 /* SpotImBalanced */:
+    case 4 /* CurveImBalanced */:
+    case 5 /* BidAskImBalanced */: {
       throw "Invalid Strategy Parameters";
     }
-    case 3 /* SpotBalanced */: {
+    case 6 /* SpotBalanced */: {
       let weights = toWeightSpotBalanced(minBinId, maxBinId);
       return autoFillYByWeight(
         activeId,
@@ -7508,7 +7400,7 @@ function autoFillYByStrategy(activeId, binStep, amountX, amountXInActiveBin, amo
         weights
       );
     }
-    case 4 /* CurveBalanced */: {
+    case 7 /* CurveBalanced */: {
       let weights = toWeightCurve(minBinId, maxBinId, activeId);
       return autoFillYByWeight(
         activeId,
@@ -7519,7 +7411,7 @@ function autoFillYByStrategy(activeId, binStep, amountX, amountXInActiveBin, amo
         weights
       );
     }
-    case 5 /* BidAskBalanced */: {
+    case 8 /* BidAskBalanced */: {
       let weights = toWeightBidAsk(minBinId, maxBinId, activeId);
       return autoFillYByWeight(
         activeId,
@@ -7534,12 +7426,15 @@ function autoFillYByStrategy(activeId, binStep, amountX, amountXInActiveBin, amo
 }
 function autoFillXByStrategy(activeId, binStep, amountY, amountXInActiveBin, amountYInActiveBin, minBinId, maxBinId, strategyType) {
   switch (strategyType) {
-    case 0 /* SpotImBalanced */:
-    case 1 /* CurveImBalanced */:
-    case 2 /* BidAskImBalanced */: {
+    case 0 /* SpotOneSide */:
+    case 1 /* CurveOneSide */:
+    case 2 /* BidAskOneSide */:
+    case 3 /* SpotImBalanced */:
+    case 4 /* CurveImBalanced */:
+    case 5 /* BidAskImBalanced */: {
       throw "Invalid Strategy Parameters";
     }
-    case 3 /* SpotBalanced */: {
+    case 6 /* SpotBalanced */: {
       let weights = toWeightSpotBalanced(minBinId, maxBinId);
       return autoFillXByWeight(
         activeId,
@@ -7550,7 +7445,7 @@ function autoFillXByStrategy(activeId, binStep, amountY, amountXInActiveBin, amo
         weights
       );
     }
-    case 4 /* CurveBalanced */: {
+    case 7 /* CurveBalanced */: {
       let weights = toWeightCurve(minBinId, maxBinId, activeId);
       return autoFillXByWeight(
         activeId,
@@ -7561,7 +7456,7 @@ function autoFillXByStrategy(activeId, binStep, amountY, amountXInActiveBin, amo
         weights
       );
     }
-    case 5 /* BidAskBalanced */: {
+    case 8 /* BidAskBalanced */: {
       let weights = toWeightBidAsk(minBinId, maxBinId, activeId);
       return autoFillXByWeight(
         activeId,
@@ -7582,7 +7477,31 @@ function toStrategyParameters({
 }) {
   const parameters = [singleSidedX ? 1 : 0, ...new Array(63).fill(0)];
   switch (strategyType) {
-    case 3 /* SpotBalanced */: {
+    case 0 /* SpotOneSide */: {
+      return {
+        minBinId,
+        maxBinId,
+        strategyType: { spotOneSide: {} },
+        parameteres: Buffer.from(parameters).toJSON().data
+      };
+    }
+    case 1 /* CurveOneSide */: {
+      return {
+        minBinId,
+        maxBinId,
+        strategyType: { curveOneSide: {} },
+        parameteres: Buffer.from(parameters).toJSON().data
+      };
+    }
+    case 2 /* BidAskOneSide */: {
+      return {
+        minBinId,
+        maxBinId,
+        strategyType: { bidAskOneSide: {} },
+        parameteres: Buffer.from(parameters).toJSON().data
+      };
+    }
+    case 6 /* SpotBalanced */: {
       return {
         minBinId,
         maxBinId,
@@ -7590,7 +7509,7 @@ function toStrategyParameters({
         parameteres: Buffer.from(parameters).toJSON().data
       };
     }
-    case 4 /* CurveBalanced */: {
+    case 7 /* CurveBalanced */: {
       return {
         minBinId,
         maxBinId,
@@ -7598,7 +7517,7 @@ function toStrategyParameters({
         parameteres: Buffer.from(parameters).toJSON().data
       };
     }
-    case 5 /* BidAskBalanced */: {
+    case 8 /* BidAskBalanced */: {
       return {
         minBinId,
         maxBinId,
@@ -7606,7 +7525,7 @@ function toStrategyParameters({
         parameteres: Buffer.from(parameters).toJSON().data
       };
     }
-    case 0 /* SpotImBalanced */: {
+    case 3 /* SpotImBalanced */: {
       return {
         minBinId,
         maxBinId,
@@ -7614,7 +7533,7 @@ function toStrategyParameters({
         parameteres: Buffer.from(parameters).toJSON().data
       };
     }
-    case 1 /* CurveImBalanced */: {
+    case 4 /* CurveImBalanced */: {
       return {
         minBinId,
         maxBinId,
@@ -7622,7 +7541,7 @@ function toStrategyParameters({
         parameteres: Buffer.from(parameters).toJSON().data
       };
     }
-    case 2 /* BidAskImBalanced */: {
+    case 5 /* BidAskImBalanced */: {
       return {
         minBinId,
         maxBinId,
@@ -7644,7 +7563,7 @@ async function getTokensMintFromPoolAddress(connection, poolAddress, opt) {
   );
   const program = new (0, _anchor.Program)(
     IDL,
-    LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _29 => _29.cluster]), () => ( "mainnet-beta"))],
+    LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _21 => _21.cluster]), () => ( "mainnet-beta"))],
     provider
   );
   const poolAccount = await program.account.lbPair.fetchNullable(
@@ -7702,7 +7621,7 @@ var getOrCreateATAInstruction = async (connection, tokenMint, owner, payer = own
     return { ataPubKey: toAccount, ix: void 0 };
   } catch (e) {
     if (e instanceof _spltoken.TokenAccountNotFoundError || e instanceof _spltoken.TokenInvalidAccountOwnerError) {
-      const ix = _spltoken.createAssociatedTokenAccountIdempotentInstruction.call(void 0, 
+      const ix = _spltoken.createAssociatedTokenAccountInstruction.call(void 0, 
         payer,
         toAccount,
         owner,
@@ -7722,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', _30 => _30.parseLogs, 'call', _31 => _31(logs)])) {
+  for (const event of _optionalChain([eventParser, 'optionalAccess', _22 => _22.parseLogs, 'call', _23 => _23(logs)])) {
     return event.data;
   }
   throw new Error("No events found");
@@ -7779,7 +7698,7 @@ var getEstimatedComputeUnitUsageWithBuffer = async (connection, instructions, fe
   }
   buffer = Math.max(0, buffer);
   buffer = Math.min(1, buffer);
-  const estimatedComputeUnitUsage = await getSimulationComputeUnits(
+  const estimatedComputeUnitUsage = await _helpers.getSimulationComputeUnits.call(void 0, 
     connection,
     instructions,
     feePayer,
@@ -7837,13 +7756,13 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _32 => _32.programId]), () => ( LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _33 => _33.cluster]), () => ( "mainnet-beta"))])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _24 => _24.programId]), () => ( LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _25 => _25.cluster]), () => ( "mainnet-beta"))])),
       provider
     );
     return program.account.lbPair.all();
   }
   static async getPairPubkeyIfExists(connection, tokenX, tokenY, binStep, baseFactor, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _34 => _34.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _26 => _26.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -7851,7 +7770,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _35 => _35.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _27 => _27.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
       provider
     );
     try {
@@ -7890,7 +7809,7 @@ var DLMM = class {
    * @returns The `create` function returns a `Promise` that resolves to a `DLMM` object.
    */
   static async create(connection, dlmm, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _36 => _36.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _28 => _28.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -7898,7 +7817,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _37 => _37.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _29 => _29.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
       provider
     );
     const binArrayBitMapExtensionPubkey = deriveBinArrayBitmapExtension(
@@ -7914,14 +7833,14 @@ var DLMM = class {
       connection,
       accountsToFetch
     );
-    const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _38 => _38[0], 'optionalAccess', _39 => _39.data]);
+    const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _30 => _30[0], 'optionalAccess', _31 => _31.data]);
     if (!lbPairAccountInfoBuffer)
       throw new Error(`LB Pair account ${dlmm.toBase58()} not found`);
     const lbPairAccInfo = program.coder.accounts.decode(
       "lbPair",
       lbPairAccountInfoBuffer
     );
-    const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _40 => _40[1], 'optionalAccess', _41 => _41.data]);
+    const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _32 => _32[1], 'optionalAccess', _33 => _33.data]);
     let binArrayBitMapExtensionAccInfo = null;
     if (binArrayBitMapAccountInfoBuffer) {
       binArrayBitMapExtensionAccInfo = program.coder.accounts.decode(
@@ -7929,7 +7848,7 @@ var DLMM = class {
         binArrayBitMapAccountInfoBuffer
       );
     }
-    const clockAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _42 => _42[2], 'optionalAccess', _43 => _43.data]);
+    const clockAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _34 => _34[2], 'optionalAccess', _35 => _35.data]);
     if (!clockAccountInfoBuffer)
       throw new Error(`Clock account not found`);
     const clock = ClockLayout.decode(clockAccountInfoBuffer);
@@ -7990,7 +7909,7 @@ var DLMM = class {
    * objects.
    */
   static async createMultiple(connection, dlmmList, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _44 => _44.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _36 => _36.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -7998,7 +7917,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _45 => _45.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _37 => _37.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
       provider
     );
     const binArrayBitMapExtensions = dlmmList.map(
@@ -8014,14 +7933,14 @@ var DLMM = class {
       accountsToFetch
     );
     const clockAccount = accountsInfo.pop();
-    const clockAccountInfoBuffer = _optionalChain([clockAccount, 'optionalAccess', _46 => _46.data]);
+    const clockAccountInfoBuffer = _optionalChain([clockAccount, 'optionalAccess', _38 => _38.data]);
     if (!clockAccountInfoBuffer)
       throw new Error(`Clock account not found`);
     const clock = ClockLayout.decode(clockAccountInfoBuffer);
     const lbPairArraysMap = /* @__PURE__ */ new Map();
     for (let i = 0; i < dlmmList.length; i++) {
       const lbPairPubKey = dlmmList[i];
-      const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _47 => _47[i], 'optionalAccess', _48 => _48.data]);
+      const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _39 => _39[i], 'optionalAccess', _40 => _40.data]);
       if (!lbPairAccountInfoBuffer)
         throw new Error(`LB Pair account ${lbPairPubKey.toBase58()} not found`);
       const binArrayAccInfo = program.coder.accounts.decode(
@@ -8034,7 +7953,7 @@ var DLMM = class {
     for (let i = dlmmList.length; i < accountsInfo.length; i++) {
       const index = i - dlmmList.length;
       const lbPairPubkey = dlmmList[index];
-      const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _49 => _49[i], 'optionalAccess', _50 => _50.data]);
+      const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _41 => _41[i], 'optionalAccess', _42 => _42.data]);
       if (binArrayBitMapAccountInfoBuffer) {
         const binArrayBitMapExtensionAccInfo = program.coder.accounts.decode(
           "binArrayBitmapExtension",
@@ -8118,7 +8037,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _51 => _51.programId]), () => ( LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _52 => _52.cluster]), () => ( "mainnet-beta"))])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _43 => _43.programId]), () => ( LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _44 => _44.cluster]), () => ( "mainnet-beta"))])),
       provider
     );
     const presetParameter = await program.account.presetParameter.all();
@@ -8136,7 +8055,7 @@ var DLMM = class {
    * Pair account, and the value is an object of PositionInfo
    */
   static async getAllLbPairPositionsByUser(connection, userPubKey, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _53 => _53.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _45 => _45.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -8144,17 +8063,52 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _54 => _54.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _46 => _46.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
       provider
     );
-    const positionsV2 = await program.account.positionV2.all([
-      {
-        memcmp: {
-          bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
-          offset: 8 + 32
+    const [positions, positionsV2] = await Promise.all([
+      program.account.position.all([
+        {
+          memcmp: {
+            bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
+            offset: 8 + 32
+          }
         }
-      }
+      ]),
+      program.account.positionV2.all([
+        {
+          memcmp: {
+            bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
+            offset: 8 + 32
+          }
+        }
+      ])
     ]);
+    const binArrayPubkeySet = /* @__PURE__ */ new Set();
+    const lbPairSet = /* @__PURE__ */ new Set();
+    positions.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
+      const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinId));
+      const [lowerBinArrayPubKey] = deriveBinArray(
+        lbPair,
+        lowerBinArrayIndex,
+        program.programId
+      );
+      const [upperBinArrayPubKey] = deriveBinArray(
+        lbPair,
+        upperBinArrayIndex,
+        program.programId
+      );
+      binArrayPubkeySet.add(lowerBinArrayPubKey.toBase58());
+      binArrayPubkeySet.add(upperBinArrayPubKey.toBase58());
+      lbPairSet.add(lbPair.toBase58());
+    });
+    const binArrayPubkeyArray = Array.from(binArrayPubkeySet).map(
+      (pubkey) => new (0, _web3js.PublicKey)(pubkey)
+    );
+    const lbPairArray = Array.from(lbPairSet).map(
+      (pubkey) => new (0, _web3js.PublicKey)(pubkey)
+    );
     const binArrayPubkeySetV2 = /* @__PURE__ */ new Set();
     const lbPairSetV2 = /* @__PURE__ */ new Set();
     positionsV2.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
@@ -8182,24 +8136,60 @@ var DLMM = class {
     );
     const [clockAccInfo, ...binArraysAccInfo] = await chunkedGetMultipleAccountInfos(connection, [
       _web3js.SYSVAR_CLOCK_PUBKEY,
+      ...binArrayPubkeyArray,
+      ...lbPairArray,
       ...binArrayPubkeyArrayV2,
       ...lbPairArrayV2
     ]);
+    const positionBinArraysMap = /* @__PURE__ */ new Map();
+    for (let i = 0; i < binArrayPubkeyArray.length; i++) {
+      const binArrayPubkey = binArrayPubkeyArray[i];
+      const binArrayAccInfoBuffer = binArraysAccInfo[i];
+      if (!binArrayAccInfoBuffer)
+        throw new Error(
+          `Bin Array account ${binArrayPubkey.toBase58()} not found`
+        );
+      const binArrayAccInfo = program.coder.accounts.decode(
+        "binArray",
+        binArrayAccInfoBuffer.data
+      );
+      positionBinArraysMap.set(binArrayPubkey.toBase58(), binArrayAccInfo);
+    }
+    const lbPairArraysMap = /* @__PURE__ */ new Map();
+    for (let i = binArrayPubkeyArray.length; i < binArrayPubkeyArray.length + lbPairArray.length; i++) {
+      const lbPairPubkey = lbPairArray[i - binArrayPubkeyArray.length];
+      const lbPairAccInfoBuffer = binArraysAccInfo[i];
+      if (!lbPairAccInfoBuffer)
+        throw new Error(`LB Pair account ${lbPairPubkey.toBase58()} not found`);
+      const lbPairAccInfo = program.coder.accounts.decode(
+        "lbPair",
+        lbPairAccInfoBuffer.data
+      );
+      lbPairArraysMap.set(lbPairPubkey.toBase58(), lbPairAccInfo);
+    }
+    const reservePublicKeys = Array.from(lbPairArraysMap.values()).map(({ reserveX, reserveY, tokenXMint, tokenYMint }) => [
+      reserveX,
+      reserveY,
+      tokenXMint,
+      tokenYMint
+    ]).flat();
     const positionBinArraysMapV2 = /* @__PURE__ */ new Map();
-    for (let i = 0; i < binArrayPubkeyArrayV2.length; i++) {
-      const binArrayPubkey = binArrayPubkeyArrayV2[i];
+    for (let i = binArrayPubkeyArray.length + lbPairArray.length; i < binArrayPubkeyArray.length + lbPairArray.length + binArrayPubkeyArrayV2.length; i++) {
+      const binArrayPubkey = binArrayPubkeyArrayV2[i - (binArrayPubkeyArray.length + lbPairArray.length)];
       const binArrayAccInfoBufferV2 = binArraysAccInfo[i];
-      if (binArrayAccInfoBufferV2) {
-        const binArrayAccInfo = program.coder.accounts.decode(
-          "binArray",
-          binArrayAccInfoBufferV2.data
+      if (!binArrayAccInfoBufferV2)
+        throw new Error(
+          `Bin Array account ${binArrayPubkey.toBase58()} not found`
         );
-        positionBinArraysMapV2.set(binArrayPubkey.toBase58(), binArrayAccInfo);
-      }
+      const binArrayAccInfo = program.coder.accounts.decode(
+        "binArray",
+        binArrayAccInfoBufferV2.data
+      );
+      positionBinArraysMapV2.set(binArrayPubkey.toBase58(), binArrayAccInfo);
     }
     const lbPairArraysMapV2 = /* @__PURE__ */ new Map();
-    for (let i = binArrayPubkeyArrayV2.length; i < binArraysAccInfo.length; i++) {
-      const lbPairPubkey = lbPairArrayV2[i - binArrayPubkeyArrayV2.length];
+    for (let i = binArrayPubkeyArray.length + lbPairArray.length + binArrayPubkeyArrayV2.length; i < binArraysAccInfo.length; i++) {
+      const lbPairPubkey = lbPairArrayV2[i - (binArrayPubkeyArray.length + lbPairArray.length + binArrayPubkeyArrayV2.length)];
       const lbPairAccInfoBufferV2 = binArraysAccInfo[i];
       if (!lbPairAccInfoBufferV2)
         throw new Error(`LB Pair account ${lbPairPubkey.toBase58()} not found`);
@@ -8217,14 +8207,43 @@ var DLMM = class {
     ]).flat();
     const reserveAccountsInfo = await chunkedGetMultipleAccountInfos(
       program.provider.connection,
-      reservePublicKeysV2
+      [...reservePublicKeys, ...reservePublicKeysV2]
     );
+    const lbPairReserveMap = /* @__PURE__ */ new Map();
+    const lbPairMintMap = /* @__PURE__ */ new Map();
+    lbPairArray.forEach((lbPair, idx) => {
+      const index = idx * 4;
+      const reserveAccBufferX = reserveAccountsInfo[index];
+      const reserveAccBufferY = reserveAccountsInfo[index + 1];
+      if (!reserveAccBufferX || !reserveAccBufferY)
+        throw new Error(
+          `Reserve account for LB Pair ${lbPair.toBase58()} not found`
+        );
+      const reserveAccX = _spltoken.AccountLayout.decode(reserveAccBufferX.data);
+      const reserveAccY = _spltoken.AccountLayout.decode(reserveAccBufferY.data);
+      lbPairReserveMap.set(lbPair.toBase58(), {
+        reserveX: reserveAccX.amount,
+        reserveY: reserveAccY.amount
+      });
+      const mintXBuffer = reserveAccountsInfo[index + 2];
+      const mintYBuffer = reserveAccountsInfo[index + 3];
+      if (!mintXBuffer || !mintYBuffer)
+        throw new Error(
+          `Mint account for LB Pair ${lbPair.toBase58()} not found`
+        );
+      const mintX = _spltoken.MintLayout.decode(mintXBuffer.data);
+      const mintY = _spltoken.MintLayout.decode(mintYBuffer.data);
+      lbPairMintMap.set(lbPair.toBase58(), {
+        mintXDecimal: mintX.decimals,
+        mintYDecimal: mintY.decimals
+      });
+    });
     const lbPairReserveMapV2 = /* @__PURE__ */ new Map();
     const lbPairMintMapV2 = /* @__PURE__ */ new Map();
     lbPairArrayV2.forEach((lbPair, idx) => {
       const index = idx * 4;
-      const reserveAccBufferXV2 = reserveAccountsInfo[index];
-      const reserveAccBufferYV2 = reserveAccountsInfo[index + 1];
+      const reserveAccBufferXV2 = reserveAccountsInfo[reservePublicKeys.length + index];
+      const reserveAccBufferYV2 = reserveAccountsInfo[reservePublicKeys.length + index + 1];
       if (!reserveAccBufferXV2 || !reserveAccBufferYV2)
         throw new Error(
           `Reserve account for LB Pair ${lbPair.toBase58()} not found`
@@ -8235,8 +8254,8 @@ var DLMM = class {
         reserveX: reserveAccX.amount,
         reserveY: reserveAccY.amount
       });
-      const mintXBufferV2 = reserveAccountsInfo[index + 2];
-      const mintYBufferV2 = reserveAccountsInfo[index + 3];
+      const mintXBufferV2 = reserveAccountsInfo[reservePublicKeys.length + index + 2];
+      const mintYBufferV2 = reserveAccountsInfo[reservePublicKeys.length + index + 3];
       if (!mintXBufferV2 || !mintYBufferV2)
         throw new Error(
           `Mint account for LB Pair ${lbPair.toBase58()} not found`
@@ -8252,9 +8271,9 @@ var DLMM = class {
       clockAccInfo.data.readBigInt64LE(32).toString()
     ).toNumber();
     const positionsMap = /* @__PURE__ */ new Map();
-    for (let position of positionsV2) {
+    for (let position of positions) {
       const { account, publicKey: positionPubKey } = position;
-      const { upperBinId, lowerBinId, lbPair, feeOwner } = account;
+      const { upperBinId, lowerBinId, lbPair } = account;
       const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
       const upperBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinId));
       const [lowerBinArrayPubKey] = deriveBinArray(
@@ -8267,57 +8286,42 @@ var DLMM = class {
         upperBinArrayIndex,
         program.programId
       );
-      const lowerBinArray = positionBinArraysMapV2.get(
+      const lowerBinArray = positionBinArraysMap.get(
         lowerBinArrayPubKey.toBase58()
       );
-      const upperBinArray = positionBinArraysMapV2.get(
+      const upperBinArray = positionBinArraysMap.get(
         upperBinArrayPubKey.toBase58()
       );
-      const lbPairAcc = lbPairArraysMapV2.get(lbPair.toBase58());
-      const [baseTokenDecimal, quoteTokenDecimal] = await Promise.all([
-        getTokenDecimals(program.provider.connection, lbPairAcc.tokenXMint),
-        getTokenDecimals(program.provider.connection, lbPairAcc.tokenYMint)
-      ]);
-      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _55 => _55.get, 'call', _56 => _56(lbPair.toBase58()), 'optionalAccess', _57 => _57.reserveX]), () => ( BigInt(0)));
-      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _58 => _58.get, 'call', _59 => _59(lbPair.toBase58()), 'optionalAccess', _60 => _60.reserveY]), () => ( BigInt(0)));
+      const lbPairAcc = lbPairArraysMap.get(lbPair.toBase58());
+      const { mintXDecimal, mintYDecimal } = lbPairMintMap.get(
+        lbPair.toBase58()
+      );
+      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _47 => _47.get, 'call', _48 => _48(lbPair.toBase58()), 'optionalAccess', _49 => _49.reserveX]), () => ( BigInt(0)));
+      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _50 => _50.get, 'call', _51 => _51(lbPair.toBase58()), 'optionalAccess', _52 => _52.reserveY]), () => ( BigInt(0)));
       const tokenX = {
         publicKey: lbPairAcc.tokenXMint,
         reserve: lbPairAcc.reserveX,
         amount: reserveXBalance,
-        decimal: baseTokenDecimal
+        decimal: mintXDecimal
       };
       const tokenY = {
         publicKey: lbPairAcc.tokenYMint,
         reserve: lbPairAcc.reserveY,
         amount: reserveYBalance,
-        decimal: quoteTokenDecimal
+        decimal: mintYDecimal
       };
-      const positionData = !!lowerBinArray && !!upperBinArray ? await DLMM.processPosition(
+      const positionData = await DLMM.processPosition(
         program,
-        1 /* V2 */,
+        0 /* V1 */,
         lbPairAcc,
         onChainTimestamp,
         account,
-        baseTokenDecimal,
-        quoteTokenDecimal,
+        mintXDecimal,
+        mintYDecimal,
         lowerBinArray,
         upperBinArray,
-        feeOwner
-      ) : {
-        totalXAmount: "0",
-        totalYAmount: "0",
-        positionBinData: [],
-        lastUpdatedAt: new (0, _anchor.BN)(0),
-        upperBinId,
-        lowerBinId,
-        feeX: new (0, _anchor.BN)(0),
-        feeY: new (0, _anchor.BN)(0),
-        rewardOne: new (0, _anchor.BN)(0),
-        rewardTwo: new (0, _anchor.BN)(0),
-        feeOwner,
-        totalClaimedFeeXAmount: new (0, _anchor.BN)(0),
-        totalClaimedFeeYAmount: new (0, _anchor.BN)(0)
-      };
+        _web3js.PublicKey.default
+      );
       if (positionData) {
         positionsMap.set(lbPair.toBase58(), {
           publicKey: lbPair,
@@ -8325,136 +8329,144 @@ var DLMM = class {
           tokenX,
           tokenY,
           lbPairPositionsData: [
-            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _61 => _61.get, 'call', _62 => _62(lbPair.toBase58()), 'optionalAccess', _63 => _63.lbPairPositionsData]), () => ( [])),
+            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _53 => _53.get, 'call', _54 => _54(lbPair.toBase58()), 'optionalAccess', _55 => _55.lbPairPositionsData]), () => ( [])),
             {
               publicKey: positionPubKey,
               positionData,
-              version: 1 /* V2 */
+              version: 0 /* V1 */
             }
           ]
         });
       }
     }
-    return positionsMap;
-  }
-  static getPricePerLamport(tokenXDecimal, tokenYDecimal, price) {
-    return new (0, _decimaljs2.default)(price).mul(new (0, _decimaljs2.default)(10 ** (tokenYDecimal - tokenXDecimal))).toString();
-  }
-  static getBinIdFromPrice(price, binStep, min) {
-    const binStepNum = new (0, _decimaljs2.default)(binStep).div(new (0, _decimaljs2.default)(BASIS_POINT_MAX));
-    const binId = new (0, _decimaljs2.default)(price).log().dividedBy(new (0, _decimaljs2.default)(1).add(binStepNum).log());
-    return (min ? binId.floor() : binId.ceil()).toNumber();
-  }
-  /**
-  * The function `getLbPairLockInfo` retrieves all pair positions that has locked liquidity.
-  * @param {number} [lockDurationOpt] - An optional value indicating the minimum position lock duration that the function should return. 
-  * Depending on the lbPair activationType, the param should be a number of seconds or a number of slots.
-  * @returns The function `getLbPairLockInfo` returns a `Promise` that resolves to a `PairLockInfo`
-  * object. The `PairLockInfo` object contains an array of `PositionLockInfo` objects.
-  */
-  async getLbPairLockInfo(lockDurationOpt) {
-    const lockDuration = lockDurationOpt | 0;
-    const lbPairPositions = await this.program.account.positionV2.all([
-      {
-        memcmp: {
-          bytes: _bytes.bs58.encode(this.pubkey.toBuffer()),
-          offset: 8
-        }
-      }
-    ]);
-    const clockAccInfo = await this.program.provider.connection.getAccountInfo(_web3js.SYSVAR_CLOCK_PUBKEY);
-    const clock = ClockLayout.decode(clockAccInfo.data);
-    const currentPoint = this.lbPair.activationType == 0 /* Slot */ ? clock.slot : clock.unixTimestamp;
-    const minLockReleasePoint = currentPoint.add(new (0, _anchor.BN)(lockDuration));
-    const positionsWithLock = lbPairPositions.filter((p) => p.account.lockReleasePoint.gt(minLockReleasePoint));
-    if (positionsWithLock.length == 0) {
-      return {
-        positions: []
-      };
-    }
-    const binArrayPubkeySetV2 = /* @__PURE__ */ new Set();
-    positionsWithLock.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
+    for (let position of positionsV2) {
+      const { account, publicKey: positionPubKey } = position;
+      const { upperBinId, lowerBinId, lbPair, feeOwner } = account;
       const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
       const upperBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinId));
       const [lowerBinArrayPubKey] = deriveBinArray(
-        this.pubkey,
+        lbPair,
         lowerBinArrayIndex,
-        this.program.programId
+        program.programId
       );
       const [upperBinArrayPubKey] = deriveBinArray(
-        this.pubkey,
+        lbPair,
         upperBinArrayIndex,
-        this.program.programId
+        program.programId
       );
-      binArrayPubkeySetV2.add(lowerBinArrayPubKey.toBase58());
-      binArrayPubkeySetV2.add(upperBinArrayPubKey.toBase58());
-    });
-    const binArrayPubkeyArrayV2 = Array.from(binArrayPubkeySetV2).map(
-      (pubkey) => new (0, _web3js.PublicKey)(pubkey)
-    );
-    const binArraysAccInfo = await chunkedGetMultipleAccountInfos(
-      this.program.provider.connection,
-      binArrayPubkeyArrayV2
-    );
-    const positionBinArraysMapV2 = /* @__PURE__ */ new Map();
-    for (let i = 0; i < binArraysAccInfo.length; i++) {
-      const binArrayPubkey = binArrayPubkeyArrayV2[i];
-      const binArrayAccBufferV2 = binArraysAccInfo[i];
-      if (!binArrayAccBufferV2)
-        throw new Error(
-          `Bin Array account ${binArrayPubkey.toBase58()} not found`
-        );
-      const binArrayAccInfo = this.program.coder.accounts.decode(
-        "binArray",
-        binArrayAccBufferV2.data
+      const lowerBinArray = positionBinArraysMapV2.get(
+        lowerBinArrayPubKey.toBase58()
       );
-      positionBinArraysMapV2.set(binArrayPubkey.toBase58(), binArrayAccInfo);
+      const upperBinArray = positionBinArraysMapV2.get(
+        upperBinArrayPubKey.toBase58()
+      );
+      const lbPairAcc = lbPairArraysMapV2.get(lbPair.toBase58());
+      const [baseTokenDecimal, quoteTokenDecimal] = await Promise.all([
+        getTokenDecimals(program.provider.connection, lbPairAcc.tokenXMint),
+        getTokenDecimals(program.provider.connection, lbPairAcc.tokenYMint)
+      ]);
+      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _56 => _56.get, 'call', _57 => _57(lbPair.toBase58()), 'optionalAccess', _58 => _58.reserveX]), () => ( BigInt(0)));
+      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _59 => _59.get, 'call', _60 => _60(lbPair.toBase58()), 'optionalAccess', _61 => _61.reserveY]), () => ( BigInt(0)));
+      const tokenX = {
+        publicKey: lbPairAcc.tokenXMint,
+        reserve: lbPairAcc.reserveX,
+        amount: reserveXBalance,
+        decimal: baseTokenDecimal
+      };
+      const tokenY = {
+        publicKey: lbPairAcc.tokenYMint,
+        reserve: lbPairAcc.reserveY,
+        amount: reserveYBalance,
+        decimal: quoteTokenDecimal
+      };
+      const positionData = await DLMM.processPosition(
+        program,
+        1 /* V2 */,
+        lbPairAcc,
+        onChainTimestamp,
+        account,
+        baseTokenDecimal,
+        quoteTokenDecimal,
+        lowerBinArray,
+        upperBinArray,
+        feeOwner
+      );
+      if (positionData) {
+        positionsMap.set(lbPair.toBase58(), {
+          publicKey: lbPair,
+          lbPair: lbPairAcc,
+          tokenX,
+          tokenY,
+          lbPairPositionsData: [
+            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _62 => _62.get, 'call', _63 => _63(lbPair.toBase58()), 'optionalAccess', _64 => _64.lbPairPositionsData]), () => ( [])),
+            {
+              publicKey: positionPubKey,
+              positionData,
+              version: 1 /* V2 */
+            }
+          ]
+        });
+      }
     }
-    const positionsLockInfo = await Promise.all(
-      positionsWithLock.map(async ({ publicKey, account }) => {
-        const { lowerBinId, upperBinId, feeOwner } = account;
+    return positionsMap;
+  }
+  static async migratePosition(connection, positions, newPositions, walletPubkey, opt) {
+    const cluster = _optionalChain([opt, 'optionalAccess', _65 => _65.cluster]) || "mainnet-beta";
+    const provider = new (0, _anchor.AnchorProvider)(
+      connection,
+      {},
+      _anchor.AnchorProvider.defaultOptions()
+    );
+    const program = new (0, _anchor.Program)(
+      IDL,
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _66 => _66.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
+      provider
+    );
+    const positionsState = await program.account.position.fetchMultiple(
+      positions
+    );
+    const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash("confirmed");
+    return Promise.all(
+      positionsState.map(async ({ lbPair, lowerBinId }, idx) => {
+        const position = positions[idx];
         const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
-        const upperBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinId));
+        const upperBinArrayIndex = lowerBinArrayIndex.add(new (0, _anchor.BN)(1));
         const [lowerBinArrayPubKey] = deriveBinArray(
-          this.pubkey,
+          lbPair,
           lowerBinArrayIndex,
-          this.program.programId
+          program.programId
         );
         const [upperBinArrayPubKey] = deriveBinArray(
-          this.pubkey,
+          lbPair,
           upperBinArrayIndex,
-          this.program.programId
+          program.programId
         );
-        const lowerBinArray = positionBinArraysMapV2.get(
-          lowerBinArrayPubKey.toBase58()
-        );
-        const upperBinArray = positionBinArraysMapV2.get(
-          upperBinArrayPubKey.toBase58()
-        );
-        const positionData = await DLMM.processPosition(
-          this.program,
-          1 /* V2 */,
-          this.lbPair,
-          clock.unixTimestamp.toNumber(),
-          account,
-          this.tokenX.decimal,
-          this.tokenY.decimal,
-          lowerBinArray,
-          upperBinArray,
-          feeOwner
-        );
-        return {
-          positionAddress: publicKey,
-          owner: account.owner,
-          lockReleasePoint: account.lockReleasePoint.toNumber(),
-          tokenXAmount: positionData.totalXAmount,
-          tokenYAmount: positionData.totalYAmount
-        };
+        const migrateTx = await program.methods.migratePosition().accounts({
+          binArrayLower: lowerBinArrayPubKey,
+          binArrayUpper: upperBinArrayPubKey,
+          lbPair,
+          owner: walletPubkey,
+          positionV1: position,
+          positionV2: newPositions[idx],
+          program: program.programId,
+          rentReceiver: walletPubkey,
+          systemProgram: _web3js.SystemProgram.programId
+        }).transaction();
+        return new (0, _web3js.Transaction)({
+          blockhash,
+          lastValidBlockHeight,
+          feePayer: walletPubkey
+        }).add(migrateTx);
       })
     );
-    return {
-      positions: positionsLockInfo
-    };
+  }
+  static getPricePerLamport(tokenXDecimal, tokenYDecimal, price) {
+    return new (0, _decimaljs2.default)(price).mul(new (0, _decimaljs2.default)(10 ** (tokenYDecimal - tokenXDecimal))).toString();
+  }
+  static getBinIdFromPrice(price, binStep, min) {
+    const binStepNum = new (0, _decimaljs2.default)(binStep).div(new (0, _decimaljs2.default)(BASIS_POINT_MAX));
+    const binId = new (0, _decimaljs2.default)(price).log().dividedBy(new (0, _decimaljs2.default)(1).add(binStepNum).log());
+    return (min ? binId.floor() : binId.ceil()).toNumber();
   }
   /** Public methods */
   static async createPermissionLbPair(connection, binStep, tokenX, tokenY, activeId, baseKey, creatorKey, feeBps, activationType, opt) {
@@ -8465,7 +8477,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _64 => _64.programId]), () => ( LBCLMM_PROGRAM_IDS[opt.cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _67 => _67.programId]), () => ( LBCLMM_PROGRAM_IDS[opt.cluster])),
       provider
     );
     const [lbPair] = derivePermissionLbPair(
@@ -8514,7 +8526,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _65 => _65.programId]), () => ( LBCLMM_PROGRAM_IDS[opt.cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _68 => _68.programId]), () => ( LBCLMM_PROGRAM_IDS[opt.cluster])),
       provider
     );
     const [lbPair] = deriveCustomizablePermissionlessLbPair(
@@ -8539,9 +8551,9 @@ var DLMM = class {
       padding: Array(64).fill(0)
     };
     const userTokenX = _spltoken.getAssociatedTokenAddressSync.call(void 0, tokenX, creatorKey);
-    const userTokenY = _spltoken.getAssociatedTokenAddressSync.call(void 0, tokenY, creatorKey);
     return program.methods.initializeCustomizablePermissionlessLbPair(ixData).accounts({
       lbPair,
+      rent: _web3js.SYSVAR_RENT_PUBKEY,
       reserveX,
       reserveY,
       binArrayBitmapExtension,
@@ -8551,7 +8563,6 @@ var DLMM = class {
       oracle,
       systemProgram: _web3js.SystemProgram.programId,
       userTokenX,
-      userTokenY,
       funder: creatorKey
     }).transaction();
   }
@@ -8563,7 +8574,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _66 => _66.programId]), () => ( LBCLMM_PROGRAM_IDS[opt.cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _69 => _69.programId]), () => ( LBCLMM_PROGRAM_IDS[opt.cluster])),
       provider
     );
     const existsPool = await this.getPairPubkeyIfExists(
@@ -8699,7 +8710,7 @@ var DLMM = class {
         swapForY,
         new (0, _anchor.BN)(activeIdToLoop),
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _67 => _67.binArrayBitmapExtension, 'optionalAccess', _68 => _68.account]), () => ( null))
+        _nullishCoalesce(_optionalChain([this, 'access', _70 => _70.binArrayBitmapExtension, 'optionalAccess', _71 => _71.account]), () => ( null))
       );
       if (binArrayIndex === null)
         shouldStop = true;
@@ -8940,6 +8951,20 @@ var DLMM = class {
   async getPositionsByUserAndLbPair(userPubKey) {
     const promiseResults = await Promise.all([
       this.getActiveBin(),
+      userPubKey && this.program.account.position.all([
+        {
+          memcmp: {
+            bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
+            offset: 8 + 32
+          }
+        },
+        {
+          memcmp: {
+            bytes: _bytes.bs58.encode(this.pubkey.toBuffer()),
+            offset: 8
+          }
+        }
+      ]),
       userPubKey && this.program.account.positionV2.all([
         {
           memcmp: {
@@ -8955,7 +8980,7 @@ var DLMM = class {
         }
       ])
     ]);
-    const [activeBin, positionsV2] = promiseResults;
+    const [activeBin, positions, positionsV2] = promiseResults;
     if (!activeBin) {
       throw new Error("Error fetching active bin");
     }
@@ -8965,9 +8990,29 @@ var DLMM = class {
         userPositions: []
       };
     }
-    if (!positionsV2) {
+    if (!positions || !positionsV2) {
       throw new Error("Error fetching positions");
     }
+    const binArrayPubkeySet = /* @__PURE__ */ new Set();
+    positions.forEach(({ account: { upperBinId, lowerBinId } }) => {
+      const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinId));
+      const [lowerBinArrayPubKey] = deriveBinArray(
+        this.pubkey,
+        lowerBinArrayIndex,
+        this.program.programId
+      );
+      const [upperBinArrayPubKey] = deriveBinArray(
+        this.pubkey,
+        upperBinArrayIndex,
+        this.program.programId
+      );
+      binArrayPubkeySet.add(lowerBinArrayPubKey.toBase58());
+      binArrayPubkeySet.add(upperBinArrayPubKey.toBase58());
+    });
+    const binArrayPubkeyArray = Array.from(binArrayPubkeySet).map(
+      (pubkey) => new (0, _web3js.PublicKey)(pubkey)
+    );
     const binArrayPubkeySetV2 = /* @__PURE__ */ new Set();
     positionsV2.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
       const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
@@ -8993,13 +9038,28 @@ var DLMM = class {
       [
         this.pubkey,
         _web3js.SYSVAR_CLOCK_PUBKEY,
+        ...binArrayPubkeyArray,
         ...binArrayPubkeyArrayV2
       ]
     );
     const [lbPairAccInfo, clockAccInfo, ...binArraysAccInfo] = lbPairAndBinArrays;
+    const positionBinArraysMap = /* @__PURE__ */ new Map();
+    for (let i = 0; i < binArrayPubkeyArray.length; i++) {
+      const binArrayPubkey = binArrayPubkeyArray[i];
+      const binArrayAccBuffer = binArraysAccInfo[i];
+      if (!binArrayAccBuffer)
+        throw new Error(
+          `Bin Array account ${binArrayPubkey.toBase58()} not found`
+        );
+      const binArrayAccInfo = this.program.coder.accounts.decode(
+        "binArray",
+        binArrayAccBuffer.data
+      );
+      positionBinArraysMap.set(binArrayPubkey.toBase58(), binArrayAccInfo);
+    }
     const positionBinArraysMapV2 = /* @__PURE__ */ new Map();
-    for (let i = 0; i < binArraysAccInfo.length; i++) {
-      const binArrayPubkey = binArrayPubkeyArrayV2[i];
+    for (let i = binArrayPubkeyArray.length; i < binArraysAccInfo.length; i++) {
+      const binArrayPubkey = binArrayPubkeyArrayV2[i - binArrayPubkeyArray.length];
       const binArrayAccBufferV2 = binArraysAccInfo[i];
       if (!binArrayAccBufferV2)
         throw new Error(
@@ -9016,6 +9076,45 @@ var DLMM = class {
     const onChainTimestamp = new (0, _anchor.BN)(
       clockAccInfo.data.readBigInt64LE(32).toString()
     ).toNumber();
+    const userPositions = await Promise.all(
+      positions.map(async ({ publicKey, account }) => {
+        const { lowerBinId, upperBinId } = account;
+        const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
+        const upperBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinId));
+        const [lowerBinArrayPubKey] = deriveBinArray(
+          this.pubkey,
+          lowerBinArrayIndex,
+          this.program.programId
+        );
+        const [upperBinArrayPubKey] = deriveBinArray(
+          this.pubkey,
+          upperBinArrayIndex,
+          this.program.programId
+        );
+        const lowerBinArray = positionBinArraysMap.get(
+          lowerBinArrayPubKey.toBase58()
+        );
+        const upperBinArray = positionBinArraysMap.get(
+          upperBinArrayPubKey.toBase58()
+        );
+        return {
+          publicKey,
+          positionData: await DLMM.processPosition(
+            this.program,
+            0 /* V1 */,
+            this.lbPair,
+            onChainTimestamp,
+            account,
+            this.tokenX.decimal,
+            this.tokenY.decimal,
+            lowerBinArray,
+            upperBinArray,
+            _web3js.PublicKey.default
+          ),
+          version: 0 /* V1 */
+        };
+      })
+    );
     const userPositionsV2 = await Promise.all(
       positionsV2.map(async ({ publicKey, account }) => {
         const { lowerBinId, upperBinId, feeOwner } = account;
@@ -9057,7 +9156,7 @@ var DLMM = class {
     );
     return {
       activeBin,
-      userPositions: userPositionsV2
+      userPositions: [...userPositions, ...userPositionsV2]
     };
   }
   async quoteCreatePosition({ strategy }) {
@@ -9118,93 +9217,6 @@ var DLMM = class {
       feePayer: user
     }).add(setCUIx, ...instructions);
   }
-  /**
-   * The function `getPosition` retrieves position information for a given public key and processes it
-   * using various data to return a `LbPosition` object.
-   * @param {PublicKey} positionPubKey - The `getPosition` function you provided is an asynchronous
-   * function that fetches position information based on a given public key. Here's a breakdown of the
-   * parameters used in the function:
-   * @returns The `getPosition` function returns a Promise that resolves to an object of type
-   * `LbPosition`. The object contains the following properties:
-   * - `publicKey`: The public key of the position account
-   * - `positionData`: Position Object
-   * - `version`: The version of the position (in this case, `Position.V2`)
-   */
-  async getPosition(positionPubKey) {
-    const positionAccountInfo = await this.program.account.positionV2.fetch(positionPubKey);
-    if (!positionAccountInfo) {
-      throw new Error(`Position account ${positionPubKey.toBase58()} not found`);
-    }
-    const { lowerBinId, upperBinId, feeOwner } = positionAccountInfo;
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
-    const upperBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinId));
-    const [lowerBinArrayPubKey] = deriveBinArray(
-      this.pubkey,
-      lowerBinArrayIndex,
-      this.program.programId
-    );
-    const [upperBinArrayPubKey] = deriveBinArray(
-      this.pubkey,
-      upperBinArrayIndex,
-      this.program.programId
-    );
-    const [clockAccInfo, lowerBinArrayAccInfo, upperBinArrayAccInfo] = await chunkedGetMultipleAccountInfos(
-      this.program.provider.connection,
-      [
-        _web3js.SYSVAR_CLOCK_PUBKEY,
-        lowerBinArrayPubKey,
-        upperBinArrayPubKey
-      ]
-    );
-    if (!lowerBinArrayAccInfo || !upperBinArrayAccInfo) {
-      return {
-        publicKey: positionPubKey,
-        positionData: {
-          totalXAmount: "0",
-          totalYAmount: "0",
-          positionBinData: [],
-          lastUpdatedAt: new (0, _anchor.BN)(0),
-          upperBinId,
-          lowerBinId,
-          feeX: new (0, _anchor.BN)(0),
-          feeY: new (0, _anchor.BN)(0),
-          rewardOne: new (0, _anchor.BN)(0),
-          rewardTwo: new (0, _anchor.BN)(0),
-          feeOwner,
-          totalClaimedFeeXAmount: new (0, _anchor.BN)(0),
-          totalClaimedFeeYAmount: new (0, _anchor.BN)(0)
-        },
-        version: 1 /* V2 */
-      };
-    }
-    const onChainTimestamp = new (0, _anchor.BN)(
-      clockAccInfo.data.readBigInt64LE(32).toString()
-    ).toNumber();
-    const lowerBinArray = this.program.coder.accounts.decode(
-      "binArray",
-      lowerBinArrayAccInfo.data
-    );
-    const upperBinArray = this.program.coder.accounts.decode(
-      "binArray",
-      upperBinArrayAccInfo.data
-    );
-    return {
-      publicKey: positionPubKey,
-      positionData: await DLMM.processPosition(
-        this.program,
-        1 /* V2 */,
-        this.lbPair,
-        onChainTimestamp,
-        positionAccountInfo,
-        this.tokenX.decimal,
-        this.tokenY.decimal,
-        lowerBinArray,
-        upperBinArray,
-        feeOwner
-      ),
-      version: 1 /* V2 */
-    };
-  }
   /**
    * The function `initializePositionAndAddLiquidityByStrategy` function is used to initializes a position and adds liquidity
    * @param {TInitializePositionAndAddLiquidityParamsByStrategy}
@@ -9928,13 +9940,9 @@ var DLMM = class {
     bps,
     shouldClaimAndClose = false
   }) {
-    const lowerBinIdToRemove = Math.min(...binIds);
-    const upperBinIdToRemove = Math.max(...binIds);
-    const { lbPair, owner, feeOwner, lowerBinId: positionLowerBinId, liquidityShares } = await this.program.account.positionV2.fetch(position);
-    if (liquidityShares.every((share) => share.isZero())) {
-      throw new Error("No liquidity to remove");
-    }
-    const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(positionLowerBinId));
+    const { lbPair, lowerBinId, owner, feeOwner } = await this.program.account.positionV2.fetch(position);
+    const { reserveX, reserveY, tokenXMint, tokenYMint } = await this.program.account.lbPair.fetch(lbPair);
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
     const upperBinArrayIndex = lowerBinArrayIndex.add(new (0, _anchor.BN)(1));
     const [binArrayLower] = deriveBinArray(
       lbPair,
@@ -9994,8 +10002,8 @@ var DLMM = class {
         lbPair: this.pubkey,
         sender: user,
         position,
-        reserveX: this.lbPair.reserveX,
-        reserveY: this.lbPair.reserveY,
+        reserveX,
+        reserveY,
         tokenProgram: _spltoken.TOKEN_PROGRAM_ID,
         tokenXMint: this.tokenX.publicKey,
         tokenYMint: this.tokenY.publicKey,
@@ -10048,19 +10056,21 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const minBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinIdToRemove));
-    const maxBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(upperBinIdToRemove));
+    const minBinId = Math.min(...binIds);
+    const maxBinId = Math.max(...binIds);
+    const minBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(minBinId));
+    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(lowerBinIdToRemove, upperBinIdToRemove, bps.toNumber()).accounts({
+    const removeLiquidityIx = await this.program.methods.removeLiquidityByRange(minBinId, maxBinId, bps.toNumber()).accounts({
       position,
       lbPair,
       userTokenX,
       userTokenY,
-      reserveX: this.lbPair.reserveX,
-      reserveY: this.lbPair.reserveY,
-      tokenXMint: this.tokenX.publicKey,
-      tokenYMint: this.tokenY.publicKey,
+      reserveX,
+      reserveY,
+      tokenXMint,
+      tokenYMint,
       binArrayLower,
       binArrayUpper,
       binArrayBitmapExtension,
@@ -10070,7 +10080,7 @@ var DLMM = class {
     }).instruction();
     const instructions = [
       ...preInstructions,
-      removeLiquidityTx,
+      removeLiquidityIx,
       ...postInstructions
     ];
     const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
@@ -10186,7 +10196,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _69 => _69.binArrayBitmapExtension, 'optionalAccess', _70 => _70.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _72 => _72.binArrayBitmapExtension, 'optionalAccess', _73 => _73.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -10285,13 +10295,12 @@ var DLMM = class {
     let actualOutAmount = new (0, _anchor.BN)(0);
     let feeAmount = new (0, _anchor.BN)(0);
     let protocolFeeAmount = new (0, _anchor.BN)(0);
-    let lastFilledActiveBinId = activeId;
     while (!inAmountLeft.isZero()) {
       let binArrayAccountToSwap = findNextBinArrayWithLiquidity(
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _71 => _71.binArrayBitmapExtension, 'optionalAccess', _72 => _72.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _74 => _74.binArrayBitmapExtension, 'optionalAccess', _75 => _75.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -10331,7 +10340,6 @@ var DLMM = class {
           if (!startBin) {
             startBin = bin;
           }
-          lastFilledActiveBinId = activeId;
         }
       }
       if (!inAmountLeft.isZero()) {
@@ -10359,7 +10367,7 @@ var DLMM = class {
     const priceImpact = new (0, _decimaljs2.default)(actualOutAmount.toString()).sub(new (0, _decimaljs2.default)(outAmountWithoutSlippage.toString())).div(new (0, _decimaljs2.default)(outAmountWithoutSlippage.toString())).mul(new (0, _decimaljs2.default)(100));
     const minOutAmount = actualOutAmount.mul(new (0, _anchor.BN)(BASIS_POINT_MAX).sub(allowedSlippage)).div(new (0, _anchor.BN)(BASIS_POINT_MAX));
     const endPrice = getPriceOfBinByBinId(
-      lastFilledActiveBinId.toNumber(),
+      activeId.toNumber(),
       this.lbPair.binStep
     );
     return {
@@ -10476,6 +10484,7 @@ var DLMM = class {
     priceImpact,
     binArraysPubkey
   }) {
+    const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [];
     const postInstructions = [];
     const [
@@ -10509,6 +10518,9 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
+    let swapForY = true;
+    if (outToken.equals(tokenXMint))
+      swapForY = false;
     const binArrays = binArraysPubkey.map((pubkey) => {
       return {
         isSigner: false,
@@ -10522,17 +10534,17 @@ var DLMM = class {
       priceImpact.toNumber()
     ).accounts({
       lbPair,
-      reserveX: this.lbPair.reserveX,
-      reserveY: this.lbPair.reserveY,
-      tokenXMint: this.lbPair.tokenXMint,
-      tokenYMint: this.lbPair.tokenYMint,
+      reserveX,
+      reserveY,
+      tokenXMint,
+      tokenYMint,
       tokenXProgram: _spltoken.TOKEN_PROGRAM_ID,
       tokenYProgram: _spltoken.TOKEN_PROGRAM_ID,
       user,
       userTokenIn,
       userTokenOut,
       binArrayBitmapExtension: this.binArrayBitmapExtension ? this.binArrayBitmapExtension.publicKey : null,
-      oracle: this.lbPair.oracle,
+      oracle,
       hostFeeIn: null
     }).remainingAccounts(binArrays).instruction();
     const instructions = [...preInstructions, swapIx, ...postInstructions];
@@ -10570,6 +10582,7 @@ var DLMM = class {
     user,
     binArraysPubkey
   }) {
+    const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [];
     const postInstructions = [];
     const [
@@ -10603,6 +10616,9 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
+    let swapForY = true;
+    if (outToken.equals(tokenXMint))
+      swapForY = false;
     const binArrays = binArraysPubkey.map((pubkey) => {
       return {
         isSigner: false,
@@ -10612,10 +10628,10 @@ var DLMM = class {
     });
     const swapIx = await this.program.methods.swap(inAmount, minOutAmount).accounts({
       lbPair,
-      reserveX: this.lbPair.reserveX,
-      reserveY: this.lbPair.reserveY,
-      tokenXMint: this.lbPair.tokenXMint,
-      tokenYMint: this.lbPair.tokenYMint,
+      reserveX,
+      reserveY,
+      tokenXMint,
+      tokenYMint,
       tokenXProgram: _spltoken.TOKEN_PROGRAM_ID,
       // dont use 2022 first; lack familiarity
       tokenYProgram: _spltoken.TOKEN_PROGRAM_ID,
@@ -10624,7 +10640,7 @@ var DLMM = class {
       userTokenIn,
       userTokenOut,
       binArrayBitmapExtension: this.binArrayBitmapExtension ? this.binArrayBitmapExtension.publicKey : null,
-      oracle: this.lbPair.oracle,
+      oracle,
       hostFeeIn: null
     }).remainingAccounts(binArrays).instruction();
     const instructions = [...preInstructions, swapIx, ...postInstructions];
@@ -10726,21 +10742,6 @@ var DLMM = class {
       lastValidBlockHeight
     }).add(setActivationPointTx);
   }
-  async setPairStatus(enabled) {
-    const pairStatus = enabled ? 0 : 1;
-    const tx = await this.program.methods.setPairStatus(pairStatus).accounts(
-      {
-        lbPair: this.pubkey,
-        admin: this.lbPair.creator
-      }
-    ).transaction();
-    const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
-    return new (0, _web3js.Transaction)({
-      feePayer: this.lbPair.creator,
-      blockhash,
-      lastValidBlockHeight
-    }).add(tx);
-  }
   /**
    * The function `claimSwapFee` is used to claim swap fees for a specific position owned by a specific owner.
    * @param
@@ -11485,7 +11486,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _73 => _73.binArrayBitmapExtension, 'optionalAccess', _74 => _74.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _76 => _76.binArrayBitmapExtension, 'optionalAccess', _77 => _77.account]), () => ( null))
     );
     if (toBinArrayIndex === null)
       return true;
@@ -11522,7 +11523,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _75 => _75.binArrayBitmapExtension, 'optionalAccess', _76 => _76.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _78 => _78.binArrayBitmapExtension, 'optionalAccess', _79 => _79.account]), () => ( null))
     );
     const accountsToFetch = [];
     const [binArrayBitMapExtensionPubkey] = deriveBinArrayBitmapExtension(
@@ -11553,13 +11554,13 @@ var DLMM = class {
     let fromBinArray = null;
     let toBinArray = null;
     let binArrayBitmapExtension = null;
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _77 => _77[0]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _80 => _80[0]])) {
       binArrayBitmapExtension = binArrayBitMapExtensionPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _78 => _78[1]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _81 => _81[1]])) {
       fromBinArray = fromBinArrayPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _79 => _79[2]]) && !!toBinArrayIndex) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _82 => _82[2]]) && !!toBinArrayIndex) {
       toBinArray = toBinArrayPubkey;
     }
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
@@ -11884,7 +11885,12 @@ var DLMM = class {
     let totalYAmount = new (0, _decimaljs2.default)(0);
     bins.forEach((bin, idx) => {
       const binSupply = new (0, _decimaljs2.default)(bin.supply.toString());
-      const posShare = new (0, _decimaljs2.default)(posShares[idx].toString());
+      let posShare;
+      if (bin.version === 1 && version === 0 /* V1 */) {
+        posShare = new (0, _decimaljs2.default)(posShares[idx].shln(64).toString());
+      } else {
+        posShare = new (0, _decimaljs2.default)(posShares[idx].toString());
+      }
       const positionXAmount = binSupply.eq(new (0, _decimaljs2.default)("0")) ? new (0, _decimaljs2.default)("0") : posShare.mul(bin.xAmount.toString()).div(binSupply);
       const positionYAmount = binSupply.eq(new (0, _decimaljs2.default)("0")) ? new (0, _decimaljs2.default)("0") : posShare.mul(bin.yAmount.toString()).div(binSupply);
       totalXAmount = totalXAmount.add(positionXAmount);
@@ -12035,7 +12041,7 @@ var DLMM = class {
       const [lowerBinId2] = getBinArrayLowerUpperBinId(index);
       return bins.map((b, i) => [lowerBinId2.toNumber() + i, b]);
     }));
-    const version = _nullishCoalesce(_optionalChain([binArrays, 'access', _80 => _80.find, 'call', _81 => _81((binArray) => binArray != null), 'optionalAccess', _82 => _82.version]), () => ( 1));
+    const version = _nullishCoalesce(_optionalChain([binArrays, 'access', _83 => _83.find, 'call', _84 => _84((binArray) => binArray != null), 'optionalAccess', _85 => _85.version]), () => ( 1));
     return Array.from(enumerateBins(
       binsById,
       lowerBinId,
@@ -12328,5 +12334,6 @@ 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.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.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