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

package/dist/index.mjs

@@ -11,8 +11,8 @@ import {
   getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2
 } from "@solana/spl-token";
 import {
-  ComputeBudgetProgram as ComputeBudgetProgram3,
-  PublicKey as PublicKey7,
+  ComputeBudgetProgram as ComputeBudgetProgram2,
+  PublicKey as PublicKey6,
   SYSVAR_CLOCK_PUBKEY,
   SYSVAR_RENT_PUBKEY,
   SystemProgram as SystemProgram2,
@@ -25,7 +25,7 @@ import { PublicKey } from "@solana/web3.js";
 
 // 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,7 +1964,7 @@ var IDL = {
       "args": []
     },
     {
-      "name": "updateBaseFeeParameters",
+      "name": "updateFeeParameters",
       "accounts": [
         {
           "name": "lbPair",
@@ -2001,40 +1991,7 @@ var IDL = {
         {
           "name": "feeParameter",
           "type": {
-            "defined": "BaseFeeParameter"
-          }
-        }
-      ]
-    },
-    {
-      "name": "updateDynamicFeeParameters",
-      "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": "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"
     }
   ]
 };
@@ -5504,16 +5373,16 @@ import {
   TOKEN_PROGRAM_ID,
   TokenAccountNotFoundError,
   TokenInvalidAccountOwnerError,
-  createAssociatedTokenAccountIdempotentInstruction,
+  createAssociatedTokenAccountInstruction,
   createCloseAccountInstruction,
   getAccount,
   getAssociatedTokenAddressSync,
   getMint
 } from "@solana/spl-token";
 import {
-  ComputeBudgetProgram as ComputeBudgetProgram2,
+  ComputeBudgetProgram,
   SystemProgram,
-  TransactionInstruction as TransactionInstruction2
+  TransactionInstruction
 } from "@solana/web3.js";
 
 // src/dlmm/helpers/math.ts
@@ -6472,51 +6341,22 @@ function generateBinAmount(amount, binStep, binId, tokenXDecimal, tokenYDecimal,
   return new BN5(c1.sub(c0).floor().toString());
 }
 
+// src/dlmm/helpers/index.ts
+import { getSimulationComputeUnits } from "@solana-developers/helpers";
+
 // src/dlmm/helpers/computeUnit.ts
-import { ComputeBudgetProgram, PublicKey as PublicKey2, TransactionMessage, VersionedTransaction } from "@solana/web3.js";
 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
-    ComputeBudgetProgram.setComputeUnitLimit({ units: 14e5 }),
-    ...instructions
-  ];
-  const testTransaction = new VersionedTransaction(
-    new TransactionMessage({
-      instructions: testInstructions,
-      payerKey: payer,
-      // RecentBlockhash can by any public key during simulation
-      // since 'replaceRecentBlockhash' is set to 'true' below
-      recentBlockhash: PublicKey2.default.toString()
-    }).compileToV0Message(lookupTables)
-  );
-  const rpcResponse = await connection.simulateTransaction(testTransaction, {
-    replaceRecentBlockhash: true,
-    sigVerify: false,
-    commitment
-  });
-  if (rpcResponse?.value?.err) {
-    const logs = rpcResponse.value.logs?.join("\n  \u2022 ") || "No logs available";
-    throw new Error(
-      `Transaction simulation failed:
-  \u2022${logs}` + JSON.stringify(rpcResponse?.value?.err)
-    );
-  }
-  return rpcResponse.value.unitsConsumed || null;
-};
 
 // src/dlmm/helpers/derive.ts
