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

package/dist/index.js

@@ -14265,10 +14265,10 @@ var DLMM = class {
       } else {
         const createPositionOwnerTokenXIx = _spltoken.createAssociatedTokenAccountIdempotentInstruction.call(void 0, 
           payer,
+          positionOwnerTokenX,
           positionOwner,
           this.lbPair.tokenXMint,
-          this.tokenX.owner,
-          positionOwnerTokenX
+          this.tokenX.owner
         );
         preInstructions.push(createPositionOwnerTokenXIx);
         const transferIx = _spltoken.createTransferCheckedInstruction.call(void 0, 
@@ -14571,12 +14571,17 @@ var DLMM = class {
       this.lbPair,
       _nullishCoalesce(_optionalChain([this, 'access', _94 => _94.binArrayBitmapExtension, 'optionalAccess', _95 => _95.account]), () => ( null))
     );
-    const accountsToFetch = [];
-    const [binArrayBitMapExtensionPubkey] = deriveBinArrayBitmapExtension(
-      this.pubkey,
-      this.program.programId
+    const marketPriceBinArrayIndex = findNextBinArrayIndexWithLiquidity(
+      swapForY,
+      new (0, _anchor.BN)(marketPriceBinId),
+      this.lbPair,
+      _nullishCoalesce(_optionalChain([this, 'access', _96 => _96.binArrayBitmapExtension, 'optionalAccess', _97 => _97.account]), () => ( null))
     );
-    accountsToFetch.push(binArrayBitMapExtensionPubkey);
+    const accountsToFetch = [];
+    const binArrayBitMapExtensionPubkey = isOverflowDefaultBinArrayBitmap(
+      new (0, _anchor.BN)(marketPriceBinArrayIndex)
+    ) ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
+    binArrayBitMapExtensionPubkey && accountsToFetch.push(binArrayBitMapExtensionPubkey);
     const [fromBinArrayPubkey] = deriveBinArray(
       this.pubkey,
       fromBinArrayIndex,
@@ -14597,16 +14602,25 @@ var DLMM = class {
     const binArrayAccounts = await this.program.provider.connection.getMultipleAccountsInfo(
       accountsToFetch
     );
+    const preInstructions = [];
     let fromBinArray = null;
     let toBinArray = null;
     let binArrayBitmapExtension = null;
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _96 => _96[0]])) {
+    if (binArrayBitMapExtensionPubkey) {
       binArrayBitmapExtension = binArrayBitMapExtensionPubkey;
+      if (!_optionalChain([binArrayAccounts, 'optionalAccess', _98 => _98[0]])) {
+        const initializeBitmapExtensionIx = await this.program.methods.initializeBinArrayBitmapExtension().accounts({
+          binArrayBitmapExtension: binArrayBitMapExtensionPubkey,
+          funder: owner,
+          lbPair: this.pubkey
+        }).instruction();
+        preInstructions.push(initializeBitmapExtensionIx);
+      }
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _97 => _97[1]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _99 => _99[1]])) {
       fromBinArray = fromBinArrayPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _98 => _98[2]]) && !!toBinArrayIndex) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _100 => _100[2]]) && !!toBinArrayIndex) {
       toBinArray = toBinArrayPubkey;
     }
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
@@ -14615,7 +14629,7 @@ var DLMM = class {
       binArrayBitmapExtension,
       fromBinArray,
       toBinArray
-    }).transaction();
+    }).preInstructions(preInstructions).transaction();
     return new (0, _web3js.Transaction)({
       feePayer: owner,
       blockhash,
@@ -14946,7 +14960,7 @@ var DLMM = class {
         );
       })
     );
-    const version = _nullishCoalesce(_optionalChain([binArrays, 'access', _99 => _99.find, 'call', _100 => _100((binArray) => binArray != null), 'optionalAccess', _101 => _101.version]), () => ( 1));
+    const version = _nullishCoalesce(_optionalChain([binArrays, 'access', _101 => _101.find, 'call', _102 => _102((binArray) => binArray != null), 'optionalAccess', _103 => _103.version]), () => ( 1));
     return Array.from(
       enumerateBins(
         binsById,