@meteora-ag/cp-amm-sdk 1.0.1-rc.20 → 1.0.1-rc.22

package/dist/index.d.mts

@@ -6629,6 +6629,7 @@ declare function derivePositionNftAccount(positionNftMint: PublicKey, programId:
 declare function deriveEventAuthority(programId: PublicKey): [PublicKey, number];
 
 declare const CP_AMM_PROGRAM_ID: PublicKey;
+declare const LIQUIDITY_SCALE = 128;
 declare const SCALE_OFFSET = 64;
 declare const BASIS_POINT_MAX = 10000;
 declare const MAX_FEE_NUMERATOR = 500000000;
@@ -6650,7 +6651,31 @@ declare const unwrapSOLInstruction: (owner: PublicKey, allowOwnerOffCurve?: bool
 declare function getNftOwner(connection: Connection, nftMint: PublicKey): Promise<PublicKey>;
 
 declare function getBaseFeeNumerator(feeSchedulerMode: FeeSchedulerMode, cliffFeeNumerator: BN, period: BN, reductionFactor: BN): BN;
+/**
+ * Calculates the dynamic fee numerator based on market volatility metrics
+ *
+ * @param volatilityAccumulator - A measure of accumulated market volatility (BN)
+ * @param binStep - The size of price bins in the liquidity distribution (BN)
+ * @param variableFeeControl - Parameter controlling the impact of volatility on fees (BN)
+ * @returns The calculated dynamic fee numerator (BN)
+ */
 declare function getDynamicFeeNumerator(volatilityAccumulator: BN, binStep: BN, variableFeeControl: BN): BN;
+/**
+ * Calculates the fee numerator based on current market conditions and fee schedule configuration
+ *
+ * @param currentPoint - The current price point in the liquidity curve
+ * @param activationPoint - The price point at which the fee schedule is activated (BN)
+ * @param numberOfPeriod - The total number of periods in the fee schedule
+ * @param periodFrequency - The frequency at which periods change (BN)
+ * @param feeSchedulerMode - The mode determining how fees are calculated (0 = constant, 1 = linear, etc.)
+ * @param cliffFeeNumerator - The initial fee numerator at the cliff point (BN)
+ * @param reductionFactor - The factor by which fees are reduced in each period (BN)
+ * @param dynamicFeeParams - Optional parameters for dynamic fee calculation
+ * @param dynamicFeeParams.volatilityAccumulator - Measure of accumulated market volatility (BN)
+ * @param dynamicFeeParams.binStep - Size of price bins in the liquidity distribution (BN)
+ * @param dynamicFeeParams.variableFeeControl - Parameter controlling the impact of volatility (BN)
+ * @returns The calculated fee numerator (BN), capped at MAX_FEE_NUMERATOR
+ */
 declare function getFeeNumerator(currentPoint: number, activationPoint: BN, numberOfPeriod: number, periodFrequency: BN, feeSchedulerMode: number, cliffFeeNumerator: BN, reductionFactor: BN, dynamicFeeParams?: {
     volatilityAccumulator: BN;
     binStep: BN;
@@ -6731,7 +6756,7 @@ declare const getMinAmountWithSlippage: (amount: BN, rate: number) => BN;
  */
 declare const getPriceImpact: (actualAmount: BN, idealAmount: BN) => number;
 declare const getCurrentPrice: (sqrtPrice: BN, tokenADecimal: number, tokenBDecimal: number) => string;
-declare const getUnClaimReward: (positionState: PositionState) => {
+declare const getUnClaimReward: (poolState: PoolState, positionState: PositionState) => {
     feeTokenA: BN;
     feeTokenB: BN;
     rewards: BN[];
@@ -12911,4 +12936,4 @@ var CpAmmIDL = {
 	types: types
 };
 
-export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeParams, type ClaimRewardParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetQuoteParams, type InitializeCustomizeablePoolParams, type InitializeRewardParams, type LiquidityDeltaParams, type LockPositionParams, MAX_CU_BUFFER, MAX_FEE_NUMERATOR, MAX_SQRT_PRICE, MIN_CU_BUFFER, MIN_SQRT_PRICE, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparedPoolCreation, type RefreshVestingParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, calculateInitSqrtPrice, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, deriveEventAuthority, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getBaseFeeNumerator, getCurrentPrice, getDeltaAmountA, getDeltaAmountB, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSwapAmount, getTokenDecimals, getTokenProgram, getUnClaimReward, mulDiv, mulShr, positionByPoolFilter, pow, q64ToDecimal, shlDiv, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };
+export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeParams, type ClaimRewardParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetQuoteParams, 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, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparedPoolCreation, type RefreshVestingParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, calculateInitSqrtPrice, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, deriveEventAuthority, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getBaseFeeNumerator, getCurrentPrice, getDeltaAmountA, getDeltaAmountB, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSwapAmount, getTokenDecimals, getTokenProgram, getUnClaimReward, mulDiv, mulShr, positionByPoolFilter, pow, q64ToDecimal, shlDiv, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };

package/dist/index.d.ts

@@ -6629,6 +6629,7 @@ declare function derivePositionNftAccount(positionNftMint: PublicKey, programId:
 declare function deriveEventAuthority(programId: PublicKey): [PublicKey, number];
 
 declare const CP_AMM_PROGRAM_ID: PublicKey;
+declare const LIQUIDITY_SCALE = 128;
 declare const SCALE_OFFSET = 64;
 declare const BASIS_POINT_MAX = 10000;
 declare const MAX_FEE_NUMERATOR = 500000000;
@@ -6650,7 +6651,31 @@ declare const unwrapSOLInstruction: (owner: PublicKey, allowOwnerOffCurve?: bool
 declare function getNftOwner(connection: Connection, nftMint: PublicKey): Promise<PublicKey>;
 
 declare function getBaseFeeNumerator(feeSchedulerMode: FeeSchedulerMode, cliffFeeNumerator: BN, period: BN, reductionFactor: BN): BN;
+/**
+ * Calculates the dynamic fee numerator based on market volatility metrics
+ *
+ * @param volatilityAccumulator - A measure of accumulated market volatility (BN)
+ * @param binStep - The size of price bins in the liquidity distribution (BN)
+ * @param variableFeeControl - Parameter controlling the impact of volatility on fees (BN)
+ * @returns The calculated dynamic fee numerator (BN)
+ */
 declare function getDynamicFeeNumerator(volatilityAccumulator: BN, binStep: BN, variableFeeControl: BN): BN;
+/**
+ * Calculates the fee numerator based on current market conditions and fee schedule configuration
+ *
+ * @param currentPoint - The current price point in the liquidity curve
+ * @param activationPoint - The price point at which the fee schedule is activated (BN)
+ * @param numberOfPeriod - The total number of periods in the fee schedule
+ * @param periodFrequency - The frequency at which periods change (BN)
+ * @param feeSchedulerMode - The mode determining how fees are calculated (0 = constant, 1 = linear, etc.)
+ * @param cliffFeeNumerator - The initial fee numerator at the cliff point (BN)
+ * @param reductionFactor - The factor by which fees are reduced in each period (BN)
+ * @param dynamicFeeParams - Optional parameters for dynamic fee calculation
+ * @param dynamicFeeParams.volatilityAccumulator - Measure of accumulated market volatility (BN)
+ * @param dynamicFeeParams.binStep - Size of price bins in the liquidity distribution (BN)
+ * @param dynamicFeeParams.variableFeeControl - Parameter controlling the impact of volatility (BN)
+ * @returns The calculated fee numerator (BN), capped at MAX_FEE_NUMERATOR
+ */
 declare function getFeeNumerator(currentPoint: number, activationPoint: BN, numberOfPeriod: number, periodFrequency: BN, feeSchedulerMode: number, cliffFeeNumerator: BN, reductionFactor: BN, dynamicFeeParams?: {
     volatilityAccumulator: BN;
     binStep: BN;
@@ -6731,7 +6756,7 @@ declare const getMinAmountWithSlippage: (amount: BN, rate: number) => BN;
  */
 declare const getPriceImpact: (actualAmount: BN, idealAmount: BN) => number;
 declare const getCurrentPrice: (sqrtPrice: BN, tokenADecimal: number, tokenBDecimal: number) => string;
-declare const getUnClaimReward: (positionState: PositionState) => {
+declare const getUnClaimReward: (poolState: PoolState, positionState: PositionState) => {
     feeTokenA: BN;
     feeTokenB: BN;
     rewards: BN[];
@@ -12911,4 +12936,4 @@ var CpAmmIDL = {
 	types: types
 };
 
-export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeParams, type ClaimRewardParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetQuoteParams, type InitializeCustomizeablePoolParams, type InitializeRewardParams, type LiquidityDeltaParams, type LockPositionParams, MAX_CU_BUFFER, MAX_FEE_NUMERATOR, MAX_SQRT_PRICE, MIN_CU_BUFFER, MIN_SQRT_PRICE, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparedPoolCreation, type RefreshVestingParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, calculateInitSqrtPrice, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, deriveEventAuthority, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getBaseFeeNumerator, getCurrentPrice, getDeltaAmountA, getDeltaAmountB, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSwapAmount, getTokenDecimals, getTokenProgram, getUnClaimReward, mulDiv, mulShr, positionByPoolFilter, pow, q64ToDecimal, shlDiv, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };
+export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeParams, type ClaimRewardParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetQuoteParams, 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, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparedPoolCreation, type RefreshVestingParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, calculateInitSqrtPrice, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, deriveEventAuthority, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getBaseFeeNumerator, getCurrentPrice, getDeltaAmountA, getDeltaAmountB, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSwapAmount, getTokenDecimals, getTokenProgram, getUnClaimReward, mulDiv, mulShr, positionByPoolFilter, pow, q64ToDecimal, shlDiv, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };

package/dist/index.js

@@ -6181,6 +6181,7 @@ var _web3js = require('@solana/web3.js');
 var CP_AMM_PROGRAM_ID = new (0, _web3js.PublicKey)(
   "cpamdpZCGKUy5JxQXB4dcpGPiikHawvSWAd6mEn1sGG"
 );
+var LIQUIDITY_SCALE = 128;
 var SCALE_OFFSET = 64;
 var BASIS_POINT_MAX = 1e4;
 var MAX_FEE_NUMERATOR = 5e8;
@@ -6285,6 +6286,140 @@ function deriveEventAuthority(programId) {
   );
 }
 
+// src/helpers/token.ts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+function getTokenProgram(flag) {
+  return flag == 0 ? _spltoken.TOKEN_PROGRAM_ID : _spltoken.TOKEN_2022_PROGRAM_ID;
+}
+var getTokenDecimals = (connection, mint) => __async(void 0, null, function* () {
+  return (yield _spltoken.getMint.call(void 0, connection, mint)).decimals;
+});
+var getOrCreateATAInstruction = (_0, _1, _2, ..._3) => __async(void 0, [_0, _1, _2, ..._3], function* (connection, tokenMint, owner, payer = owner, allowOwnerOffCurve = true, tokenProgram) {
+  const toAccount = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
+    tokenMint,
+    owner,
+    allowOwnerOffCurve,
+    tokenProgram
+  );
+  try {
+    yield _spltoken.getAccount.call(void 0, connection, toAccount);
+    return { ataPubkey: toAccount, ix: void 0 };
+  } catch (e) {
+    if (e instanceof _spltoken.TokenAccountNotFoundError || e instanceof _spltoken.TokenInvalidAccountOwnerError) {
+      const ix = _spltoken.createAssociatedTokenAccountIdempotentInstruction.call(void 0, 
+        payer,
+        toAccount,
+        owner,
+        tokenMint,
+        tokenProgram
+      );
+      return { ataPubkey: toAccount, ix };
+    } else {
+      console.error("Error::getOrCreateATAInstruction", e);
+      throw e;
+    }
+  }
+});
+var wrapSOLInstruction = (from, to, amount) => {
+  return [
+    _web3js.SystemProgram.transfer({
+      fromPubkey: from,
+      toPubkey: to,
+      lamports: amount
+    }),
+    new (0, _web3js.TransactionInstruction)({
+      keys: [
+        {
+          pubkey: to,
+          isSigner: false,
+          isWritable: true
+        }
+      ],
+      data: Buffer.from(new Uint8Array([17])),
+      programId: _spltoken.TOKEN_PROGRAM_ID
+    })
+  ];
+};
+var unwrapSOLInstruction = (owner, allowOwnerOffCurve = true) => __async(void 0, null, function* () {
+  const wSolATAAccount = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
+    _spltoken.NATIVE_MINT,
+    owner,
+    allowOwnerOffCurve
+  );
+  if (wSolATAAccount) {
+    const closedWrappedSolInstruction = _spltoken.createCloseAccountInstruction.call(void 0, 
+      wSolATAAccount,
+      owner,
+      owner,
+      [],
+      _spltoken.TOKEN_PROGRAM_ID
+    );
+    return closedWrappedSolInstruction;
+  }
+  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);
+  });
+}
+
+// src/helpers/fee.ts
+
+
+// src/types.ts
+var Rounding = /* @__PURE__ */ ((Rounding2) => {
+  Rounding2[Rounding2["Up"] = 0] = "Up";
+  Rounding2[Rounding2["Down"] = 1] = "Down";
+  return Rounding2;
+})(Rounding || {});
+var ActivationPoint = /* @__PURE__ */ ((ActivationPoint2) => {
+  ActivationPoint2[ActivationPoint2["Timestamp"] = 0] = "Timestamp";
+  ActivationPoint2[ActivationPoint2["Slot"] = 1] = "Slot";
+  return ActivationPoint2;
+})(ActivationPoint || {});
+var FeeSchedulerMode = /* @__PURE__ */ ((FeeSchedulerMode2) => {
+  FeeSchedulerMode2[FeeSchedulerMode2["Linear"] = 0] = "Linear";
+  FeeSchedulerMode2[FeeSchedulerMode2["Exponential"] = 1] = "Exponential";
+  return FeeSchedulerMode2;
+})(FeeSchedulerMode || {});
+var CollectFeeMode = /* @__PURE__ */ ((CollectFeeMode3) => {
+  CollectFeeMode3[CollectFeeMode3["BothToken"] = 0] = "BothToken";
+  CollectFeeMode3[CollectFeeMode3["OnlyB"] = 1] = "OnlyB";
+  return CollectFeeMode3;
+})(CollectFeeMode || {});
+var TradeDirection = /* @__PURE__ */ ((TradeDirection2) => {
+  TradeDirection2[TradeDirection2["AtoB"] = 0] = "AtoB";
+  TradeDirection2[TradeDirection2["BtoA"] = 1] = "BtoA";
+  return TradeDirection2;
+})(TradeDirection || {});
+var ActivationType = /* @__PURE__ */ ((ActivationType2) => {
+  ActivationType2[ActivationType2["Slot"] = 0] = "Slot";
+  ActivationType2[ActivationType2["Timestamp"] = 1] = "Timestamp";
+  return ActivationType2;
+})(ActivationType || {});
+
 // src/math/feeMath.ts
 
 var MAX_EXPONENTIAL = new (0, _anchor.BN)(524288);
@@ -6392,40 +6527,6 @@ function pow(base, exp) {
 // src/math/mathUtils.ts
 
 var _decimaljs = require('decimal.js'); var _decimaljs2 = _interopRequireDefault(_decimaljs);
-
-// src/types.ts
-var Rounding = /* @__PURE__ */ ((Rounding2) => {
-  Rounding2[Rounding2["Up"] = 0] = "Up";
-  Rounding2[Rounding2["Down"] = 1] = "Down";
-  return Rounding2;
-})(Rounding || {});
-var ActivationPoint = /* @__PURE__ */ ((ActivationPoint2) => {
-  ActivationPoint2[ActivationPoint2["Timestamp"] = 0] = "Timestamp";
-  ActivationPoint2[ActivationPoint2["Slot"] = 1] = "Slot";
-  return ActivationPoint2;
-})(ActivationPoint || {});
-var FeeSchedulerMode = /* @__PURE__ */ ((FeeSchedulerMode2) => {
-  FeeSchedulerMode2[FeeSchedulerMode2["Linear"] = 0] = "Linear";
-  FeeSchedulerMode2[FeeSchedulerMode2["Exponential"] = 1] = "Exponential";
-  return FeeSchedulerMode2;
-})(FeeSchedulerMode || {});
-var CollectFeeMode = /* @__PURE__ */ ((CollectFeeMode3) => {
-  CollectFeeMode3[CollectFeeMode3["BothToken"] = 0] = "BothToken";
-  CollectFeeMode3[CollectFeeMode3["OnlyB"] = 1] = "OnlyB";
-  return CollectFeeMode3;
-})(CollectFeeMode || {});
-var TradeDirection = /* @__PURE__ */ ((TradeDirection3) => {
-  TradeDirection3[TradeDirection3["AtoB"] = 0] = "AtoB";
-  TradeDirection3[TradeDirection3["BtoA"] = 1] = "BtoA";
-  return TradeDirection3;
-})(TradeDirection || {});
-var ActivationType = /* @__PURE__ */ ((ActivationType2) => {
-  ActivationType2[ActivationType2["Slot"] = 0] = "Slot";
-  ActivationType2[ActivationType2["Timestamp"] = 1] = "Timestamp";
-  return ActivationType2;
-})(ActivationType || {});
-
-// src/math/mathUtils.ts
 function mulShr(x, y, offset, rounding) {
   const denominator = new (0, _anchor.BN)(1).shln(offset);
   return mulDiv(x, y, denominator, rounding);
@@ -6454,138 +6555,6 @@ function decimalToQ64(num) {
   return new (0, _anchor.BN)(num.mul(_decimaljs2.default.pow(2, 64)).floor().toFixed());
 }
 
-// src/helpers/priceMath.ts
-
-
-function calculateInitSqrtPrice(tokenAAmount, tokenBAmount, minSqrtPrice, maxSqrtPrice) {
-  if (tokenAAmount.isZero() || tokenBAmount.isZero()) {
-    throw new Error("Amount cannot be zero");
-  }
-  const amountADecimal = new (0, _decimaljs2.default)(tokenAAmount.toString());
-  const amountBDecimal = new (0, _decimaljs2.default)(tokenBAmount.toString());
-  const minSqrtPriceDecimal = new (0, _decimaljs2.default)(minSqrtPrice.toString()).div(
-    _decimaljs2.default.pow(2, 64)
-  );
-  const maxSqrtPriceDecimal = new (0, _decimaljs2.default)(maxSqrtPrice.toString()).div(
-    _decimaljs2.default.pow(2, 64)
-  );
-  const x = new (0, _decimaljs2.default)(1).div(maxSqrtPriceDecimal);
-  const y = amountBDecimal.div(amountADecimal);
-  const xy = x.mul(y);
-  const paMinusXY = minSqrtPriceDecimal.sub(xy);
-  const xyMinusPa = xy.sub(minSqrtPriceDecimal);
-  const fourY = new (0, _decimaljs2.default)(4).mul(y);
-  const discriminant = xyMinusPa.mul(xyMinusPa).add(fourY);
-  if (discriminant.isNeg()) {
-    throw new Error("Calculate sqrt price failed: negative discriminant");
-  }
-  const sqrtDiscriminant = discriminant.sqrt();
-  const result = paMinusXY.add(sqrtDiscriminant).div(new (0, _decimaljs2.default)(2)).mul(_decimaljs2.default.pow(2, 64));
-  return new (0, _anchor.BN)(result.floor().toFixed());
-}
-
-// src/helpers/token.ts
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-function getTokenProgram(flag) {
-  return flag == 0 ? _spltoken.TOKEN_PROGRAM_ID : _spltoken.TOKEN_2022_PROGRAM_ID;
-}
-var getTokenDecimals = (connection, mint) => __async(void 0, null, function* () {
-  return (yield _spltoken.getMint.call(void 0, connection, mint)).decimals;
-});
-var getOrCreateATAInstruction = (_0, _1, _2, ..._3) => __async(void 0, [_0, _1, _2, ..._3], function* (connection, tokenMint, owner, payer = owner, allowOwnerOffCurve = true, tokenProgram) {
-  const toAccount = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
-    tokenMint,
-    owner,
-    allowOwnerOffCurve,
-    tokenProgram
-  );
-  try {
-    yield _spltoken.getAccount.call(void 0, connection, toAccount);
-    return { ataPubkey: toAccount, ix: void 0 };
-  } catch (e) {
-    if (e instanceof _spltoken.TokenAccountNotFoundError || e instanceof _spltoken.TokenInvalidAccountOwnerError) {
-      const ix = _spltoken.createAssociatedTokenAccountIdempotentInstruction.call(void 0, 
-        payer,
-        toAccount,
-        owner,
-        tokenMint,
-        tokenProgram
-      );
-      return { ataPubkey: toAccount, ix };
-    } else {
-      console.error("Error::getOrCreateATAInstruction", e);
-      throw e;
-    }
-  }
-});
-var wrapSOLInstruction = (from, to, amount) => {
-  return [
-    _web3js.SystemProgram.transfer({
-      fromPubkey: from,
-      toPubkey: to,
-      lamports: amount
-    }),
-    new (0, _web3js.TransactionInstruction)({
-      keys: [
-        {
-          pubkey: to,
-          isSigner: false,
-          isWritable: true
-        }
-      ],
-      data: Buffer.from(new Uint8Array([17])),
-      programId: _spltoken.TOKEN_PROGRAM_ID
-    })
-  ];
-};
-var unwrapSOLInstruction = (owner, allowOwnerOffCurve = true) => __async(void 0, null, function* () {
-  const wSolATAAccount = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
-    _spltoken.NATIVE_MINT,
-    owner,
-    allowOwnerOffCurve
-  );
-  if (wSolATAAccount) {
-    const closedWrappedSolInstruction = _spltoken.createCloseAccountInstruction.call(void 0, 
-      wSolATAAccount,
-      owner,
-      owner,
-      [],
-      _spltoken.TOKEN_PROGRAM_ID
-    );
-    return closedWrappedSolInstruction;
-  }
-  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);
-  });
-}
-
-// src/helpers/fee.ts
-
-
 // src/helpers/curve.ts
 
 
