@meteora-ag/cp-amm-sdk 1.1.7 → 1.1.9-rc.0

package/dist/index.mjs

@@ -8664,11 +8664,11 @@ import BN8 from "bn.js";
 function getMaxBaseFeeNumerator(cliffFeeNumerator) {
   return cliffFeeNumerator;
 }
-function getMinBaseFeeNumerator(cliffFeeNumerator, numberOfPeriod, periodFrequency, reductionFactor, feeSchedulerMode) {
+function getMinBaseFeeNumerator(cliffFeeNumerator, numberOfPeriod, reductionFactor, feeSchedulerMode) {
   return getBaseFeeNumeratorByPeriod(
     cliffFeeNumerator,
     numberOfPeriod,
-    periodFrequency,
+    new BN8(numberOfPeriod),
     reductionFactor,
     feeSchedulerMode
   );
@@ -8718,7 +8718,15 @@ function getBaseFeeNumerator(cliffFeeNumerator, numberOfPeriod, periodFrequency,
   if (periodFrequency.isZero()) {
     return cliffFeeNumerator;
   }
-  const period = currentPoint.sub(activationPoint).div(periodFrequency);
+  let period;
+  if (currentPoint.lt(activationPoint)) {
+    period = new BN8(numberOfPeriod);
+  } else {
+    period = currentPoint.sub(activationPoint).div(periodFrequency);
+    if (period.gt(new BN8(numberOfPeriod))) {
+      period = new BN8(numberOfPeriod);
+    }
+  }
   return getBaseFeeNumeratorByPeriod(
     cliffFeeNumerator,
     numberOfPeriod,
@@ -9626,7 +9634,6 @@ function validateFeeScheduler(numberOfPeriod, periodFrequency, reductionFactor,
   const minFeeNumerator = getMinBaseFeeNumerator(
     cliffFeeNumerator,
     numberOfPeriod,
-    periodFrequency,
     reductionFactor,
     baseFeeMode
   );
@@ -11616,7 +11623,8 @@ var CpAmm = class {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(payer);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
-      const poolState = yield this.fetchPoolState(pool);
+      let { poolState } = params;
+      poolState = poolState != null ? poolState : yield this.fetchPoolState(pool);
       const currentPoint = yield getCurrentPoint(
         this._program.provider.connection,
         poolState.activationType
@@ -11717,7 +11725,8 @@ var CpAmm = class {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(payer);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
-      const poolState = yield this.fetchPoolState(pool);
+      let { poolState } = params;
+      poolState = poolState != null ? poolState : yield this.fetchPoolState(pool);
       const currentPoint = yield getCurrentPoint(
         this._program.provider.connection,
         poolState.activationType
@@ -12463,9 +12472,6 @@ var CpAmm = class {
     });
   }
 };
-
-// src/index.ts
-var index_default = cp_amm_default;
 export {
   ActivationPoint,
   ActivationType,
@@ -12477,6 +12483,7 @@ export {
   CURRENT_POOL_VERSION,
   CollectFeeMode,
   CpAmm,
+  cp_amm_default as CpAmmIdl,
   DYNAMIC_FEE_DECAY_PERIOD_DEFAULT,
   DYNAMIC_FEE_FILTER_PERIOD_DEFAULT,
   DYNAMIC_FEE_REDUCTION_FACTOR_DEFAULT,
@@ -12526,7 +12533,6 @@ export {
   convertToLamports,
   convertToRateLimiterSecondFactor,
   decimalToQ64,
-  index_default as default,
   deriveClaimFeeOperatorAddress,
   deriveConfigAddress,
   deriveCustomizablePoolAddress,