@meteora-ag/dlmm 1.0.53 → 1.0.55

package/dist/index.js

@@ -9,7 +9,7 @@ var _web3js = require('@solana/web3.js');
 
 // src/dlmm/idl.ts
 var IDL = {
-  "version": "0.7.0",
+  "version": "0.8.0",
   "name": "lb_clmm",
   "constants": [
     {
@@ -2307,7 +2307,7 @@ var IDL = {
       ]
     },
     {
-      "name": "setActivationSlot",
+      "name": "setActivationPoint",
       "accounts": [
         {
           "name": "lbPair",
@@ -2322,13 +2322,13 @@ var IDL = {
       ],
       "args": [
         {
-          "name": "activationSlot",
+          "name": "activationPoint",
           "type": "u64"
         }
       ]
     },
     {
-      "name": "setLockReleaseSlot",
+      "name": "setLockReleasePoint",
       "accounts": [
         {
           "name": "position",
@@ -2358,7 +2358,7 @@ var IDL = {
       ],
       "args": [
         {
-          "name": "newLockReleaseSlot",
+          "name": "newLockReleasePoint",
           "type": "u64"
         }
       ]
@@ -2582,7 +2582,7 @@ var IDL = {
       ]
     },
     {
-      "name": "setPreActivationSlotDuration",
+      "name": "setPreActivationDuration",
       "accounts": [
         {
           "name": "lbPair",
@@ -2597,7 +2597,7 @@ var IDL = {
       ],
       "args": [
         {
-          "name": "preActivationSlotDuration",
+          "name": "preActivationDuration",
           "type": "u16"
         }
       ]
@@ -2788,10 +2788,16 @@ var IDL = {
           },
           {
             "name": "requireBaseFactorSeed",
+            "docs": [
+              "Require base factor seed"
+            ],
             "type": "u8"
           },
           {
             "name": "baseFactorSeed",
+            "docs": [
+              "Base factor seed"
+            ],
             "type": {
               "array": [
                 "u8",
@@ -2800,13 +2806,18 @@ var IDL = {
             }
           },
           {
-            "name": "padding1",
-            "type": {
-              "array": [
-                "u8",
-                2
-              ]
-            }
+            "name": "activationType",
+            "docs": [
+              "Activation type"
+            ],
+            "type": "u8"
+          },
+          {
+            "name": "padding0",
+            "docs": [
+              "padding 0"
+            ],
+            "type": "u8"
           },
           {
             "name": "tokenXMint",
@@ -2846,11 +2857,16 @@ var IDL = {
             }
           },
           {
-            "name": "feeOwner",
+            "name": "padding1",
             "docs": [
-              "Fee owner. Deprecated. Can be used as buffer in the future."
+              "_padding_1, previous Fee owner, BE CAREFUL FOR TOMBSTONE WHEN REUSE !!"
             ],
-            "type": "publicKey"
+            "type": {
+              "array": [
+                "u8",
+                32
+              ]
+            }
           },
           {
             "name": "rewardInfos",
@@ -2902,7 +2918,7 @@ var IDL = {
           {
             "name": "preActivationSwapAddress",
             "docs": [
-              "Address allowed to swap when the current slot is greater than or equal to the pre-activation slot. The pre-activation slot is calculated as `activation_slot - pre_activation_slot_duration`."
+              "Address allowed to swap when the current point is greater than or equal to the pre-activation point. The pre-activation point is calculated as `activation_point - pre_activation_duration`."
             ],
             "type": "publicKey"
           },
@@ -2914,23 +2930,23 @@ var IDL = {
             "type": "publicKey"
           },
           {
-            "name": "activationSlot",
+            "name": "activationPoint",
             "docs": [
-              "Slot to enable the pair. Only applicable for permission pair."
+              "Time point to enable the pair. Only applicable for permission pair."
             ],
             "type": "u64"
           },
           {
-            "name": "preActivationSlotDuration",
+            "name": "preActivationDuration",
             "docs": [
-              "Number of slot before activation slot. Used to calculate pre-activation slot for pre_activation_swap_address"
+              "Duration before activation activation_point. Used to calculate pre-activation time point for pre_activation_swap_address"
             ],
             "type": "u64"
           },
           {
             "name": "padding2",
             "docs": [
-              "_padding2 is reclaimed free space from swap_cap_deactivate_slot and swap_cap_amount before, BE CAREFUL FOR TOMBSTONE WHEN REUSE !!"
+              "_padding 2 is reclaimed free space from swap_cap_deactivate_point and swap_cap_amount before, BE CAREFUL FOR TOMBSTONE WHEN REUSE !!"
             ],
             "type": {
               "array": [
@@ -2940,7 +2956,7 @@ var IDL = {
             }
           },
           {
-            "name": "lockDurationsInSlot",
+            "name": "lockDuration",
             "docs": [
               "Liquidity lock duration for positions which created before activate. Only applicable for permission pair."
             ],
@@ -2976,7 +2992,7 @@ var IDL = {
           {
             "name": "idx",
             "docs": [
-              "Index of latest observation slot"
+              "Index of latest observation"
             ],
             "type": "u64"
           },
@@ -3232,9 +3248,9 @@ var IDL = {
             "type": "publicKey"
           },
           {
-            "name": "lockReleaseSlot",
+            "name": "lockReleasePoint",
             "docs": [
-              "Slot which the locked liquidity can be withdraw"
+              "Time point which the locked liquidity can be withdraw"
             ],
             "type": "u64"
           },
@@ -3706,8 +3722,12 @@ var IDL = {
             "type": "i32"
           },
           {
-            "name": "lockDurationInSlot",
+            "name": "lockDuration",
             "type": "u64"
+          },
+          {
+            "name": "activationType",
+            "type": "u8"
           }
         ]
       }
@@ -4282,6 +4302,23 @@ var IDL = {
         ]
       }
     },
+    {
+      "name": "ActivationType",
+      "docs": [
+        "Type of the activation"
+      ],
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "Slot"
+          },
+          {
+            "name": "Timestamp"
+          }
+        ]
+      }
+    },
     {
       "name": "PairType",
       "docs": [
@@ -4784,7 +4821,7 @@ var IDL = {
       ]
     },
     {
-      "name": "UpdatePositionLockReleaseSlot",
+      "name": "UpdatePositionLockReleasePoint",
       "fields": [
         {
           "name": "position",
@@ -4792,17 +4829,17 @@ var IDL = {
           "index": false
         },
         {
-          "name": "currentSlot",
+          "name": "currentPoint",
           "type": "u64",
           "index": false
         },
         {
-          "name": "newLockReleaseSlot",
+          "name": "newLockReleasePoint",
           "type": "u64",
           "index": false
         },
         {
-          "name": "oldLockReleaseSlot",
+          "name": "oldLockReleasePoint",
           "type": "u64",
           "index": false
         },
@@ -5097,43 +5134,38 @@ var IDL = {
     },
     {
       "code": 6052,
-      "name": "AlreadyPassActivationSlot",
+      "name": "AlreadyPassActivationPoint",
       "msg": "Already activated"
     },
     {
       "code": 6053,
-      "name": "LastSlotCannotBeSmallerThanActivateSlot",
-      "msg": "Last slot cannot be smaller than activate slot"
-    },
-    {
-      "code": 6054,
       "name": "ExceedMaxSwappedAmount",
       "msg": "Swapped amount is exceeded max swapped amount"
     },
     {
-      "code": 6055,
+      "code": 6054,
       "name": "InvalidStrategyParameters",
       "msg": "Invalid strategy parameters"
     },
     {
-      "code": 6056,
+      "code": 6055,
       "name": "LiquidityLocked",
       "msg": "Liquidity locked"
     },
     {
-      "code": 6057,
-      "name": "InvalidLockReleaseSlot",
-      "msg": "Invalid lock release slot"
-    },
-    {
-      "code": 6058,
+      "code": 6056,
       "name": "BinRangeIsNotEmpty",
       "msg": "Bin range is not empty"
     },
     {
-      "code": 6059,
+      "code": 6057,
       "name": "NotExactAmountOut",
       "msg": "Amount out is not matched with exact amount out"
+    },
+    {
+      "code": 6058,
+      "name": "InvalidActivationType",
+      "msg": "Invalid activation type"
     }
   ]
 };
@@ -5187,6 +5219,7 @@ var MAX_BIN_PER_TX = 69;
 var MAX_ACTIVE_BIN_SLIPPAGE = 3;
 
 // src/dlmm/types/index.ts
+var _borsh = require('@coral-xyz/borsh');
 var PositionVersion = /* @__PURE__ */ ((PositionVersion2) => {
   PositionVersion2[PositionVersion2["V1"] = 0] = "V1";
   PositionVersion2[PositionVersion2["V2"] = 1] = "V2";
@@ -5220,11 +5253,28 @@ var StrategyType = /* @__PURE__ */ ((StrategyType2) => {
   StrategyType2[StrategyType2["BidAskBalanced"] = 8] = "BidAskBalanced";
   return StrategyType2;
 })(StrategyType || {});
+var ActivationType = /* @__PURE__ */ ((ActivationType2) => {
+  ActivationType2[ActivationType2["Slot"] = 0] = "Slot";
+  ActivationType2[ActivationType2["Timestamp"] = 1] = "Timestamp";
+  return ActivationType2;
+})(ActivationType || {});
 var BitmapType = /* @__PURE__ */ ((BitmapType2) => {
   BitmapType2[BitmapType2["U1024"] = 0] = "U1024";
   BitmapType2[BitmapType2["U512"] = 1] = "U512";
   return BitmapType2;
 })(BitmapType || {});
+var ClockLayout = _borsh.struct.call(void 0, [
+  _borsh.u64.call(void 0, "slot"),
+  _borsh.i64.call(void 0, "epochStartTimestamp"),
+  _borsh.u64.call(void 0, "epoch"),
+  _borsh.u64.call(void 0, "leaderScheduleEpoch"),
+  _borsh.i64.call(void 0, "unixTimestamp")
+]);
+var PairStatus = /* @__PURE__ */ ((PairStatus2) => {
+  PairStatus2[PairStatus2["Enabled"] = 0] = "Enabled";
+  PairStatus2[PairStatus2["Disabled"] = 1] = "Disabled";
+  return PairStatus2;
+})(PairStatus || {});
 
 // src/dlmm/index.ts
 
@@ -7443,15 +7493,27 @@ var _bytes = require('@coral-xyz/anchor/dist/cjs/utils/bytes');
 
 
 var DLMM = class {
-  constructor(pubkey, program, lbPair, binArrayBitmapExtension, tokenX, tokenY, opt) {
+  constructor(pubkey, program, lbPair, binArrayBitmapExtension, tokenX, tokenY, clock, opt) {
     this.pubkey = pubkey;
     this.program = program;
     this.lbPair = lbPair;
     this.binArrayBitmapExtension = binArrayBitmapExtension;
     this.tokenX = tokenX;
     this.tokenY = tokenY;
+    this.clock = clock;
     this.opt = opt;
   }
+  validateSwapActivation() {
+    if (this.lbPair.status == 1 /* Disabled */) {
+      throw new Error("Pair is disabled");
+    }
+    if (this.lbPair.pairType == 1 /* Permissioned */) {
+      const currentPoint = this.lbPair.activationType == 0 /* Slot */ ? this.clock.slot : this.clock.unixTimestamp;
+      if (currentPoint < this.lbPair.activationPoint) {
+        throw new Error("Pair is disabled");
+      }
+    }
+  }
   /** Static public method */
   /**
    * The function `getLbPairs` retrieves a list of LB pair accounts using a connection and optional
@@ -7539,7 +7601,11 @@ var DLMM = class {
       dlmm,
       program.programId
     )[0];
-    const accountsToFetch = [dlmm, binArrayBitMapExtensionPubkey];
+    const accountsToFetch = [
+      dlmm,
+      binArrayBitMapExtensionPubkey,
+      _web3js.SYSVAR_CLOCK_PUBKEY
+    ];
     const accountsInfo = await chunkedGetMultipleAccountInfos(
       connection,
       accountsToFetch
@@ -7559,6 +7625,10 @@ var DLMM = class {
         binArrayBitMapAccountInfoBuffer
       );
     }
+    const clockAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _31 => _31[2], 'optionalAccess', _32 => _32.data]);
+    if (!clockAccountInfoBuffer)
+      throw new Error(`Clock account not found`);
+    const clock = ClockLayout.decode(clockAccountInfoBuffer);
     const reserveAccountsInfo = await chunkedGetMultipleAccountInfos(
       program.provider.connection,
       [
@@ -7602,6 +7672,7 @@ var DLMM = class {
       binArrayBitmapExtension,
       tokenX,
       tokenY,
+      clock,
       opt
     );
   }
@@ -7615,7 +7686,7 @@ var DLMM = class {
    * objects.
    */
   static async createMultiple(connection, dlmmList, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _31 => _31.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _33 => _33.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -7623,21 +7694,30 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _32 => _32.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _34 => _34.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
       provider
     );
     const binArrayBitMapExtensions = dlmmList.map(
       (lbPair) => deriveBinArrayBitmapExtension(lbPair, program.programId)[0]
     );
-    const accountsToFetch = [...dlmmList, ...binArrayBitMapExtensions];
+    const accountsToFetch = [
+      ...dlmmList,
+      ...binArrayBitMapExtensions,
+      _web3js.SYSVAR_CLOCK_PUBKEY
+    ];
     const accountsInfo = await chunkedGetMultipleAccountInfos(
       connection,
       accountsToFetch
     );
+    const clockAccount = accountsInfo.pop();
+    const clockAccountInfoBuffer = _optionalChain([clockAccount, 'optionalAccess', _35 => _35.data]);
+    if (!clockAccountInfoBuffer)
+      throw new Error(`Clock account not found`);
+    const clock = ClockLayout.decode(clockAccountInfoBuffer);
     const lbPairArraysMap = /* @__PURE__ */ new Map();
     for (let i = 0; i < dlmmList.length; i++) {
       const lbPairPubKey = dlmmList[i];
-      const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _33 => _33[i], 'optionalAccess', _34 => _34.data]);
+      const lbPairAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _36 => _36[i], 'optionalAccess', _37 => _37.data]);
       if (!lbPairAccountInfoBuffer)
         throw new Error(`LB Pair account ${lbPairPubKey.toBase58()} not found`);
       const binArrayAccInfo = program.coder.accounts.decode(
@@ -7650,7 +7730,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', _35 => _35[i], 'optionalAccess', _36 => _36.data]);
+      const binArrayBitMapAccountInfoBuffer = _optionalChain([accountsInfo, 'access', _38 => _38[i], 'optionalAccess', _39 => _39.data]);
       if (binArrayBitMapAccountInfoBuffer) {
         const binArrayBitMapExtensionAccInfo = program.coder.accounts.decode(
           "binArrayBitmapExtension",
@@ -7719,6 +7799,7 @@ var DLMM = class {
           binArrayBitmapExtension,
           tokenX,
           tokenY,
+          clock,
           opt
         );
       })
@@ -7733,7 +7814,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _37 => _37.programId]), () => ( LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _38 => _38.cluster]), () => ( "mainnet-beta"))])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _40 => _40.programId]), () => ( LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _41 => _41.cluster]), () => ( "mainnet-beta"))])),
       provider
     );
     const presetParameter = await program.account.presetParameter.all();
