@magmaprotocol/magma-clmm-sdk 0.5.18 → 0.5.19

package/dist/index.d.ts

@@ -3098,7 +3098,10 @@ declare class LockModule implements IModule {
     poolWeights(pools: string[]): Promise<PoolWeight[]>;
     getVotingFeeRewardTokens(lock_id: string): Promise<Map<string, string[]>>;
     getVotingBribeRewardTokens(lock_id: string): Promise<Map<string, string[]>>;
-    getPoolIncentiveRewrads(incentive_tokens: string[], locksId: string): Promise<Map<string, Map<string, string>>>;
+    getPoolFeeRewards(lock_id: string, tokens: string[]): Promise<Map<string, Map<string, string>>>;
+    _getPoolFeeRewards(lock_id: string, token_a: string, token_b: string, poolFeeRewardTokens: Map<string, Map<string, string>>): Promise<Map<string, Map<string, string>>>;
+    getPoolIncentiveRewards(lock_id: string, incentive_tokens: string[]): Promise<Map<string, Map<string, string>>>;
+    _getPoolIncentiveRewards(locksId: string, incentive_tokens: string[], poolBribeRewardTokens: Map<string, Map<string, string>>): Promise<Map<string, Map<string, string>>>;
     getPoolBribeRewardTokens(pool_id: string): Promise<Map<string, string[]>>;
 }
 

package/dist/index.js

@@ -7490,11 +7490,16 @@ var LockModule = class {
       const { fields } = item.data.content;
       const aLockSummary = await this.aLockSummary(fields.id.id);
       const poolIncentiveTokens = await this.getVotingBribeRewardTokens(fields.id.id);
+      const poolFeeTokens = await this.getVotingFeeRewardTokens(fields.id.id);
       const incentiveTokens = [];
       poolIncentiveTokens.forEach((value, key) => {
         incentiveTokens.push(...value);
       });
-      const poolIncentiveRewards = await this.getPoolIncentiveRewrads(incentiveTokens, fields.id.id);
+      const feeTokens = [];
+      poolFeeTokens.forEach((value, key) => {
+        feeTokens.push(...value);
+      });
+      const poolIncentiveRewards = await this.getPoolIncentiveRewards(fields.id.id, incentiveTokens);
       const votingRewards = /* @__PURE__ */ new Map();
       poolIncentiveRewards.forEach((value, coin) => {
         value.forEach((amount, pool) => {
@@ -7508,6 +7513,19 @@ var LockModule = class {
           });
         });
       });
+      const poolFeeRewards = await this.getPoolFeeRewards(fields.id.id, feeTokens);
+      poolFeeRewards.forEach((value, coin) => {
+        value.forEach((amount, pool) => {
+          if (!votingRewards.has(pool)) {
+            votingRewards.set(pool, []);
+          }
+          votingRewards.get(pool)?.push({
+            kind: "fee" /* Fee */,
+            token_addr: coin,
+            amount: amount.toString()
+          });
+        });
+      });
       const lockInfo = {
         lock_id: fields.id.id,
         amount: fields.amount,
@@ -7520,7 +7538,7 @@ var LockModule = class {
           amount: aLockSummary.reward_distributor_claimable
         },
         voting_power: aLockSummary.voting_power,
-        // pool => incentive => amount
+        // pool => incentive/fee => amount
         voting_rewards: votingRewards
       };
       locksInfo.lockInfo.push(lockInfo);
@@ -7528,7 +7546,6 @@ var LockModule = class {
     return locksInfo;
   }
   async aLockInfo(lockId) {
-    const aLockSummary = await this.aLockSummary(lockId);
     const lockObj = await this._sdk.fullClient.getObject({
       id: lockId,
       options: {
@@ -7540,13 +7557,25 @@ var LockModule = class {
         showType: true
       }
     });
+    if (lockObj.error != null || lockObj.data?.content?.dataType !== "moveObject") {
+      throw new ClmmpoolsError(
+        `getPool error code: ${lockObj.error?.code ?? "unknown error"}, please check config and object id`,
+        "InvalidLockObject" /* InvalidLockObject */
+      );
+    }
     const { magma_token } = getPackagerConfigs(this.sdk.sdkOptions.magma_config);
+    const aLockSummary = await this.aLockSummary(lockId);
     const poolIncentiveTokens = await this.getVotingBribeRewardTokens(lockId);
+    const poolFeeTokens = await this.getVotingFeeRewardTokens(lockId);
     const incentiveTokens = [];
     poolIncentiveTokens.forEach((value, key) => {
       incentiveTokens.push(...value);
     });
-    const poolIncentiveRewards = await this.getPoolIncentiveRewrads(incentiveTokens, lockId);
+    const feeTokens = [];
+    poolFeeTokens.forEach((value, key) => {
+      feeTokens.push(...value);
+    });
+    const poolIncentiveRewards = await this.getPoolIncentiveRewards(lockId, incentiveTokens);
     const votingRewards = /* @__PURE__ */ new Map();
     poolIncentiveRewards.forEach((value, coin) => {
       value.forEach((amount, pool) => {
@@ -7560,12 +7589,19 @@ var LockModule = class {
         });
       });
     });
-    if (lockObj.error != null || lockObj.data?.content?.dataType !== "moveObject") {
-      throw new ClmmpoolsError(
-        `getPool error code: ${lockObj.error?.code ?? "unknown error"}, please check config and object id`,
-        "InvalidLockObject" /* InvalidLockObject */
-      );
-    }
+    const poolFeeRewards = await this.getPoolFeeRewards(lockId, feeTokens);
+    poolFeeRewards.forEach((value, coin) => {
+      value.forEach((amount, pool) => {
+        if (!votingRewards.has(pool)) {
+          votingRewards.set(pool, []);
+        }
+        votingRewards.get(pool)?.push({
+          kind: "fee" /* Fee */,
+          token_addr: coin,
+          amount: amount.toString()
+        });
+      });
+    });
     const fields = getObjectFields(lockObj);
     const lockInfo = {
       lock_id: lockId,
@@ -7780,11 +7816,72 @@ var LockModule = class {
     });
     return poolBirbeRewardTokens;
   }
