@scallop-io/sui-scallop-sdk 0.37.6 → 0.37.8

package/dist/index.js

@@ -556,7 +556,9 @@ var ScallopUtils = class {
       // USDC
       "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf",
       // USDT
-      "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c"
+      "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c",
+      // ETH
+      "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5"
     ];
     if (wormHoleCoins.includes(coinPackageId)) {
       return `${coinPackageId}::coin::COIN`;
@@ -575,12 +577,16 @@ var ScallopUtils = class {
       // USDC
       "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN",
       // USDT
-      "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c::coin::COIN"
+      "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c::coin::COIN",
+      // ETH
+      "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5::coin::COIN"
     ];
     if (coinType === wormHoleCoinTypes[0]) {
       return "usdc";
     } else if (coinType === wormHoleCoinTypes[1]) {
       return "usdt";
+    } else if (coinType === wormHoleCoinTypes[2]) {
+      return "eth";
     } else {
       return coinType.split("::")[2].toLowerCase();
     }
@@ -606,7 +612,7 @@ var ScallopUtils = class {
 // src/queries/market.ts
 var import_sui_kit2 = require("@scallop-io/sui-kit");
 var import_bignumber = __toESM(require("bignumber.js"));
-var queryMarket = async (scallopAddress, suiKit, scallopUtils) => {
+var queryMarket = async (scallopAddress, suiKit, scallopUtils, rateType) => {
   const packageId = scallopAddress.get("core.packages.query.id");
   const marketId = scallopAddress.get("core.market");
   const txBlock = new import_sui_kit2.SuiTxBlock();
@@ -618,7 +624,7 @@ var queryMarket = async (scallopAddress, suiKit, scallopUtils) => {
   const collaterals = [];
   for (const asset of marketData.pools) {
     const coinType = "0x" + asset.type.name;
-    const borrowAPYFactor = 24 * 365 * 3600;
+    const borrowYearFactor = 24 * 365 * 3600;
     const baseBorrowRate = Number(asset.baseBorrowRatePerSec.value) / 2 ** 32;
     const borrowRateOnHighKink = Number(asset.borrowRateOnHighKink.value) / 2 ** 32;
     const borrowRateOnMidKink = Number(asset.borrowRateOnMidKink.value) / 2 ** 32;
@@ -636,11 +642,11 @@ var queryMarket = async (scallopAddress, suiKit, scallopUtils) => {
     const reserve = Number(asset.reserve);
     const reserveFactor = Number(asset.reserveFactor.value) / 2 ** 32;
     const borrowWeight = Number(asset.borrowWeight.value) / 2 ** 32;
-    const caculatedBaseBorrowRate = (0, import_bignumber.default)(baseBorrowRate).multipliedBy(borrowAPYFactor).dividedBy(borrowRateScale).toNumber();
-    const caculatedBorrowRateOnHighKink = (0, import_bignumber.default)(borrowRateOnHighKink).multipliedBy(borrowAPYFactor).dividedBy(borrowRateScale).toNumber();
-    const caculatedBorrowRateOnMidKink = (0, import_bignumber.default)(borrowRateOnMidKink).multipliedBy(borrowAPYFactor).dividedBy(borrowRateScale).toNumber();
-    const caculatedMaxBorrowRate = (0, import_bignumber.default)(maxBorrowRate).multipliedBy(borrowAPYFactor).dividedBy(borrowRateScale).toNumber();
-    const caculatedBorrowRate = (0, import_bignumber.default)(borrowRate).multipliedBy(borrowAPYFactor).dividedBy(borrowRateScale).toNumber();
+    const calculatedBaseBorrowRate = rateType === "apr" ? baseBorrowRate * borrowYearFactor / borrowRateScale : (1 + baseBorrowRate / borrowRateScale) ** borrowYearFactor - 1;
+    const calculatedBorrowRateOnHighKink = rateType === "apr" ? borrowRateOnHighKink * borrowYearFactor / borrowRateScale : (1 + borrowRateOnHighKink / borrowRateScale) ** borrowYearFactor - 1;
+    const calculatedBorrowRateOnMidKink = rateType === "apr" ? borrowRateOnMidKink * borrowYearFactor / borrowRateScale : (1 + borrowRateOnMidKink / borrowRateScale) ** borrowYearFactor - 1;
+    const calculatedMaxBorrowRate = rateType === "apr" ? maxBorrowRate * borrowYearFactor / borrowRateScale : (1 + maxBorrowRate / borrowRateScale) ** borrowYearFactor - 1;
+    const calculatedBorrowRate = rateType === "apr" ? borrowRate * borrowYearFactor / borrowRateScale : (1 + borrowRate / borrowRateScale) ** borrowYearFactor - 1;
     const timeDelta = Math.floor((/* @__PURE__ */ new Date()).getTime() / 1e3) - lastUpdated;
     const borrowIndexDelta = (0, import_bignumber.default)(borrowIndex).multipliedBy((0, import_bignumber.default)(timeDelta).multipliedBy(borrowRate)).dividedBy(borrowRateScale);
     const currentBorrowIndex = (0, import_bignumber.default)(borrowIndex).plus(borrowIndexDelta);
@@ -655,7 +661,7 @@ var queryMarket = async (scallopAddress, suiKit, scallopUtils) => {
     );
     let utilizationRate = (0, import_bignumber.default)(currentTotalDebt).dividedBy(currentTotalSupply);
     utilizationRate = utilizationRate.isFinite() ? utilizationRate : (0, import_bignumber.default)(0);
-    let supplyRate = (0, import_bignumber.default)(caculatedBorrowRate).multipliedBy(utilizationRate).multipliedBy(1 - reserveFactor);
+    let supplyRate = (0, import_bignumber.default)(calculatedBorrowRate).multipliedBy(utilizationRate).multipliedBy(1 - reserveFactor);
     supplyRate = supplyRate.isFinite() ? supplyRate : (0, import_bignumber.default)(0);
     const coin = scallopUtils.getCoinNameFromCoinType(
       coinType
@@ -666,7 +672,7 @@ var queryMarket = async (scallopAddress, suiKit, scallopUtils) => {
       scallopAddress.get("core.packages.protocol.id"),
       coin
     );
-    const wrappedType = coin === "usdc" ? {
+    const wrappedType = coin === "usdc" || coin === "usdt" || coin === "eth" ? {
       from: "Wormhole",
       type: "Portal from Ethereum"
     } : void 0;
@@ -678,10 +684,10 @@ var queryMarket = async (scallopAddress, suiKit, scallopUtils) => {
       marketCoinType,
       calculated: {
         utilizationRate: utilizationRate.toNumber(),
-        baseBorrowRate: caculatedBaseBorrowRate,
+        baseBorrowRate: calculatedBaseBorrowRate,
         borrowInterestRate: Math.min(
-          caculatedBorrowRate,
-          caculatedMaxBorrowRate
+          calculatedBorrowRate,
+          calculatedMaxBorrowRate
         ),
         supplyInterestRate: supplyRate.toNumber(),
         currentGrowthInterest: growthInterest.toNumber(),
@@ -693,11 +699,11 @@ var queryMarket = async (scallopAddress, suiKit, scallopUtils) => {
       origin: {
         highKink,
         midKink,
-        baseBorrowRate: caculatedBaseBorrowRate,
-        borrowRateOnHighKink: caculatedBorrowRateOnHighKink,
-        borrowRateOnMidKink: caculatedBorrowRateOnMidKink,
-        borrowRate: caculatedBorrowRate,
-        maxBorrowRate: caculatedMaxBorrowRate,
+        baseBorrowRate: calculatedBaseBorrowRate,
+        borrowRateOnHighKink: calculatedBorrowRateOnHighKink,
+        borrowRateOnMidKink: calculatedBorrowRateOnMidKink,
+        borrowRate: calculatedBorrowRate,
+        maxBorrowRate: calculatedMaxBorrowRate,
         reserveFactor,
         borrowWeight,
         borrowIndex,
@@ -723,7 +729,7 @@ var queryMarket = async (scallopAddress, suiKit, scallopUtils) => {
       coinType
     );
     const symbol = coin.toUpperCase();
-    const wrappedType = coin === "usdc" ? {
+    const wrappedType = coin === "usdc" || coin === "usdt" || coin === "eth" ? {
       from: "Wormhole",
       type: "Portal from Ethereum"
     } : void 0;
@@ -1356,10 +1362,11 @@ var ScallopClient = class {
   /**
    * Query market data.
    *
+   * @param rateType - How interest rates are calculated.
    * @return Market data
    */
-  async queryMarket() {
-    return queryMarket(this.address, this.suiKit, this._utils);
+  async queryMarket(rateType = "apr") {
+    return queryMarket(this.address, this.suiKit, this._utils, rateType);
   }
   /**
    * Query obligations data.