@meteora-ag/dlmm 1.0.32 → 1.0.34-rc.0

package/dist/index.d.ts

@@ -1768,39 +1768,6 @@ type LbClmm = {
                 }
             ];
         },
-        {
-            name: "initializePresetParameterV2";
-            accounts: [
-                {
-                    name: "presetParameter";
-                    isMut: true;
-                    isSigner: false;
-                },
-                {
-                    name: "admin";
-                    isMut: true;
-                    isSigner: true;
-                },
-                {
-                    name: "systemProgram";
-                    isMut: false;
-                    isSigner: false;
-                },
-                {
-                    name: "rent";
-                    isMut: false;
-                    isSigner: false;
-                }
-            ];
-            args: [
-                {
-                    name: "ix";
-                    type: {
-                        defined: "InitPresetParametersIx";
-                    };
-                }
-            ];
-        },
         {
             name: "closePresetParameter";
             accounts: [
@@ -2540,10 +2507,20 @@ type LbClmm = {
                         docs: ["Status of the pair. Check PairStatus enum."];
                         type: "u8";
                     },
+                    {
+                        name: "requireBaseFactorSeed";
+                        type: "u8";
+                    },
+                    {
+                        name: "baseFactorSeed";
+                        type: {
+                            array: ["u8", 2];
+                        };
+                    },
                     {
                         name: "padding1";
                         type: {
-                            array: ["u8", 5];
+                            array: ["u8", 2];
                         };
                     },
                     {
@@ -4870,6 +4847,7 @@ declare class DLMM {
      * `LbPairAccount` objects.
      */
     static getLbPairs(connection: Connection, opt?: Opt): Promise<LbPairAccount[]>;
+    static checkPoolExists(connection: Connection, tokenX: PublicKey, tokenY: PublicKey, binStep: BN, baseFactor: BN, opt?: Opt): Promise<boolean>;
     /**
      * The `create` function is a static method that creates a new instance of the `DLMM` class
      * @param {Connection} connection - The `connection` parameter is an instance of the `Connection`
@@ -4919,7 +4897,7 @@ declare class DLMM {
     static getBinIdFromPrice(price: string | number | Decimal, binStep: number, min: boolean): number;
     /** Public methods */
     static createPermissionLbPair(connection: Connection, binStep: BN, tokenX: PublicKey, tokenY: PublicKey, activeId: BN, baseKey: PublicKey, creatorKey: PublicKey, feeBps: BN, lockDurationInSlot: BN, opt?: Opt): Promise<Transaction>;
-    static createLbPair(connection: Connection, funder: PublicKey, tokenX: PublicKey, tokenY: PublicKey, presetParameter: PublicKey, activeId: BN, opt?: Opt): Promise<Transaction>;
+    static createLbPair(connection: Connection, funder: PublicKey, tokenX: PublicKey, tokenY: PublicKey, binStep: BN, baseFactor: BN, presetParameter: PublicKey, activeId: BN, opt?: Opt): Promise<Transaction>;
     /**
      * The function `refetchStates` retrieves and updates various states and data related to bin arrays
      * and lb pairs.
@@ -5294,9 +5272,18 @@ declare class DLMM {
 }
 
 /** private */
+/**
+ *
+ * @deprecated Use derivePresetParameter2
+ */
 declare function derivePresetParameter(binStep: BN, programId: PublicKey): [PublicKey, number];
+declare function derivePresetParameter2(binStep: BN, baseFactor: BN, programId: PublicKey): [PublicKey, number];
+declare function deriveLbPair2(tokenX: PublicKey, tokenY: PublicKey, binStep: BN, baseFactor: BN, programId: PublicKey): [PublicKey, number];
+/**
+ *
+ * @deprecated Use deriveLbPair2
+ */
 declare function deriveLbPair(tokenX: PublicKey, tokenY: PublicKey, binStep: BN, programId: PublicKey): [PublicKey, number];
-declare function checkPoolExists(connection: Connection, tokenX: PublicKey, tokenY: PublicKey, binStep: BN, programId: PublicKey): Promise<PublicKey | false>;
 declare function derivePermissionLbPair(baseKey: PublicKey, tokenX: PublicKey, tokenY: PublicKey, binStep: BN, programId: PublicKey): [PublicKey, number];
 declare function deriveOracle(lbPair: PublicKey, programId: PublicKey): [PublicKey, number];
 declare function derivePosition(mint: PublicKey, programId: PublicKey): [PublicKey, number];
@@ -5581,6 +5568,8 @@ declare function chunkedFetchMultiplePoolAccount(program: ClmmProgram, pks: Publ
     activeId: number;
     binStep: number;
     status: number;
+    requireBaseFactorSeed: number;
+    baseFactorSeed: number[];
     padding1: number[];
     tokenXMint: PublicKey;
     tokenYMint: PublicKey;
@@ -5669,4 +5658,4 @@ declare const MAX_BIN_LENGTH_ALLOWED_IN_ONE_TX = 26;
 declare const MAX_BIN_PER_TX = 69;
 declare const MAX_ACTIVE_BIN_SLIPPAGE = 3;
 
-export { ADMIN, BASIS_POINT_MAX, BIN_ARRAY_BITMAP_SIZE, BIN_ARRAY_FEE, Bin, BinAndAmount, BinArray, BinArrayAccount, BinArrayBitmapExtension, BinArrayBitmapExtensionAccount, BinLiquidity, BinLiquidityDistribution, BinLiquidityReduction, BitmapType, ClmmProgram, DLMMError, EXTENSION_BINARRAY_BITMAP_SIZE, EmissionRate, FEE_PRECISION, FeeInfo, GetOrCreateATAResponse, IAccountsCache, IDL, InitPermissionPairIx, LBCLMM_PROGRAM_IDS, LMRewards, LbClmm, LbPair, LbPairAccount, LbPosition, LiquidityOneSideParameter, LiquidityParameterByStrategy, LiquidityParameterByStrategyOneSide, LiquidityParameterByWeight, MAX_ACTIVE_BIN_SLIPPAGE, MAX_BIN_ARRAY_SIZE, MAX_BIN_LENGTH_ALLOWED_IN_ONE_TX, MAX_BIN_PER_POSITION, MAX_BIN_PER_TX, MAX_CLAIM_ALL_ALLOWED, MAX_FEE_RATE, Network, POSITION_FEE, PRECISION, PairType, Position, PositionBinData, PositionData, PositionInfo, PositionVersion, ProgramStrategyParameter, ProgramStrategyType, SCALE, SCALE_OFFSET, SIMULATION_USER, Strategy, StrategyParameters, StrategyType, SwapFee, SwapParams, SwapQuote, TInitializePositionAndAddLiquidityParams, TInitializePositionAndAddLiquidityParamsByStrategy, TQuoteCreatePositionParams, TokenReserve, autoFillXByStrategy, autoFillXByWeight, autoFillYByStrategy, autoFillYByWeight, binIdToBinArrayIndex, calculateBidAskDistribution, calculateNormalDistribution, calculateSpotDistribution, checkPoolExists, chunkedFetchMultipleBinArrayBitmapExtensionAccount, chunkedFetchMultiplePoolAccount, chunkedGetMultipleAccountInfos, chunks, computeBudgetIx, computeFee, computeFeeFromAmount, computeProtocolFee, DLMM as default, deriveBinArray, deriveBinArrayBitmapExtension, deriveLbPair, deriveOracle, derivePermissionLbPair, derivePosition, derivePresetParameter, deriveReserve, findNextBinArrayIndexWithLiquidity, findNextBinArrayWithLiquidity, fromWeightDistributionToAmount, fromWeightDistributionToAmountOneSide, getBaseFee, getBinArrayLowerUpperBinId, getBinFromBinArray, getOrCreateATAInstruction, getOutAmount, getPriceOfBinByBinId, getTokenBalance, getTokenDecimals, getTotalFee, getVariableFee, isBinIdWithinBinArray, isOverflowDefaultBinArrayBitmap, parseLogs, sParameters, swapQuoteAtBin, swapQuoteAtBinWithCap, toAmountAskSide, toAmountBidSide, toAmountBothSide, toAmountsBothSideByStrategy, toAmountsOneSideByStrategy, toStrategyParameters, toWeightDistribution, unwrapSOLInstruction, vParameters, wrapSOLInstruction };
+export { ADMIN, BASIS_POINT_MAX, BIN_ARRAY_BITMAP_SIZE, BIN_ARRAY_FEE, Bin, BinAndAmount, BinArray, BinArrayAccount, BinArrayBitmapExtension, BinArrayBitmapExtensionAccount, BinLiquidity, BinLiquidityDistribution, BinLiquidityReduction, BitmapType, ClmmProgram, DLMMError, EXTENSION_BINARRAY_BITMAP_SIZE, EmissionRate, FEE_PRECISION, FeeInfo, GetOrCreateATAResponse, IAccountsCache, IDL, InitPermissionPairIx, LBCLMM_PROGRAM_IDS, LMRewards, LbClmm, LbPair, LbPairAccount, LbPosition, LiquidityOneSideParameter, LiquidityParameterByStrategy, LiquidityParameterByStrategyOneSide, LiquidityParameterByWeight, MAX_ACTIVE_BIN_SLIPPAGE, MAX_BIN_ARRAY_SIZE, MAX_BIN_LENGTH_ALLOWED_IN_ONE_TX, MAX_BIN_PER_POSITION, MAX_BIN_PER_TX, MAX_CLAIM_ALL_ALLOWED, MAX_FEE_RATE, Network, POSITION_FEE, PRECISION, PairType, Position, PositionBinData, PositionData, PositionInfo, PositionVersion, ProgramStrategyParameter, ProgramStrategyType, SCALE, SCALE_OFFSET, SIMULATION_USER, Strategy, StrategyParameters, StrategyType, SwapFee, SwapParams, SwapQuote, TInitializePositionAndAddLiquidityParams, TInitializePositionAndAddLiquidityParamsByStrategy, TQuoteCreatePositionParams, TokenReserve, autoFillXByStrategy, autoFillXByWeight, autoFillYByStrategy, autoFillYByWeight, binIdToBinArrayIndex, calculateBidAskDistribution, calculateNormalDistribution, calculateSpotDistribution, chunkedFetchMultipleBinArrayBitmapExtensionAccount, chunkedFetchMultiplePoolAccount, chunkedGetMultipleAccountInfos, chunks, computeBudgetIx, computeFee, computeFeeFromAmount, computeProtocolFee, DLMM as default, deriveBinArray, deriveBinArrayBitmapExtension, deriveLbPair, deriveLbPair2, deriveOracle, derivePermissionLbPair, derivePosition, derivePresetParameter, derivePresetParameter2, deriveReserve, findNextBinArrayIndexWithLiquidity, findNextBinArrayWithLiquidity, fromWeightDistributionToAmount, fromWeightDistributionToAmountOneSide, getBaseFee, getBinArrayLowerUpperBinId, getBinFromBinArray, getOrCreateATAInstruction, getOutAmount, getPriceOfBinByBinId, getTokenBalance, getTokenDecimals, getTotalFee, getVariableFee, isBinIdWithinBinArray, isOverflowDefaultBinArrayBitmap, parseLogs, sParameters, swapQuoteAtBin, swapQuoteAtBinWithCap, toAmountAskSide, toAmountBidSide, toAmountBothSide, toAmountsBothSideByStrategy, toAmountsOneSideByStrategy, toStrategyParameters, toWeightDistribution, unwrapSOLInstruction, vParameters, wrapSOLInstruction };

package/dist/index.js

@@ -1772,39 +1772,6 @@ var IDL = {
         }
       ]
     },
-    {
-      name: "initializePresetParameterV2",
-      accounts: [
-        {
-          name: "presetParameter",
-          isMut: true,
-          isSigner: false
-        },
-        {
-          name: "admin",
-          isMut: true,
-          isSigner: true
-        },
-        {
-          name: "systemProgram",
-          isMut: false,
-          isSigner: false
-        },
-        {
-          name: "rent",
-          isMut: false,
-          isSigner: false
-        }
-      ],
-      args: [
-        {
-          name: "ix",
-          type: {
-            defined: "InitPresetParametersIx"
-          }
-        }
-      ]
-    },
     {
       name: "closePresetParameter",
       accounts: [
@@ -2544,10 +2511,20 @@ var IDL = {
             docs: ["Status of the pair. Check PairStatus enum."],
             type: "u8"
           },
+          {
+            name: "requireBaseFactorSeed",
+            type: "u8"
+          },
+          {
+            name: "baseFactorSeed",
+            type: {
+              array: ["u8", 2]
+            }
+          },
           {
             name: "padding1",
             type: {
-              array: ["u8", 5]
+              array: ["u8", 2]
             }
           },
           {
@@ -4928,6 +4905,28 @@ function derivePresetParameter(binStep, programId) {
     programId
   );
 }
+function derivePresetParameter2(binStep, baseFactor, programId) {
+  return _web3js.PublicKey.findProgramAddressSync(
+    [
+      Buffer.from("preset_parameter"),
+      new Uint8Array(binStep.toArrayLike(Buffer, "le", 2)),
+      new Uint8Array(baseFactor.toArrayLike(Buffer, "le", 2))
+    ],
+    programId
+  );
+}
+function deriveLbPair2(tokenX, tokenY, binStep, baseFactor, programId) {
+  const [minKey, maxKey] = sortTokenMints(tokenX, tokenY);
+  return _web3js.PublicKey.findProgramAddressSync(
+    [
+      minKey.toBuffer(),
+      maxKey.toBuffer(),
+      new Uint8Array(binStep.toArrayLike(Buffer, "le", 2)),
+      new Uint8Array(baseFactor.toArrayLike(Buffer, "le", 2))
+    ],
+    programId
+  );
+}
 function deriveLbPair(tokenX, tokenY, binStep, programId) {
   const [minKey, maxKey] = sortTokenMints(tokenX, tokenY);
   return _web3js.PublicKey.findProgramAddressSync(
@@ -4939,19 +4938,15 @@ function deriveLbPair(tokenX, tokenY, binStep, programId) {
     programId
   );
 }
-async function checkPoolExists(connection, tokenX, tokenY, binStep, programId) {
-  try {
-    const [lbPairKey] = deriveLbPair(tokenX, tokenY, binStep, programId);
-    await DLMM.create(connection, lbPairKey);
-    return lbPairKey;
-  } catch (e2) {
-    return false;
-  }
-}
 function derivePermissionLbPair(baseKey, tokenX, tokenY, binStep, programId) {
   const [minKey, maxKey] = sortTokenMints(tokenX, tokenY);
   return _web3js.PublicKey.findProgramAddressSync(
-    [baseKey.toBuffer(), minKey.toBuffer(), maxKey.toBuffer(), new Uint8Array(binStep.toArrayLike(Buffer, "le", 2))],
+    [
+      baseKey.toBuffer(),
+      minKey.toBuffer(),
+      maxKey.toBuffer(),
+      new Uint8Array(binStep.toArrayLike(Buffer, "le", 2))
+    ],
     programId
   );
 }
@@ -6523,6 +6518,28 @@ var DLMM = class {
     );
     return program.account.lbPair.all();
   }
+  static async checkPoolExists(connection, tokenX, tokenY, binStep, baseFactor, opt) {
+    const cluster = _optionalChain([opt, 'optionalAccess', _21 => _21.cluster]) || "mainnet-beta";
+    const provider = new (0, _anchor.AnchorProvider)(
+      connection,
+      {},
+      _anchor.AnchorProvider.defaultOptions()
+    );
+    const program = new (0, _anchor.Program)(IDL, LBCLMM_PROGRAM_IDS[cluster], provider);
+    try {
+      const [lbPairKey] = deriveLbPair2(
+        tokenX,
+        tokenY,
+        binStep,
+        baseFactor,
+        program.programId
+      );
+      await program.account.lbPair.fetch(lbPairKey);
+      return true;
+    } catch (e2) {
+      return false;
+    }
+  }
   /**
    * The `create` function is a static method that creates a new instance of the `DLMM` class
    * @param {Connection} connection - The `connection` parameter is an instance of the `Connection`
@@ -6533,7 +6550,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', _21 => _21.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _22 => _22.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -6549,14 +6566,14 @@ var DLMM = class {
       connection,
       accountsToFetch
     );
-    const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _22 => _22[0], 'optionalAccess', _23 => _23.data]);
+    const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _23 => _23[0], 'optionalAccess', _24 => _24.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', _24 => _24[1], 'optionalAccess', _25 => _25.data]);
+    const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _25 => _25[1], 'optionalAccess', _26 => _26.data]);
     let binArrayBitMapExtensionAccInfo = null;
     if (binArrayBitMapAccountInfoBuffer) {
       binArrayBitMapExtensionAccInfo = program.coder.accounts.decode(
@@ -6620,7 +6637,7 @@ var DLMM = class {
    * objects.
    */
   static async createMultiple(connection, dlmmList, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _26 => _26.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _27 => _27.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -6638,7 +6655,7 @@ var DLMM = class {
     const lbPairArraysMap = /* @__PURE__ */ new Map();
     for (let i = 0; i < dlmmList.length; i++) {
       const lbPairPubKey = dlmmList[i];
-      const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _27 => _27[i], 'optionalAccess', _28 => _28.data]);
+      const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _28 => _28[i], 'optionalAccess', _29 => _29.data]);
       if (!lbPairAccountInfoBuffer)
         throw new Error(`LB Pair account ${lbPairPubKey.toBase58()} not found`);
       const binArrayAccInfo = program.coder.accounts.decode(
@@ -6651,7 +6668,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', _29 => _29[i], 'optionalAccess', _30 => _30.data]);
+      const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _30 => _30[i], 'optionalAccess', _31 => _31.data]);
       if (binArrayBitMapAccountInfoBuffer) {
         const binArrayBitMapExtensionAccInfo = program.coder.accounts.decode(
           "binArrayBitmapExtension",
@@ -6734,7 +6751,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _31 => _31.cluster]), () => ( "mainnet-beta"))],
+      LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _32 => _32.cluster]), () => ( "mainnet-beta"))],
       provider
     );
     const presetParameter = await program.account.presetParameter.all();
