@scallop-io/sui-scallop-sdk 0.46.32 → 0.46.34

package/package.json

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

package/src/constants/common.ts

@@ -18,8 +18,8 @@ export const PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST
 //   '0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1' as const;
 
 export const BORROW_FEE_PROTOCOL_ID = IS_VE_SCA_TEST
-  ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const)
-  : ('0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da' as const); // test environment
+  ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const) // test environment
+  : ('0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da' as const);
 // export const BORROW_FEE_PROTOCOL_ID =
 //   '0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1' as const;
 

package/src/models/scallopCache.ts

@@ -168,6 +168,9 @@ export class ScallopCache {
       JSON.stringify(objectIds),
       this.suiKit.currentAddress(),
     ];
+    if (options) {
+      queryKey.push(JSON.stringify(options));
+    }
     return this.queryClient.fetchQuery({
       queryKey,
       queryFn: async () => {
@@ -213,9 +216,6 @@ export class ScallopCache {
     if (input.cursor) {
       queryKey.push(JSON.stringify(input.cursor));
     }
-    if (input.cursor) {
-      queryKey.push(JSON.stringify(input.cursor));
-    }
     if (input.limit) {
       queryKey.push(JSON.stringify(input.limit));
     }
@@ -234,6 +234,7 @@ export class ScallopCache {
     const queryKey = [
       'getDynamicFieldObject',
       input.parentId,
+      input.name.type,
       input.name.value,
     ];
     return this.queryClient.fetchQuery({

package/src/queries/borrowIncentiveQuery.ts

@@ -215,15 +215,13 @@ export const getBindedObligationId = async (
   const incentivePoolsId = query.address.get('borrowIncentive.incentivePools');
   const veScaObjId = query.address.get('vesca.object');
 
-  const client = query.suiKit.client();
-
   // get incentive pools
-  const incentivePoolsResponse = await client.getObject({
-    id: incentivePoolsId,
-    options: {
+  const incentivePoolsResponse = await query.cache.queryGetObject(
+    incentivePoolsId,
+    {
       showContent: true,
-    },
-  });
+    }
+  );
 
   if (incentivePoolsResponse.data?.content?.dataType !== 'moveObject')
     return null;
@@ -233,7 +231,7 @@ export const getBindedObligationId = async (
 
   // check if veSca is inside the bind table
   const keyType = `${borrowIncentiveObjectId}::typed_id::TypedID<${veScaObjId}::ve_sca::VeScaKey>`;
-  const veScaBindTableResponse = await client.getDynamicFieldObject({
+  const veScaBindTableResponse = await query.cache.queryGetDynamicFieldObject({
     parentId: veScaBindTableId,
     name: {
       type: keyType,
@@ -260,15 +258,14 @@ export const getBindedVeScaKey = async (
     'borrowIncentive.incentiveAccounts'
   );
   const corePkg = query.address.get('core.object');
-  const client = query.suiKit.client();
 
   // get IncentiveAccounts object
-  const incentiveAccountsObject = await client.getObject({
-    id: incentiveAccountsId,
-    options: {
+  const incentiveAccountsObject = await query.cache.queryGetObject(
+    incentiveAccountsId,
+    {
       showContent: true,
-    },
-  });
+    }
+  );
   if (incentiveAccountsObject.data?.content?.dataType !== 'moveObject')
     return null;
   const incentiveAccountsTableId = (
@@ -276,7 +273,7 @@ export const getBindedVeScaKey = async (
   ).accounts.fields.id.id;
 
   // Search in the table
-  const bindedIncentiveAcc = await client.getDynamicFieldObject({
+  const bindedIncentiveAcc = await query.cache.queryGetDynamicFieldObject({
     parentId: incentiveAccountsTableId,
     name: {
       type: `${borrowIncentiveObjectId}::typed_id::TypedID<${corePkg}::obligation::Obligation>`,

package/src/queries/portfolioQuery.ts

@@ -433,12 +433,12 @@ export const getObligationAccount = async (
       const increasedRate = debt?.borrowIndex
         ? marketPool.borrowIndex / Number(debt.borrowIndex) - 1
         : 0;
-      const borrowedAmount = BigNumber(debt?.amount ?? 0);
-      const borrowedCoin = borrowedAmount.shiftedBy(-1 * coinDecimal);
-
-      const requiredRepayAmount = borrowedAmount.multipliedBy(
+      const borrowedAmount = BigNumber(debt?.amount ?? 0).multipliedBy(
         increasedRate + 1
       );
+      const borrowedCoin = borrowedAmount.shiftedBy(-1 * coinDecimal);
+
+      const requiredRepayAmount = borrowedAmount;
       const requiredRepayCoin = requiredRepayAmount.shiftedBy(-1 * coinDecimal);
 
       const availableRepayAmount = BigNumber(coinAmount);
@@ -486,7 +486,6 @@ export const getObligationAccount = async (
   )) {
     const coinName = poolCoinName as SupportBorrowIncentiveCoins;
     const borrowIncentivePool = borrowIncentivePools[coinName];
-
     if (borrowIncentivePool) {
       const rewards: ObligationBorrowIcentiveReward[] = [];
       for (const rewardCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
@@ -499,9 +498,12 @@ export const getObligationAccount = async (
           const accountBorrowedAmount = BigNumber(accountPoint.weightedAmount);
           const baseIndexRate = 1_000_000_000;
           const increasedPointRate = poolPoint.currentPointIndex
-            ? BigNumber(
-                poolPoint.currentPointIndex - accountPoint.index
-              ).dividedBy(baseIndexRate)
+            ? Math.max(
+                BigNumber(poolPoint.currentPointIndex - accountPoint.index)
+                  .dividedBy(baseIndexRate)
+                  .toNumber(),
+                0
+              )
             : 1;
           availableClaimAmount = availableClaimAmount.plus(
             accountBorrowedAmount
@@ -530,7 +532,7 @@ export const getObligationAccount = async (
                 .toNumber()
             : 1;
 
-          if (availableClaimAmount.isGreaterThan(0)) {
+          if (availableClaimAmount.isGreaterThanOrEqualTo(0)) {
             rewards.push({
               coinName: poolPoint.coinName,
               coinType: poolPoint.coinType,