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

package/dist/index.mjs

@@ -322,6 +322,9 @@ var ScallopCache = class {
       JSON.stringify(objectIds),
       this.suiKit.currentAddress()
     ];
+    if (options) {
+      queryKey.push(JSON.stringify(options));
+    }
     return this.queryClient.fetchQuery({
       queryKey,
       queryFn: async () => {
@@ -360,9 +363,6 @@ var ScallopCache = class {
     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));
     }
@@ -377,6 +377,7 @@ var ScallopCache = class {
     const queryKey = [
       "getDynamicFieldObject",
       input.parentId,
+      input.name.type,
       input.name.value
     ];
     return this.queryClient.fetchQuery({
@@ -2586,19 +2587,18 @@ var getBindedObligationId = async (query, veScaKeyId) => {
   const borrowIncentiveObjectId = query.address.get("borrowIncentive.object");
   const incentivePoolsId = query.address.get("borrowIncentive.incentivePools");
   const veScaObjId = query.address.get("vesca.object");
-  const client = query.suiKit.client();
-  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;
   const incentivePoolFields = incentivePoolsResponse.data.content.fields;
   const veScaBindTableId = incentivePoolFields.ve_sca_bind.fields.id.id;
   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,
@@ -2617,17 +2617,16 @@ var getBindedVeScaKey = async (query, obliationId) => {
     "borrowIncentive.incentiveAccounts"
   );
   const corePkg = query.address.get("core.object");
-  const client = query.suiKit.client();
-  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 = incentiveAccountsObject.data.content.fields.accounts.fields.id.id;
-  const bindedIncentiveAcc = await client.getDynamicFieldObject({
+  const bindedIncentiveAcc = await query.cache.queryGetDynamicFieldObject({
     parentId: incentiveAccountsTableId,
     name: {
       type: `${borrowIncentiveObjectId}::typed_id::TypedID<${corePkg}::obligation::Obligation>`,
@@ -2978,11 +2977,11 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
     const coinAmount = coinAmounts?.[assetCoinName] ?? 0;
     if (marketPool && coinPrice) {
       const increasedRate = debt?.borrowIndex ? marketPool.borrowIndex / Number(debt.borrowIndex) - 1 : 0;
-      const borrowedAmount = BigNumber4(debt?.amount ?? 0);
-      const borrowedCoin = borrowedAmount.shiftedBy(-1 * coinDecimal);
-      const requiredRepayAmount = borrowedAmount.multipliedBy(
+      const borrowedAmount = BigNumber4(debt?.amount ?? 0).multipliedBy(
         increasedRate + 1
       );
+      const borrowedCoin = borrowedAmount.shiftedBy(-1 * coinDecimal);
+      const requiredRepayAmount = borrowedAmount;
       const requiredRepayCoin = requiredRepayAmount.shiftedBy(-1 * coinDecimal);
       const availableRepayAmount = BigNumber4(coinAmount);
       const availableRepayCoin = availableRepayAmount.shiftedBy(
@@ -3034,9 +3033,10 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
           let availableClaimCoin = BigNumber4(0);
           const accountBorrowedAmount = BigNumber4(accountPoint.weightedAmount);
           const baseIndexRate = 1e9;
-          const increasedPointRate = poolPoint.currentPointIndex ? BigNumber4(
-            poolPoint.currentPointIndex - accountPoint.index
-          ).dividedBy(baseIndexRate) : 1;
+          const increasedPointRate = poolPoint.currentPointIndex ? Math.max(
+            BigNumber4(poolPoint.currentPointIndex - accountPoint.index).dividedBy(baseIndexRate).toNumber(),
+            0
+          ) : 1;
           availableClaimAmount = availableClaimAmount.plus(
             accountBorrowedAmount.multipliedBy(increasedPointRate).plus(accountPoint.points)
           );
@@ -3049,7 +3049,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
           ).isFinite() ? BigNumber4(accountPoint.weightedAmount).div(
             BigNumber4(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
           ).toNumber() : 1;
-          if (availableClaimAmount.isGreaterThan(0)) {
+          if (availableClaimAmount.isGreaterThanOrEqualTo(0)) {
             rewards.push({
               coinName: poolPoint.coinName,
               coinType: poolPoint.coinType,