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

package/dist/index.d.mts

@@ -5346,6 +5346,17 @@ type BuildAddLiquidityParams = {
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
 };
+type BuildLiquidatePositionInstructionParams = {
+    owner: PublicKey;
+    position: PublicKey;
+    positionNftAccount: PublicKey;
+    positionState: PositionState;
+    poolState: PoolState;
+    tokenAAccount: PublicKey;
+    tokenBAccount: PublicKey;
+    tokenAAmountThreshold: BN;
+    tokenBAmountThreshold: BN;
+};
 type BuildRemoveAllLiquidityInstructionParams = {
     poolAuthority: PublicKey;
     owner: PublicKey;
@@ -5651,6 +5662,13 @@ declare class CpAmm {
      * @returns Transaction instruction or null if no vestings to refresh
      */
     private buildRefreshVestingInstruction;
+    /**
+     * 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
+     */
+    private buildLiquidatePositionInstruction;
     /**
      * Fetches the Config state of the program.
      * @param config - Public key of the config account.
@@ -12475,4 +12493,4 @@ var CpAmmIDL = {
 	types: types
 };
 
-export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildRemoveAllLiquidityInstructionParams, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeInstructionParams, type ClaimPositionFeeParams, type ClaimRewardParams, type ClosePositionInstructionParams, type ClosePositionParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DepositQuote, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetDepositQuoteParams, type GetQuoteParams, type GetWithdrawQuoteParams, type InitializeCustomizeablePoolParams, type InitializeRewardParams, LIQUIDITY_SCALE, type LiquidityDeltaParams, type LockPositionParams, MAX_CU_BUFFER, MAX_FEE_NUMERATOR, MAX_SQRT_PRICE, MIN_CU_BUFFER, MIN_SQRT_PRICE, type MergePositionParams, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparePoolCreationSingleSide, type PreparedPoolCreation, type RefreshVestingParams, type RemoveAllLiquidityAndClosePositionParams, type RemoveAllLiquidityParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, type WithdrawQuote, calculateInitSqrtPrice, calculateTransferFeeExcludedAmount, calculateTransferFeeIncludedAmount, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadge, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAllUserPositionNftAccount, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getAvailableVestingLiquidity, getBaseFeeNumerator, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceFromSqrtPrice, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSqrtPriceFromPrice, getSwapAmount, getTokenDecimals, getTokenProgram, getTotalLockedLiquidity, getUnClaimReward, isVestingComplete, mulDiv, positionByPoolFilter, pow, q64ToDecimal, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };
+export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildLiquidatePositionInstructionParams, type BuildRemoveAllLiquidityInstructionParams, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeInstructionParams, type ClaimPositionFeeParams, type ClaimRewardParams, type ClosePositionInstructionParams, type ClosePositionParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DepositQuote, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetDepositQuoteParams, type GetQuoteParams, type GetWithdrawQuoteParams, type InitializeCustomizeablePoolParams, type InitializeRewardParams, LIQUIDITY_SCALE, type LiquidityDeltaParams, type LockPositionParams, MAX_CU_BUFFER, MAX_FEE_NUMERATOR, MAX_SQRT_PRICE, MIN_CU_BUFFER, MIN_SQRT_PRICE, type MergePositionParams, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparePoolCreationSingleSide, type PreparedPoolCreation, type RefreshVestingParams, type RemoveAllLiquidityAndClosePositionParams, type RemoveAllLiquidityParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, type WithdrawQuote, calculateInitSqrtPrice, calculateTransferFeeExcludedAmount, calculateTransferFeeIncludedAmount, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadge, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAllUserPositionNftAccount, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getAvailableVestingLiquidity, getBaseFeeNumerator, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceFromSqrtPrice, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSqrtPriceFromPrice, getSwapAmount, getTokenDecimals, getTokenProgram, getTotalLockedLiquidity, getUnClaimReward, isVestingComplete, mulDiv, positionByPoolFilter, pow, q64ToDecimal, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };

package/dist/index.d.ts

@@ -5346,6 +5346,17 @@ type BuildAddLiquidityParams = {
     tokenAProgram: PublicKey;
     tokenBProgram: PublicKey;
 };
+type BuildLiquidatePositionInstructionParams = {
+    owner: PublicKey;
+    position: PublicKey;
+    positionNftAccount: PublicKey;
+    positionState: PositionState;
+    poolState: PoolState;
+    tokenAAccount: PublicKey;
+    tokenBAccount: PublicKey;
+    tokenAAmountThreshold: BN;
+    tokenBAmountThreshold: BN;
+};
 type BuildRemoveAllLiquidityInstructionParams = {
     poolAuthority: PublicKey;
     owner: PublicKey;
@@ -5651,6 +5662,13 @@ declare class CpAmm {
      * @returns Transaction instruction or null if no vestings to refresh
      */
     private buildRefreshVestingInstruction;
+    /**
+     * 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
+     */
+    private buildLiquidatePositionInstruction;
     /**
      * Fetches the Config state of the program.
      * @param config - Public key of the config account.
@@ -12475,4 +12493,4 @@ var CpAmmIDL = {
 	types: types
 };
 
-export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildRemoveAllLiquidityInstructionParams, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeInstructionParams, type ClaimPositionFeeParams, type ClaimRewardParams, type ClosePositionInstructionParams, type ClosePositionParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DepositQuote, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetDepositQuoteParams, type GetQuoteParams, type GetWithdrawQuoteParams, type InitializeCustomizeablePoolParams, type InitializeRewardParams, LIQUIDITY_SCALE, type LiquidityDeltaParams, type LockPositionParams, MAX_CU_BUFFER, MAX_FEE_NUMERATOR, MAX_SQRT_PRICE, MIN_CU_BUFFER, MIN_SQRT_PRICE, type MergePositionParams, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparePoolCreationSingleSide, type PreparedPoolCreation, type RefreshVestingParams, type RemoveAllLiquidityAndClosePositionParams, type RemoveAllLiquidityParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, type WithdrawQuote, calculateInitSqrtPrice, calculateTransferFeeExcludedAmount, calculateTransferFeeIncludedAmount, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadge, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAllUserPositionNftAccount, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getAvailableVestingLiquidity, getBaseFeeNumerator, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceFromSqrtPrice, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSqrtPriceFromPrice, getSwapAmount, getTokenDecimals, getTokenProgram, getTotalLockedLiquidity, getUnClaimReward, isVestingComplete, mulDiv, positionByPoolFilter, pow, q64ToDecimal, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };
+export { ActivationPoint, ActivationType, type AddLiquidityParams, type AmmProgram, BASIS_POINT_MAX, type BaseFee, type BuildAddLiquidityParams, type BuildLiquidatePositionInstructionParams, type BuildRemoveAllLiquidityInstructionParams, CP_AMM_PROGRAM_ID, type ClaimPartnerFeeParams, type ClaimPositionFeeInstructionParams, type ClaimPositionFeeParams, type ClaimRewardParams, type ClosePositionInstructionParams, type ClosePositionParams, CollectFeeMode, type ConfigState, CpAmm, type CpAmm$1 as CpAmmTypes, type CreatePoolParams, type CreatePositionParams, type DepositQuote, type DynamicFee, FEE_DENOMINATOR, type FeeMode, FeeSchedulerMode, type FundRewardParams, type GetDepositQuoteParams, type GetQuoteParams, type GetWithdrawQuoteParams, type InitializeCustomizeablePoolParams, type InitializeRewardParams, LIQUIDITY_SCALE, type LiquidityDeltaParams, type LockPositionParams, MAX_CU_BUFFER, MAX_FEE_NUMERATOR, MAX_SQRT_PRICE, MIN_CU_BUFFER, MIN_SQRT_PRICE, type MergePositionParams, ONE, PRECISION, type PermanentLockParams, type PoolFeesParams, type PoolState, type PositionState, type PreparePoolCreationParams, type PreparePoolCreationSingleSide, type PreparedPoolCreation, type RefreshVestingParams, type RemoveAllLiquidityAndClosePositionParams, type RemoveAllLiquidityParams, type RemoveLiquidityParams, type RewardInfo, Rounding, SCALE_OFFSET, type SwapParams, type SwapQuotes, type TokenBadgeState, TradeDirection, type TxBuilder, type UpdateRewardDurationParams, type UpdateRewardFunderParams, type VestingState, type WithdrawIneligibleRewardParams, type WithdrawQuote, calculateInitSqrtPrice, calculateTransferFeeExcludedAmount, calculateTransferFeeIncludedAmount, decimalToQ64, CpAmmIDL as default, deriveClaimFeeOperatorAddress, deriveConfigAddress, deriveCustomizablePoolAddress, derivePoolAddress, derivePoolAuthority, derivePositionAddress, derivePositionNftAccount, deriveRewardVaultAddress, deriveTokenBadge, deriveTokenBadgeAddress, deriveTokenVaultAddress, divCeil, getAllUserPositionNftAccount, getAmountAFromLiquidityDelta, getAmountBFromLiquidityDelta, getAvailableVestingLiquidity, getBaseFeeNumerator, getDynamicFeeNumerator, getEstimatedComputeUnitIxWithBuffer, getEstimatedComputeUnitUsageWithBuffer, getFeeNumerator, getFirstKey, getLiquidityDeltaFromAmountA, getLiquidityDeltaFromAmountB, getMaxAmountWithSlippage, getMinAmountWithSlippage, getNextSqrtPrice, getNftOwner, getOrCreateATAInstruction, getPriceFromSqrtPrice, getPriceImpact, getSecondKey, getSimulationComputeUnits, getSqrtPriceFromPrice, getSwapAmount, getTokenDecimals, getTokenProgram, getTotalLockedLiquidity, getUnClaimReward, isVestingComplete, mulDiv, positionByPoolFilter, pow, q64ToDecimal, unwrapSOLInstruction, vestingByPositionFilter, wrapSOLInstruction };

package/dist/index.js

@@ -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 (0, _anchor.BN)(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);
       }