@magmaprotocol/magma-clmm-sdk 0.5.86 → 0.5.88

package/dist/index.js

@@ -2316,28 +2316,28 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
     }
     case 2 /* Curve */: {
       if (activeId < minBinId) {
-        const weights2 = toWeightDecendingOrder(minBinId, maxBinId);
-        res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights2);
-      }
-      if (activeId > maxBinId) {
-        const weights2 = toWeightAscendingOrder(minBinId, maxBinId);
-        res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights2);
+        const weights = toWeightDecendingOrder(minBinId, maxBinId);
+        res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
+      } else if (activeId > maxBinId) {
+        const weights = toWeightAscendingOrder(minBinId, maxBinId);
+        res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
+      } else {
+        const weights = toWeightCurve(minBinId, maxBinId, activeId);
+        res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
       }
-      const weights = toWeightCurve(minBinId, maxBinId, activeId);
-      res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
       break;
     }
     case 3 /* BidAsk */: {
       if (activeId < minBinId) {
-        const weights2 = toWeightAscendingOrder(minBinId, maxBinId);
-        res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights2);
-      }
-      if (activeId > maxBinId) {
-        const weights2 = toWeightDecendingOrder(minBinId, maxBinId);
-        res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights2);
+        const weights = toWeightAscendingOrder(minBinId, maxBinId);
+        res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
+      } else if (activeId > maxBinId) {
+        const weights = toWeightDecendingOrder(minBinId, maxBinId);
+        res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
+      } else {
+        const weights = toWeightBidAsk(minBinId, maxBinId, activeId);
+        res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
       }
-      const weights = toWeightBidAsk(minBinId, maxBinId, activeId);
-      res = toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
       break;
     }
     default:
@@ -11470,10 +11470,10 @@ var DlmmModule = class {
       throw new Error(`fetchPairRewards error code: ${simulateRes.error ?? "unknown error"}`);
     }
     simulateRes.events?.forEach((item) => {
-      if (extractStructTagFromType(item.type).name === `EventPositionLiquidity`) {
+      if (extractStructTagFromType(item.type).name === `EventEarnedFees`) {
         out.position_id = item.parsedJson.position_id;
-        out.x = item.parsedJson.x;
-        out.y = item.parsedJson.y;
+        out.x = item.parsedJson.x.name;
+        out.y = item.parsedJson.y.name;
         out.fee_x = item.parsedJson.fee_x;
         out.fee_y = item.parsedJson.fee_y;
       }
@@ -11507,17 +11507,17 @@ var DlmmModule = class {
       throw new Error(`getEarnedRewards error code: ${simulateRes.error ?? "unknown error"}`);
     }
     simulateRes.events?.forEach((item) => {
-      if (extractStructTagFromType(item.type).name === `DlmmEventEarnedRewards`) {
+      if (extractStructTagFromType(item.type).name === `EventEarnedRewards`) {
         out.position_id = item.parsedJson.position_id;
-        out.reward = [item.parsedJson.reward];
+        out.reward = [item.parsedJson.reward.name];
         out.amount = [item.parsedJson.amount];
-      } else if (extractStructTagFromType(item.type).name === `DlmmEventEarnedRewards2`) {
+      } else if (extractStructTagFromType(item.type).name === `EventEarnedRewards2`) {
         out.position_id = item.parsedJson.position_id;
-        out.reward = [item.parsedJson.reward1, item.parsedJson.reward2];
+        out.reward = [item.parsedJson.reward1.name, item.parsedJson.reward2.name];
         out.amount = [item.parsedJson.amount1, item.parsedJson.amount2];
       } else if (extractStructTagFromType(item.type).name === `EventEarnedRewards3`) {
         out.position_id = item.parsedJson.position_id;
-        out.reward = [item.parsedJson.reward1, item.parsedJson.reward2, item.parsedJson.reward3];
+        out.reward = [item.parsedJson.reward1.name, item.parsedJson.reward2.name, item.parsedJson.reward3.name];
         out.amount = [item.parsedJson.amount1, item.parsedJson.amount2, item.parsedJson.amount3];
       }
     });