@meteora-ag/cp-amm-sdk 1.0.1-rc.33 → 1.0.1-rc.34

package/dist/index.d.mts

@@ -5232,8 +5232,6 @@ type PreparePoolCreationParams = {
     tokenBAmount: BN;
     minSqrtPrice: BN;
     maxSqrtPrice: BN;
-    tokenADecimal: number;
-    tokenBDecimal: number;
     tokenAInfo?: {
         mint: Mint;
         currentEpoch: number;
@@ -5324,6 +5322,11 @@ type RemoveLiquidityParams = {
     tokenBVault: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
+    vestings: Array<{
+        account: PublicKey;
+        vestingState: VestingState;
+    }>;
+    currentPoint: BN;
 };
 type RemoveAllLiquidityParams = Omit<RemoveLiquidityParams, "liquidityDelta">;
 type BuildAddLiquidityParams = {
@@ -5375,6 +5378,11 @@ type RemoveAllLiquidityAndClosePositionParams = {
     positionState: PositionState;
     tokenAAmountThreshold: BN;
     tokenBAmountThreshold: BN;
+    vestings: Array<{
+        account: PublicKey;
+        vestingState: VestingState;
+    }>;
+    currentPoint: BN;
 };
 type MergePositionParams = {
     owner: PublicKey;
@@ -5388,6 +5396,11 @@ type MergePositionParams = {
     tokenBAmountAddLiquidityThreshold: BN;
     tokenAAmountRemoveLiquidityThreshold: BN;
     tokenBAmountRemoveLiquidityThreshold: BN;
+    positionBVestings: Array<{
+        account: PublicKey;
+        vestingState: VestingState;
+    }>;
+    currentPoint: BN;
 };
 type GetQuoteParams = {
     inAmount: BN;
@@ -5523,7 +5536,7 @@ type RefreshVestingParams = {
     position: PublicKey;
     positionNftAccount: PublicKey;
     pool: PublicKey;
-    vestings: PublicKey[];
+    vestingAccounts: PublicKey[];
 };
 type PermanentLockParams = {
     owner: PublicKey;
@@ -5632,6 +5645,12 @@ declare class CpAmm {
      * @returns {Promise<TransactionInstruction>} Instruction to close the position
      */
     private buildClosePositionInstruction;
+    /**
+     * Builds an instruction to refresh vesting for a position
+     * @param params Parameters required for the refresh vesting instruction
+     * @returns Transaction instruction or null if no vestings to refresh
+     */
+    private buildRefreshVestingInstruction;
     /**
      * Fetches the Config state of the program.
      * @param config - Public key of the config account.
@@ -5709,6 +5728,30 @@ declare class CpAmm {
         account: VestingState;
     }>>;
     isLockedPosition(position: PositionState): boolean;
+    isPermanentLockedPosition(positionState: PositionState): boolean;
+    /**
+     * Checks if a position can be unlocked based on its locking state and vesting schedules.
+     *
+     * This method evaluates whether a position is eligible for operations that require
+     * unlocked liquidity, such as removing all liquidity or closing the position. It checks both
+     * permanent locks and time-based vesting schedules.
+     *
+     * @private
+     * @param {PositionState} positionState - The current state of the position
+     * @param {Array<{account: PublicKey; vestingState: VestingState}>} vestings - Array of vesting accounts and their states
+     * @param {BN} currentPoint - Current timestamp or slot number (depending on activation type of pool)
+     *
+     * @returns {Object} Result object containing unlock status and reason
+     * @returns {boolean} result.canUnlock - Whether the position can be unlocked
+     * @returns {string|undefined} result.reason - Reason why position cannot be unlocked (if applicable)
+     */
+    canUnlockPosition(positionState: PositionState, vestings: Array<{
+        account: PublicKey;
+        vestingState: VestingState;
+    }>, currentPoint: BN): {
+        canUnlock: boolean;
+        reason?: string;
+    };
     isPoolExist(pool: PublicKey): Promise<boolean>;
     /**
      * Calculates swap quote based on input amount and pool state.
@@ -6063,6 +6106,28 @@ interface TransferFeeExcludedAmount {
 }
 declare function calculateTransferFeeExcludedAmount(transferFeeIncludedAmount: BN, mint: Mint, currentEpoch: number): TransferFeeExcludedAmount;
 
+/**
+ * Checks if a vesting schedule is ready for full release
+ * @param vestingData The vesting account data
+ * @param currentPoint Current timestamp or slot
+ * @returns True if the vesting is complete and all liquidity can be released
+ */
+declare function isVestingComplete(vestingData: VestingState, currentPoint: BN): boolean;
+/**
+ * Gets the total amount of liquidity in the vesting schedule
+ * @param vestingData The vesting account data
+ * @returns The total locked liquidity amount
+ */
+declare function getTotalLockedLiquidity(vestingData: VestingState): BN;
+/**
+ * Calculates the available liquidity to withdraw based on vesting schedule
+ * @param vestingData The vesting account data
+ * @param positionData The position account data
+ * @param currentPoint Current timestamp or slot
+ * @returns The amount of liquidity available to withdraw
+ */
+declare function getAvailableVestingLiquidity(vestingData: VestingState, currentPoint: BN): BN;
+
 declare const ONE: BN;
 declare function pow(base: BN, exp: BN): BN;
 
@@ -12410,4 +12475,4 @@ var CpAmmIDL = {
 	types: types
 };
 
-export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildRemoveAllLiquidityInstructionParams, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeInstructionParams, type ClaimPositionFeeParams, type ClaimRewardParams, type ClosePositionInstructionParams, type ClosePositionParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DepositQuote, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetDepositQuoteParams, type GetQuoteParams, type GetWithdrawQuoteParams, type InitializeCustomizeablePoolParams, type InitializeRewardParams, LIQUIDITY_SCALE, type LiquidityDeltaParams, type LockPositionParams, MAX_CU_BUFFER, MAX_FEE_NUMERATOR, MAX_SQRT_PRICE, MIN_CU_BUFFER, MIN_SQRT_PRICE, type MergePositionParams, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparePoolCreationSingleSide, type PreparedPoolCreation, type RefreshVestingParams, type RemoveAllLiquidityAndClosePositionParams, type RemoveAllLiquidityParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, type WithdrawQuote, calculateInitSqrtPrice, calculateTransferFeeExcludedAmount, calculateTransferFeeIncludedAmount, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadge, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAllUserPositionNftAccount, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getBaseFeeNumerator, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceFromSqrtPrice, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSqrtPriceFromPrice, getSwapAmount, getTokenDecimals, getTokenProgram, getUnClaimReward, mulDiv, positionByPoolFilter, pow, q64ToDecimal, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };
+export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildRemoveAllLiquidityInstructionParams, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeInstructionParams, type ClaimPositionFeeParams, type ClaimRewardParams, type ClosePositionInstructionParams, type ClosePositionParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DepositQuote, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetDepositQuoteParams, type GetQuoteParams, type GetWithdrawQuoteParams, type InitializeCustomizeablePoolParams, type InitializeRewardParams, LIQUIDITY_SCALE, type LiquidityDeltaParams, type LockPositionParams, MAX_CU_BUFFER, MAX_FEE_NUMERATOR, MAX_SQRT_PRICE, MIN_CU_BUFFER, MIN_SQRT_PRICE, type MergePositionParams, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparePoolCreationSingleSide, type PreparedPoolCreation, type RefreshVestingParams, type RemoveAllLiquidityAndClosePositionParams, type RemoveAllLiquidityParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, type WithdrawQuote, calculateInitSqrtPrice, calculateTransferFeeExcludedAmount, calculateTransferFeeIncludedAmount, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadge, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAllUserPositionNftAccount, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getAvailableVestingLiquidity, getBaseFeeNumerator, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceFromSqrtPrice, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSqrtPriceFromPrice, getSwapAmount, getTokenDecimals, getTokenProgram, getTotalLockedLiquidity, getUnClaimReward, isVestingComplete, mulDiv, positionByPoolFilter, pow, q64ToDecimal, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };

package/dist/index.d.ts

@@ -5232,8 +5232,6 @@ type PreparePoolCreationParams = {
     tokenBAmount: BN;
     minSqrtPrice: BN;
     maxSqrtPrice: BN;
-    tokenADecimal: number;
-    tokenBDecimal: number;
     tokenAInfo?: {
         mint: Mint;
         currentEpoch: number;
@@ -5324,6 +5322,11 @@ type RemoveLiquidityParams = {
     tokenBVault: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
+    vestings: Array<{
+        account: PublicKey;
+        vestingState: VestingState;
+    }>;
+    currentPoint: BN;
 };
 type RemoveAllLiquidityParams = Omit<RemoveLiquidityParams, "liquidityDelta">;
 type BuildAddLiquidityParams = {
@@ -5375,6 +5378,11 @@ type RemoveAllLiquidityAndClosePositionParams = {
     positionState: PositionState;
     tokenAAmountThreshold: BN;
     tokenBAmountThreshold: BN;
+    vestings: Array<{
+        account: PublicKey;
+        vestingState: VestingState;
+    }>;
+    currentPoint: BN;
 };
 type MergePositionParams = {
     owner: PublicKey;
@@ -5388,6 +5396,11 @@ type MergePositionParams = {
     tokenBAmountAddLiquidityThreshold: BN;
     tokenAAmountRemoveLiquidityThreshold: BN;
     tokenBAmountRemoveLiquidityThreshold: BN;
+    positionBVestings: Array<{
+        account: PublicKey;
+        vestingState: VestingState;
+    }>;
+    currentPoint: BN;
 };
 type GetQuoteParams = {
     inAmount: BN;
@@ -5523,7 +5536,7 @@ type RefreshVestingParams = {
     position: PublicKey;
     positionNftAccount: PublicKey;
     pool: PublicKey;
-    vestings: PublicKey[];
+    vestingAccounts: PublicKey[];
 };
 type PermanentLockParams = {
     owner: PublicKey;
@@ -5632,6 +5645,12 @@ declare class CpAmm {
      * @returns {Promise<TransactionInstruction>} Instruction to close the position
      */
     private buildClosePositionInstruction;
+    /**
+     * Builds an instruction to refresh vesting for a position
+     * @param params Parameters required for the refresh vesting instruction
+     * @returns Transaction instruction or null if no vestings to refresh
+     */
+    private buildRefreshVestingInstruction;
     /**
      * Fetches the Config state of the program.
      * @param config - Public key of the config account.
@@ -5709,6 +5728,30 @@ declare class CpAmm {
         account: VestingState;
     }>>;
     isLockedPosition(position: PositionState): boolean;
+    isPermanentLockedPosition(positionState: PositionState): boolean;
+    /**
+     * Checks if a position can be unlocked based on its locking state and vesting schedules.
+     *
+     * This method evaluates whether a position is eligible for operations that require
+     * unlocked liquidity, such as removing all liquidity or closing the position. It checks both
+     * permanent locks and time-based vesting schedules.
+     *
+     * @private
+     * @param {PositionState} positionState - The current state of the position
+     * @param {Array<{account: PublicKey; vestingState: VestingState}>} vestings - Array of vesting accounts and their states
+     * @param {BN} currentPoint - Current timestamp or slot number (depending on activation type of pool)
+     *
+     * @returns {Object} Result object containing unlock status and reason
+     * @returns {boolean} result.canUnlock - Whether the position can be unlocked
+     * @returns {string|undefined} result.reason - Reason why position cannot be unlocked (if applicable)
+     */
+    canUnlockPosition(positionState: PositionState, vestings: Array<{
+        account: PublicKey;
+        vestingState: VestingState;
+    }>, currentPoint: BN): {
+        canUnlock: boolean;
+        reason?: string;
+    };
     isPoolExist(pool: PublicKey): Promise<boolean>;
     /**
      * Calculates swap quote based on input amount and pool state.
@@ -6063,6 +6106,28 @@ interface TransferFeeExcludedAmount {
 }
 declare function calculateTransferFeeExcludedAmount(transferFeeIncludedAmount: BN, mint: Mint, currentEpoch: number): TransferFeeExcludedAmount;
 
+/**
+ * Checks if a vesting schedule is ready for full release
+ * @param vestingData The vesting account data
+ * @param currentPoint Current timestamp or slot
+ * @returns True if the vesting is complete and all liquidity can be released
+ */
+declare function isVestingComplete(vestingData: VestingState, currentPoint: BN): boolean;
+/**
+ * Gets the total amount of liquidity in the vesting schedule
+ * @param vestingData The vesting account data
+ * @returns The total locked liquidity amount
+ */
+declare function getTotalLockedLiquidity(vestingData: VestingState): BN;
+/**
+ * Calculates the available liquidity to withdraw based on vesting schedule
+ * @param vestingData The vesting account data
+ * @param positionData The position account data
+ * @param currentPoint Current timestamp or slot
+ * @returns The amount of liquidity available to withdraw
+ */
+declare function getAvailableVestingLiquidity(vestingData: VestingState, currentPoint: BN): BN;
+
 declare const ONE: BN;
 declare function pow(base: BN, exp: BN): BN;
 
@@ -12410,4 +12475,4 @@ var CpAmmIDL = {
 	types: types
 };
 
-export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildRemoveAllLiquidityInstructionParams, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeInstructionParams, type ClaimPositionFeeParams, type ClaimRewardParams, type ClosePositionInstructionParams, type ClosePositionParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DepositQuote, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetDepositQuoteParams, type GetQuoteParams, type GetWithdrawQuoteParams, type InitializeCustomizeablePoolParams, type InitializeRewardParams, LIQUIDITY_SCALE, type LiquidityDeltaParams, type LockPositionParams, MAX_CU_BUFFER, MAX_FEE_NUMERATOR, MAX_SQRT_PRICE, MIN_CU_BUFFER, MIN_SQRT_PRICE, type MergePositionParams, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparePoolCreationSingleSide, type PreparedPoolCreation, type RefreshVestingParams, type RemoveAllLiquidityAndClosePositionParams, type RemoveAllLiquidityParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, type WithdrawQuote, calculateInitSqrtPrice, calculateTransferFeeExcludedAmount, calculateTransferFeeIncludedAmount, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadge, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAllUserPositionNftAccount, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getBaseFeeNumerator, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceFromSqrtPrice, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSqrtPriceFromPrice, getSwapAmount, getTokenDecimals, getTokenProgram, getUnClaimReward, mulDiv, positionByPoolFilter, pow, q64ToDecimal, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };
+export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildRemoveAllLiquidityInstructionParams, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeInstructionParams, type ClaimPositionFeeParams, type ClaimRewardParams, type ClosePositionInstructionParams, type ClosePositionParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DepositQuote, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetDepositQuoteParams, type GetQuoteParams, type GetWithdrawQuoteParams, type InitializeCustomizeablePoolParams, type InitializeRewardParams, LIQUIDITY_SCALE, type LiquidityDeltaParams, type LockPositionParams, MAX_CU_BUFFER, MAX_FEE_NUMERATOR, MAX_SQRT_PRICE, MIN_CU_BUFFER, MIN_SQRT_PRICE, type MergePositionParams, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparePoolCreationSingleSide, type PreparedPoolCreation, type RefreshVestingParams, type RemoveAllLiquidityAndClosePositionParams, type RemoveAllLiquidityParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, type WithdrawQuote, calculateInitSqrtPrice, calculateTransferFeeExcludedAmount, calculateTransferFeeIncludedAmount, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadge, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAllUserPositionNftAccount, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getAvailableVestingLiquidity, getBaseFeeNumerator, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceFromSqrtPrice, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSqrtPriceFromPrice, getSwapAmount, getTokenDecimals, getTokenProgram, getTotalLockedLiquidity, getUnClaimReward, isVestingComplete, mulDiv, positionByPoolFilter, pow, q64ToDecimal, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };

package/dist/index.js

@@ -7140,8 +7140,49 @@ function calculateTransferFeeExcludedAmount(transferFeeIncludedAmount, mint, cur
   };
 }
 
-// src/CpAmm.ts
+// src/helpers/vestings.ts
+
 var _bnjs = require('bn.js');
+function isVestingComplete(vestingData, currentPoint) {
+  const cliffPoint = vestingData.cliffPoint;
+  const periodFrequency = vestingData.periodFrequency;
+  const numberOfPeriods = vestingData.numberOfPeriod;
+  const endPoint = cliffPoint.add(periodFrequency.muln(numberOfPeriods));
+  return currentPoint.gte(endPoint);
+}
+function getTotalLockedLiquidity(vestingData) {
+  return vestingData.cliffUnlockLiquidity.add(
+    vestingData.liquidityPerPeriod.mul(new (0, _anchor.BN)(vestingData.numberOfPeriod))
+  );
+}
+function getAvailableVestingLiquidity(vestingData, currentPoint) {
+  const {
+    cliffPoint,
+    periodFrequency,
+    cliffUnlockLiquidity,
+    liquidityPerPeriod,
+    numberOfPeriod,
+    totalReleasedLiquidity
+  } = vestingData;
+  if (currentPoint < cliffPoint) {
+    return new (0, _anchor.BN)(0);
+  }
+  if (periodFrequency.isZero()) {
+    return cliffUnlockLiquidity.sub(totalReleasedLiquidity);
+  }
+  let passedPeriod = new (0, _anchor.BN)(currentPoint).sub(cliffPoint).div(periodFrequency);
+  passedPeriod = _bnjs.min.call(void 0, passedPeriod, new (0, _anchor.BN)(numberOfPeriod));
+  const unlockedLiquidity = cliffUnlockLiquidity.add(
+    passedPeriod.mul(liquidityPerPeriod)
+  );
+  const availableReleasingLiquidity = unlockedLiquidity.sub(
+    totalReleasedLiquidity
+  );
+  return availableReleasingLiquidity;
+}
+
+// src/CpAmm.ts
+
 var CpAmm = class {
   constructor(connection) {
     this._program = new (0, _anchor.Program)(cp_amm_default, {
@@ -7371,6 +7412,33 @@ var CpAmm = class {
       }).instruction();
     });
   }
+  /**
+   * Builds an instruction to refresh vesting for a position
+   * @param params Parameters required for the refresh vesting instruction
+   * @returns Transaction instruction or null if no vestings to refresh
+   */
+  buildRefreshVestingInstruction(params) {
+    return __async(this, null, function* () {
+      const { owner, position, positionNftAccount, pool, vestingAccounts } = params;
+      if (vestingAccounts.length == 0) {
+        return null;
+      }
+      return yield this._program.methods.refreshVesting().accountsPartial({
+        position,
+        positionNftAccount,
+        pool,
+        owner
+      }).remainingAccounts(
+        vestingAccounts.map((pubkey) => {
+          return {
+            isSigner: false,
+            isWritable: true,
+            pubkey
+          };
+        })
+      ).instruction();
+    });
+  }
   /**
    * Fetches the Config state of the program.
    * @param config - Public key of the config account.
@@ -7518,6 +7586,44 @@ var CpAmm = class {
     );
     return totalLockedLiquidity.gtn(0);
   }
+  isPermanentLockedPosition(positionState) {
+    return positionState.permanentLockedLiquidity.gtn(0);
+  }
+  /**
+   * Checks if a position can be unlocked based on its locking state and vesting schedules.
+   *
+   * This method evaluates whether a position is eligible for operations that require
+   * unlocked liquidity, such as removing all liquidity or closing the position. It checks both
+   * permanent locks and time-based vesting schedules.
+   *
+   * @private
+   * @param {PositionState} positionState - The current state of the position
+   * @param {Array<{account: PublicKey; vestingState: VestingState}>} vestings - Array of vesting accounts and their states
+   * @param {BN} currentPoint - Current timestamp or slot number (depending on activation type of pool)
+   *
+   * @returns {Object} Result object containing unlock status and reason
+   * @returns {boolean} result.canUnlock - Whether the position can be unlocked
+   * @returns {string|undefined} result.reason - Reason why position cannot be unlocked (if applicable)
+   */
+  canUnlockPosition(positionState, vestings, currentPoint) {
+    if (vestings.length > 0) {
+      if (this.isPermanentLockedPosition(positionState)) {
+        return {
+          canUnlock: false,
+          reason: "Position is permanently locked"
+        };
+      }
+      for (const vesting of vestings) {
+        if (!isVestingComplete(vesting.vestingState, currentPoint)) {
+          return {
+            canUnlock: false,
+            reason: "Position has incomplete vesting schedule"
+          };
+        }
+      }
+    }
+    return { canUnlock: true };
+  }
   isPoolExist(pool) {
     return __async(this, null, function* () {
       const poolState = yield this._program.account.pool.fetchNullable(pool);
@@ -7590,22 +7696,25 @@ var CpAmm = class {
         aToB,
         collectFeeMode
       );
-      let actualAmoutOut = amountOut;
+      let actualAmountOut = amountOut;
       if (outputTokenInfo) {
-        actualAmoutOut = calculateTransferFeeExcludedAmount(
+        actualAmountOut = calculateTransferFeeExcludedAmount(
           amountOut,
           outputTokenInfo.mint,
           outputTokenInfo.currentEpoch
         ).amount;
       }
-      const minSwapOutAmount = getMinAmountWithSlippage(actualAmoutOut, slippage);
+      const minSwapOutAmount = getMinAmountWithSlippage(
+        actualAmountOut,
+        slippage
+      );
       return {
         swapInAmount: inAmount,
         consumedInAmount: actualAmountIn,
-        swapOutAmount: actualAmoutOut,
+        swapOutAmount: actualAmountOut,
         minSwapOutAmount,
         totalFee,
-        priceImpact: getPriceImpact(minSwapOutAmount, actualAmoutOut)
+        priceImpact: getPriceImpact(minSwapOutAmount, actualAmountOut)
       };
     });
   }
@@ -7782,13 +7891,13 @@ var CpAmm = class {
         tokenAInfo.currentEpoch
       ).transferFee
     ) : tokenAAmount;
-    const actualAmountBIn = tokenBInfo ? tokenAAmount.sub(
+    const actualAmountBIn = tokenBInfo ? tokenBAmount.sub(
       calculateTransferFeeIncludedAmount(
         tokenBAmount,
         tokenBInfo.mint,
         tokenBInfo.currentEpoch
       ).transferFee
-    ) : tokenAAmount;
+    ) : tokenBAmount;
     const initSqrtPrice = calculateInitSqrtPrice(
       tokenAAmount,
       tokenBAmount,
@@ -8121,7 +8230,8 @@ var CpAmm = class {
         tokenAVault,
         tokenBVault,
         tokenAProgram,
-        tokenBProgram
+        tokenBProgram,
+        vestings
       } = params;
       const {
         tokenAAta: tokenAAccount,
@@ -8141,6 +8251,16 @@ var CpAmm = class {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(owner);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
+      if (vestings.length > 0) {
+        const refreshVestingInstruction = yield this.buildRefreshVestingInstruction({
+          owner,
+          position,
+          positionNftAccount,
+          pool,
+          vestingAccounts: vestings.map((item) => item.account)
+        });
+        refreshVestingInstruction && preInstructions.push(refreshVestingInstruction);
+      }
       return yield this._program.methods.removeLiquidity({
         liquidityDelta,
         tokenAAmountThreshold,
@@ -8181,7 +8301,8 @@ var CpAmm = class {
         tokenAVault,
         tokenBVault,
         tokenAProgram,
-        tokenBProgram
+        tokenBProgram,
+        vestings
       } = params;
       const {
         tokenAAta: tokenAAccount,
@@ -8201,6 +8322,16 @@ var CpAmm = class {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(owner);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
+      if (vestings.length > 0) {
+        const refreshVestingInstruction = yield this.buildRefreshVestingInstruction({
+          owner,
+          position,
+          positionNftAccount,
+          pool,
+          vestingAccounts: vestings.map((item) => item.account)
+        });
+        refreshVestingInstruction && preInstructions.push(refreshVestingInstruction);
+      }
       const removeAllLiquidityInstruction = yield this.buildRemoveAllLiquidityInstruction({
         poolAuthority: this.poolAuthority,
         owner,
@@ -8358,21 +8489,8 @@ var CpAmm = class {
    */
   refreshVesting(params) {
     return __async(this, null, function* () {
-      const { owner, position, positionNftAccount, pool, vestings } = params;
-      return yield this._program.methods.refreshVesting().accountsPartial({
-        position,
-        positionNftAccount,
-        pool,
-        owner
-      }).remainingAccounts(
-        vestings.map((pubkey) => {
-          return {
-            isSigner: false,
-            isWritable: true,
-            pubkey
-          };
-        })
-      ).transaction();
+      const instruction = yield this.buildRefreshVestingInstruction(params);
+      return new (0, _web3js.Transaction)().add(instruction);
     });
   }
   /**
@@ -8470,13 +8588,19 @@ var CpAmm = class {
         positionState,
         poolState,
         tokenAAmountThreshold,
-        tokenBAmountThreshold
+        tokenBAmountThreshold,
+        vestings,
+        currentPoint
       } = params;
       const { nftMint: positionNftMint, pool } = positionState;
       const { tokenAMint, tokenBMint, tokenAVault, tokenBVault } = poolState;
-      const isLockedPosition = this.isLockedPosition(positionState);
-      if (isLockedPosition) {
-        throw Error("position must be unlocked");
+      const { canUnlock, reason } = this.canUnlockPosition(
+        positionState,
+        vestings,
+        currentPoint
+      );
+      if (!canUnlock) {
+        throw new Error(`Cannot remove liquidity: ${reason}`);
       }
       const tokenAProgram = getTokenProgram(poolState.tokenAFlag);
       const tokenBProgram = getTokenProgram(poolState.tokenBFlag);
@@ -8498,6 +8622,16 @@ var CpAmm = class {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(owner);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
+      if (vestings.length > 0) {
+        const refreshVestingInstruction = yield this.buildRefreshVestingInstruction({
+          owner,
+          position,
+          positionNftAccount,
+          pool,
+          vestingAccounts: vestings.map((item) => item.account)
+        });
+        refreshVestingInstruction && preInstructions.push(refreshVestingInstruction);
+      }
       const transaction = new (0, _web3js.Transaction)();
       if (preInstructions.length > 0) {
         transaction.add(...preInstructions);
@@ -8576,13 +8710,19 @@ var CpAmm = class {
         tokenAAmountAddLiquidityThreshold,
         tokenBAmountAddLiquidityThreshold,
         tokenAAmountRemoveLiquidityThreshold,
-        tokenBAmountRemoveLiquidityThreshold
+        tokenBAmountRemoveLiquidityThreshold,
+        positionBVestings,
+        currentPoint
       } = params;
-      const isLockedPosition = this.isLockedPosition(positionBState);
-      if (isLockedPosition) {
-        throw Error("position must be unlocked");
+      const { canUnlock, reason } = this.canUnlockPosition(
+        positionBState,
+        positionBVestings,
+        currentPoint
+      );
+      if (!canUnlock) {
+        throw new Error(`Cannot remove liquidity: ${reason}`);
       }
-      const postionBLiquidityDelta = positionBState.unlockedLiquidity;
+      const positionBLiquidityDelta = positionBState.unlockedLiquidity;
       const pool = positionBState.pool;
       const { tokenAMint, tokenBMint, tokenAVault, tokenBVault } = poolState;
       const tokenAProgram = getTokenProgram(poolState.tokenAFlag);
@@ -8605,6 +8745,16 @@ var CpAmm = class {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(owner);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
+      if (positionBVestings.length > 0) {
+        const refreshVestingInstruction = yield this.buildRefreshVestingInstruction({
+          owner,
+          position: positionB,
+          positionNftAccount: positionBNftAccount,
+          pool,
+          vestingAccounts: positionBVestings.map((item) => item.account)
+        });
+        refreshVestingInstruction && preInstructions.push(refreshVestingInstruction);
+      }
       const transaction = new (0, _web3js.Transaction)();
       if (preInstructions.length > 0) {
         transaction.add(...preInstructions);
@@ -8656,7 +8806,7 @@ var CpAmm = class {
         tokenBVault,
         tokenAProgram,
         tokenBProgram,
-        liquidityDelta: postionBLiquidityDelta,
+        liquidityDelta: positionBLiquidityDelta,
         tokenAAmountThreshold: tokenAAmountAddLiquidityThreshold,
         tokenBAmountThreshold: tokenBAmountAddLiquidityThreshold
       });
@@ -8953,5 +9103,8 @@ var index_default = cp_amm_default;
 
 
 
-exports.ActivationPoint = ActivationPoint; exports.ActivationType = ActivationType; exports.BASIS_POINT_MAX = BASIS_POINT_MAX; exports.CP_AMM_PROGRAM_ID = CP_AMM_PROGRAM_ID; exports.CollectFeeMode = CollectFeeMode; exports.CpAmm = CpAmm; exports.FEE_DENOMINATOR = FEE_DENOMINATOR; exports.FeeSchedulerMode = FeeSchedulerMode; exports.LIQUIDITY_SCALE = LIQUIDITY_SCALE; exports.MAX_CU_BUFFER = MAX_CU_BUFFER; exports.MAX_FEE_NUMERATOR = MAX_FEE_NUMERATOR; exports.MAX_SQRT_PRICE = MAX_SQRT_PRICE; exports.MIN_CU_BUFFER = MIN_CU_BUFFER; exports.MIN_SQRT_PRICE = MIN_SQRT_PRICE; exports.ONE = ONE; exports.PRECISION = PRECISION; exports.Rounding = Rounding; exports.SCALE_OFFSET = SCALE_OFFSET; exports.TradeDirection = TradeDirection; exports.calculateInitSqrtPrice = calculateInitSqrtPrice; exports.calculateTransferFeeExcludedAmount = calculateTransferFeeExcludedAmount; exports.calculateTransferFeeIncludedAmount = calculateTransferFeeIncludedAmount; exports.decimalToQ64 = decimalToQ64; exports.default = index_default; exports.deriveClaimFeeOperatorAddress = deriveClaimFeeOperatorAddress; exports.deriveConfigAddress = deriveConfigAddress; exports.deriveCustomizablePoolAddress = deriveCustomizablePoolAddress; exports.derivePoolAddress = derivePoolAddress; exports.derivePoolAuthority = derivePoolAuthority; exports.derivePositionAddress = derivePositionAddress; exports.derivePositionNftAccount = derivePositionNftAccount; exports.deriveRewardVaultAddress = deriveRewardVaultAddress; exports.deriveTokenBadge = deriveTokenBadge; exports.deriveTokenBadgeAddress = deriveTokenBadgeAddress; exports.deriveTokenVaultAddress = deriveTokenVaultAddress; exports.divCeil = divCeil; exports.getAllUserPositionNftAccount = getAllUserPositionNftAccount; exports.getAmountAFromLiquidityDelta = getAmountAFromLiquidityDelta; exports.getAmountBFromLiquidityDelta = getAmountBFromLiquidityDelta; exports.getBaseFeeNumerator = getBaseFeeNumerator; exports.getDynamicFeeNumerator = getDynamicFeeNumerator; exports.getEstimatedComputeUnitIxWithBuffer = getEstimatedComputeUnitIxWithBuffer; exports.getEstimatedComputeUnitUsageWithBuffer = getEstimatedComputeUnitUsageWithBuffer; exports.getFeeNumerator = getFeeNumerator; exports.getFirstKey = getFirstKey; exports.getLiquidityDeltaFromAmountA = getLiquidityDeltaFromAmountA; exports.getLiquidityDeltaFromAmountB = getLiquidityDeltaFromAmountB; exports.getMaxAmountWithSlippage = getMaxAmountWithSlippage; exports.getMinAmountWithSlippage = getMinAmountWithSlippage; exports.getNextSqrtPrice = getNextSqrtPrice; exports.getNftOwner = getNftOwner; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getPriceFromSqrtPrice = getPriceFromSqrtPrice; exports.getPriceImpact = getPriceImpact; exports.getSecondKey = getSecondKey; exports.getSimulationComputeUnits = getSimulationComputeUnits; exports.getSqrtPriceFromPrice = getSqrtPriceFromPrice; exports.getSwapAmount = getSwapAmount; exports.getTokenDecimals = getTokenDecimals; exports.getTokenProgram = getTokenProgram; exports.getUnClaimReward = getUnClaimReward; exports.mulDiv = mulDiv; exports.positionByPoolFilter = positionByPoolFilter; exports.pow = pow; exports.q64ToDecimal = q64ToDecimal; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.vestingByPositionFilter = vestingByPositionFilter; exports.wrapSOLInstruction = wrapSOLInstruction;
+
+
+
+exports.ActivationPoint = ActivationPoint; exports.ActivationType = ActivationType; exports.BASIS_POINT_MAX = BASIS_POINT_MAX; exports.CP_AMM_PROGRAM_ID = CP_AMM_PROGRAM_ID; exports.CollectFeeMode = CollectFeeMode; exports.CpAmm = CpAmm; exports.FEE_DENOMINATOR = FEE_DENOMINATOR; exports.FeeSchedulerMode = FeeSchedulerMode; exports.LIQUIDITY_SCALE = LIQUIDITY_SCALE; exports.MAX_CU_BUFFER = MAX_CU_BUFFER; exports.MAX_FEE_NUMERATOR = MAX_FEE_NUMERATOR; exports.MAX_SQRT_PRICE = MAX_SQRT_PRICE; exports.MIN_CU_BUFFER = MIN_CU_BUFFER; exports.MIN_SQRT_PRICE = MIN_SQRT_PRICE; exports.ONE = ONE; exports.PRECISION = PRECISION; exports.Rounding = Rounding; exports.SCALE_OFFSET = SCALE_OFFSET; exports.TradeDirection = TradeDirection; exports.calculateInitSqrtPrice = calculateInitSqrtPrice; exports.calculateTransferFeeExcludedAmount = calculateTransferFeeExcludedAmount; exports.calculateTransferFeeIncludedAmount = calculateTransferFeeIncludedAmount; exports.decimalToQ64 = decimalToQ64; exports.default = index_default; exports.deriveClaimFeeOperatorAddress = deriveClaimFeeOperatorAddress; exports.deriveConfigAddress = deriveConfigAddress; exports.deriveCustomizablePoolAddress = deriveCustomizablePoolAddress; exports.derivePoolAddress = derivePoolAddress; exports.derivePoolAuthority = derivePoolAuthority; exports.derivePositionAddress = derivePositionAddress; exports.derivePositionNftAccount = derivePositionNftAccount; exports.deriveRewardVaultAddress = deriveRewardVaultAddress; exports.deriveTokenBadge = deriveTokenBadge; exports.deriveTokenBadgeAddress = deriveTokenBadgeAddress; exports.deriveTokenVaultAddress = deriveTokenVaultAddress; exports.divCeil = divCeil; exports.getAllUserPositionNftAccount = getAllUserPositionNftAccount; exports.getAmountAFromLiquidityDelta = getAmountAFromLiquidityDelta; exports.getAmountBFromLiquidityDelta = getAmountBFromLiquidityDelta; exports.getAvailableVestingLiquidity = getAvailableVestingLiquidity; exports.getBaseFeeNumerator = getBaseFeeNumerator; exports.getDynamicFeeNumerator = getDynamicFeeNumerator; exports.getEstimatedComputeUnitIxWithBuffer = getEstimatedComputeUnitIxWithBuffer; exports.getEstimatedComputeUnitUsageWithBuffer = getEstimatedComputeUnitUsageWithBuffer; exports.getFeeNumerator = getFeeNumerator; exports.getFirstKey = getFirstKey; exports.getLiquidityDeltaFromAmountA = getLiquidityDeltaFromAmountA; exports.getLiquidityDeltaFromAmountB = getLiquidityDeltaFromAmountB; exports.getMaxAmountWithSlippage = getMaxAmountWithSlippage; exports.getMinAmountWithSlippage = getMinAmountWithSlippage; exports.getNextSqrtPrice = getNextSqrtPrice; exports.getNftOwner = getNftOwner; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getPriceFromSqrtPrice = getPriceFromSqrtPrice; exports.getPriceImpact = getPriceImpact; exports.getSecondKey = getSecondKey; exports.getSimulationComputeUnits = getSimulationComputeUnits; exports.getSqrtPriceFromPrice = getSqrtPriceFromPrice; exports.getSwapAmount = getSwapAmount; exports.getTokenDecimals = getTokenDecimals; exports.getTokenProgram = getTokenProgram; exports.getTotalLockedLiquidity = getTotalLockedLiquidity; exports.getUnClaimReward = getUnClaimReward; exports.isVestingComplete = isVestingComplete; exports.mulDiv = mulDiv; exports.positionByPoolFilter = positionByPoolFilter; exports.pow = pow; exports.q64ToDecimal = q64ToDecimal; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.vestingByPositionFilter = vestingByPositionFilter; exports.wrapSOLInstruction = wrapSOLInstruction;
 //# sourceMappingURL=index.js.map