@meteora-ag/cp-amm-sdk 1.2.4-rc.0 → 1.2.5

package/dist/index.mjs

@@ -11640,82 +11640,6 @@ var CpAmm = class {
       }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     });
   }
-  /**
-   * Builds a transaction to remove liquidity from a position.
-   * @param {RemoveLiquidityParams} params - Parameters for removing liquidity.
-   * @returns Transaction builder.
-   */
-  removeLiquidity2(params) {
-    return __async(this, null, function* () {
-      const {
-        owner,
-        receiver,
-        feePayer,
-        pool,
-        position,
-        positionNftAccount,
-        liquidityDelta,
-        tokenAAmountThreshold,
-        tokenBAmountThreshold,
-        tokenAMint,
-        tokenBMint,
-        tokenAVault,
-        tokenBVault,
-        tokenAProgram,
-        tokenBProgram,
-        vestings
-      } = params;
-      const {
-        tokenAAta: tokenAAccount,
-        tokenBAta: tokenBAccount,
-        instructions: preInstructions
-      } = yield this.prepareTokenAccounts({
-        payer: feePayer,
-        tokenAOwner: receiver,
-        tokenBOwner: receiver,
-        tokenAMint,
-        tokenBMint,
-        tokenAProgram,
-        tokenBProgram
-      });
-      const postInstructions = [];
-      if ([tokenAMint.toBase58(), tokenBMint.toBase58()].includes(
-        NATIVE_MINT2.toBase58()
-      )) {
-        const closeWrappedSOLIx = yield unwrapSOLInstruction(owner);
-        closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
-      }
-      if (vestings.length > 0) {
-        const refreshVestingInstruction = yield this.buildRefreshVestingInstruction({
-          owner,
-          position,
-          positionNftAccount,
-          pool,
-          vestingAccounts: vestings.map((item) => item.account)
-        });
-        refreshVestingInstruction && preInstructions.push(refreshVestingInstruction);
-      }
-      return yield this._program.methods.removeLiquidity({
-        liquidityDelta,
-        tokenAAmountThreshold,
-        tokenBAmountThreshold
-      }).accountsPartial({
-        poolAuthority: this.poolAuthority,
-        pool,
-        position,
-        positionNftAccount,
-        owner,
-        tokenAAccount,
-        tokenBAccount,
-        tokenAMint,
-        tokenBMint,
-        tokenAVault,
-        tokenBVault,
-        tokenAProgram,
-        tokenBProgram
-      }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
-    });
-  }
   /**
    * Builds a transaction to remove liquidity from a position.
    * @param {RemoveLiquidityParams} params - Parameters for removing liquidity.
@@ -11857,15 +11781,18 @@ var CpAmm = class {
       const { maxLimiterDuration, maxFeeBps } = parseRateLimiterSecondFactor(
         poolState.poolFees.baseFee.secondFactor
       );
-      const rateLimiterApplied = isRateLimiterApplied(
-        poolState.poolFees.baseFee.thirdFactor,
-        maxLimiterDuration,
-        maxFeeBps,
-        poolState.poolFees.baseFee.firstFactor,
-        currentPoint,
-        poolState.activationPoint,
-        tradeDirection
-      );
+      let rateLimiterApplied = false;
+      if (poolState.poolFees.baseFee.baseFeeMode === 2 /* RateLimiter */) {
+        rateLimiterApplied = isRateLimiterApplied(
+          poolState.poolFees.baseFee.thirdFactor,
+          maxLimiterDuration,
+          maxFeeBps,
+          poolState.poolFees.baseFee.firstFactor,
+          currentPoint,
+          poolState.activationPoint,
+          tradeDirection
+        );
+      }
       const remainingAccounts = rateLimiterApplied ? [
         {
           isSigner: false,
@@ -11964,15 +11891,18 @@ var CpAmm = class {
       const { maxLimiterDuration, maxFeeBps } = parseRateLimiterSecondFactor(
         poolState.poolFees.baseFee.secondFactor
       );
-      const rateLimiterApplied = isRateLimiterApplied(
-        poolState.poolFees.baseFee.thirdFactor,
-        maxLimiterDuration,
-        maxFeeBps,
-        poolState.poolFees.baseFee.firstFactor,
-        currentPoint,
-        poolState.activationPoint,
-        tradeDirection
-      );
+      let rateLimiterApplied = false;
+      if (poolState.poolFees.baseFee.baseFeeMode === 2 /* RateLimiter */) {
+        rateLimiterApplied = isRateLimiterApplied(
+          poolState.poolFees.baseFee.thirdFactor,
+          maxLimiterDuration,
+          maxFeeBps,
+          poolState.poolFees.baseFee.firstFactor,
+          currentPoint,
+          poolState.activationPoint,
+          tradeDirection
+        );
+      }
       const remainingAccounts = rateLimiterApplied ? [
         {
           isSigner: false,