-import { PublicKey as PublicKey3 } from "@solana/web3.js";
+import { PublicKey as PublicKey2 } from "@solana/web3.js";
 function sortTokenMints(tokenX, tokenY) {
   const [minKey, maxKey] = tokenX.toBuffer().compare(tokenY.toBuffer()) == 1 ? [tokenY, tokenX] : [tokenX, tokenY];
   return [minKey, maxKey];
 }
 function derivePresetParameter(binStep, programId) {
-  return PublicKey3.findProgramAddressSync(
+  return PublicKey2.findProgramAddressSync(
     [
       Buffer.from("preset_parameter"),
       new Uint8Array(binStep.toArrayLike(Buffer, "le", 2))
@@ -6525,7 +6365,7 @@ function derivePresetParameter(binStep, programId) {
   );
 }
 function derivePresetParameter2(binStep, baseFactor, programId) {
-  return PublicKey3.findProgramAddressSync(
+  return PublicKey2.findProgramAddressSync(
     [
       Buffer.from("preset_parameter"),
       new Uint8Array(binStep.toArrayLike(Buffer, "le", 2)),
@@ -6536,7 +6376,7 @@ function derivePresetParameter2(binStep, baseFactor, programId) {
 }
 function deriveLbPair2(tokenX, tokenY, binStep, baseFactor, programId) {
   const [minKey, maxKey] = sortTokenMints(tokenX, tokenY);
-  return PublicKey3.findProgramAddressSync(
+  return PublicKey2.findProgramAddressSync(
     [
       minKey.toBuffer(),
       maxKey.toBuffer(),
@@ -6548,7 +6388,7 @@ function deriveLbPair2(tokenX, tokenY, binStep, baseFactor, programId) {
 }
 function deriveLbPair(tokenX, tokenY, binStep, programId) {
   const [minKey, maxKey] = sortTokenMints(tokenX, tokenY);
-  return PublicKey3.findProgramAddressSync(
+  return PublicKey2.findProgramAddressSync(
     [
       minKey.toBuffer(),
       maxKey.toBuffer(),
@@ -6559,14 +6399,14 @@ function deriveLbPair(tokenX, tokenY, binStep, programId) {
 }
 function deriveCustomizablePermissionlessLbPair(tokenX, tokenY, programId) {
   const [minKey, maxKey] = sortTokenMints(tokenX, tokenY);
-  return PublicKey3.findProgramAddressSync(
+  return PublicKey2.findProgramAddressSync(
     [ILM_BASE.toBuffer(), minKey.toBuffer(), maxKey.toBuffer()],
     programId
   );
 }
 function derivePermissionLbPair(baseKey, tokenX, tokenY, binStep, programId) {
   const [minKey, maxKey] = sortTokenMints(tokenX, tokenY);
-  return PublicKey3.findProgramAddressSync(
+  return PublicKey2.findProgramAddressSync(
     [
       baseKey.toBuffer(),
       minKey.toBuffer(),
@@ -6577,7 +6417,7 @@ function derivePermissionLbPair(baseKey, tokenX, tokenY, binStep, programId) {
   );
 }
 function deriveOracle(lbPair, programId) {
-  return PublicKey3.findProgramAddressSync(
+  return PublicKey2.findProgramAddressSync(
     [Buffer.from("oracle"), lbPair.toBytes()],
     programId
   );
@@ -6591,7 +6431,7 @@ function derivePosition(lbPair, base, lowerBinId, width, programId) {
   } else {
     lowerBinIdBytes = new Uint8Array(lowerBinId.toArrayLike(Buffer, "le", 4));
   }
-  return PublicKey3.findProgramAddressSync(
+  return PublicKey2.findProgramAddressSync(
     [
       Buffer.from("position"),
       lbPair.toBuffer(),
@@ -6611,13 +6451,13 @@ function deriveBinArray(lbPair, index, programId) {
   } else {
     binArrayBytes = new Uint8Array(index.toArrayLike(Buffer, "le", 8));
   }
-  return PublicKey3.findProgramAddressSync(
+  return PublicKey2.findProgramAddressSync(
     [Buffer.from("bin_array"), lbPair.toBytes(), binArrayBytes],
     programId
   );
 }
 function deriveReserve(token, lbPair, programId) {
-  return PublicKey3.findProgramAddressSync(
+  return PublicKey2.findProgramAddressSync(
     [lbPair.toBuffer(), token.toBuffer()],
     programId
   );
@@ -6625,7 +6465,7 @@ function deriveReserve(token, lbPair, programId) {
 
 // src/dlmm/helpers/binArray.ts
 import { BN as BN7 } from "@coral-xyz/anchor";
-import { PublicKey as PublicKey4 } from "@solana/web3.js";
+import { PublicKey as PublicKey3 } from "@solana/web3.js";
 
 // src/dlmm/types/index.ts
 import {
@@ -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) => {
@@ -6813,7 +6659,7 @@ function isOverflowDefaultBinArrayBitmap(binArrayIndex) {
   return binArrayIndex.gt(maxBinArrayIndex) || binArrayIndex.lt(minBinArrayIndex);
 }
 function deriveBinArrayBitmapExtension(lbPair, programId) {
-  return PublicKey4.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [Buffer.from("bitmap"), lbPair.toBytes()],
     programId
   );
@@ -6962,7 +6808,7 @@ function getBinArraysRequiredByPositionRange(pair, fromBinId, toBinId, programId
     binArrays.set(upperBinArray.toBase58(), upperBinArrayIndex);
   }
   return Array.from(binArrays, ([key, index]) => ({
-    key: new PublicKey4(key),
+    key: new PublicKey3(key),
     index
   }));
 }
@@ -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,
@@ -7635,7 +7554,7 @@ function toStrategyParameters({
 
 // src/dlmm/helpers/lbPair.ts
 import { AnchorProvider, Program as Program2 } from "@coral-xyz/anchor";
-import { PublicKey as PublicKey5 } from "@solana/web3.js";
+import { PublicKey as PublicKey4 } from "@solana/web3.js";
 async function getTokensMintFromPoolAddress(connection, poolAddress, opt) {
   const provider = new AnchorProvider(
     connection,
@@ -7648,7 +7567,7 @@ async function getTokensMintFromPoolAddress(connection, poolAddress, opt) {
     provider
   );
   const poolAccount = await program.account.lbPair.fetchNullable(
-    new PublicKey5(poolAddress)
+    new PublicKey4(poolAddress)
   );
   if (!poolAccount)
     throw new Error("Pool account not found");
@@ -7702,7 +7621,7 @@ var getOrCreateATAInstruction = async (connection, tokenMint, owner, payer = own
     return { ataPubKey: toAccount, ix: void 0 };
   } catch (e) {
     if (e instanceof TokenAccountNotFoundError || e instanceof TokenInvalidAccountOwnerError) {
-      const ix = createAssociatedTokenAccountIdempotentInstruction(
+      const ix = createAssociatedTokenAccountInstruction(
         payer,
         toAccount,
         owner,
@@ -7734,7 +7653,7 @@ var wrapSOLInstruction = (from, to, amount) => {
       toPubkey: to,
       lamports: amount
     }),
-    new TransactionInstruction2({
+    new TransactionInstruction({
       keys: [
         {
           pubkey: to,
@@ -7803,7 +7722,7 @@ var getEstimatedComputeUnitIxWithBuffer = async (connection, instructions, feePa
     console.error("Error::getEstimatedComputeUnitUsageWithBuffer", error);
     return 14e5;
   });
-  return ComputeBudgetProgram2.setComputeUnitLimit({ units });
+  return ComputeBudgetProgram.setComputeUnitLimit({ units });
 };
 
 // src/dlmm/index.ts
@@ -8147,14 +8066,49 @@ var DLMM = class {
       opt?.programId ?? LBCLMM_PROGRAM_IDS[cluster],
       provider
     );
-    const positionsV2 = await program.account.positionV2.all([
-      {
-        memcmp: {
-          bytes: bs58.encode(userPubKey.toBuffer()),
-          offset: 8 + 32
+    const [positions, positionsV2] = await Promise.all([
+      program.account.position.all([
+        {
+          memcmp: {
+            bytes: bs58.encode(userPubKey.toBuffer()),
+            offset: 8 + 32
+          }
         }
-      }
+      ]),
+      program.account.positionV2.all([
+        {
+          memcmp: {
+            bytes: bs58.encode(userPubKey.toBuffer()),
+            offset: 8 + 32
+          }
+        }
+      ])
     ]);
+    const binArrayPubkeySet = /* @__PURE__ */ new Set();
+    const lbPairSet = /* @__PURE__ */ new Set();
+    positions.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
+      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
+      const [lowerBinArrayPubKey] = deriveBinArray(
+        lbPair,
+        lowerBinArrayIndex,
+        program.programId
+      );
+      const [upperBinArrayPubKey] = deriveBinArray(
+        lbPair,
+        upperBinArrayIndex,
+        program.programId
+      );
+      binArrayPubkeySet.add(lowerBinArrayPubKey.toBase58());
+      binArrayPubkeySet.add(upperBinArrayPubKey.toBase58());
+      lbPairSet.add(lbPair.toBase58());
+    });
+    const binArrayPubkeyArray = Array.from(binArrayPubkeySet).map(
+      (pubkey) => new PublicKey6(pubkey)
+    );
+    const lbPairArray = Array.from(lbPairSet).map(
+      (pubkey) => new PublicKey6(pubkey)
+    );
     const binArrayPubkeySetV2 = /* @__PURE__ */ new Set();
     const lbPairSetV2 = /* @__PURE__ */ new Set();
     positionsV2.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
@@ -8175,31 +8129,67 @@ var DLMM = class {
       lbPairSetV2.add(lbPair.toBase58());
     });
     const binArrayPubkeyArrayV2 = Array.from(binArrayPubkeySetV2).map(
-      (pubkey) => new PublicKey7(pubkey)
+      (pubkey) => new PublicKey6(pubkey)
     );
     const lbPairArrayV2 = Array.from(lbPairSetV2).map(
-      (pubkey) => new PublicKey7(pubkey)
+      (pubkey) => new PublicKey6(pubkey)
     );
     const [clockAccInfo, ...binArraysAccInfo] = await chunkedGetMultipleAccountInfos(connection, [
       SYSVAR_CLOCK_PUBKEY,
+      ...binArrayPubkeyArray,
+      ...lbPairArray,
       ...binArrayPubkeyArrayV2,
       ...lbPairArrayV2
     ]);
+    const positionBinArraysMap = /* @__PURE__ */ new Map();
+    for (let i = 0; i < binArrayPubkeyArray.length; i++) {
+      const binArrayPubkey = binArrayPubkeyArray[i];
+      const binArrayAccInfoBuffer = binArraysAccInfo[i];
+      if (!binArrayAccInfoBuffer)
+        throw new Error(
+          `Bin Array account ${binArrayPubkey.toBase58()} not found`
+        );
+      const binArrayAccInfo = program.coder.accounts.decode(
+        "binArray",
+        binArrayAccInfoBuffer.data
+      );
+      positionBinArraysMap.set(binArrayPubkey.toBase58(), binArrayAccInfo);
+    }
+    const lbPairArraysMap = /* @__PURE__ */ new Map();
+    for (let i = binArrayPubkeyArray.length; i < binArrayPubkeyArray.length + lbPairArray.length; i++) {
+      const lbPairPubkey = lbPairArray[i - binArrayPubkeyArray.length];
+      const lbPairAccInfoBuffer = binArraysAccInfo[i];
+      if (!lbPairAccInfoBuffer)
+        throw new Error(`LB Pair account ${lbPairPubkey.toBase58()} not found`);
+      const lbPairAccInfo = program.coder.accounts.decode(
+        "lbPair",
+        lbPairAccInfoBuffer.data
+      );
+      lbPairArraysMap.set(lbPairPubkey.toBase58(), lbPairAccInfo);
+    }
+    const reservePublicKeys = Array.from(lbPairArraysMap.values()).map(({ reserveX, reserveY, tokenXMint, tokenYMint }) => [
+      reserveX,
+      reserveY,
+      tokenXMint,
+      tokenYMint
+    ]).flat();
     const positionBinArraysMapV2 = /* @__PURE__ */ new Map();
-    for (let i = 0; i < binArrayPubkeyArrayV2.length; i++) {
-      const binArrayPubkey = binArrayPubkeyArrayV2[i];
+    for (let i = binArrayPubkeyArray.length + lbPairArray.length; i < binArrayPubkeyArray.length + lbPairArray.length + binArrayPubkeyArrayV2.length; i++) {
+      const binArrayPubkey = binArrayPubkeyArrayV2[i - (binArrayPubkeyArray.length + lbPairArray.length)];
       const binArrayAccInfoBufferV2 = binArraysAccInfo[i];
-      if (binArrayAccInfoBufferV2) {
-        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 = AccountLayout.decode(reserveAccBufferX.data);
+      const reserveAccY = AccountLayout.decode(reserveAccBufferY.data);
+      lbPairReserveMap.set(lbPair.toBase58(), {
+        reserveX: reserveAccX.amount,
+        reserveY: reserveAccY.amount
+      });
+      const mintXBuffer = reserveAccountsInfo[index + 2];
+      const mintYBuffer = reserveAccountsInfo[index + 3];
+      if (!mintXBuffer || !mintYBuffer)
+        throw new Error(
+          `Mint account for LB Pair ${lbPair.toBase58()} not found`
+        );
+      const mintX = MintLayout.decode(mintXBuffer.data);
+      const mintY = MintLayout.decode(mintYBuffer.data);
+      lbPairMintMap.set(lbPair.toBase58(), {
+        mintXDecimal: mintX.decimals,
+        mintYDecimal: mintY.decimals
+      });
+    });
     const lbPairReserveMapV2 = /* @__PURE__ */ new Map();
     const lbPairMintMapV2 = /* @__PURE__ */ new Map();
     lbPairArrayV2.forEach((lbPair, idx) => {
       const index = idx * 4;
-      const reserveAccBufferXV2 = reserveAccountsInfo[index];
-      const reserveAccBufferYV2 = reserveAccountsInfo[index + 1];
+      const reserveAccBufferXV2 = reserveAccountsInfo[reservePublicKeys.length + index];
+      const reserveAccBufferYV2 = reserveAccountsInfo[reservePublicKeys.length + index + 1];
       if (!reserveAccBufferXV2 || !reserveAccBufferYV2)
         throw new Error(
           `Reserve account for LB Pair ${lbPair.toBase58()} not found`
@@ -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,6 +8271,74 @@ var DLMM = class {
       clockAccInfo.data.readBigInt64LE(32).toString()
     ).toNumber();
     const positionsMap = /* @__PURE__ */ new Map();
+    for (let position of positions) {
+      const { account, publicKey: positionPubKey } = position;
+      const { upperBinId, lowerBinId, lbPair } = account;
+      const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
+      const [lowerBinArrayPubKey] = deriveBinArray(
+        lbPair,
+        lowerBinArrayIndex,
+        program.programId
+      );
+      const [upperBinArrayPubKey] = deriveBinArray(
+        lbPair,
+        upperBinArrayIndex,
+        program.programId
+      );
+      const lowerBinArray = positionBinArraysMap.get(
+        lowerBinArrayPubKey.toBase58()
+      );
+      const upperBinArray = positionBinArraysMap.get(
+        upperBinArrayPubKey.toBase58()
+      );
+      const lbPairAcc = lbPairArraysMap.get(lbPair.toBase58());
+      const { mintXDecimal, mintYDecimal } = lbPairMintMap.get(
+        lbPair.toBase58()
+      );
+      const reserveXBalance = lbPairReserveMap.get(lbPair.toBase58())?.reserveX ?? BigInt(0);
+      const reserveYBalance = lbPairReserveMap.get(lbPair.toBase58())?.reserveY ?? BigInt(0);
+      const tokenX = {
+        publicKey: lbPairAcc.tokenXMint,
+        reserve: lbPairAcc.reserveX,
+        amount: reserveXBalance,
+        decimal: mintXDecimal
+      };
+      const tokenY = {
+        publicKey: lbPairAcc.tokenYMint,
+        reserve: lbPairAcc.reserveY,
+        amount: reserveYBalance,
+        decimal: mintYDecimal
+      };
+      const positionData = await DLMM.processPosition(
+        program,
+        0 /* V1 */,
+        lbPairAcc,
+        onChainTimestamp,
+        account,
+        mintXDecimal,
+        mintYDecimal,
+        lowerBinArray,
+        upperBinArray,
+        PublicKey6.default
+      );
+      if (positionData) {
+        positionsMap.set(lbPair.toBase58(), {
+          publicKey: lbPair,
+          lbPair: lbPairAcc,
+          tokenX,
+          tokenY,
+          lbPairPositionsData: [
+            ...positionsMap.get(lbPair.toBase58())?.lbPairPositionsData ?? [],
+            {
+              publicKey: positionPubKey,
+              positionData,
+              version: 0 /* V1 */
+            }
+          ]
+        });
+      }
+    }
     for (let position of positionsV2) {
       const { account, publicKey: positionPubKey } = position;
       const { upperBinId, lowerBinId, lbPair, feeOwner } = account;
@@ -8292,7 +8379,7 @@ var DLMM = class {
         amount: reserveYBalance,
         decimal: quoteTokenDecimal
       };
-      const positionData = !!lowerBinArray && !!upperBinArray ? await DLMM.processPosition(
+      const positionData = await DLMM.processPosition(
         program,
         1 /* V2 */,
         lbPairAcc,
@@ -8303,21 +8390,7 @@ var DLMM = class {
         lowerBinArray,
         upperBinArray,
         feeOwner
-      ) : {
-        totalXAmount: "0",
-        totalYAmount: "0",
-        positionBinData: [],
-        lastUpdatedAt: new BN10(0),
-        upperBinId,
-        lowerBinId,
-        feeX: new BN10(0),
-        feeY: new BN10(0),
-        rewardOne: new BN10(0),
-        rewardTwo: new BN10(0),
-        feeOwner,
-        totalClaimedFeeXAmount: new BN10(0),
-        totalClaimedFeeYAmount: new BN10(0)
-      };
+      );
       if (positionData) {
         positionsMap.set(lbPair.toBase58(), {
           publicKey: lbPair,
@@ -8337,6 +8410,56 @@ var DLMM = class {
     }
     return positionsMap;
   }
+  static async migratePosition(connection, positions, newPositions, walletPubkey, opt) {
+    const cluster = opt?.cluster || "mainnet-beta";
+    const provider = new AnchorProvider2(
+      connection,
+      {},
+      AnchorProvider2.defaultOptions()
+    );
+    const program = new Program3(
+      IDL,
+      opt?.programId ?? LBCLMM_PROGRAM_IDS[cluster],
+      provider
+    );
+    const positionsState = await program.account.position.fetchMultiple(
+      positions
+    );
+    const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash("confirmed");
+    return Promise.all(
+      positionsState.map(async ({ lbPair, lowerBinId }, idx) => {
+        const position = positions[idx];
+        const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+        const upperBinArrayIndex = lowerBinArrayIndex.add(new BN10(1));
+        const [lowerBinArrayPubKey] = deriveBinArray(
+          lbPair,
+          lowerBinArrayIndex,
+          program.programId
+        );
+        const [upperBinArrayPubKey] = deriveBinArray(
+          lbPair,
+          upperBinArrayIndex,
+          program.programId
+        );
+        const migrateTx = await program.methods.migratePosition().accounts({
+          binArrayLower: lowerBinArrayPubKey,
+          binArrayUpper: upperBinArrayPubKey,
+          lbPair,
+          owner: walletPubkey,
+          positionV1: position,
+          positionV2: newPositions[idx],
+          program: program.programId,
+          rentReceiver: walletPubkey,
+          systemProgram: SystemProgram2.programId
+        }).transaction();
+        return new Transaction({
+          blockhash,
+          lastValidBlockHeight,
+          feePayer: walletPubkey
+        }).add(migrateTx);
+      })
+    );
+  }
   static getPricePerLamport(tokenXDecimal, tokenYDecimal, price) {
     return new Decimal5(price).mul(new Decimal5(10 ** (tokenYDecimal - tokenXDecimal))).toString();
   }
@@ -8428,9 +8551,9 @@ var DLMM = class {
       padding: Array(64).fill(0)
     };
     const userTokenX = getAssociatedTokenAddressSync2(tokenX, creatorKey);
-    const userTokenY = getAssociatedTokenAddressSync2(tokenY, creatorKey);
     return program.methods.initializeCustomizablePermissionlessLbPair(ixData).accounts({
       lbPair,
+      rent: SYSVAR_RENT_PUBKEY,
       reserveX,
       reserveY,
       binArrayBitmapExtension,
@@ -8440,7 +8563,6 @@ var DLMM = class {
       oracle,
       systemProgram: SystemProgram2.programId,
       userTokenX,
-      userTokenY,
       funder: creatorKey
     }).transaction();
   }
@@ -8606,7 +8728,7 @@ var DLMM = class {
         shouldStop = true;
     }
     const accountsToFetch = Array.from(binArraysPubkey).map(
-      (pubkey) => new PublicKey7(pubkey)
+      (pubkey) => new PublicKey6(pubkey)
     );
     const binArraysAccInfoBuffer = await chunkedGetMultipleAccountInfos(
       this.program.provider.connection,
@@ -8829,6 +8951,20 @@ var DLMM = class {
   async getPositionsByUserAndLbPair(userPubKey) {
     const promiseResults = await Promise.all([
       this.getActiveBin(),
+      userPubKey && this.program.account.position.all([
+        {
+          memcmp: {
+            bytes: bs58.encode(userPubKey.toBuffer()),
+            offset: 8 + 32
+          }
+        },
+        {
+          memcmp: {
+            bytes: bs58.encode(this.pubkey.toBuffer()),
+            offset: 8
+          }
+        }
+      ]),
       userPubKey && this.program.account.positionV2.all([
         {
           memcmp: {
@@ -8844,7 +8980,7 @@ var DLMM = class {
         }
       ])
     ]);
-    const [activeBin, positionsV2] = promiseResults;
+    const [activeBin, positions, positionsV2] = promiseResults;
     if (!activeBin) {
       throw new Error("Error fetching active bin");
     }
@@ -8854,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 BN10(lowerBinId));
+      const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
+      const [lowerBinArrayPubKey] = deriveBinArray(
+        this.pubkey,
+        lowerBinArrayIndex,
+        this.program.programId
+      );
+      const [upperBinArrayPubKey] = deriveBinArray(
+        this.pubkey,
+        upperBinArrayIndex,
+        this.program.programId
+      );
+      binArrayPubkeySet.add(lowerBinArrayPubKey.toBase58());
+      binArrayPubkeySet.add(upperBinArrayPubKey.toBase58());
+    });
+    const binArrayPubkeyArray = Array.from(binArrayPubkeySet).map(
+      (pubkey) => new PublicKey6(pubkey)
+    );
     const binArrayPubkeySetV2 = /* @__PURE__ */ new Set();
     positionsV2.forEach(({ account: { upperBinId, lowerBinId, lbPair } }) => {
       const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
@@ -8875,20 +9031,35 @@ var DLMM = class {
       binArrayPubkeySetV2.add(upperBinArrayPubKey.toBase58());
     });
     const binArrayPubkeyArrayV2 = Array.from(binArrayPubkeySetV2).map(
-      (pubkey) => new PublicKey7(pubkey)
+      (pubkey) => new PublicKey6(pubkey)
     );
     const lbPairAndBinArrays = await chunkedGetMultipleAccountInfos(
       this.program.provider.connection,
       [
         this.pubkey,
         SYSVAR_CLOCK_PUBKEY,
+        ...binArrayPubkeyArray,
         ...binArrayPubkeyArrayV2
       ]
     );
     const [lbPairAccInfo, clockAccInfo, ...binArraysAccInfo] = lbPairAndBinArrays;
+    const positionBinArraysMap = /* @__PURE__ */ new Map();
+    for (let i = 0; i < binArrayPubkeyArray.length; i++) {
+      const binArrayPubkey = binArrayPubkeyArray[i];
+      const binArrayAccBuffer = binArraysAccInfo[i];
+      if (!binArrayAccBuffer)
+        throw new Error(
+          `Bin Array account ${binArrayPubkey.toBase58()} not found`
+        );
+      const binArrayAccInfo = this.program.coder.accounts.decode(
+        "binArray",
+        binArrayAccBuffer.data
+      );
+      positionBinArraysMap.set(binArrayPubkey.toBase58(), binArrayAccInfo);
+    }
     const positionBinArraysMapV2 = /* @__PURE__ */ new Map();
-    for (let i = 0; i < binArraysAccInfo.length; i++) {
-      const binArrayPubkey = binArrayPubkeyArrayV2[i];
+    for (let i = binArrayPubkeyArray.length; i < binArraysAccInfo.length; i++) {
+      const binArrayPubkey = binArrayPubkeyArrayV2[i - binArrayPubkeyArray.length];
       const binArrayAccBufferV2 = binArraysAccInfo[i];
       if (!binArrayAccBufferV2)
         throw new Error(
@@ -8905,6 +9076,45 @@ var DLMM = class {
     const onChainTimestamp = new BN10(
       clockAccInfo.data.readBigInt64LE(32).toString()
     ).toNumber();
+    const userPositions = await Promise.all(
+      positions.map(async ({ publicKey, account }) => {
+        const { lowerBinId, upperBinId } = account;
+        const lowerBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinId));
+        const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
+        const [lowerBinArrayPubKey] = deriveBinArray(
+          this.pubkey,
+          lowerBinArrayIndex,
+          this.program.programId
+        );
+        const [upperBinArrayPubKey] = deriveBinArray(
+          this.pubkey,
+          upperBinArrayIndex,
+          this.program.programId
+        );
+        const lowerBinArray = positionBinArraysMap.get(
+          lowerBinArrayPubKey.toBase58()
+        );
+        const upperBinArray = positionBinArraysMap.get(
+          upperBinArrayPubKey.toBase58()
+        );
+        return {
+          publicKey,
+          positionData: await DLMM.processPosition(
+            this.program,
+            0 /* V1 */,
+            this.lbPair,
+            onChainTimestamp,
+            account,
+            this.tokenX.decimal,
+            this.tokenY.decimal,
+            lowerBinArray,
+            upperBinArray,
+            PublicKey6.default
+          ),
+          version: 0 /* V1 */
+        };
+      })
+    );
     const userPositionsV2 = await Promise.all(
       positionsV2.map(async ({ publicKey, account }) => {
         const { lowerBinId, upperBinId, feeOwner } = account;
@@ -8946,7 +9156,7 @@ var DLMM = class {
     );
     return {
       activeBin,
-      userPositions: userPositionsV2
+      userPositions: [...userPositions, ...userPositionsV2]
     };
   }
   async quoteCreatePosition({ strategy }) {
@@ -9007,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 BN10(lowerBinId));
-    const upperBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinId));
-    const [lowerBinArrayPubKey] = deriveBinArray(
-      this.pubkey,
-      lowerBinArrayIndex,
-      this.program.programId
-    );
-    const [upperBinArrayPubKey] = deriveBinArray(
-      this.pubkey,
-      upperBinArrayIndex,
-      this.program.programId
-    );
-    const [clockAccInfo, lowerBinArrayAccInfo, upperBinArrayAccInfo] = await chunkedGetMultipleAccountInfos(
-      this.program.provider.connection,
-      [
-        SYSVAR_CLOCK_PUBKEY,
-        lowerBinArrayPubKey,
-        upperBinArrayPubKey
-      ]
-    );
-    if (!lowerBinArrayAccInfo || !upperBinArrayAccInfo) {
-      return {
-        publicKey: positionPubKey,
-        positionData: {
-          totalXAmount: "0",
-          totalYAmount: "0",
-          positionBinData: [],
-          lastUpdatedAt: new BN10(0),
-          upperBinId,
-          lowerBinId,
-          feeX: new BN10(0),
-          feeY: new BN10(0),
-          rewardOne: new BN10(0),
-          rewardTwo: new BN10(0),
-          feeOwner,
-          totalClaimedFeeXAmount: new BN10(0),
-          totalClaimedFeeYAmount: new BN10(0)
-        },
-        version: 1 /* V2 */
-      };
-    }
-    const onChainTimestamp = new BN10(
-      clockAccInfo.data.readBigInt64LE(32).toString()
-    ).toNumber();
-    const lowerBinArray = this.program.coder.accounts.decode(
-      "binArray",
-      lowerBinArrayAccInfo.data
-    );
-    const upperBinArray = this.program.coder.accounts.decode(
-      "binArray",
-      upperBinArrayAccInfo.data
-    );
-    return {
-      publicKey: positionPubKey,
-      positionData: await DLMM.processPosition(
-        this.program,
-        1 /* V2 */,
-        this.lbPair,
-        onChainTimestamp,
-        positionAccountInfo,
-        this.tokenX.decimal,
-        this.tokenY.decimal,
-        lowerBinArray,
-        upperBinArray,
-        feeOwner
-      ),
-      version: 1 /* V2 */
-    };
-  }
   /**
    * The function `initializePositionAndAddLiquidityByStrategy` function is used to initializes a position and adds liquidity
    * @param {TInitializePositionAndAddLiquidityParamsByStrategy}
@@ -9817,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 BN10(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 BN10(lowerBinId));
     const upperBinArrayIndex = lowerBinArrayIndex.add(new BN10(1));
     const [binArrayLower] = deriveBinArray(
       lbPair,
@@ -9836,7 +9955,7 @@ var DLMM = class {
       this.program.programId
     );
     const preInstructions = [];
-    const walletToReceiveFee = feeOwner.equals(PublicKey7.default) ? user : feeOwner;
+    const walletToReceiveFee = feeOwner.equals(PublicKey6.default) ? user : feeOwner;
     const [
       { ataPubKey: userTokenX, ix: createPayerTokenXIx },
       { ataPubKey: userTokenY, ix: createPayerTokenYIx },
@@ -9883,8 +10002,8 @@ var DLMM = class {
         lbPair: this.pubkey,
         sender: user,
         position,
-        reserveX: this.lbPair.reserveX,
-        reserveY: this.lbPair.reserveY,
+        reserveX,
+        reserveY,
         tokenProgram: TOKEN_PROGRAM_ID2,
         tokenXMint: this.tokenX.publicKey,
         tokenYMint: this.tokenY.publicKey,
@@ -9894,7 +10013,7 @@ var DLMM = class {
       postInstructions.push(claimSwapFeeIx);
       for (let i = 0; i < 2; i++) {
         const rewardInfo = this.lbPair.rewardInfos[i];
-        if (!rewardInfo || rewardInfo.mint.equals(PublicKey7.default))
+        if (!rewardInfo || rewardInfo.mint.equals(PublicKey6.default))
           continue;
         const { ataPubKey, ix: rewardAtaIx } = await getOrCreateATAInstruction(
           this.program.provider.connection,
@@ -9937,19 +10056,21 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    const minBinArrayIndex = binIdToBinArrayIndex(new BN10(lowerBinIdToRemove));
-    const maxBinArrayIndex = binIdToBinArrayIndex(new BN10(upperBinIdToRemove));
+    const minBinId = Math.min(...binIds);
+    const maxBinId = Math.max(...binIds);
+    const minBinArrayIndex = binIdToBinArrayIndex(new BN10(minBinId));
+    const maxBinArrayIndex = binIdToBinArrayIndex(new BN10(maxBinId));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
     const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
-    const removeLiquidityTx = await this.program.methods.removeLiquidityByRange(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,
@@ -9959,7 +10080,7 @@ var DLMM = class {
     }).instruction();
     const instructions = [
       ...preInstructions,
-      removeLiquidityTx,
+      removeLiquidityIx,
       ...postInstructions
     ];
     const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
@@ -10174,7 +10295,6 @@ var DLMM = class {
     let actualOutAmount = new BN10(0);
     let feeAmount = new BN10(0);
     let protocolFeeAmount = new BN10(0);
-    let lastFilledActiveBinId = activeId;
     while (!inAmountLeft.isZero()) {
       let binArrayAccountToSwap = findNextBinArrayWithLiquidity(
         swapForY,
@@ -10220,7 +10340,6 @@ var DLMM = class {
           if (!startBin) {
             startBin = bin;
           }
-          lastFilledActiveBinId = activeId;
         }
       }
       if (!inAmountLeft.isZero()) {
@@ -10248,7 +10367,7 @@ var DLMM = class {
     const priceImpact = new Decimal5(actualOutAmount.toString()).sub(new Decimal5(outAmountWithoutSlippage.toString())).div(new Decimal5(outAmountWithoutSlippage.toString())).mul(new Decimal5(100));
     const minOutAmount = actualOutAmount.mul(new BN10(BASIS_POINT_MAX).sub(allowedSlippage)).div(new BN10(BASIS_POINT_MAX));
     const endPrice = getPriceOfBinByBinId(
-      lastFilledActiveBinId.toNumber(),
+      activeId.toNumber(),
       this.lbPair.binStep
     );
     return {
@@ -10365,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 [
@@ -10398,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,
@@ -10411,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: TOKEN_PROGRAM_ID2,
       tokenYProgram: TOKEN_PROGRAM_ID2,
       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];
@@ -10459,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 [
@@ -10492,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,
@@ -10501,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: TOKEN_PROGRAM_ID2,
       // dont use 2022 first; lack familiarity
       tokenYProgram: TOKEN_PROGRAM_ID2,
@@ -10513,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];
@@ -10615,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 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
@@ -10709,11 +10821,11 @@ var DLMM = class {
     const tokensInvolved = [...pairTokens];
     for (let i = 0; i < 2; i++) {
       const rewardMint = this.lbPair.rewardInfos[i].mint;
-      if (!tokensInvolved.some((pubkey) => rewardMint.equals(pubkey)) && !rewardMint.equals(PublicKey7.default)) {
+      if (!tokensInvolved.some((pubkey) => rewardMint.equals(pubkey)) && !rewardMint.equals(PublicKey6.default)) {
         tokensInvolved.push(this.lbPair.rewardInfos[i].mint);
       }
     }
-    const feeOwner = position.positionData.feeOwner.equals(PublicKey7.default) ? owner : position.positionData.feeOwner;
+    const feeOwner = position.positionData.feeOwner.equals(PublicKey6.default) ? owner : position.positionData.feeOwner;
     const createATAAccAndIx = await Promise.all(
       tokensInvolved.map((token) => {
         if (pairTokens.some((t) => t.equals(token))) {
@@ -10973,7 +11085,7 @@ var DLMM = class {
           );
         }
         addLiquidityIxs.push([
-          ComputeBudgetProgram3.setComputeUnitLimit({
+          ComputeBudgetProgram2.setComputeUnitLimit({
             units: DEFAULT_ADD_LIQUIDITY_CU
           }),
           ...instructions
@@ -11260,7 +11372,7 @@ var DLMM = class {
     const tokensInvolved = [...pairsToken];
     for (let i = 0; i < 2; i++) {
       const rewardMint = this.lbPair.rewardInfos[i].mint;
-      if (!tokensInvolved.some((pubkey) => rewardMint.equals(pubkey)) && !rewardMint.equals(PublicKey7.default)) {
+      if (!tokensInvolved.some((pubkey) => rewardMint.equals(pubkey)) && !rewardMint.equals(PublicKey6.default)) {
         tokensInvolved.push(this.lbPair.rewardInfos[i].mint);
       }
     }
@@ -11270,9 +11382,9 @@ var DLMM = class {
     const feeOwners = [
       .../* @__PURE__ */ new Set([
         owner.toBase58(),
-        ...positions.filter((p) => !p.positionData.feeOwner.equals(PublicKey7.default)).map((p) => p.positionData.feeOwner.toBase58())
+        ...positions.filter((p) => !p.positionData.feeOwner.equals(PublicKey6.default)).map((p) => p.positionData.feeOwner.toBase58())
       ])
-    ].map((pk) => new PublicKey7(pk));
+    ].map((pk) => new PublicKey6(pk));
     const createATAAccAndIx = await Promise.all(
       tokensInvolved.map((token) => {
         if (pairsToken.some((p) => p.equals(token))) {
@@ -11606,7 +11718,7 @@ var DLMM = class {
       const preActivationSwapPoint = this.lbPair.activationPoint.sub(
         this.lbPair.preActivationDuration
       );
-      const activationPoint = !this.lbPair.preActivationSwapAddress.equals(PublicKey7.default) && this.lbPair.preActivationSwapAddress.equals(swapInitiator) ? preActivationSwapPoint : this.lbPair.activationPoint;
+      const activationPoint = !this.lbPair.preActivationSwapAddress.equals(PublicKey6.default) && this.lbPair.preActivationSwapAddress.equals(swapInitiator) ? preActivationSwapPoint : this.lbPair.activationPoint;
       if (currentPoint < activationPoint) {
         return true;
       }
@@ -11660,7 +11772,7 @@ var DLMM = class {
       const liquidityShare = positionVersion === 0 /* V1 */ ? position.liquidityShares[binIdxInPosition] : position.liquidityShares[binIdxInPosition].shrn(64);
       for (let j = 0; j < 2; j++) {
         const pairRewardInfo = lbPair.rewardInfos[j];
-        if (!pairRewardInfo.mint.equals(PublicKey7.default)) {
+        if (!pairRewardInfo.mint.equals(PublicKey6.default)) {
           let rewardPerTokenStored = binState.rewardPerTokenStored[j];
           if (i == lbPair.activeId && !binState.liquiditySupply.isZero()) {
             const currentTime = new BN10(
@@ -11773,7 +11885,12 @@ var DLMM = class {
     let totalYAmount = new Decimal5(0);
     bins.forEach((bin, idx) => {
       const binSupply = new Decimal5(bin.supply.toString());
-      const posShare = new Decimal5(posShares[idx].toString());
+      let posShare;
+      if (bin.version === 1 && version === 0 /* V1 */) {
+        posShare = new Decimal5(posShares[idx].shln(64).toString());
+      } else {
+        posShare = new Decimal5(posShares[idx].toString());
+      }
       const positionXAmount = binSupply.eq(new Decimal5("0")) ? new Decimal5("0") : posShare.mul(bin.xAmount.toString()).div(binSupply);
       const positionYAmount = binSupply.eq(new Decimal5("0")) ? new Decimal5("0") : posShare.mul(bin.yAmount.toString()).div(binSupply);
       totalXAmount = totalXAmount.add(positionXAmount);
@@ -12021,7 +12138,7 @@ var DLMM = class {
     const claimTransactions = [];
     for (let i = 0; i < 2; i++) {
       const rewardInfo = this.lbPair.rewardInfos[i];
-      if (!rewardInfo || rewardInfo.mint.equals(PublicKey7.default))
+      if (!rewardInfo || rewardInfo.mint.equals(PublicKey6.default))
         continue;
       const preInstructions = [];
       const { ataPubKey, ix } = await getOrCreateATAInstruction(
@@ -12074,7 +12191,7 @@ var DLMM = class {
       this.pubkey,
       this.program.programId
     );
-    const walletToReceiveFee = feeOwner.equals(PublicKey7.default) ? owner : feeOwner;
+    const walletToReceiveFee = feeOwner.equals(PublicKey6.default) ? owner : feeOwner;
     const preInstructions = [];
     const [
       { ataPubKey: userTokenX, ix: createInTokenAccountIx },
@@ -12213,6 +12330,7 @@ export {
   toAmountBidSide,
   toAmountBothSide,
   toAmountsBothSideByStrategy,
+  toAmountsOneSideByStrategy,
   toStrategyParameters,
   toWeightDistribution,
   unwrapSOLInstruction,