@meteora-ag/dlmm 1.0.44 → 1.0.46-rc.0

package/dist/index.js

@@ -4898,6 +4898,26 @@ function toAmountAskSide(activeId, binStep, totalAmount, distributions) {
   });
 }
 function toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, distributions) {
+  if (activeId > distributions[distributions.length - 1].binId) {
+    let amounts = toAmountBidSide(activeId, amountY, distributions);
+    return amounts.map((bin) => {
+      return {
+        binId: bin.binId,
+        amountX: new (0, _anchor.BN)(0),
+        amountY: bin.amount
+      };
+    });
+  }
+  if (activeId < distributions[0].binId) {
+    let amounts = toAmountAskSide(activeId, binStep, amountX, distributions);
+    return amounts.map((bin) => {
+      return {
+        binId: bin.binId,
+        amountX: bin.amount,
+        amountY: new (0, _anchor.BN)(0)
+      };
+    });
+  }
   const activeBins = distributions.filter((element) => {
     return element.binId === activeId;
   });
@@ -6280,6 +6300,10 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
       throw "Invalid Strategy Parameters";
     }
     case 3 /* SpotImBalanced */: {
+      if (activeId < minBinId || activeId > maxBinId) {
+        let weights = toWeightSpotBalanced(minBinId, maxBinId);
+        return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
+      }
       let amountsInBin = [];
       if (minBinId <= activeId) {
         let weights = toWeightSpotBalanced(minBinId, activeId);
@@ -6306,6 +6330,30 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
       return amountsInBin;
     }
     case 4 /* CurveImBalanced */: {
+      if (activeId < minBinId) {
+        let weights = toWeightDecendingOrder(minBinId, maxBinId);
+        return toAmountBothSide(
+          activeId,
+          binStep,
+          amountX,
+          amountY,
+          amountXInActiveBin,
+          amountYInActiveBin,
+          weights
+        );
+      }
+      if (activeId > maxBinId) {
+        let weights = toWeightAscendingOrder(minBinId, maxBinId);
+        return toAmountBothSide(
+          activeId,
+          binStep,
+          amountX,
+          amountY,
+          amountXInActiveBin,
+          amountYInActiveBin,
+          weights
+        );
+      }
       let amountsInBin = [];
       if (minBinId <= activeId) {
         let weights = toWeightAscendingOrder(minBinId, activeId);
@@ -6332,6 +6380,30 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
       return amountsInBin;
     }
     case 5 /* BidAskImBalanced */: {
+      if (activeId < minBinId) {
+        let weights = toWeightAscendingOrder(minBinId, maxBinId);
+        return toAmountBothSide(
+          activeId,
+          binStep,
+          amountX,
+          amountY,
+          amountXInActiveBin,
+          amountYInActiveBin,
+          weights
+        );
+      }
+      if (activeId > maxBinId) {
+        let weights = toWeightDecendingOrder(minBinId, maxBinId);
+        return toAmountBothSide(
+          activeId,
+          binStep,
+          amountX,
+          amountY,
+          amountXInActiveBin,
+          amountYInActiveBin,
+          weights
+        );
+      }
       let amountsInBin = [];
       if (minBinId <= activeId) {
         let weights = toWeightDecendingOrder(minBinId, activeId);
@@ -6973,21 +7045,23 @@ var DLMM = class {
       _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _40 => _40.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
       provider
     );
-    const positions = await program.account.position.all([
-      {
-        memcmp: {
-          bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
-          offset: 8 + 32
+    const [positions, positionsV2] = await Promise.all([
+      program.account.position.all([
+        {
+          memcmp: {
+            bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
+            offset: 8 + 32
+          }
         }
-      }
-    ]);
-    const positionsV2 = await program.account.positionV2.all([
-      {
-        memcmp: {
-          bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
-          offset: 8 + 32
+      ]),
+      program.account.positionV2.all([
+        {
+          memcmp: {
+            bytes: _bytes.bs58.encode(userPubKey.toBuffer()),
+            offset: 8 + 32
+          }
         }
-      }
+      ])
     ]);
     const binArrayPubkeySet = /* @__PURE__ */ new Set();
     const lbPairSet = /* @__PURE__ */ new Set();
@@ -8164,31 +8238,8 @@ var DLMM = class {
       tokenXProgram: _spltoken.TOKEN_PROGRAM_ID,
       tokenYProgram: _spltoken.TOKEN_PROGRAM_ID
     };
-    const oneSideLiquidityParams = {
-      amount: totalXAmount.isZero() ? totalYAmount : totalXAmount,
-      activeId,
-      maxActiveBinSlippage,
-      strategyParameters
-    };
-    const oneSideAddLiquidityAccounts = {
-      binArrayLower,
-      binArrayUpper,
-      lbPair: this.pubkey,
-      binArrayBitmapExtension: null,
-      sender: user,
-      position: positionPubKey,
-      reserve: totalXAmount.isZero() ? this.lbPair.reserveY : this.lbPair.reserveX,
-      tokenMint: totalXAmount.isZero() ? this.lbPair.tokenYMint : this.lbPair.tokenXMint,
-      tokenProgram: _spltoken.TOKEN_PROGRAM_ID,
-      userToken: totalXAmount.isZero() ? userTokenY : userTokenX
-    };
-    const isOneSideDeposit = totalXAmount.isZero() || totalYAmount.isZero();
-    const programMethod = isOneSideDeposit ? this.program.methods.addLiquidityByStrategyOneSide(
-      oneSideLiquidityParams
-    ) : this.program.methods.addLiquidityByStrategy(liquidityParams);
-    const createPositionTx = await programMethod.accounts(
-      isOneSideDeposit ? oneSideAddLiquidityAccounts : addLiquidityAccounts
-    ).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
+    const programMethod = this.program.methods.addLiquidityByStrategy(liquidityParams);
+    const createPositionTx = await programMethod.accounts(addLiquidityAccounts).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return new (0, _web3js.Transaction)({
       blockhash,
@@ -8513,31 +8564,8 @@ var DLMM = class {
       tokenXProgram: _spltoken.TOKEN_PROGRAM_ID,
       tokenYProgram: _spltoken.TOKEN_PROGRAM_ID
     };
-    const oneSideLiquidityParams = {
-      amount: totalXAmount.isZero() ? totalYAmount : totalXAmount,
-      activeId,
-      maxActiveBinSlippage,
-      strategyParameters
-    };
-    const oneSideAddLiquidityAccounts = {
-      binArrayLower,
-      binArrayUpper,
-      lbPair: this.pubkey,
-      binArrayBitmapExtension: null,
-      sender: user,
-      position: positionPubKey,
-      reserve: totalXAmount.isZero() ? this.lbPair.reserveY : this.lbPair.reserveX,
-      tokenMint: totalXAmount.isZero() ? this.lbPair.tokenYMint : this.lbPair.tokenXMint,
-      tokenProgram: _spltoken.TOKEN_PROGRAM_ID,
-      userToken: totalXAmount.isZero() ? userTokenY : userTokenX
-    };
-    const isOneSideDeposit = totalXAmount.isZero() || totalYAmount.isZero();
-    const programMethod = isOneSideDeposit ? this.program.methods.addLiquidityByStrategyOneSide(
-      oneSideLiquidityParams
-    ) : this.program.methods.addLiquidityByStrategy(liquidityParams);
-    const createPositionTx = await programMethod.accounts(
-      isOneSideDeposit ? oneSideAddLiquidityAccounts : addLiquidityAccounts
-    ).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
+    const programMethod = this.program.methods.addLiquidityByStrategy(liquidityParams);
+    const createPositionTx = await programMethod.accounts(addLiquidityAccounts).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return new (0, _web3js.Transaction)({
       blockhash,