@scallop-io/sui-scallop-sdk 0.44.12 → 0.44.14

package/dist/index.js

@@ -1261,7 +1261,7 @@ var queryMarket = async (query, indexer = false) => {
     const parsedMarketCollateralData = parseOriginMarketCollateralData({
       type: collateral.type,
       collateralFactor: collateral.collateralFactor,
-      liquidationFactor: collateral.collateralFactor,
+      liquidationFactor: collateral.liquidationFactor,
       liquidationDiscount: collateral.liquidationDiscount,
       liquidationPanelty: collateral.liquidationPanelty,
       liquidationReserveFactor: collateral.liquidationReserveFactor,
@@ -4286,8 +4286,8 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
     obligationAccessStore: builder.address.get("core.obligationAccessStore")
   };
   return {
-    stakeObligation: (obligationId, obligaionKey, coinName) => {
-      const rewardCoinName = borrowIncentiveRewardCoins[coinName];
+    stakeObligation: (obligationId, obligaionKey) => {
+      const rewardCoinName = "sui";
       const rewardType = builder.utils.parseCoinType(rewardCoinName);
       txBlock.moveCall(
         `${borrowIncentiveIds.borrowIncentivePkg}::user::stake`,
@@ -4302,8 +4302,8 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
         [rewardType]
       );
     },
-    unstakeObligation: (obligationId, obligaionKey, coinName) => {
-      const rewardCoinName = borrowIncentiveRewardCoins[coinName];
+    unstakeObligation: (obligationId, obligaionKey) => {
+      const rewardCoinName = "sui";
       const rewardType = builder.utils.parseCoinType(rewardCoinName);
       txBlock.moveCall(
         `${borrowIncentiveIds.borrowIncentivePkg}::user::unstake`,
@@ -4336,7 +4336,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
 };
 var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
   return {
-    stakeObligationQuick: async (coinName, obligation, obligationKey) => {
+    stakeObligationQuick: async (obligation, obligationKey) => {
       const {
         obligationId: obligationArg,
         obligationKey: obligationtKeyArg,
@@ -4351,10 +4351,10 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
         (txn) => txn.kind === "MoveCall" && txn.target === `${builder.address.get("borrowIncentive.id")}::user::unstake`
       );
       if (!obligationLocked || unstakeObligationBeforeStake) {
-        txBlock.stakeObligation(obligationArg, obligationtKeyArg, coinName);
+        txBlock.stakeObligation(obligationArg, obligationtKeyArg);
       }
     },
-    unstakeObligationQuick: async (coinName, obligation, obligationKey) => {
+    unstakeObligationQuick: async (obligation, obligationKey) => {
       const {
         obligationId: obligationArg,
         obligationKey: obligationtKeyArg,
@@ -4366,7 +4366,7 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
         obligationKey
       );
       if (obligationLocked) {
-        txBlock.unstakeObligation(obligationArg, obligationtKeyArg, coinName);
+        txBlock.unstakeObligation(obligationArg, obligationtKeyArg);
       }
     },
     claimBorrowIncentiveQuick: async (coinName, obligation, obligationKey) => {
@@ -4793,11 +4793,7 @@ var ScallopClient = class {
     txBlock.setSender(sender);
     const availableStake = SUPPORT_BORROW_INCENTIVE_POOLS.includes(poolCoinName);
     if (sign && availableStake) {
-      await txBlock.unstakeObligationQuick(
-        poolCoinName,
-        obligationId,
-        obligationKey
-      );
+      await txBlock.unstakeObligationQuick(obligationId, obligationKey);
     }
     const coin = await txBlock.borrowQuick(
       amount,
@@ -4807,11 +4803,7 @@ var ScallopClient = class {
     );
     txBlock.transferObjects([coin], sender);
     if (sign && availableStake) {
-      await txBlock.stakeObligationQuick(
-        poolCoinName,
-        obligationId,
-        obligationKey
-      );
+      await txBlock.stakeObligationQuick(obligationId, obligationKey);
     }
     if (sign) {
       return await this.suiKit.signAndSendTxn(
@@ -4837,19 +4829,11 @@ var ScallopClient = class {
     txBlock.setSender(sender);
     const availableStake = SUPPORT_BORROW_INCENTIVE_POOLS.includes(poolCoinName);
     if (sign && availableStake) {
-      await txBlock.unstakeObligationQuick(
-        poolCoinName,
-        obligationId,
-        obligationKey
-      );
+      await txBlock.unstakeObligationQuick(obligationId, obligationKey);
     }
     await txBlock.repayQuick(amount, poolCoinName, obligationId);
     if (sign && availableStake) {
-      await txBlock.stakeObligationQuick(
-        poolCoinName,
-        obligationId,
-        obligationKey
-      );
+      await txBlock.stakeObligationQuick(obligationId, obligationKey);
     }
     if (sign) {
       return await this.suiKit.signAndSendTxn(
@@ -4971,17 +4955,17 @@ var ScallopClient = class {
   /**
    * stake obligaion.
    *
-   * @param sign - Decide to directly sign the transaction or return the transaction block.
    * @param obligaionId - The obligation account object.
    * @param obligaionKeyId - The obligation key account object.
+   * @param sign - Decide to directly sign the transaction or return the transaction block.
    * @param walletAddress - The wallet address of the owner.
    * @return Transaction block response or transaction block
    */
-  async stakeObligation(coinName, obligaionId, obligaionKeyId, sign = true, walletAddress) {
+  async stakeObligation(obligaionId, obligaionKeyId, sign = true, walletAddress) {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
-    await txBlock.stakeObligationQuick(coinName, obligaionId, obligaionKeyId);
+    await txBlock.stakeObligationQuick(obligaionId, obligaionKeyId);
     if (sign) {
       return await this.suiKit.signAndSendTxn(
         txBlock
@@ -4993,17 +4977,17 @@ var ScallopClient = class {
   /**
    * unstake obligaion.
    *
-   * @param sign - Decide to directly sign the transaction or return the transaction block.
    * @param obligaionId - The obligation account object.
    * @param obligaionKeyId - The obligation key account object.
+   * @param sign - Decide to directly sign the transaction or return the transaction block.
    * @param walletAddress - The wallet address of the owner.
    * @return Transaction block response or transaction block
    */
-  async unstakeObligation(coinName, obligaionId, obligaionKeyId, sign = true, walletAddress) {
+  async unstakeObligation(obligaionId, obligaionKeyId, sign = true, walletAddress) {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
-    await txBlock.unstakeObligationQuick(coinName, obligaionId, obligaionKeyId);
+    await txBlock.unstakeObligationQuick(obligaionId, obligaionKeyId);
     if (sign) {
       return await this.suiKit.signAndSendTxn(
         txBlock