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

package/dist/index.d.ts

@@ -2622,7 +2622,7 @@ type LbClmm = {
     ];
     "accounts": [
         {
-            "name": "BinArrayBitmapExtension";
+            "name": "binArrayBitmapExtension";
             "type": {
                 "kind": "struct";
                 "fields": [
@@ -2668,7 +2668,7 @@ type LbClmm = {
             };
         },
         {
-            "name": "BinArray";
+            "name": "binArray";
             "docs": [
                 "An account to contain a range of bin. For example: Bin 100 <-> 200.",
                 "For example:",
@@ -2717,7 +2717,7 @@ type LbClmm = {
             };
         },
         {
-            "name": "LbPair";
+            "name": "lbPair";
             "type": {
                 "kind": "struct";
                 "fields": [
@@ -2965,7 +2965,7 @@ type LbClmm = {
             };
         },
         {
-            "name": "Oracle";
+            "name": "oracle";
             "type": {
                 "kind": "struct";
                 "fields": [
@@ -2994,7 +2994,7 @@ type LbClmm = {
             };
         },
         {
-            "name": "Position";
+            "name": "position";
             "type": {
                 "kind": "struct";
                 "fields": [
@@ -3115,7 +3115,7 @@ type LbClmm = {
             };
         },
         {
-            "name": "PositionV2";
+            "name": "positionV2";
             "type": {
                 "kind": "struct";
                 "fields": [
@@ -3264,7 +3264,7 @@ type LbClmm = {
             };
         },
         {
-            "name": "PresetParameter";
+            "name": "presetParameter";
             "type": {
                 "kind": "struct";
                 "fields": [
@@ -5147,20 +5147,20 @@ interface TokenReserve {
     decimal: number;
 }
 type ClmmProgram = Program<LbClmm>;
-type LbPair = IdlAccounts<LbClmm>["LbPair"];
-type LbPairAccount = ProgramAccount<IdlAccounts<LbClmm>["LbPair"]>;
+type LbPair = IdlAccounts<LbClmm>["lbPair"];
+type LbPairAccount = ProgramAccount<IdlAccounts<LbClmm>["lbPair"]>;
 type Bin = IdlTypes<LbClmm>["Bin"];
-type BinArray = IdlAccounts<LbClmm>["BinArray"];
-type BinArrayAccount = ProgramAccount<IdlAccounts<LbClmm>["BinArray"]>;
-type Position = IdlAccounts<LbClmm>["Position"];
-type PositionV2 = IdlAccounts<LbClmm>["PositionV2"];
-type vParameters = IdlAccounts<LbClmm>["LbPair"]["vParameters"];
-type sParameters = IdlAccounts<LbClmm>["LbPair"]["parameters"];
+type BinArray = IdlAccounts<LbClmm>["binArray"];
+type BinArrayAccount = ProgramAccount<IdlAccounts<LbClmm>["binArray"]>;
+type Position = IdlAccounts<LbClmm>["position"];
+type PositionV2 = IdlAccounts<LbClmm>["positionV2"];
+type vParameters = IdlAccounts<LbClmm>["lbPair"]["vParameters"];
+type sParameters = IdlAccounts<LbClmm>["lbPair"]["parameters"];
 type InitPermissionPairIx = IdlTypes<LbClmm>["InitPermissionPairIx"];
 type BinLiquidityDistribution = IdlTypes<LbClmm>["BinLiquidityDistribution"];
 type BinLiquidityReduction = IdlTypes<LbClmm>["BinLiquidityReduction"];
-type BinArrayBitmapExtensionAccount = ProgramAccount<IdlAccounts<LbClmm>["BinArrayBitmapExtension"]>;
-type BinArrayBitmapExtension = IdlAccounts<LbClmm>["BinArrayBitmapExtension"];
+type BinArrayBitmapExtensionAccount = ProgramAccount<IdlAccounts<LbClmm>["binArrayBitmapExtension"]>;
+type BinArrayBitmapExtension = IdlAccounts<LbClmm>["binArrayBitmapExtension"];
 type LiquidityParameterByWeight = IdlTypes<LbClmm>["LiquidityParameterByWeight"];
 type LiquidityOneSideParameter = IdlTypes<LbClmm>["LiquidityOneSideParameter"];
 type LiquidityParameterByStrategy = IdlTypes<LbClmm>["LiquidityParameterByStrategy"];
@@ -5921,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

@@ -2626,7 +2626,7 @@ var IDL = {
   ],
   "accounts": [
     {
-      "name": "BinArrayBitmapExtension",
+      "name": "binArrayBitmapExtension",
       "type": {
         "kind": "struct",
         "fields": [
@@ -2672,7 +2672,7 @@ var IDL = {
       }
     },
     {
-      "name": "BinArray",
+      "name": "binArray",
       "docs": [
         "An account to contain a range of bin. For example: Bin 100 <-> 200.",
         "For example:",
@@ -2721,7 +2721,7 @@ var IDL = {
       }
     },
     {
-      "name": "LbPair",
+      "name": "lbPair",
       "type": {
         "kind": "struct",
         "fields": [
@@ -2969,7 +2969,7 @@ var IDL = {
       }
     },
     {
-      "name": "Oracle",
+      "name": "oracle",
       "type": {
         "kind": "struct",
         "fields": [
@@ -2998,7 +2998,7 @@ var IDL = {
       }
     },
     {
-      "name": "Position",
+      "name": "position",
       "type": {
         "kind": "struct",
         "fields": [
@@ -3119,7 +3119,7 @@ var IDL = {
       }
     },
     {
-      "name": "PositionV2",
+      "name": "positionV2",
       "type": {
         "kind": "struct",
         "fields": [
@@ -3268,7 +3268,7 @@ var IDL = {
       }
     },
     {
-      "name": "PresetParameter",
+      "name": "presetParameter",
       "type": {
         "kind": "struct",
         "fields": [
@@ -7304,7 +7304,7 @@ async function getTokensMintFromPoolAddress(connection, poolAddress, opt) {
     LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _18 => _18.cluster]), () => ( "mainnet-beta"))],
     provider
   );
-  const poolAccount = await program.account.LbPair.fetchNullable(
+  const poolAccount = await program.account.lbPair.fetchNullable(
     new (0, _web3js.PublicKey)(poolAddress)
   );
   if (!poolAccount)
@@ -7324,7 +7324,7 @@ function chunks(array, size) {
 async function chunkedFetchMultiplePoolAccount(program, pks, chunkSize = 100) {
   const accounts = (await Promise.all(
     chunks(pks, chunkSize).map(
-      (chunk) => program.account.LbPair.fetchMultiple(chunk)
+      (chunk) => program.account.lbPair.fetchMultiple(chunk)
     )
   )).flat();
   return accounts.filter(Boolean);
@@ -7332,7 +7332,7 @@ async function chunkedFetchMultiplePoolAccount(program, pks, chunkSize = 100) {
 async function chunkedFetchMultipleBinArrayBitmapExtensionAccount(program, pks, chunkSize = 100) {
   const accounts = (await Promise.all(
     chunks(pks, chunkSize).map(
-      (chunk) => program.account.BinArrayBitmapExtension.fetchMultiple(chunk)
+      (chunk) => program.account.binArrayBitmapExtension.fetchMultiple(chunk)
     )
   )).flat();
   return accounts;
@@ -7474,7 +7474,7 @@ var DLMM = class {
       _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _21 => _21.programId]), () => ( LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _22 => _22.cluster]), () => ( "mainnet-beta"))])),
       provider
     );
-    return program.account.LbPair.all();
+    return program.account.lbPair.all();
   }
   static async getPairPubkeyIfExists(connection, tokenX, tokenY, binStep, baseFactor, opt) {
     const cluster = _optionalChain([opt, 'optionalAccess', _23 => _23.cluster]) || "mainnet-beta";
@@ -7496,7 +7496,7 @@ var DLMM = class {
         baseFactor,
         program.programId
       );
-      const account2 = await program.account.LbPair.fetchNullable(lbPair2Key);
+      const account2 = await program.account.lbPair.fetchNullable(lbPair2Key);
       if (account2)
         return lbPair2Key;
       const [lbPairKey] = deriveLbPair(
@@ -7505,7 +7505,7 @@ var DLMM = class {
         binStep,
         program.programId
       );
-      const account = await program.account.LbPair.fetchNullable(lbPairKey);
+      const account = await program.account.lbPair.fetchNullable(lbPairKey);
       if (account && account.parameters.baseFactor === baseFactor.toNumber()) {
         return lbPairKey;
       }
@@ -7736,7 +7736,7 @@ var DLMM = class {
       _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _37 => _37.programId]), () => ( LBCLMM_PROGRAM_IDS[_nullishCoalesce(_optionalChain([opt, 'optionalAccess', _38 => _38.cluster]), () => ( "mainnet-beta"))])),
       provider
     );
-    const presetParameter = await program.account.PresetParameter.all();
+    const presetParameter = await program.account.presetParameter.all();
     return presetParameter;
   }
   /**
@@ -7763,7 +7763,7 @@ var DLMM = class {
       provider
     );
     const [positions, positionsV2] = await Promise.all([
-      program.account.Position.all([
+      program.account.position.all([
         {
           memcmp: {
             bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
@@ -7771,7 +7771,7 @@ var DLMM = class {
           }
         }
       ]),
-      program.account.PositionV2.all([
+      program.account.positionV2.all([
         {
           memcmp: {
             bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
@@ -8118,7 +8118,7 @@ var DLMM = class {
       _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _60 => _60.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
       provider
     );
-    const positionsState = await program.account.Position.fetchMultiple(
+    const positionsState = await program.account.position.fetchMultiple(
       positions
     );
     const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash("confirmed");
@@ -8331,7 +8331,7 @@ var DLMM = class {
    * @returns a Promise that resolves to an array of BinArrayAccount objects.
    */
   async getBinArrays() {
-    return this.program.account.BinArray.all([
+    return this.program.account.binArray.all([
       {
         memcmp: {
           bytes: _bytes.bs58.encode(this.pubkey.toBuffer()),
@@ -8560,7 +8560,7 @@ var DLMM = class {
    * @returns an object with two properties: "binId" which is a number, and "price" which is a string.
    */
   async getActiveBin() {
-    const { activeId } = await this.program.account.LbPair.fetch(this.pubkey);
+    const { activeId } = await this.program.account.lbPair.fetch(this.pubkey);
     const [activeBinState] = await this.getBins(
       this.pubkey,
       activeId,
@@ -8610,7 +8610,7 @@ var DLMM = class {
   async getPositionsByUserAndLbPair(userPubKey) {
     const promiseResults = await Promise.all([
       this.getActiveBin(),
-      userPubKey && this.program.account.Position.all([
+      userPubKey && this.program.account.position.all([
         {
           memcmp: {
             bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
@@ -8624,7 +8624,7 @@ var DLMM = class {
           }
         }
       ]),
-      userPubKey && this.program.account.PositionV2.all([
+      userPubKey && this.program.account.positionV2.all([
         {
           memcmp: {
             bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
@@ -9311,7 +9311,7 @@ var DLMM = class {
     slippage
   }) {
     const maxActiveBinSlippage = slippage ? Math.ceil(slippage / (this.lbPair.binStep / 100)) : MAX_ACTIVE_BIN_SLIPPAGE;
-    const positionAccount = await this.program.account.PositionV2.fetch(
+    const positionAccount = await this.program.account.positionV2.fetch(
       positionPubKey
     );
     const { lowerBinId, upperBinId, binIds } = this.processXYAmountDistribution(xYAmountDistribution);
@@ -9510,8 +9510,8 @@ var DLMM = class {
     bps,
     shouldClaimAndClose = 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 { 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(
@@ -9677,9 +9677,8 @@ var DLMM = class {
     binIds,
     removeLiquidityForY = false
   }) {
-    const { lbPair, lowerBinId, owner, feeOwner } = await this.program.account.PositionV2.fetch(position);
-    console.log("removeLiquidityFor2Y", removeLiquidityForY);
-    const { reserveX, reserveY, tokenXMint, tokenYMint } = await this.program.account.LbPair.fetch(lbPair);
+    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(
@@ -9753,7 +9752,7 @@ var DLMM = class {
     owner,
     position
   }) {
-    const { lowerBinId } = await this.program.account.PositionV2.fetch(
+    const { lowerBinId } = await this.program.account.positionV2.fetch(
       position.publicKey
     );
     const lowerBinArrayIndex = binIdToBinArrayIndex(new (0, _anchor.BN)(lowerBinId));
@@ -9992,7 +9991,7 @@ var DLMM = class {
     user,
     binArraysPubkey
   }) {
-    const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.LbPair.fetch(lbPair);
+    const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [computeBudgetIx()];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
@@ -10077,7 +10076,7 @@ var DLMM = class {
     priceImpact,
     binArraysPubkey
   }) {
-    const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.LbPair.fetch(lbPair);
+    const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [computeBudgetIx()];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
@@ -10166,7 +10165,7 @@ var DLMM = class {
     user,
     binArraysPubkey
   }) {
-    const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.LbPair.fetch(lbPair);
+    const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [computeBudgetIx()];
     const [
       { ataPubKey: userTokenIn, ix: createInTokenAccountIx },
@@ -10961,9 +10960,111 @@ 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([
+    return program.account.binArray.all([
       {
         memcmp: {
           bytes: _bytes.bs58.encode(lbPairPubkey.toBuffer()),
@@ -10992,7 +11093,7 @@ var DLMM = class {
         upperBinArrayIdx,
         program.programId
       );
-      [_lowerBinArray, _upperBinArray] = await program.account.BinArray.fetchMultiple([
+      [_lowerBinArray, _upperBinArray] = await program.account.binArray.fetchMultiple([
         lowerBinArray2,
         upperBinArray2
       ]);
@@ -11063,7 +11164,7 @@ var DLMM = class {
         upperBinArrayIdx,
         program.programId
       );
-      [_lowerBinArray, _upperBinArray] = await program.account.BinArray.fetchMultiple([
+      [_lowerBinArray, _upperBinArray] = await program.account.binArray.fetchMultiple([
         lowerBinArray2,
         upperBinArray2
       ]);
@@ -11268,7 +11369,7 @@ var DLMM = class {
         lowerBinArrayIndex,
         this.program.programId
       );
-      const binArray = await _asyncNullishCoalesce(lowerBinArrays, async () => ( await this.program.account.BinArray.fetch(binArrayPubKey).catch(() => {
+      const binArray = await _asyncNullishCoalesce(lowerBinArrays, async () => ( await this.program.account.binArray.fetch(binArrayPubKey).catch(() => {
         const [lowerBinId2, upperBinId2] = getBinArrayLowerUpperBinId(lowerBinArrayIndex);
         const binArrayBins = [];
         for (let i = lowerBinId2.toNumber(); i <= upperBinId2.toNumber(); i++) {
@@ -11323,7 +11424,7 @@ var DLMM = class {
       );
       const binArrays = await (async () => {
         if (!lowerBinArrays || !upperBinArrays) {
-          return (await this.program.account.BinArray.fetchMultiple([
+          return (await this.program.account.binArray.fetchMultiple([
             lowerBinArrayPubKey,
             upperBinArrayPubKey
           ])).filter((binArray) => binArray !== null);