@scallop-io/sui-scallop-sdk 1.3.1 → 1.3.2-alpha.2

package/dist/models/scallopCache.d.ts

@@ -37,7 +37,7 @@ export declare class ScallopCache {
      * - `all`: All queries that match the refetch predicate will be refetched in the background.
      * - `none`: No queries will be refetched. Queries that match the refetch predicate will only be marked as invalid.
      */
-    invalidateAndRefetchAllCache(refetchType: 'all' | 'active' | 'inactive' | 'none'): Promise<void>;
+    invalidateAllCache(): Promise<Promise<void>[]>;
     /**
      * @description Provides cache for inspectTxn of the SuiKit.
      * @param QueryInspectTxnParams

package/package.json

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

package/src/constants/cache.ts

@@ -1,12 +1,10 @@
-import { QueryClientConfig } from '@tanstack/query-core';
-
 /**
  * Default cache options for the QueryClient.
  * @type {QueryClientConfig}
  * @description Default cache options for the QueryClient
  * We set the default to 5s to prevent duplicate requests from being requested (e.g. query MarketObject, etc.)
  */
-export const DEFAULT_CACHE_OPTIONS: QueryClientConfig = {
+export const DEFAULT_CACHE_OPTIONS = {
   defaultOptions: {
     queries: {
       staleTime: 5000,

package/src/constants/queryKeys.ts

@@ -52,31 +52,31 @@ export const queryKeys = {
         objectIds: JSON.stringify(objectIds ?? []),
       },
     ],
-    getOwnedObjects: (input: Partial<GetOwnedObjectsParams>) => [
+    getOwnedObjects: (input?: Partial<GetOwnedObjectsParams>) => [
       'rpc',
       'getOwnedObjects',
       {
-        walletAddress: input.owner,
-        cursor: input.cursor ?? undefined,
-        options: input.options ?? undefined,
-        filter: JSON.stringify(input.filter ?? undefined),
-        limit: input.limit ?? undefined,
+        walletAddress: input?.owner,
+        cursor: input?.cursor ?? undefined,
+        options: input?.options ?? undefined,
+        filter: JSON.stringify(input?.filter ?? undefined),
+        limit: input?.limit ?? undefined,
       },
     ],
-    getDynamicFields: (input: Partial<GetDynamicFieldsParams>) => [
+    getDynamicFields: (input?: Partial<GetDynamicFieldsParams>) => [
       'rpc',
       'getDynamicFields',
       {
-        parentId: input.parentId,
-        cursor: input.cursor ?? undefined,
-        limit: input.limit ?? undefined,
+        parentId: input?.parentId,
+        cursor: input?.cursor ?? undefined,
+        limit: input?.limit ?? undefined,
       },
     ],
-    getDynamicFieldObject: (input: Partial<GetDynamicFieldObjectParams>) => [
+    getDynamicFieldObject: (input?: Partial<GetDynamicFieldObjectParams>) => [
       'rpc',
       'getDynamicFieldObject',
       {
-        parentId: input.parentId,
+        parentId: input?.parentId,
         name: {
           type: input?.name?.type,
           value: input?.name?.value,

package/src/models/scallopCache.ts

@@ -31,8 +31,6 @@ type QueryInspectTxnParams = {
   typeArgs?: any[];
 };
 
-const DEFAULT_GC_TIME = 5 * 1000; // 5 seconds
-
 /**
  * @description
  * It provides caching for moveCall, RPC Request, and API Request.
@@ -99,12 +97,13 @@ export class ScallopCache {
    * - `all`: All queries that match the refetch predicate will be refetched in the background.
    * - `none`: No queries will be refetched. Queries that match the refetch predicate will only be marked as invalid.
    */
-  public invalidateAndRefetchAllCache(
-    refetchType: 'all' | 'active' | 'inactive' | 'none'
-  ) {
-    return this.queryClient.invalidateQueries({
-      refetchType,
-    });
+  public async invalidateAllCache() {
+    return Object.values(queryKeys.rpc).map((t) =>
+      this.queryClient.invalidateQueries({
+        queryKey: t(),
+        type: 'all',
+      })
+    );
   }
 
   /**
@@ -129,7 +128,6 @@ export class ScallopCache {
           this.suiKit.inspectTxn(txBlock)
         );
       },
-      gcTime: DEFAULT_GC_TIME,
     });
     return query;
   }
@@ -154,7 +152,6 @@ export class ScallopCache {
           })
         );
       },
-      gcTime: DEFAULT_GC_TIME,
     });
   }
 
@@ -183,7 +180,6 @@ export class ScallopCache {
           this.suiKit.getObjects(objectIds, options)
         );
       },
-      gcTime: DEFAULT_GC_TIME,
     });
   }
 
@@ -200,7 +196,6 @@ export class ScallopCache {
           this.client.getOwnedObjects(input)
         );
       },
-      gcTime: DEFAULT_GC_TIME,
     });
   }
 
@@ -214,7 +209,6 @@ export class ScallopCache {
           this.client.getDynamicFields(input)
         );
       },
-      gcTime: DEFAULT_GC_TIME,
     });
   }
 
@@ -228,7 +222,6 @@ export class ScallopCache {
           this.client.getDynamicFieldObject(input)
         );
       },
-      gcTime: DEFAULT_GC_TIME,
     });
   }
 

package/src/models/scallopUtils.ts

@@ -524,6 +524,11 @@ export class ScallopUtils {
         existPricesCoinNames.push(assetCoinName);
       } else {
         lackPricesCoinNames.push(assetCoinName);
+        this.cache.queryClient.invalidateQueries({
+          queryKey: queryKeys.oracle.getPythLatestPriceFeed(
+            this.address.get(`core.coins.${assetCoinName}.oracle.pyth.feed`)
+          ),
+        });
       }
     });
 
@@ -558,7 +563,7 @@ export class ScallopUtils {
           Object.entries(priceIds).map(async ([coinName, priceId]) => {
             const pythConnection = new SuiPriceServiceConnection(endpoint);
             try {
-              const feed = await this.address.cache.queryClient.fetchQuery({
+              const feed = await this.cache.queryClient.fetchQuery({
                 queryKey: queryKeys.oracle.getPythLatestPriceFeed(priceId),
                 queryFn: async () => {
                   return await pythConnection.getLatestPriceFeeds([priceId]);

package/src/queries/isolatedAsset.ts

@@ -29,42 +29,47 @@ const ISOLATED_ASSET_KEY =
 export const getIsolatedAssets = async (
   address: ScallopAddress
 ): Promise<string[]> => {
-  const marketObject = address.get('core.market');
-  const isolatedAssets: string[] = [];
-  if (!marketObject) return isolatedAssets;
+  try {
+    const marketObject = address.get('core.market');
+    const isolatedAssets: string[] = [];
+    if (!marketObject) return isolatedAssets;
 
-  let hasNextPage = false;
-  let nextCursor: string | null | undefined = null;
+    let hasNextPage = false;
+    let nextCursor: string | null | undefined = null;
 
-  const isIsolatedDynamicField = (
-    dynamicField: DynamicFieldInfo
-  ): dynamicField is DynamicFieldInfo & {
-    name: DynamicFieldName & { value: { type: { name: string } } };
-  } => {
-    return dynamicField.name.type === ISOLATED_ASSET_KEY;
-  };
+    const isIsolatedDynamicField = (
+      dynamicField: DynamicFieldInfo
+    ): dynamicField is DynamicFieldInfo & {
+      name: DynamicFieldName & { value: { type: { name: string } } };
+    } => {
+      return dynamicField.name.type === ISOLATED_ASSET_KEY;
+    };
 
-  do {
-    const response = await address.cache.queryGetDynamicFields({
-      parentId: marketObject,
-      cursor: nextCursor,
-      limit: 10,
-    });
-    if (!response) break;
+    do {
+      const response = await address.cache.queryGetDynamicFields({
+        parentId: marketObject,
+        cursor: nextCursor,
+        limit: 10,
+      });
+      if (!response) break;
 
-    const isolatedAssetCoinTypes = response.data
-      .filter(isIsolatedDynamicField)
-      .map(({ name }) => `0x${name.value.type.name}`);
-    isolatedAssets.push(...isolatedAssetCoinTypes);
+      const isolatedAssetCoinTypes = response.data
+        .filter(isIsolatedDynamicField)
+        .map(({ name }) => `0x${name.value.type.name}`);
+      isolatedAssets.push(...isolatedAssetCoinTypes);
 
-    if (response && response.hasNextPage && response.nextCursor) {
-      hasNextPage = true;
-      nextCursor = response.nextCursor;
-    } else {
-      hasNextPage = false;
-    }
-  } while (hasNextPage);
-  return isolatedAssets;
+      if (response && response.hasNextPage && response.nextCursor) {
+        hasNextPage = true;
+        nextCursor = response.nextCursor;
+      } else {
+        hasNextPage = false;
+      }
+    } while (hasNextPage);
+    return isolatedAssets;
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
 };
 
 /**
@@ -76,30 +81,35 @@ export const isIsolatedAsset = async (
   utils: ScallopUtils,
   coinName: SupportPoolCoins
 ): Promise<boolean> => {
-  const marketObject = utils.address.get('core.market');
+  try {
+    const marketObject = utils.address.get('core.market');
 
-  // check if the coin type is in the list
-  const cachedData = utils.address.cache.queryClient.getQueryData<string[]>([
-    'getDynamicFields',
-    marketObject,
-  ]);
-  if (cachedData) {
-    const coinType = utils.parseCoinType(coinName);
-    return cachedData.includes(coinType);
-  }
+    // check if the coin type is in the list
+    const cachedData = utils.address.cache.queryClient.getQueryData<string[]>([
+      'getDynamicFields',
+      marketObject,
+    ]);
+    if (cachedData) {
+      const coinType = utils.parseCoinType(coinName);
+      return cachedData.includes(coinType);
+    }
 
-  // fetch dynamic field object
-  const coinType = utils.parseCoinType(coinName).slice(2);
+    // fetch dynamic field object
+    const coinType = utils.parseCoinType(coinName).slice(2);
 
-  const object = await utils.cache.queryGetDynamicFieldObject({
-    parentId: marketObject,
-    name: {
-      type: ISOLATED_ASSET_KEY,
-      value: coinType,
-    },
-  });
+    const object = await utils.cache.queryGetDynamicFieldObject({
+      parentId: marketObject,
+      name: {
+        type: ISOLATED_ASSET_KEY,
+        value: coinType,
+      },
+    });
 
-  const parsedData = isolatedAssetZod.safeParse(object?.data?.content);
-  if (!parsedData.success) return false;
-  return parsedData.data.fields.value;
+    const parsedData = isolatedAssetZod.safeParse(object?.data?.content);
+    if (!parsedData.success) return false;
+    return parsedData.data.fields.value;
+  } catch (e) {
+    console.error(e);
+    return false;
+  }
 };

package/src/queries/spoolQuery.ts

@@ -254,6 +254,7 @@ export const getStakeAccounts = async (
         filter: { StructType: stakeAccountType },
         options: {
           showContent: true,
+          showType: true,
         },
         cursor: nextCursor,
         limit: 10,
@@ -304,17 +305,17 @@ export const getStakeAccounts = async (
       {} as Record<string, SupportStakeMarketCoins>
     );
 
-  const stakeObjectIds: string[] = stakeObjectsResponse
-    .map((ref: any) => ref?.data?.objectId)
-    .filter((id: any) => id !== undefined);
-  const stakeObjects = await utils.cache.queryGetObjects(stakeObjectIds, {
-    showContent: true,
-    showType: true,
-  });
-  for (const stakeObject of stakeObjects) {
-    const id = stakeObject.objectId;
-    const type = stakeObject.type!;
-    if (stakeObject.content && 'fields' in stakeObject.content) {
+  // const stakeObjectIds: string[] = stakeObjectsResponse
+  //   .map((ref: any) => ref?.data?.objectId)
+  //   .filter((id: any) => id !== undefined);
+  // const stakeObjects = await utils.cache.queryGetObjects(stakeObjectIds, {
+  //   showContent: true,
+  //   showType: true,
+  // });
+  for (const stakeObject of stakeObjectsResponse.map((ref) => ref.data)) {
+    const id = stakeObject?.objectId;
+    const type = stakeObject?.type!;
+    if (id && stakeObject?.content && 'fields' in stakeObject.content) {
       const fields = stakeObject.content.fields as any;
       const stakePoolId = String(fields.spool_id);
       const stakeType = String(fields.stake_type.fields.name);