@@ -6752,7 +6769,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', _32 => _32.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _33 => _33.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -6987,8 +7004,8 @@ var DLMM = class {
       const { mintXDecimal, mintYDecimal } = lbPairMintMap.get(
         lbPair.toBase58()
       );
-      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _33 => _33.get, 'call', _34 => _34(lbPair.toBase58()), 'optionalAccess', _35 => _35.reserveX]), () => ( BigInt(0)));
-      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _36 => _36.get, 'call', _37 => _37(lbPair.toBase58()), 'optionalAccess', _38 => _38.reserveY]), () => ( BigInt(0)));
+      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _34 => _34.get, 'call', _35 => _35(lbPair.toBase58()), 'optionalAccess', _36 => _36.reserveX]), () => ( BigInt(0)));
+      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _37 => _37.get, 'call', _38 => _38(lbPair.toBase58()), 'optionalAccess', _39 => _39.reserveY]), () => ( BigInt(0)));
       const tokenX = {
         publicKey: lbPairAcc.tokenXMint,
         reserve: lbPairAcc.reserveX,
@@ -7020,7 +7037,7 @@ var DLMM = class {
           tokenX,
           tokenY,
           lbPairPositionsData: [
-            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _39 => _39.get, 'call', _40 => _40(lbPair.toBase58()), 'optionalAccess', _41 => _41.lbPairPositionsData]), () => ( [])),
+            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _40 => _40.get, 'call', _41 => _41(lbPair.toBase58()), 'optionalAccess', _42 => _42.lbPairPositionsData]), () => ( [])),
             {
               publicKey: positionPubKey,
               positionData,
@@ -7056,8 +7073,8 @@ var DLMM = class {
         getTokenDecimals(program.provider.connection, lbPairAcc.tokenXMint),
         getTokenDecimals(program.provider.connection, lbPairAcc.tokenYMint)
       ]);