@@ -7751,7 +7832,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', _39 => _39.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _42 => _42.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -7759,7 +7840,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _40 => _40.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _43 => _43.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
       provider
     );
     const [positions, positionsV2] = await Promise.all([
@@ -7992,8 +8073,8 @@ var DLMM = class {
       const { mintXDecimal, mintYDecimal } = lbPairMintMap.get(
         lbPair.toBase58()
       );
-      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _41 => _41.get, 'call', _42 => _42(lbPair.toBase58()), 'optionalAccess', _43 => _43.reserveX]), () => ( BigInt(0)));
-      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _44 => _44.get, 'call', _45 => _45(lbPair.toBase58()), 'optionalAccess', _46 => _46.reserveY]), () => ( BigInt(0)));
+      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _44 => _44.get, 'call', _45 => _45(lbPair.toBase58()), 'optionalAccess', _46 => _46.reserveX]), () => ( BigInt(0)));
+      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMap, 'access', _47 => _47.get, 'call', _48 => _48(lbPair.toBase58()), 'optionalAccess', _49 => _49.reserveY]), () => ( BigInt(0)));
       const tokenX = {
         publicKey: lbPairAcc.tokenXMint,
         reserve: lbPairAcc.reserveX,
@@ -8025,7 +8106,7 @@ var DLMM = class {
           tokenX,
           tokenY,
           lbPairPositionsData: [
-            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _47 => _47.get, 'call', _48 => _48(lbPair.toBase58()), 'optionalAccess', _49 => _49.lbPairPositionsData]), () => ( [])),
+            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _50 => _50.get, 'call', _51 => _51(lbPair.toBase58()), 'optionalAccess', _52 => _52.lbPairPositionsData]), () => ( [])),
             {
               publicKey: positionPubKey,
               positionData,
@@ -8061,8 +8142,8 @@ var DLMM = class {
         getTokenDecimals(program.provider.connection, lbPairAcc.tokenXMint),
         getTokenDecimals(program.provider.connection, lbPairAcc.tokenYMint)
       ]);
