@scallop-io/sui-scallop-sdk 2.1.1-merge-split-ve-sca-alpha.1 → 2.1.2-merge-split-ve-sca-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.1.1-merge-split-ve-sca-alpha.1",
+  "version": "2.1.2-merge-split-ve-sca-alpha.1",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/models/scallopConstants.ts

@@ -28,7 +28,7 @@ export type ScallopConstantsParams = {
   poolAddressesApiUrl?: string;
   whitelistApiUrl?: string;
   forcePoolAddressInterface?: Record<string, PoolAddress>;
-  forceWhitelistInterface?: Whitelist;
+  forceWhitelistInterface?: Whitelist | Record<string, any>;
 } & ScallopAddressParams;
 
 const DEFAULT_WHITELIST = {
@@ -48,6 +48,18 @@ const DEFAULT_WHITELIST = {
   emerging: new Set(),
 } as Whitelist;
 
+const parseWhitelistParams = (params: Record<string, any> | Whitelist) => {
+  return Object.entries(params)
+    .filter(
+      ([_, value]) => !!value && (Array.isArray(value) || value instanceof Set)
+    )
+    .reduce((acc, [key, value]) => {
+      acc[key as keyof typeof DEFAULT_WHITELIST] =
+        value instanceof Set ? value : new Set(value);
+      return acc;
+    }, {} as Whitelist);
+};
+
 class ScallopConstants extends ScallopAddress {
   private _poolAddresses: Record<string, PoolAddress | undefined> = {};
   private _whitelist: Whitelist = DEFAULT_WHITELIST;
@@ -144,7 +156,7 @@ class ScallopConstants extends ScallopAddress {
     networkType?: NetworkType;
   } = {}) {
     const addresses = this.getAddresses(networkType);
-    return !addresses || isEmptyObject(addresses);
+    return !!addresses && !isEmptyObject(addresses);
   }
 
   parseToOldMarketCoin(coinType: string) {
@@ -174,10 +186,13 @@ class ScallopConstants extends ScallopAddress {
     }
 
     if (constantsParams.forceWhitelistInterface) {
-      this._whitelist = constantsParams.forceWhitelistInterface;
+      this._whitelist = parseWhitelistParams(
+        constantsParams.forceWhitelistInterface
+      );
     }
 
     if (this.isInitialized && !force) {
+      this.initConstants();
       return;
     }
 

package/src/queries/portfolioQuery.ts

@@ -821,7 +821,6 @@ export const getTotalValueLocked = async (
     );
   }
 
-  // console.dir(market.collaterals, { depth: null });
   for (const collateral of Object.values(market.collaterals)) {
     if (!collateral) continue;
     supplyCollateralValue = supplyCollateralValue.plus(