@scallop-io/sui-scallop-sdk 1.4.8 → 1.4.10

package/src/constants/queryKeys.ts

@@ -37,18 +37,12 @@ export const queryKeys = {
     getObject: (objectId?: string, options?: SuiObjectDataOptions) => [
       'rpc',
       'getObject',
-      { options, objectId },
+      { objectId, options },
     ],
-    getObjects: (
-      objectIds?: string[],
-      walletAddress?: string,
-      options?: SuiObjectDataOptions
-    ) => [
+    getObjects: (objectIds?: string[]) => [
       'rpc',
       'getObjects',
       {
-        walletAddress,
-        options,
         objectIds: JSON.stringify(objectIds ?? undefined),
       },
     ],

package/src/constants/testAddress.ts

@@ -236,6 +236,9 @@ export const TEST_ADDRESSES: AddressesInterface = {
           },
         },
       },
+      // @TODO: add test address
+      // @ts-ignore
+      sbusdt: {},
       fdusd: {
         id: '0xf16e6b723f242ec745dfd7634ad072c42d5c1d9ac9d62a39c381303eaa57693a',
         metaData:

package/src/models/scallop.ts

@@ -163,6 +163,7 @@ export class Scallop {
       },
       {
         address: this.address,
+        suiKit: this.suiKit,
       }
     );
 

package/src/models/scallopCache.ts

