@scallop-io/sui-scallop-sdk 2.0.0-alpha.8 → 2.0.0

package/src/models/scallopConstants.ts

@@ -36,6 +36,7 @@ export class ScallopConstants {
     scoin: new Set(),
     spool: new Set(),
     borrowIncentiveRewards: new Set(),
+    rewardsAsPoint: new Set(),
     suiBridge: new Set(),
     wormhole: new Set(),
     oracles: new Set(),
@@ -98,10 +99,20 @@ export class ScallopConstants {
   }
 
   get isInitialized() {
+    const REQUIRED_WHITELIST_KEYS = [
+      'lending',
+      'collateral',
+      'borrowing',
+      'packages',
+      'scoin',
+      'spool',
+      'oracles',
+      'pythEndpoints',
+    ] as const;
     return (
-      !this.isEmptyObject(this._poolAddresses) &&
-      Object.values(this._whitelist).every((t) => t.size > 0) &&
-      this.isAddressInitialized
+      this.isAddressInitialized && // address is initialized
+      !this.isEmptyObject(this._poolAddresses) && // poolAddresses is initialized
+      REQUIRED_WHITELIST_KEYS.every((t) => this.whitelist[t].size > 0) // whitelist is initialized
     );
   }
 

package/src/models/scallopUtils.ts

@@ -554,7 +554,9 @@ export class ScallopUtils {
   public getSupportedPoolAddresses(): PoolAddress[] {
     return this.constants.poolAddresses
       ? Object.values(this.constants.poolAddresses).filter(
-          (address): address is PoolAddress => address !== undefined
+          (poolAddress): poolAddress is PoolAddress =>
+            poolAddress !== undefined &&
+            this.constants.whitelist.lending.has(poolAddress.coinName)
         )
       : [];
   }

package/src/queries/portfolioQuery.ts

@@ -13,7 +13,7 @@ import type {
   CoinAmounts,
   CoinPrices,
   TotalValueLocked,
-  ObligationBorrowIcentiveReward,
+  ObligationBorrowIncentiveReward,
   MarketPools,
   MarketCollaterals,
 } from '../types';
@@ -534,7 +534,7 @@ export const getObligationAccount = async (
     const coinName = poolCoinName as string;
     const borrowIncentivePool = borrowIncentivePools[coinName];
     if (borrowIncentivePool) {
-      const rewards: ObligationBorrowIcentiveReward[] = [];
+      const rewards: ObligationBorrowIncentiveReward[] = [];
       Object.entries(borrowIncentiveAccount.pointList).forEach(
         ([key, accountPoint]) => {
           const poolPoint =
@@ -590,6 +590,7 @@ export const getObligationAccount = async (
                 symbol: poolPoint.symbol,
                 coinDecimal: poolPoint.coinDecimal,
                 coinPrice: poolPoint.coinPrice,
+                weightedBorrowAmount: accountBorrowedAmount.toNumber(),
                 availableClaimAmount: availableClaimAmount.toNumber(),
                 availableClaimCoin: availableClaimCoin.toNumber(),
                 boostValue,

package/src/types/constant/common.ts

@@ -39,6 +39,7 @@ export type Whitelist = {
   wormhole: Set<string>;
   oracles: Set<string>;
   borrowIncentiveRewards: Set<string>;
+  rewardsAsPoint: Set<string>;
   pythEndpoints: Set<string>;
   deprecated: Set<string>;
 };

package/src/types/query/portfolio.ts

@@ -108,12 +108,13 @@ export type ObligationDebt = {
   availableRepayCoin: number;
 };
 
-export type ObligationBorrowIcentiveReward = {
+export type ObligationBorrowIncentiveReward = {
   coinName: string;
   coinType: string;
   symbol: string;
   coinDecimal: number;
   coinPrice: number;
+  weightedBorrowAmount: number;
   availableClaimCoin: number;
   availableClaimAmount: number;
   boostValue: number;
@@ -125,7 +126,7 @@ export type ObligationBorrowIncentive = {
   symbol: string;
   coinDecimal: number;
   coinPrice: number;
-  rewards: ObligationBorrowIcentiveReward[];
+  rewards: ObligationBorrowIncentiveReward[];
 };
 
 export type TotalValueLocked = {