-      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _42 => _42.get, 'call', _43 => _43(lbPair.toBase58()), 'optionalAccess', _44 => _44.reserveX]), () => ( BigInt(0)));
-      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _45 => _45.get, 'call', _46 => _46(lbPair.toBase58()), 'optionalAccess', _47 => _47.reserveY]), () => ( BigInt(0)));
+      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _43 => _43.get, 'call', _44 => _44(lbPair.toBase58()), 'optionalAccess', _45 => _45.reserveX]), () => ( BigInt(0)));
+      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _46 => _46.get, 'call', _47 => _47(lbPair.toBase58()), 'optionalAccess', _48 => _48.reserveY]), () => ( BigInt(0)));
       const tokenX = {
         publicKey: lbPairAcc.tokenXMint,
         reserve: lbPairAcc.reserveX,
@@ -7089,7 +7106,7 @@ var DLMM = class {
           tokenX,
           tokenY,
           lbPairPositionsData: [
-            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _48 => _48.get, 'call', _49 => _49(lbPair.toBase58()), 'optionalAccess', _50 => _50.lbPairPositionsData]), () => ( [])),
+            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _49 => _49.get, 'call', _50 => _50(lbPair.toBase58()), 'optionalAccess', _51 => _51.lbPairPositionsData]), () => ( [])),
             {
               publicKey: positionPubKey,
               positionData,
@@ -7102,7 +7119,7 @@ var DLMM = class {
     return positionsMap;
   }
   static async migratePosition(connection, positions, newPositions, walletPubkey, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _51 => _51.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _52 => _52.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -7201,18 +7218,20 @@ var DLMM = class {
       base: baseKey
     }).transaction();
   }
