@magmaprotocol/magma-clmm-sdk 0.5.78 → 0.5.79

package/dist/index.d.ts

@@ -2917,7 +2917,7 @@ declare class RewarderModule implements IModule {
      * @param tx
      * @returns
      */
-    batchCollectRewardePayload(params: CollectRewarderParams[], tx?: Transaction, inputCoinA?: TransactionObjectArgument, inputCoinB?: TransactionObjectArgument): Promise<Transaction>;
+    batchCollectRewardePayload(params: CollectRewarderParams[], tx?: Transaction): Promise<Transaction>;
     createCollectRewarderPaylod(params: CollectRewarderParams, tx: Transaction, primaryCoinInputs: TransactionArgument[]): Transaction;
     createCollectRewarderNoSendPaylod(params: CollectRewarderParams, tx: Transaction, primaryCoinInputs: TransactionArgument[]): Transaction;
 }

package/dist/index.js

@@ -1975,7 +1975,7 @@ function toAmountAskSide(activeId, binStep, totalAmount, distributions) {
   });
 }
 function toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, distributions) {
-  if (activeId > distributions[distributions.length - 1].binId) {
+  if (activeId > distributions[distributions.length - 1].binId || amountX.isZero()) {
     const amounts = toAmountBidSide(activeId, amountY, distributions);
     return amounts.map((bin) => {
       return {
@@ -1985,7 +1985,7 @@ function toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBi
       };
     });
   }
-  if (activeId < distributions[0].binId) {
+  if (activeId < distributions[0].binId || amountY.isZero()) {
     const amounts = toAmountAskSide(activeId, binStep, amountX, distributions);
     return amounts.map((bin) => {
       return {
@@ -2100,6 +2100,26 @@ var StrategyType = /* @__PURE__ */ ((StrategyType2) => {
   StrategyType2[StrategyType2["BidAsk"] = 3] = "BidAsk";
   return StrategyType2;
 })(StrategyType || {});
+function toWeightDecendingOrder(minBinId, maxBinId) {
+  const distributions = [];
+  for (let i = minBinId; i <= maxBinId; i++) {
+    distributions.push({
+      binId: i,
+      weight: maxBinId - i + 1
+    });
+  }
+  return distributions;
+}
+function toWeightAscendingOrder(minBinId, maxBinId) {
+  const distributions = [];
+  for (let i = minBinId; i <= maxBinId; i++) {
+    distributions.push({
+      binId: i,
+      weight: i - minBinId + 1
+    });
+  }
+  return distributions;
+}
 function toWeightSpotBalanced(minBinId, maxBinId) {
   const distributions = [];
   for (let i = minBinId; i <= maxBinId; i++) {
@@ -2216,10 +2236,26 @@ function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amou
       return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
     }
     case 2 /* Curve */: {
+      if (activeId < minBinId) {
+        const weights2 = toWeightDecendingOrder(minBinId, maxBinId);
+        return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights2);
+      }
+      if (activeId > maxBinId) {
+        const weights2 = toWeightAscendingOrder(minBinId, maxBinId);
+        return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights2);
+      }
       const weights = toWeightCurve(minBinId, maxBinId, activeId);
       return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
     }
     case 3 /* BidAsk */: {
+      if (activeId < minBinId) {
+        const weights2 = toWeightAscendingOrder(minBinId, maxBinId);
+        return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights2);
+      }
+      if (activeId > maxBinId) {
+        const weights2 = toWeightDecendingOrder(minBinId, maxBinId);
+        return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights2);
+      }
       const weights = toWeightBidAsk(minBinId, maxBinId, activeId);
       return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
     }
@@ -6881,45 +6917,21 @@ var RewarderModule = class {
    * @param tx
    * @returns
    */
-  async batchCollectRewardePayload(params, tx, inputCoinA, inputCoinB) {
+  async batchCollectRewardePayload(params, tx) {
     if (!checkInvalidSuiAddress(this._sdk.senderAddress)) {
       throw new ClmmpoolsError("this config sdk senderAddress is not set right", "InvalidSendAddress" /* InvalidSendAddress */);
     }
     const allCoinAsset = await this._sdk.getOwnerCoinAssets(this._sdk.senderAddress, null);
     tx = tx || new import_transactions6.Transaction();
-    const coinIdMaps = {};
+    const coinIdList = [];
     params.forEach((item) => {
       const coinTypeA = normalizeCoinType(item.coinTypeA);
       const coinTypeB = normalizeCoinType(item.coinTypeB);
       if (item.collect_fee) {
-        let coinAInput = coinIdMaps[coinTypeA];
-        if (coinAInput == null) {
-          if (inputCoinA == null) {
-            coinAInput = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, BigInt(0), coinTypeA, false);
-          } else {
-            coinAInput = {
-              targetCoin: inputCoinA,
-              remainCoins: [],
-              isMintZeroCoin: false,
-              tragetCoinAmount: "0"
-            };
-          }
-          coinIdMaps[coinTypeA] = coinAInput;
-        }
-        let coinBInput = coinIdMaps[coinTypeB];
-        if (coinBInput == null) {
-          if (inputCoinB == null) {
-            coinBInput = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, BigInt(0), coinTypeB, false);
-          } else {
-            coinBInput = {
-              targetCoin: inputCoinB,
-              remainCoins: [],
-              isMintZeroCoin: false,
-              tragetCoinAmount: "0"
-            };
-          }
-          coinIdMaps[coinTypeB] = coinBInput;
-        }
+        const coinAInput = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, BigInt(0), coinTypeA, false, true);
+        const coinBInput = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, BigInt(0), coinTypeB, false, true);
+        coinIdList.push({ coin: coinAInput, coin_addr: coinTypeA });
+        coinIdList.push({ coin: coinBInput, coin_addr: coinTypeB });
         tx = this._sdk.Position.createCollectFeeNoSendPaylod(
           {
             pool_id: item.pool_id,
@@ -6935,20 +6947,14 @@ var RewarderModule = class {
       const primaryCoinInputs = [];
       item.rewarder_coin_types.forEach((type) => {
         const coinType = normalizeCoinType(type);
-        let coinInput = coinIdMaps[type];
-        if (coinInput === void 0) {
-          coinInput = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, BigInt(0), coinType, false);
-          coinIdMaps[coinType] = coinInput;
-        }
+        const coinInput = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, BigInt(0), coinType, false, true);
         primaryCoinInputs.push(coinInput.targetCoin);
+        coinIdList.push({ coin: coinInput, coin_addr: coinType });
       });
       tx = this.createCollectRewarderNoSendPaylod(item, tx, primaryCoinInputs);
     });
-    Object.keys(coinIdMaps).forEach((key) => {
-      const value = coinIdMaps[key];
-      if (value.isMintZeroCoin) {
-        TransactionUtil.buildTransferCoin(this._sdk, tx, value.targetCoin, key, this._sdk.senderAddress);
-      }
+    coinIdList.forEach((item) => {
+      TransactionUtil.buildTransferCoin(this._sdk, tx, item.coin.targetCoin, item.coin_addr, this._sdk.senderAddress);
     });
     return tx;
   }
@@ -10660,12 +10666,14 @@ var DlmmModule = class {
     let primaryCoinBInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(params.amountBTotal), params.coinTypeB, false, true);
     let amount_min = 0;
     let amount_max = 0;
-    if (params.fixCoinA) {
+    if (params.fixCoinA && params.fixCoinB) {
+      primaryCoinAInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(params.amountATotal), params.coinTypeB, false, true);
+      primaryCoinBInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(params.amountBTotal), params.coinTypeB, false, true);
+    } else if (params.fixCoinA) {
       amount_min = new import_decimal13.default(params.amountBTotal).mul(lower_slippage).toDecimalPlaces(0).toNumber();
       amount_max = new import_decimal13.default(params.amountBTotal).mul(upper_slippage).toDecimalPlaces(0).toNumber();
       primaryCoinBInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(amount_max), params.coinTypeB, false, true);
-    }
-    if (params.fixCoinB) {
+    } else if (params.fixCoinB) {
       amount_min = new import_decimal13.default(params.amountATotal).mul(lower_slippage).toDecimalPlaces(0).toNumber();
       amount_max = new import_decimal13.default(params.amountATotal).mul(upper_slippage).toDecimalPlaces(0).toNumber();
       primaryCoinAInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(amount_max), params.coinTypeB, false, true);