-      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _50 => _50.get, 'call', _51 => _51(lbPair.toBase58()), 'optionalAccess', _52 => _52.reserveX]), () => ( BigInt(0)));
-      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _53 => _53.get, 'call', _54 => _54(lbPair.toBase58()), 'optionalAccess', _55 => _55.reserveY]), () => ( BigInt(0)));
+      const reserveXBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _53 => _53.get, 'call', _54 => _54(lbPair.toBase58()), 'optionalAccess', _55 => _55.reserveX]), () => ( BigInt(0)));
+      const reserveYBalance = _nullishCoalesce(_optionalChain([lbPairReserveMapV2, 'access', _56 => _56.get, 'call', _57 => _57(lbPair.toBase58()), 'optionalAccess', _58 => _58.reserveY]), () => ( BigInt(0)));
       const tokenX = {
         publicKey: lbPairAcc.tokenXMint,
         reserve: lbPairAcc.reserveX,
@@ -8094,7 +8175,7 @@ var DLMM = class {
           tokenX,
           tokenY,
           lbPairPositionsData: [
-            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _56 => _56.get, 'call', _57 => _57(lbPair.toBase58()), 'optionalAccess', _58 => _58.lbPairPositionsData]), () => ( [])),
+            ..._nullishCoalesce(_optionalChain([positionsMap, 'access', _59 => _59.get, 'call', _60 => _60(lbPair.toBase58()), 'optionalAccess', _61 => _61.lbPairPositionsData]), () => ( [])),
             {
               publicKey: positionPubKey,
               positionData,
@@ -8107,7 +8188,7 @@ var DLMM = class {
     return positionsMap;
   }
   static async migratePosition(connection, positions, newPositions, walletPubkey, opt) {
-    const cluster = _optionalChain([opt, 'optionalAccess', _59 => _59.cluster]) || "mainnet-beta";
+    const cluster = _optionalChain([opt, 'optionalAccess', _62 => _62.cluster]) || "mainnet-beta";
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -8115,7 +8196,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _60 => _60.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _63 => _63.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
       provider
     );
     const positionsState = await program.account.position.fetchMultiple(
@@ -8165,7 +8246,7 @@ var DLMM = class {
     return (min ? binId.floor() : binId.ceil()).toNumber();
   }
   /** Public methods */
-  static async createPermissionLbPair(connection, binStep, tokenX, tokenY, activeId, baseKey, creatorKey, feeBps, lockDurationInSlot, opt) {
+  static async createPermissionLbPair(connection, binStep, tokenX, tokenY, activeId, baseKey, creatorKey, feeBps, lockDuration, activationType, opt) {
     const provider = new (0, _anchor.AnchorProvider)(
       connection,
       {},
@@ -8173,7 +8254,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _61 => _61.programId]), () => ( LBCLMM_PROGRAM_IDS[opt.cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _64 => _64.programId]), () => ( LBCLMM_PROGRAM_IDS[opt.cluster])),
       provider
     );
     const [lbPair] = derivePermissionLbPair(
@@ -8197,7 +8278,8 @@ var DLMM = class {
       baseFactor: computeBaseFactorFromFeeBps(binStep, feeBps).toNumber(),
       minBinId: minBinId.toNumber(),
       maxBinId: maxBinId.toNumber(),
-      lockDurationInSlot
+      lockDuration,
+      activationType
     };
     return program.methods.initializePermissionLbPair(ixData).accounts({
       lbPair,
@@ -8222,7 +8304,7 @@ var DLMM = class {
     );
     const program = new (0, _anchor.Program)(
       IDL,
-      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _62 => _62.programId]), () => ( LBCLMM_PROGRAM_IDS[opt.cluster])),
+      _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _65 => _65.programId]), () => ( LBCLMM_PROGRAM_IDS[opt.cluster])),
       provider
     );
     const existsPool = await this.getPairPubkeyIfExists(
@@ -8358,7 +8440,7 @@ var DLMM = class {
         swapForY,
         new (0, _anchor.BN)(activeIdToLoop),
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _63 => _63.binArrayBitmapExtension, 'optionalAccess', _64 => _64.account]), () => ( null))
+        _nullishCoalesce(_optionalChain([this, 'access', _66 => _66.binArrayBitmapExtension, 'optionalAccess', _67 => _67.account]), () => ( null))
       );
       if (binArrayIndex === null)
         shouldStop = true;
