@scallop-io/sui-scallop-sdk 0.46.33 → 0.46.35

package/README.md

@@ -16,7 +16,7 @@
 
 ## Description
 
-This SDK is used to interact with [sui-lending-protocal](https://github.com/scallop-io/sui-lending-protocol) and is written based on another sui-integrated tool, [sui-kit](https://github.com/scallop-io/sui-kit). It consists of seven main functional models, here's a brief introduction to each of them:
+This SDK is used to interact with [sui-lending-protocol](https://github.com/scallop-io/sui-lending-protocol) and is written based on another sui-integrated tool, [sui-kit](https://github.com/scallop-io/sui-kit). It consists of seven main functional models, here's a brief introduction to each of them:
 
 - **Scallop**: Provide an entry to quickly create an instance (client, address, query, builder, utils) and complete initialization at the same time.
 

package/dist/index.js

@@ -395,6 +395,9 @@ var ScallopCache = class {
       JSON.stringify(objectIds),
       this.suiKit.currentAddress()
     ];
+    if (options) {
+      queryKey.push(JSON.stringify(options));
+    }
     return this.queryClient.fetchQuery({
       queryKey,
       queryFn: async () => {
@@ -433,9 +436,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));
     }
@@ -450,6 +450,7 @@ var ScallopCache = class {
     const queryKey = [
       "getDynamicFieldObject",
       input.parentId,
+      input.name.type,
       input.name.value
     ];
     return this.queryClient.fetchQuery({
@@ -2659,19 +2660,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,
@@ -2690,17 +2690,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>`,
@@ -3051,11 +3050,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 = (0, import_bignumber4.default)(debt?.amount ?? 0);
-      const borrowedCoin = borrowedAmount.shiftedBy(-1 * coinDecimal);
-      const requiredRepayAmount = borrowedAmount.multipliedBy(
+      const borrowedAmount = (0, import_bignumber4.default)(debt?.amount ?? 0).multipliedBy(
         increasedRate + 1
       );
+      const borrowedCoin = borrowedAmount.shiftedBy(-1 * coinDecimal);
+      const requiredRepayAmount = borrowedAmount;
       const requiredRepayCoin = requiredRepayAmount.shiftedBy(-1 * coinDecimal);
       const availableRepayAmount = (0, import_bignumber4.default)(coinAmount);
       const availableRepayCoin = availableRepayAmount.shiftedBy(
@@ -5651,16 +5650,17 @@ var generateReferralQuickMethod = ({
           const rewardCoin = txBlock.claimReferralRevenue(veScaKey, coinName);
           objToTransfer.push(rewardCoin);
         } else {
-          const coins = await builder.suiKit.suiInteractor.selectCoins(
-            sender,
-            Infinity,
-            builder.utils.parseCoinType(coinName)
-          );
           const rewardCoin = txBlock.claimReferralRevenue(veScaKey, coinName);
-          if (coins.length > 0) {
+          try {
+            const coins = await builder.suiKit.suiInteractor.selectCoins(
+              sender,
+              Infinity,
+              builder.utils.parseCoinType(coinName)
+            );
             txBlock.mergeCoins(rewardCoin, coins);
+          } finally {
+            objToTransfer.push(rewardCoin);
           }
-          objToTransfer.push(rewardCoin);
         }
       }
       if (objToTransfer.length > 0) {