@meteora-ag/dlmm 1.1.5 → 1.2.2-rc.0

package/dist/index.mjs

@@ -8938,6 +8938,41 @@ var DLMM = class {
       positionCost
     };
   }
+  /**
+   * Creates an empty position and initializes the corresponding bin arrays if needed.
+   * @param param0 The settings of the requested new position.
+   * @returns A promise that resolves into a transaction for creating the requested position.
+   */
+  async createEmptyPosition({
+    positionPubKey,
+    minBinId,
+    maxBinId,
+    user
+  }) {
+    const setComputeUnitLimitIx = computeBudgetIx();
+    const createPositionIx = await this.program.methods.initializePosition(minBinId, maxBinId - minBinId + 1).accounts({
+      payer: user,
+      position: positionPubKey,
+      lbPair: this.pubkey,
+      owner: user
+    }).instruction();
+    const lowerBinArrayIndex = binIdToBinArrayIndex(new BN9(minBinId));
+    const upperBinArrayIndex = BN9.max(
+      lowerBinArrayIndex.add(new BN9(1)),
+      binIdToBinArrayIndex(new BN9(maxBinId))
+    );
+    const createBinArrayIxs = await this.createBinArraysIfNeeded(
+      upperBinArrayIndex,
+      lowerBinArrayIndex,
+      user
+    );
+    const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
+    return new Transaction({
+      blockhash,
+      lastValidBlockHeight,
+      feePayer: user
+    }).add(setComputeUnitLimitIx, createPositionIx, ...createBinArrayIxs);
+  }
   /**
    * The function `initializePositionAndAddLiquidityByStrategy` function is used to initializes a position and adds liquidity
    * @param {TInitializePositionAndAddLiquidityParamsByStrategy}
@@ -9776,74 +9811,6 @@ 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 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 = [];
-    const shouldUnwrapSOL = removeLiquidityForY && this.tokenY.publicKey.equals(NATIVE_MINT2) || !removeLiquidityForY && this.tokenX.publicKey.equals(NATIVE_MINT2);
-    if (shouldUnwrapSOL) {
-      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).postInstructions(postInstructions).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
@@ -11612,17 +11579,20 @@ var DLMM = class {
     ).map((idx) => new BN9(idx));
     const binArrays = [];
     for (const idx of binArrayIndexes) {
-      const [binArray] = deriveBinArray(
+      const [binArrayPubKey] = deriveBinArray(
         this.pubkey,
         idx,
         this.program.programId
       );
-      const binArrayAccount = await this.program.provider.connection.getAccountInfo(binArray);
-      if (binArrayAccount === null) {
-        binArrays.push(binArray);
-      }
+      binArrays.push(binArrayPubKey);
     }
-    return binArrays;
+    const binArrayAccounts = await this.program.provider.connection.getMultipleAccountsInfo(binArrays);
+    console.log(
+      binArrays.map((binArray, index) => ({
+        [binArray.toBase58()]: binArrayAccounts[index]
+      }))
+    );
+    return binArrayAccounts.filter((binArray) => binArray === null);
   }
   async createBinArraysIfNeeded(upperBinArrayIndex, lowerBinArrayIndex, funder) {
     const ixs = [];