@meteora-ag/cp-amm-sdk 1.0.0-rc.3 → 1.0.0-rc.4

package/dist/index.d.mts

@@ -5781,14 +5781,14 @@ declare class CpAmm {
      * @param params - Swap parameters including input amount, pool state, slippage, etc.
      * @returns Swap quote including expected output amount, fee, and price impact.
      */
-    getQuote(params: GetQuoteParams): Promise<{
+    getQuote(params: GetQuoteParams): {
         swapInAmount: BN;
         consumedInAmount: BN;
         swapOutAmount: BN;
         minSwapOutAmount: BN;
         totalFee: BN;
         priceImpact: number;
-    }>;
+    };
     /**
      * Calculates the deposit quote for liquidity pool.
      *
@@ -5799,7 +5799,7 @@ declare class CpAmm {
      * @returns {BN} returns.outputAmount - The calculated corresponding amount of the other token.
      * @returns {BN} returns.liquidityDelta - The amount of liquidity that will be added to the pool.
      */
-    getDepositQuote(params: GetDepositQuoteParams): Promise<DepositQuote>;
+    getDepositQuote(params: GetDepositQuoteParams): DepositQuote;
     /**
      * Calculates the withdrawal quote for removing liquidity from a concentrated liquidity pool.
      *
@@ -5813,7 +5813,7 @@ declare class CpAmm {
      * @returns {BN} returns.outAmountA - The calculated amount of token A to be received (after deducting transfer fees)
      * @returns {BN} returns.outAmountB - The calculated amount of token B to be received (after deducting transfer fees)
      */
-    getWithdrawQuote(params: GetWithdrawQuoteParams): Promise<WithdrawQuote>;
+    getWithdrawQuote(params: GetWithdrawQuoteParams): WithdrawQuote;
     /**
      * Calculates liquidity and corresponding token amounts for token A single-sided pool creation
      * Only supports initialization where initial price equals min sqrt price
@@ -5974,7 +5974,6 @@ declare function deriveCustomizablePoolAddress(tokenAMint: PublicKey, tokenBMint
 declare function deriveTokenBadgeAddress(tokenMint: PublicKey): PublicKey;
 declare function deriveClaimFeeOperatorAddress(operator: PublicKey): PublicKey;
 declare function derivePositionNftAccount(positionNftMint: PublicKey): PublicKey;
-declare function deriveTokenBadge(tokenMint: PublicKey): PublicKey;
 
 declare const CP_AMM_PROGRAM_ID: PublicKey;
 declare const LIQUIDITY_SCALE = 128;
@@ -5982,7 +5981,6 @@ declare const SCALE_OFFSET = 64;
 declare const BASIS_POINT_MAX = 10000;
 declare const MAX_FEE_NUMERATOR = 500000000;
 declare const FEE_DENOMINATOR = 1000000000;
-declare const PRECISION = 1000000;
 declare const MIN_SQRT_PRICE: BN;
 declare const MAX_SQRT_PRICE: BN;
 declare const MIN_CU_BUFFER = 50000;
@@ -5996,7 +5994,6 @@ declare const getOrCreateATAInstruction: (connection: Connection, tokenMint: Pub
 }>;
 declare const wrapSOLInstruction: (from: PublicKey, to: PublicKey, amount: bigint) => TransactionInstruction[];
 declare const unwrapSOLInstruction: (owner: PublicKey, allowOwnerOffCurve?: boolean) => Promise<TransactionInstruction>;
-declare function getNftOwner(connection: Connection, nftMint: PublicKey): Promise<PublicKey>;
 declare function getAllUserPositionNftAccount(connection: Connection, user: PublicKey): Promise<Array<{
     positionNft: PublicKey;
     positionNftAccount: PublicKey;
@@ -6155,7 +6152,6 @@ declare const ONE: BN;
 declare function pow(base: BN, exp: BN): BN;
 
 declare function mulDiv(x: BN, y: BN, denominator: BN, rounding: Rounding): BN;
-declare function divCeil(a: BN, b: BN): BN;
 declare function q64ToDecimal(num: BN, decimalPlaces?: number): Decimal;
 declare function decimalToQ64(num: Decimal): BN;
 
@@ -12498,4 +12494,4 @@ var CpAmmIDL = {
 	types: types
 };
 
-export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildLiquidatePositionInstructionParams, 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, type DynamicFeeParams, 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 };
+export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildLiquidatePositionInstructionParams, 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, type DynamicFeeParams, 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, 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, deriveTokenBadgeAddress, deriveTokenVaultAddress, getAllUserPositionNftAccount, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getAvailableVestingLiquidity, getBaseFeeNumerator, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getOrCreateATAInstruction, getPriceFromSqrtPrice, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSqrtPriceFromPrice, getSwapAmount, getTokenDecimals, getTokenProgram, getTotalLockedLiquidity, getUnClaimReward, isVestingComplete, mulDiv, positionByPoolFilter, pow, q64ToDecimal, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };

package/dist/index.d.ts

@@ -5781,14 +5781,14 @@ declare class CpAmm {
      * @param params - Swap parameters including input amount, pool state, slippage, etc.
      * @returns Swap quote including expected output amount, fee, and price impact.
      */
-    getQuote(params: GetQuoteParams): Promise<{
+    getQuote(params: GetQuoteParams): {
         swapInAmount: BN;
         consumedInAmount: BN;
         swapOutAmount: BN;
         minSwapOutAmount: BN;
         totalFee: BN;
         priceImpact: number;
-    }>;
+    };
     /**
      * Calculates the deposit quote for liquidity pool.
      *
@@ -5799,7 +5799,7 @@ declare class CpAmm {
      * @returns {BN} returns.outputAmount - The calculated corresponding amount of the other token.
      * @returns {BN} returns.liquidityDelta - The amount of liquidity that will be added to the pool.
      */
-    getDepositQuote(params: GetDepositQuoteParams): Promise<DepositQuote>;
+    getDepositQuote(params: GetDepositQuoteParams): DepositQuote;
     /**
      * Calculates the withdrawal quote for removing liquidity from a concentrated liquidity pool.
      *
@@ -5813,7 +5813,7 @@ declare class CpAmm {
      * @returns {BN} returns.outAmountA - The calculated amount of token A to be received (after deducting transfer fees)
      * @returns {BN} returns.outAmountB - The calculated amount of token B to be received (after deducting transfer fees)
      */
-    getWithdrawQuote(params: GetWithdrawQuoteParams): Promise<WithdrawQuote>;
+    getWithdrawQuote(params: GetWithdrawQuoteParams): WithdrawQuote;
     /**
      * Calculates liquidity and corresponding token amounts for token A single-sided pool creation
      * Only supports initialization where initial price equals min sqrt price
@@ -5974,7 +5974,6 @@ declare function deriveCustomizablePoolAddress(tokenAMint: PublicKey, tokenBMint
 declare function deriveTokenBadgeAddress(tokenMint: PublicKey): PublicKey;
 declare function deriveClaimFeeOperatorAddress(operator: PublicKey): PublicKey;
 declare function derivePositionNftAccount(positionNftMint: PublicKey): PublicKey;
-declare function deriveTokenBadge(tokenMint: PublicKey): PublicKey;
 
 declare const CP_AMM_PROGRAM_ID: PublicKey;
 declare const LIQUIDITY_SCALE = 128;
@@ -5982,7 +5981,6 @@ declare const SCALE_OFFSET = 64;
 declare const BASIS_POINT_MAX = 10000;
 declare const MAX_FEE_NUMERATOR = 500000000;
 declare const FEE_DENOMINATOR = 1000000000;
-declare const PRECISION = 1000000;
 declare const MIN_SQRT_PRICE: BN;
 declare const MAX_SQRT_PRICE: BN;
 declare const MIN_CU_BUFFER = 50000;
@@ -5996,7 +5994,6 @@ declare const getOrCreateATAInstruction: (connection: Connection, tokenMint: Pub
 }>;
 declare const wrapSOLInstruction: (from: PublicKey, to: PublicKey, amount: bigint) => TransactionInstruction[];
 declare const unwrapSOLInstruction: (owner: PublicKey, allowOwnerOffCurve?: boolean) => Promise<TransactionInstruction>;
-declare function getNftOwner(connection: Connection, nftMint: PublicKey): Promise<PublicKey>;
 declare function getAllUserPositionNftAccount(connection: Connection, user: PublicKey): Promise<Array<{
     positionNft: PublicKey;
     positionNftAccount: PublicKey;
@@ -6155,7 +6152,6 @@ declare const ONE: BN;
 declare function pow(base: BN, exp: BN): BN;
 
 declare function mulDiv(x: BN, y: BN, denominator: BN, rounding: Rounding): BN;
-declare function divCeil(a: BN, b: BN): BN;
 declare function q64ToDecimal(num: BN, decimalPlaces?: number): Decimal;
 declare function decimalToQ64(num: Decimal): BN;
 
@@ -12498,4 +12494,4 @@ var CpAmmIDL = {
 	types: types
 };
 
-export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildLiquidatePositionInstructionParams, 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, type DynamicFeeParams, 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 };
+export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildLiquidatePositionInstructionParams, 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, type DynamicFeeParams, 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, 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, deriveTokenBadgeAddress, deriveTokenVaultAddress, getAllUserPositionNftAccount, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getAvailableVestingLiquidity, getBaseFeeNumerator, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getOrCreateATAInstruction, getPriceFromSqrtPrice, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSqrtPriceFromPrice, getSwapAmount, getTokenDecimals, getTokenProgram, getTotalLockedLiquidity, getUnClaimReward, isVestingComplete, mulDiv, positionByPoolFilter, pow, q64ToDecimal, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };

package/dist/index.js

@@ -6401,7 +6401,6 @@ var SCALE_OFFSET = 64;
 var BASIS_POINT_MAX = 1e4;
 var MAX_FEE_NUMERATOR = 5e8;
 var FEE_DENOMINATOR = 1e9;
-var PRECISION = 1e6;
 var MIN_SQRT_PRICE = new (0, _anchor.BN)("4295048016");
 var MAX_SQRT_PRICE = new (0, _anchor.BN)("79226673521066979257578248091");
 var MIN_CU_BUFFER = 5e4;
@@ -6493,12 +6492,6 @@ function derivePositionNftAccount(positionNftMint) {
     CP_AMM_PROGRAM_ID
   )[0];
 }
-function deriveTokenBadge(tokenMint) {
-  return _web3js.PublicKey.findProgramAddressSync(
-    [Buffer.from("token_badge"), tokenMint.toBuffer()],
-    CP_AMM_PROGRAM_ID
-  )[0];
-}
 
 // src/helpers/token.ts
 var _bytes = require('@coral-xyz/anchor/dist/cjs/utils/bytes');
@@ -6519,7 +6512,6 @@ var _bytes = require('@coral-xyz/anchor/dist/cjs/utils/bytes');
 
 
 
-
 function getTokenProgram(flag) {
   return flag == 0 ? _spltoken.TOKEN_PROGRAM_ID : _spltoken.TOKEN_2022_PROGRAM_ID;
 }
@@ -6590,16 +6582,6 @@ var unwrapSOLInstruction = (owner, allowOwnerOffCurve = true) => __async(void 0,
   }
   return null;
 });
-function getNftOwner(connection, nftMint) {
-  return __async(this, null, function* () {
-    const largesTokenAccount = yield connection.getTokenLargestAccounts(nftMint);
-    const accountInfo = yield connection.getParsedAccountInfo(
-      largesTokenAccount.value[0].address
-    );
-    const owner = new (0, _web3js.PublicKey)(accountInfo.value.data.parsed.info.owner);
-    return new (0, _web3js.PublicKey)(owner);
-  });
-}
 function getAllUserPositionNftAccount(connection, user) {
   return __async(this, null, function* () {
     const filters = [
@@ -6752,12 +6734,6 @@ function mulDiv(x, y, denominator, rounding) {
   }
   return div;
 }
-function divCeil(a, b) {
-  if (a.isZero()) {
-    return new (0, _anchor.BN)(0);
-  }
-  return a.add(b.sub(new (0, _anchor.BN)(1))).div(b);
-}
 function q64ToDecimal(num, decimalPlaces) {
   return new (0, _decimaljs2.default)(num.toString()).div(_decimaljs2.default.pow(2, 64)).toDecimalPlaces(decimalPlaces);
 }
@@ -6849,7 +6825,7 @@ function getFeeNumerator(currentPoint, activationPoint, numberOfPeriod, periodFr
       new (0, _anchor.BN)(binStep),
       new (0, _anchor.BN)(variableFeeControl)
     );
-    feeNumerator.add(dynamicFeeNumberator);
+    feeNumerator = feeNumerator.add(dynamicFeeNumberator);
   }
   return feeNumerator.gt(new (0, _anchor.BN)(MAX_FEE_NUMERATOR)) ? new (0, _anchor.BN)(MAX_FEE_NUMERATOR) : feeNumerator;
 }
@@ -7164,11 +7140,11 @@ function getAvailableVestingLiquidity(vestingData, currentPoint) {
     numberOfPeriod,
     totalReleasedLiquidity
   } = vestingData;
-  if (currentPoint < cliffPoint) {
+  if (currentPoint.lt(cliffPoint)) {
     return new (0, _anchor.BN)(0);
   }
   if (periodFrequency.isZero()) {
-    return cliffUnlockLiquidity.sub(totalReleasedLiquidity);
+    return cliffUnlockLiquidity;
   }
   let passedPeriod = new (0, _anchor.BN)(currentPoint).sub(cliffPoint).div(periodFrequency);
   passedPeriod = _bnjs.min.call(void 0, passedPeriod, new (0, _anchor.BN)(numberOfPeriod));
@@ -7246,12 +7222,12 @@ var CpAmm = class {
   getTokenBadgeAccounts(tokenAMint, tokenBMint) {
     return [
       {
-        pubkey: deriveTokenBadge(tokenAMint),
+        pubkey: deriveTokenBadgeAddress(tokenAMint),
         isWritable: false,
         isSigner: false
       },
       {
-        pubkey: deriveTokenBadge(tokenBMint),
+        pubkey: deriveTokenBadgeAddress(tokenBMint),
         isWritable: false,
         isSigner: false
       }
@@ -7706,87 +7682,85 @@ var CpAmm = class {
    * @returns Swap quote including expected output amount, fee, and price impact.
    */
   getQuote(params) {
-    return __async(this, null, function* () {
-      const {
+    const {
+      inAmount,
+      inputTokenMint,
+      slippage,
+      poolState,
+      currentTime,
+      currentSlot,
+      inputTokenInfo,
+      outputTokenInfo
+    } = params;
+    const {
+      sqrtPrice: sqrtPriceQ64,
+      liquidity: liquidityQ64,
+      activationType,
+      activationPoint,
+      collectFeeMode,
+      poolFees
+    } = poolState;
+    const {
+      feeSchedulerMode,
+      cliffFeeNumerator,
+      numberOfPeriod,
+      reductionFactor,
+      periodFrequency
+    } = poolFees.baseFee;
+    const dynamicFee = poolFees.dynamicFee;
+    let actualAmountIn = inAmount;
+    if (inputTokenInfo) {
+      actualAmountIn = calculateTransferFeeExcludedAmount(
         inAmount,
-        inputTokenMint,
-        slippage,
-        poolState,
-        currentTime,
-        currentSlot,
-        inputTokenInfo,
-        outputTokenInfo
-      } = params;
-      const {
-        sqrtPrice: sqrtPriceQ64,
-        liquidity: liquidityQ64,
-        activationType,
-        activationPoint,
-        collectFeeMode,
-        poolFees
-      } = poolState;
-      const {
-        feeSchedulerMode,
-        cliffFeeNumerator,
-        numberOfPeriod,
-        reductionFactor,
-        periodFrequency
-      } = poolFees.baseFee;
-      const dynamicFee = poolFees.dynamicFee;
-      let actualAmountIn = inAmount;
-      if (inputTokenInfo) {
-        actualAmountIn = calculateTransferFeeExcludedAmount(
-          inAmount,
-          inputTokenInfo.mint,
-          inputTokenInfo.currentEpoch
-        ).amount;
-      }
-      const aToB = poolState.tokenAMint.equals(inputTokenMint);
-      const currentPoint = activationType ? currentTime : currentSlot;
-      let dynamicFeeParams;
-      if (dynamicFee.initialized) {
-        const { volatilityAccumulator, binStep, variableFeeControl } = dynamicFee;
-        dynamicFeeParams = { volatilityAccumulator, binStep, variableFeeControl };
-      }
-      const tradeFeeNumerator = getFeeNumerator(
-        currentPoint,
-        activationPoint,
-        numberOfPeriod,
-        periodFrequency,
-        feeSchedulerMode,
-        cliffFeeNumerator,
-        reductionFactor,
-        dynamicFeeParams
-      );
-      const { amountOut, totalFee } = getSwapAmount(
-        actualAmountIn,
-        sqrtPriceQ64,
-        liquidityQ64,
-        tradeFeeNumerator,
-        aToB,
-        collectFeeMode
-      );
-      let actualAmountOut = amountOut;
-      if (outputTokenInfo) {
-        actualAmountOut = calculateTransferFeeExcludedAmount(
-          amountOut,
-          outputTokenInfo.mint,
-          outputTokenInfo.currentEpoch
-        ).amount;
-      }
-      const minSwapOutAmount = getMinAmountWithSlippage(
-        actualAmountOut,
-        slippage
-      );
-      return {
-        swapInAmount: inAmount,
-        consumedInAmount: actualAmountIn,
-        swapOutAmount: actualAmountOut,
-        minSwapOutAmount,
-        totalFee,
-        priceImpact: getPriceImpact(minSwapOutAmount, actualAmountOut)
-      };
-    });
+        inputTokenInfo.mint,
+        inputTokenInfo.currentEpoch
+      ).amount;
+    }
+    const aToB = poolState.tokenAMint.equals(inputTokenMint);
+    const currentPoint = activationType ? currentTime : currentSlot;
+    let dynamicFeeParams;
+    if (dynamicFee.initialized) {
+      const { volatilityAccumulator, binStep, variableFeeControl } = dynamicFee;
+      dynamicFeeParams = { volatilityAccumulator, binStep, variableFeeControl };
+    }
+    const tradeFeeNumerator = getFeeNumerator(
+      currentPoint,
+      activationPoint,
+      numberOfPeriod,
+      periodFrequency,
+      feeSchedulerMode,
+      cliffFeeNumerator,
+      reductionFactor,
+      dynamicFeeParams
+    );
+    const { amountOut, totalFee } = getSwapAmount(
+      actualAmountIn,
+      sqrtPriceQ64,
+      liquidityQ64,
+      tradeFeeNumerator,
+      aToB,
+      collectFeeMode
+    );
+    let actualAmountOut = amountOut;
+    if (outputTokenInfo) {
+      actualAmountOut = calculateTransferFeeExcludedAmount(
+        amountOut,
+        outputTokenInfo.mint,
+        outputTokenInfo.currentEpoch
+      ).amount;
+    }
+    const minSwapOutAmount = getMinAmountWithSlippage(
+      actualAmountOut,
+      slippage
+    );
+    return {
+      swapInAmount: inAmount,
+      consumedInAmount: actualAmountIn,
+      swapOutAmount: actualAmountOut,
+      minSwapOutAmount,
+      totalFee,
+      priceImpact: getPriceImpact(minSwapOutAmount, actualAmountOut)
+    };
   }
   /**
    * Calculates the deposit quote for liquidity pool.
@@ -7799,61 +7773,59 @@ var CpAmm = class {
    * @returns {BN} returns.liquidityDelta - The amount of liquidity that will be added to the pool.
    */
   getDepositQuote(params) {
-    return __async(this, null, function* () {
-      const {
+    const {
+      inAmount,
+      isTokenA,
+      inputTokenInfo,
+      outputTokenInfo,
+      minSqrtPrice,
+      maxSqrtPrice,
+      sqrtPrice
+    } = params;
+    const actualAmountIn = inputTokenInfo ? inAmount.sub(
+      calculateTransferFeeIncludedAmount(
         inAmount,
-        isTokenA,
-        inputTokenInfo,
-        outputTokenInfo,
+        inputTokenInfo.mint,
+        inputTokenInfo.currentEpoch
+      ).transferFee
+    ) : inAmount;
+    const { liquidityDelta, rawAmount } = isTokenA ? {
+      liquidityDelta: getLiquidityDeltaFromAmountA(
+        actualAmountIn,
+        sqrtPrice,
+        maxSqrtPrice
+      ),
+      rawAmount: (delta) => getAmountBFromLiquidityDelta(
+        delta,
+        sqrtPrice,
+        minSqrtPrice,
+        0 /* Up */
+      )
+    } : {
+      liquidityDelta: getLiquidityDeltaFromAmountB(
+        actualAmountIn,
         minSqrtPrice,
-        maxSqrtPrice,
         sqrtPrice
-      } = params;
-      const actualAmountIn = inputTokenInfo ? inAmount.sub(
-        calculateTransferFeeIncludedAmount(
-          inAmount,
-          inputTokenInfo.mint,
-          inputTokenInfo.currentEpoch
-        ).transferFee
-      ) : inAmount;
-      const { liquidityDelta, rawAmount } = isTokenA ? {
-        liquidityDelta: getLiquidityDeltaFromAmountA(
-          actualAmountIn,
-          sqrtPrice,
-          maxSqrtPrice
-        ),
-        rawAmount: (delta) => getAmountBFromLiquidityDelta(
-          delta,
-          sqrtPrice,
-          minSqrtPrice,
-          0 /* Up */
-        )
-      } : {
-        liquidityDelta: getLiquidityDeltaFromAmountB(
-          actualAmountIn,
-          minSqrtPrice,
-          sqrtPrice
-        ),
-        rawAmount: (delta) => getAmountAFromLiquidityDelta(
-          delta,
-          sqrtPrice,
-          maxSqrtPrice,
-          0 /* Up */
-        )
-      };
-      const rawOutputAmount = new (0, _anchor.BN)(rawAmount(liquidityDelta));
-      const outputAmount = outputTokenInfo ? calculateTransferFeeIncludedAmount(
-        rawOutputAmount,
-        outputTokenInfo.mint,
-        outputTokenInfo.currentEpoch
-      ).amount : rawOutputAmount;
-      return {
-        actualInputAmount: actualAmountIn,
-        consumedInputAmount: inAmount,
-        liquidityDelta,
-        outputAmount
-      };
-    });
+      ),
+      rawAmount: (delta) => getAmountAFromLiquidityDelta(
+        delta,
+        sqrtPrice,
+        maxSqrtPrice,
+        0 /* Up */
+      )
+    };
+    const rawOutputAmount = new (0, _anchor.BN)(rawAmount(liquidityDelta));
+    const outputAmount = outputTokenInfo ? calculateTransferFeeIncludedAmount(
+      rawOutputAmount,
+      outputTokenInfo.mint,
+      outputTokenInfo.currentEpoch
+    ).amount : rawOutputAmount;
+    return {
+      actualInputAmount: actualAmountIn,
+      consumedInputAmount: inAmount,
+      liquidityDelta,
+      outputAmount
+    };
   }
   /**
    * Calculates the withdrawal quote for removing liquidity from a concentrated liquidity pool.
@@ -7869,41 +7841,39 @@ var CpAmm = class {
    * @returns {BN} returns.outAmountB - The calculated amount of token B to be received (after deducting transfer fees)
    */
   getWithdrawQuote(params) {
-    return __async(this, null, function* () {
-      const {
-        liquidityDelta,
-        sqrtPrice,
-        maxSqrtPrice,
-        minSqrtPrice,
-        tokenATokenInfo,
-        tokenBTokenInfo
-      } = params;
-      const amountA = getAmountAFromLiquidityDelta(
-        liquidityDelta,
-        sqrtPrice,
-        maxSqrtPrice,
-        1 /* Down */
-      );
-      const amountB = getAmountBFromLiquidityDelta(
-        liquidityDelta,
-        sqrtPrice,
-        minSqrtPrice,
-        1 /* Down */
-      );
-      return {
-        liquidityDelta,
-        outAmountA: tokenATokenInfo ? calculateTransferFeeExcludedAmount(
-          amountA,
-          tokenATokenInfo.mint,
-          tokenATokenInfo.currentEpoch
-        ).amount : amountA,
-        outAmountB: tokenBTokenInfo ? calculateTransferFeeExcludedAmount(
-          amountB,
-          tokenBTokenInfo.mint,
-          tokenBTokenInfo.currentEpoch
-        ).amount : amountB
-      };
-    });
+    const {
+      liquidityDelta,
+      sqrtPrice,
+      maxSqrtPrice,
+      minSqrtPrice,
+      tokenATokenInfo,
+      tokenBTokenInfo
+    } = params;
+    const amountA = getAmountAFromLiquidityDelta(
+      liquidityDelta,
+      sqrtPrice,
+      maxSqrtPrice,
+      1 /* Down */
+    );
+    const amountB = getAmountBFromLiquidityDelta(
+      liquidityDelta,
+      sqrtPrice,
+      minSqrtPrice,
+      1 /* Down */
+    );
+    return {
+      liquidityDelta,
+      outAmountA: tokenATokenInfo ? calculateTransferFeeExcludedAmount(
+        amountA,
+        tokenATokenInfo.mint,
+        tokenATokenInfo.currentEpoch
+      ).amount : amountA,
+      outAmountB: tokenBTokenInfo ? calculateTransferFeeExcludedAmount(
+        amountB,
+        tokenBTokenInfo.mint,
+        tokenBTokenInfo.currentEpoch
+      ).amount : amountB
+    };
   }
   /**
    * Calculates liquidity and corresponding token amounts for token A single-sided pool creation
@@ -9124,9 +9094,5 @@ 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.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;
+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.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.deriveTokenBadgeAddress = deriveTokenBadgeAddress; exports.deriveTokenVaultAddress = deriveTokenVaultAddress; 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.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