@@ -9788,6 +9870,7 @@ var DLMM = class {
   swapQuoteExactOut(outAmount, swapForY, allowedSlippage, binArrays) {
     const currentTimestamp = Date.now() / 1e3;
     let outAmountLeft = outAmount;
+    this.validateSwapActivation();
     let vParameterClone = Object.assign({}, this.lbPair.vParameters);
     let activeId = new (0, _anchor.BN)(this.lbPair.activeId);
     const binStep = this.lbPair.binStep;
@@ -9808,7 +9891,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _65 => _65.binArrayBitmapExtension, 'optionalAccess', _66 => _66.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _68 => _68.binArrayBitmapExtension, 'optionalAccess', _69 => _69.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -9888,6 +9971,7 @@ var DLMM = class {
   swapQuote(inAmount, swapForY, allowedSlippage, binArrays, isPartialFill) {
     const currentTimestamp = Date.now() / 1e3;
     let inAmountLeft = inAmount;
+    this.validateSwapActivation();
     let vParameterClone = Object.assign({}, this.lbPair.vParameters);
     let activeId = new (0, _anchor.BN)(this.lbPair.activeId);
     const binStep = this.lbPair.binStep;
@@ -9908,7 +9992,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _67 => _67.binArrayBitmapExtension, 'optionalAccess', _68 => _68.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _70 => _70.binArrayBitmapExtension, 'optionalAccess', _71 => _71.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -10290,8 +10374,8 @@ var DLMM = class {
       })
     );
   }
-  async setActivationSlot(activationSlot) {
-    const setActivationSlotTx = await this.program.methods.setActivationSlot(activationSlot).accounts({
+  async setActivationPoint(activationPoint) {
+    const setActivationPointTx = await this.program.methods.setActivationPoint(activationPoint).accounts({
       lbPair: this.pubkey,
       admin: this.lbPair.creator
     }).transaction();
@@ -10300,10 +10384,10 @@ var DLMM = class {
       feePayer: this.lbPair.creator,
       blockhash,
       lastValidBlockHeight
-    }).add(setActivationSlotTx);
+    }).add(setActivationPointTx);
   }
   /**
-   * The function `updateWhitelistedWallet` is used to whitelist a wallet, enabling it to deposit into a permissioned pool before the activation slot.
+   * The function `updateWhitelistedWallet` is used to whitelist a wallet, enabling it to deposit into a permissioned pool before the activation point.
    * @param
    *    - `walletsToWhitelist`: The public key of the wallet.
    *    - `overrideIndexes`: Index of the whitelisted wallet to be inserted. Check DLMM.lbPair.whitelistedWallet for the index
@@ -10845,7 +10929,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _69 => _69.binArrayBitmapExtension, 'optionalAccess', _70 => _70.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _72 => _72.binArrayBitmapExtension, 'optionalAccess', _73 => _73.account]), () => ( null))
     );
     if (toBinArrayIndex === null)
       return true;
@@ -10882,7 +10966,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _71 => _71.binArrayBitmapExtension, 'optionalAccess', _72 => _72.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _74 => _74.binArrayBitmapExtension, 'optionalAccess', _75 => _75.account]), () => ( null))
     );
     const accountsToFetch = [];
     const [binArrayBitMapExtensionPubkey] = deriveBinArrayBitmapExtension(
@@ -10913,13 +10997,13 @@ var DLMM = class {
     let fromBinArray = null;
     let toBinArray = null;
     let binArrayBitmapExtension = null;
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _73 => _73[0]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _76 => _76[0]])) {
       binArrayBitmapExtension = binArrayBitMapExtensionPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _74 => _74[1]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _77 => _77[1]])) {
       fromBinArray = fromBinArrayPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _75 => _75[2]]) && !!toBinArrayIndex) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _78 => _78[2]]) && !!toBinArrayIndex) {
       toBinArray = toBinArrayPubkey;
     }
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
@@ -10993,7 +11077,7 @@ var DLMM = class {
     maxAmountIn = maxAmountIn.add(maxFee);
     if (amount0.gt(maxAmountIn)) {
       return {
-        withdrawAmount: maxAmountOut
+        withdrawAmount: amount1.add(maxAmountOut)
       };
     }
     const fee = computeFeeFromAmount(
@@ -11005,7 +11089,7 @@ var DLMM = class {
     const amount0AfterFee = amount0.sub(fee);
     const amountOut = isWithdrawForY ? mulShr(price, amount0AfterFee, SCALE_OFFSET, 1 /* Down */) : shlDiv(amount0AfterFee, price, SCALE_OFFSET, 1 /* Down */);
     return {
-      withdrawAmount: amount1.add(amountOut.gt(maxAmountOut) ? maxAmountOut : amountOut)
+      withdrawAmount: amount1.add(amountOut)
     };
   }
   async getWithdrawSingleSideAmount(positionPubkey, isWithdrawForY) {
@@ -11031,8 +11115,6 @@ var DLMM = class {
       lowerBinArrayPubKey,
       upperBinArrayPubKey
     ]);
