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

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.
      */
-    invalidateAllCache(): 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.2-alpha.1",
+  "version": "1.3.2-alpha.3",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/models/scallopCache.ts

@@ -97,10 +97,11 @@ 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 invalidateAllCache() {
+  public async invalidateAllCache() {
     return Object.values(queryKeys.rpc).map((t) =>
       this.queryClient.invalidateQueries({
         queryKey: t(),
+        type: 'all',
       })
     );
   }
@@ -127,7 +128,6 @@ export class ScallopCache {
           this.suiKit.inspectTxn(txBlock)
         );
       },
-      ...DEFAULT_CACHE_OPTIONS.defaultOptions.queries,
     });
     return query;
   }
@@ -152,7 +152,6 @@ export class ScallopCache {
           })
         );
       },
-      ...DEFAULT_CACHE_OPTIONS.defaultOptions.queries,
     });
   }
 
@@ -181,7 +180,6 @@ export class ScallopCache {
           this.suiKit.getObjects(objectIds, options)
         );
       },
-      ...DEFAULT_CACHE_OPTIONS.defaultOptions.queries,
     });
   }
 
@@ -198,7 +196,6 @@ export class ScallopCache {
           this.client.getOwnedObjects(input)
         );
       },
-      ...DEFAULT_CACHE_OPTIONS.defaultOptions.queries,
     });
   }
 
@@ -212,7 +209,6 @@ export class ScallopCache {
           this.client.getDynamicFields(input)
         );
       },
-      ...DEFAULT_CACHE_OPTIONS.defaultOptions.queries,
     });
   }
 
@@ -226,7 +222,6 @@ export class ScallopCache {
           this.client.getDynamicFieldObject(input)
         );
       },
-      ...DEFAULT_CACHE_OPTIONS.defaultOptions.queries,
     });
   }
 

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/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);