@meteora-ag/dlmm 1.0.51 → 1.0.52-rc.10

package/dist/index.d.ts

@@ -2044,6 +2044,73 @@ type LbClmm = {
             ];
             "args": [];
         },
+        {
+            "name": "removeLiquiditySingleSide";
+            "accounts": [
+                {
+                    "name": "position";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "lbPair";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "binArrayBitmapExtension";
+                    "isMut": true;
+                    "isSigner": false;
+                    "isOptional": true;
+                },
+                {
+                    "name": "userToken";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "reserve";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "tokenMint";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "binArrayLower";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "binArrayUpper";
+                    "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "sender";
+                    "isMut": false;
+                    "isSigner": true;
+                },
+                {
+                    "name": "tokenProgram";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "eventAuthority";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "program";
+                    "isMut": false;
+                    "isSigner": false;
+                }
+            ];
+            "args": [];
+        },
         {
             "name": "togglePairStatus";
             "accounts": [
@@ -3720,38 +3787,38 @@ type LbClmm = {
             };
         },
         {
-            "name": "BinLiquidityReduction";
+            "name": "FeeParameter";
             "type": {
                 "kind": "struct";
                 "fields": [
                     {
-                        "name": "binId";
-                        "type": "i32";
+                        "name": "protocolShare";
+                        "docs": [
+                            "Portion of swap fees retained by the protocol by controlling protocol_share parameter. protocol_swap_fee = protocol_share * total_swap_fee"
+                        ];
+                        "type": "u16";
                     },
                     {
-                        "name": "bpsToRemove";
+                        "name": "baseFactor";
+                        "docs": [
+                            "Base factor for base fee rate"
+                        ];
                         "type": "u16";
                     }
                 ];
             };
         },
         {
-            "name": "FeeParameter";
+            "name": "BinLiquidityReduction";
             "type": {
                 "kind": "struct";
                 "fields": [
                     {
-                        "name": "protocolShare";
-                        "docs": [
-                            "Portion of swap fees retained by the protocol by controlling protocol_share parameter. protocol_swap_fee = protocol_share * total_swap_fee"
-                        ];
-                        "type": "u16";
+                        "name": "binId";
+                        "type": "i32";
                     },
                     {
-                        "name": "baseFactor";
-                        "docs": [
-                            "Base factor for base fee rate"
-                        ];
+                        "name": "bpsToRemove";
                         "type": "u16";
                     }
                 ];
@@ -5226,6 +5293,7 @@ interface SwapQuote {
     minOutAmount: BN;
     priceImpact: Decimal;
     binArraysPubkey: any[];
+    endPrice: Decimal;
 }
 interface SwapQuoteExactOut {
     inAmount: BN;
@@ -5538,12 +5606,6 @@ declare class DLMM {
      * @returns an object with two properties: "binId" which is a number, and "price" which is a string.
      */
     getActiveBin(): Promise<BinLiquidity>;
-    /**
-     * The function get the price of a bin based on its bin ID.
-     * @param {number} binId - The `binId` parameter is a number that represents the ID of a bin.
-     * @returns {number} the calculated price of a bin based on the provided binId.
-     */
-    getPriceOfBinByBinId(binId: number): string;
     /**
      * The function get bin ID based on a given price and a boolean flag indicating whether to
      * round down or up.
@@ -5648,6 +5710,12 @@ declare class DLMM {
         bps: BN;
         shouldClaimAndClose?: boolean;
     }): Promise<Transaction | Transaction[]>;
+    removeLiquiditySingleSide({ user, position, binIds, removeLiquidityForY, }: {
+        user: PublicKey;
+        position: PublicKey;
+        binIds: number[];
+        removeLiquidityForY?: boolean;
+    }): Promise<Transaction | Transaction[]>;
     /**
      * The `closePosition` function closes a position
      * @param
@@ -5848,13 +5916,16 @@ declare class DLMM {
      */
     syncWithMarketPrice(marketPrice: number, owner: PublicKey): Promise<Transaction>;
     getMaxPriceInBinArrays(binArrayAccounts: BinArrayAccount[]): Promise<string>;
+    getAmountOutWithdrawSingleSide(maxLiquidityShare: BN, price: BN, bin: Bin, isWithdrawForY: boolean): {
+        withdrawAmount: BN;
+    };
+    getWithdrawSingleSideAmount(positionPubkey: PublicKey, isWithdrawForY: boolean): Promise<BN>;
     /** Private static method */
     private static getBinArrays;
     private static getClaimableLMReward;
     private static getClaimableSwapFee;
     private static processPosition;
     private static getBinsBetweenLowerAndUpperBound;
-    private static getPriceOfBinByBinId;
     /** Private method */
     private processXYAmountDistribution;
     private getBins;

package/dist/index.js

@@ -2048,6 +2048,73 @@ var IDL = {
       ],
       "args": []
     },
+    {
+      "name": "removeLiquiditySingleSide",
+      "accounts": [
+        {
+          "name": "position",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "lbPair",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "binArrayBitmapExtension",
+          "isMut": true,
+          "isSigner": false,
+          "isOptional": true
+        },
+        {
+          "name": "userToken",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "reserve",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenMint",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "binArrayLower",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "binArrayUpper",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "sender",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "eventAuthority",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "program",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "togglePairStatus",
       "accounts": [
@@ -3724,38 +3791,38 @@ var IDL = {
       }
     },
     {
-      "name": "BinLiquidityReduction",
+      "name": "FeeParameter",
       "type": {
         "kind": "struct",
         "fields": [
           {
-            "name": "binId",
-            "type": "i32"
+            "name": "protocolShare",
+            "docs": [
+              "Portion of swap fees retained by the protocol by controlling protocol_share parameter. protocol_swap_fee = protocol_share * total_swap_fee"
+            ],
+            "type": "u16"
           },
           {
-            "name": "bpsToRemove",
+            "name": "baseFactor",
+            "docs": [
+              "Base factor for base fee rate"
+            ],
             "type": "u16"
           }
         ]
       }
     },
     {
-      "name": "FeeParameter",
+      "name": "BinLiquidityReduction",
       "type": {
         "kind": "struct",
         "fields": [
           {
-            "name": "protocolShare",
-            "docs": [
-              "Portion of swap fees retained by the protocol by controlling protocol_share parameter. protocol_swap_fee = protocol_share * total_swap_fee"
-            ],
-            "type": "u16"
+            "name": "binId",
+            "type": "i32"
           },
           {
-            "name": "baseFactor",
-            "docs": [
-              "Base factor for base fee rate"
-            ],
+            "name": "bpsToRemove",
             "type": "u16"
           }
         ]
@@ -8503,17 +8570,6 @@ var DLMM = class {
     );
     return activeBinState;
   }
-  /**
-   * The function get the price of a bin based on its bin ID.
-   * @param {number} binId - The `binId` parameter is a number that represents the ID of a bin.
-   * @returns {number} the calculated price of a bin based on the provided binId.
-   */
-  getPriceOfBinByBinId(binId) {
-    const binStepNum = new (0, _decimaljs2.default)(this.lbPair.binStep).div(
-      new (0, _decimaljs2.default)(BASIS_POINT_MAX)
-    );
-    return new (0, _decimaljs2.default)(1).add(new (0, _decimaljs2.default)(binStepNum)).pow(new (0, _decimaljs2.default)(binId)).toString();
-  }
   /**
    * The function get bin ID based on a given price and a boolean flag indicating whether to
    * round down or up.
@@ -9604,6 +9660,76 @@ var DLMM = class {
       }).add(removeLiquidityTx);
     }
   }
+  async removeLiquiditySingleSide({
+    user,
+    position,
+    binIds,
+    removeLiquidityForY = false
+  }) {
+    const { lbPair, lowerBinId, owner, feeOwner } = await this.program.account.positionV2.fetch(position);
+    const { reserveX, reserveY, tokenXMint, tokenYMint } = await this.program.account.lbPair.fetch(lbPair);
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new (0, _anchor.BN)(1));
+    const [binArrayLower] = deriveBinArray(
+      lbPair,
+      lowerBinArrayIndex,
+      this.program.programId
+    );
+    const [binArrayUpper] = deriveBinArray(
+      lbPair,
+      upperBinArrayIndex,
+      this.program.programId
+    );
+    const preInstructions = [];
+    const setComputeUnitLimitIx = computeBudgetIx();
+    preInstructions.push(setComputeUnitLimitIx);
+    const { ataPubKey: userToken, ix: createPayerTokenIx } = removeLiquidityForY ? await getOrCreateATAInstruction(
+      this.program.provider.connection,
+      this.tokenY.publicKey,
+      owner,
+      user
+    ) : await getOrCreateATAInstruction(
+      this.program.provider.connection,
+      this.tokenX.publicKey,
+      owner,
+      user
+    );
+    createPayerTokenIx && preInstructions.push(createPayerTokenIx);
+    const postInstructions = [];
+    if ([
+      this.tokenX.publicKey.toBase58(),
+      this.tokenY.publicKey.toBase58()
+    ].includes(_spltoken.NATIVE_MINT.toBase58())) {
+      const closeWrappedSOLIx = await unwrapSOLInstruction(user);
+      closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
+    }
+    const minBinId = Math.min(...binIds);
+    const maxBinId = Math.max(...binIds);
+    const minBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(minBinId));
+    const maxBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(maxBinId));
+    const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
+    const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
+    const reserve = removeLiquidityForY ? reserveY : reserveX;
+    const tokenMint = removeLiquidityForY ? tokenYMint : tokenXMint;
+    const removeLiquiditySingleSideTx = await this.program.methods.removeLiquiditySingleSide().accounts({
+      position,
+      lbPair,
+      binArrayBitmapExtension,
+      userToken,
+      reserve,
+      tokenMint,
+      binArrayLower,
+      binArrayUpper,
+      sender: user,
+      tokenProgram: _spltoken.TOKEN_PROGRAM_ID
+    }).preInstructions(preInstructions).transaction();
+    const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
+    return new (0, _web3js.Transaction)({
+      blockhash,
+      lastValidBlockHeight,
+      feePayer: user
+    }).add(removeLiquiditySingleSideTx);
+  }
   /**
    * The `closePosition` function closes a position
    * @param
@@ -9722,9 +9848,15 @@ var DLMM = class {
         }
       }
     }
-    const startPrice = this.getPriceOfBinByBinId(startBinId.toNumber());
-    const endPrice = this.getPriceOfBinByBinId(activeId.toNumber());
-    const priceImpact = new (0, _decimaljs2.default)(startPrice).sub(new (0, _decimaljs2.default)(endPrice)).abs().div(new (0, _decimaljs2.default)(startPrice)).mul(new (0, _decimaljs2.default)(100));
+    const startPrice = getPriceOfBinByBinId(
+      startBinId.toNumber(),
+      this.lbPair.binStep
+    );
+    const endPrice = getPriceOfBinByBinId(
+      activeId.toNumber(),
+      this.lbPair.binStep
+    );
+    const priceImpact = startPrice.sub(endPrice).abs().div(startPrice).mul(new (0, _decimaljs2.default)(100));
     const maxInAmount = actualInAmount.mul(new (0, _anchor.BN)(BASIS_POINT_MAX).add(allowedSlippage)).div(new (0, _anchor.BN)(BASIS_POINT_MAX));
     return {
       inAmount: actualInAmount,
@@ -9835,6 +9967,10 @@ var DLMM = class {
     );
     const priceImpact = new (0, _decimaljs2.default)(actualOutAmount.toString()).sub(new (0, _decimaljs2.default)(outAmountWithoutSlippage.toString())).div(new (0, _decimaljs2.default)(outAmountWithoutSlippage.toString())).mul(new (0, _decimaljs2.default)(100));
     const minOutAmount = actualOutAmount.mul(new (0, _anchor.BN)(BASIS_POINT_MAX).sub(allowedSlippage)).div(new (0, _anchor.BN)(BASIS_POINT_MAX));
+    const endPrice = getPriceOfBinByBinId(
+      activeId.toNumber(),
+      this.lbPair.binStep
+    );
     return {
       consumedInAmount: inAmount,
       outAmount: actualOutAmount,
@@ -9842,7 +9978,8 @@ var DLMM = class {
       protocolFee: protocolFeeAmount,
       minOutAmount,
       priceImpact,
-      binArraysPubkey: [...binArraysForSwap.keys()]
+      binArraysPubkey: [...binArraysForSwap.keys()],
+      endPrice
     };
   }
   async swapExactOut({
@@ -10823,6 +10960,108 @@ var DLMM = class {
       Number(binPriceWithLastLiquidity) / (2 ** 64 - 1)
     );
   }
+  getAmountOutWithdrawSingleSide(maxLiquidityShare, price, bin, isWithdrawForY) {
+    const amountX = mulDiv(
+      maxLiquidityShare,
+      bin.amountX,
+      bin.liquiditySupply,
+      1 /* Down */
+    );
+    const amountY = mulDiv(
+      maxLiquidityShare,
+      bin.amountY,
+      bin.liquiditySupply,
+      1 /* Down */
+    );
+    const amount0 = isWithdrawForY ? amountX : amountY;
+    const amount1 = isWithdrawForY ? amountY : amountX;
+    const remainAmountX = bin.amountX.sub(amountX);
+    const remainAmountY = bin.amountY.sub(amountY);
+    if (amount0.eq(new (0, _anchor.BN)(0))) {
+      return {
+        withdrawAmount: amount1
+      };
+    }
+    let maxAmountOut = isWithdrawForY ? remainAmountY : remainAmountX;
+    let maxAmountIn = isWithdrawForY ? shlDiv(remainAmountY, price, SCALE_OFFSET, 0 /* Up */) : mulShr(remainAmountX, price, SCALE_OFFSET, 0 /* Up */);
+    let maxFee = computeFee(
+      this.lbPair.binStep,
+      this.lbPair.parameters,
+      this.lbPair.vParameters,
+      maxAmountIn
+    );
+    maxAmountIn = maxAmountIn.add(maxFee);
+    if (amount0.gt(maxAmountIn)) {
+      return {
+        withdrawAmount: maxAmountOut
+      };
+    }
+    const fee = computeFeeFromAmount(
+      this.lbPair.binStep,
+      this.lbPair.parameters,
+      this.lbPair.vParameters,
+      amount0
+    );
+    const amount0AfterFee = amount0.sub(fee);
+    const amountOut = isWithdrawForY ? mulShr(price, amount0AfterFee, SCALE_OFFSET, 1 /* Down */) : shlDiv(amount0AfterFee, price, SCALE_OFFSET, 1 /* Down */);
+    return {
+      withdrawAmount: amount1.add(amountOut.gt(maxAmountOut) ? maxAmountOut : amountOut)
+    };
+  }
+  async getWithdrawSingleSideAmount(positionPubkey, isWithdrawForY) {
+    let totalWithdrawAmount = new (0, _anchor.BN)(0);
+    let lowerBinArray;
+    let upperBinArray;
+    const position = await this.program.account.positionV2.fetch(
+      positionPubkey
+    );
+    const lowerBinArrayIdx = binIdToBinArrayIndex(new (0, _anchor.BN)(position.lowerBinId));
+    const [lowerBinArrayPubKey] = deriveBinArray(
+      position.lbPair,
+      lowerBinArrayIdx,
+      this.program.programId
+    );
+    const upperBinArrayIdx = lowerBinArrayIdx.add(new (0, _anchor.BN)(1));
+    const [upperBinArrayPubKey] = deriveBinArray(
+      position.lbPair,
+      upperBinArrayIdx,
+      this.program.programId
+    );
+    [lowerBinArray, upperBinArray] = await this.program.account.binArray.fetchMultiple([
+      lowerBinArrayPubKey,
+      upperBinArrayPubKey
+    ]);
+    if (!lowerBinArray || !upperBinArray)
+      throw new Error("BinArray not found");
+    for (let idx = 0; idx < position.liquidityShares.length; idx++) {
+      const shareToRemove = position.liquidityShares[idx];
+      if (shareToRemove.eq(new (0, _anchor.BN)(0))) {
+        continue;
+      }
+      const binId = new (0, _anchor.BN)(position.lowerBinId).add(new (0, _anchor.BN)(idx));
+      const binArrayIndex = binIdToBinArrayIndex(binId);
+      const binArray = binArrayIndex.eq(lowerBinArrayIdx) ? lowerBinArray : upperBinArray;
+      const bin = getBinFromBinArray(binId.toNumber(), binArray);
+      if (isWithdrawForY) {
+        if (binId.gt(new (0, _anchor.BN)(this.lbPair.activeId))) {
+          break;
+        }
+      } else {
+        if (binId.lt(new (0, _anchor.BN)(this.lbPair.activeId))) {
+          continue;
+        }
+      }
+      const price = getQPriceFromId(binId, new (0, _anchor.BN)(this.lbPair.binStep));
+      const { withdrawAmount } = this.getAmountOutWithdrawSingleSide(
+        shareToRemove,
+        price,
+        bin,
+        isWithdrawForY
+      );
+      totalWithdrawAmount = totalWithdrawAmount.add(withdrawAmount);
+    }
+    return totalWithdrawAmount;
+  }
   /** Private static method */
   static async getBinArrays(program, lbPairPubkey) {
     return program.account.binArray.all([
@@ -11049,10 +11288,10 @@ var DLMM = class {
       binArray.bins.forEach((bin, idx) => {
         const binId = lowerBinIdForBinArray.toNumber() + idx;
         if (binId >= lowerBinId && binId <= upperBinId) {
-          const pricePerLamport = this.getPriceOfBinByBinId(
-            lbPair.binStep,
-            binId
-          );
+          const pricePerLamport = getPriceOfBinByBinId(
+            binId,
+            lbPair.binStep
+          ).toString();
           bins.push({
             binId,
             xAmount: bin.amountX,
@@ -11073,10 +11312,10 @@ var DLMM = class {
         binArray.bins.forEach((bin, idx) => {
           const binId = lowerBinIdForBinArray.toNumber() + idx;
           if (binId >= lowerBinId && binId <= upperBinId) {
-            const pricePerLamport = this.getPriceOfBinByBinId(
-              lbPair.binStep,
-              binId
-            );
+            const pricePerLamport = getPriceOfBinByBinId(
+              binId,
+              lbPair.binStep
+            ).toString();
             bins.push({
               binId,
               xAmount: bin.amountX,
@@ -11092,10 +11331,6 @@ var DLMM = class {
     }
     return bins;
   }
-  static getPriceOfBinByBinId(binStep, binId) {
-    const binStepNum = new (0, _decimaljs2.default)(binStep).div(new (0, _decimaljs2.default)(BASIS_POINT_MAX));
-    return new (0, _decimaljs2.default)(1).add(new (0, _decimaljs2.default)(binStepNum)).pow(new (0, _decimaljs2.default)(binId)).toString();
-  }
   /** Private method */
   processXYAmountDistribution(xYAmountDistribution) {
     let currentBinId = null;
@@ -11134,8 +11369,6 @@ var DLMM = class {
         const [lowerBinId2, upperBinId2] = getBinArrayLowerUpperBinId(lowerBinArrayIndex);
         const binArrayBins = [];
         for (let i = lowerBinId2.toNumber(); i <= upperBinId2.toNumber(); i++) {
-          const binId = new (0, _anchor.BN)(i);
-          const pricePerLamport = this.getPriceOfBinByBinId(binId.toNumber());
           binArrayBins.push({
             amountX: new (0, _anchor.BN)(0),
             amountY: new (0, _anchor.BN)(0),
@@ -11160,7 +11393,10 @@ var DLMM = class {
       binArray.bins.forEach((bin, idx) => {
         const binId = lowerBinIdForBinArray.toNumber() + idx;
         if (binId >= lowerBinId && binId <= upperBinId) {
-          const pricePerLamport = this.getPriceOfBinByBinId(binId);
+          const pricePerLamport = getPriceOfBinByBinId(
+            binId,
+            this.lbPair.binStep
+          ).toString();
           bins.push({
             binId,
             xAmount: bin.amountX,
@@ -11201,7 +11437,10 @@ var DLMM = class {
         binArray.bins.forEach((bin, idx) => {
           const binId = lowerBinIdForBinArray.toNumber() + idx;
           if (binId >= lowerBinId && binId <= upperBinId) {
-            const pricePerLamport = this.getPriceOfBinByBinId(binId);
+            const pricePerLamport = getPriceOfBinByBinId(
+              binId,
+              this.lbPair.binStep
+            ).toString();
             bins.push({
               binId,
               xAmount: bin.amountX,