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

package/dist/constants/cache.d.ts

@@ -1,8 +1,14 @@
-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 declare const DEFAULT_CACHE_OPTIONS: QueryClientConfig;
+export declare const DEFAULT_CACHE_OPTIONS: {
+    defaultOptions: {
+        queries: {
+            staleTime: number;
+            gcTime: number;
+        };
+    };
+};

package/dist/constants/queryKeys.d.ts

@@ -26,19 +26,19 @@ export declare const queryKeys: {
             options: SuiObjectDataOptions | undefined;
             objectIds: string;
         })[];
-        getOwnedObjects: (input: Partial<GetOwnedObjectsParams>) => (string | {
+        getOwnedObjects: (input?: Partial<GetOwnedObjectsParams>) => (string | {
             walletAddress: string | undefined;
             cursor: string | undefined;
             options: SuiObjectDataOptions | undefined;
             filter: string;
             limit: number | undefined;
         })[];
-        getDynamicFields: (input: Partial<GetDynamicFieldsParams>) => (string | {
+        getDynamicFields: (input?: Partial<GetDynamicFieldsParams>) => (string | {
             parentId: string | undefined;
             cursor: string | undefined;
             limit: number | undefined;
         })[];
-        getDynamicFieldObject: (input: Partial<GetDynamicFieldObjectParams>) => (string | {
+        getDynamicFieldObject: (input?: Partial<GetDynamicFieldObjectParams>) => (string | {
             parentId: string | undefined;
             name: {
                 type: string | undefined;

package/dist/index.js

@@ -402,27 +402,27 @@ var queryKeys = {
       "rpc",
       "getOwnedObjects",
       {
-        walletAddress: input.owner,
-        cursor: input.cursor ?? void 0,
-        options: input.options ?? void 0,
-        filter: JSON.stringify(input.filter ?? void 0),
-        limit: input.limit ?? void 0
+        walletAddress: input?.owner,
+        cursor: input?.cursor ?? void 0,
+        options: input?.options ?? void 0,
+        filter: JSON.stringify(input?.filter ?? void 0),
+        limit: input?.limit ?? void 0
       }
     ],
     getDynamicFields: (input) => [
       "rpc",
       "getDynamicFields",
       {
-        parentId: input.parentId,
-        cursor: input.cursor ?? void 0,
-        limit: input.limit ?? void 0
+        parentId: input?.parentId,
+        cursor: input?.cursor ?? void 0,
+        limit: input?.limit ?? void 0
       }
     ],
     getDynamicFieldObject: (input) => [
       "rpc",
       "getDynamicFieldObject",
       {
-        parentId: input.parentId,
+        parentId: input?.parentId,
         name: {
           type: input?.name?.type,
           value: input?.name?.value
@@ -1122,7 +1122,6 @@ function withIndexerFallback(method) {
 }
 
 // src/models/scallopCache.ts
-var DEFAULT_GC_TIME = 5 * 1e3;
 var ScallopCache = class {
   constructor(suiKit, walletAddress, cacheOptions, tokenBucket, queryClient) {
     this.queryClient = queryClient ?? new import_query_core.QueryClient(cacheOptions ?? DEFAULT_CACHE_OPTIONS);
@@ -1148,10 +1147,13 @@ var ScallopCache = class {
    * - `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) {
-    return this.queryClient.invalidateQueries({
-      refetchType
-    });
+  async invalidateAllCache() {
+    return Object.values(queryKeys.rpc).map(
+      (t) => this.queryClient.invalidateQueries({
+        queryKey: t(),
+        type: "all"
+      })
+    );
   }
   /**
    * @description Provides cache for inspectTxn of the SuiKit.
@@ -1173,8 +1175,7 @@ var ScallopCache = class {
           this.tokenBucket,
           () => this.suiKit.inspectTxn(txBlock)
         );
-      },
-      gcTime: DEFAULT_GC_TIME
+      }
     });
     return query;
   }
@@ -1195,8 +1196,7 @@ var ScallopCache = class {
             options
           })
         );
-      },
-      gcTime: DEFAULT_GC_TIME
+      }
     });
   }
   /**
@@ -1220,8 +1220,7 @@ var ScallopCache = class {
           this.tokenBucket,
           () => this.suiKit.getObjects(objectIds, options)
         );
-      },
-      gcTime: DEFAULT_GC_TIME
+      }
     });
   }
   /**
@@ -1237,8 +1236,7 @@ var ScallopCache = class {
           this.tokenBucket,
           () => this.client.getOwnedObjects(input)
         );
-      },
-      gcTime: DEFAULT_GC_TIME
+      }
     });
   }
   async queryGetDynamicFields(input) {
@@ -1249,8 +1247,7 @@ var ScallopCache = class {
           this.tokenBucket,
           () => this.client.getDynamicFields(input)
         );
-      },
-      gcTime: DEFAULT_GC_TIME
+      }
     });
   }
   async queryGetDynamicFieldObject(input) {
@@ -1261,8 +1258,7 @@ var ScallopCache = class {
           this.tokenBucket,
           () => this.client.getDynamicFieldObject(input)
         );
-      },
-      gcTime: DEFAULT_GC_TIME
+      }
     });
   }
   async queryGetAllCoinBalances(owner) {
@@ -2416,56 +2412,66 @@ var isolatedAssetZod = import_zod2.z.object({
 });
 var ISOLATED_ASSET_KEY = "0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::IsolatedAssetKey";
 var getIsolatedAssets = async (address) => {
-  const marketObject = address.get("core.market");
-  const isolatedAssets = [];
-  if (!marketObject)
+  try {
+    const marketObject = address.get("core.market");
+    const isolatedAssets = [];
+    if (!marketObject)
+      return isolatedAssets;
+    let hasNextPage = false;
+    let nextCursor = null;
+    const isIsolatedDynamicField = (dynamicField) => {
+      return dynamicField.name.type === ISOLATED_ASSET_KEY;
+    };
+    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);
+      if (response && response.hasNextPage && response.nextCursor) {
+        hasNextPage = true;
+        nextCursor = response.nextCursor;
+      } else {
+        hasNextPage = false;
+      }
+    } while (hasNextPage);
     return isolatedAssets;
-  let hasNextPage = false;
-  let nextCursor = null;
-  const isIsolatedDynamicField = (dynamicField) => {
-    return dynamicField.name.type === ISOLATED_ASSET_KEY;
-  };
-  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);
-    if (response && response.hasNextPage && response.nextCursor) {
-      hasNextPage = true;
-      nextCursor = response.nextCursor;
-    } else {
-      hasNextPage = false;
-    }
-  } while (hasNextPage);
-  return isolatedAssets;
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
 };
 var isIsolatedAsset = async (utils, coinName) => {
-  const marketObject = utils.address.get("core.market");
-  const cachedData = utils.address.cache.queryClient.getQueryData([
-    "getDynamicFields",
-    marketObject
-  ]);
-  if (cachedData) {
-    const coinType2 = utils.parseCoinType(coinName);
-    return cachedData.includes(coinType2);
-  }
-  const coinType = utils.parseCoinType(coinName).slice(2);
-  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)
+  try {
+    const marketObject = utils.address.get("core.market");
+    const cachedData = utils.address.cache.queryClient.getQueryData([
+      "getDynamicFields",
+      marketObject
+    ]);
+    if (cachedData) {
+      const coinType2 = utils.parseCoinType(coinName);
+      return cachedData.includes(coinType2);
+    }
+    const coinType = utils.parseCoinType(coinName).slice(2);
+    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;
+  } catch (e) {
+    console.error(e);
     return false;
-  return parsedData.data.fields.value;
+  }
 };
 
 // src/queries/coreQuery.ts
@@ -3242,7 +3248,8 @@ var getStakeAccounts = async ({
       owner,
       filter: { StructType: stakeAccountType },
       options: {
-        showContent: true
+        showContent: true,
+        showType: true
       },
       cursor: nextCursor,
       limit: 10
@@ -3280,15 +3287,10 @@ var getStakeAccounts = async ({
     },
     {}
   );
-  const stakeObjectIds = stakeObjectsResponse.map((ref) => ref?.data?.objectId).filter((id) => id !== void 0);
-  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) {
+  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;
       const stakePoolId = String(fields.spool_id);
       const stakeType = String(fields.stake_type.fields.name);
@@ -4785,6 +4787,11 @@ var ScallopUtils = class {
         existPricesCoinNames.push(assetCoinName);
       } else {
         lackPricesCoinNames.push(assetCoinName);
+        this.cache.queryClient.invalidateQueries({
+          queryKey: queryKeys.oracle.getPythLatestPriceFeed(
+            this.address.get(`core.coins.${assetCoinName}.oracle.pyth.feed`)
+          )
+        });
       }
     });
     if (existPricesCoinNames.length > 0) {
@@ -4812,7 +4819,7 @@ var ScallopUtils = class {
           Object.entries(priceIds).map(async ([coinName, priceId]) => {
             const pythConnection = new import_pyth_sui_js.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]);