@scallop-io/sui-scallop-sdk 2.3.8 → 2.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.3.8",
+  "version": "2.3.9",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/models/scallopSuiKit.ts

@@ -33,6 +33,7 @@ type QueryInspectTxnParams = {
   args: SuiObjectArg[];
   typeArgs?: any[];
   txBlock?: SuiTxBlock;
+  keys?: QueryKey;
 };
 
 export type ScallopSuiKitParams = {
@@ -354,6 +355,7 @@ class ScallopSuiKit extends ScallopQueryClient {
     args,
     typeArgs,
     txBlock = new SuiTxBlock(),
+    keys,
   }: QueryInspectTxnParams): Promise<DevInspectResults | null> {
     const resolvedQueryTarget =
       await this.queryGetNormalizedMoveFunction(queryTarget);
@@ -372,12 +374,15 @@ class ScallopSuiKit extends ScallopQueryClient {
     txBlock.moveCall(queryTarget, resolvedArgs, typeArgs);
 
     return await this.callWithRateLimiter(
-      queryKeys.rpc.getInspectTxn({
-        queryTarget,
-        args,
-        typeArgs,
-        node: this.currentFullNode,
-      }),
+      keys ??
+        queryKeys.rpc.getInspectTxn({
+          queryTarget,
+          args: args.map((arg) =>
+            typeof arg === 'object' && 'objectId' in arg ? arg.objectId : arg
+          ),
+          typeArgs,
+          node: this.currentFullNode,
+        }),
       () => this.suiKit.inspectTxn(txBlock)
     );
   }

package/src/queries/borrowIncentiveQuery.ts

@@ -24,6 +24,7 @@ import type {
 import BigNumber from 'bignumber.js';
 import { SuiObjectRef } from '@mysten/sui/client';
 import { SuiTxBlock } from '@scallop-io/sui-kit';
+import { queryKeys } from 'src/constants';
 
 /**
  * Query borrow incentive pools data using moveCall
@@ -53,6 +54,11 @@ export const queryBorrowIncentivePools = async ({
     queryTarget,
     args,
     txBlock,
+    keys: queryKeys.rpc.getInspectTxn({
+      queryTarget,
+      args: [incentivePoolsId],
+      node: scallopSuiKit.currentFullNode,
+    }),
   });
   const borrowIncentivePoolsQueryData = queryResult?.events[0].parsedJson as
     | BorrowIncentivePoolsQueryInterface
@@ -188,7 +194,7 @@ export const queryBorrowIncentiveAccounts = async (
       mutable: true,
     }),
     txBlock.sharedObjectRef({
-      ...(await getSharedObjectData(obligationId)),
+      ...(await getSharedObjectData(obligationId, utils.scallopSuiKit.client)),
       mutable: true,
     }),
   ];
@@ -197,6 +203,11 @@ export const queryBorrowIncentiveAccounts = async (
     queryTarget,
     args,
     txBlock,
+    keys: queryKeys.rpc.getInspectTxn({
+      queryTarget,
+      args: [incentiveAccountsId, obligationId],
+      node: utils.scallopSuiKit.currentFullNode,
+    }),
   });
   const borrowIncentiveAccountsQueryData = queryResult?.events[0]
     ?.parsedJson as BorrowIncentiveAccountsQueryInterface | undefined;

package/src/queries/coreQuery.ts

@@ -47,6 +47,7 @@ import {
   ScallopAddress,
 } from 'src/models';
 import { getSharedObjectData } from 'src/utils/object';
+import { queryKeys } from 'src/constants';
 
 /**
  * Query market data.
@@ -120,6 +121,11 @@ export const queryMarket = async (
     queryTarget,
     args,
     txBlock,
+    keys: queryKeys.rpc.getInspectTxn({
+      queryTarget,
+      args: [marketId],
+      node: utils.scallopSuiKit.currentFullNode,
+    }),
   });
   const marketData = queryResult?.events[0]?.parsedJson as
     | MarketQueryInterface
@@ -963,7 +969,7 @@ export const queryObligation = async (
       mutable: true,
     }),
     txBlock.sharedObjectRef({
-      ...(await getSharedObjectData(obligationId)),
+      ...(await getSharedObjectData(obligationId, scallopSuiKit.client)),
       mutable: true,
     }),
     {
@@ -974,7 +980,16 @@ export const queryObligation = async (
   ];
 
   const queryResult = await scallopSuiKit.queryInspectTxn(
-    { queryTarget, args, txBlock }
+    {
+      queryTarget,
+      args,
+      txBlock,
+      keys: queryKeys.rpc.getInspectTxn({
+        queryTarget,
+        args: [version, market, obligationId],
+        node: scallopSuiKit.currentFullNode,
+      }),
+    }
     // txBlock
   );
   return queryResult?.events[0]?.parsedJson as

package/src/queries/sCoinQuery.ts

@@ -2,6 +2,7 @@ import { bcs } from '@mysten/sui/bcs';
 import { SuiTxBlock } from '@scallop-io/sui-kit';
 import assert from 'assert';
 import BigNumber from 'bignumber.js';
+import { queryKeys } from 'src/constants';
 import { ScallopQuery, ScallopUtils } from 'src/models';
 import { OptionalKeys, sCoinBalance } from 'src/types';
 import { getSharedObjectData } from 'src/utils';
@@ -23,9 +24,10 @@ export const getSCoinTotalSupply = async (
   const txBlock = new SuiTxBlock();
   const sCoinPkgId = utils.address.get('scoin.id');
   // get treasury
+  const treasury = utils.getSCoinTreasury(sCoinName);
   const args = [
     txBlock.sharedObjectRef({
-      ...(await getSharedObjectData(utils.getSCoinTreasury(sCoinName))),
+      ...(await getSharedObjectData(treasury, utils.scallopSuiKit.client)),
       mutable: false,
     }),
   ];
@@ -39,6 +41,11 @@ export const getSCoinTotalSupply = async (
     args,
     typeArgs,
     txBlock,
+    keys: queryKeys.rpc.getInspectTxn({
+      queryTarget,
+      args: [treasury],
+      node: utils.scallopSuiKit.currentFullNode,
+    }),
   });
   const results = queryResults?.results;
   if (results && results[0]?.returnValues) {

package/src/queries/vescaQuery.ts

@@ -191,13 +191,34 @@ const getTotalVeScaTreasuryAmount = async (
     initialSharedVersion: '1',
   });
 
+  const treasuryRef =
+    typeof veScaTreasury === 'string'
+      ? txb.sharedObjectRef({
+          objectId: veScaTreasury,
+          initialSharedVersion: '75353922',
+          mutable: true,
+        })
+      : txb.sharedObjectRef({
+          objectId: veScaTreasury.objectId,
+          initialSharedVersion: '75353922',
+          mutable: true,
+        });
+
   // refresh query
   const refreshQueryTarget = `${veScaPkgId}::treasury::refresh`;
-  const refreshArgs = [veScaConfig, veScaTreasury, clockObjectRef];
+  const refreshArgs = [
+    txb.sharedObjectRef({
+      objectId: veScaConfig,
+      initialSharedVersion: '75353922',
+      mutable: false,
+    }),
+    treasuryRef,
+    clockObjectRef,
+  ];
 
   // query total veSca amount
   const veScaAmountQueryTarget = `${veScaPkgId}::treasury::total_ve_sca_amount`;
-  const vescaAmountArgs = [veScaTreasury, clockObjectRef];
+  const vescaAmountArgs = [treasuryRef, clockObjectRef];
 
   // resolve each args
   const resolvedRefreshArgs = await Promise.all(