@@ -33,6 +33,29 @@ type QueryInspectTxnParams = {
 const DEFAULT_TOKENS_PER_INTERVAL = 10;
 const DEFAULT_INTERVAL_IN_MS = 250;
 
+const deepMergeObject = <T>(curr: T, update: T): T => {
+  const result = { ...curr }; // Clone the current object to avoid mutation
+
+  for (const key in update) {
+    if (
+      update[key] &&
+      typeof update[key] === 'object' &&
+      !Array.isArray(update[key])
+    ) {
+      // If the value is an object, recurse
+      result[key] = deepMergeObject(
+        curr[key] || ({} as T[Extract<keyof T, string>]),
+        update[key]
+      );
+    } else {
+      // Otherwise, directly assign the value
+      result[key] = update[key];
+    }
+  }
+
+  return result;
+};
+
 /**
  * @description
  * It provides caching for moveCall, RPC Request, and API Request.
@@ -254,6 +277,7 @@ export class ScallopCache {
       ...options,
       showOwner: true,
       showContent: true,
+      showType: true,
     };
     return this.queryClient.fetchQuery({
       retry: this.retryFn,
@@ -276,42 +300,38 @@ export class ScallopCache {
    * @param objectIds
    * @returns Promise<SuiObjectData[]>
    */
-  public async queryGetObjects(
-    objectIds: string[],
-    options: SuiObjectDataOptions = {
-      showContent: true,
-    }
-  ): Promise<SuiObjectData[]> {
+  public async queryGetObjects(objectIds: string[]): Promise<SuiObjectData[]> {
     if (objectIds.length === 0) return [];
-    // objectIds.sort();
+    const options: SuiObjectDataOptions = {
+      showContent: true,
+      showOwner: true,
+      showType: true,
+    };
 
     return this.queryClient.fetchQuery({
       retry: this.retryFn,
       retryDelay: 1000,
-      queryKey: queryKeys.rpc.getObjects(
-        objectIds,
-        this.walletAddress,
-        options
-      ),
+      queryKey: queryKeys.rpc.getObjects(objectIds),
       queryFn: async () => {
         const results = await this.callWithRateLimit(
           async () => await this.suiKit.getObjects(objectIds, options)
         );
         if (results) {
           results.forEach((result) => {
-            this.queryClient.setQueriesData(
-              {
+            // fetch previous data
+            const queryKey = queryKeys.rpc.getObject(result.objectId);
+            const prevDatas =
+              this.queryClient.getQueriesData<SuiObjectResponse>({
                 exact: false,
-                queryKey: queryKeys.rpc.getObject(result.objectId, options),
-              },
-              {
-                data: result,
-                error: null,
-              },
-              {
-                updatedAt: Date.now(),
-              }
-            );
+                queryKey,
+              });
+            prevDatas.forEach(([key, prevData]) => {
+              this.queryClient.setQueryData(
+                key,
+                deepMergeObject(prevData, { data: result, error: null }),
+                { updatedAt: Date.now() }
+              );
+            });
           });
         }
         return results;
@@ -325,7 +345,7 @@ export class ScallopCache {
    * @returns Promise<PaginatedObjectsResponse>
    */
   public async queryGetOwnedObjects(input: GetOwnedObjectsParams) {
-    // TODO: This query need its own separate rate limiter (as owned objects can theoretically be infinite), need a better way to handle this
+    // @TODO: This query need its own separate rate limiter (as owned objects can theoretically be infinite), need a better way to handle this
     return this.queryClient.fetchQuery({
       retry: this.retryFn,
       retryDelay: 1000,
@@ -343,22 +363,20 @@ export class ScallopCache {
                 NonNullable<{ data: SuiObjectData }> => !!result.data
             )
             .forEach((result) => {
-              this.queryClient.setQueriesData(
-                {
+              // fetch previous data
+              const queryKey = queryKeys.rpc.getObject(result.data.objectId);
+              const prevDatas =
+                this.queryClient.getQueriesData<SuiObjectResponse>({
                   exact: false,
-                  queryKey: queryKeys.rpc.getObject(
-                    result.data.objectId,
-                    input.options ?? {}
-                  ),
-                },
-                {
-                  data: result.data,
-                  error: null,
-                },
-                {
-                  updatedAt: Date.now(),
-                }
-              );
+                  queryKey,
+                });
+              prevDatas.forEach(([key, prevData]) => {
+                this.queryClient.setQueryData(
+                  key,
+                  deepMergeObject(prevData, { data: result.data, error: null }),
+                  { updatedAt: Date.now() }
+                );
+              });
             });
         }
         return results;
@@ -393,22 +411,18 @@ export class ScallopCache {
           this.client.getDynamicFieldObject(input)
         );
         if (result?.data) {
-          this.queryClient.setQueriesData(
-            {
-              exact: false,
-              queryKey: queryKeys.rpc.getObject(result?.data.objectId, {
-                showContent: true,
-                showOwner: true,
-              }),
-            },
-            {
-              data: result.data,
-              error: null,
-            },
-            {
-              updatedAt: Date.now(),
-            }
-          );
+          const queryKey = queryKeys.rpc.getObject(result.data.objectId);
+          const prevDatas = this.queryClient.getQueriesData<SuiObjectResponse>({
+            exact: false,
+            queryKey,
+          });
+          prevDatas.forEach(([key, prevData]) => {
+            this.queryClient.setQueryData(
+              key,
+              deepMergeObject(prevData, { data: result.data, error: null }),
+              { updatedAt: Date.now() }
+            );
+          });
         }
         return result;
       },

package/src/queries/borrowIncentiveQuery.ts

@@ -246,12 +246,8 @@ export const getBindedObligationId = async (
   const veScaObjId = address.get('vesca.object');
 
   // get incentive pools
-  const incentivePoolsResponse = await address.cache.queryGetObject(
-    incentivePoolsId,
-    {
-      showContent: true,
-    }
-  );
+  const incentivePoolsResponse =
+    await address.cache.queryGetObject(incentivePoolsId);
 
   if (incentivePoolsResponse?.data?.content?.dataType !== 'moveObject')
     return null;
@@ -294,12 +290,8 @@ export const getBindedVeScaKey = async (
   const corePkg = address.get('core.object');
 
   // get IncentiveAccounts object
-  const incentiveAccountsObject = await address.cache.queryGetObject(
-    incentiveAccountsId,
-    {
-      showContent: true,
-    }
-  );
+  const incentiveAccountsObject =
+    await address.cache.queryGetObject(incentiveAccountsId);
   if (incentiveAccountsObject?.data?.content?.dataType !== 'moveObject')
     return null;
   const incentiveAccountsTableId = (

package/src/queries/coreQuery.ts

@@ -721,9 +721,7 @@ export const getMarketCollaterals = async (
     return marketCollaterals;
   }
 
-  const marketObjectResponse = await query.cache.queryGetObject(marketId, {
-    showContent: true,
-  });
+  const marketObjectResponse = await query.cache.queryGetObject(marketId);
   await Promise.allSettled(
     collateralCoinNames.map(async (collateralCoinName) => {
       const marketCollateral = await getMarketCollateral(
@@ -781,12 +779,7 @@ export const getMarketCollateral = async (
 
   const marketId = query.address.get('core.market');
   marketObject =
-    marketObject ||
-    (
-      await query.cache.queryGetObject(marketId, {
-        showContent: true,
-      })
-    )?.data;
+    marketObject || (await query.cache.queryGetObject(marketId))?.data;
 
   if (!(marketObject && marketObject.content?.dataType === 'moveObject'))
     throw new Error(`Failed to fetch marketObject`);
@@ -949,10 +942,7 @@ export const getObligations = async (
         (content): content is SuiParsedData & { dataType: 'moveObject' } =>
           content?.dataType === 'moveObject'
       )
-      .map((content) => (content.fields as any).ownership.fields.of),
-    {
-      showContent: true,
-    }
+      .map((content) => (content.fields as any).ownership.fields.of)
   );
 
   await Promise.allSettled(
@@ -987,11 +977,7 @@ export const getObligationLocked = async (
 ) => {
   const obligationObjectData =
     typeof obligation === 'string'
-      ? (
-          await cache.queryGetObject(obligation, {
-            showContent: true,
-          })
-        )?.data
+      ? (await cache.queryGetObject(obligation))?.data
       : obligation;
   let obligationLocked = false;
   if (
@@ -1179,16 +1165,12 @@ export const getFlashLoanFees = async (
     })
     .filter((t) => !!t) as string[];
 
-  const flashloanFeeObjects = await query.cache.queryGetObjects(objIds, {
-    showContent: true,
-  });
+  const flashloanFeeObjects = await query.cache.queryGetObjects(objIds);
 
   if (missingAssets.length > 0) {
     // get market object
     const marketObjectId = query.address.get('core.market');
-    const marketObjectRes = await query.cache.queryGetObject(marketObjectId, {
-      showContent: true,
-    });
+    const marketObjectRes = await query.cache.queryGetObject(marketObjectId);
     if (marketObjectRes?.data?.content?.dataType !== 'moveObject')
       throw new Error('Failed to get market object');
 
@@ -1215,9 +1197,7 @@ export const getFlashLoanFees = async (
         .map((field) => field.objectId) ?? [];
 
     flashloanFeeObjects.push(
-      ...(await query.cache.queryGetObjects(dynamicFieldObjectIds, {
-        showContent: true,
-      }))
+      ...(await query.cache.queryGetObjects(dynamicFieldObjectIds))
     );
   }
 

package/src/queries/loyaltyProgramQuery.ts

@@ -36,9 +36,7 @@ export const getLoyaltyProgramInformations = async (
   const rewardPool = query.address.get('loyaltyProgram.rewardPool');
 
   // get fields from rewardPool object
-  const rewardPoolObject = await query.cache.queryGetObject(rewardPool, {
-    showContent: true,
-  });
+  const rewardPoolObject = await query.cache.queryGetObject(rewardPool);
 
   if (rewardPoolObject?.data?.content?.dataType !== 'moveObject') return null;
   const rewardPoolFields = rewardPoolObject.data.content.fields;

package/src/queries/objectsQuery.ts

@@ -1,18 +1,16 @@
-import { SuiObjectDataOptions } from '@mysten/sui/dist/cjs/client';
 import { ScallopCache } from 'src/models/scallopCache';
 import { partitionArray } from 'src/utils';
 
 export const queryMultipleObjects = async (
   cache: ScallopCache,
   objectIds: string[],
-  options?: SuiObjectDataOptions,
   partitionSize = 50
 ) => {
   const objectIdsPartition = partitionArray(objectIds, partitionSize);
 
   const objects = [];
   for (const objectIds of objectIdsPartition) {
-    const result = await cache.queryGetObjects(objectIds, options);
+    const result = await cache.queryGetObjects(objectIds);
     objects.push(...result);
   }
 

package/src/queries/poolAddressesQuery.ts

@@ -20,7 +20,7 @@ export const getAllAddresses = async (query: ScallopQuery) => {
         supplyLimitKey?: string;
         borrowLimitKey?: string;
         isolatedAssetKey?: string;
-        coinDecimalId?: string;
+        coinMetadataId?: string;
         borrowIncentivePoolId?: string;
         coinType?: string;
       }
@@ -28,11 +28,7 @@ export const getAllAddresses = async (query: ScallopQuery) => {
   > = {};
 
   const marketId = query.address.get('core.market');
-  const marketObject = (
-    await query.cache.queryGetObject(marketId, {
-      showContent: true,
-    })
-  )?.data;
+  const marketObject = (await query.cache.queryGetObject(marketId))?.data;
 
   if (!(marketObject && marketObject.content?.dataType === 'moveObject'))
     throw new Error(`Failed to fetch marketObject`);
@@ -80,7 +76,8 @@ export const getAllAddresses = async (query: ScallopQuery) => {
           },
         })
       )?.data?.objectId;
-    } catch (_e) {
+    } catch (e: any) {
+      console.error(e.message);
       return undefined;
     }
   };
@@ -123,7 +120,7 @@ export const getAllAddresses = async (query: ScallopQuery) => {
         // @ts-ignore
         `scoin.coins.s${coinName}.treasury`
       );
-      const coinDecimalId = query.address.get(
+      const coinMetadataId = query.address.get(
         `core.coins.${coinName}.metaData`
       );
       results[coinName as SupportPoolCoins] = {
@@ -140,11 +137,11 @@ export const getAllAddresses = async (query: ScallopQuery) => {
         spoolReward: rewardPool,
         sCoinTreasury,
         sCoinType,
-        coinDecimalId,
+        coinMetadataId,
         coinType: `0x${coinType}`,
       };
 
-      await new Promise((resolve) => setTimeout(resolve, 200));
+      await new Promise((resolve) => setTimeout(resolve, 500));
     })
   );
 

package/src/queries/priceQuery.ts

@@ -31,11 +31,7 @@ export const getPythPrice = async (
   );
   priceFeedObject =
     priceFeedObject ||
-    (
-      await address.cache.queryGetObject(pythFeedObjectId, {
-        showContent: true,
-      })
-    )?.data;
+    (await address.cache.queryGetObject(pythFeedObjectId))?.data;
 
   if (priceFeedObject) {
     const priceFeedPoolObject = priceFeedObject;
@@ -99,8 +95,7 @@ export const getPythPrices = async (
 
   // Fetch multiple objects at once to save rpc calls
   const priceFeedObjects = await address.cache.queryGetObjects(
-    Object.keys(pythPriceFeedIds),
-    { showContent: true }
+    Object.keys(pythPriceFeedIds)
   );
 
   const assetToPriceFeedMapping = priceFeedObjects.reduce(

package/src/queries/spoolQuery.ts

@@ -453,10 +453,7 @@ export const getStakePool = async (
 ) => {
   const poolId = utils.address.get(`spool.pools.${marketCoinName}.id`);
   let stakePool: StakePool | undefined = undefined;
-  const stakePoolObjectResponse = await utils.cache.queryGetObject(poolId, {
-    showContent: true,
-    showType: true,
-  });
+  const stakePoolObjectResponse = await utils.cache.queryGetObject(poolId);
   if (stakePoolObjectResponse?.data) {
     const stakePoolObject = stakePoolObjectResponse.data;
     const id = stakePoolObject.objectId;
@@ -515,13 +512,8 @@ export const getStakeRewardPool = async (
     `spool.pools.${marketCoinName}.rewardPoolId`
   );
   let stakeRewardPool: StakeRewardPool | undefined = undefined;
-  const stakeRewardPoolObjectResponse = await utils.cache.queryGetObject(
-    poolId,
-    {
-      showContent: true,
-      showType: true,
-    }
-  );
+  const stakeRewardPoolObjectResponse =
+    await utils.cache.queryGetObject(poolId);
 
   if (stakeRewardPoolObjectResponse?.data) {
     const stakeRewardPoolObject = stakeRewardPoolObjectResponse.data;

package/src/queries/vescaQuery.ts

@@ -195,8 +195,7 @@ const getTotalVeScaTreasuryAmount = async (
   const resolvedRefreshArgs = await Promise.all(
     refreshArgs.map(async (arg) => {
       if (typeof arg === 'string') {
-        return (await utils.cache.queryGetObject(arg, { showContent: true }))
-          ?.data;
+        return (await utils.cache.queryGetObject(arg))?.data;
       }
       return arg;
     })
@@ -205,8 +204,7 @@ const getTotalVeScaTreasuryAmount = async (
   const resolvedVeScaAmountArgs = await Promise.all(
     veScaAmountArgs.map(async (arg) => {
       if (typeof arg === 'string') {
-        return (await utils.cache.queryGetObject(arg, { showContent: true }))
-          ?.data;
+        return (await utils.cache.queryGetObject(arg))?.data;
       }
       return arg;
     })
@@ -254,9 +252,7 @@ export const getVeScaTreasuryInfo = async (
   utils: ScallopUtils
 ): Promise<VeScaTreasuryInfo | null> => {
   const veScaTreasuryId = utils.address.get('vesca.treasury');
-  const veScaTreasury = await utils.cache.queryGetObject(veScaTreasuryId, {
-    showContent: true,
-  });
+  const veScaTreasury = await utils.cache.queryGetObject(veScaTreasuryId);
 
   if (!veScaTreasury || veScaTreasury.data?.content?.dataType !== 'moveObject')
     return null;