@meteora-ag/dlmm 1.4.6 → 1.4.7-rc.1

package/dist/index.mjs

@@ -14265,10 +14265,10 @@ var DLMM = class {
       } else {
         const createPositionOwnerTokenXIx = createAssociatedTokenAccountIdempotentInstruction2(
           payer,
+          positionOwnerTokenX,
           positionOwner,
           this.lbPair.tokenXMint,
-          this.tokenX.owner,
-          positionOwnerTokenX
+          this.tokenX.owner
         );
         preInstructions.push(createPositionOwnerTokenXIx);
         const transferIx = createTransferCheckedInstruction2(
@@ -14571,12 +14571,17 @@ var DLMM = class {
       this.lbPair,
       this.binArrayBitmapExtension?.account ?? null
     );
-    const accountsToFetch = [];
-    const [binArrayBitMapExtensionPubkey] = deriveBinArrayBitmapExtension(
-      this.pubkey,
-      this.program.programId
+    const marketPriceBinArrayIndex = findNextBinArrayIndexWithLiquidity(
+      swapForY,
+      new BN13(marketPriceBinId),
+      this.lbPair,
+      this.binArrayBitmapExtension?.account ?? null
     );
-    accountsToFetch.push(binArrayBitMapExtensionPubkey);
+    const accountsToFetch = [];
+    const binArrayBitMapExtensionPubkey = isOverflowDefaultBinArrayBitmap(
+      new BN13(marketPriceBinArrayIndex)
+    ) ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
+    binArrayBitMapExtensionPubkey && accountsToFetch.push(binArrayBitMapExtensionPubkey);
     const [fromBinArrayPubkey] = deriveBinArray(
       this.pubkey,
       fromBinArrayIndex,
@@ -14597,11 +14602,20 @@ var DLMM = class {
     const binArrayAccounts = await this.program.provider.connection.getMultipleAccountsInfo(
       accountsToFetch
     );
+    const preInstructions = [];
     let fromBinArray = null;
     let toBinArray = null;
     let binArrayBitmapExtension = null;
-    if (!!binArrayAccounts?.[0]) {
+    if (binArrayBitMapExtensionPubkey) {
       binArrayBitmapExtension = binArrayBitMapExtensionPubkey;
+      if (!binArrayAccounts?.[0]) {
+        const initializeBitmapExtensionIx = await this.program.methods.initializeBinArrayBitmapExtension().accounts({
+          binArrayBitmapExtension: binArrayBitMapExtensionPubkey,
+          funder: owner,
+          lbPair: this.pubkey
+        }).instruction();
+        preInstructions.push(initializeBitmapExtensionIx);
+      }
     }
     if (!!binArrayAccounts?.[1]) {
       fromBinArray = fromBinArrayPubkey;
@@ -14615,7 +14629,7 @@ var DLMM = class {
       binArrayBitmapExtension,
       fromBinArray,
       toBinArray
-    }).transaction();
+    }).preInstructions(preInstructions).transaction();
     return new Transaction({
       feePayer: owner,
       blockhash,