@meteora-ag/cp-amm-sdk 1.1.5-rc.0 → 1.1.5-rc.2

package/dist/index.d.mts

@@ -7411,7 +7411,7 @@ declare function validateFeeFraction(numerator: BN$1, denominator: BN$1): void;
  * @param partner - The partner address
  * @returns True if the partner is valid, false otherwise
  */
-declare function hasPartner(partner: PublicKey): boolean;
+declare function hasPartner(poolState: PoolState): boolean;
 /**
  * Gets the current point
  * @param connection - The connection to the Solana cluster
@@ -7858,7 +7858,11 @@ declare function getExcludedFeeAmountFromIncludedFeeAmount(includedFeeAmount: BN
  * @param feeIncrementBps - The fee increment in basis points
  * @returns [checkedOutputAmount: BN, checkedIncludedFeeAmount: BN, capped: boolean]
  */
-declare function getCheckedAmounts(referenceAmount: BN$1, cliffFeeNumerator: BN$1, maxFeeBps: number, feeIncrementBps: number): [BN$1, BN$1, boolean];
+declare function getCheckedAmounts(referenceAmount: BN$1, cliffFeeNumerator: BN$1, maxFeeBps: number, feeIncrementBps: number): {
+    checkedExcludedFeeAmount: BN$1;
+    checkedIncludedFeeAmount: BN$1;
+    isOverflow: boolean;
+};
 /**
  * Calculates the fee numerator from an excluded fee amount.
  * @param excludedFeeAmount - The excluded fee amount

package/dist/index.d.ts

@@ -7411,7 +7411,7 @@ declare function validateFeeFraction(numerator: BN$1, denominator: BN$1): void;
  * @param partner - The partner address
  * @returns True if the partner is valid, false otherwise
  */
-declare function hasPartner(partner: PublicKey): boolean;
+declare function hasPartner(poolState: PoolState): boolean;
 /**
  * Gets the current point
  * @param connection - The connection to the Solana cluster
@@ -7858,7 +7858,11 @@ declare function getExcludedFeeAmountFromIncludedFeeAmount(includedFeeAmount: BN
  * @param feeIncrementBps - The fee increment in basis points
  * @returns [checkedOutputAmount: BN, checkedIncludedFeeAmount: BN, capped: boolean]
  */
