@meteora-ag/dlmm 1.0.47-rc.0 → 1.0.47-rc.2

package/dist/index.d.ts

@@ -4739,7 +4739,7 @@ interface StrategyParameters {
     maxBinId: number;
     minBinId: number;
     strategyType: StrategyType;
-    singleSided?: boolean;
+    singleSidedX?: boolean;
 }
 interface TQuoteCreatePositionParams {
     strategy: StrategyParameters;
@@ -5464,7 +5464,7 @@ declare function toAmountsBothSideByStrategy(activeId: number, binStep: number,
 }[];
 declare function autoFillYByStrategy(activeId: number, binStep: number, amountX: BN, amountXInActiveBin: BN, amountYInActiveBin: BN, minBinId: number, maxBinId: number, strategyType: StrategyType): BN;
 declare function autoFillXByStrategy(activeId: number, binStep: number, amountY: BN, amountXInActiveBin: BN, amountYInActiveBin: BN, minBinId: number, maxBinId: number, strategyType: StrategyType): BN;
-declare function toStrategyParameters({ maxBinId, minBinId, strategyType, singleSided, }: StrategyParameters): {
+declare function toStrategyParameters({ maxBinId, minBinId, strategyType, singleSidedX, }: StrategyParameters): {
     minBinId: number;
     maxBinId: number;
     strategyType: {

package/dist/index.js

@@ -6293,6 +6293,7 @@ function toAmountsOneSideByStrategy(activeId, binStep, minBinId, maxBinId, amoun
   }
 }
 function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amountX, amountY, amountXInActiveBin, amountYInActiveBin, strategyType) {
+  const isSingleSideX = amountY.isZero();
   switch (strategyType) {
     case 0 /* SpotOneSide */:
     case 1 /* CurveOneSide */:
@@ -6301,7 +6302,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
     }
     case 3 /* SpotImBalanced */: {
       if (activeId < minBinId || activeId > maxBinId) {
-        let weights = toWeightSpotBalanced(minBinId, maxBinId);
+        const weights = toWeightSpotBalanced(minBinId, maxBinId);
         return toAmountBothSide(
           activeId,
           binStep,
@@ -6312,27 +6313,61 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
           weights
         );
       }
-      let amountsInBin = [];
-      if (minBinId <= activeId) {
-        let weights = toWeightSpotBalanced(minBinId, activeId);
-        let amounts = toAmountBidSide(activeId, amountY, weights);
-        for (let bin of amounts) {
-          amountsInBin.push({
-            binId: bin.binId,
-            amountX: new (0, _anchor.BN)(0),
-            amountY: bin.amount
-          });
+      const amountsInBin = [];
+      if (!isSingleSideX) {
+        if (minBinId <= activeId) {
+          const weights = toWeightSpotBalanced(minBinId, activeId);
+          const amounts = toAmountBidSide(activeId, amountY, weights);
+          for (let bin of amounts) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: new (0, _anchor.BN)(0),
+              amountY: bin.amount
+            });
+          }
         }
-      }
-      if (activeId < maxBinId) {
-        let weights = toWeightSpotBalanced(activeId + 1, maxBinId);
-        let amounts = toAmountAskSide(activeId, binStep, amountX, weights);
-        for (let bin of amounts) {
-          amountsInBin.push({
-            binId: bin.binId,
-            amountX: bin.amount,
-            amountY: new (0, _anchor.BN)(0)
-          });
+        if (activeId < maxBinId) {
+          const weights = toWeightSpotBalanced(activeId + 1, maxBinId);
+          const amounts = toAmountAskSide(activeId, binStep, amountX, weights);
+          for (let bin of amounts) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: bin.amount,
+              amountY: new (0, _anchor.BN)(0)
+            });
+          }
+        }
+      } else {
+        if (minBinId < activeId) {
+          const weights = toWeightSpotBalanced(minBinId, activeId - 1);
+          const amountsIntoBidSide = toAmountBidSide(
+            activeId,
+            amountY,
+            weights
+          );
+          for (let bin of amountsIntoBidSide) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: new (0, _anchor.BN)(0),
+              amountY: bin.amount
+            });
+          }
+        }
+        if (activeId <= maxBinId) {
+          const weights = toWeightSpotBalanced(activeId, maxBinId);
+          const amountsIntoAskSide = toAmountAskSide(
+            activeId,
+            binStep,
+            amountX,
+            weights
+          );
+          for (let bin of amountsIntoAskSide) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: bin.amount,
+              amountY: new (0, _anchor.BN)(0)
+            });
+          }
         }
       }
       return amountsInBin;
@@ -6351,7 +6386,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
         );
       }
       if (activeId > maxBinId) {
-        let weights = toWeightAscendingOrder(minBinId, maxBinId);
+        const weights = toWeightAscendingOrder(minBinId, maxBinId);
         return toAmountBothSide(
           activeId,
           binStep,
@@ -6362,34 +6397,68 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
           weights
         );
       }
-      let amountsInBin = [];
-      if (minBinId <= activeId) {
-        let weights = toWeightAscendingOrder(minBinId, activeId);
-        let amounts = toAmountBidSide(activeId, amountY, weights);
-        for (let bin of amounts) {
-          amountsInBin.push({
-            binId: bin.binId,
-            amountX: new (0, _anchor.BN)(0),
-            amountY: bin.amount
-          });
+      const amountsInBin = [];
+      if (!isSingleSideX) {
+        if (minBinId <= activeId) {
+          const weights = toWeightAscendingOrder(minBinId, activeId);
+          const amounts = toAmountBidSide(activeId, amountY, weights);
+          for (let bin of amounts) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: new (0, _anchor.BN)(0),
+              amountY: bin.amount
+            });
+          }
         }
