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

package/dist/index.mjs

@@ -6371,10 +6371,10 @@ var FeeSchedulerMode = /* @__PURE__ */ ((FeeSchedulerMode2) => {
   FeeSchedulerMode2[FeeSchedulerMode2["Exponential"] = 1] = "Exponential";
   return FeeSchedulerMode2;
 })(FeeSchedulerMode || {});
-var CollectFeeMode = /* @__PURE__ */ ((CollectFeeMode3) => {
-  CollectFeeMode3[CollectFeeMode3["BothToken"] = 0] = "BothToken";
-  CollectFeeMode3[CollectFeeMode3["OnlyB"] = 1] = "OnlyB";
-  return CollectFeeMode3;
+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";
@@ -6745,14 +6745,6 @@ function pow(base, exp) {
 // src/math/mathUtils.ts
 import { BN as BN3 } from "@coral-xyz/anchor";
 import Decimal from "decimal.js";
-function mulShr(x, y, offset, rounding) {
-  const denominator = new BN3(1).shln(offset);
-  return mulDiv(x, y, denominator, rounding);
-}
-function shlDiv(x, y, offset, rounding) {
-  const scale = new BN3(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()) {
@@ -6775,7 +6767,6 @@ function decimalToQ64(num) {
 
 // src/helpers/curve.ts
 import { BN as BN4 } from "@coral-xyz/anchor";
-import Decimal2 from "decimal.js";
 function getNextSqrtPrice(amount, sqrtPrice, liquidity, aToB) {
   let result;
   if (aToB) {
@@ -6788,65 +6779,35 @@ function getNextSqrtPrice(amount, sqrtPrice, liquidity, aToB) {
   }
   return result;
 }
-function getDeltaAmountA(lowerSqrtPrice, upperSqrtPrice, liquidity, rounding) {
-  const deltaSqrtPrice = upperSqrtPrice.sub(lowerSqrtPrice);
-  const prod = liquidity.mul(deltaSqrtPrice);
-  const denominator = lowerSqrtPrice.mul(upperSqrtPrice);
-  const result = shlDiv(prod, denominator, SCALE_OFFSET, rounding);
-  return result.shrn(SCALE_OFFSET);
-}
-function getDeltaAmountB(lowerSqrtPrice, upperSqrtPrice, liquidity, rounding) {
-  const deltaSqrtPrice = upperSqrtPrice.sub(lowerSqrtPrice);
-  const prod = liquidity.mul(deltaSqrtPrice);
-  let result;
-  if (rounding == 0 /* Up */) {
-    const denominator = new BN4(1).shln(SCALE_OFFSET * 2);
-    result = divCeil(prod, denominator);
-  } else {
-    result = prod.shrn(SCALE_OFFSET * 2);
-  }
-  return result;
-}
-function getLiquidityDeltaFromAmountA(maxAmountA, lowerSqrtPrice, upperSqrtPrice) {
-  const prod = new Decimal2(
-    maxAmountA.mul(upperSqrtPrice.mul(lowerSqrtPrice)).toString()
-  );
-  const delta = new Decimal2(upperSqrtPrice.sub(lowerSqrtPrice).toString());
-  return new BN4(prod.div(delta).floor().toFixed());
+function getLiquidityDeltaFromAmountA(amountA, lowerSqrtPrice, upperSqrtPrice) {
+  const product = amountA.mul(lowerSqrtPrice).mul(upperSqrtPrice);
+  const denominator = upperSqrtPrice.sub(lowerSqrtPrice);
+  return product.div(denominator);
 }
-function getLiquidityDeltaFromAmountB(maxAmountB, lowerSqrtPrice, upperSqrtPrice) {
-  const denominator = new Decimal2(
-    upperSqrtPrice.sub(lowerSqrtPrice).toString()
-  );
-  const prod = new Decimal2(maxAmountB.toString()).mul(
-    Decimal2.pow(2, SCALE_OFFSET * 2)
-  );
-  return new BN4(prod.div(denominator).floor().toFixed());
+function getLiquidityDeltaFromAmountB(amountB, lowerSqrtPrice, upperSqrtPrice) {
+  const denominator = upperSqrtPrice.sub(lowerSqrtPrice);
+  const product = amountB.shln(128);
+  return product.div(denominator);
 }
 function getAmountAFromLiquidityDelta(liquidity, currentSqrtPrice, maxSqrtPrice, rounding) {
-  const prod = new Decimal2(liquidity.toString()).mul(
-    new Decimal2(maxSqrtPrice.sub(currentSqrtPrice).toString())
-  );
+  const product = liquidity.mul(maxSqrtPrice.sub(currentSqrtPrice));
   const denominator = currentSqrtPrice.mul(maxSqrtPrice);
-  const result = prod.mul(Decimal2.pow(2, 64)).div(new Decimal2(denominator.toString()));
   if (rounding == 0 /* Up */) {
-    return result.div(Decimal2.pow(2, 64)).ceil().toFixed();
+    return product.add(denominator.sub(new BN4(1))).div(denominator);
   }
-  return result.div(Decimal2.pow(2, 64)).floor().toFixed();
+  return product.div(denominator);
 }
 function getAmountBFromLiquidityDelta(liquidity, currentSqrtPrice, minSqrtPrice, rounding) {
-  const delta = currentSqrtPrice.sub(minSqrtPrice);
-  const prod = new Decimal2(liquidity.toString()).mul(
-    new Decimal2(delta.toString())
-  );
+  const one = new BN4(1).shln(128);
+  const deltaPrice = currentSqrtPrice.sub(minSqrtPrice);
+  const result = liquidity.mul(deltaPrice);
   if (rounding == 0 /* Up */) {
-    return prod.div(Decimal2.pow(2, 128)).ceil().toFixed();
+    return result.add(one.sub(new BN4(1))).div(one);
   }
-  return prod.div(Decimal2.pow(2, 128)).floor().toFixed();
+  return result.shrn(128);
 }
 
 // src/helpers/fee.ts
-import Decimal3 from "decimal.js";
 function getBaseFeeNumerator(feeSchedulerMode, cliffFeeNumerator, period, reductionFactor) {
   let feeNumerator;
   if (feeSchedulerMode == 0 /* Linear */) {
@@ -6860,14 +6821,12 @@ function getBaseFeeNumerator(feeSchedulerMode, cliffFeeNumerator, period, reduct
   return feeNumerator;
 }
 function getDynamicFeeNumerator(volatilityAccumulator, binStep, variableFeeControl) {
-  const volatilityAccumulatorDecimal = new Decimal3(
-    volatilityAccumulator.toString()
-  ).div(Decimal3.pow(2, 64));
-  const squareVfaBin = volatilityAccumulatorDecimal.mul(new Decimal3(binStep.toString())).pow(2);
-  const vFee = squareVfaBin.mul(new Decimal3(variableFeeControl.toString()));
-  return new BN5(
-    vFee.add(99999999999).div(1e11).floor().toFixed()
-  );
+  if (variableFeeControl.isZero()) {
+    return new BN5(0);
+  }
+  const squareVfaBin = volatilityAccumulator.mul(new BN5(binStep)).pow(new BN5(2));
+  const vFee = variableFeeControl.mul(squareVfaBin);
+  return vFee.add(new BN5(99999999999)).div(new BN5(1e11));
 }
 function getFeeNumerator(currentPoint, activationPoint, numberOfPeriod, periodFrequency, feeSchedulerMode, cliffFeeNumerator, reductionFactor, dynamicFeeParams) {
   if (Number(periodFrequency) == 0) {
@@ -6918,12 +6877,12 @@ function getSwapAmount(inAmount, sqrtPrice, liquidity, tradeFeeNumerator, aToB,
     totalFee = getTotalFeeOnAmount(inAmount, tradeFeeNumerator);
     actualInAmount = inAmount.sub(totalFee);
   }
-  const outAmount = aToB ? getDeltaAmountB(
+  const outAmount = aToB ? getAmountBFromLiquidityDelta(
     getNextSqrtPrice(actualInAmount, sqrtPrice, liquidity, true),
     sqrtPrice,
     liquidity,
     1 /* Down */
-  ) : getDeltaAmountA(
+  ) : getAmountBFromLiquidityDelta(
     sqrtPrice,
     getNextSqrtPrice(actualInAmount, sqrtPrice, liquidity, false),
     liquidity,
@@ -7010,7 +6969,7 @@ var getEstimatedComputeUnitIxWithBuffer = (connection, instructions, feePayer, b
 
 // src/helpers/utils.ts
 import { BN as BN6 } from "@coral-xyz/anchor";
-import Decimal4 from "decimal.js";
+import Decimal2 from "decimal.js";
 var getMaxAmountWithSlippage = (amount, rate) => {
   const slippage = (100 + rate) / 100 * BASIS_POINT_MAX;
   return amount.mul(new BN6(slippage)).div(new BN6(BASIS_POINT_MAX));
@@ -7021,20 +6980,20 @@ var getMinAmountWithSlippage = (amount, rate) => {
 };
 var getPriceImpact = (actualAmount, idealAmount) => {
   const diff = idealAmount.sub(actualAmount);
-  return new Decimal4(diff.toString()).div(new Decimal4(idealAmount.toString())).mul(100).toNumber();
+  return new Decimal2(diff.toString()).div(new Decimal2(idealAmount.toString())).mul(100).toNumber();
 };
 var getPriceFromSqrtPrice = (sqrtPrice, tokenADecimal, tokenBDecimal) => {
-  const decimalSqrtPrice = new Decimal4(sqrtPrice.toString());
-  const price = decimalSqrtPrice.mul(decimalSqrtPrice).mul(new Decimal4(__pow(10, tokenADecimal - tokenBDecimal))).div(Decimal4.pow(2, 128)).toString();
+  const decimalSqrtPrice = new Decimal2(sqrtPrice.toString());
+  const price = decimalSqrtPrice.mul(decimalSqrtPrice).mul(new Decimal2(__pow(10, tokenADecimal - tokenBDecimal))).div(Decimal2.pow(2, 128)).toString();
   return price;
 };
 var getSqrtPriceFromPrice = (price, tokenADecimal, tokenBDecimal) => {
-  const decimalPrice = new Decimal4(price);
+  const decimalPrice = new Decimal2(price);
   const adjustedByDecimals = decimalPrice.div(
-    new Decimal4(__pow(10, tokenADecimal - tokenBDecimal))
+    new Decimal2(__pow(10, tokenADecimal - tokenBDecimal))
   );
-  const sqrtValue = Decimal4.sqrt(adjustedByDecimals);
-  const sqrtValueQ64 = sqrtValue.mul(Decimal4.pow(2, 64));
+  const sqrtValue = Decimal2.sqrt(adjustedByDecimals);
+  const sqrtValueQ64 = sqrtValue.mul(Decimal2.pow(2, 64));
   return new BN6(sqrtValueQ64.floor().toFixed());
 };
 var getUnClaimReward = (poolState, positionState) => {
@@ -7074,28 +7033,28 @@ var vestingByPositionFilter = (position) => {
 
 // src/helpers/priceMath.ts
 import { BN as BN7 } from "@coral-xyz/anchor";
-import Decimal5 from "decimal.js";
+import Decimal3 from "decimal.js";
 function calculateInitSqrtPrice(tokenAAmount, tokenBAmount, minSqrtPrice, maxSqrtPrice) {
   if (tokenAAmount.isZero() || tokenBAmount.isZero()) {
     throw new Error("Amount cannot be zero");
   }
-  const amountADecimal = new Decimal5(tokenAAmount.toString());
-  const amountBDecimal = new Decimal5(tokenBAmount.toString());
-  const minSqrtPriceDecimal = new Decimal5(minSqrtPrice.toString()).div(
-    Decimal5.pow(2, 64)
+  const amountADecimal = new Decimal3(tokenAAmount.toString());
+  const amountBDecimal = new Decimal3(tokenBAmount.toString());
+  const minSqrtPriceDecimal = new Decimal3(minSqrtPrice.toString()).div(
+    Decimal3.pow(2, 64)
   );
-  const maxSqrtPriceDecimal = new Decimal5(maxSqrtPrice.toString()).div(
-    Decimal5.pow(2, 64)
+  const maxSqrtPriceDecimal = new Decimal3(maxSqrtPrice.toString()).div(
+    Decimal3.pow(2, 64)
   );
-  const x = new Decimal5(1).div(maxSqrtPriceDecimal);
+  const x = new Decimal3(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 Decimal5(4).mul(y);
+  const fourY = new Decimal3(4).mul(y);
   const discriminant = xyMinusPa.mul(xyMinusPa).add(fourY);
   const sqrtDiscriminant = discriminant.sqrt();
-  const result = paMinusXY.add(sqrtDiscriminant).div(new Decimal5(2)).mul(Decimal5.pow(2, 64));
+  const result = paMinusXY.add(sqrtDiscriminant).div(new Decimal3(2)).mul(Decimal3.pow(2, 64));
   return new BN7(result.floor().toFixed());
 }
 
@@ -7755,15 +7714,15 @@ var CpAmm = class {
       return {
         liquidityDelta,
         outAmountA: tokenATokenInfo ? calculateTransferFeeExcludedAmount(
-          new BN9(amountA),
+          amountA,
           tokenATokenInfo.mint,
           tokenATokenInfo.currentEpoch
-        ).amount : new BN9(amountA),
+        ).amount : amountA,
         outAmountB: tokenBTokenInfo ? calculateTransferFeeExcludedAmount(
-          new BN9(amountB),
+          amountB,
           tokenBTokenInfo.mint,
           tokenBTokenInfo.currentEpoch
-        ).amount : new BN9(amountB)
+        ).amount : amountB
       };
     });
   }
@@ -8966,8 +8925,6 @@ export {
   getAmountAFromLiquidityDelta,
   getAmountBFromLiquidityDelta,
   getBaseFeeNumerator,
-  getDeltaAmountA,
-  getDeltaAmountB,
   getDynamicFeeNumerator,
   getEstimatedComputeUnitIxWithBuffer,
   getEstimatedComputeUnitUsageWithBuffer,
@@ -8990,11 +8947,9 @@ export {
   getTokenProgram,
   getUnClaimReward,
   mulDiv,
-  mulShr,
   positionByPoolFilter,
   pow,
   q64ToDecimal,
-  shlDiv,
   unwrapSOLInstruction,
   vestingByPositionFilter,
   wrapSOLInstruction