@@ -6835,10 +6804,19 @@ var getCurrentPrice = (sqrtPrice, tokenADecimal, tokenBDecimal) => {
   const price = decimalSqrtPrice.mul(decimalSqrtPrice).mul(new (0, _decimaljs2.default)(__pow(10, tokenADecimal - tokenBDecimal))).div(_decimaljs2.default.pow(2, 128)).toString();
   return price;
 };
-var getUnClaimReward = (positionState) => {
+var getUnClaimReward = (poolState, positionState) => {
+  const totalPositionLiquidity = positionState.unlockedLiquidity.add(positionState.vestedLiquidity).add(positionState.permanentLockedLiquidity);
+  const feeAPerTokenStored = new (0, _anchor.BN)(
+    Buffer.from(poolState.feeAPerLiquidity).reverse()
+  ).sub(new (0, _anchor.BN)(Buffer.from(positionState.feeAPerTokenCheckpoint).reverse()));
+  const feeBPerTokenStored = new (0, _anchor.BN)(
+    Buffer.from(poolState.feeBPerLiquidity).reverse()
+  ).sub(new (0, _anchor.BN)(Buffer.from(positionState.feeBPerTokenCheckpoint).reverse()));
+  const feeA = totalPositionLiquidity.mul(feeAPerTokenStored).shrn(LIQUIDITY_SCALE);
+  const feeB = totalPositionLiquidity.mul(feeBPerTokenStored).shrn(LIQUIDITY_SCALE);
   return {
-    feeTokenA: positionState.feeAPending,
-    feeTokenB: positionState.feeBPending,
+    feeTokenA: positionState.feeAPending.add(feeA),
+    feeTokenB: positionState.feeBPending.add(feeB),
     rewards: positionState.rewardInfos.length > 0 ? positionState.rewardInfos.map((item) => item.rewardPendings) : []
   };
 };
@@ -6861,6 +6839,33 @@ var vestingByPositionFilter = (position) => {
   };
 };
 
