@scallop-io/sui-scallop-sdk 1.3.5-rc.1 → 1.4.0

package/dist/models/scallopClient.d.ts

@@ -7,7 +7,7 @@ import type { SuiTransactionBlockResponse } from '@mysten/sui/client';
 import type { TransactionObjectArgument } from '@mysten/sui/transactions';
 import { ScallopCache } from './scallopCache';
 import type { SuiObjectArg } from '@scallop-io/sui-kit';
-import type { ScallopClientFnReturnType, ScallopClientParams, SupportPoolCoins, SupportCollateralCoins, SupportAssetCoins, SupportStakeCoins, SupportStakeMarketCoins, ScallopTxBlock, ScallopClientVeScaReturnType, ScallopClientInstanceParams } from '../types';
+import type { ScallopClientFnReturnType, ScallopClientParams, SupportPoolCoins, SupportCollateralCoins, SupportAssetCoins, SupportStakeCoins, SupportStakeMarketCoins, SupportBorrowIncentiveCoins, ScallopTxBlock, ScallopClientVeScaReturnType, ScallopClientInstanceParams } from '../types';
 /**
  * @description
  * It provides contract interaction operations for general users.
@@ -284,16 +284,16 @@ export declare class ScallopClient {
      */
     unstakeObligation<S extends boolean>(obligationId: string, obligationKeyId: string, sign?: S, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
     /**
-     * Claim borrow incentive reward.
+     * unstake market coin from the specific spool.
      *
-     * @param poolName
+     * @param marketCoinName - Types of mak coin.
      * @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
      */
-    claimBorrowIncentive<S extends boolean>(obligationId: string, obligationKeyId: string, sign?: S, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
+    claimBorrowIncentive<S extends boolean>(coinName: SupportBorrowIncentiveCoins, obligationId: string, obligationKeyId: string, sign?: S, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
     /**
      * Function to migrate all market coin in user wallet into sCoin
      * @returns Transaction response

package/dist/models/scallopQuery.d.ts

@@ -38,8 +38,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market data.
      */
-    queryMarket(indexer?: boolean, args?: {
-        coinPrices: CoinPrices;
+    queryMarket(args?: {
+        coinPrices?: CoinPrices;
+        indexer?: boolean;
     }): Promise<import("../types").Market>;
     /**
      * Get market pools.
@@ -52,8 +53,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market pools data.
      */
-    getMarketPools(poolCoinNames?: SupportPoolCoins[], indexer?: boolean, args?: {
+    getMarketPools(poolCoinNames?: SupportPoolCoins[], args?: {
         coinPrices?: CoinPrices;
+        indexer?: boolean;
     }): Promise<{
         usdc?: MarketPool | undefined;
         sbeth?: MarketPool | undefined;
@@ -79,9 +81,10 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market pool data.
      */
-    getMarketPool(poolCoinName: SupportPoolCoins, indexer?: boolean, args?: {
+    getMarketPool(poolCoinName: SupportPoolCoins, args?: {
         marketObject?: SuiObjectData | null;
         coinPrice?: number;
+        indexer?: boolean;
     }): Promise<MarketPool | undefined>;
     /**
      * Get market collaterals.
@@ -94,7 +97,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market collaterals data.
      */
-    getMarketCollaterals(collateralCoinNames?: SupportCollateralCoins[], indexer?: boolean): Promise<{
+    getMarketCollaterals(collateralCoinNames?: SupportCollateralCoins[], args?: {
+        indexer?: boolean;
+    }): Promise<{
         usdc?: import("../types").MarketCollateral | undefined;
         sbeth?: import("../types").MarketCollateral | undefined;
         weth?: import("../types").MarketCollateral | undefined;
@@ -117,7 +122,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Market collateral data.
      */
-    getMarketCollateral(collateralCoinName: SupportCollateralCoins, indexer?: boolean): Promise<import("../types").MarketCollateral | undefined>;
+    getMarketCollateral(collateralCoinName: SupportCollateralCoins, args?: {
+        indexer?: boolean;
+    }): Promise<import("../types").MarketCollateral | undefined>;
     /**
      * Get obligations data.
      *
@@ -185,9 +192,10 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Spools data.
      */
-    getSpools(stakeMarketCoinNames?: SupportStakeMarketCoins[], indexer?: boolean, args?: {
+    getSpools(stakeMarketCoinNames?: SupportStakeMarketCoins[], args?: {
         marketPools?: MarketPools;
         coinPrices?: CoinPrices;
+        indexer?: boolean;
     }): Promise<{
         susdc?: import("../types").Spool | undefined;
         sweth?: import("../types").Spool | undefined;
@@ -206,9 +214,10 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Spool data.
      */
-    getSpool(stakeMarketCoinName: SupportStakeMarketCoins, indexer?: boolean, args?: {
+    getSpool(stakeMarketCoinName: SupportStakeMarketCoins, args?: {
         marketPool?: MarketPool;
         coinPrices?: CoinPrices;
+        indexer?: boolean;
     }): Promise<import("../types").Spool | undefined>;
     /**
      * Get stake accounts data for all stake pools (spools).
@@ -296,9 +305,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Borrow incentive pools data.
      */
-    getBorrowIncentivePools(coinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean, args?: {
-        marketPools?: MarketPools;
-        coinPrices?: CoinPrices;
+    getBorrowIncentivePools(coinNames?: SupportBorrowIncentiveCoins[], args?: {
+        coinPrices: CoinPrices;
+        indexer?: boolean;
     }): Promise<{
         usdc?: import("../types").BorrowIncentivePool | undefined;
         sbeth?: import("../types").BorrowIncentivePool | undefined;
@@ -338,7 +347,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return All lending and spool infomation.
      */
-    getLendings(poolCoinNames?: SupportPoolCoins[], ownerAddress?: string, indexer?: boolean): Promise<{
+    getLendings(poolCoinNames?: SupportPoolCoins[], ownerAddress?: string, args?: {
+        indexer?: boolean;
+    }): Promise<{
         usdc?: import("../types").Lending | undefined;
         sbeth?: import("../types").Lending | undefined;
         weth?: import("../types").Lending | undefined;
@@ -364,7 +375,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Lending pool data.
      */
-    getLending(poolCoinName: SupportPoolCoins, ownerAddress?: string, indexer?: boolean): Promise<import("../types").Lending>;
+    getLending(poolCoinName: SupportPoolCoins, ownerAddress?: string, args?: {
+        indexer?: boolean;
+    }): Promise<import("../types").Lending>;
     /**
      * Get user all obligation accounts information.
      *
@@ -375,7 +388,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return All obligation accounts information.
      */
-    getObligationAccounts(ownerAddress?: string, indexer?: boolean): Promise<{
+    getObligationAccounts(ownerAddress?: string, args?: {
+        indexer: boolean;
+    }): Promise<{
         [x: string]: import("../types").ObligationAccount | undefined;
     }>;
     /**
@@ -389,7 +404,9 @@ export declare class ScallopQuery {
      * @param indexer - Whether to use indexer.
      * @return Borrowing and collateral information.
      */
-    getObligationAccount(obligationId: string, ownerAddress?: string, indexer?: boolean): Promise<import("../types").ObligationAccount>;
+    getObligationAccount(obligationId: string, ownerAddress?: string, args?: {
+        indexer?: boolean;
+    }): Promise<import("../types").ObligationAccount>;
     /**
      * Get total value locked.
      *
@@ -399,7 +416,9 @@ export declare class ScallopQuery {
      *
      * @return Total value locked.
      */
-    getTvl(indexer?: boolean): Promise<import("../types").TotalValueLocked>;
+    getTvl(args?: {
+        indexer?: boolean;
+    }): Promise<import("../types").TotalValueLocked>;
     /**
      * Get veSca data.
      * @param veScaKey
@@ -495,45 +514,4 @@ export declare class ScallopQuery {
      * @returns price data
      */
     getCoinPriceByIndexer(poolName: SupportPoolCoins): Promise<number>;
-    /**
-     * Get all coin prices, including sCoin
-     * @returns prices data
-     */
-    getAllCoinPrices(args?: {
-        marketPools?: MarketPools;
-        coinPrices?: CoinPrices;
-    }): Promise<{
-        susdc?: number | undefined;
-        ssbeth?: number | undefined;
-        sweth?: number | undefined;
-        swbtc?: number | undefined;
-        swusdc?: number | undefined;
-        swusdt?: number | undefined;
-        ssui?: number | undefined;
-        swsol?: number | undefined;
-        scetus?: number | undefined;
-        safsui?: number | undefined;
-        shasui?: number | undefined;
-        svsui?: number | undefined;
-        ssca?: number | undefined;
-        sfud?: number | undefined;
-        sdeep?: number | undefined;
-        usdc?: number | undefined;
-        sbeth?: number | undefined;
-        weth?: number | undefined;
-        wbtc?: number | undefined;
-        wusdc?: number | undefined;
-        wusdt?: number | undefined;
-        sui?: number | undefined;
-        wapt?: number | undefined;
-        wsol?: number | undefined;
-        cetus?: number | undefined;
-        afsui?: number | undefined;
-        hasui?: number | undefined;
-        vsui?: number | undefined;
-        sca?: number | undefined;
-        fud?: number | undefined;
-        deep?: number | undefined;
-        swapt?: number | undefined;
-    }>;
 }

package/dist/models/scallopUtils.d.ts

@@ -1,7 +1,7 @@
 import { SuiKit } from '@scallop-io/sui-kit';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopCache } from './scallopCache';
-import type { ScallopUtilsParams, SupportCoins, SupportAssetCoins, SupportMarketCoins, SupportStakeMarketCoins, CoinWrappedType, SupportSCoin, ScallopUtilsInstanceParams, SupportSuiBridgeCoins, SupportWormholeCoins, PoolAddressInfo } from '../types';
+import type { ScallopUtilsParams, SupportCoins, SupportAssetCoins, SupportMarketCoins, SupportStakeMarketCoins, SupportBorrowIncentiveCoins, CoinWrappedType, SupportSCoin, ScallopUtilsInstanceParams, SupportSuiBridgeCoins, SupportWormholeCoins, PoolAddressInfo } from '../types';
 import type { SuiObjectArg, SuiTxArg, SuiTxBlock } from '@scallop-io/sui-kit';
 /**
  * @description
@@ -50,7 +50,7 @@ export declare class ScallopUtils {
      * @param coinName - Specific support coin name.
      * @return Coin type.
      */
-    parseCoinType(coinName: SupportCoins, useOldMarketCoin?: boolean): string;
+    parseCoinType(coinName: SupportCoins): string;
     /**
      * Convert coin name to sCoin name.
      *
@@ -58,13 +58,6 @@ export declare class ScallopUtils {
      * @return sCoin name.
      */
     parseSCoinName<T extends SupportSCoin>(coinName: SupportCoins | SupportMarketCoins): T | undefined;
-    /**
-     * Convert sCoin name to coin name.
-     * This function will parse new sCoin name `scallop_...` to its old market coin name which is shorter
-     * e.g: `scallop_sui -> ssui
-     * @return sCoin name
-     */
-    parseCoinNameFromSCoinName(coinName: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep";
     /**
      * Convert sCoin name into sCoin type
      * @param sCoinName
@@ -131,6 +124,13 @@ export declare class ScallopUtils {
      * @return Spool reward coin name.
      */
     getSpoolRewardCoinName: (stakeMarketCoinName: SupportStakeMarketCoins) => "sui";
+    /**
+     * Get reward type of borrow incentive pool.
+     *
+     * @param borrowIncentiveCoinName - Support borrow incentive coin.
+     * @return Borrow incentive reward coin name.
+     */
+    getBorrowIncentiveRewardCoinName: (borrowIncentiveCoinName: SupportBorrowIncentiveCoins) => ("sui" | "sca")[];
     /**
      * Get coin decimal.
      *
@@ -188,7 +188,7 @@ export declare class ScallopUtils {
      * @param assetCoinNames - Specific an array of support asset coin name.
      * @return  Asset coin price.
      */
-    getCoinPrices(_?: SupportAssetCoins[]): Promise<import("../types").OptionalKeys<Record<SupportCoins, number>>>;
+    getCoinPrices(_?: SupportAssetCoins[]): Promise<import("../types").OptionalKeys<Record<SupportAssetCoins, number>>>;
     /**
      * Convert apr to apy.
      *

package/dist/queries/borrowIncentiveQuery.d.ts

@@ -1,5 +1,5 @@
 import type { ScallopAddress, ScallopQuery, ScallopUtils } from '../models';
-import type { BorrowIncentivePoolsQueryInterface, SupportBorrowIncentiveCoins, BorrowIncentivePool, CoinPrices, MarketPools } from '../types';
+import type { BorrowIncentivePoolsQueryInterface, SupportBorrowIncentiveCoins, BorrowIncentivePool, CoinPrices } from '../types';
 /**
  * Query borrow incentive pools data using moveCall
  * @param address
@@ -14,7 +14,7 @@ export declare const queryBorrowIncentivePools: (address: ScallopAddress) => Pro
  * @param indexer - Whether to use indexer.
  * @return Borrow incentive pools data.
  */
-export declare const getBorrowIncentivePools: (query: ScallopQuery, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean, marketPools?: MarketPools, coinPrices?: CoinPrices) => Promise<{
+export declare const getBorrowIncentivePools: (query: ScallopQuery, borrowIncentiveCoinNames?: SupportBorrowIncentiveCoins[], indexer?: boolean, coinPrices?: CoinPrices) => Promise<{
     usdc?: BorrowIncentivePool | undefined;
     sbeth?: BorrowIncentivePool | undefined;
     weth?: BorrowIncentivePool | undefined;

package/dist/queries/priceQuery.d.ts

@@ -1,6 +1,6 @@
 import { SuiObjectData } from '@mysten/sui/client';
-import type { ScallopAddress, ScallopQuery } from '../models';
-import type { CoinPrices, MarketPools, SupportAssetCoins } from '../types';
+import type { ScallopAddress } from '../models';
+import type { SupportAssetCoins } from '../types';
 /**
  * Get price from pyth fee object.
  *
@@ -14,37 +14,3 @@ export declare const getPythPrice: ({ address, }: {
 export declare const getPythPrices: ({ address, }: {
     address: ScallopAddress;
 }, assetCoinNames: SupportAssetCoins[]) => Promise<Record<SupportAssetCoins, number>>;
-export declare const getAllCoinPrices: (query: ScallopQuery, marketPools?: MarketPools, coinPrices?: CoinPrices) => Promise<{
-    susdc?: number | undefined;
-    ssbeth?: number | undefined;
-    sweth?: number | undefined;
-    swbtc?: number | undefined;
-    swusdc?: number | undefined;
-    swusdt?: number | undefined;
-    ssui?: number | undefined;
-    swsol?: number | undefined;
-    scetus?: number | undefined;
-    safsui?: number | undefined;
-    shasui?: number | undefined;
-    svsui?: number | undefined;
-    ssca?: number | undefined;
-    sfud?: number | undefined;
-    sdeep?: number | undefined;
-    usdc?: number | undefined;
-    sbeth?: number | undefined;
-    weth?: number | undefined;
-    wbtc?: number | undefined;
-    wusdc?: number | undefined;
-    wusdt?: number | undefined;
-    sui?: number | undefined;
-    wapt?: number | undefined;
-    wsol?: number | undefined;
-    cetus?: number | undefined;
-    afsui?: number | undefined;
-    hasui?: number | undefined;
-    vsui?: number | undefined;
-    sca?: number | undefined;
-    fud?: number | undefined;
-    deep?: number | undefined;
-    swapt?: number | undefined;
-}>;

package/dist/types/builder/borrowIncentive.d.ts

@@ -1,7 +1,7 @@
 import type { SuiTxBlock as SuiKitTxBlock, SuiObjectArg } from '@scallop-io/sui-kit';
 import type { TransactionResult } from '@mysten/sui/transactions';
 import type { ScallopBuilder } from '../../models';
-import type { SupportBorrowIncentiveRewardCoins } from '../constant';
+import type { SupportBorrowIncentiveCoins, SupportBorrowIncentiveRewardCoins } from '../constant';
 export type BorrowIncentiveIds = {
     borrowIncentivePkg: string;
     query: string;
@@ -14,14 +14,14 @@ export type BorrowIncentiveNormalMethods = {
     stakeObligation: (obligation: SuiObjectArg, obligationKey: SuiObjectArg) => void;
     stakeObligationWithVesca: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, veScaKey: SuiObjectArg) => void;
     unstakeObligation: (obligation: SuiObjectArg, obligationKey: SuiObjectArg) => void;
-    claimBorrowIncentive: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, rewardType: SupportBorrowIncentiveRewardCoins) => TransactionResult;
+    claimBorrowIncentive: (obligation: SuiObjectArg, obligationKey: SuiObjectArg, coinName: SupportBorrowIncentiveCoins, rewardType: SupportBorrowIncentiveRewardCoins) => TransactionResult;
     deactivateBoost: (obligation: SuiObjectArg, veScaKey: SuiObjectArg) => void;
 };
 export type BorrowIncentiveQuickMethods = {
-    stakeObligationQuick(obligation?: string, obligationKey?: string): Promise<void>;
-    stakeObligationWithVeScaQuick(obligation?: string, obligationKey?: string, veScaKey?: string): Promise<void>;
-    unstakeObligationQuick(obligation?: string, obligationKey?: string): Promise<void>;
-    claimBorrowIncentiveQuick(rewardType: SupportBorrowIncentiveRewardCoins, obligation?: string, obligationKey?: string): Promise<TransactionResult>;
+    stakeObligationQuick(obligation?: SuiObjectArg, obligationKey?: SuiObjectArg): Promise<void>;
+    stakeObligationWithVeScaQuick(obligation?: SuiObjectArg, obligationKey?: SuiObjectArg, veScaKey?: SuiObjectArg): Promise<void>;
+    unstakeObligationQuick(obligation?: SuiObjectArg, obligationKey?: SuiObjectArg): Promise<void>;
+    claimBorrowIncentiveQuick(coinName: SupportBorrowIncentiveCoins, rewardType: SupportBorrowIncentiveRewardCoins, obligation?: SuiObjectArg, obligationKey?: SuiObjectArg): Promise<TransactionResult>;
 };
 export type SuiTxBlockWithBorrowIncentiveNormalMethods = SuiKitTxBlock & BorrowIncentiveNormalMethods;
 export type BorrowIncentiveTxBlock = SuiTxBlockWithBorrowIncentiveNormalMethods & BorrowIncentiveQuickMethods;

package/dist/types/constant/common.d.ts

@@ -2,7 +2,7 @@ import { SUPPORT_POOLS, SUPPORT_COLLATERALS, SUPPORT_ORACLES, SUPPORT_PACKAGES,
 type ParseMarketCoins<T extends string> = `s${T}`;
 type ParseCoins<T extends string> = T extends `s${infer R}` ? R : never;
 export type SupportCoins = SupportAssetCoins | SupportMarketCoins | SupportStakeMarketCoins | SupportSCoin;
-export type SupportAssetCoins = SupportPoolCoins | SupportCollateralCoins | SupportStakeRewardCoins;
+export type SupportAssetCoins = SupportPoolCoins | SupportCollateralCoins | SupportStakeRewardCoins | SupportBorrowIncentiveRewardCoins;
 export type SupportPoolCoins = (typeof SUPPORT_POOLS)[number];
 export type SupportCollateralCoins = (typeof SUPPORT_COLLATERALS)[number];
 export type SupportMarketCoins = ParseMarketCoins<SupportPoolCoins> | SupportStakeMarketCoins;

package/dist/types/utils.d.ts

@@ -1,8 +1,12 @@
-import type { SupportCoins } from './constant';
+import type { SupportAssetCoins } from './constant';
 export type OptionalKeys<T> = {
     [K in keyof T]?: T[K];
 };
-export type CoinPrices = OptionalKeys<Record<SupportCoins, number>>;
+export type CoinPrices = OptionalKeys<Record<SupportAssetCoins, number>>;
+export type PriceMap = Map<SupportAssetCoins, {
+    price: number;
+    publishTime: number;
+}>;
 export type PoolAddressInfo = {
     name: string;
     coingeckoId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "1.3.5-rc.1",
+  "version": "1.4.0",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/builders/borrowIncentiveBuilder.ts

@@ -143,7 +143,17 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
           ]
         );
       },
-      claimBorrowIncentive: (obligationId, obligationKey, rewardCoinName) => {
+      claimBorrowIncentive: (
+        obligationId,
+        obligationKey,
+        coinName,
+        rewardCoinName
+      ) => {
+        const rewardCoinNames =
+          builder.utils.getBorrowIncentiveRewardCoinName(coinName);
+        if (rewardCoinNames.includes(rewardCoinName) === false) {
+          throw new Error(`Invalid reward coin name ${rewardCoinName}`);
+        }
         const rewardType = builder.utils.parseCoinType(rewardCoinName);
         return txBlock.moveCall(
           `${borrowIncentiveIds.borrowIncentivePkg}::user::redeem_rewards`,
@@ -274,11 +284,11 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
         }
       },
       claimBorrowIncentiveQuick: async (
+        coinName,
         rewardCoinName,
         obligation,
         obligationKey
       ) => {
-        // check for available reward coin names
         const { obligationId: obligationArg, obligationKey: obligationKeyArg } =
           await requireObligationInfo(
             builder,
@@ -290,6 +300,7 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
         return txBlock.claimBorrowIncentive(
           obligationArg,
           obligationKeyArg,
+          coinName,
           rewardCoinName
         );
       },

package/src/constants/common.ts

@@ -9,6 +9,7 @@ export const ADDRESSES_ID =
     ? ('65fb07c39c845425d71d7b18' as const)
     : ('675c65cd301dd817ea262e76' as const);
 // : ('66f8e7ed9bb9e07fdfb86bbb' as const);
+// : ('664dfe22898c36c159e28bc8' as const);
 
 export const PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST
   ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const)
@@ -120,10 +121,7 @@ export const SUPPORT_BORROW_INCENTIVE_POOLS = [
   'usdc',
 ] as const;
 
-export const SUPPORT_BORROW_INCENTIVE_REWARDS = [
-  ...SUPPORT_POOLS,
-  ...SUPPORT_SCOIN,
-] as const;
+export const SUPPORT_BORROW_INCENTIVE_REWARDS = ['sui', 'sca'] as const;
 export const SUPPORT_ORACLES = ['supra', 'switchboard', 'pyth'] as const;
 
 export const SUPPORT_PACKAGES = [

package/src/constants/enum.ts

@@ -120,6 +120,19 @@ export const suiBridgeCoins: types.SuiBridgeCoins = {
   sbeth: 'sbeth',
 };
 
+export const borrowIncentiveRewardCoins: types.BorrowIncentiveRewardCoins = {
+  usdc: ['sui', 'sca'],
+  sui: ['sui', 'sca'],
+  wusdc: ['sui', 'sca'],
+  wusdt: ['sui', 'sca'],
+  sca: ['sui', 'sca'],
+  afsui: ['sui'],
+  hasui: ['sui'],
+  vsui: ['sui'],
+  weth: ['sui'],
+  sbeth: ['sui'],
+};
+
 export const coinIds: types.AssetCoinIds = {
   usdc: '0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7',
   sui: '0x0000000000000000000000000000000000000000000000000000000000000002',
@@ -162,13 +175,13 @@ export const sCoinIds: types.SCoinIds = {
   ssbeth:
     '0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH',
   ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
+  scetus:
+    '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',
+  ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
   swusdc:
     '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
   swusdt:
     '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
-  ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
-  scetus:
-    '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',
   sweth:
     '0x67540ceb850d418679e69f1fb6b2093d6df78a2a699ffc733f7646096d552e9b::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH',
   safsui:
@@ -194,14 +207,6 @@ export const sCoinTypeToName = Object.entries(sCoinIds).reduce(
   {} as Record<string, types.SupportSCoin>
 );
 
-export const sCoinRawNameToName = Object.entries(sCoinIds).reduce(
-  (acc, [coinName, coinType]) => {
-    acc[coinType.split('::')[2].toLowerCase()] = coinName as types.SupportSCoin;
-    return acc;
-  },
-  {} as Record<string, types.SupportSCoin>
-);
-
 // TEST VERSION
 // export const sCoinIds: types.SCoinIds = {
 // ssui: '0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI',

package/src/constants/tokenBucket.ts

@@ -1,2 +1,2 @@
 export const DEFAULT_TOKENS_PER_INTERVAL = 50;
-export const DEFAULT_INTERVAL_IN_MS = 300;
+export const DEFAULT_INTERVAL_IN_MS = 100;

package/src/models/scallopClient.ts

@@ -4,6 +4,7 @@ import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
 import {
   ADDRESSES_ID,
   SUPPORT_BORROW_INCENTIVE_POOLS,
+  SUPPORT_BORROW_INCENTIVE_REWARDS,
   SUPPORT_SCOIN,
   SUPPORT_SPOOLS,
 } from '../constants';
@@ -27,6 +28,7 @@ import type {
   SupportAssetCoins,
   SupportStakeCoins,
   SupportStakeMarketCoins,
+  SupportBorrowIncentiveCoins,
   ScallopTxBlock,
   SupportSCoin,
   ScallopClientVeScaReturnType,
@@ -943,9 +945,9 @@ export class ScallopClient {
   }
 
   /**
-   * Claim borrow incentive reward.
+   * unstake market coin from the specific spool.
    *
-   * @param poolName
+   * @param marketCoinName - Types of mak coin.
    * @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.
@@ -953,6 +955,7 @@ export class ScallopClient {
    * @return Transaction block response or transaction block
    */
   public async claimBorrowIncentive<S extends boolean>(
+    coinName: SupportBorrowIncentiveCoins,
     obligationId: string,
     obligationKeyId: string,
     sign: S = true as S,
@@ -962,37 +965,17 @@ export class ScallopClient {
     const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
 
-    const rewardCoinsCollection: Record<string, TransactionResult[]> = {};
-    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 rewardCoins = [];
+    for (const rewardCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
       const rewardCoin = await txBlock.claimBorrowIncentiveQuick(
+        coinName,
         rewardCoinName,
         obligationId,
         obligationKeyId
       );
-      if (!rewardCoinsCollection[rewardCoinName]) {
-        rewardCoinsCollection[rewardCoinName] = [rewardCoin];
-      } else {
-        rewardCoinsCollection[rewardCoinName].push(rewardCoin);
-      }
+      rewardCoins.push(rewardCoin);
     }
-
-    txBlock.transferObjects(
-      Object.values(rewardCoinsCollection).map((rewardCoins) => {
-        const mergeDest = rewardCoins[0];
-        if (rewardCoins.length > 1) {
-          txBlock.mergeCoins(mergeDest, rewardCoins.slice(1));
-        }
-        return mergeDest;
-      }),
-      sender
-    );
+    txBlock.transferObjects(rewardCoins, sender);
 
     if (sign) {
       return (await this.suiKit.signAndSendTxn(