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

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";
                     }
                 ];
@@ -5648,6 +5715,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,6 +5921,10 @@ 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;

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"
           }
         ]
@@ -9604,6 +9671,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
@@ -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 > 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 [lowerBinArray] = deriveBinArray(
+      position.lbPair,
+      lowerBinArrayIdx,
+      this.program.programId
+    );
+    const upperBinArrayIdx = lowerBinArrayIdx.add(new (0, _anchor.BN)(1));
+    const [upperBinArray] = deriveBinArray(
+      position.lbPair,
+      upperBinArrayIdx,
+      this.program.programId
+    );
+    [_lowerBinArray, _upperBinArray] = await this.program.account.binArray.fetchMultiple([
+      lowerBinArray,
+      upperBinArray
+    ]);
+    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([