+// src/helpers/priceMath.ts
+
+
+function calculateInitSqrtPrice(tokenAAmount, tokenBAmount, minSqrtPrice, maxSqrtPrice) {
+  if (tokenAAmount.isZero() || tokenBAmount.isZero()) {
+    throw new Error("Amount cannot be zero");
+  }
+  const amountADecimal = new (0, _decimaljs2.default)(tokenAAmount.toString());
+  const amountBDecimal = new (0, _decimaljs2.default)(tokenBAmount.toString());
+  const minSqrtPriceDecimal = new (0, _decimaljs2.default)(minSqrtPrice.toString()).div(
+    _decimaljs2.default.pow(2, 64)
+  );
+  const maxSqrtPriceDecimal = new (0, _decimaljs2.default)(maxSqrtPrice.toString()).div(
+    _decimaljs2.default.pow(2, 64)
+  );
+  const x = new (0, _decimaljs2.default)(1).div(maxSqrtPriceDecimal);
+  const y = amountBDecimal.div(amountADecimal);
+  const xy = x.mul(y);
+  const paMinusXY = minSqrtPriceDecimal.sub(xy);
+  const xyMinusPa = xy.sub(minSqrtPriceDecimal);
+  const fourY = new (0, _decimaljs2.default)(4).mul(y);
+  const discriminant = xyMinusPa.mul(xyMinusPa).add(fourY);
+  const sqrtDiscriminant = discriminant.sqrt();
+  const result = paMinusXY.add(sqrtDiscriminant).div(new (0, _decimaljs2.default)(2)).mul(_decimaljs2.default.pow(2, 64));
+  return new (0, _anchor.BN)(result.floor().toFixed());
+}
+
 // src/CpAmm.ts
 var CpAmm = class {
   constructor(connection) {
@@ -8173,5 +8178,6 @@ 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.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.decimalToQ64 = decimalToQ64; exports.default = index_default; exports.deriveClaimFeeOperatorAddress = deriveClaimFeeOperatorAddress; exports.deriveConfigAddress = deriveConfigAddress; exports.deriveCustomizablePoolAddress = deriveCustomizablePoolAddress; exports.deriveEventAuthority = deriveEventAuthority; exports.derivePoolAddress = derivePoolAddress; exports.derivePoolAuthority = derivePoolAuthority; exports.derivePositionAddress = derivePositionAddress; exports.derivePositionNftAccount = derivePositionNftAccount; exports.deriveRewardVaultAddress = deriveRewardVaultAddress; exports.deriveTokenBadgeAddress = deriveTokenBadgeAddress; exports.deriveTokenVaultAddress = deriveTokenVaultAddress; exports.divCeil = divCeil; exports.getAmountAFromLiquidityDelta = getAmountAFromLiquidityDelta; exports.getAmountBFromLiquidityDelta = getAmountBFromLiquidityDelta; exports.getBaseFeeNumerator = getBaseFeeNumerator; exports.getCurrentPrice = getCurrentPrice; exports.getDeltaAmountA = getDeltaAmountA; exports.getDeltaAmountB = getDeltaAmountB; 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.getPriceImpact = getPriceImpact; exports.getSecondKey = getSecondKey; exports.getSimulationComputeUnits = getSimulationComputeUnits; exports.getSwapAmount = getSwapAmount; exports.getTokenDecimals = getTokenDecimals; exports.getTokenProgram = getTokenProgram; exports.getUnClaimReward = getUnClaimReward; exports.mulDiv = mulDiv; exports.mulShr = mulShr; exports.positionByPoolFilter = positionByPoolFilter; exports.pow = pow; exports.q64ToDecimal = q64ToDecimal; exports.shlDiv = shlDiv; 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.decimalToQ64 = decimalToQ64; exports.default = index_default; exports.deriveClaimFeeOperatorAddress = deriveClaimFeeOperatorAddress; exports.deriveConfigAddress = deriveConfigAddress; exports.deriveCustomizablePoolAddress = deriveCustomizablePoolAddress; exports.deriveEventAuthority = deriveEventAuthority; exports.derivePoolAddress = derivePoolAddress; exports.derivePoolAuthority = derivePoolAuthority; exports.derivePositionAddress = derivePositionAddress; exports.derivePositionNftAccount = derivePositionNftAccount; exports.deriveRewardVaultAddress = deriveRewardVaultAddress; exports.deriveTokenBadgeAddress = deriveTokenBadgeAddress; exports.deriveTokenVaultAddress = deriveTokenVaultAddress; exports.divCeil = divCeil; exports.getAmountAFromLiquidityDelta = getAmountAFromLiquidityDelta; exports.getAmountBFromLiquidityDelta = getAmountBFromLiquidityDelta; exports.getBaseFeeNumerator = getBaseFeeNumerator; exports.getCurrentPrice = getCurrentPrice; exports.getDeltaAmountA = getDeltaAmountA; exports.getDeltaAmountB = getDeltaAmountB; 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.getPriceImpact = getPriceImpact; exports.getSecondKey = getSecondKey; exports.getSimulationComputeUnits = getSimulationComputeUnits; exports.getSwapAmount = getSwapAmount; exports.getTokenDecimals = getTokenDecimals; exports.getTokenProgram = getTokenProgram; exports.getUnClaimReward = getUnClaimReward; exports.mulDiv = mulDiv; exports.mulShr = mulShr; exports.positionByPoolFilter = positionByPoolFilter; exports.pow = pow; exports.q64ToDecimal = q64ToDecimal; exports.shlDiv = shlDiv; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.vestingByPositionFilter = vestingByPositionFilter; exports.wrapSOLInstruction = wrapSOLInstruction;
 //# sourceMappingURL=index.js.map