@meteora-ag/cp-amm-sdk 1.4.1 → 1.4.3

package/dist/index.d.mts

@@ -8479,18 +8479,18 @@ declare function getFeeTimeSchedulerParams(startingBaseFeeBps: number, endingBas
 declare function computeSqrtPriceStepBps(priceMultiple: number, numberOfPeriod: number): number;
 /**
  * Gets the fee market cap scheduler parameters. Derives sqrtPriceStepBps
- * automatically from starting/ending market cap so the fee schedule is
- * fully exhausted when the token grows from startingMarketCap to endingMarketCap.
+ * automatically from `priceMultiple` so the fee schedule is fully exhausted
+ * when the spot price grows by that multiple from the initial price.
+ *
  * @param startingBaseFeeBps - Starting (max) fee in basis points
  * @param endingBaseFeeBps - Ending (min) fee in basis points
  * @param baseFeeMode - Linear or exponential decay
  * @param numberOfPeriod - Number of fee reduction periods
- * @param startingMarketCap - Initial market cap (e.g. 20_000 for $20k)
- * @param endingMarketCap - Target market cap (e.g. 20_000_000 for $20M)
+ * @param priceMultiple - Target spot-price multiple from the initial price (e.g. 1000 for 1000x). Must be > 1.
  * @param schedulerExpirationDuration - Seconds after which the schedule expires to the ending fee regardless of price
  * @returns BaseFee with the computed sqrtPriceStepBps encoded
  */
-declare function getFeeMarketCapSchedulerParams(startingBaseFeeBps: number, endingBaseFeeBps: number, baseFeeMode: BaseFeeMode, numberOfPeriod: number, startingMarketCap: number, endingMarketCap: number, schedulerExpirationDuration: number): BaseFee;
+declare function getFeeMarketCapSchedulerParams(startingBaseFeeBps: number, endingBaseFeeBps: number, baseFeeMode: BaseFeeMode, numberOfPeriod: number, priceMultiple: number, schedulerExpirationDuration: number): BaseFee;
 /**
  * Gets the rate limiter parameters
  * @param baseFeeBps - The base fee in basis points
@@ -8531,8 +8531,7 @@ declare function getBaseFeeParams(baseFeeParams: {
         startingFeeBps: number;
         endingFeeBps: number;
         numberOfPeriod: number;
-        startingMarketCap: number;
-        endingMarketCap: number;
+        priceMultiple: number;
         schedulerExpirationDuration: number;
     };
 }, tokenBDecimal: number, activationType: ActivationType): BaseFee;

package/dist/index.d.ts

@@ -8479,18 +8479,18 @@ declare function getFeeTimeSchedulerParams(startingBaseFeeBps: number, endingBas
 declare function computeSqrtPriceStepBps(priceMultiple: number, numberOfPeriod: number): number;
 /**
  * Gets the fee market cap scheduler parameters. Derives sqrtPriceStepBps
- * automatically from starting/ending market cap so the fee schedule is
- * fully exhausted when the token grows from startingMarketCap to endingMarketCap.
+ * automatically from `priceMultiple` so the fee schedule is fully exhausted
+ * when the spot price grows by that multiple from the initial price.
+ *
  * @param startingBaseFeeBps - Starting (max) fee in basis points
  * @param endingBaseFeeBps - Ending (min) fee in basis points
  * @param baseFeeMode - Linear or exponential decay
  * @param numberOfPeriod - Number of fee reduction periods
- * @param startingMarketCap - Initial market cap (e.g. 20_000 for $20k)
- * @param endingMarketCap - Target market cap (e.g. 20_000_000 for $20M)
+ * @param priceMultiple - Target spot-price multiple from the initial price (e.g. 1000 for 1000x). Must be > 1.
  * @param schedulerExpirationDuration - Seconds after which the schedule expires to the ending fee regardless of price
  * @returns BaseFee with the computed sqrtPriceStepBps encoded
  */
-declare function getFeeMarketCapSchedulerParams(startingBaseFeeBps: number, endingBaseFeeBps: number, baseFeeMode: BaseFeeMode, numberOfPeriod: number, startingMarketCap: number, endingMarketCap: number, schedulerExpirationDuration: number): BaseFee;
+declare function getFeeMarketCapSchedulerParams(startingBaseFeeBps: number, endingBaseFeeBps: number, baseFeeMode: BaseFeeMode, numberOfPeriod: number, priceMultiple: number, schedulerExpirationDuration: number): BaseFee;
 /**
  * Gets the rate limiter parameters
  * @param baseFeeBps - The base fee in basis points
@@ -8531,8 +8531,7 @@ declare function getBaseFeeParams(baseFeeParams: {
         startingFeeBps: number;
         endingFeeBps: number;
         numberOfPeriod: number;
-        startingMarketCap: number;
-        endingMarketCap: number;
+        priceMultiple: number;
         schedulerExpirationDuration: number;
     };
 }, tokenBDecimal: number, activationType: ActivationType): BaseFee;

package/dist/index.js

@@ -8190,11 +8190,11 @@ var BaseFeeMode = /* @__PURE__ */ ((BaseFeeMode3) => {
   BaseFeeMode3[BaseFeeMode3["FeeMarketCapSchedulerExponential"] = 4] = "FeeMarketCapSchedulerExponential";
   return BaseFeeMode3;
 })(BaseFeeMode || {});
-var CollectFeeMode = /* @__PURE__ */ ((CollectFeeMode4) => {
-  CollectFeeMode4[CollectFeeMode4["BothToken"] = 0] = "BothToken";
-  CollectFeeMode4[CollectFeeMode4["OnlyB"] = 1] = "OnlyB";
-  CollectFeeMode4[CollectFeeMode4["Compounding"] = 2] = "Compounding";
-  return CollectFeeMode4;
+var CollectFeeMode = /* @__PURE__ */ ((CollectFeeMode3) => {
+  CollectFeeMode3[CollectFeeMode3["BothToken"] = 0] = "BothToken";
+  CollectFeeMode3[CollectFeeMode3["OnlyB"] = 1] = "OnlyB";
+  CollectFeeMode3[CollectFeeMode3["Compounding"] = 2] = "Compounding";
+  return CollectFeeMode3;
 })(CollectFeeMode || {});
 var TradeDirection = /* @__PURE__ */ ((TradeDirection3) => {
   TradeDirection3[TradeDirection3["AtoB"] = 0] = "AtoB";
@@ -11848,12 +11848,12 @@ function computeSqrtPriceStepBps(priceMultiple, numberOfPeriod) {
   }
   return sqrtPriceStepBps;
 }
-function getFeeMarketCapSchedulerParams(startingBaseFeeBps, endingBaseFeeBps, baseFeeMode, numberOfPeriod, startingMarketCap, endingMarketCap, schedulerExpirationDuration) {
+function getFeeMarketCapSchedulerParams(startingBaseFeeBps, endingBaseFeeBps, baseFeeMode, numberOfPeriod, priceMultiple, schedulerExpirationDuration) {
   if (numberOfPeriod <= 0) {
     throw new Error("Total periods must be greater than zero");
   }
-  if (endingMarketCap <= startingMarketCap) {
-    throw new Error("endingMarketCap must be greater than startingMarketCap");
+  if (priceMultiple <= 1) {
+    throw new Error("priceMultiple must be greater than 1");
   }
   const poolMaxFeeBps = getMaxFeeBps(CURRENT_POOL_VERSION);
   if (startingBaseFeeBps <= endingBaseFeeBps) {
@@ -11869,7 +11869,6 @@ function getFeeMarketCapSchedulerParams(startingBaseFeeBps, endingBaseFeeBps, ba
   if (schedulerExpirationDuration == 0) {
     throw new Error("schedulerExpirationDuration must be greater than zero");
   }
-  const priceMultiple = endingMarketCap / startingMarketCap;
   const sqrtPriceStepBps = computeSqrtPriceStepBps(
     priceMultiple,
     numberOfPeriod
@@ -12006,8 +12005,7 @@ function getBaseFeeParams(baseFeeParams, tokenBDecimal, activationType) {
         startingFeeBps,
         endingFeeBps,
         numberOfPeriod,
-        startingMarketCap,
-        endingMarketCap,
+        priceMultiple,
         schedulerExpirationDuration
       } = baseFeeParams.feeMarketCapSchedulerParam;
       return getFeeMarketCapSchedulerParams(
@@ -12015,8 +12013,7 @@ function getBaseFeeParams(baseFeeParams, tokenBDecimal, activationType) {
         endingFeeBps,
         baseFeeParams.baseFeeMode,
         numberOfPeriod,
-        startingMarketCap,
-        endingMarketCap,
+        priceMultiple,
         schedulerExpirationDuration
       );
     }
@@ -13289,7 +13286,9 @@ var CpAmm = class {
       });
       const postInstruction = [];
       if (isLockLiquidity) {
-        const permanentLockIx = yield this._program.methods.permanentLockPosition(liquidityDelta).accountsPartial({
+        const configState = yield this.fetchConfigState(config);
+        const lockLiquidity = configState.collectFeeMode === 2 /* Compounding */ ? liquidityDelta.sub(DEAD_LIQUIDITY) : liquidityDelta;
+        const permanentLockIx = yield this._program.methods.permanentLockPosition(lockLiquidity).accountsPartial({
           position,
           positionNftAccount,
           pool,
@@ -13388,7 +13387,8 @@ var CpAmm = class {
       });
       const postInstruction = [];
       if (isLockLiquidity) {
-        const permanentLockIx = yield this._program.methods.permanentLockPosition(liquidityDelta).accountsPartial({
+        const lockLiquidity = collectFeeMode === 2 /* Compounding */ ? liquidityDelta.sub(DEAD_LIQUIDITY) : liquidityDelta;
+        const permanentLockIx = yield this._program.methods.permanentLockPosition(lockLiquidity).accountsPartial({
           position,
           positionNftAccount,
           pool,
@@ -13494,7 +13494,8 @@ var CpAmm = class {
       });
       const postInstruction = [];
       if (isLockLiquidity) {
-        const permanentLockIx = yield this._program.methods.permanentLockPosition(liquidityDelta).accountsPartial({
+        const lockLiquidity = collectFeeMode === 2 /* Compounding */ ? liquidityDelta.sub(DEAD_LIQUIDITY) : liquidityDelta;
+        const permanentLockIx = yield this._program.methods.permanentLockPosition(lockLiquidity).accountsPartial({
           position,
           positionNftAccount,
           pool,