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

package/dist/constants/queryKeys.d.ts

@@ -17,12 +17,10 @@ export declare const queryKeys: {
             typeArgs: string | undefined;
         })[];
         getObject: (objectId?: string, options?: SuiObjectDataOptions) => (string | {
-            options: SuiObjectDataOptions | undefined;
             objectId: string | undefined;
-        })[];
-        getObjects: (objectIds?: string[], walletAddress?: string, options?: SuiObjectDataOptions) => (string | {
-            walletAddress: string | undefined;
             options: SuiObjectDataOptions | undefined;
+        })[];
+        getObjects: (objectIds?: string[]) => (string | {
             objectIds: string;
         })[];
         getOwnedObjects: (input?: Partial<GetOwnedObjectsParams>) => (string | {

package/dist/index.js

@@ -812,14 +812,12 @@ var queryKeys = {
     getObject: (objectId, options) => [
       "rpc",
       "getObject",
-      { options, objectId }
+      { objectId, options }
     ],
-    getObjects: (objectIds, walletAddress, options) => [
+    getObjects: (objectIds) => [
       "rpc",
       "getObjects",
       {
-        walletAddress,
-        options,
         objectIds: JSON.stringify(objectIds ?? void 0)
       }
     ],
@@ -1393,6 +1391,20 @@ var newSuiKit = (params) => {
 // src/models/scallopCache.ts
 var DEFAULT_TOKENS_PER_INTERVAL = 10;
 var DEFAULT_INTERVAL_IN_MS = 250;
+var deepMergeObject = (curr, update) => {
+  const result = { ...curr };
+  for (const key in update) {
+    if (update[key] && typeof update[key] === "object" && !Array.isArray(update[key])) {
+      result[key] = deepMergeObject(
+        curr[key] || {},
+        update[key]
+      );
+    } else {
+      result[key] = update[key];
+    }
+  }
+  return result;
+};
 var ScallopCache = class {
   constructor(params, instance) {
     this.tokensPerInterval = DEFAULT_TOKENS_PER_INTERVAL;
@@ -1544,7 +1556,8 @@ var ScallopCache = class {
     options = {
       ...options,
       showOwner: true,
-      showContent: true
+      showContent: true,
+      showType: true
     };
     return this.queryClient.fetchQuery({
       retry: this.retryFn,
@@ -1565,38 +1578,36 @@ var ScallopCache = class {
    * @param objectIds
    * @returns Promise<SuiObjectData[]>
    */
-  async queryGetObjects(objectIds, options = {
-    showContent: true
-  }) {
+  async queryGetObjects(objectIds) {
     if (objectIds.length === 0)
       return [];
+    const options = {
+      showContent: true,
+      showOwner: true,
+      showType: true
+    };
     return this.queryClient.fetchQuery({
       retry: this.retryFn,
       retryDelay: 1e3,
-      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(
-              {
-                exact: false,
-                queryKey: queryKeys.rpc.getObject(result.objectId, options)
-              },
-              {
-                data: result,
-                error: null
-              },
-              {
-                updatedAt: Date.now()
-              }
-            );
+            const queryKey = queryKeys.rpc.getObject(result.objectId);
+            const prevDatas = this.queryClient.getQueriesData({
+              exact: false,
+              queryKey
+            });
+            prevDatas.forEach(([key, prevData]) => {
+              this.queryClient.setQueryData(
+                key,
+                deepMergeObject(prevData, { data: result, error: null }),
+                { updatedAt: Date.now() }
+              );
+            });
           });
         }
         return results;
@@ -1621,22 +1632,18 @@ var ScallopCache = class {
           results.data.filter(
             (result) => !!result.data
           ).forEach((result) => {
-            this.queryClient.setQueriesData(
-              {
-                exact: false,
-                queryKey: queryKeys.rpc.getObject(
-                  result.data.objectId,
-                  input.options ?? {}
-                )
-              },
-              {
-                data: result.data,
-                error: null
-              },
-              {
-                updatedAt: Date.now()
-              }
-            );
+            const queryKey = queryKeys.rpc.getObject(result.data.objectId);
+            const prevDatas = this.queryClient.getQueriesData({
+              exact: false,
+              queryKey
+            });
+            prevDatas.forEach(([key, prevData]) => {
+              this.queryClient.setQueryData(
+                key,
+                deepMergeObject(prevData, { data: result.data, error: null }),
+                { updatedAt: Date.now() }
+              );
+            });
           });
         }
         return results;
@@ -1665,22 +1672,18 @@ var ScallopCache = class {
           () => 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({
+            exact: false,
+            queryKey
+          });
+          prevDatas.forEach(([key, prevData]) => {
+            this.queryClient.setQueryData(
+              key,
+              deepMergeObject(prevData, { data: result.data, error: null }),
+              { updatedAt: Date.now() }
+            );
+          });
         }
         return result;
       }
@@ -3141,12 +3144,7 @@ var getBindedObligationId = async ({
   const borrowIncentiveObjectId = address.get("borrowIncentive.object");
   const incentivePoolsId = address.get("borrowIncentive.incentivePools");
   const veScaObjId = address.get("vesca.object");
-  const incentivePoolsResponse = await address.cache.queryGetObject(
-    incentivePoolsId,
-    {
-      showContent: true
-    }
-  );
+  const incentivePoolsResponse = await address.cache.queryGetObject(incentivePoolsId);
   if (incentivePoolsResponse?.data?.content?.dataType !== "moveObject")
     return null;
   const incentivePoolFields = incentivePoolsResponse.data.content.fields;
@@ -3173,12 +3171,7 @@ var getBindedVeScaKey = async ({
   const borrowIncentiveObjectId = address.get("borrowIncentive.object");
   const incentiveAccountsId = address.get("borrowIncentive.incentiveAccounts");
   const corePkg = address.get("core.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 = incentiveAccountsObject.data.content.fields.accounts.fields.id.id;
@@ -3363,11 +3356,11 @@ var getBorrowLimit = async (utils, poolName) => {
 };
 
 // src/queries/objectsQuery.ts
-var queryMultipleObjects = async (cache, objectIds, options, partitionSize = 50) => {
+var queryMultipleObjects = async (cache, objectIds, partitionSize = 50) => {
   const objectIdsPartition = partitionArray(objectIds, partitionSize);
   const objects = [];
   for (const objectIds2 of objectIdsPartition) {
-    const result = await cache.queryGetObjects(objectIds2, options);
+    const result = await cache.queryGetObjects(objectIds2);
     objects.push(...result);
   }
   return objects;
@@ -3838,9 +3831,7 @@ var getMarketCollaterals = async (query, collateralCoinNames = [...SUPPORT_COLLA
     Object.values(marketCollateralsIndexer).forEach(updateMarketCollateral);
     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(
@@ -3868,9 +3859,7 @@ var getMarketCollateral = async (query, collateralCoinName, indexer = false, mar
     return marketCollateralIndexer;
   }
   const marketId = query.address.get("core.market");
-  marketObject = marketObject || (await query.cache.queryGetObject(marketId, {
-    showContent: true
-  }))?.data;
+  marketObject = marketObject || (await query.cache.queryGetObject(marketId))?.data;
   if (!(marketObject && marketObject.content?.dataType === "moveObject"))
     throw new Error(`Failed to fetch marketObject`);
   const fields = marketObject.content.fields;
@@ -3973,10 +3962,7 @@ var getObligations = async ({
     address.cache,
     keyObjects.map((ref) => ref.data?.content).filter(
       (content) => content?.dataType === "moveObject"
-    ).map((content) => content.fields.ownership.fields.of),
-    {
-      showContent: true
-    }
+    ).map((content) => content.fields.ownership.fields.of)
   );
   await Promise.allSettled(
     keyObjects.map(async ({ data }, idx) => {
@@ -3996,9 +3982,7 @@ var getObligations = async ({
   return obligations;
 };
 var getObligationLocked = async (cache, obligation) => {
-  const obligationObjectData = typeof obligation === "string" ? (await cache.queryGetObject(obligation, {
-    showContent: true
-  }))?.data : obligation;
+  const obligationObjectData = typeof obligation === "string" ? (await cache.queryGetObject(obligation))?.data : obligation;
   let obligationLocked = false;
   if (obligationObjectData && obligationObjectData?.content?.dataType === "moveObject" && "lock_key" in obligationObjectData.content.fields) {
     obligationLocked = Boolean(obligationObjectData.content.fields.lock_key);
@@ -4083,14 +4067,10 @@ var getFlashLoanFees = async (query, assetNames) => {
       return FlashLoanFeeObjectMap[assetName];
     }
   }).filter((t) => !!t);
-  const flashloanFeeObjects = await query.cache.queryGetObjects(objIds, {
-    showContent: true
-  });
+  const flashloanFeeObjects = await query.cache.queryGetObjects(objIds);
   if (missingAssets.length > 0) {
     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");
     const vault = marketObjectRes.data.content.fields.vault;
@@ -4104,9 +4084,7 @@ var getFlashLoanFees = async (query, assetNames) => {
       return !!assetTypeMap[assetType];
     }).map((field) => field.objectId) ?? [];
     flashloanFeeObjects.push(
-      ...await query.cache.queryGetObjects(dynamicFieldObjectIds, {
-        showContent: true
-      })
+      ...await query.cache.queryGetObjects(dynamicFieldObjectIds)
     );
   }
   return flashloanFeeObjects.reduce(
@@ -4138,9 +4116,7 @@ var userRewardFieldsZod = import_zod4.z.object({
 }).transform((value) => (0, import_bignumber4.default)(value.value).shiftedBy(-9).toNumber());
 var getLoyaltyProgramInformations = async (query, veScaKey) => {
   const rewardPool = query.address.get("loyaltyProgram.rewardPool");
-  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;
@@ -4890,9 +4866,7 @@ var getPythPrice = async ({
   const pythFeedObjectId = address.get(
     `core.coins.${assetCoinName}.oracle.pyth.feedObject`
   );
-  priceFeedObject = priceFeedObject || (await address.cache.queryGetObject(pythFeedObjectId, {
-    showContent: true
-  }))?.data;
+  priceFeedObject = priceFeedObject || (await address.cache.queryGetObject(pythFeedObjectId))?.data;
   if (priceFeedObject) {
     const priceFeedPoolObject = priceFeedObject;
     if (priceFeedPoolObject.content && "fields" in priceFeedPoolObject.content) {
@@ -4934,8 +4908,7 @@ var getPythPrices = async ({
     {}
   );
   const priceFeedObjects = await address.cache.queryGetObjects(
-    Object.keys(pythPriceFeedIds),
-    { showContent: true }
+    Object.keys(pythPriceFeedIds)
   );
   const assetToPriceFeedMapping = priceFeedObjects.reduce(
     (prev, priceFeedObject) => {
@@ -5375,10 +5348,7 @@ var getStakePool = async ({
 }, marketCoinName) => {
   const poolId = utils.address.get(`spool.pools.${marketCoinName}.id`);
   let stakePool = void 0;
-  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;
@@ -5420,13 +5390,7 @@ var getStakeRewardPool = async ({
     `spool.pools.${marketCoinName}.rewardPoolId`
   );
   let stakeRewardPool = void 0;
-  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;
     const id = stakeRewardPoolObject.objectId;
@@ -5563,7 +5527,7 @@ var getTotalVeScaTreasuryAmount = async (utils, veScaTreasury) => {
   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;
     })
@@ -5571,7 +5535,7 @@ var getTotalVeScaTreasuryAmount = async (utils, veScaTreasury) => {
   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;
     })
@@ -5603,9 +5567,7 @@ var getTotalVeScaTreasuryAmount = async (utils, veScaTreasury) => {
 };
 var getVeScaTreasuryInfo = async (utils) => {
   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;
   const treasuryFields = veScaTreasury.data.content.fields;
@@ -5629,9 +5591,7 @@ var getVeScaTreasuryInfo = async (utils) => {
 var getAllAddresses = async (query) => {
   const results = {};
   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`);
   const fields = marketObject.content.fields;