@meteora-ag/cp-amm-sdk 1.0.5 → 1.0.7-rc.1

package/dist/index.d.mts

@@ -5692,8 +5692,6 @@ type CreatePositionAndAddLiquidity = {
     tokenBAmountThreshold: BN;
     tokenAMint: PublicKey;
     tokenBMint: PublicKey;
-    tokenAVault: PublicKey;
-    tokenBVault: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
 };
@@ -5868,11 +5866,12 @@ type LockPositionParams = {
 };
 type SetupFeeClaimAccountsParams = {
     payer: PublicKey;
+    owner: PublicKey;
     tokenAMint: PublicKey;
     tokenBMint: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     tempWSolAccount?: PublicKey;
 };
 type ClaimPositionFeeInstructionParams = {
@@ -5901,7 +5900,7 @@ type ClaimPositionFeeParams = {
     tokenBVault: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     feePayer?: PublicKey;
     tempWSolAccount?: PublicKey;
 };
@@ -5949,7 +5948,7 @@ type ClaimPartnerFeeParams = {
     pool: PublicKey;
     maxAmountA: BN;
     maxAmountB: BN;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     feePayer?: PublicKey;
     tempWSolAccount?: PublicKey;
 };
@@ -6511,6 +6510,7 @@ declare function getFeeNumerator(currentPoint: number, activationPoint: BN, numb
 declare function getSwapAmount(inAmount: BN, sqrtPrice: BN, liquidity: BN, tradeFeeNumerator: BN, aToB: boolean, collectFeeMode: number): {
     amountOut: BN;
     totalFee: BN;
+    nextSqrtPrice: BN;
 };
 /**
  * Converts basis points (bps) to a fee numerator
@@ -6597,11 +6597,11 @@ declare const getMaxAmountWithSlippage: (amount: BN, rate: number) => BN;
 declare const getMinAmountWithSlippage: (amount: BN, rate: number) => BN;
 /**
  * Calculate price impact as a percentage
- * @param actualAmount Amount after slippage in token units
- * @param idealAmount Theoretical amount without slippage in token units
+ * @param nextSqrtPrice sqrt price after swap
+ * @param currentSqrtPrice current pool sqrt price
  * @returns Price impact as a percentage (e.g., 1.5 means 1.5%)
  */
-declare const getPriceImpact: (actualAmount: BN, idealAmount: BN) => number;
+declare const getPriceImpact: (nextSqrtPrice: BN, currentSqrtPrice: BN) => number;
 declare const getPriceFromSqrtPrice: (sqrtPrice: BN, tokenADecimal: number, tokenBDecimal: number) => string;
 declare const getSqrtPriceFromPrice: (price: string, tokenADecimal: number, tokenBDecimal: number) => BN;
 declare const getUnClaimReward: (poolState: PoolState, positionState: PositionState) => {

package/dist/index.d.ts

@@ -5692,8 +5692,6 @@ type CreatePositionAndAddLiquidity = {
     tokenBAmountThreshold: BN;
     tokenAMint: PublicKey;
     tokenBMint: PublicKey;
-    tokenAVault: PublicKey;
-    tokenBVault: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
 };
@@ -5868,11 +5866,12 @@ type LockPositionParams = {
 };
 type SetupFeeClaimAccountsParams = {
     payer: PublicKey;
+    owner: PublicKey;
     tokenAMint: PublicKey;
     tokenBMint: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     tempWSolAccount?: PublicKey;
 };
 type ClaimPositionFeeInstructionParams = {
@@ -5901,7 +5900,7 @@ type ClaimPositionFeeParams = {
     tokenBVault: PublicKey;
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     feePayer?: PublicKey;
     tempWSolAccount?: PublicKey;
 };
@@ -5949,7 +5948,7 @@ type ClaimPartnerFeeParams = {
     pool: PublicKey;
     maxAmountA: BN;
     maxAmountB: BN;
-    receiver: PublicKey;
+    receiver?: PublicKey;
     feePayer?: PublicKey;
     tempWSolAccount?: PublicKey;
 };
@@ -6511,6 +6510,7 @@ declare function getFeeNumerator(currentPoint: number, activationPoint: BN, numb
 declare function getSwapAmount(inAmount: BN, sqrtPrice: BN, liquidity: BN, tradeFeeNumerator: BN, aToB: boolean, collectFeeMode: number): {
     amountOut: BN;
     totalFee: BN;
+    nextSqrtPrice: BN;
 };
 /**
  * Converts basis points (bps) to a fee numerator
@@ -6597,11 +6597,11 @@ declare const getMaxAmountWithSlippage: (amount: BN, rate: number) => BN;
 declare const getMinAmountWithSlippage: (amount: BN, rate: number) => BN;
 /**
  * Calculate price impact as a percentage
- * @param actualAmount Amount after slippage in token units
- * @param idealAmount Theoretical amount without slippage in token units
+ * @param nextSqrtPrice sqrt price after swap
+ * @param currentSqrtPrice current pool sqrt price
  * @returns Price impact as a percentage (e.g., 1.5 means 1.5%)
  */
-declare const getPriceImpact: (actualAmount: BN, idealAmount: BN) => number;
+declare const getPriceImpact: (nextSqrtPrice: BN, currentSqrtPrice: BN) => number;
 declare const getPriceFromSqrtPrice: (sqrtPrice: BN, tokenADecimal: number, tokenBDecimal: number) => string;
 declare const getSqrtPriceFromPrice: (price: string, tokenADecimal: number, tokenBDecimal: number) => BN;
 declare const getUnClaimReward: (poolState: PoolState, positionState: PositionState) => {

package/dist/index.js

@@ -7288,10 +7288,10 @@ function getDynamicFeeNumerator(volatilityAccumulator, binStep, variableFeeContr
   return vFee.add(new (0, _anchor.BN)(99999999999)).div(new (0, _anchor.BN)(1e11));
 }
 function getFeeNumerator(currentPoint, activationPoint, numberOfPeriod, periodFrequency, feeSchedulerMode, cliffFeeNumerator, reductionFactor, dynamicFeeParams) {
-  if (Number(periodFrequency) == 0) {
+  if (Number(periodFrequency) == 0 || new (0, _anchor.BN)(currentPoint).lt(activationPoint)) {
     return cliffFeeNumerator;
   }
-  const period = new (0, _anchor.BN)(currentPoint).lt(activationPoint) ? new (0, _anchor.BN)(numberOfPeriod) : _anchor.BN.min(
+  const period = _anchor.BN.min(
     new (0, _anchor.BN)(numberOfPeriod),
     new (0, _anchor.BN)(currentPoint).sub(activationPoint).div(periodFrequency)
   );
@@ -7336,19 +7336,25 @@ function getSwapAmount(inAmount, sqrtPrice, liquidity, tradeFeeNumerator, aToB,
     totalFee = getTotalFeeOnAmount(inAmount, tradeFeeNumerator);
     actualInAmount = inAmount.sub(totalFee);
   }
+  const nextSqrtPrice = getNextSqrtPrice(
+    actualInAmount,
+    sqrtPrice,
+    liquidity,
+    aToB
+  );
   const outAmount = aToB ? getAmountBFromLiquidityDelta(
     liquidity,
     sqrtPrice,
-    getNextSqrtPrice(actualInAmount, sqrtPrice, liquidity, true),
+    nextSqrtPrice,
     1 /* Down */
   ) : getAmountAFromLiquidityDelta(
     liquidity,
     sqrtPrice,
-    getNextSqrtPrice(actualInAmount, sqrtPrice, liquidity, false),
+    nextSqrtPrice,
     1 /* Down */
   );
   const amountOut = feeMode.feeOnInput ? outAmount : (totalFee = getTotalFeeOnAmount(outAmount, tradeFeeNumerator), outAmount.sub(totalFee));
-  return { amountOut, totalFee };
+  return { amountOut, totalFee, nextSqrtPrice };
 }
 function bpsToFeeNumerator(bps) {
   return new (0, _anchor.BN)(bps * FEE_DENOMINATOR).divn(BASIS_POINT_MAX);
@@ -7523,9 +7529,9 @@ 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 = (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 getPriceImpact = (nextSqrtPrice, currentSqrtPrice) => {
+  const diff = nextSqrtPrice.pow(new (0, _anchor.BN)(2)).sub(currentSqrtPrice.pow(new (0, _anchor.BN)(2))).abs();
+  return new (0, _decimaljs2.default)(diff.toString()).div(new (0, _decimaljs2.default)(currentSqrtPrice.pow(new (0, _anchor.BN)(2)).toString())).mul(100).toNumber();
 };
 var getPriceFromSqrtPrice = (sqrtPrice, tokenADecimal, tokenBDecimal) => {
   const decimalSqrtPrice = new (0, _decimaljs2.default)(sqrtPrice.toString());
@@ -8162,6 +8168,7 @@ var CpAmm = class {
     return __async(this, null, function* () {
       const {
         payer,
+        owner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
@@ -8176,8 +8183,12 @@ var CpAmm = class {
       const postInstructions = [];
       let tokenAAccount;
       let tokenBAccount;
-      const tokenAOwner = tempWSolAccount && tokenAIsSOL ? tempWSolAccount : receiver;
-      const tokenBOwner = tempWSolAccount && tokenBIsSOL ? tempWSolAccount : receiver;
+      let tokenAOwner = owner;
+      let tokenBOwner = owner;
+      if (receiver) {
+        tokenAOwner = tokenAIsSOL ? tempWSolAccount : receiver;
+        tokenBOwner = tokenBIsSOL ? tempWSolAccount : receiver;
+      }
       const { tokenAAta, tokenBAta, instructions } = yield this.prepareTokenAccounts({
         payer,
         tokenAOwner,
@@ -8192,8 +8203,8 @@ var CpAmm = class {
       preInstructions.push(...instructions);
       if (hasSolToken) {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(
-          tempWSolAccount != null ? tempWSolAccount : receiver,
-          receiver
+          tempWSolAccount != null ? tempWSolAccount : owner,
+          receiver != null ? receiver : owner
         );
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
@@ -8480,7 +8491,7 @@ var CpAmm = class {
       reductionFactor,
       dynamicFeeParams
     );
-    const { amountOut, totalFee } = getSwapAmount(
+    const { amountOut, totalFee, nextSqrtPrice } = getSwapAmount(
       actualAmountIn,
       sqrtPriceQ64,
       liquidityQ64,
@@ -8506,7 +8517,7 @@ var CpAmm = class {
       swapOutAmount: actualAmountOut,
       minSwapOutAmount,
       totalFee,
-      priceImpact: getPriceImpact(minSwapOutAmount, actualAmountOut)
+      priceImpact: getPriceImpact(nextSqrtPrice, sqrtPriceQ64)
     };
   }
   /**
@@ -9090,8 +9101,6 @@ var CpAmm = class {
         tokenBAmountThreshold,
         tokenAMint,
         tokenBMint,
-        tokenAVault,
-        tokenBVault,
         tokenAProgram,
         tokenBProgram
       } = params;
@@ -9108,6 +9117,8 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram
       });
+      const tokenAVault = deriveTokenVaultAddress(tokenAMint, pool);
+      const tokenBVault = deriveTokenVaultAddress(tokenBMint, pool);
       if (tokenAMint.equals(_spltoken.NATIVE_MINT)) {
         const wrapSOLIx = wrapSOLInstruction(
           owner,
@@ -9835,6 +9846,7 @@ var CpAmm = class {
       const payer = feePayer != null ? feePayer : partner;
       const { tokenAAccount, tokenBAccount, preInstructions, postInstructions } = yield this.setupFeeClaimAccounts({
         payer,
+        owner: partner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,
@@ -9882,6 +9894,7 @@ var CpAmm = class {
       const payer = feePayer != null ? feePayer : owner;
       const { tokenAAccount, tokenBAccount, preInstructions, postInstructions } = yield this.setupFeeClaimAccounts({
         payer,
+        owner,
         tokenAMint,
         tokenBMint,
         tokenAProgram,