@meteora-ag/cp-amm-sdk 1.0.1-rc.34 → 1.0.1-rc.35

package/dist/index.mjs

@@ -7439,6 +7439,76 @@ var CpAmm = class {
       ).instruction();
     });
   }
+  /**
+   * Helper function that builds instructions to claim fees, remove liquidity, and close a position
+   * @param {BuildLiquidatePositionInstructionParams} params - Parameters for liquidating a position
+   * @returns {Promise<TransactionInstruction[]>} Array of instructions
+   * @private
+   */
+  buildLiquidatePositionInstruction(params) {
+    return __async(this, null, function* () {
+      const {
+        owner,
+        position,
+        positionNftAccount,
+        positionState,
+        poolState,
+        tokenAAccount,
+        tokenBAccount,
+        tokenAAmountThreshold,
+        tokenBAmountThreshold
+      } = params;
+      const { nftMint: positionNftMint, pool } = positionState;
+      const { tokenAMint, tokenBMint, tokenAVault, tokenBVault } = poolState;
+      const tokenAProgram = getTokenProgram(poolState.tokenAFlag);
+      const tokenBProgram = getTokenProgram(poolState.tokenBFlag);
+      const instructions = [];
+      const claimPositionFeeInstruction = yield this.buildClaimPositionFeeInstruction({
+        owner,
+        poolAuthority: this.poolAuthority,
+        pool,
+        position,
+        positionNftAccount,
+        tokenAAccount,
+        tokenBAccount,
+        tokenAVault,
+        tokenBVault,
+        tokenAMint,
+        tokenBMint,
+        tokenAProgram,
+        tokenBProgram
+      });
+      instructions.push(claimPositionFeeInstruction);
+      const removeAllLiquidityInstruction = yield this.buildRemoveAllLiquidityInstruction({
+        poolAuthority: this.poolAuthority,
+        owner,
+        pool,
+        position,
+        positionNftAccount,
+        tokenAAccount,
+        tokenBAccount,
+        tokenAAmountThreshold,
+        tokenBAmountThreshold,
+        tokenAMint,
+        tokenBMint,
+        tokenAVault,
+        tokenBVault,
+        tokenAProgram,
+        tokenBProgram
+      });
+      instructions.push(removeAllLiquidityInstruction);
+      const closePositionInstruction = yield this.buildClosePositionInstruction({
+        owner,
+        poolAuthority: this.poolAuthority,
+        pool,
+        position,
+        positionNftMint,
+        positionNftAccount
+      });
+      instructions.push(closePositionInstruction);
+      return instructions;
+    });
+  }
   /**
    * Fetches the Config state of the program.
    * @param config - Public key of the config account.
@@ -8592,8 +8662,8 @@ var CpAmm = class {
         vestings,
         currentPoint
       } = params;
-      const { nftMint: positionNftMint, pool } = positionState;
-      const { tokenAMint, tokenBMint, tokenAVault, tokenBVault } = poolState;
+      const { pool } = positionState;
+      const { tokenAMint, tokenBMint } = poolState;
       const { canUnlock, reason } = this.canUnlockPosition(
         positionState,
         vestings,
@@ -8636,49 +8706,18 @@ var CpAmm = class {
       if (preInstructions.length > 0) {
         transaction.add(...preInstructions);
       }
-      const claimPositionFeeInstruction = yield this.buildClaimPositionFeeInstruction({
-        owner,
-        poolAuthority: this.poolAuthority,
-        pool,
-        position,
-        positionNftAccount,
-        tokenAAccount,
-        tokenBAccount,
-        tokenAVault,
-        tokenBVault,
-        tokenAMint,
-        tokenBMint,
-        tokenAProgram,
-        tokenBProgram
-      });
-      transaction.add(claimPositionFeeInstruction);
-      const removeAllLiquidityInstruction = yield this.buildRemoveAllLiquidityInstruction({
-        poolAuthority: this.poolAuthority,
+      const liquidatePositionInstructions = yield this.buildLiquidatePositionInstruction({
         owner,
-        pool,
         position,
         positionNftAccount,
+        positionState,
+        poolState,
         tokenAAccount,
         tokenBAccount,
         tokenAAmountThreshold,
-        tokenBAmountThreshold,
-        tokenAMint,
-        tokenBMint,
-        tokenAVault,
-        tokenBVault,
-        tokenAProgram,
-        tokenBProgram
-      });
-      transaction.add(removeAllLiquidityInstruction);
-      const closePositionInstruction = yield this.buildClosePositionInstruction({
-        owner,
-        poolAuthority: this.poolAuthority,
-        pool,
-        position,
-        positionNftMint,
-        positionNftAccount
+        tokenBAmountThreshold
       });
-      transaction.add(closePositionInstruction);
+      transaction.add(...liquidatePositionInstructions);
       if (postInstructions.length > 0) {
         transaction.add(...postInstructions);
       }
@@ -8722,7 +8761,6 @@ var CpAmm = class {
       if (!canUnlock) {
         throw new Error(`Cannot remove liquidity: ${reason}`);
       }
-      const positionBLiquidityDelta = positionBState.unlockedLiquidity;
       const pool = positionBState.pool;
       const { tokenAMint, tokenBMint, tokenAVault, tokenBVault } = poolState;
       const tokenAProgram = getTokenProgram(poolState.tokenAFlag);
@@ -8745,7 +8783,21 @@ var CpAmm = class {
         const closeWrappedSOLIx = yield unwrapSOLInstruction(owner);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
+      let positionBLiquidityDelta = positionBState.unlockedLiquidity;
       if (positionBVestings.length > 0) {
+        const totalAvailableVestingLiquidity = positionBVestings.reduce(
+          (total, position) => {
+            const available = getAvailableVestingLiquidity(
+              position.vestingState,
+              currentPoint
+            );
+            return total.add(available);
+          },
+          new BN10(0)
+        );
+        positionBLiquidityDelta = positionBLiquidityDelta.add(
+          totalAvailableVestingLiquidity
+        );
         const refreshVestingInstruction = yield this.buildRefreshVestingInstruction({
           owner,
           position: positionB,
@@ -8759,40 +8811,18 @@ var CpAmm = class {
       if (preInstructions.length > 0) {
         transaction.add(...preInstructions);
       }
-      const claimPositionFeeInstruction = yield this.buildClaimPositionFeeInstruction({
+      const liquidatePositionInstructions = yield this.buildLiquidatePositionInstruction({
         owner,
-        poolAuthority: this.poolAuthority,
-        pool,
-        position: positionB,
-        positionNftAccount: positionBNftAccount,
-        tokenAAccount,
-        tokenBAccount,
-        tokenAVault,
-        tokenBVault,
-        tokenAMint,
-        tokenBMint,
-        tokenAProgram,
-        tokenBProgram
-      });
-      transaction.add(claimPositionFeeInstruction);
-      const removeAllLiquidityInstruction = yield this.buildRemoveAllLiquidityInstruction({
-        poolAuthority: this.poolAuthority,
-        owner,
-        pool,
         position: positionB,
         positionNftAccount: positionBNftAccount,
+        positionState: positionBState,
+        poolState,
         tokenAAccount,
         tokenBAccount,
         tokenAAmountThreshold: tokenAAmountRemoveLiquidityThreshold,
-        tokenBAmountThreshold: tokenBAmountRemoveLiquidityThreshold,
-        tokenAMint,
-        tokenBMint,
-        tokenAVault,
-        tokenBVault,
-        tokenAProgram,
-        tokenBProgram
+        tokenBAmountThreshold: tokenBAmountRemoveLiquidityThreshold
       });
-      transaction.add(removeAllLiquidityInstruction);
+      transaction.add(...liquidatePositionInstructions);
       const addLiquidityInstruction = yield this.buildAddLiquidityInstruction({
         pool,
         position: positionA,
@@ -8811,15 +8841,6 @@ var CpAmm = class {
         tokenBAmountThreshold: tokenBAmountAddLiquidityThreshold
       });
       transaction.add(addLiquidityInstruction);
-      const closePositionInstruction = yield this.buildClosePositionInstruction({
-        owner,
-        poolAuthority: this.poolAuthority,
-        pool: positionBState.pool,
-        position: positionB,
-        positionNftMint: positionBState.nftMint,
-        positionNftAccount: positionBNftAccount
-      });
-      transaction.add(closePositionInstruction);
       if (postInstructions.length > 0) {
         transaction.add(...postInstructions);
       }