@magmaprotocol/magma-clmm-sdk 0.5.76 → 0.5.78

package/dist/index.d.ts

@@ -1752,6 +1752,10 @@ type DlmmPoolInfo = {
     base_factor: number;
     base_fee: number;
     active_index: number;
+    real_bin_id: number;
+    coinAmountA: string;
+    coinAmountB: string;
+    index?: number;
 };
 type DlmmAddLiquidityParams = {
     pool_id: string;
@@ -2913,7 +2917,7 @@ declare class RewarderModule implements IModule {
      * @param tx
      * @returns
      */
-    batchCollectRewardePayload(params: CollectRewarderParams[], tx?: Transaction): Promise<Transaction>;
+    batchCollectRewardePayload(params: CollectRewarderParams[], tx?: Transaction, inputCoinA?: TransactionObjectArgument, inputCoinB?: TransactionObjectArgument): Promise<Transaction>;
     createCollectRewarderPaylod(params: CollectRewarderParams, tx: Transaction, primaryCoinInputs: TransactionArgument[]): Transaction;
     createCollectRewarderNoSendPaylod(params: CollectRewarderParams, tx: Transaction, primaryCoinInputs: TransactionArgument[]): Transaction;
 }

package/dist/index.js

@@ -6881,21 +6881,45 @@ var RewarderModule = class {
    * @param tx
    * @returns
    */
-  async batchCollectRewardePayload(params, tx) {
+  async batchCollectRewardePayload(params, tx, inputCoinA, inputCoinB) {
     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 coinIdList = [];
+    const coinIdMaps = {};
     params.forEach((item) => {
       const coinTypeA = normalizeCoinType(item.coinTypeA);
       const coinTypeB = normalizeCoinType(item.coinTypeB);
       if (item.collect_fee) {
-        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 });
+        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;
+        }
         tx = this._sdk.Position.createCollectFeeNoSendPaylod(
           {
             pool_id: item.pool_id,
@@ -6911,14 +6935,20 @@ var RewarderModule = class {
       const primaryCoinInputs = [];
       item.rewarder_coin_types.forEach((type) => {
         const coinType = normalizeCoinType(type);
-        const coinInput = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, BigInt(0), coinType, false, true);
+        let coinInput = coinIdMaps[type];
+        if (coinInput === void 0) {
+          coinInput = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, BigInt(0), coinType, false);
+          coinIdMaps[coinType] = coinInput;
+        }
         primaryCoinInputs.push(coinInput.targetCoin);
-        coinIdList.push({ coin: coinInput, coin_addr: coinType });
       });
       tx = this.createCollectRewarderNoSendPaylod(item, tx, primaryCoinInputs);
     });
-    coinIdList.forEach((item) => {
-      TransactionUtil.buildTransferCoin(this._sdk, tx, item.coin.targetCoin, item.coin_addr, this._sdk.senderAddress);
+    Object.keys(coinIdMaps).forEach((key) => {
+      const value = coinIdMaps[key];
+      if (value.isMintZeroCoin) {
+        TransactionUtil.buildTransferCoin(this._sdk, tx, value.targetCoin, key, this._sdk.senderAddress);
+      }
     });
     return tx;
   }
@@ -10536,7 +10566,10 @@ var DlmmModule = class {
         coin_b: fields.y.fields.name,
         base_factor: fields.params.fields.base_factor,
         base_fee: fields.params.fields.base_factor / 1e4 * (fields.bin_step / 1e4),
-        active_index: fields.params.fields.active_index
+        active_index: fields.params.fields.active_index,
+        real_bin_id: (0, import_calc_dlmm3.get_real_id)(fields.params.fields.active_index),
+        coinAmountA: fields.reserve_x,
+        coinAmountB: fields.reserve_y
       });
     });
     return poolList;