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

package/dist/index.mjs

@@ -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": [
@@ -2559,7 +2626,7 @@ var IDL = {
   ],
   "accounts": [
     {
-      "name": "binArrayBitmapExtension",
+      "name": "BinArrayBitmapExtension",
       "type": {
         "kind": "struct",
         "fields": [
@@ -2605,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:",
@@ -2654,7 +2721,7 @@ var IDL = {
       }
     },
     {
-      "name": "lbPair",
+      "name": "LbPair",
       "type": {
         "kind": "struct",
         "fields": [
@@ -2902,7 +2969,7 @@ var IDL = {
       }
     },
     {
-      "name": "oracle",
+      "name": "Oracle",
       "type": {
         "kind": "struct",
         "fields": [
@@ -2931,7 +2998,7 @@ var IDL = {
       }
     },
     {
-      "name": "position",
+      "name": "Position",
       "type": {
         "kind": "struct",
         "fields": [
@@ -3052,7 +3119,7 @@ var IDL = {
       }
     },
     {
-      "name": "positionV2",
+      "name": "PositionV2",
       "type": {
         "kind": "struct",
         "fields": [
@@ -3201,7 +3268,7 @@ var IDL = {
       }
     },
     {
-      "name": "presetParameter",
+      "name": "PresetParameter",
       "type": {
         "kind": "struct",
         "fields": [
@@ -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"
           }
         ]
@@ -6475,6 +6542,24 @@ function findNextBinArrayWithLiquidity(swapForY, activeBinId, lbPairState, binAr
   }
   return binArrayAccount;
 }
+function getBinArraysRequiredByPositionRange(pair, fromBinId, toBinId, programId) {
+  const [minBinId, maxBinId] = fromBinId.lt(toBinId) ? [fromBinId, toBinId] : [toBinId, fromBinId];
+  const positionCount = getPositionCount(minBinId, maxBinId);
+  const binArrays = /* @__PURE__ */ new Map();
+  for (let i = 0; i < positionCount.toNumber(); i++) {
+    const lowerBinId = minBinId.add(MAX_BIN_PER_POSITION.mul(new BN6(i)));
+    const lowerBinArrayIndex = binIdToBinArrayIndex(lowerBinId);
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN6(1));
+    const [lowerBinArray] = deriveBinArray(pair, lowerBinArrayIndex, programId);
+    const [upperBinArray] = deriveBinArray(pair, upperBinArrayIndex, programId);
+    binArrays.set(lowerBinArray.toBase58(), lowerBinArrayIndex);
+    binArrays.set(upperBinArray.toBase58(), upperBinArrayIndex);
+  }
+  return Array.from(binArrays, ([key, index]) => ({
+    key: new PublicKey3(key),
+    index
+  }));
+}
 
 // src/dlmm/helpers/fee.ts
 import { BN as BN7 } from "@coral-xyz/anchor";
@@ -7219,7 +7304,7 @@ async function getTokensMintFromPoolAddress(connection, poolAddress, opt) {
     LBCLMM_PROGRAM_IDS[opt?.cluster ?? "mainnet-beta"],
     provider
   );
-  const poolAccount = await program.account.lbPair.fetchNullable(
+  const poolAccount = await program.account.LbPair.fetchNullable(
     new PublicKey4(poolAddress)
   );
   if (!poolAccount)
@@ -7239,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);
@@ -7247,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;
@@ -7389,7 +7474,7 @@ var DLMM = class {
       opt?.programId ?? LBCLMM_PROGRAM_IDS[opt?.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 = opt?.cluster || "mainnet-beta";
@@ -7411,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(
@@ -7420,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;
       }
@@ -7651,7 +7736,7 @@ var DLMM = class {
       opt?.programId ?? LBCLMM_PROGRAM_IDS[opt?.cluster ?? "mainnet-beta"],
       provider
     );
-    const presetParameter = await program.account.presetParameter.all();
+    const presetParameter = await program.account.PresetParameter.all();
     return presetParameter;
   }
   /**
@@ -7678,7 +7763,7 @@ var DLMM = class {
       provider
     );
     const [positions, positionsV2] = await Promise.all([
-      program.account.position.all([
+      program.account.Position.all([
         {
           memcmp: {
             bytes: bs58.encode(userPubKey.toBuffer()),
@@ -7686,7 +7771,7 @@ var DLMM = class {
           }
         }
       ]),
-      program.account.positionV2.all([
+      program.account.PositionV2.all([
         {
           memcmp: {
             bytes: bs58.encode(userPubKey.toBuffer()),
@@ -8033,7 +8118,7 @@ var DLMM = class {
       opt?.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");
@@ -8246,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: bs58.encode(this.pubkey.toBuffer()),
@@ -8475,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,
@@ -8525,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: bs58.encode(userPubKey.toBuffer()),
@@ -8539,7 +8624,7 @@ var DLMM = class {
           }
         }
       ]),
-      userPubKey && this.program.account.positionV2.all([
+      userPubKey && this.program.account.PositionV2.all([
         {
           memcmp: {
             bytes: bs58.encode(userPubKey.toBuffer()),
@@ -9226,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);
@@ -9425,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 BN9(lowerBinId));
     const upperBinArrayIndex = lowerBinArrayIndex.add(new BN9(1));
     const [binArrayLower] = deriveBinArray(
@@ -9586,6 +9671,77 @@ var DLMM = class {
       }).add(removeLiquidityTx);
     }
   }
+  async removeLiquiditySingleSide({
+    user,
+    position,
+    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 lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(lowerBinId));
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN9(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(NATIVE_MINT2.toBase58())) {
+      const closeWrappedSOLIx = await unwrapSOLInstruction(user);
+      closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
+    }
+    const minBinId = Math.min(...binIds);
+    const maxBinId = Math.max(...binIds);
+    const minBinArrayIndex = binIdToBinArrayIndex(new BN9(minBinId));
+    const maxBinArrayIndex = binIdToBinArrayIndex(new BN9(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: TOKEN_PROGRAM_ID2
+    }).preInstructions(preInstructions).transaction();
+    const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
+    return new Transaction({
+      blockhash,
+      lastValidBlockHeight,
+      feePayer: user
+    }).add(removeLiquiditySingleSideTx);
+  }
   /**
    * The `closePosition` function closes a position
    * @param
@@ -9597,7 +9753,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 BN9(lowerBinId));
@@ -9836,7 +9992,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 },
@@ -9921,7 +10077,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 },
@@ -10010,7 +10166,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 },
@@ -10113,7 +10269,9 @@ var DLMM = class {
     positions
   }) {
     const claimAllTxs = (await Promise.all(
-      positions.filter(({ positionData: { rewardOne, rewardTwo } }) => !rewardOne.isZero() || !rewardTwo.isZero()).map(async (position, idx) => {
+      positions.filter(
+        ({ positionData: { rewardOne, rewardTwo } }) => !rewardOne.isZero() || !rewardTwo.isZero()
+      ).map(async (position, idx) => {
         return await this.createClaimBuildMethod({
           owner,
           position,
@@ -10197,7 +10355,9 @@ var DLMM = class {
     positions
   }) {
     const claimAllTxs = (await Promise.all(
-      positions.filter(({ positionData: { feeX, feeY } }) => !feeX.isZero() || !feeY.isZero()).map(async (position, idx, positions2) => {
+      positions.filter(
+        ({ positionData: { feeX, feeY } }) => !feeX.isZero() || !feeY.isZero()
+      ).map(async (position, idx, positions2) => {
         return await this.createClaimSwapFeeMethod({
           owner,
           position,
@@ -10492,6 +10652,34 @@ var DLMM = class {
       addLiquidityIxs
     };
   }
+  /**
+   * Initializes bin arrays for the given bin array indexes if it wasn't initialized.
+   *
+   * @param {BN[]} binArrayIndexes - An array of bin array indexes to initialize.
+   * @param {PublicKey} funder - The public key of the funder.
+   * @return {Promise<TransactionInstruction[]>} An array of transaction instructions to initialize the bin arrays.
+   */
+  async initializeBinArrays(binArrayIndexes, funder) {
+    const ixs = [];
+    for (const idx of binArrayIndexes) {
+      const [binArray] = deriveBinArray(
+        this.pubkey,
+        idx,
+        this.program.programId
+      );
+      const binArrayAccount = await this.program.provider.connection.getAccountInfo(binArray);
+      if (binArrayAccount === null) {
+        ixs.push(
+          await this.program.methods.initializeBinArray(idx).accounts({
+            binArray,
+            funder,
+            lbPair: this.pubkey
+          }).instruction()
+        );
+      }
+    }
+    return ixs;
+  }
   /**
    *
    * @param
@@ -10591,7 +10779,9 @@ var DLMM = class {
     );
     createATAAccAndIx.forEach(({ ix }) => ix && preInstructions.push(ix));
     const claimAllSwapFeeTxs = (await Promise.all(
-      positions.filter(({ positionData: { feeX, feeY } }) => !feeX.isZero() || !feeY.isZero()).map(async (position) => {
+      positions.filter(
+        ({ positionData: { feeX, feeY } }) => !feeX.isZero() || !feeY.isZero()
+      ).map(async (position) => {
         return await this.createClaimSwapFeeMethod({
           owner,
           position,
@@ -10601,7 +10791,9 @@ var DLMM = class {
       })
     )).flat();
     const claimAllLMTxs = (await Promise.all(
-      positions.filter(({ positionData: { rewardOne, rewardTwo } }) => !rewardOne.isZero() || !rewardTwo.isZero()).map(async (position) => {
+      positions.filter(
+        ({ positionData: { rewardOne, rewardTwo } }) => !rewardOne.isZero() || !rewardTwo.isZero()
+      ).map(async (position) => {
         return await this.createClaimBuildMethod({
           owner,
           position,
@@ -10771,7 +10963,7 @@ var DLMM = class {
   }
   /** Private static method */
   static async getBinArrays(program, lbPairPubkey) {
-    return program.account.binArray.all([
+    return program.account.BinArray.all([
       {
         memcmp: {
           bytes: bs58.encode(lbPairPubkey.toBuffer()),
@@ -10800,7 +10992,7 @@ var DLMM = class {
         upperBinArrayIdx,
         program.programId
       );
-      [_lowerBinArray, _upperBinArray] = await program.account.binArray.fetchMultiple([
+      [_lowerBinArray, _upperBinArray] = await program.account.BinArray.fetchMultiple([
         lowerBinArray2,
         upperBinArray2
       ]);
@@ -10871,7 +11063,7 @@ var DLMM = class {
         upperBinArrayIdx,
         program.programId
       );
-      [_lowerBinArray, _upperBinArray] = await program.account.binArray.fetchMultiple([
+      [_lowerBinArray, _upperBinArray] = await program.account.BinArray.fetchMultiple([
         lowerBinArray2,
         upperBinArray2
       ]);
@@ -11076,7 +11268,7 @@ var DLMM = class {
         lowerBinArrayIndex,
         this.program.programId
       );
-      const binArray = lowerBinArrays ?? await this.program.account.binArray.fetch(binArrayPubKey).catch(() => {
+      const binArray = lowerBinArrays ?? await this.program.account.BinArray.fetch(binArrayPubKey).catch(() => {
         const [lowerBinId2, upperBinId2] = getBinArrayLowerUpperBinId(lowerBinArrayIndex);
         const binArrayBins = [];
         for (let i = lowerBinId2.toNumber(); i <= upperBinId2.toNumber(); i++) {
@@ -11131,7 +11323,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);
@@ -11448,6 +11640,7 @@ export {
   fromWeightDistributionToAmountOneSide,
   getBaseFee,
   getBinArrayLowerUpperBinId,
+  getBinArraysRequiredByPositionRange,
   getBinFromBinArray,
   getOrCreateATAInstruction,
   getOutAmount,