-declare function getCheckedAmounts(referenceAmount: BN$1, cliffFeeNumerator: BN$1, maxFeeBps: number, feeIncrementBps: number): [BN$1, BN$1, boolean];
+declare function getCheckedAmounts(referenceAmount: BN$1, cliffFeeNumerator: BN$1, maxFeeBps: number, feeIncrementBps: number): {
+    checkedExcludedFeeAmount: BN$1;
+    checkedIncludedFeeAmount: BN$1;
+    isOverflow: boolean;
+};
 /**
  * Calculates the fee numerator from an excluded fee amount.
  * @param excludedFeeAmount - The excluded fee amount

package/dist/index.js

@@ -8254,17 +8254,13 @@ function pow(base, exp) {
 
 // src/math/feeMath.ts
 function toNumerator(bps, feeDenominator) {
-  try {
-    const numerator = mulDiv(
-      bps,
-      feeDenominator,
-      new (0, _anchor.BN)(BASIS_POINT_MAX),
-      1 /* Down */
-    );
-    return numerator;
-  } catch (error) {
-    throw new Error("Type cast failed or calculation overflow in toNumerator");
-  }
+  const numerator = mulDiv(
+    bps,
+    feeDenominator,
+    new (0, _anchor.BN)(BASIS_POINT_MAX),
+    1 /* Down */
+  );
+  return numerator;
 }
 function getFeeInPeriod(cliffFeeNumerator, reductionFactor, passedPeriod) {
   if (reductionFactor.isZero()) {
@@ -8309,20 +8305,19 @@ function getFeeMode(collectFeeMode, tradeDirection, hasReferral) {
   };
 }
 function getTotalFeeNumerator(poolFees, baseFeeNumerator, maxFeeNumerator) {
-  const dynamicFeeNumerator = getDynamicFeeNumerator(
-    poolFees.dynamicFee.volatilityAccumulator,
-    new (0, _anchor.BN)(poolFees.dynamicFee.binStep),
-    new (0, _anchor.BN)(poolFees.dynamicFee.variableFeeControl)
-  );
+  let dynamicFeeNumerator = new (0, _anchor.BN)(0);
+  if (poolFees.dynamicFee.initialized !== 0) {
+    dynamicFeeNumerator = getDynamicFeeNumerator(
+      poolFees.dynamicFee.volatilityAccumulator,
+      new (0, _anchor.BN)(poolFees.dynamicFee.binStep),
+      new (0, _anchor.BN)(poolFees.dynamicFee.variableFeeControl)
+    );
+  }
   const totalFeeNumerator = dynamicFeeNumerator.add(baseFeeNumerator);
   if (totalFeeNumerator.gt(U64_MAX)) {
     throw new Error("Type cast failed: fee does not fit in u64");
   }
-  if (totalFeeNumerator.gt(maxFeeNumerator)) {
-    return maxFeeNumerator;
-  } else {
-    return totalFeeNumerator;
-  }
+  return _anchor.BN.min(totalFeeNumerator, maxFeeNumerator);
 }
 function getTotalTradingFeeFromIncludedFeeAmount(poolFees, currentPoint, activationPoint, includedFeeAmount, tradeDirection, maxFeeNumerator) {
   const baseFeeHandler = getBaseFeeHandler(
@@ -8552,24 +8547,32 @@ function getCheckedAmounts(referenceAmount, cliffFeeNumerator, maxFeeBps, feeInc
   const maxIndexInputAmount = maxIndex.add(one).mul(x0);
   if (maxIndexInputAmount.lte(U64_MAX)) {
     const checkedIncludedFeeAmount = maxIndexInputAmount;
-    const checkedOutputAmount = getExcludedFeeAmountFromIncludedFeeAmount(
+    const checkedExcludedFeeAmount = getExcludedFeeAmountFromIncludedFeeAmount(
       checkedIncludedFeeAmount,
       referenceAmount,
       cliffFeeNumerator,
       maxFeeBps,
       feeIncrementBps
     );
-    return [checkedOutputAmount, checkedIncludedFeeAmount, false];
+    return {
+      checkedExcludedFeeAmount,
+      checkedIncludedFeeAmount,
+      isOverflow: false
+    };
   } else {
     const checkedIncludedFeeAmount = U64_MAX;
-    const checkedOutputAmount = getExcludedFeeAmountFromIncludedFeeAmount(
+    const checkedExcludedFeeAmount = getExcludedFeeAmountFromIncludedFeeAmount(
       checkedIncludedFeeAmount,
       referenceAmount,
       cliffFeeNumerator,
       maxFeeBps,
       feeIncrementBps
     );
-    return [checkedOutputAmount, checkedIncludedFeeAmount, true];
+    return {
+      checkedExcludedFeeAmount,
+      checkedIncludedFeeAmount,
+      isOverflow: true
+    };
   }
 }
 function getFeeNumeratorFromExcludedFeeAmount(excludedFeeAmount, referenceAmount, cliffFeeNumerator, maxFeeBps, feeIncrementBps) {
@@ -8583,7 +8586,7 @@ function getFeeNumeratorFromExcludedFeeAmount(excludedFeeAmount, referenceAmount
   if (excludedFeeAmount.lte(excludedFeeReferenceAmount)) {
     return cliffFeeNumerator;
   }
-  const [checkedExcludedFeeAmount, checkedIncludedFeeAmount, isOverflow] = getCheckedAmounts(
+  const { checkedExcludedFeeAmount, checkedIncludedFeeAmount, isOverflow } = getCheckedAmounts(
     referenceAmount,
     cliffFeeNumerator,
     maxFeeBps,
@@ -8888,9 +8891,6 @@ function isDynamicFeeEnabled(dynamicFee) {
   return dynamicFee.initialized !== 0;
 }
 function getDynamicFeeNumerator(volatilityAccumulator, binStep, variableFeeControl) {
-  if (variableFeeControl.isZero()) {
-    return new (0, _bnjs2.default)(0);
-  }
   const squareVfaBin = volatilityAccumulator.mul(new (0, _bnjs2.default)(binStep)).pow(new (0, _bnjs2.default)(2));
   const vFee = variableFeeControl.mul(squareVfaBin);
   return vFee.add(new (0, _bnjs2.default)(DYNAMIC_FEE_ROUNDING_OFFSET)).div(new (0, _bnjs2.default)(DYNAMIC_FEE_SCALING_FACTOR));
@@ -8984,9 +8984,6 @@ function getAmountBFromLiquidityDelta(lowerSqrtPrice, upperSqrtPrice, liquidity,
     liquidity,
     rounding
   );
-  if (result.gt(U64_MAX)) {
-    throw new Error("MathOverflow: result exceeds u64 max");
-  }
   return result;
 }
 function getDeltaAmountBUnsignedUnchecked(lowerSqrtPrice, upperSqrtPrice, liquidity, rounding) {
@@ -9009,9 +9006,6 @@ function getAmountAFromLiquidityDelta(lowerSqrtPrice, upperSqrtPrice, liquidity,
     liquidity,
     rounding
   );
-  if (result.gt(U64_MAX)) {
-    throw new Error("MathOverflow: result exceeds u64 max");
-  }
   return result;
 }
 function getDeltaAmountAUnsignedUnchecked(lowerSqrtPrice, upperSqrtPrice, liquidity, rounding) {
@@ -9057,7 +9051,7 @@ function getSwapResultFromExactInput(poolState, amountIn, feeMode, tradeDirectio
       amountIn,
       tradeFeeNumerator,
       feeMode.hasReferral,
-      hasPartner(poolState.partner)
+      hasPartner(poolState)
     );
     actualProtocolFee = protocolFee;
     actualTradingFee = tradingFee;
@@ -9083,7 +9077,7 @@ function getSwapResultFromExactInput(poolState, amountIn, feeMode, tradeDirectio
       outputAmount,
       tradeFeeNumerator,
       feeMode.hasReferral,
-      hasPartner(poolState.partner)
+      hasPartner(poolState)
     );
     actualProtocolFee = protocolFee;
     actualTradingFee = tradingFee;
@@ -9114,8 +9108,8 @@ function calculateAtoBFromAmountIn(poolState, amountIn) {
     throw new Error("Price range is violated");
   }
   const outputAmount = getAmountBFromLiquidityDelta(
-    poolState.sqrtPrice,
     nextSqrtPrice,
+    poolState.sqrtPrice,
     poolState.liquidity,
     1 /* Down */
   );
@@ -9168,7 +9162,7 @@ function getSwapResultFromPartialInput(poolState, amountIn, feeMode, tradeDirect
       amountIn,
       tradeFeeNumerator,
       feeMode.hasReferral,
-      hasPartner(poolState.partner)
+      hasPartner(poolState)
     );
     actualProtocolFee = protocolFee;
     actualTradingFee = tradingFee;
@@ -9211,7 +9205,7 @@ function getSwapResultFromPartialInput(poolState, amountIn, feeMode, tradeDirect
         poolState.poolFees,
         feeAmount,
         feeMode.hasReferral,
-        hasPartner(poolState.partner)
+        hasPartner(poolState)
       );
       actualProtocolFee = protocolFee;
       actualTradingFee = tradingFee;
@@ -9233,7 +9227,7 @@ function getSwapResultFromPartialInput(poolState, amountIn, feeMode, tradeDirect
       outputAmount,
       tradeFeeNumerator,
       feeMode.hasReferral,
-      hasPartner(poolState.partner)
+      hasPartner(poolState)
     );
     actualProtocolFee = protocolFee;
     actualTradingFee = tradingFee;
@@ -9347,7 +9341,7 @@ function getSwapResultFromExactOutput(poolState, amountOut, feeMode, tradeDirect
       poolState.poolFees,
       feeAmount,
       feeMode.hasReferral,
-      hasPartner(poolState.partner)
+      hasPartner(poolState)
     );
     actualTradingFee = split.tradingFee;
     actualProtocolFee = split.protocolFee;
@@ -9386,7 +9380,7 @@ function getSwapResultFromExactOutput(poolState, amountOut, feeMode, tradeDirect
       poolState.poolFees,
       feeAmount,
       feeMode.hasReferral,
-      hasPartner(poolState.partner)
+      hasPartner(poolState)
     );
     actualTradingFee = split.tradingFee;
     actualProtocolFee = split.protocolFee;
@@ -9722,8 +9716,8 @@ function validateFeeFraction(numerator, denominator) {
 
 
 
-function hasPartner(partner) {
-  return !partner.equals(_web3js.PublicKey.default);
+function hasPartner(poolState) {
+  return !poolState.partner.equals(_web3js.PublicKey.default);
 }
 function getCurrentPoint(connection, activationType) {
   return __async(this, null, function* () {
@@ -9737,9 +9731,6 @@ function getCurrentPoint(connection, activationType) {
   });
 }
 function isSwapEnabled(pool, currentPoint) {
-  if (typeof pool.poolStatus !== "number") {
-    throw new Error("invalid pool status");
-  }
   return pool.poolStatus === 0 /* Enable */ && currentPoint.gte(pool.activationPoint);
 }
 function convertToFeeSchedulerSecondFactor(value) {
@@ -10675,7 +10666,7 @@ var CpAmm = class {
       tokenBDecimal,
       hasReferral
     } = params;
-    const { sqrtPrice: sqrtPriceQ64, activationType } = poolState;
+    const { activationType } = poolState;
     const aToB = poolState.tokenAMint.equals(inputTokenMint);
     const currentPoint = activationType ? new (0, _bnjs2.default)(currentTime) : new (0, _bnjs2.default)(currentSlot);
     const swapResult = swapQuoteExactInput(