@scallop-io/sui-scallop-sdk 0.44.13 → 0.44.15

package/dist/constants/common.d.ts

@@ -5,7 +5,7 @@ export declare const PROTOCOL_OBJECT_ID = "0xefe8b36d5b2e43728cc323298626b831778
 export declare const BORROW_FEE_PROTOCOL_ID = "0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da";
 export declare const SUPPORT_POOLS: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus", "afsui", "hasui", "vsui"];
 export declare const SUPPORT_COLLATERALS: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus", "afsui", "hasui", "vsui"];
-export declare const SUPPORT_SPOOLS: readonly ["ssui", "susdc", "susdt"];
+export declare const SUPPORT_SPOOLS: readonly ["ssui", "susdc", "susdt", "safsui", "shasui", "svsui"];
 export declare const SUPPORT_SPOOLS_REWARDS: readonly ["sui"];
 export declare const SUPPORT_BORROW_INCENTIVE_POOLS: readonly ["sui", "usdc", "usdt"];
 export declare const SUPPORT_BORROW_INCENTIVE_REWARDS: readonly ["sui"];

package/dist/index.js

@@ -94,7 +94,14 @@ var SUPPORT_COLLATERALS = [
   "hasui",
   "vsui"
 ];
-var SUPPORT_SPOOLS = ["ssui", "susdc", "susdt"];
+var SUPPORT_SPOOLS = [
+  "ssui",
+  "susdc",
+  "susdt",
+  "safsui",
+  "shasui",
+  "svsui"
+];
 var SUPPORT_SPOOLS_REWARDS = ["sui"];
 var SUPPORT_BORROW_INCENTIVE_POOLS = ["sui", "usdc", "usdt"];
 var SUPPORT_BORROW_INCENTIVE_REWARDS = ["sui"];
@@ -168,12 +175,18 @@ var marketCoins = {
 var stakeMarketCoins = {
   ssui: "ssui",
   susdc: "susdc",
-  susdt: "susdt"
+  susdt: "susdt",
+  safsui: "safsui",
+  shasui: "shasui",
+  svsui: "svsui"
 };
 var spoolRewardCoins = {
   ssui: "sui",
   susdc: "sui",
-  susdt: "sui"
+  susdt: "sui",
+  safsui: "sui",
+  shasui: "sui",
+  svsui: "sui"
 };
 var borrowIncentiveRewardCoins = {
   sui: "sui",
@@ -401,6 +414,22 @@ var EMPTY_ADDRESSES = {
       susdc: {
         id: "",
         rewardPoolId: ""
+      },
+      susdt: {
+        id: "",
+        rewardPoolId: ""
+      },
+      safsui: {
+        id: "",
+        rewardPoolId: ""
+      },
+      shasui: {
+        id: "",
+        rewardPoolId: ""
+      },
+      svsui: {
+        id: "",
+        rewardPoolId: ""
       }
     }
   },
@@ -2007,7 +2036,10 @@ var getStakeAccounts = async (query, ownerAddress) => {
   const stakeAccounts = {
     ssui: [],
     susdc: [],
-    susdt: []
+    susdt: [],
+    safsui: [],
+    shasui: [],
+    svsui: []
   };
   const stakeMarketCoinTypes = Object.keys(stakeAccounts).reduce(
     (types, stakeMarketCoinName) => {
@@ -2064,6 +2096,39 @@ var getStakeAccounts = async (query, ownerAddress) => {
           points,
           totalPoints
         });
+      } else if ((0, import_utils4.normalizeStructTag)(type) === stakeMarketCoinTypes.safsui) {
+        stakeAccounts.safsui.push({
+          id,
+          type: (0, import_utils4.normalizeStructTag)(type),
+          stakePoolId,
+          stakeType: (0, import_utils4.normalizeStructTag)(stakeType),
+          staked,
+          index,
+          points,
+          totalPoints
+        });
+      } else if ((0, import_utils4.normalizeStructTag)(type) === stakeMarketCoinTypes.shasui) {
+        stakeAccounts.shasui.push({
+          id,
+          type: (0, import_utils4.normalizeStructTag)(type),
+          stakePoolId,
+          stakeType: (0, import_utils4.normalizeStructTag)(stakeType),
+          staked,
+          index,
+          points,
+          totalPoints
+        });
+      } else if ((0, import_utils4.normalizeStructTag)(type) === stakeMarketCoinTypes.svsui) {
+        stakeAccounts.svsui.push({
+          id,
+          type: (0, import_utils4.normalizeStructTag)(type),
+          stakePoolId,
+          stakeType: (0, import_utils4.normalizeStructTag)(stakeType),
+          staked,
+          index,
+          points,
+          totalPoints
+        });
       }
     }
   }
@@ -2418,6 +2483,9 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
   );
   const suppliedCoin = suppliedAmount.shiftedBy(-1 * coinDecimal);
   const suppliedValue = suppliedCoin.multipliedBy(coinPrice ?? 0);
+  const marketCoinPrice = (0, import_bignumber3.default)(coinPrice ?? 0).multipliedBy(
+    marketPool?.conversionRate ?? 1
+  );
   const unstakedMarketAmount = (0, import_bignumber3.default)(marketCoinAmount);
   const unstakedMarketCoin = unstakedMarketAmount.shiftedBy(-1 * coinDecimal);
   const availableSupplyAmount = (0, import_bignumber3.default)(coinAmount);
@@ -2437,6 +2505,8 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
     marketCoinType: query.utils.parseMarketCoinType(poolCoinName),
     coinDecimal,
     coinPrice: coinPrice ?? 0,
+    conversionRate: marketPool?.conversionRate ?? 1,
+    marketCoinPrice: marketCoinPrice.toNumber(),
     supplyApr: marketPool?.supplyApr ?? 0,
     supplyApy: marketPool?.supplyApy ?? 0,
     rewardApr: spool?.rewardApr ?? 0,
@@ -4286,8 +4356,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 +4372,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 +4406,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 +4421,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 +4436,7 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
         obligationKey
       );
       if (obligationLocked) {
-        txBlock.unstakeObligation(obligationArg, obligationtKeyArg, coinName);
+        txBlock.unstakeObligation(obligationArg, obligationtKeyArg);
       }
     },
     claimBorrowIncentiveQuick: async (coinName, obligation, obligationKey) => {
@@ -4461,14 +4531,14 @@ var ScallopBuilder = class {
   /**
    * Request the scallop API to initialize data.
    *
-   * @param forece - Whether to force initialization.
+   * @param force - Whether to force initialization.
    */
-  async init(forece = false) {
-    if (forece || !this.address.getAddresses()) {
+  async init(force = false) {
+    if (force || !this.address.getAddresses()) {
       await this.address.read();
     }
-    await this.query.init(forece);
-    await this.utils.init(forece);
+    await this.query.init(force);
+    await this.utils.init(force);
   }
   /**
    * Create a scallop txBlock instance that enhances transaction block.
@@ -4793,11 +4863,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 +4873,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 +4899,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 +5025,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 +5047,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