-  static async createLbPair(connection, funder, tokenX, tokenY, presetParameter, activeId, opt) {
+  static async createLbPair(connection, funder, tokenX, tokenY, binStep, baseFactor, presetParameter, activeId, opt) {
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
       _anchor.AnchorProvider.defaultOptions()
     );
     const program = new (0, _anchor.Program)(IDL, LBCLMM_PROGRAM_IDS[opt.cluster], provider);
-    const presetParameterState = await program.account.presetParameter.fetch(
-      presetParameter
+    const [lbPair] = deriveLbPair2(
+      tokenX,
+      tokenY,
+      binStep,
+      baseFactor,
+      program.programId
     );
-    const binStep = new (0, _anchor.BN)(presetParameterState.binStep);
-    const [lbPair] = deriveLbPair(tokenX, tokenY, binStep, program.programId);
     const [reserveX] = deriveReserve(tokenX, lbPair, program.programId);
     const [reserveY] = deriveReserve(tokenY, lbPair, program.programId);
     const [oracle] = deriveOracle(lbPair, program.programId);
@@ -7329,7 +7348,7 @@ var DLMM = class {
         swapForY,
         new (0, _anchor.BN)(activeIdToLoop),
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _52 => _52.binArrayBitmapExtension, 'optionalAccess', _53 => _53.account]), () => ( null))
+        _nullishCoalesce(_optionalChain([this, 'access', _53 => _53.binArrayBitmapExtension, 'optionalAccess', _54 => _54.account]), () => ( null))
       );
       if (binArrayIndex === null)
         shouldStop = true;
