@meteora-ag/dlmm 1.9.8 → 1.9.10

package/dist/index.mjs

@@ -15,7 +15,7 @@ import {
   LAMPORTS_PER_SOL as LAMPORTS_PER_SOL2,
   PublicKey as PublicKey10,
   SYSVAR_CLOCK_PUBKEY as SYSVAR_CLOCK_PUBKEY2,
-  SYSVAR_RENT_PUBKEY,
+  SYSVAR_RENT_PUBKEY as SYSVAR_RENT_PUBKEY2,
   SystemProgram as SystemProgram2,
   Transaction
 } from "@solana/web3.js";
@@ -10262,6 +10262,7 @@ import {
 } from "@solana/spl-token";
 import {
   ComputeBudgetProgram as ComputeBudgetProgram2,
+  SYSVAR_RENT_PUBKEY,
   SystemProgram,
   TransactionInstruction as TransactionInstruction3
 } from "@solana/web3.js";
@@ -15354,7 +15355,8 @@ async function chunkDepositWithRebalanceEndpoint(dlmm, strategy, slippagePercent
       const initBitmapIx = await dlmm.program.methods.initializeBinArrayBitmapExtension().accountsPartial({
         binArrayBitmapExtension: bitmapPubkey,
         lbPair: dlmm.pubkey,
-        funder: payer
+        funder: payer,
+        rent: SYSVAR_RENT_PUBKEY
       }).instruction();
       initBitmapIxs.push(initBitmapIx);
       binArrayOrBitmapInitTracking.add(bitmapPubkey.toBase58());
@@ -17131,7 +17133,7 @@ var DLMM = class {
     return program.methods.initializeLbPair(activeId.toNumber(), binStep.toNumber()).accountsPartial({
       funder,
       lbPair,
-      rent: SYSVAR_RENT_PUBKEY,
+      rent: SYSVAR_RENT_PUBKEY2,
       reserveX,
       reserveY,
       binArrayBitmapExtension,
@@ -18047,7 +18049,7 @@ var DLMM = class {
       position: positionPubKey,
       lbPair: this.pubkey,
       owner: user,
-      rent: SYSVAR_RENT_PUBKEY
+      rent: SYSVAR_RENT_PUBKEY2
     }).instruction();
     const binArrayIndexes = getBinArrayIndexesCoverage(
       new BN24(minBinId),
@@ -18319,7 +18321,7 @@ var DLMM = class {
         lbPair: this.pubkey,
         owner,
         payer,
-        rent: SYSVAR_RENT_PUBKEY
+        rent: SYSVAR_RENT_PUBKEY2
       }).instruction();
       const chunkedAddLiquidityIx = await chunkDepositWithRebalanceEndpoint(
         this,
@@ -18435,7 +18437,7 @@ var DLMM = class {
       position: positionPubKey,
       lbPair: this.pubkey,
       owner: user,
-      rent: SYSVAR_RENT_PUBKEY
+      rent: SYSVAR_RENT_PUBKEY2
     }).instruction();
     preInstructions.push(initializePositionIx);
     const binArrayIndexes = getBinArrayIndexesCoverage(
@@ -18584,7 +18586,7 @@ var DLMM = class {
       position: positionPubKey,
       lbPair: this.pubkey,
       owner: user,
-      rent: SYSVAR_RENT_PUBKEY
+      rent: SYSVAR_RENT_PUBKEY2
     }).instruction();
     preInstructions.push(initializePositionIx);
     const lowerBinArrayIndex = binIdToBinArrayIndex(new BN24(lowerBinId));
@@ -20731,7 +20733,8 @@ var DLMM = class {
                 await this.program.methods.initializeBinArrayBitmapExtension().accountsPartial({
                   binArrayBitmapExtension,
                   funder: payer,
-                  lbPair: this.pubkey
+                  lbPair: this.pubkey,
+                  rent: SYSVAR_RENT_PUBKEY2
                 }).instruction()
               );
               appendedInitBinArrayBitmap = true;
@@ -20930,7 +20933,8 @@ var DLMM = class {
           await this.program.methods.initializeBinArrayBitmapExtension().accountsPartial({
             binArrayBitmapExtension,
             funder: payer,
-            lbPair: this.pubkey
+            lbPair: this.pubkey,
+            rent: SYSVAR_RENT_PUBKEY2
           }).instruction()
         );
         binArrayBitmapLamports = binArrayBitmapLamports.add(
@@ -21346,7 +21350,8 @@ var DLMM = class {
         const initializeBitmapExtensionIx = await this.program.methods.initializeBinArrayBitmapExtension().accountsPartial({
           binArrayBitmapExtension: binArrayBitMapExtensionPubkey,
           funder: owner,
-          lbPair: this.pubkey
+          lbPair: this.pubkey,
+          rent: SYSVAR_RENT_PUBKEY2
         }).instruction();
         preInstructions.push(initializeBitmapExtensionIx);
       }
@@ -21754,7 +21759,8 @@ var DLMM = class {
         const initBitmapExtensionIx = await this.program.methods.initializeBinArrayBitmapExtension().accountsPartial({
           binArrayBitmapExtension: binArrayBitmap,
           funder: owner,
-          lbPair: this.pubkey
+          lbPair: this.pubkey,
+          rent: SYSVAR_RENT_PUBKEY2
         }).preInstructions([
           ComputeBudgetProgram3.setComputeUnitLimit({
             units: DEFAULT_INIT_BIN_ARRAY_CU
@@ -21970,7 +21976,8 @@ var DLMM = class {
       const initializeBitmapExtensionIx = await this.program.methods.initializeBinArrayBitmapExtension().accountsPartial({
         binArrayBitmapExtension,
         funder: owner,
-        lbPair: this.pubkey
+        lbPair: this.pubkey,
+        rent: SYSVAR_RENT_PUBKEY2
       }).instruction();
       preInstructions.push(initializeBitmapExtensionIx);
     }
@@ -22062,7 +22069,8 @@ var DLMM = class {
    *    - `limitOrderPubkey`: The public key of the limit-order account to cancel.
    *    - `owner`: The owner of the limit-order account and transaction fee payer.
    *    - `binIds`: Bin IDs to cancel from the limit order.
-   * @returns {Promise<Transaction>} A transaction that cancels the limit order and handles SOL unwrap when needed.
+   * @returns {Promise<Transaction>} A transaction that cancels the limit order, ensures owner ATAs for both pool
+   *    mints (including idempotent creates for non-SOL legs), and unwraps SOL when applicable.
    */
   async cancelLimitOrder({
     limitOrderPubkey,
@@ -22090,7 +22098,20 @@ var DLMM = class {
       true,
       this.tokenY.owner
     );
-    if (this.tokenX.mint.address.equals(NATIVE_MINT2) && !this.opt?.skipSolWrappingOperation) {
+    if (this.tokenX.mint.address.equals(NATIVE_MINT2)) {
+      if (!this.opt?.skipSolWrappingOperation) {
+        preInstructions.push(
+          createAssociatedTokenAccountIdempotentInstruction2(
+            owner,
+            userTokenX,
+            owner,
+            this.tokenX.mint.address,
+            this.tokenX.owner
+          )
+        );
+        postInstructions.push(unwrapSOLInstruction(owner));
+      }
+    } else {
       preInstructions.push(
         createAssociatedTokenAccountIdempotentInstruction2(
           owner,
@@ -22100,9 +22121,21 @@ var DLMM = class {
           this.tokenX.owner
         )
       );
-      postInstructions.push(unwrapSOLInstruction(owner));
     }
-    if (this.tokenY.mint.address.equals(NATIVE_MINT2) && !this.opt?.skipSolWrappingOperation) {
+    if (this.tokenY.mint.address.equals(NATIVE_MINT2)) {
+      if (!this.opt?.skipSolWrappingOperation) {
+        preInstructions.push(
+          createAssociatedTokenAccountIdempotentInstruction2(
+            owner,
+            userTokenY,
+            owner,
+            this.tokenY.mint.address,
+            this.tokenY.owner
+          )
+        );
+        postInstructions.push(unwrapSOLInstruction(owner));
+      }
+    } else {
       preInstructions.push(
         createAssociatedTokenAccountIdempotentInstruction2(
           owner,
@@ -22112,7 +22145,6 @@ var DLMM = class {
           this.tokenY.owner
         )
       );
-      postInstructions.push(unwrapSOLInstruction(owner));
     }
     const closeLimitOrderIx = await this.program.methods.closeLimitOrderIfEmpty().accountsPartial({
       limitOrder: limitOrderPubkey,
@@ -22175,7 +22207,7 @@ var DLMM = class {
       position,
       lbPair: this.pubkey,
       owner: user,
-      rent: SYSVAR_RENT_PUBKEY
+      rent: SYSVAR_RENT_PUBKEY2
     }).instruction();
     const extendedBinCount = getExtendedPositionBinCount(
       new BN24(lowerBinId),