@scallop-io/sui-scallop-sdk 1.3.5-alpha.2 → 1.3.5-alpha.4

package/dist/index.mjs

@@ -267,18 +267,6 @@ var spoolRewardCoins = {
 var suiBridgeCoins = {
   sbeth: "sbeth"
 };
-var borrowIncentiveRewardCoins = {
-  usdc: ["ssui", "ssca"],
-  sui: ["ssui", "ssca"],
-  wusdc: ["ssui", "ssca"],
-  wusdt: ["ssui", "ssca"],
-  sca: ["ssui", "ssca"],
-  afsui: ["ssui"],
-  hasui: ["ssui"],
-  vsui: ["ssui"],
-  weth: ["ssui"],
-  sbeth: ["ssui"]
-};
 var coinIds = {
   usdc: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7",
   sui: "0x0000000000000000000000000000000000000000000000000000000000000002",
@@ -4756,15 +4744,6 @@ var ScallopUtils = class {
     this.getSpoolRewardCoinName = (stakeMarketCoinName) => {
       return spoolRewardCoins[stakeMarketCoinName];
     };
-    /**
-     * Get reward type of borrow incentive pool.
-     *
-     * @param borrowIncentiveCoinName - Support borrow incentive coin.
-     * @return Borrow incentive reward coin name.
-     */
-    this.getBorrowIncentiveRewardCoinName = (borrowIncentiveCoinName) => {
-      return borrowIncentiveRewardCoins[borrowIncentiveCoinName];
-    };
     this.params = {
       pythEndpoints: params.pythEndpoints ?? PYTH_ENDPOINTS["mainnet"],
       ...params
@@ -4834,7 +4813,10 @@ var ScallopUtils = class {
    * @param coinName - Specific support coin name.
    * @return Coin type.
    */
-  parseCoinType(coinName) {
+  parseCoinType(coinName, useOldMarketCoin = false) {
+    if (sCoinIds[coinName] && !useOldMarketCoin) {
+      return sCoinIds[coinName];
+    }
     coinName = isMarketCoin(coinName) ? this.parseCoinName(coinName) : coinName;
     const coinPackageId = this.address.get(`core.coins.${coinName}.id`) || coinIds[coinName] || void 0;
     if (!coinPackageId) {
@@ -4940,7 +4922,7 @@ var ScallopUtils = class {
    */
   parseMarketCoinType(coinName) {
     const protocolObjectId = this.address.get("core.object") ?? PROTOCOL_OBJECT_ID;
-    const coinType = this.parseCoinType(coinName);
+    const coinType = this.parseCoinType(coinName, true);
     return `${protocolObjectId}::reserve::MarketCoin<${coinType}>`;
   }
   parseCoinNameFromType(coinType) {
@@ -6083,11 +6065,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
         ]
       );
     },
-    claimBorrowIncentive: (obligationId, obligationKey, coinName, rewardCoinName) => {
-      const rewardCoinNames = builder.utils.getBorrowIncentiveRewardCoinName(coinName);
-      if (rewardCoinNames.includes(rewardCoinName) === false) {
-        throw new Error(`Invalid reward coin name ${rewardCoinName}`);
-      }
+    claimBorrowIncentive: (obligationId, obligationKey, rewardCoinName) => {
       const rewardType = builder.utils.parseCoinType(rewardCoinName);
       return txBlock.moveCall(
         `${borrowIncentiveIds.borrowIncentivePkg}::user::redeem_rewards`,
@@ -6180,7 +6158,7 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
         txBlock.unstakeObligation(obligationArg, obligationKeyArg);
       }
     },
-    claimBorrowIncentiveQuick: async (coinName, rewardCoinName, obligation, obligationKey) => {
+    claimBorrowIncentiveQuick: async (rewardCoinName, obligation, obligationKey) => {
       const { obligationId: obligationArg, obligationKey: obligationKeyArg } = await requireObligationInfo2(
         builder,
         txBlock,
@@ -6190,7 +6168,6 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
       return txBlock.claimBorrowIncentive(
         obligationArg,
         obligationKeyArg,
-        coinName,
         rewardCoinName
       );
     }
@@ -8235,30 +8212,46 @@ var ScallopClient = class {
     }
   }
   /**
-   * unstake market coin from the specific spool.
+   * Claim borrow incentive reward.
    *
-   * @param marketCoinName - Types of mak coin.
+   * @param poolName
    * @param amount - The amount of coins would deposit.
    * @param sign - Decide to directly sign the transaction or return the transaction block.
    * @param accountId - The stake account object.
    * @param walletAddress - The wallet address of the owner.
    * @return Transaction block response or transaction block
    */
-  async claimBorrowIncentive(coinName, obligationId, obligationKeyId, sign = true, walletAddress) {
+  async claimBorrowIncentive(obligationId, obligationKeyId, sign = true, walletAddress) {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
-    const rewardCoins = [];
-    for (const rewardCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
+    const rewardCoinsCollection = {};
+    const obligationAccount = await this.query.getObligationAccount(obligationId);
+    const rewardCoinNames = Object.values(obligationAccount.borrowIncentives).flatMap(
+      ({ rewards }) => rewards.filter(({ availableClaimAmount }) => availableClaimAmount > 0)
+    ).flatMap(({ coinName }) => coinName);
+    for (const rewardCoinName of rewardCoinNames) {
       const rewardCoin = await txBlock.claimBorrowIncentiveQuick(
-        coinName,
         rewardCoinName,
         obligationId,
         obligationKeyId
       );
-      rewardCoins.push(rewardCoin);
+      if (!rewardCoinsCollection[rewardCoinName]) {
+        rewardCoinsCollection[rewardCoinName] = [rewardCoin];
+      } else {
+        rewardCoinsCollection[rewardCoinName].push(rewardCoin);
+      }
     }
-    txBlock.transferObjects(rewardCoins, sender);
+    txBlock.transferObjects(
+      Object.values(rewardCoinsCollection).map((rewardCoins) => {
+        const mergeDest = rewardCoins[0];
+        if (rewardCoins.length > 1) {
+          txBlock.mergeCoins(mergeDest, rewardCoins.slice(1));
+        }
+        return mergeDest;
+      }),
+      sender
+    );
     if (sign) {
       return await this.suiKit.signAndSendTxn(
         txBlock
@@ -8567,7 +8560,6 @@ export {
   UNLOCK_ROUND_DURATION,
   USE_TEST_ADDRESS,
   assetCoins,
-  borrowIncentiveRewardCoins,
   coinDecimals,
   coinIds,
   marketCoins,