@meteora-ag/dlmm 1.0.50-rc.2 → 1.0.51

package/dist/index.mjs

@@ -6475,6 +6475,24 @@ function findNextBinArrayWithLiquidity(swapForY, activeBinId, lbPairState, binAr
   }
   return binArrayAccount;
 }
+function getBinArraysRequiredByPositionRange(pair, fromBinId, toBinId, programId) {
+  const [minBinId, maxBinId] = fromBinId.lt(toBinId) ? [fromBinId, toBinId] : [toBinId, fromBinId];
+  const positionCount = getPositionCount(minBinId, maxBinId);
+  const binArrays = /* @__PURE__ */ new Map();
+  for (let i = 0; i < positionCount.toNumber(); i++) {
+    const lowerBinId = minBinId.add(MAX_BIN_PER_POSITION.mul(new BN6(i)));
+    const lowerBinArrayIndex = binIdToBinArrayIndex(lowerBinId);
+    const upperBinArrayIndex = lowerBinArrayIndex.add(new BN6(1));
+    const [lowerBinArray] = deriveBinArray(pair, lowerBinArrayIndex, programId);
+    const [upperBinArray] = deriveBinArray(pair, upperBinArrayIndex, programId);
+    binArrays.set(lowerBinArray.toBase58(), lowerBinArrayIndex);
+    binArrays.set(upperBinArray.toBase58(), upperBinArrayIndex);
+  }
+  return Array.from(binArrays, ([key, index]) => ({
+    key: new PublicKey3(key),
+    index
+  }));
+}
 
 // src/dlmm/helpers/fee.ts
 import { BN as BN7 } from "@coral-xyz/anchor";
@@ -8485,6 +8503,17 @@ var DLMM = class {
     );
     return activeBinState;
   }
+  /**
+   * The function get the price of a bin based on its bin ID.
+   * @param {number} binId - The `binId` parameter is a number that represents the ID of a bin.
+   * @returns {number} the calculated price of a bin based on the provided binId.
+   */
+  getPriceOfBinByBinId(binId) {
+    const binStepNum = new Decimal4(this.lbPair.binStep).div(
+      new Decimal4(BASIS_POINT_MAX)
+    );
+    return new Decimal4(1).add(new Decimal4(binStepNum)).pow(new Decimal4(binId)).toString();
+  }
   /**
    * The function get bin ID based on a given price and a boolean flag indicating whether to
    * round down or up.
@@ -9693,15 +9722,9 @@ var DLMM = class {
         }
       }
     }
-    const startPrice = getPriceOfBinByBinId(
-      startBinId.toNumber(),
-      this.lbPair.binStep
-    );
-    const endPrice = getPriceOfBinByBinId(
-      activeId.toNumber(),
-      this.lbPair.binStep
-    );
-    const priceImpact = startPrice.sub(endPrice).abs().div(startPrice).mul(new Decimal4(100));
+    const startPrice = this.getPriceOfBinByBinId(startBinId.toNumber());
+    const endPrice = this.getPriceOfBinByBinId(activeId.toNumber());
+    const priceImpact = new Decimal4(startPrice).sub(new Decimal4(endPrice)).abs().div(new Decimal4(startPrice)).mul(new Decimal4(100));
     const maxInAmount = actualInAmount.mul(new BN9(BASIS_POINT_MAX).add(allowedSlippage)).div(new BN9(BASIS_POINT_MAX));
     return {
       inAmount: actualInAmount,
@@ -9719,6 +9742,8 @@ var DLMM = class {
    *    - `inAmount`: Amount of lamport to swap in
    *    - `swapForY`: Swap token X to Y when it is true, else reversed.
    *    - `allowedSlippage`: Allowed slippage for the swap. Expressed in BPS. To convert from slippage percentage to BPS unit: SLIPPAGE_PERCENTAGE * 100
+   *    - `binArrays`: binArrays for swapQuote.
+   *    - `isPartialFill`: Flag to check whether the the swapQuote is partial fill, default = false.
    * @returns {SwapQuote}
    *    - `consumedInAmount`: Amount of lamport to swap in
    *    - `outAmount`: Amount of lamport to swap out
@@ -9728,7 +9753,7 @@ var DLMM = class {
    *    - `priceImpact`: Price impact of the swap
    *    - `binArraysPubkey`: Array of bin arrays involved in the swap
    */
