@meteora-ag/cp-amm-sdk 1.0.0-rc.7 → 1.0.0-rc.8

package/dist/index.mjs

@@ -6886,57 +6886,6 @@ function getSwapAmount(inAmount, sqrtPrice, liquidity, tradeFeeNumerator, aToB,
   const amountOut = feeMode.feeOnInput ? outAmount : (totalFee = getTotalFeeOnAmount(outAmount, tradeFeeNumerator), outAmount.sub(totalFee));
   return { amountOut, totalFee };
 }
-function bpsToFeeNumerator(bps) {
-  return bps * FEE_DENOMINATOR / BASIS_POINT_MAX;
-}
-function feeNumeratorToBps(feeNumerator) {
-  return feeNumerator * BASIS_POINT_MAX / FEE_DENOMINATOR;
-}
-function estimateLinearReductionFactor(cliffFeeBps, targetFeeBps, totalPeriods) {
-  if (totalPeriods <= 0) {
-    throw new Error("Total periods must be greater than zero");
-  }
-  if (cliffFeeBps > feeNumeratorToBps(MAX_FEE_NUMERATOR)) {
-    throw new Error(
-      `Cliff fee (${cliffFeeBps} bps) exceeds maximum allowed value of ${feeNumeratorToBps(
-        MAX_FEE_NUMERATOR
-      )} bps`
-    );
-  }
-  if (targetFeeBps > cliffFeeBps) {
-    throw new Error(
-      "Target fee must be less than or equal to cliff fee for reduction"
-    );
-  }
-  const cliffFeeNumerator = bpsToFeeNumerator(cliffFeeBps);
-  const targetFeeNumerator = bpsToFeeNumerator(targetFeeBps);
-  const totalReduction = cliffFeeNumerator - targetFeeNumerator;
-  const reductionFactor = totalReduction / totalPeriods;
-  return Math.floor(reductionFactor);
-}
-function estimateExponentialReductionFactor(cliffFeeBps, targetFeeBps, totalPeriods) {
-  if (totalPeriods <= 0) {
-    throw new Error("Total periods must be greater than zero");
-  }
-  if (cliffFeeBps > feeNumeratorToBps(MAX_FEE_NUMERATOR)) {
-    throw new Error(
-      `Cliff fee (${cliffFeeBps} bps) exceeds maximum allowed value of ${feeNumeratorToBps(
-        MAX_FEE_NUMERATOR
-      )} bps`
-    );
-  }
-  if (targetFeeBps > cliffFeeBps) {
-    throw new Error(
-      "Target fee bps must be less than or equal to cliff fee bps for reduction"
-    );
-  }
-  const cliffFeeNumerator = bpsToFeeNumerator(cliffFeeBps);
-  const targetFeeNumerator = bpsToFeeNumerator(targetFeeBps);
-  const ratio = targetFeeNumerator / cliffFeeNumerator;
-  const decayBase = Math.pow(ratio, 1 / totalPeriods);
-  const reductionFactor = BASIS_POINT_MAX * (1 - decayBase);
-  return Math.floor(reductionFactor);
-}
 
 // src/helpers/computeUnits.ts
 import {
@@ -7236,6 +7185,13 @@ var CpAmm = class {
     });
     this.poolAuthority = derivePoolAuthority();
   }
+  /**
+   * Returns the Anchor program instance.
+   * @returns The AmmProgram instance.
+   */
+  getProgram() {
+    return this._program;
+  }
   /**
    * Prepares token accounts for a transaction by retrieving or creating associated token accounts.
    * @private
@@ -8950,13 +8906,6 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram
       );
-      const postInstructions = [];
-      if ([tokenAMint.toBase58(), tokenBMint.toBase58()].includes(
-        NATIVE_MINT2.toBase58()
-      )) {
-        const closeWrappedSOLIx = yield unwrapSOLInstruction(owner);
-        closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
-      }
       let positionBLiquidityDelta = positionBState.unlockedLiquidity;
       if (positionBVestings.length > 0) {
         const totalAvailableVestingLiquidity = positionBVestings.reduce(
@@ -8982,6 +8931,14 @@ var CpAmm = class {
         refreshVestingInstruction && preInstructions.push(refreshVestingInstruction);
       }
       const transaction = new Transaction();
+      if (poolState.tokenAMint.equals(NATIVE_MINT2)) {
+        const wrapSOLIx = wrapSOLInstruction(owner, tokenAAccount, BigInt(1));
+        preInstructions.push(...wrapSOLIx);
+      }
+      if (poolState.tokenBMint.equals(NATIVE_MINT2)) {
+        const wrapSOLIx = wrapSOLInstruction(owner, tokenBAccount, BigInt(1));
+        preInstructions.push(...wrapSOLIx);
+      }
       if (preInstructions.length > 0) {
         transaction.add(...preInstructions);
       }
@@ -9015,8 +8972,11 @@ var CpAmm = class {
         tokenBAmountThreshold: tokenBAmountAddLiquidityThreshold
       });
       transaction.add(addLiquidityInstruction);
-      if (postInstructions.length > 0) {
-        transaction.add(...postInstructions);
+      if ([tokenAMint.toBase58(), tokenBMint.toBase58()].includes(
+        NATIVE_MINT2.toBase58()
+      )) {
+        const closeWrappedSOLIx = yield unwrapSOLInstruction(owner);
+        closeWrappedSOLIx && transaction.add(closeWrappedSOLIx);
       }
       return transaction;
     });
@@ -9248,7 +9208,6 @@ export {
   Rounding,
   SCALE_OFFSET,
   TradeDirection,
-  bpsToFeeNumerator,
   calculateInitSqrtPrice,
   calculateTransferFeeExcludedAmount,
   calculateTransferFeeIncludedAmount,
@@ -9264,9 +9223,6 @@ export {
   deriveRewardVaultAddress,
   deriveTokenBadgeAddress,
   deriveTokenVaultAddress,
-  estimateExponentialReductionFactor,
-  estimateLinearReductionFactor,
-  feeNumeratorToBps,
   getAllPositionNftAccountByOwner,
   getAllUserPositionNftAccount,
   getAmountAFromLiquidityDelta,