@meteora-ag/dlmm 1.9.1 → 1.9.2

package/dist/index.js

@@ -17017,18 +17017,59 @@ var DLMM = class {
       baseFeePowerFactor: baseFeePowerFactor.toNumber(),
       padding: Array(63).fill(0)
     };
+    const preInstructions = [];
     const userTokenX = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
       tokenX,
       creatorKey,
       true,
       tokenXAccount.owner
     );
+    const createUserTokenXIx = _spltoken.createAssociatedTokenAccountIdempotentInstruction.call(void 0, 
+      creatorKey,
+      userTokenX,
+      creatorKey,
+      tokenX,
+      tokenXAccount.owner
+    );
+    preInstructions.push(createUserTokenXIx);
     const userTokenY = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
       tokenY,
       creatorKey,
       true,
       tokenYAccount.owner
     );
+    const createUserTokenYIx = _spltoken.createAssociatedTokenAccountIdempotentInstruction.call(void 0, 
+      creatorKey,
+      userTokenY,
+      creatorKey,
+      tokenY,
+      tokenYAccount.owner
+    );
+    preInstructions.push(createUserTokenYIx);
+    const postInstructions = [];
+    if ((tokenX.equals(_spltoken.NATIVE_MINT) || tokenY.equals(_spltoken.NATIVE_MINT)) && !_optionalChain([opt, 'optionalAccess', _69 => _69.skipSolWrappingOperation])) {
+      const wrapAmount = BigInt(1);
+      if (tokenX.equals(_spltoken.NATIVE_MINT)) {
+        const wrapSOLIxX = wrapSOLInstruction(
+          creatorKey,
+          userTokenX,
+          wrapAmount
+        );
+        preInstructions.push(...wrapSOLIxX);
+      }
+      if (tokenY.equals(_spltoken.NATIVE_MINT)) {
+        const wrapSOLIxY = wrapSOLInstruction(
+          creatorKey,
+          userTokenY,
+          wrapAmount
+        );
+        preInstructions.push(...wrapSOLIxY);
+      }
+      const unwrapSOLIx = await unwrapSOLInstruction(creatorKey);
+      if (unwrapSOLIx) {
+        postInstructions.push(unwrapSOLIx);
+      }
+    }
     return program.methods.initializeCustomizablePermissionlessLbPair2(ixData).accountsPartial({
       tokenBadgeX: tokenBadgeXAccount ? tokenBadgeX : program.programId,
       tokenBadgeY: tokenBadgeYAccount ? tokenBadgeY : program.programId,
@@ -17045,7 +17086,7 @@ var DLMM = class {
       funder: creatorKey,
       tokenProgramX: tokenXAccount.owner,
       tokenProgramY: tokenYAccount.owner
-    }).transaction();
+    }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
   }
   /**
    * Create a new customizable permissionless pair. Support only token program.
@@ -17069,6 +17110,7 @@ var DLMM = class {
       tokenY,
       program.programId
     );
+    const [tokenXAccount, tokenYAccount] = await connection.getMultipleAccountsInfo([tokenX, tokenY]);
     const [reserveX] = deriveReserve(tokenX, lbPair, program.programId);
     const [reserveY] = deriveReserve(tokenY, lbPair, program.programId);
     const [oracle] = deriveOracle(lbPair, program.programId);
@@ -17095,8 +17137,59 @@ var DLMM = class {
       creatorPoolOnOffControl: creatorPoolOnOffControl ? creatorPoolOnOffControl : false,
       padding: Array(63).fill(0)
     };
-    const userTokenX = _spltoken.getAssociatedTokenAddressSync.call(void 0, tokenX, creatorKey);
-    const userTokenY = _spltoken.getAssociatedTokenAddressSync.call(void 0, tokenY, creatorKey);
+    const preInstructions = [];
+    const userTokenX = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
+      tokenX,
+      creatorKey,
+      true,
+      tokenXAccount.owner
+    );
+    const createUserTokenXIx = _spltoken.createAssociatedTokenAccountIdempotentInstruction.call(void 0, 
+      creatorKey,
+      userTokenX,
+      creatorKey,
+      tokenX,
+      tokenXAccount.owner
+    );
+    preInstructions.push(createUserTokenXIx);
+    const userTokenY = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
+      tokenY,
+      creatorKey,
+      true,
+      tokenYAccount.owner
+    );
+    const createUserTokenYIx = _spltoken.createAssociatedTokenAccountIdempotentInstruction.call(void 0, 
+      creatorKey,
+      userTokenY,
+      creatorKey,
+      tokenY,
+      tokenYAccount.owner
+    );
+    preInstructions.push(createUserTokenYIx);
+    const postInstructions = [];
+    if ((tokenX.equals(_spltoken.NATIVE_MINT) || tokenY.equals(_spltoken.NATIVE_MINT)) && !_optionalChain([opt, 'optionalAccess', _70 => _70.skipSolWrappingOperation])) {
+      const wrapAmount = BigInt(1);
+      if (tokenX.equals(_spltoken.NATIVE_MINT)) {
+        const wrapSOLIxX = wrapSOLInstruction(
+          creatorKey,
+          userTokenX,
+          wrapAmount
+        );
+        preInstructions.push(...wrapSOLIxX);
+      }
+      if (tokenY.equals(_spltoken.NATIVE_MINT)) {
+        const wrapSOLIxY = wrapSOLInstruction(
+          creatorKey,
+          userTokenY,
+          wrapAmount
+        );
+        preInstructions.push(...wrapSOLIxY);
+      }
+      const unwrapSOLIx = await unwrapSOLInstruction(creatorKey);
+      if (unwrapSOLIx) {
+        postInstructions.push(unwrapSOLIx);
+      }
+    }
     return program.methods.initializeCustomizablePermissionlessLbPair(ixData).accountsPartial({
       lbPair,
       reserveX,
@@ -17109,7 +17202,7 @@ var DLMM = class {
       userTokenX,
       userTokenY,
       funder: creatorKey
-    }).transaction();
+    }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
   }
   /**
    * Create a new liquidity pair. Support only token program.
@@ -17205,8 +17298,8 @@ var DLMM = class {
       new (0, _anchor.BN)(presetParameterState.baseFactor),
       new (0, _anchor.BN)(presetParameterState.baseFeePowerFactor),
       {
-        cluster: _optionalChain([opt, 'optionalAccess', _69 => _69.cluster]),
-        programId: _optionalChain([opt, 'optionalAccess', _70 => _70.programId])
+        cluster: _optionalChain([opt, 'optionalAccess', _71 => _71.cluster]),
+        programId: _optionalChain([opt, 'optionalAccess', _72 => _72.programId])
       }
     );
     if (existsPool) {
@@ -17434,7 +17527,7 @@ var DLMM = class {
         swapForY,
         new (0, _anchor.BN)(activeIdToLoop),
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _71 => _71.binArrayBitmapExtension, 'optionalAccess', _72 => _72.account]), () => ( null))
+        _nullishCoalesce(_optionalChain([this, 'access', _73 => _73.binArrayBitmapExtension, 'optionalAccess', _74 => _74.account]), () => ( null))
       );
       if (binArrayIndex === null)
         shouldStop = true;
@@ -17765,8 +17858,8 @@ var DLMM = class {
             position,
             this.tokenX.mint,
             this.tokenY.mint,
-            _optionalChain([this, 'access', _73 => _73.rewards, 'access', _74 => _74[0], 'optionalAccess', _75 => _75.mint]),
-            _optionalChain([this, 'access', _76 => _76.rewards, 'access', _77 => _77[1], 'optionalAccess', _78 => _78.mint]),
+            _optionalChain([this, 'access', _75 => _75.rewards, 'access', _76 => _76[0], 'optionalAccess', _77 => _77.mint]),
+            _optionalChain([this, 'access', _78 => _78.rewards, 'access', _79 => _79[1], 'optionalAccess', _80 => _80.mint]),
             positionBinArraysMapV2
           ),
           version: position.version()
@@ -17954,8 +18047,8 @@ var DLMM = class {
         position,
         this.tokenX.mint,
         this.tokenY.mint,
-        _optionalChain([this, 'access', _79 => _79.rewards, 'access', _80 => _80[0], 'optionalAccess', _81 => _81.mint]),
-        _optionalChain([this, 'access', _82 => _82.rewards, 'access', _83 => _83[1], 'optionalAccess', _84 => _84.mint]),
+        _optionalChain([this, 'access', _81 => _81.rewards, 'access', _82 => _82[0], 'optionalAccess', _83 => _83.mint]),
+        _optionalChain([this, 'access', _84 => _84.rewards, 'access', _85 => _85[1], 'optionalAccess', _86 => _86.mint]),
         binArrayMap
       ),
       version: position.version()
@@ -17980,7 +18073,7 @@ var DLMM = class {
     );
     const { minBinId, maxBinId } = strategy;
     const binCount = getBinCount(minBinId, maxBinId);
-    const defaultAltAddressString = _nullishCoalesce(altAddress, () => ( ALT_ADDRESS[_optionalChain([this, 'access', _85 => _85.opt, 'optionalAccess', _86 => _86.cluster])]));
+    const defaultAltAddressString = _nullishCoalesce(altAddress, () => ( ALT_ADDRESS[_optionalChain([this, 'access', _87 => _87.opt, 'optionalAccess', _88 => _88.cluster])]));
     if (defaultAltAddressString) {
       altAddress = new (0, _web3js.PublicKey)(defaultAltAddressString);
     }
@@ -18043,7 +18136,7 @@ var DLMM = class {
         owner,
         payer,
         true,
-        _optionalChain([this, 'access', _87 => _87.opt, 'optionalAccess', _88 => _88.skipSolWrappingOperation])
+        _optionalChain([this, 'access', _89 => _89.opt, 'optionalAccess', _90 => _90.skipSolWrappingOperation])
       );
       for (const instructions of addLiquidityIxs) {
         const txIxs = [];
@@ -18165,7 +18258,7 @@ var DLMM = class {
         owner,
         payer,
         false,
-        _optionalChain([this, 'access', _89 => _89.opt, 'optionalAccess', _90 => _90.skipSolWrappingOperation])
+        _optionalChain([this, 'access', _91 => _91.opt, 'optionalAccess', _92 => _92.skipSolWrappingOperation])
       );
       instructionsByPositions.push({
         positionKeypair: position,
@@ -18229,7 +18322,7 @@ var DLMM = class {
       user,
       user,
       true,
-      _optionalChain([this, 'access', _91 => _91.opt, 'optionalAccess', _92 => _92.skipSolWrappingOperation])
+      _optionalChain([this, 'access', _93 => _93.opt, 'optionalAccess', _94 => _94.skipSolWrappingOperation])
     );
     const latestBlockhashInfo = await this.program.provider.connection.getLatestBlockhash();
     return chunkedAddLiquidityIx.map((ixs) => {
@@ -18304,7 +18397,7 @@ var DLMM = class {
     ]);
     createPayerTokenXIx && preInstructions.push(createPayerTokenXIx);
     createPayerTokenYIx && preInstructions.push(createPayerTokenYIx);
-    if (this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) && !totalXAmount.isZero() && !_optionalChain([this, 'access', _93 => _93.opt, 'optionalAccess', _94 => _94.skipSolWrappingOperation])) {
+    if (this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) && !totalXAmount.isZero() && !_optionalChain([this, 'access', _95 => _95.opt, 'optionalAccess', _96 => _96.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         user,
         userTokenX,
@@ -18312,7 +18405,7 @@ var DLMM = class {
       );
       preInstructions.push(...wrapSOLIx);
     }
-    if (this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT) && !totalYAmount.isZero() && !_optionalChain([this, 'access', _95 => _95.opt, 'optionalAccess', _96 => _96.skipSolWrappingOperation])) {
+    if (this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT) && !totalYAmount.isZero() && !_optionalChain([this, 'access', _97 => _97.opt, 'optionalAccess', _98 => _98.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         user,
         userTokenY,
@@ -18324,7 +18417,7 @@ var DLMM = class {
     if ([
       this.tokenX.publicKey.toBase58(),
       this.tokenY.publicKey.toBase58()
-    ].includes(_spltoken.NATIVE_MINT.toBase58()) && !_optionalChain([this, 'access', _97 => _97.opt, 'optionalAccess', _98 => _98.skipSolWrappingOperation])) {
+    ].includes(_spltoken.NATIVE_MINT.toBase58()) && !_optionalChain([this, 'access', _99 => _99.opt, 'optionalAccess', _100 => _100.skipSolWrappingOperation])) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
@@ -18458,7 +18551,7 @@ var DLMM = class {
     ]);
     createPayerTokenXIx && preInstructions.push(createPayerTokenXIx);
     createPayerTokenYIx && preInstructions.push(createPayerTokenYIx);
-    if (this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) && !totalXAmount.isZero() && !_optionalChain([this, 'access', _99 => _99.opt, 'optionalAccess', _100 => _100.skipSolWrappingOperation])) {
+    if (this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) && !totalXAmount.isZero() && !_optionalChain([this, 'access', _101 => _101.opt, 'optionalAccess', _102 => _102.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         user,
         userTokenX,
@@ -18466,7 +18559,7 @@ var DLMM = class {
       );
       preInstructions.push(...wrapSOLIx);
     }
-    if (this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT) && !totalYAmount.isZero() && !_optionalChain([this, 'access', _101 => _101.opt, 'optionalAccess', _102 => _102.skipSolWrappingOperation])) {
+    if (this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT) && !totalYAmount.isZero() && !_optionalChain([this, 'access', _103 => _103.opt, 'optionalAccess', _104 => _104.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         user,
         userTokenY,
@@ -18478,7 +18571,7 @@ var DLMM = class {
     if ([
       this.tokenX.publicKey.toBase58(),
       this.tokenY.publicKey.toBase58()
-    ].includes(_spltoken.NATIVE_MINT.toBase58()) && !_optionalChain([this, 'access', _103 => _103.opt, 'optionalAccess', _104 => _104.skipSolWrappingOperation])) {
+    ].includes(_spltoken.NATIVE_MINT.toBase58()) && !_optionalChain([this, 'access', _105 => _105.opt, 'optionalAccess', _106 => _106.skipSolWrappingOperation])) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
@@ -18662,7 +18755,7 @@ var DLMM = class {
     ]);
     createPayerTokenXIx && preInstructions.push(createPayerTokenXIx);
     createPayerTokenYIx && preInstructions.push(createPayerTokenYIx);
-    if (this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) && !totalXAmount.isZero() && !_optionalChain([this, 'access', _105 => _105.opt, 'optionalAccess', _106 => _106.skipSolWrappingOperation])) {
+    if (this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) && !totalXAmount.isZero() && !_optionalChain([this, 'access', _107 => _107.opt, 'optionalAccess', _108 => _108.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         user,
         userTokenX,
@@ -18670,7 +18763,7 @@ var DLMM = class {
       );
       preInstructions.push(...wrapSOLIx);
     }
-    if (this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT) && !totalYAmount.isZero() && !_optionalChain([this, 'access', _107 => _107.opt, 'optionalAccess', _108 => _108.skipSolWrappingOperation])) {
+    if (this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT) && !totalYAmount.isZero() && !_optionalChain([this, 'access', _109 => _109.opt, 'optionalAccess', _110 => _110.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         user,
         userTokenY,
@@ -18682,7 +18775,7 @@ var DLMM = class {
     if ([
       this.tokenX.publicKey.toBase58(),
       this.tokenY.publicKey.toBase58()
-    ].includes(_spltoken.NATIVE_MINT.toBase58()) && !_optionalChain([this, 'access', _109 => _109.opt, 'optionalAccess', _110 => _110.skipSolWrappingOperation])) {
+    ].includes(_spltoken.NATIVE_MINT.toBase58()) && !_optionalChain([this, 'access', _111 => _111.opt, 'optionalAccess', _112 => _112.skipSolWrappingOperation])) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
@@ -18830,7 +18923,7 @@ var DLMM = class {
     ]);
     createPayerTokenXIx && preInstructions.push(createPayerTokenXIx);
     createPayerTokenYIx && preInstructions.push(createPayerTokenYIx);
-    if (this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) && !totalXAmount.isZero() && !_optionalChain([this, 'access', _111 => _111.opt, 'optionalAccess', _112 => _112.skipSolWrappingOperation])) {
+    if (this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) && !totalXAmount.isZero() && !_optionalChain([this, 'access', _113 => _113.opt, 'optionalAccess', _114 => _114.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         user,
         userTokenX,
@@ -18838,7 +18931,7 @@ var DLMM = class {
       );
       preInstructions.push(...wrapSOLIx);
     }
-    if (this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT) && !totalYAmount.isZero() && !_optionalChain([this, 'access', _113 => _113.opt, 'optionalAccess', _114 => _114.skipSolWrappingOperation])) {
+    if (this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT) && !totalYAmount.isZero() && !_optionalChain([this, 'access', _115 => _115.opt, 'optionalAccess', _116 => _116.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         user,
         userTokenY,
@@ -18850,7 +18943,7 @@ var DLMM = class {
     if ([
       this.tokenX.publicKey.toBase58(),
       this.tokenY.publicKey.toBase58()
-    ].includes(_spltoken.NATIVE_MINT.toBase58()) && !_optionalChain([this, 'access', _115 => _115.opt, 'optionalAccess', _116 => _116.skipSolWrappingOperation])) {
+    ].includes(_spltoken.NATIVE_MINT.toBase58()) && !_optionalChain([this, 'access', _117 => _117.opt, 'optionalAccess', _118 => _118.skipSolWrappingOperation])) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
@@ -19127,7 +19220,7 @@ var DLMM = class {
       if ([
         this.tokenX.publicKey.toBase58(),
         this.tokenY.publicKey.toBase58()
-      ].includes(_spltoken.NATIVE_MINT.toBase58()) && (!skipUnwrapSOL || !_optionalChain([this, 'access', _117 => _117.opt, 'optionalAccess', _118 => _118.skipSolWrappingOperation]))) {
+      ].includes(_spltoken.NATIVE_MINT.toBase58()) && (!skipUnwrapSOL || !_optionalChain([this, 'access', _119 => _119.opt, 'optionalAccess', _120 => _120.skipSolWrappingOperation]))) {
         const closeWrappedSOLIx = await unwrapSOLInstruction(user);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
@@ -19282,7 +19375,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _119 => _119.binArrayBitmapExtension, 'optionalAccess', _120 => _120.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _121 => _121.binArrayBitmapExtension, 'optionalAccess', _122 => _122.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -19347,7 +19440,7 @@ var DLMM = class {
           swapForY,
           activeId,
           this.lbPair,
-          _nullishCoalesce(_optionalChain([this, 'access', _121 => _121.binArrayBitmapExtension, 'optionalAccess', _122 => _122.account]), () => ( null)),
+          _nullishCoalesce(_optionalChain([this, 'access', _123 => _123.binArrayBitmapExtension, 'optionalAccess', _124 => _124.account]), () => ( null)),
           binArrays
         );
         if (binArrayAccountToSwap == null) {
@@ -19444,7 +19537,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _123 => _123.binArrayBitmapExtension, 'optionalAccess', _124 => _124.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _125 => _125.binArrayBitmapExtension, 'optionalAccess', _126 => _126.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -19532,7 +19625,7 @@ var DLMM = class {
           swapForY,
           activeId,
           this.lbPair,
-          _nullishCoalesce(_optionalChain([this, 'access', _125 => _125.binArrayBitmapExtension, 'optionalAccess', _126 => _126.account]), () => ( null)),
+          _nullishCoalesce(_optionalChain([this, 'access', _127 => _127.binArrayBitmapExtension, 'optionalAccess', _128 => _128.account]), () => ( null)),
           binArrays
         );
         if (binArrayAccountToSwap == null) {
@@ -19614,7 +19707,7 @@ var DLMM = class {
     ]);
     createInTokenAccountIx && preInstructions.push(createInTokenAccountIx);
     createOutTokenAccountIx && preInstructions.push(createOutTokenAccountIx);
-    if (inToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _127 => _127.opt, 'optionalAccess', _128 => _128.skipSolWrappingOperation])) {
+    if (inToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _129 => _129.opt, 'optionalAccess', _130 => _130.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         user,
         userTokenIn,
@@ -19624,7 +19717,7 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    if (outToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _129 => _129.opt, 'optionalAccess', _130 => _130.skipSolWrappingOperation])) {
+    if (outToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _131 => _131.opt, 'optionalAccess', _132 => _132.skipSolWrappingOperation])) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
@@ -19707,7 +19800,7 @@ var DLMM = class {
     ]);
     createInTokenAccountIx && preInstructions.push(createInTokenAccountIx);
     createOutTokenAccountIx && preInstructions.push(createOutTokenAccountIx);
-    if (inToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _131 => _131.opt, 'optionalAccess', _132 => _132.skipSolWrappingOperation])) {
+    if (inToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _133 => _133.opt, 'optionalAccess', _134 => _134.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         user,
         userTokenIn,
@@ -19717,7 +19810,7 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    if (outToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _133 => _133.opt, 'optionalAccess', _134 => _134.skipSolWrappingOperation])) {
+    if (outToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _135 => _135.opt, 'optionalAccess', _136 => _136.skipSolWrappingOperation])) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
@@ -19809,7 +19902,7 @@ var DLMM = class {
     ]);
     createInTokenAccountIx && preInstructions.push(createInTokenAccountIx);
     createOutTokenAccountIx && preInstructions.push(createOutTokenAccountIx);
-    if (inToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _135 => _135.opt, 'optionalAccess', _136 => _136.skipSolWrappingOperation])) {
+    if (inToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _137 => _137.opt, 'optionalAccess', _138 => _138.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         user,
         userTokenIn,
@@ -19819,7 +19912,7 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    if (outToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _137 => _137.opt, 'optionalAccess', _138 => _138.skipSolWrappingOperation])) {
+    if (outToken.equals(_spltoken.NATIVE_MINT) && !_optionalChain([this, 'access', _139 => _139.opt, 'optionalAccess', _140 => _140.skipSolWrappingOperation])) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
@@ -20878,7 +20971,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _139 => _139.binArrayBitmapExtension, 'optionalAccess', _140 => _140.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _141 => _141.binArrayBitmapExtension, 'optionalAccess', _142 => _142.account]), () => ( null))
     );
     if (toBinArrayIndex === null)
       return true;
@@ -20915,7 +21008,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _141 => _141.binArrayBitmapExtension, 'optionalAccess', _142 => _142.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _143 => _143.binArrayBitmapExtension, 'optionalAccess', _144 => _144.account]), () => ( null))
     );
     const marketPriceBinArrayIndex = binIdToBinArrayIndex(
       new (0, _anchor.BN)(marketPriceBinId)
@@ -20951,7 +21044,7 @@ var DLMM = class {
     let binArrayBitmapExtension = null;
     if (binArrayBitMapExtensionPubkey) {
       binArrayBitmapExtension = binArrayBitMapExtensionPubkey;
-      if (!_optionalChain([binArrayAccounts, 'optionalAccess', _143 => _143[0]])) {
+      if (!_optionalChain([binArrayAccounts, 'optionalAccess', _145 => _145[0]])) {
         const initializeBitmapExtensionIx = await this.program.methods.initializeBinArrayBitmapExtension().accountsPartial({
           binArrayBitmapExtension: binArrayBitMapExtensionPubkey,
           funder: owner,
@@ -20960,10 +21053,10 @@ var DLMM = class {
         preInstructions.push(initializeBitmapExtensionIx);
       }
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _144 => _144[1]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _146 => _146[1]])) {
       fromBinArray = fromBinArrayPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _145 => _145[2]]) && !!toBinArrayIndex) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _147 => _147[2]]) && !!toBinArrayIndex) {
       toBinArray = toBinArrayPubkey;
     }
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
@@ -21409,7 +21502,7 @@ var DLMM = class {
       slippage
     );
     const postInstructions = [];
-    if (this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) && simulationResult.actualAmountXDeposited.gtn(0) && !_optionalChain([this, 'access', _146 => _146.opt, 'optionalAccess', _147 => _147.skipSolWrappingOperation])) {
+    if (this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) && simulationResult.actualAmountXDeposited.gtn(0) && !_optionalChain([this, 'access', _148 => _148.opt, 'optionalAccess', _149 => _149.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         owner,
         userTokenX,
@@ -21417,7 +21510,7 @@ var DLMM = class {
       );
       preInstructions.push(...wrapSOLIx);
     }
-    if (this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT) && simulationResult.actualAmountYDeposited.gtn(0) && !_optionalChain([this, 'access', _148 => _148.opt, 'optionalAccess', _149 => _149.skipSolWrappingOperation])) {
+    if (this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT) && simulationResult.actualAmountYDeposited.gtn(0) && !_optionalChain([this, 'access', _150 => _150.opt, 'optionalAccess', _151 => _151.skipSolWrappingOperation])) {
       const wrapSOLIx = wrapSOLInstruction(
         owner,
         userTokenY,
@@ -21425,7 +21518,7 @@ var DLMM = class {
       );
       preInstructions.push(...wrapSOLIx);
     }
-    if ((this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) || this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT)) && !_optionalChain([this, 'access', _150 => _150.opt, 'optionalAccess', _151 => _151.skipSolWrappingOperation])) {
+    if ((this.tokenX.publicKey.equals(_spltoken.NATIVE_MINT) || this.tokenY.publicKey.equals(_spltoken.NATIVE_MINT)) && !_optionalChain([this, 'access', _152 => _152.opt, 'optionalAccess', _153 => _153.skipSolWrappingOperation])) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(owner);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
@@ -21871,7 +21964,7 @@ var DLMM = class {
         );
       })
     );
-    const version = _nullishCoalesce(_optionalChain([binArrays, 'access', _152 => _152.find, 'call', _153 => _153((binArray) => binArray != null), 'optionalAccess', _154 => _154.version]), () => ( 1));
+    const version = _nullishCoalesce(_optionalChain([binArrays, 'access', _154 => _154.find, 'call', _155 => _155((binArray) => binArray != null), 'optionalAccess', _156 => _156.version]), () => ( 1));
     return Array.from(
       enumerateBins(
         binsById,
@@ -22066,7 +22159,7 @@ var DLMM = class {
       if ([
         this.tokenX.publicKey.toBase58(),
         this.tokenY.publicKey.toBase58()
-      ].includes(_spltoken.NATIVE_MINT.toBase58()) && !_optionalChain([this, 'access', _155 => _155.opt, 'optionalAccess', _156 => _156.skipSolWrappingOperation])) {
+      ].includes(_spltoken.NATIVE_MINT.toBase58()) && !_optionalChain([this, 'access', _157 => _157.opt, 'optionalAccess', _158 => _158.skipSolWrappingOperation])) {
         const closeWrappedSOLIx = await unwrapSOLInstruction(owner);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }