@scallop-io/sui-scallop-sdk 0.37.7 → 0.37.9

package/dist/constants/common.d.ts

@@ -1,7 +1,7 @@
 export declare const API_BASE_URL = "https://sui.api.scallop.io";
 export declare const ADDRESSES_ID = "6462a088a7ace142bb6d7e9b";
-export declare const SUPPORT_ASSET_COINS: readonly ["eth", "btc", "usdc", "usdt", "sui"];
-export declare const SUPPORT_COLLATERAL_COINS: readonly ["eth", "btc", "usdc", "usdt", "sui"];
+export declare const SUPPORT_ASSET_COINS: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus"];
+export declare const SUPPORT_COLLATERAL_COINS: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus"];
 export declare const SUPPORT_ORACLES: readonly ["supra", "switchboard", "pyth"];
 export declare const SUPPORT_PACKAGES: readonly ["coinDecimalsRegistry", "math", "whitelist", "x", "protocol", "query", "supra", "pyth", "switchboard", "xOracle", "testCoin"];
 export declare const SUI_COIN_TYPE_ARG_REGEX: RegExp;

package/dist/index.js

@@ -52,14 +52,20 @@ var SUPPORT_ASSET_COINS = [
   "btc",
   "usdc",
   "usdt",
-  "sui"
+  "sui",
+  "apt",
+  "sol",
+  "cetus"
 ];
 var SUPPORT_COLLATERAL_COINS = [
   "eth",
   "btc",
   "usdc",
   "usdt",
-  "sui"
+  "sui",
+  "apt",
+  "sol",
+  "cetus"
 ];
 var SUPPORT_ORACLES = ["supra", "switchboard", "pyth"];
 var SUPPORT_PACKAGES = [
@@ -558,7 +564,13 @@ var ScallopUtils = class {
       // USDT
       "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c",
       // ETH
-      "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5"
+      "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5",
+      // BTC
+      "0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881",
+      // SOL
+      "0xb7844e289a8410e50fb3ca48d69eb9cf29e27d223ef90353fe1bd8e27ff8f3f8",
+      // APT
+      "0x3a5143bb1196e3bcdfab6203d1683ae29edd26294fc8bfeafe4aaa9d2704df37"
     ];
     if (wormHoleCoins.includes(coinPackageId)) {
       return `${coinPackageId}::coin::COIN`;
@@ -579,7 +591,13 @@ var ScallopUtils = class {
       // USDT
       "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c::coin::COIN",
       // ETH
-      "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5::coin::COIN"
+      "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5::coin::COIN",
+      // BTC
+      "0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881::coin::COIN",
+      // SOL
+      "0xb7844e289a8410e50fb3ca48d69eb9cf29e27d223ef90353fe1bd8e27ff8f3f8::coin::COIN",
+      // APT
+      "0x3a5143bb1196e3bcdfab6203d1683ae29edd26294fc8bfeafe4aaa9d2704df37::coin::COIN"
     ];
     if (coinType === wormHoleCoinTypes[0]) {
       return "usdc";
@@ -587,6 +605,12 @@ var ScallopUtils = class {
       return "usdt";
     } else if (coinType === wormHoleCoinTypes[2]) {
       return "eth";
+    } else if (coinType === wormHoleCoinTypes[3]) {
+      return "btc";
+    } else if (coinType === wormHoleCoinTypes[4]) {
+      return "sol";
+    } else if (coinType === wormHoleCoinTypes[5]) {
+      return "apt";
     } else {
       return coinType.split("::")[2].toLowerCase();
     }
@@ -612,7 +636,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();
@@ -624,7 +648,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;
@@ -642,11 +666,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);
@@ -661,7 +685,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
@@ -672,7 +696,7 @@ var queryMarket = async (scallopAddress, suiKit, scallopUtils) => {
       scallopAddress.get("core.packages.protocol.id"),
       coin
     );
-    const wrappedType = coin === "usdc" || coin === "usdt" || coin === "eth" ? {
+    const wrappedType = coin === "usdc" || coin === "usdt" || coin === "eth" || coin === "btc" || coin === "apt" || coin === "sol" ? {
       from: "Wormhole",
       type: "Portal from Ethereum"
     } : void 0;
@@ -684,10 +708,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(),
@@ -699,11 +723,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,
@@ -729,7 +753,7 @@ var queryMarket = async (scallopAddress, suiKit, scallopUtils) => {
       coinType
     );
     const symbol = coin.toUpperCase();
-    const wrappedType = coin === "usdc" || coin === "usdt" || coin === "eth" ? {
+    const wrappedType = coin === "usdc" || coin === "usdt" || coin === "eth" || coin === "btc" || coin === "apt" || coin === "sol" ? {
       from: "Wormhole",
       type: "Portal from Ethereum"
     } : void 0;
@@ -1362,10 +1386,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.