@meteora-ag/cp-amm-sdk 1.0.1-rc.12 → 1.0.1-rc.14

package/dist/index.js

@@ -22,12 +22,8 @@ var __async = (__this, __arguments, generator) => {
 
 // src/CpAmm.ts
 var _anchor = require('@coral-xyz/anchor');
-
-
-
 var _spltoken = require('@solana/spl-token');
 var _invariant = require('invariant'); var _invariant2 = _interopRequireDefault(_invariant);
-var _decimaljs = require('decimal.js'); var _decimaljs2 = _interopRequireDefault(_decimaljs);
 
 // src/idl/cp_amm.json
 var cp_amm_default = {
@@ -6189,6 +6185,7 @@ 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;
@@ -6288,71 +6285,7 @@ function deriveEventAuthority(programId) {
   );
 }
 
-// src/math/index.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__ */ ((CollectFeeMode2) => {
-  CollectFeeMode2[CollectFeeMode2["BothToken"] = 0] = "BothToken";
-  CollectFeeMode2[CollectFeeMode2["OnlyB"] = 1] = "OnlyB";
-  return CollectFeeMode2;
-})(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/index.ts
-function shlDiv(x, y, offset, rounding) {
-  const scale = new (0, _anchor.BN)(1).shln(offset);
-  return mulDiv(x, scale, y, rounding);
-}
-function mulDiv(x, y, denominator, rounding) {
-  const { div, mod } = x.mul(y).divmod(denominator);
-  if (rounding == 0 /* Up */ && !mod.isZero()) {
-    return div.add(new (0, _anchor.BN)(1));
-  }
-  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 decimalToQ64(num) {
-  return new (0, _anchor.BN)(num.mul(_decimaljs2.default.pow(2, 64)).floor().toFixed());
-}
-function priceToSqrtPrice(initPrice, tokenADecimal, tokenBDecimal) {
-  const sqrtPriceQ64 = decimalToQ64(
-    initPrice.mul(_decimaljs2.default.pow(10, tokenBDecimal - tokenADecimal)).sqrt()
-  );
-  return sqrtPriceQ64;
-}
-
-// src/utils/token.ts
+// src/helpers/token.ts
 
 
 
@@ -6451,9 +6384,41 @@ function getNftOwner(connection, nftMint) {
   });
 }
 
-// src/utils/fee.ts
+// 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__ */ ((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/feeMath.ts
 
 var MAX_EXPONENTIAL = new (0, _anchor.BN)(524288);
@@ -6558,51 +6523,33 @@ function pow(base, exp) {
   return result;
 }
 