-  swapQuote(inAmount, swapForY, allowedSlippage, binArrays) {
+  swapQuote(inAmount, swapForY, allowedSlippage, binArrays, isPartialFill) {
     const currentTimestamp = Date.now() / 1e3;
     let inAmountLeft = inAmount;
     let vParameterClone = Object.assign({}, this.lbPair.vParameters);
@@ -9755,7 +9780,11 @@ var DLMM = class {
         binArrays
       );
       if (binArrayAccountToSwap == null) {
-        throw new Error("Insufficient liquidity");
+        if (isPartialFill) {
+          break;
+        } else {
+          throw new Error("Insufficient liquidity");
+        }
       }
       binArraysForSwap.set(binArrayAccountToSwap.publicKey, true);
       this.updateVolatilityAccumulator(
@@ -9796,6 +9825,7 @@ var DLMM = class {
     }
     if (!startBin)
       throw new Error("Invalid start bin");
+    inAmount = inAmount.sub(inAmountLeft);
     const outAmountWithoutSlippage = getOutAmount(
       startBin,
       inAmount.sub(
@@ -9805,10 +9835,6 @@ var DLMM = class {
     );
     const priceImpact = new Decimal4(actualOutAmount.toString()).sub(new Decimal4(outAmountWithoutSlippage.toString())).div(new Decimal4(outAmountWithoutSlippage.toString())).mul(new Decimal4(100));
     const minOutAmount = actualOutAmount.mul(new BN9(BASIS_POINT_MAX).sub(allowedSlippage)).div(new BN9(BASIS_POINT_MAX));
-    const endPrice = getPriceOfBinByBinId(
-      activeId.toNumber(),
-      this.lbPair.binStep
-    );
     return {
       consumedInAmount: inAmount,
       outAmount: actualOutAmount,
@@ -9816,8 +9842,7 @@ var DLMM = class {
       protocolFee: protocolFeeAmount,
       minOutAmount,
       priceImpact,
-      binArraysPubkey: [...binArraysForSwap.keys()],
-      endPrice
+      binArraysPubkey: [...binArraysForSwap.keys()]
     };
   }
   async swapExactOut({
@@ -10106,7 +10131,9 @@ var DLMM = class {
     positions
   }) {
     const claimAllTxs = (await Promise.all(
-      positions.map(async (position, idx) => {
+      positions.filter(
+        ({ positionData: { rewardOne, rewardTwo } }) => !rewardOne.isZero() || !rewardTwo.isZero()
+      ).map(async (position, idx) => {
         return await this.createClaimBuildMethod({
           owner,
           position,
@@ -10190,12 +10217,14 @@ var DLMM = class {
     positions
   }) {
     const claimAllTxs = (await Promise.all(
-      positions.map(async (position, idx) => {
+      positions.filter(
+        ({ positionData: { feeX, feeY } }) => !feeX.isZero() || !feeY.isZero()
+      ).map(async (position, idx, positions2) => {
         return await this.createClaimSwapFeeMethod({
           owner,
           position,
           shouldIncludePretIx: idx === 0,
-          shouldIncludePostIx: idx === positions.length - 1
+          shouldIncludePostIx: idx === positions2.length - 1
         });
       })
     )).flat();
@@ -10485,6 +10514,34 @@ var DLMM = class {
       addLiquidityIxs
     };
   }
+  /**
+   * Initializes bin arrays for the given bin array indexes if it wasn't initialized.
+   *
+   * @param {BN[]} binArrayIndexes - An array of bin array indexes to initialize.
+   * @param {PublicKey} funder - The public key of the funder.
+   * @return {Promise<TransactionInstruction[]>} An array of transaction instructions to initialize the bin arrays.
+   */
+  async initializeBinArrays(binArrayIndexes, funder) {
+    const ixs = [];
+    for (const idx of binArrayIndexes) {
+      const [binArray] = deriveBinArray(
+        this.pubkey,
+        idx,
+        this.program.programId
+      );
+      const binArrayAccount = await this.program.provider.connection.getAccountInfo(binArray);
+      if (binArrayAccount === null) {
+        ixs.push(
+          await this.program.methods.initializeBinArray(idx).accounts({
+            binArray,
+            funder,
+            lbPair: this.pubkey
+          }).instruction()
+        );
+      }
+    }
+    return ixs;
+  }
   /**
    *
    * @param
@@ -10584,7 +10641,9 @@ var DLMM = class {
     );
     createATAAccAndIx.forEach(({ ix }) => ix && preInstructions.push(ix));
     const claimAllSwapFeeTxs = (await Promise.all(
-      positions.map(async (position) => {
+      positions.filter(
+        ({ positionData: { feeX, feeY } }) => !feeX.isZero() || !feeY.isZero()
+      ).map(async (position) => {
         return await this.createClaimSwapFeeMethod({
           owner,
           position,
@@ -10594,7 +10653,9 @@ var DLMM = class {
       })
     )).flat();
     const claimAllLMTxs = (await Promise.all(
-      positions.map(async (position) => {
+      positions.filter(
+        ({ positionData: { rewardOne, rewardTwo } }) => !rewardOne.isZero() || !rewardTwo.isZero()
+      ).map(async (position) => {
         return await this.createClaimBuildMethod({
           owner,
           position,
@@ -10988,10 +11049,10 @@ var DLMM = class {
       binArray.bins.forEach((bin, idx) => {
         const binId = lowerBinIdForBinArray.toNumber() + idx;
         if (binId >= lowerBinId && binId <= upperBinId) {
-          const pricePerLamport = getPriceOfBinByBinId(
-            binId,
-            lbPair.binStep
-          ).toString();
+          const pricePerLamport = this.getPriceOfBinByBinId(
+            lbPair.binStep,
+            binId
+          );
           bins.push({
             binId,
             xAmount: bin.amountX,
@@ -11012,10 +11073,10 @@ var DLMM = class {
         binArray.bins.forEach((bin, idx) => {
           const binId = lowerBinIdForBinArray.toNumber() + idx;
           if (binId >= lowerBinId && binId <= upperBinId) {
-            const pricePerLamport = getPriceOfBinByBinId(
-              binId,
-              lbPair.binStep
-            ).toString();
+            const pricePerLamport = this.getPriceOfBinByBinId(
+              lbPair.binStep,
+              binId
+            );
             bins.push({
               binId,
               xAmount: bin.amountX,
@@ -11031,6 +11092,10 @@ var DLMM = class {
     }
     return bins;
   }
+  static getPriceOfBinByBinId(binStep, binId) {
+    const binStepNum = new Decimal4(binStep).div(new Decimal4(BASIS_POINT_MAX));
+    return new Decimal4(1).add(new Decimal4(binStepNum)).pow(new Decimal4(binId)).toString();
+  }
   /** Private method */
   processXYAmountDistribution(xYAmountDistribution) {
     let currentBinId = null;
@@ -11069,6 +11134,8 @@ var DLMM = class {
         const [lowerBinId2, upperBinId2] = getBinArrayLowerUpperBinId(lowerBinArrayIndex);
         const binArrayBins = [];
         for (let i = lowerBinId2.toNumber(); i <= upperBinId2.toNumber(); i++) {
+          const binId = new BN9(i);
+          const pricePerLamport = this.getPriceOfBinByBinId(binId.toNumber());
           binArrayBins.push({
             amountX: new BN9(0),
             amountY: new BN9(0),
@@ -11093,10 +11160,7 @@ var DLMM = class {
       binArray.bins.forEach((bin, idx) => {
         const binId = lowerBinIdForBinArray.toNumber() + idx;
         if (binId >= lowerBinId && binId <= upperBinId) {
-          const pricePerLamport = getPriceOfBinByBinId(
-            binId,
-            this.lbPair.binStep
-          ).toString();
+          const pricePerLamport = this.getPriceOfBinByBinId(binId);
           bins.push({
             binId,
             xAmount: bin.amountX,
@@ -11137,10 +11201,7 @@ var DLMM = class {
         binArray.bins.forEach((bin, idx) => {
           const binId = lowerBinIdForBinArray.toNumber() + idx;
           if (binId >= lowerBinId && binId <= upperBinId) {
-            const pricePerLamport = getPriceOfBinByBinId(
-              binId,
-              this.lbPair.binStep
-            ).toString();
+            const pricePerLamport = this.getPriceOfBinByBinId(binId);
             bins.push({
               binId,
               xAmount: bin.amountX,
@@ -11441,6 +11502,7 @@ export {
   fromWeightDistributionToAmountOneSide,
   getBaseFee,
   getBinArrayLowerUpperBinId,
+  getBinArraysRequiredByPositionRange,
   getBinFromBinArray,
   getOrCreateATAInstruction,
   getOutAmount,