@scallop-io/sui-scallop-sdk 2.0.0-alpha.1 → 2.0.0-alpha.3

package/package.json

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

package/src/models/scallopBuilder.ts

@@ -98,13 +98,11 @@ export class ScallopBuilder {
    * @param force - Whether to force initialization.
    * @param address - ScallopAddress instance.
    */
-  public async init(force: boolean = false, address?: ScallopAddress) {
-    if (address && !this.address) this.address = address;
-    if (force || !this.address.getAddresses()) {
-      await this.address.read();
+  public async init(force: boolean = false) {
+    if (force || !this.constants.isInitialized) {
+      await this.constants.init();
     }
-    await this.query.init(force, this.address);
-    // await this.utils.init(force, this.address);
+    await this.query.init(force);
   }
 
   /**

package/src/models/scallopClient.ts

@@ -59,6 +59,7 @@ export class ScallopClient {
 
     this.cache =
       instance?.builder?.cache ??
+      instance?.cache ??
       new ScallopCache(this.params, {
         suiKit: this.suiKit,
       });
@@ -100,13 +101,13 @@ export class ScallopClient {
    * @param force - Whether to force initialization.
    */
   public async init(force: boolean = false) {
-    if (force || !this.address.getAddresses()) {
-      await this.address.read();
+    if (force || !this.constants.isInitialized) {
+      await this.constants.init();
     }
 
-    await this.builder.init(force, this.address);
-    await this.query.init(force, this.address);
-    await this.utils.init(force, this.address);
+    await this.builder.init(force);
+    await this.query.init(force);
+    await this.utils.init(force);
   }
 
   /* ==================== Query Method ==================== */

package/src/models/scallopConstants.ts

@@ -44,7 +44,6 @@ export class ScallopConstants {
   };
 
   private _coinDecimals: Record<string, number | undefined> = {};
-  private _coinNameToCoinTypeMap: Record<string, string | undefined> = {};
   private _coinNameToOldMarketCoinTypeMap: Record<string, string | undefined> =
     {};
   private _scoinRawNameToSCoinNameMap: Record<string, string | undefined> = {};
@@ -73,6 +72,7 @@ export class ScallopConstants {
 
     this.cache =
       instance?.address?.cache ??
+      instance?.cache ??
       new ScallopCache(this.params, {
         suiKit: newSuiKit(this.params),
       });
@@ -98,7 +98,9 @@ export class ScallopConstants {
 
   get isInitialized() {
     return (
-      !!this._poolAddresses && !!this._whitelist && this.isAddressInitialized
+      !this.isEmptyObject(this._poolAddresses) &&
+      Object.values(this._whitelist).every((t) => t.size > 0) &&
+      this.isAddressInitialized
     );
   }
 
@@ -162,23 +164,10 @@ export class ScallopConstants {
     return this._wormholeCoinTypeToCoinNameMap;
   }
 
-  get coinNameToCoinTypeMap() {
-    if (this.isEmptyObject(this._coinNameToCoinTypeMap))
-      this._coinNameToCoinTypeMap = Object.fromEntries(
-        Object.entries(this.poolAddresses)
-          .filter(([_, value]) => !!value)
-          .map(([_, value]) => [value!.coinName, value!.coinType])
-      );
-    return this._coinNameToCoinTypeMap;
-  }
-
   get coinTypeToCoinNameMap() {
     if (this.isEmptyObject(this._coinTypeToCoinNameMap))
       this._coinTypeToCoinNameMap = Object.fromEntries(
-        Object.entries(this.coinNameToCoinTypeMap).map(([key, val]) => [
-          val,
-          key,
-        ])
+        Object.entries(this.coinTypes).map(([key, val]) => [val, key])
       );
     return this._coinTypeToCoinNameMap;
   }
@@ -291,7 +280,8 @@ export class ScallopConstants {
   async readWhiteList() {
     const response = await this.readApi<Record<keyof Whitelist, string[]>>({
       url:
-        this.params.whitelistApiUrl ?? 'https://sui.apis.scallop.io/whitelist',
+        this.params.whitelistApiUrl ??
+        `https://sui.apis.scallop.io/pool/whitelist/${this.params.whitelistId}`,
       queryKey: queryKeys.api.getWhiteList(),
     });
 
@@ -304,7 +294,7 @@ export class ScallopConstants {
     return await this.readApi<Record<string, PoolAddress>>({
       url:
         this.params.poolAddressesApiUrl ??
-        `https://sui.apis.scallop.io/poolAddresses`,
+        `https://sui.apis.scallop.io/pool/addresses`,
       queryKey: queryKeys.api.getPoolAddresses(),
     });
   }
@@ -322,20 +312,42 @@ export class ScallopConstants {
       this._whitelist = params?.forceWhitelistInterface;
     }
 
+    console.log({
+      isAddressInitialized: this.isAddressInitialized,
+      a: params?.forcePoolAddressInterface,
+      b: params?.forceWhitelistInterface,
+      isInitialized: this.isInitialized,
+    });
     if (this.isInitialized) return;
 
     const [whitelistResponse, poolAddressesResponse] = await Promise.all([
       this.readWhiteList(),
       this.readPoolAddresses(),
     ]);
+
     if (!this.params.forceWhitelistInterface) {
-      this._whitelist = whitelistResponse;
+      this._whitelist = Object.fromEntries(
+        Object.entries(whitelistResponse)
+          .filter(([key]) => key !== 'id')
+          .map(([key, value]) => [
+            key as keyof Whitelist,
+            key !== 'id' ? new Set(value) : value,
+          ])
+      ) as Whitelist;
     }
     if (!this.params.forcePoolAddressInterface)
       this._poolAddresses = Object.fromEntries(
-        Object.entries(poolAddressesResponse).filter(([key]) =>
-          Object.values(this.whitelist).some((set) => set.has(key))
-        )
+        Object.entries(poolAddressesResponse)
+          .filter(([key]) =>
+            Object.values(this.whitelist).some((set) => set.has(key))
+          )
+          .map(([key, value]) => {
+            const parsedValue = Object.fromEntries(
+              Object.entries(value).map(([k, v]) => [k, v || undefined])
+            );
+            return [key, parsedValue as PoolAddress];
+          })
       );
+    console.log({ p: this._poolAddresses });
   }
 }

package/src/models/scallopQuery.ts

@@ -109,6 +109,7 @@ export class ScallopQuery {
 
     this.cache =
       instance?.utils?.cache ??
+      instance?.cache ??
       new ScallopCache(this.params, {
         suiKit: this.suiKit,
       });
@@ -173,15 +174,12 @@ export class ScallopQuery {
    * @param force - Whether to force initialization.
    * @param address - ScallopAddress instance.
    */
-  public async init(force: boolean = false, address?: ScallopAddress) {
-    if (address && !this.address) {
-      this.address = address;
-    }
-    if (force || !this.address.getAddresses()) {
-      await this.address.read();
+  public async init(force: boolean = false) {
+    if (force || !this.constants.isInitialized) {
+      await this.constants.init();
     }
 
-    await this.utils.init(force, this.address);
+    await this.utils.init(force);
   }
 
   /* ==================== Core Query Methods ==================== */

package/src/models/scallopUtils.ts

@@ -67,6 +67,7 @@ export class ScallopUtils {
 
     this.cache =
       instance?.constants?.cache ??
+      instance?.cache ??
       new ScallopCache(this.params, {
         suiKit: this.suiKit,
       });
@@ -111,10 +112,9 @@ export class ScallopUtils {
    * @param force - Whether to force initialization.
    * @param address - ScallopAddress instance.
    */
-  public async init(force: boolean = false, address?: ScallopAddress) {
-    if (address && !this.address) this.address = address;
-    if (force || !this.address.getAddresses()) {
-      await this.address.read();
+  public async init(force: boolean = false) {
+    if (force || !this.constants.isInitialized) {
+      await this.constants.init();
     }
   }
 
@@ -125,7 +125,10 @@ export class ScallopUtils {
    * @return Symbol string.
    */
   public parseSymbol(coinName: string) {
-    return this.constants.poolAddresses[coinName]?.symbol ?? '';
+    return this.isMarketCoin(coinName)
+      ? (this.constants.poolAddresses[this.parseCoinName(coinName)]
+          ?.sCoinSymbol ?? '')
+      : (this.constants.poolAddresses[coinName]?.symbol ?? '');
   }
 
   /**
@@ -143,7 +146,7 @@ export class ScallopUtils {
     if (useOldMarketCoin) {
       return this.constants.coinNameToOldMarketCoinTypeMap[coinName] ?? '';
     }
-    return this.constants.coinNameToCoinTypeMap[coinName] ?? '';
+    return this.constants.coinTypes[coinName] ?? '';
   }
 
   /**

package/src/queries/borrowIncentiveQuery.ts

@@ -174,8 +174,10 @@ export const queryBorrowIncentiveAccounts = async (
   const borrowIncentiveAccounts: BorrowIncentiveAccounts = Object.values(
     borrowIncentiveAccountsQueryData?.pool_records ?? []
   ).reduce((accounts, accountData) => {
-    const parsedBorrowIncentiveAccount =
-      parseOriginBorrowIncentiveAccountData(accountData);
+    const parsedBorrowIncentiveAccount = parseOriginBorrowIncentiveAccountData(
+      utils,
+      accountData
+    );
     const poolType = parsedBorrowIncentiveAccount.poolType;
     const coinName = utils.parseCoinNameFromType(poolType);
 

package/src/queries/poolAddressesQuery.ts

@@ -188,7 +188,10 @@ export const getPoolAddresses = async (
       const { symbol, metaData: coinMetadataId } =
         addressApiResponse.core.coins[coinName];
 
-      let spoolData = undefined;
+      let spoolData = {
+        spool: '',
+        spoolReward: '',
+      };
       const _spoolData = addressApiResponse.spool.pools[`s${coinName}`];
       // @ts-ignore
       if (_spoolData) {
@@ -197,11 +200,15 @@ export const getPoolAddresses = async (
         spoolData = {
           spool,
           spoolReward,
-          coinMetadataId,
         };
       }
 
-      let sCoinData = undefined;
+      let sCoinData = {
+        sCoinType: '',
+        sCoinTreasury: '',
+        sCoinMetadataId: '',
+        sCoinSymbol: '',
+      };
       const sCoinName = `s${coinName}`;
       const _sCoinData = addressApiResponse.scoin.coins[sCoinName];
       if (_sCoinData) {
@@ -219,7 +226,21 @@ export const getPoolAddresses = async (
         };
       }
 
-      const { feed: pythFeed, feedObject: pythFeedObjectId } =
+      let pythData = {
+        pythFeed: '',
+        pythFeedObjectId: '',
+      };
+
+      if (addressApiResponse.core.coins[coinName]?.oracle.pyth) {
+        const { feed: pythFeed, feedObject: pythFeedObjectId } =
+          //@ts-ignore
+          addressApiResponse.core.coins[coinName].oracle.pyth;
+        pythData = {
+          pythFeed,
+          pythFeedObjectId,
+        };
+      }
+      const { feed: _pythFeed, feedObject: _pythFeedObjectId } =
         //@ts-ignore
         addressApiResponse.core.coins[coinName].oracle.pyth;
 
@@ -243,18 +264,17 @@ export const getPoolAddresses = async (
         interestModel: addresses[3] ?? '',
         riskModel: addresses[4],
         borrowFeeKey: addresses[5] ?? '',
-        supplyLimitKey: addresses[6],
-        borrowLimitKey: addresses[7],
-        isolatedAssetKey: addresses[8],
-        ...(spoolData ?? {}),
-        ...(sCoinData ?? {}),
+        supplyLimitKey: addresses[6] ?? '',
+        borrowLimitKey: addresses[7] ?? '',
+        isolatedAssetKey: addresses[8] ?? '',
+        ...spoolData,
+        ...sCoinData,
         sCoinName,
         coinMetadataId,
         coinType,
         spoolName,
         decimals,
-        pythFeed,
-        pythFeedObjectId,
+        ...pythData,
         flashloanFeeObject: flashloanFeeObjectIds[coinType] ?? '',
       };
 

package/src/queries/portfolioQuery.ts

@@ -549,7 +549,6 @@ export const getObligationAccount = async (
             borrowIncentivePool.points[
               query.utils.parseSCoinTypeNameToMarketCoinName(key)
             ];
-
           if (accountPoint && poolPoint) {
             let availableClaimAmount = BigNumber(0);
             let availableClaimCoin = BigNumber(0);

package/src/types/model.ts

@@ -28,6 +28,7 @@ export type ScallopClientVeScaReturnType<T extends boolean> = T extends true
 
 export type ScallopBaseInstanceParams = {
   suiKit?: SuiKit;
+  cache?: ScallopCache;
 };
 
 export type ScallopCacheInstanceParams = ScallopBaseInstanceParams & {
@@ -40,6 +41,7 @@ export type ScallopAddressInstanceParams = ScallopBaseInstanceParams & {
 
 export type ScallopConstantsInstanceParams = {
   address?: ScallopAddress;
+  cache?: ScallopCache;
 };
 
 export type ScallopIndexerInstanceParams = {
@@ -82,6 +84,7 @@ export type ScallopIndexerParams = ScallopCacheParams & {
 export type ScallopAddressParams = ScallopCacheParams & {
   addressApiUrl?: string;
   addressId: string;
+  whitelistId: string;
   auth?: string;
   network?: NetworkType;
   forceAddressesInterface?: Partial<Record<NetworkType, AddressesInterface>>;

package/src/utils/query.ts

@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { normalizeStructTag, parseStructTag } from '@mysten/sui/utils';
+import { normalizeStructTag } from '@mysten/sui/utils';
 import type { ScallopUtils } from '../models';
 import type {
   OriginMarketPoolData,
@@ -581,6 +581,7 @@ export const parseOriginBorrowIncentiveAccountPoolPointData = (
  * @return Parsed borrow incentive account data
  */
 export const parseOriginBorrowIncentiveAccountData = (
+  utils: ScallopUtils,
   originBorrowIncentiveAccountData: OriginBorrowIncentiveAccountData
 ): ParsedBorrowIncentiveAccountData => {
   return {
@@ -591,9 +592,7 @@ export const parseOriginBorrowIncentiveAccountData = (
     pointList: originBorrowIncentiveAccountData.points_list.reduce(
       (acc, point) => {
         const parsed = parseOriginBorrowIncentiveAccountPoolPointData(point);
-        const name = parseStructTag(
-          parsed.pointType
-        ).name.toLowerCase() as string;
+        const name = utils.parseCoinNameFromType(parsed.pointType);
         acc[name] = parsed;
         return acc;
       },