-      }
-      if (activeId < maxBinId) {
-        let weights = toWeightDecendingOrder(activeId + 1, maxBinId);
-        let amounts = toAmountAskSide(activeId, binStep, amountX, weights);
-        for (let bin of amounts) {
-          amountsInBin.push({
-            binId: bin.binId,
-            amountX: bin.amount,
-            amountY: new (0, _anchor.BN)(0)
-          });
+        if (activeId < maxBinId) {
+          const weights = toWeightDecendingOrder(activeId + 1, maxBinId);
+          const amounts = toAmountAskSide(activeId, binStep, amountX, weights);
+          for (let bin of amounts) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: bin.amount,
+              amountY: new (0, _anchor.BN)(0)
+            });
+          }
+        }
+      } else {
+        if (minBinId < activeId) {
+          const weights = toWeightAscendingOrder(minBinId, activeId - 1);
+          const amountsIntoBidSide = toAmountBidSide(
+            activeId,
+            amountY,
+            weights
+          );
+          for (let bin of amountsIntoBidSide) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: new (0, _anchor.BN)(0),
+              amountY: bin.amount
+            });
+          }
+        }
+        if (activeId <= maxBinId) {
+          const weights = toWeightDecendingOrder(activeId, maxBinId);
+          const amountsIntoAskSide = toAmountAskSide(
+            activeId,
+            binStep,
+            amountX,
+            weights
+          );
+          for (let bin of amountsIntoAskSide) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: bin.amount,
+              amountY: new (0, _anchor.BN)(0)
+            });
+          }
         }
       }
       return amountsInBin;
     }
     case 5 /* BidAskImBalanced */: {
       if (activeId < minBinId) {
-        let weights = toWeightAscendingOrder(minBinId, maxBinId);
+        const weights = toWeightAscendingOrder(minBinId, maxBinId);
         return toAmountBothSide(
           activeId,
           binStep,
@@ -6401,7 +6470,7 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
         );
       }
       if (activeId > maxBinId) {
-        let weights = toWeightDecendingOrder(minBinId, maxBinId);
+        const weights = toWeightDecendingOrder(minBinId, maxBinId);
         return toAmountBothSide(
           activeId,
           binStep,
@@ -6412,27 +6481,61 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
           weights
         );
       }
-      let amountsInBin = [];
-      if (minBinId <= activeId) {
-        let weights = toWeightDecendingOrder(minBinId, activeId);
-        let amounts = toAmountBidSide(activeId, amountY, weights);
-        for (let bin of amounts) {
-          amountsInBin.push({
-            binId: bin.binId,
-            amountX: new (0, _anchor.BN)(0),
-            amountY: bin.amount
-          });
+      const amountsInBin = [];
+      if (!isSingleSideX) {
+        if (minBinId <= activeId) {
+          const weights = toWeightDecendingOrder(minBinId, activeId);
+          const amounts = toAmountBidSide(activeId, amountY, weights);
+          for (let bin of amounts) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: new (0, _anchor.BN)(0),
+              amountY: bin.amount
+            });
+          }
         }
-      }
-      if (activeId < maxBinId) {
-        let weights = toWeightAscendingOrder(activeId + 1, maxBinId);
-        let amounts = toAmountAskSide(activeId, binStep, amountX, weights);
-        for (let bin of amounts) {
-          amountsInBin.push({
-            binId: bin.binId,
-            amountX: bin.amount,
-            amountY: new (0, _anchor.BN)(0)
-          });
+        if (activeId < maxBinId) {
+          const weights = toWeightAscendingOrder(activeId + 1, maxBinId);
+          const amounts = toAmountAskSide(activeId, binStep, amountX, weights);
+          for (let bin of amounts) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: bin.amount,
+              amountY: new (0, _anchor.BN)(0)
+            });
+          }
+        }
+      } else {
+        if (minBinId < activeId) {
+          const weights = toWeightDecendingOrder(minBinId, activeId - 1);
+          const amountsIntoBidSide = toAmountBidSide(
+            activeId,
+            amountY,
+            weights
+          );
+          for (let bin of amountsIntoBidSide) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: new (0, _anchor.BN)(0),
+              amountY: bin.amount
+            });
+          }
+        }
+        if (activeId <= maxBinId) {
+          const weights = toWeightAscendingOrder(activeId, maxBinId);
+          const amountsIntoAskSide = toAmountAskSide(
+            activeId,
+            binStep,
+            amountX,
+            weights
+          );
+          for (let bin of amountsIntoAskSide) {
+            amountsInBin.push({
+              binId: bin.binId,
+              amountX: bin.amount,
+              amountY: new (0, _anchor.BN)(0)
+            });
+          }
         }
       }
       return amountsInBin;
@@ -6569,9 +6672,9 @@ function toStrategyParameters({
   maxBinId,
   minBinId,
   strategyType,
-  singleSided
+  singleSidedX
 }) {
-  const parameters = [singleSided ? 1 : 0, ...new Array(63).fill(0)];
+  const parameters = [singleSidedX ? 1 : 0, ...new Array(63).fill(0)];
   switch (strategyType) {
     case 0 /* SpotOneSide */: {
       return {