@meteora-ag/dlmm 1.3.6 → 1.3.8-rc.0

package/dist/index.js

@@ -7621,7 +7621,7 @@ var getOrCreateATAInstruction = async (connection, tokenMint, owner, payer = own
     return { ataPubKey: toAccount, ix: void 0 };
   } catch (e) {
     if (e instanceof _spltoken.TokenAccountNotFoundError || e instanceof _spltoken.TokenInvalidAccountOwnerError) {
-      const ix = _spltoken.createAssociatedTokenAccountInstruction.call(void 0, 
+      const ix = _spltoken.createAssociatedTokenAccountIdempotentInstruction.call(void 0, 
         payer,
         toAccount,
         owner,
@@ -10092,6 +10092,7 @@ var DLMM = class {
     let actualOutAmount = new (0, _anchor.BN)(0);
     let feeAmount = new (0, _anchor.BN)(0);
     let protocolFeeAmount = new (0, _anchor.BN)(0);
+    let lastFilledActiveBinId = activeId;
     while (!inAmountLeft.isZero()) {
       let binArrayAccountToSwap = findNextBinArrayWithLiquidity(
         swapForY,
@@ -10137,6 +10138,7 @@ var DLMM = class {
           if (!startBin) {
             startBin = bin;
           }
+          lastFilledActiveBinId = activeId;
         }
       }
       if (!inAmountLeft.isZero()) {
@@ -10164,7 +10166,7 @@ var DLMM = class {
     const priceImpact = new (0, _decimaljs2.default)(actualOutAmount.toString()).sub(new (0, _decimaljs2.default)(outAmountWithoutSlippage.toString())).div(new (0, _decimaljs2.default)(outAmountWithoutSlippage.toString())).mul(new (0, _decimaljs2.default)(100));
     const minOutAmount = actualOutAmount.mul(new (0, _anchor.BN)(BASIS_POINT_MAX).sub(allowedSlippage)).div(new (0, _anchor.BN)(BASIS_POINT_MAX));
     const endPrice = getPriceOfBinByBinId(
-      activeId.toNumber(),
+      lastFilledActiveBinId.toNumber(),
       this.lbPair.binStep
     );
     return {
@@ -10281,7 +10283,6 @@ var DLMM = class {
     priceImpact,
     binArraysPubkey
   }) {
-    const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [];
     const postInstructions = [];
     const [
@@ -10315,9 +10316,6 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    let swapForY = true;
-    if (outToken.equals(tokenXMint))
-      swapForY = false;
     const binArrays = binArraysPubkey.map((pubkey) => {
       return {
         isSigner: false,
@@ -10331,17 +10329,17 @@ var DLMM = class {
       priceImpact.toNumber()
     ).accounts({
       lbPair,
-      reserveX,
-      reserveY,
-      tokenXMint,
-      tokenYMint,
+      reserveX: this.lbPair.reserveX,
+      reserveY: this.lbPair.reserveY,
+      tokenXMint: this.lbPair.tokenXMint,
+      tokenYMint: this.lbPair.tokenYMint,
       tokenXProgram: _spltoken.TOKEN_PROGRAM_ID,
       tokenYProgram: _spltoken.TOKEN_PROGRAM_ID,
       user,
       userTokenIn,
       userTokenOut,
       binArrayBitmapExtension: this.binArrayBitmapExtension ? this.binArrayBitmapExtension.publicKey : null,
-      oracle,
+      oracle: this.lbPair.oracle,
       hostFeeIn: null
     }).remainingAccounts(binArrays).instruction();
     const instructions = [...preInstructions, swapIx, ...postInstructions];
@@ -10379,7 +10377,6 @@ var DLMM = class {
     user,
     binArraysPubkey
   }) {
-    const { tokenXMint, tokenYMint, reserveX, reserveY, activeId, oracle } = await this.program.account.lbPair.fetch(lbPair);
     const preInstructions = [];
     const postInstructions = [];
     const [
@@ -10413,9 +10410,6 @@ var DLMM = class {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
-    let swapForY = true;
-    if (outToken.equals(tokenXMint))
-      swapForY = false;
     const binArrays = binArraysPubkey.map((pubkey) => {
       return {
         isSigner: false,
@@ -10425,10 +10419,10 @@ var DLMM = class {
     });
     const swapIx = await this.program.methods.swap(inAmount, minOutAmount).accounts({
       lbPair,
-      reserveX,
-      reserveY,
-      tokenXMint,
-      tokenYMint,
+      reserveX: this.lbPair.reserveX,
+      reserveY: this.lbPair.reserveY,
+      tokenXMint: this.lbPair.tokenXMint,
+      tokenYMint: this.lbPair.tokenYMint,
       tokenXProgram: _spltoken.TOKEN_PROGRAM_ID,
       // dont use 2022 first; lack familiarity
       tokenYProgram: _spltoken.TOKEN_PROGRAM_ID,
@@ -10437,7 +10431,7 @@ var DLMM = class {
       userTokenIn,
       userTokenOut,
       binArrayBitmapExtension: this.binArrayBitmapExtension ? this.binArrayBitmapExtension.publicKey : null,
-      oracle,
+      oracle: this.lbPair.oracle,
       hostFeeIn: null
     }).remainingAccounts(binArrays).instruction();
     const instructions = [...preInstructions, swapIx, ...postInstructions];