-// src/utils/fee.ts
-function getBaseFeeNumerator(feeSchedulerMode, cliffFeeNumerator, period, reductionFactor) {
-  let feeNumerator;
-  if (feeSchedulerMode == 0 /* Linear */) {
-    feeNumerator = cliffFeeNumerator.sub(period.mul(reductionFactor));
-  } else {
-    const bps = reductionFactor.shln(SCALE_OFFSET).div(new (0, _anchor.BN)(BASIS_POINT_MAX));
-    const base = ONE.sub(bps);
-    const result = pow(base, period);
-    feeNumerator = cliffFeeNumerator.mul(result).shrn(SCALE_OFFSET);
-  }
-  return feeNumerator;
-}
-function getDynamicFeeNumerator(volatilityAccumulator, binStep, variableFeeControl) {
-  const squareVfaBin = volatilityAccumulator.mul(binStep).pow(new (0, _anchor.BN)(2));
-  const vFee = squareVfaBin.mul(variableFeeControl);
-  return vFee.addn(99999999999).divn(1e11);
+// src/math/index.ts
+
+var _decimaljs = require('decimal.js'); var _decimaljs2 = _interopRequireDefault(_decimaljs);
+function shlDiv(x, y, offset, rounding) {
+  const scale = new (0, _anchor.BN)(1).shln(offset);
+  return mulDiv(x, scale, y, rounding);
 }
-function getFeeNumerator(currentPoint, activationPoint, numberOfPeriod, periodFrequency, feeSchedulerMode, cliffFeeNumerator, reductionFactor, dynamicFeeParams) {
-  if (Number(periodFrequency) == 0) {
-    return cliffFeeNumerator;
+function mulDiv(x, y, denominator, rounding) {
+  const { div, mod } = x.mul(y).divmod(denominator);
+  if (rounding == 0 /* Up */ && !mod.isZero()) {
+    return div.add(new (0, _anchor.BN)(1));
   }
-  const period = new (0, _anchor.BN)(currentPoint).lt(activationPoint) ? new (0, _anchor.BN)(numberOfPeriod) : _anchor.BN.min(
-    new (0, _anchor.BN)(numberOfPeriod),
-    new (0, _anchor.BN)(currentPoint).sub(activationPoint).div(periodFrequency)
-  );
-  let feeNumerator = getBaseFeeNumerator(
-    feeSchedulerMode,
-    cliffFeeNumerator,
-    period,
-    reductionFactor
-  );
-  if (dynamicFeeParams) {
-    const { volatilityAccumulator, binStep, variableFeeControl } = dynamicFeeParams;
-    const dynamicFeeNumberator = getDynamicFeeNumerator(
-      volatilityAccumulator,
-      binStep,
-      variableFeeControl
-    );
-    feeNumerator.add(dynamicFeeNumberator);
+  return div;
+}
+function divCeil(a, b) {
+  if (a.isZero()) {
+    return new (0, _anchor.BN)(0);
   }
-  return feeNumerator.gt(new (0, _anchor.BN)(MAX_FEE_NUMERATOR)) ? new (0, _anchor.BN)(MAX_FEE_NUMERATOR) : feeNumerator;
+  return a.add(b.sub(new (0, _anchor.BN)(1))).div(b);
 }
+function getInitPriceQ64(tokenAAmount, tokenBAmount) {
+  const sqrtInitPrice = new (0, _decimaljs2.default)(tokenBAmount.toString()).div(new (0, _decimaljs2.default)(tokenAAmount.toString())).sqrt();
+  return new (0, _anchor.BN)(sqrtInitPrice.mul(_decimaljs2.default.pow(2, 64)).floor().toFixed());
+}
+
+// src/helpers/curve.ts
 
-// src/utils/curve.ts
 
 function getNextSqrtPrice(amount, sqrtPrice, liquidity, aToB) {
   let result;
@@ -6635,115 +6582,121 @@ function getDeltaAmountB(lowerSqrtPrice, upperSqrtPrice, liquidity, rounding) {
   }
   return result;
 }
-function calculateSwap(inAmount, sqrtPrice, liquidity, tradeFeeNumerator, aToB, collectFeeMode) {
-  let outAmount;
-  let lpFee;
-  if (collectFeeMode === 0 /* BothToken */) {
-    if (aToB) {
-      const nextSqrtPrice = getNextSqrtPrice(
-        inAmount,
-        sqrtPrice,
-        liquidity,
-        true
-      );
-      outAmount = getDeltaAmountB(
-        nextSqrtPrice,
-        sqrtPrice,
-        liquidity,
-        1 /* Down */
-      );
-      lpFee = mulDiv(
-        outAmount,
-        tradeFeeNumerator,
-        new (0, _anchor.BN)(FEE_DENOMINATOR),
-        1 /* Down */
-      );
-    } else {
-      const nextSqrtPrice = getNextSqrtPrice(
-        inAmount,
-        sqrtPrice,
-        liquidity,
-        false
-      );
-      outAmount = getDeltaAmountA(
-        sqrtPrice,
-        nextSqrtPrice,
-        liquidity,
-        1 /* Down */
-      );
-      lpFee = mulDiv(
-        outAmount,
-        tradeFeeNumerator,
-        new (0, _anchor.BN)(new (0, _anchor.BN)(FEE_DENOMINATOR)),
-        1 /* Down */
-      );
-    }
-  } else {
-    const nextSqrtPrice = getNextSqrtPrice(
-      inAmount,
-      sqrtPrice,
-      liquidity,
-      true
-    );
-    outAmount = getDeltaAmountB(
-      nextSqrtPrice,
-      sqrtPrice,
-      liquidity,
-      1 /* Down */
-    );
-    lpFee = mulDiv(
-      outAmount,
-      tradeFeeNumerator,
-      new (0, _anchor.BN)(FEE_DENOMINATOR),
-      1 /* Down */
-    );
-    if (aToB) {
-    } else {
-      lpFee = mulDiv(
-        inAmount,
-        tradeFeeNumerator,
-        new (0, _anchor.BN)(FEE_DENOMINATOR),
-        1 /* Down */
-      );
-      const nextSqrtPrice2 = getNextSqrtPrice(
-        inAmount.sub(lpFee),
-        sqrtPrice,
-        liquidity,
-        false
-      );
-      outAmount = getDeltaAmountA(
-        sqrtPrice,
-        nextSqrtPrice2,
-        liquidity,
-        1 /* Down */
-      );
-    }
-  }
-  return { amountOutExcludedlpFee: outAmount.sub(lpFee), lpFee };
-}
 function getLiquidityDeltaFromAmountA(maxAmountA, lowerSqrtPrice, upperSqrtPrice) {
-  const prod = maxAmountA.mul(upperSqrtPrice.mul(lowerSqrtPrice));
-  const delta = upperSqrtPrice.sub(lowerSqrtPrice);
-  return prod.div(delta);
+  const prod = new (0, _decimaljs2.default)(
+    maxAmountA.mul(upperSqrtPrice.mul(lowerSqrtPrice)).toString()
+  );
+  const delta = new (0, _decimaljs2.default)(upperSqrtPrice.sub(lowerSqrtPrice).toString());
+  return new (0, _anchor.BN)(prod.div(delta).floor().toFixed());
 }
 function getLiquidityDeltaFromAmountB(maxAmountB, lowerSqrtPrice, upperSqrtPrice) {
-  const denominator = upperSqrtPrice.sub(lowerSqrtPrice);
-  const result = maxAmountB.shln(SCALE_OFFSET * 2).div(denominator);
-  return result;
+  const denominator = new (0, _decimaljs2.default)(
+    upperSqrtPrice.sub(lowerSqrtPrice).toString()
+  );
+  const prod = new (0, _decimaljs2.default)(maxAmountB.toString()).mul(
+    _decimaljs2.default.pow(2, SCALE_OFFSET * 2)
+  );
+  return new (0, _anchor.BN)(prod.div(denominator).floor().toFixed());
 }
 function getAmountAFromLiquidityDelta(liquidity, currentSqrtPrice) {
-  const prod = liquidity.mul(MAX_SQRT_PRICE.sub(currentSqrtPrice));
+  const prod = new (0, _decimaljs2.default)(liquidity.toString()).mul(
+    new (0, _decimaljs2.default)(MAX_SQRT_PRICE.sub(currentSqrtPrice).toString())
+  );
   const denominator = currentSqrtPrice.mul(MAX_SQRT_PRICE);
-  const result = shlDiv(prod, denominator, SCALE_OFFSET, 1 /* Down */);
-  return result.shrn(SCALE_OFFSET);
+  const result = prod.mul(_decimaljs2.default.pow(2, 64)).div(new (0, _decimaljs2.default)(denominator.toString()));
+  return result.div(_decimaljs2.default.pow(2, 64)).floor().toFixed();
 }
 function getAmountBFromLiquidityDelta(liquidity, currentSqrtPrice) {
   const delta = currentSqrtPrice.sub(MIN_SQRT_PRICE);
-  const prod = liquidity.mul(delta);
-  return prod.shrn(SCALE_OFFSET * 2);
+  const prod = new (0, _decimaljs2.default)(liquidity.toString()).mul(
+    new (0, _decimaljs2.default)(delta.toString())
+  );
+  return prod.div(_decimaljs2.default.pow(2, 128)).floor().toFixed();
 }
 
-// src/utils/computeUnits.ts
+// src/helpers/fee.ts
+function getBaseFeeNumerator(feeSchedulerMode, cliffFeeNumerator, period, reductionFactor) {
+  let feeNumerator;
+  if (feeSchedulerMode == 0 /* Linear */) {
+    feeNumerator = cliffFeeNumerator.sub(period.mul(reductionFactor));
+  } else {
+    const bps = reductionFactor.shln(SCALE_OFFSET).div(new (0, _anchor.BN)(BASIS_POINT_MAX));
+    const base = ONE.sub(bps);
+    const result = pow(base, period);
+    feeNumerator = cliffFeeNumerator.mul(result).shrn(SCALE_OFFSET);
+  }
+  return feeNumerator;
+}
+function getDynamicFeeNumerator(volatilityAccumulator, binStep, variableFeeControl) {
+  const squareVfaBin = volatilityAccumulator.mul(binStep).pow(new (0, _anchor.BN)(2));
+  const vFee = squareVfaBin.mul(variableFeeControl);
+  return vFee.addn(99999999999).divn(1e11);
+}
+function getFeeNumerator(currentPoint, activationPoint, numberOfPeriod, periodFrequency, feeSchedulerMode, cliffFeeNumerator, reductionFactor, dynamicFeeParams) {
+  if (Number(periodFrequency) == 0) {
+    return cliffFeeNumerator;
+  }
+  const period = new (0, _anchor.BN)(currentPoint).lt(activationPoint) ? new (0, _anchor.BN)(numberOfPeriod) : _anchor.BN.min(
+    new (0, _anchor.BN)(numberOfPeriod),
+    new (0, _anchor.BN)(currentPoint).sub(activationPoint).div(periodFrequency)
+  );
+  let feeNumerator = getBaseFeeNumerator(
+    feeSchedulerMode,
+    cliffFeeNumerator,
+    period,
+    reductionFactor
+  );
+  if (dynamicFeeParams) {
+    const { volatilityAccumulator, binStep, variableFeeControl } = dynamicFeeParams;
+    const dynamicFeeNumberator = getDynamicFeeNumerator(
+      volatilityAccumulator,
+      binStep,
+      variableFeeControl
+    );
+    feeNumerator.add(dynamicFeeNumberator);
+  }
+  return feeNumerator.gt(new (0, _anchor.BN)(MAX_FEE_NUMERATOR)) ? new (0, _anchor.BN)(MAX_FEE_NUMERATOR) : feeNumerator;
+}
+function getFeeMode(collectFeeMode, btoA) {
+  const feeOnInput = btoA && collectFeeMode === 1 /* OnlyB */;
+  const feesOnTokenA = btoA && collectFeeMode === 0 /* BothToken */;
+  return {
+    feeOnInput,
+    feesOnTokenA
+  };
+}
+function getTotalFeeOnAmount(amount, tradeFeeNumerator) {
+  return mulDiv(
+    amount,
+    tradeFeeNumerator,
+    new (0, _anchor.BN)(FEE_DENOMINATOR),
+    0 /* Up */
+  );
+}
+function getSwapAmount(inAmount, sqrtPrice, liquidity, tradeFeeNumerator, aToB, collectFeeMode) {
+  let feeMode = getFeeMode(collectFeeMode, !aToB);
+  let actualInAmount = inAmount;
+  let totalFee = new (0, _anchor.BN)(0);
+  if (feeMode.feeOnInput) {
+    totalFee = getTotalFeeOnAmount(inAmount, tradeFeeNumerator);
+    actualInAmount = inAmount.sub(totalFee);
+  }
+  const outAmount = aToB ? getDeltaAmountB(
+    getNextSqrtPrice(actualInAmount, sqrtPrice, liquidity, true),
+    sqrtPrice,
+    liquidity,
+    1 /* Down */
+  ) : getDeltaAmountA(
+    sqrtPrice,
+    getNextSqrtPrice(actualInAmount, sqrtPrice, liquidity, false),
+    liquidity,
+    1 /* Down */
+  );
+  const actualOutAmount = feeMode.feeOnInput ? outAmount : (totalFee = getTotalFeeOnAmount(outAmount, tradeFeeNumerator), outAmount.sub(totalFee));
+  return { actualOutAmount, totalFee };
+}
+
+// src/helpers/computeUnits.ts
 
 
 
@@ -6818,26 +6771,25 @@ var getEstimatedComputeUnitIxWithBuffer = (connection, instructions, feePayer, b
   return _web3js.ComputeBudgetProgram.setComputeUnitLimit({ units });
 });
 
-// src/utils/utils.ts
+// src/helpers/utils.ts
 
 
-var getMaxAmountWithSlippage = (amount, slippageRate) => {
-  const slippage = (100 + slippageRate) / 100 * BASIS_POINT_MAX;
+var getMaxAmountWithSlippage = (amount, rate) => {
+  const slippage = (100 + rate) / 100 * BASIS_POINT_MAX;
   return amount.mul(new (0, _anchor.BN)(slippage)).div(new (0, _anchor.BN)(BASIS_POINT_MAX));
 };
-var getMinAmountWithSlippage = (amount, slippageRate) => {
-  const slippage = (100 - slippageRate) / 100 * BASIS_POINT_MAX;
+var getMinAmountWithSlippage = (amount, rate) => {
+  const slippage = (100 - rate) / 100 * BASIS_POINT_MAX;
   return amount.mul(new (0, _anchor.BN)(slippage)).div(new (0, _anchor.BN)(BASIS_POINT_MAX));
 };
-var getPriceImpact = (amount, amountWithoutSlippage) => {
-  const diff = amountWithoutSlippage.sub(amount);
-  return new (0, _decimaljs2.default)(diff.toString()).div(new (0, _decimaljs2.default)(amountWithoutSlippage.toString())).mul(100).toNumber();
+var getPriceImpact = (actualAmount, idealAmount) => {
+  const diff = idealAmount.sub(actualAmount);
+  return new (0, _decimaljs2.default)(diff.toString()).div(new (0, _decimaljs2.default)(idealAmount.toString())).mul(100).toNumber();
 };
 var getCurrentPrice = (sqrtPrice, tokenADecimal, tokenBDecimal) => {
-  const rawSqrtPrice = sqrtPrice.shrn(SCALE_OFFSET);
-  const price = rawSqrtPrice.mul(rawSqrtPrice);
-  const expo = __pow(10, tokenADecimal - tokenBDecimal);
-  return price.muln(expo);
+  const decimalSqrtPrice = new (0, _decimaljs2.default)(sqrtPrice.toString());
+  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) => {
   return {
@@ -6847,7 +6799,7 @@ var getUnClaimReward = (positionState) => {
   };
 };
 
-// src/utils/accountFilters.ts
+// src/helpers/accountFilters.ts
 var positionByPoolFilter = (pool) => {
   return {
     memcmp: {
@@ -6864,28 +6816,23 @@ var CpAmm = class {
       connection
     });
   }
+  /**
+   * Returns the Anchor program instance.
+   * @returns The AmmProgram instance.
+   */
   getProgram() {
     return this._program;
   }
   /**
-    Prepares token ordering, calculates the initial sqrtPrice in Q64 format,
-    @private
-    @async
-    @param {PublicKey} tokenX - One token mint address in the pair.
-    @param {PublicKey} tokenY - The other token mint address in the pair.
-    @param {Decimal} initialPrice - The initial price ratio of tokenX/tokenY (will be inverted if needed).
-    @param {Decimal} liquidity - The initial liquidity value.
-    @returns {PreparedPoolCreation} Object containing the ordered token mints and their Q64 price/liquidity values. 
-  */
+   * Prepares parameters required for pool creation, including initial sqrt price and liquidity.
+   * @private
+   * @param {PreparePoolCreationParams} params - Initial token amounts for pool creation.
+   * @returns init sqrt price and liquidity in Q64 format.
+   */
   preparePoolCreationParams(params) {
     return __async(this, null, function* () {
-      const { tokenAAmount, tokenBAmount, tokenADecimal, tokenBDecimal } = params;
-      const initPrice = tokenBAmount.div(tokenAAmount);
-      const sqrtPriceQ64 = priceToSqrtPrice(
-        new (0, _decimaljs2.default)(initPrice.toString()),
-        tokenADecimal,
-        tokenBDecimal
-      );
+      const { tokenAAmount, tokenBAmount } = params;
+      const sqrtPriceQ64 = getInitPriceQ64(tokenAAmount, tokenBAmount);
       if (sqrtPriceQ64.lt(MIN_SQRT_PRICE) || sqrtPriceQ64.gt(MAX_SQRT_PRICE)) {
         throw new Error(`Invalid sqrt price: ${sqrtPriceQ64.toString()}`);
       }
@@ -6908,7 +6855,11 @@ var CpAmm = class {
       };
     });
   }
-  // fetcher
+  /**
+   * Fetches the Config state of the program.
+   * @param config - Public key of the config account.
+   * @returns Parsed ConfigState.
+   */
   fetchConfigState(config) {
     return __async(this, null, function* () {
       const configState = yield this._program.account.config.fetchNullable(
@@ -6918,6 +6869,11 @@ var CpAmm = class {
       return configState;
     });
   }
+  /**
+   * Fetches the Pool state.
+   * @param pool - Public key of the pool.
+   * @returns Parsed PoolState.
+   */
   fetchPoolState(pool) {
     return __async(this, null, function* () {
       const poolState = yield this._program.account.pool.fetchNullable(pool);
@@ -6925,6 +6881,11 @@ var CpAmm = class {
       return poolState;
     });
   }
+  /**
+   * Fetches the Position state.
+   * @param position - Public key of the position.
+   * @returns Parsed PositionState.
+   */
   fetchPositionState(position) {
     return __async(this, null, function* () {
       const positionState = yield this._program.account.position.fetchNullable(
@@ -6934,24 +6895,42 @@ var CpAmm = class {
       return positionState;
     });
   }
+  /**
+   * Retrieves all config accounts.
+   * @returns Array of config public keys and their states.
+   */
   getAllConfigs() {
     return __async(this, null, function* () {
       const configAccounts = yield this._program.account.config.all();
       return configAccounts;
     });
   }
+  /**
+   * Retrieves all pool accounts.
+   * @returns Array of pool public keys and their states.
+   */
   getAllPools() {
     return __async(this, null, function* () {
       const poolAccounts = yield this._program.account.pool.all();
       return poolAccounts;
     });
   }
+  /**
+   * Retrieves all position accounts.
+   * @returns Array of position public keys and their states.
+   */
   getAllPositions() {
     return __async(this, null, function* () {
       const poolAccounts = yield this._program.account.position.all();
       return poolAccounts;
     });
   }
+  /**
+   * Gets all positions of a user for a specific pool.
+   * @param pool - Public key of the pool.
+   * @param user - Public key of the user.
+   * @returns List of user positions for the pool.
+   */
   getUserPositionByPool(pool, user) {
     return __async(this, null, function* () {
       const positions = yield this._program.account.position.all([
@@ -6970,6 +6949,11 @@ var CpAmm = class {
       return result;
     });
   }
+  /**
+   * Gets all positions of a user across all pools.
+   * @param user - Public key of the user.
+   * @returns Array of user positions.
+   */
   getPositionsByUser(user) {
     return __async(this, null, function* () {
       const positions = yield this._program.account.position.all();
@@ -6986,6 +6970,11 @@ var CpAmm = class {
       return result;
     });
   }
+  /**
+   * Calculates swap quote based on input amount and pool state.
+   * @param params - Swap parameters including input amount, pool state, slippage, etc.
+   * @returns Swap quote including expected output amount, fee, and price impact.
+   */
   getQuote(params) {
     return __async(this, null, function* () {
       var _a;
@@ -7028,7 +7017,7 @@ var CpAmm = class {
         reductionFactor,
         dynamicFeeParams
       );
-      const { amountOutExcludedlpFee, lpFee } = calculateSwap(
+      const { actualOutAmount, totalFee } = getSwapAmount(
         inAmount,
         sqrtPriceQ64,
         liquidityQ64,
@@ -7037,28 +7026,22 @@ var CpAmm = class {
         collectFeeMode
       );
       const minSwapOutAmount = getMinAmountWithSlippage(
-        amountOutExcludedlpFee,
+        actualOutAmount,
         slippage
       );
       return {
         swapInAmount: inAmount,
-        swapOutAmount: amountOutExcludedlpFee,
+        swapOutAmount: actualOutAmount,
         minSwapOutAmount,
-        totalFee: lpFee,
-        priceImpact: getPriceImpact(minSwapOutAmount, amountOutExcludedlpFee)
+        totalFee,
+        priceImpact: getPriceImpact(minSwapOutAmount, actualOutAmount)
       };
     });
   }
   /**
    * Computes the liquidity delta based on the provided token amounts and pool state.
    *
-   * @param {LiquidityDeltaParams} params - The parameters for liquidity calculation, including:
-   *   - tokenX: The mint address of token X.
-   *   - tokenY: The mint address of token Y.
-   *   - maxAmountX: The maximum amount of token X available.
-   *   - maxAmountY: The maximum amount of token Y available.
-   *   - pool: The address of the liquidity pool.
-   *
+   * @param {LiquidityDeltaParams} params - The parameters for liquidity calculation
    * @returns {Promise<BN>} - The computed liquidity delta in Q64 value.
    */
   getLiquidityDelta(params) {
@@ -7083,6 +7066,11 @@ var CpAmm = class {
       return liquidityDeltaFromAmountA.gte(liquidityDeltaFromAmountB) ? liquidityDeltaFromAmountB : liquidityDeltaFromAmountA;
     });
   }
+  /**
+   * Builds a transaction to create a permissionless pool.
+   * @param params - Parameters for pool creation.
+   * @returns Transaction builder.
+   */
   createPool(params) {
     return __async(this, null, function* () {
       const {
@@ -7095,17 +7083,13 @@ var CpAmm = class {
         activationPoint,
         tokenAAmount,
         tokenBAmount,
-        tokenADecimal,
-        tokenBDecimal,
         tokenAProgram,
         tokenBProgram
       } = params;
       const { sqrtPriceQ64, liquidityQ64 } = yield this.preparePoolCreationParams(
         {
           tokenAAmount,
-          tokenBAmount,
-          tokenADecimal,
-          tokenBDecimal
+          tokenBAmount
         }
       );
       const poolAuthority = derivePoolAuthority(this._program.programId);
@@ -7202,6 +7186,11 @@ var CpAmm = class {
       return tx;
     });
   }
+  /**
+   * Builds a transaction to create a customizable pool.
+   * @param params - Parameters for customizable pool creation.
+   * @returns Transaction and related addresses.
+   */
   createCustomPool(params) {
     return __async(this, null, function* () {
       const {
@@ -7225,9 +7214,7 @@ var CpAmm = class {
       const { sqrtPriceQ64, liquidityQ64 } = yield this.preparePoolCreationParams(
         {
           tokenAAmount,
-          tokenBAmount,
-          tokenADecimal,
-          tokenBDecimal
+          tokenBAmount
         }
       );
       const poolAuthority = derivePoolAuthority(this._program.programId);
@@ -7328,6 +7315,11 @@ var CpAmm = class {
       return { tx: transaction, pool, position };
     });
   }
+  /**
+   * Builds a transaction to create a position.
+   * @param {CreatePositionParams} params - Parameters for position creation.
+   * @returns Transaction builder.
+   */
   createPosition(params) {
     return __async(this, null, function* () {
       const { owner, payer, pool, positionNft } = params;
@@ -7355,6 +7347,11 @@ var CpAmm = class {
       }).transaction();
     });
   }
+  /**
+   * Builds a transaction to add liquidity to an existing position.
+   * @param {AddLiquidityParams} params - Parameters for adding liquidity.
+   * @returns Transaction builder.
+   */
   addLiquidity(params) {
     return __async(this, null, function* () {
       const {
@@ -7447,6 +7444,11 @@ var CpAmm = class {
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
+  /**
+   * Builds a transaction to remove liquidity from a position.
+   * @param {RemoveLiquidityParams} params - Parameters for removing liquidity.
+   * @returns Transaction builder.
+   */
   removeLiquidity(params) {
     return __async(this, null, function* () {
       const {
@@ -7523,6 +7525,11 @@ var CpAmm = class {
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
+  /**
+   * Builds a transaction to perform a swap in the pool.
+   * @param {SwapParams} params - Parameters for swapping tokens.
+   * @returns Transaction builder.
+   */
   swap(params) {
     return __async(this, null, function* () {
       const {
@@ -7601,6 +7608,11 @@ var CpAmm = class {
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
+  /**
+   * Builds a transaction to lock a position with vesting schedule.
+   * @param {LockPositionParams} params - Locking parameters.
+   * @returns Transaction builder.
+   */
   lockPosition(params) {
     return __async(this, null, function* () {
       const {
@@ -7642,6 +7654,11 @@ var CpAmm = class {
       }).transaction();
     });
   }
+  /**
+   * Builds a transaction to permanently lock a position.
+   * @param {PermanentLockParams} params - Parameters for permanent locking.
+   * @returns Transaction builder.
+   */
   permanentLockPosition(params) {
     return __async(this, null, function* () {
       const { owner, position, positionNftMint, pool, unlockedLiquidity } = params;
@@ -7659,6 +7676,11 @@ var CpAmm = class {
       }).transaction();
     });
   }
+  /**
+   * Builds a transaction to refresh vesting status of a position.
+   * @param {RefreshVestingParams} params - Refresh vesting parameters.
+   * @returns Transaction builder.
+   */
   refreshVesting(params) {
     return __async(this, null, function* () {
       const { owner, position, positionNftMint, pool, vestings } = params;
@@ -7682,6 +7704,11 @@ var CpAmm = class {
       ).transaction();
     });
   }
+  /**
+   * Builds a transaction to claim position fee rewards.
+   * @param {ClaimPositionFeeParams} params - Parameters for claiming position fee.
+   * @returns Transaction builder.
+   */
   claimPositionFee(params) {
     return __async(this, null, function* () {
       const {
@@ -7751,6 +7778,11 @@ var CpAmm = class {
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
+  /**
+   * Builds a transaction to update reward duration.
+   * @param {UpdateRewardDurationParams} params - Parameters including pool and new duration.
+   * @returns Transaction builder.
+   */
   updateRewardDuration(params) {
     return __async(this, null, function* () {
       const { pool, admin, rewardIndex, newDuration } = params;
@@ -7762,6 +7794,11 @@ var CpAmm = class {
       }).transaction();
     });
   }
+  /**
+   * Builds a transaction to update reward funder address.
+   * @param {UpdateRewardFunderParams} params - Parameters including pool and new funder address.
+   * @returns Transaction builder.
+   */
   updateRewardFunder(params) {
     return __async(this, null, function* () {
       const { pool, admin, rewardIndex, newFunder } = params;
@@ -7773,6 +7810,11 @@ var CpAmm = class {
       }).transaction();
     });
   }
+  /**
+   * Builds a transaction to fund rewards in a pool.
+   * @param {FundRewardParams} params - Funding parameters.
+   * @returns Transaction builder.
+   */
   fundReward(params) {
     return __async(this, null, function* () {
       const { rewardIndex, carryForward, pool, funder, amount } = params;
@@ -7810,6 +7852,11 @@ var CpAmm = class {
       }).transaction();
     });
   }
+  /**
+   * Builds a transaction to withdraw ineligible rewards from a pool.
+   * @param {WithdrawIneligibleRewardParams} params - Parameters for withdrawal.
+   * @returns Transaction builder.
+   */
   withdrawIneligibleReward(params) {
     return __async(this, null, function* () {
       const { rewardIndex, pool, funder } = params;
@@ -7846,6 +7893,11 @@ var CpAmm = class {
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
+  /**
+   * Builds a transaction to claim partner fee rewards.
+   * @param {ClaimPartnerFeeParams} params - Claim parameters including amounts and partner address.
+   * @returns Transaction builder.
+   */
   claimPartnerFee(params) {
     return __async(this, null, function* () {
       const { partner, pool, maxAmountA, maxAmountB } = params;
@@ -7910,6 +7962,11 @@ var CpAmm = class {
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
+  /**
+   * Builds a transaction to claim reward from a position.
+   * @param {ClaimRewardParams} params - Parameters for claiming reward.
+   * @returns Transaction builder.
+   */
   claimReward(params) {
     return __async(this, null, function* () {
       const { user, position, rewardIndex } = params;
@@ -8012,5 +8069,7 @@ 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.Rounding = Rounding; exports.SCALE_OFFSET = SCALE_OFFSET; exports.TradeDirection = TradeDirection; exports.calculateSwap = calculateSwap; 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.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.getTokenDecimals = getTokenDecimals; exports.getTokenProgram = getTokenProgram; exports.getUnClaimReward = getUnClaimReward; exports.unwrapSOLInstruction = unwrapSOLInstruction; 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.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.PRECISION = PRECISION; exports.Rounding = Rounding; exports.SCALE_OFFSET = SCALE_OFFSET; exports.TradeDirection = TradeDirection; 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.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.positionByPoolFilter = positionByPoolFilter; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.wrapSOLInstruction = wrapSOLInstruction;
 //# sourceMappingURL=index.js.map