@@ -8524,7 +8543,7 @@ var DLMM = class {
     bps,
     shouldClaimAndClose = false
   }) {
-    const { lbPair, lowerBinId, feeOwner } = await this.program.account.positionV2.fetch(position);
+    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));
@@ -8544,8 +8563,22 @@ var DLMM = class {
     const walletToReceiveFee = feeOwner.equals(_web3js.PublicKey.default) ? user : feeOwner;
     const [
       { ataPubKey: userTokenX, ix: createPayerTokenXIx },
-      { ataPubKey: userTokenY, ix: createPayerTokenYIx }
+      { ataPubKey: userTokenY, ix: createPayerTokenYIx },
+      { ataPubKey: feeOwnerTokenX, ix: createFeeOwnerTokenXIx },
+      { ataPubKey: feeOwnerTokenY, ix: createFeeOwnerTokenYIx }
     ] = await Promise.all([
+      getOrCreateATAInstruction(
+        this.program.provider.connection,
+        this.tokenX.publicKey,
+        owner,
+        user
+      ),
+      getOrCreateATAInstruction(
+        this.program.provider.connection,
+        this.tokenY.publicKey,
+        owner,
+        user
+      ),
       getOrCreateATAInstruction(
         this.program.provider.connection,
         this.tokenX.publicKey,
@@ -8561,6 +8594,10 @@ var DLMM = class {
     ]);
     createPayerTokenXIx && preInstructions.push(createPayerTokenXIx);
     createPayerTokenYIx && preInstructions.push(createPayerTokenYIx);
+    if (!walletToReceiveFee.equals(owner)) {
+      createFeeOwnerTokenXIx && preInstructions.push(createFeeOwnerTokenXIx);
+      createFeeOwnerTokenYIx && preInstructions.push(createFeeOwnerTokenYIx);
+    }
     const secondTransactionsIx = [];
     const postInstructions = [];
     if (shouldClaimAndClose) {
@@ -8575,8 +8612,8 @@ var DLMM = class {
         tokenProgram: _spltoken.TOKEN_PROGRAM_ID,
         tokenXMint: this.tokenX.publicKey,
         tokenYMint: this.tokenY.publicKey,
-        userTokenX,
-        userTokenY
+        userTokenX: feeOwnerTokenX,
+        userTokenY: feeOwnerTokenY
       }).instruction();
       postInstructions.push(claimSwapFeeIx);
       for (let i = 0; i < 2; i++) {
@@ -8746,7 +8783,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _optionalChain([this, 'access', _54 => _54.binArrayBitmapExtension, 'optionalAccess', _55 => _55.account]),
+        _optionalChain([this, 'access', _55 => _55.binArrayBitmapExtension, 'optionalAccess', _56 => _56.account]),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -8853,7 +8890,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _optionalChain([this, 'access', _56 => _56.binArrayBitmapExtension, 'optionalAccess', _57 => _57.account]),
+        _optionalChain([this, 'access', _57 => _57.binArrayBitmapExtension, 'optionalAccess', _58 => _58.account]),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -9342,7 +9379,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _58 => _58.binArrayBitmapExtension, 'optionalAccess', _59 => _59.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _59 => _59.binArrayBitmapExtension, 'optionalAccess', _60 => _60.account]), () => ( null))
     );
     if (toBinArrayIndex === null)
       return true;
