@meteora-ag/dlmm 1.6.0 → 1.6.1-rc.1

package/dist/index.mjs

@@ -13891,26 +13891,23 @@ async function chunkDepositWithRebalanceEndpoint(dlmm, strategy, slippagePercent
     ]).instruction();
     calculatedAddLiquidityCU += DEFAULT_ADD_LIQUIDITY_CU;
     const addLiquidityIxs = [];
-    addLiquidityIxs.push(
-      ...initBitmapIxs,
-      ...initBinArrayIxs,
-      createUserTokenXIx,
-      createUserTokenYIx
-    );
-    if (dlmm.tokenX.publicKey.equals(NATIVE_MINT) && !totalXAmount.isZero()) {
+    addLiquidityIxs.push(...initBitmapIxs, ...initBinArrayIxs);
+    if (dlmm.tokenX.publicKey.equals(NATIVE_MINT)) {
       const wrapSOLIx = wrapSOLInstruction(
         owner,
         userTokenX,
         BigInt(totalXAmount.toString())
       );
+      addLiquidityIxs.push(createUserTokenXIx);
       addLiquidityIxs.push(...wrapSOLIx);
     }
-    if (dlmm.tokenY.publicKey.equals(NATIVE_MINT) && !totalYAmount.isZero()) {
+    if (dlmm.tokenY.publicKey.equals(NATIVE_MINT)) {
       const wrapSOLIx = wrapSOLInstruction(
         owner,
         userTokenY,
         BigInt(totalYAmount.toString())
       );
+      addLiquidityIxs.push(createUserTokenYIx);
       addLiquidityIxs.push(...wrapSOLIx);
     }
     addLiquidityIxs.push(rebalanceIx);
@@ -15631,6 +15628,7 @@ var DLMM = class {
    *   - "userPositions" which is an array of Position objects.
    */
   async getPositionsByUserAndLbPair(userPubKey) {
+    console.log(this.program.provider.connection.commitment);
     const promiseResults = await Promise.all([
       this.getActiveBin(),
       userPubKey && this.program.provider.connection.getProgramAccounts(
@@ -15934,6 +15932,41 @@ var DLMM = class {
     );
     const instructionsByPositions = [];
     let startBinId = minBinId;
+    const initializeAtaIxs = [];
+    if (!this.tokenX.publicKey.equals(NATIVE_MINT2)) {
+      const ownerAtaX = getAssociatedTokenAddressSync2(
+        this.tokenX.publicKey,
+        owner,
+        true,
+        this.tokenX.owner
+      );
+      initializeAtaIxs.push(
+        createAssociatedTokenAccountIdempotentInstruction2(
+          owner,
+          ownerAtaX,
+          owner,
+          this.tokenX.publicKey,
+          this.tokenX.owner
+        )
+      );
+    }
+    if (!this.tokenY.publicKey.equals(NATIVE_MINT2)) {
+      const ownerAtaY = getAssociatedTokenAddressSync2(
+        this.tokenY.publicKey,
+        owner,
+        true,
+        this.tokenY.owner
+      );
+      initializeAtaIxs.push(
+        createAssociatedTokenAccountIdempotentInstruction2(
+          owner,
+          ownerAtaY,
+          owner,
+          this.tokenY.publicKey,
+          this.tokenY.owner
+        )
+      );
+    }
     for (const position of positionKeypairs) {
       const endBinId = Math.min(
         startBinId + MAX_BINS_PER_POSITION.toNumber() - 1,
@@ -15966,6 +15999,7 @@ var DLMM = class {
       instructionsByPositions.push({
         positionKeypair: position,
         initializePositionIx: initPositionIx,
+        initializeAtaIxs,
         addLiquidityIxs: chunkedAddLiquidityIx
       });
       startBinId = endBinId + 1;