-    if (!lowerBinArray || !upperBinArray)
-      throw new Error("BinArray not found");
     for (let idx = 0; idx < position.liquidityShares.length; idx++) {
       const shareToRemove = position.liquidityShares[idx];
       if (shareToRemove.eq(new (0, _anchor.BN)(0))) {
@@ -11041,6 +11123,9 @@ var DLMM = class {
       const binId = new (0, _anchor.BN)(position.lowerBinId).add(new (0, _anchor.BN)(idx));
       const binArrayIndex = binIdToBinArrayIndex(binId);
       const binArray = binArrayIndex.eq(lowerBinArrayIdx) ? lowerBinArray : upperBinArray;
+      if (!binArray) {
+        throw new Error("BinArray not found");
+      }
       const bin = getBinFromBinArray(binId.toNumber(), binArray);
       if (isWithdrawForY) {
         if (binId.gt(new (0, _anchor.BN)(this.lbPair.activeId))) {
@@ -11658,7 +11743,7 @@ var DLMMError = class extends Error {
       const anchorError = _anchor.AnchorError.parse(
         JSON.parse(JSON.stringify(error)).logs
       );
-      if (_optionalChain([anchorError, 'optionalAccess', _76 => _76.program, 'access', _77 => _77.toBase58, 'call', _78 => _78()]) === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
+      if (_optionalChain([anchorError, 'optionalAccess', _79 => _79.program, 'access', _80 => _80.toBase58, 'call', _81 => _81()]) === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
         _errorCode = anchorError.error.errorCode.number;
         _errorName = anchorError.error.errorCode.code;
         _errorMessage = anchorError.error.errorMessage;
@@ -11765,5 +11850,8 @@ 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.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.getBinArraysRequiredByPositionRange = getBinArraysRequiredByPositionRange; exports.getBinFromBinArray = getBinFromBinArray; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getOutAmount = getOutAmount; exports.getPriceOfBinByBinId = getPriceOfBinByBinId; exports.getTokenBalance = getTokenBalance; exports.getTokenDecimals = getTokenDecimals; exports.getTokensMintFromPoolAddress = getTokensMintFromPoolAddress; exports.getTotalFee = getTotalFee; exports.getVariableFee = getVariableFee; exports.isBinIdWithinBinArray = isBinIdWithinBinArray; exports.isOverflowDefaultBinArrayBitmap = isOverflowDefaultBinArrayBitmap; exports.parseLogs = parseLogs; exports.swapExactInQuoteAtBin = swapExactInQuoteAtBin; exports.swapExactOutQuoteAtBin = swapExactOutQuoteAtBin; exports.toAmountAskSide = toAmountAskSide; exports.toAmountBidSide = toAmountBidSide; exports.toAmountBothSide = toAmountBothSide; exports.toAmountsBothSideByStrategy = toAmountsBothSideByStrategy; exports.toAmountsOneSideByStrategy = toAmountsOneSideByStrategy; exports.toStrategyParameters = toStrategyParameters; exports.toWeightDistribution = toWeightDistribution; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.wrapSOLInstruction = wrapSOLInstruction;
+
+
+
+exports.ADMIN = ADMIN; exports.ActivationType = ActivationType; exports.BASIS_POINT_MAX = BASIS_POINT_MAX; exports.BIN_ARRAY_BITMAP_SIZE = BIN_ARRAY_BITMAP_SIZE; exports.BIN_ARRAY_FEE = BIN_ARRAY_FEE; exports.BitmapType = BitmapType; exports.ClockLayout = ClockLayout; 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.PairStatus = PairStatus; exports.PairType = PairType; exports.PositionVersion = PositionVersion; exports.SCALE = SCALE; exports.SCALE_OFFSET = SCALE_OFFSET; exports.SIMULATION_USER = SIMULATION_USER; exports.Strategy = Strategy; exports.StrategyType = StrategyType; exports.autoFillXByStrategy = autoFillXByStrategy; exports.autoFillXByWeight = autoFillXByWeight; exports.autoFillYByStrategy = autoFillYByStrategy; exports.autoFillYByWeight = autoFillYByWeight; exports.binIdToBinArrayIndex = binIdToBinArrayIndex; exports.calculateBidAskDistribution = calculateBidAskDistribution; exports.calculateNormalDistribution = calculateNormalDistribution; exports.calculateSpotDistribution = calculateSpotDistribution; exports.chunkedFetchMultipleBinArrayBitmapExtensionAccount = chunkedFetchMultipleBinArrayBitmapExtensionAccount; exports.chunkedFetchMultiplePoolAccount = chunkedFetchMultiplePoolAccount; exports.chunkedGetMultipleAccountInfos = chunkedGetMultipleAccountInfos; exports.chunks = chunks; exports.computeBudgetIx = computeBudgetIx; exports.computeFee = computeFee; exports.computeFeeFromAmount = computeFeeFromAmount; exports.computeProtocolFee = computeProtocolFee; exports.default = src_default; exports.deriveBinArray = deriveBinArray; exports.deriveBinArrayBitmapExtension = deriveBinArrayBitmapExtension; exports.deriveLbPair = deriveLbPair; exports.deriveLbPair2 = deriveLbPair2; exports.deriveOracle = deriveOracle; exports.derivePermissionLbPair = derivePermissionLbPair; exports.derivePosition = derivePosition; exports.derivePresetParameter = derivePresetParameter; exports.derivePresetParameter2 = derivePresetParameter2; exports.deriveReserve = deriveReserve; exports.findNextBinArrayIndexWithLiquidity = findNextBinArrayIndexWithLiquidity; exports.findNextBinArrayWithLiquidity = findNextBinArrayWithLiquidity; exports.fromWeightDistributionToAmount = fromWeightDistributionToAmount; exports.fromWeightDistributionToAmountOneSide = fromWeightDistributionToAmountOneSide; exports.getBaseFee = getBaseFee; exports.getBinArrayLowerUpperBinId = getBinArrayLowerUpperBinId; exports.getBinArraysRequiredByPositionRange = getBinArraysRequiredByPositionRange; exports.getBinFromBinArray = getBinFromBinArray; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getOutAmount = getOutAmount; exports.getPriceOfBinByBinId = getPriceOfBinByBinId; exports.getTokenBalance = getTokenBalance; exports.getTokenDecimals = getTokenDecimals; exports.getTokensMintFromPoolAddress = getTokensMintFromPoolAddress; exports.getTotalFee = getTotalFee; exports.getVariableFee = getVariableFee; exports.isBinIdWithinBinArray = isBinIdWithinBinArray; exports.isOverflowDefaultBinArrayBitmap = isOverflowDefaultBinArrayBitmap; exports.parseLogs = parseLogs; exports.swapExactInQuoteAtBin = swapExactInQuoteAtBin; exports.swapExactOutQuoteAtBin = swapExactOutQuoteAtBin; exports.toAmountAskSide = toAmountAskSide; exports.toAmountBidSide = toAmountBidSide; exports.toAmountBothSide = toAmountBothSide; exports.toAmountsBothSideByStrategy = toAmountsBothSideByStrategy; exports.toAmountsOneSideByStrategy = toAmountsOneSideByStrategy; exports.toStrategyParameters = toStrategyParameters; exports.toWeightDistribution = toWeightDistribution; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.wrapSOLInstruction = wrapSOLInstruction;
 //# sourceMappingURL=index.js.map