-  // tokenId => pool => incentive_tokens
-  async getPoolIncentiveRewrads(incentive_tokens, locksId) {
-    const poolBirbeRewardTokens = /* @__PURE__ */ new Map();
+  async getPoolFeeRewards(lock_id, tokens) {
+    const poolFeeRewardTokens = /* @__PURE__ */ new Map();
+    if (tokens.length === 0) {
+      return poolFeeRewardTokens;
+    }
+    if (tokens.length % 2 !== 0) {
+      tokens.push(tokens[0]);
+    }
+    for (let i = 0; i + 1 < tokens.length; i += 2) {
+      await this._getPoolFeeRewards(lock_id, tokens[i], tokens[i + 1], poolFeeRewardTokens);
+    }
+    return poolFeeRewardTokens;
+  }
+  // if you have many tokens, call this function multi times
+  async _getPoolFeeRewards(lock_id, token_a, token_b, poolFeeRewardTokens) {
+    const tx = new import_transactions9.Transaction();
+    const { integrate, simulationAccount } = this.sdk.sdkOptions;
+    const { magma_token, voter_id } = getPackagerConfigs(this.sdk.sdkOptions.magma_config);
+    const typeArguments = [magma_token, token_a, token_b];
+    const args = [tx.object(voter_id), tx.object(lock_id), tx.object(CLOCK_ADDRESS)];
+    const targetFunc = `${integrate.published_at}::${Voter}::claimable_voting_fee_rewards`;
+    tx.moveCall({
+      target: targetFunc,
+      arguments: args,
+      typeArguments
+    });
+    if (!checkInvalidSuiAddress(simulationAccount.address)) {
+      throw Error("this config simulationAccount is not set right");
+    }
+    const simulateRes = await this.sdk.fullClient.devInspectTransactionBlock({
+      transactionBlock: tx,
+      sender: simulationAccount.address
+    });
+    if (simulateRes.error != null) {
+      throw new Error(`getPoolFeeRewards error code: ${simulateRes.error ?? "unknown error"}`);
+    }
+    simulateRes.events?.forEach((item) => {
+      if (extractStructTagFromType(item.type).name === `ClaimableVotingFee`) {
+        item.parsedJson.data.contents.forEach((rewardTokens) => {
+          if (!poolFeeRewardTokens.has(rewardTokens.key.name)) {
+            poolFeeRewardTokens.set(rewardTokens.key.name, /* @__PURE__ */ new Map());
+          }
+          rewardTokens.value.contents.forEach((token) => {
+            poolFeeRewardTokens.get(rewardTokens.key.name)?.set(token.key, token.value);
+          });
+        });
+      }
+    });
+    return poolFeeRewardTokens;
+  }
+  async getPoolIncentiveRewards(lock_id, incentive_tokens) {
+    const poolBribeRewardTokens = /* @__PURE__ */ new Map();
     if (incentive_tokens.length === 0) {
-      return poolBirbeRewardTokens;
+      return poolBribeRewardTokens;
+    }
+    let i = 0;
+    for (; i + 3 < incentive_tokens.length; i += 3) {
+      await this._getPoolIncentiveRewards(lock_id, incentive_tokens.slice(i, i + 3), poolBribeRewardTokens);
+    }
+    await this._getPoolIncentiveRewards(lock_id, incentive_tokens.slice(i), poolBribeRewardTokens);
+    return poolBribeRewardTokens;
+  }
+  // tokenId => pool => incentive_tokens
+  async _getPoolIncentiveRewards(locksId, incentive_tokens, poolBribeRewardTokens) {
+    if (incentive_tokens.length > 3) {
+      throw Error("Too many tokens");
     }
     const tx = new import_transactions9.Transaction();
     const { integrate, simulationAccount } = this.sdk.sdkOptions;
@@ -7808,21 +7905,21 @@ var LockModule = class {
       sender: simulationAccount.address
     });
     if (simulateRes.error != null) {
-      throw new Error(`all_lock_summary error code: ${simulateRes.error ?? "unknown error"}`);
+      throw new Error(`getPoolIncentiveRewards error code: ${simulateRes.error ?? "unknown error"}`);
     }
     simulateRes.events?.forEach((item) => {
       if (extractStructTagFromType(item.type).name === `ClaimableVotingBribes`) {
         item.parsedJson.data.contents.forEach((rewardTokens) => {
-          if (!poolBirbeRewardTokens.has(rewardTokens.key.name)) {
-            poolBirbeRewardTokens.set(rewardTokens.key.name, /* @__PURE__ */ new Map());
+          if (!poolBribeRewardTokens.has(rewardTokens.key.name)) {
+            poolBribeRewardTokens.set(rewardTokens.key.name, /* @__PURE__ */ new Map());
           }
           rewardTokens.value.contents.forEach((token) => {
-            poolBirbeRewardTokens.get(rewardTokens.key.name)?.set(token.key, token.value);
+            poolBribeRewardTokens.get(rewardTokens.key.name)?.set(token.key, token.value);
           });
         });
       }
     });
-    return poolBirbeRewardTokens;
+    return poolBribeRewardTokens;
   }
   async getPoolBribeRewardTokens(pool_id) {
     const tx = new import_transactions9.Transaction();