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

package/dist/index.d.ts

@@ -5226,7 +5226,6 @@ interface SwapQuote {
     minOutAmount: BN;
     priceImpact: Decimal;
     binArraysPubkey: any[];
-    endPrice: Decimal;
 }
 interface SwapQuoteExactOut {
     inAmount: BN;
@@ -5539,6 +5538,12 @@ declare class DLMM {
      * @returns an object with two properties: "binId" which is a number, and "price" which is a string.
      */
     getActiveBin(): Promise<BinLiquidity>;
+    /**
+     * 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: number): string;
     /**
      * The function get bin ID based on a given price and a boolean flag indicating whether to
      * round down or up.
@@ -5675,6 +5680,8 @@ declare class DLMM {
      *    - `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
@@ -5684,7 +5691,7 @@ declare class DLMM {
      *    - `priceImpact`: Price impact of the swap
      *    - `binArraysPubkey`: Array of bin arrays involved in the swap
      */
-    swapQuote(inAmount: BN, swapForY: boolean, allowedSlippage: BN, binArrays: BinArrayAccount[]): SwapQuote;
+    swapQuote(inAmount: BN, swapForY: boolean, allowedSlippage: BN, binArrays: BinArrayAccount[], isPartialFill?: boolean): SwapQuote;
     swapExactOut({ inToken, outToken, outAmount, maxInAmount, lbPair, user, binArraysPubkey, }: SwapExactOutParams): Promise<Transaction>;
     /**
      * Returns a transaction to be signed and sent by user performing swap.
@@ -5839,6 +5846,7 @@ declare class DLMM {
     private static getClaimableSwapFee;
     private static processPosition;
     private static getBinsBetweenLowerAndUpperBound;
+    private static getPriceOfBinByBinId;
     /** Private method */
     private processXYAmountDistribution;
     private getBins;

package/dist/index.js

@@ -8485,6 +8485,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 (0, _decimaljs2.default)(this.lbPair.binStep).div(
+      new (0, _decimaljs2.default)(BASIS_POINT_MAX)
+    );
+    return new (0, _decimaljs2.default)(1).add(new (0, _decimaljs2.default)(binStepNum)).pow(new (0, _decimaljs2.default)(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 +9704,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 (0, _decimaljs2.default)(100));
+    const startPrice = this.getPriceOfBinByBinId(startBinId.toNumber());
+    const endPrice = this.getPriceOfBinByBinId(activeId.toNumber());
+    const priceImpact = new (0, _decimaljs2.default)(startPrice).sub(new (0, _decimaljs2.default)(endPrice)).abs().div(new (0, _decimaljs2.default)(startPrice)).mul(new (0, _decimaljs2.default)(100));
     const maxInAmount = actualInAmount.mul(new (0, _anchor.BN)(BASIS_POINT_MAX).add(allowedSlippage)).div(new (0, _anchor.BN)(BASIS_POINT_MAX));
     return {
       inAmount: actualInAmount,
@@ -9719,6 +9724,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 +9735,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 +9762,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 +9807,7 @@ var DLMM = class {
     }
     if (!startBin)
       throw new Error("Invalid start bin");
+    inAmount = inAmount.sub(inAmountLeft);
     const outAmountWithoutSlippage = getOutAmount(
       startBin,
       inAmount.sub(
@@ -9805,10 +9817,6 @@ 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(),
-      this.lbPair.binStep
-    );
     return {
       consumedInAmount: inAmount,
       outAmount: actualOutAmount,
@@ -9816,8 +9824,7 @@ var DLMM = class {
       protocolFee: protocolFeeAmount,
       minOutAmount,
       priceImpact,
-      binArraysPubkey: [...binArraysForSwap.keys()],
-      endPrice
+      binArraysPubkey: [...binArraysForSwap.keys()]
     };
   }
   async swapExactOut({
@@ -10106,7 +10113,7 @@ 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 +10197,12 @@ 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();
@@ -10584,7 +10591,7 @@ 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 +10601,7 @@ 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 +10995,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 +11019,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 +11038,10 @@ var DLMM = class {
     }
     return bins;
   }
+  static getPriceOfBinByBinId(binStep, binId) {
+    const binStepNum = new (0, _decimaljs2.default)(binStep).div(new (0, _decimaljs2.default)(BASIS_POINT_MAX));
+    return new (0, _decimaljs2.default)(1).add(new (0, _decimaljs2.default)(binStepNum)).pow(new (0, _decimaljs2.default)(binId)).toString();
+  }
   /** Private method */
   processXYAmountDistribution(xYAmountDistribution) {
     let currentBinId = null;
@@ -11069,6 +11080,8 @@ var DLMM = class {
         const [lowerBinId2, upperBinId2] = getBinArrayLowerUpperBinId(lowerBinArrayIndex);
         const binArrayBins = [];
         for (let i = lowerBinId2.toNumber(); i <= upperBinId2.toNumber(); i++) {
+          const binId = new (0, _anchor.BN)(i);
+          const pricePerLamport = this.getPriceOfBinByBinId(binId.toNumber());
           binArrayBins.push({
             amountX: new (0, _anchor.BN)(0),
             amountY: new (0, _anchor.BN)(0),
@@ -11093,10 +11106,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 +11147,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,