@@ -9379,7 +9416,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _60 => _60.binArrayBitmapExtension, 'optionalAccess', _61 => _61.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _61 => _61.binArrayBitmapExtension, 'optionalAccess', _62 => _62.account]), () => ( null))
     );
     const accountsToFetch = [];
     const [binArrayBitMapExtensionPubkey] = deriveBinArrayBitmapExtension(
@@ -9410,13 +9447,13 @@ var DLMM = class {
     let fromBinArray = null;
     let toBinArray = null;
     let binArrayBitmapExtension = null;
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _62 => _62[0]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _63 => _63[0]])) {
       binArrayBitmapExtension = binArrayBitMapExtensionPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _63 => _63[1]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _64 => _64[1]])) {
       fromBinArray = fromBinArrayPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _64 => _64[2]]) && !!toBinArrayIndex) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _65 => _65[2]]) && !!toBinArrayIndex) {
       toBinArray = toBinArrayPubkey;
     }
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
@@ -10028,7 +10065,7 @@ var DLMMError = class extends Error {
       const anchorError = _anchor.AnchorError.parse(
         JSON.parse(JSON.stringify(error)).logs
       );
-      if (_optionalChain([anchorError, 'optionalAccess', _65 => _65.program, 'access', _66 => _66.toBase58, 'call', _67 => _67()]) === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
+      if (_optionalChain([anchorError, 'optionalAccess', _66 => _66.program, 'access', _67 => _67.toBase58, 'call', _68 => _68()]) === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
         _errorCode = anchorError.error.errorCode.number;
         _errorName = anchorError.error.errorCode.code;
         _errorMessage = anchorError.error.errorMessage;
@@ -10132,5 +10169,6 @@ var src_default = DLMM;
 
 
 
-exports.ADMIN = ADMIN; exports.BASIS_POINT_MAX = BASIS_POINT_MAX; exports.BIN_ARRAY_BITMAP_SIZE = BIN_ARRAY_BITMAP_SIZE; exports.BIN_ARRAY_FEE = BIN_ARRAY_FEE; exports.BitmapType = BitmapType; exports.DLMMError = DLMMError; exports.EXTENSION_BINARRAY_BITMAP_SIZE = EXTENSION_BINARRAY_BITMAP_SIZE; exports.FEE_PRECISION = FEE_PRECISION; exports.IDL = IDL; 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.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.checkPoolExists = checkPoolExists; exports.chunkedFetchMultipleBinArrayBitmapExtensionAccount = chunkedFetchMultipleBinArrayBitmapExtensionAccount; exports.chunkedFetchMultiplePoolAccount = chunkedFetchMultiplePoolAccount; exports.chunkedGetMultipleAccountInfos = chunkedGetMultipleAccountInfos; exports.chunks = chunks; exports.computeBudgetIx = computeBudgetIx; exports.computeFee = computeFee; exports.computeFeeFromAmount = computeFeeFromAmount; exports.computeProtocolFee = computeProtocolFee; exports.default = src_default; exports.deriveBinArray = deriveBinArray; exports.deriveBinArrayBitmapExtension = deriveBinArrayBitmapExtension; exports.deriveLbPair = deriveLbPair; exports.deriveOracle = deriveOracle; exports.derivePermissionLbPair = derivePermissionLbPair; exports.derivePosition = derivePosition; exports.derivePresetParameter = derivePresetParameter; exports.deriveReserve = deriveReserve; exports.findNextBinArrayIndexWithLiquidity = findNextBinArrayIndexWithLiquidity; exports.findNextBinArrayWithLiquidity = findNextBinArrayWithLiquidity; exports.fromWeightDistributionToAmount = fromWeightDistributionToAmount; exports.fromWeightDistributionToAmountOneSide = fromWeightDistributionToAmountOneSide; exports.getBaseFee = getBaseFee; exports.getBinArrayLowerUpperBinId = getBinArrayLowerUpperBinId; exports.getBinFromBinArray = getBinFromBinArray; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getOutAmount = getOutAmount; exports.getPriceOfBinByBinId = getPriceOfBinByBinId; exports.getTokenBalance = getTokenBalance; exports.getTokenDecimals = getTokenDecimals; exports.getTotalFee = getTotalFee; exports.getVariableFee = getVariableFee; exports.isBinIdWithinBinArray = isBinIdWithinBinArray; exports.isOverflowDefaultBinArrayBitmap = isOverflowDefaultBinArrayBitmap; exports.parseLogs = parseLogs; exports.swapQuoteAtBin = swapQuoteAtBin; exports.swapQuoteAtBinWithCap = swapQuoteAtBinWithCap; exports.toAmountAskSide = toAmountAskSide; exports.toAmountBidSide = toAmountBidSide; exports.toAmountBothSide = toAmountBothSide; exports.toAmountsBothSideByStrategy = toAmountsBothSideByStrategy; exports.toAmountsOneSideByStrategy = toAmountsOneSideByStrategy; exports.toStrategyParameters = toStrategyParameters; exports.toWeightDistribution = toWeightDistribution; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.wrapSOLInstruction = wrapSOLInstruction;
+
+exports.ADMIN = ADMIN; exports.BASIS_POINT_MAX = BASIS_POINT_MAX; exports.BIN_ARRAY_BITMAP_SIZE = BIN_ARRAY_BITMAP_SIZE; exports.BIN_ARRAY_FEE = BIN_ARRAY_FEE; exports.BitmapType = BitmapType; exports.DLMMError = DLMMError; exports.EXTENSION_BINARRAY_BITMAP_SIZE = EXTENSION_BINARRAY_BITMAP_SIZE; exports.FEE_PRECISION = FEE_PRECISION; exports.IDL = IDL; 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.PairType = PairType; exports.PositionVersion = PositionVersion; exports.SCALE = SCALE; exports.SCALE_OFFSET = SCALE_OFFSET; exports.SIMULATION_USER = SIMULATION_USER; exports.Strategy = Strategy; exports.StrategyType = StrategyType; exports.autoFillXByStrategy = autoFillXByStrategy; exports.autoFillXByWeight = autoFillXByWeight; exports.autoFillYByStrategy = autoFillYByStrategy; exports.autoFillYByWeight = autoFillYByWeight; exports.binIdToBinArrayIndex = binIdToBinArrayIndex; exports.calculateBidAskDistribution = calculateBidAskDistribution; exports.calculateNormalDistribution = calculateNormalDistribution; exports.calculateSpotDistribution = calculateSpotDistribution; exports.chunkedFetchMultipleBinArrayBitmapExtensionAccount = chunkedFetchMultipleBinArrayBitmapExtensionAccount; exports.chunkedFetchMultiplePoolAccount = chunkedFetchMultiplePoolAccount; exports.chunkedGetMultipleAccountInfos = chunkedGetMultipleAccountInfos; exports.chunks = chunks; exports.computeBudgetIx = computeBudgetIx; exports.computeFee = computeFee; exports.computeFeeFromAmount = computeFeeFromAmount; exports.computeProtocolFee = computeProtocolFee; exports.default = src_default; exports.deriveBinArray = deriveBinArray; exports.deriveBinArrayBitmapExtension = deriveBinArrayBitmapExtension; exports.deriveLbPair = deriveLbPair; exports.deriveLbPair2 = deriveLbPair2; exports.deriveOracle = deriveOracle; exports.derivePermissionLbPair = derivePermissionLbPair; exports.derivePosition = derivePosition; exports.derivePresetParameter = derivePresetParameter; exports.derivePresetParameter2 = derivePresetParameter2; exports.deriveReserve = deriveReserve; exports.findNextBinArrayIndexWithLiquidity = findNextBinArrayIndexWithLiquidity; exports.findNextBinArrayWithLiquidity = findNextBinArrayWithLiquidity; exports.fromWeightDistributionToAmount = fromWeightDistributionToAmount; exports.fromWeightDistributionToAmountOneSide = fromWeightDistributionToAmountOneSide; exports.getBaseFee = getBaseFee; exports.getBinArrayLowerUpperBinId = getBinArrayLowerUpperBinId; exports.getBinFromBinArray = getBinFromBinArray; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getOutAmount = getOutAmount; exports.getPriceOfBinByBinId = getPriceOfBinByBinId; exports.getTokenBalance = getTokenBalance; exports.getTokenDecimals = getTokenDecimals; exports.getTotalFee = getTotalFee; exports.getVariableFee = getVariableFee; exports.isBinIdWithinBinArray = isBinIdWithinBinArray; exports.isOverflowDefaultBinArrayBitmap = isOverflowDefaultBinArrayBitmap; exports.parseLogs = parseLogs; exports.swapQuoteAtBin = swapQuoteAtBin; exports.swapQuoteAtBinWithCap = swapQuoteAtBinWithCap; 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