@scallop-io/sui-scallop-sdk 0.46.61 → 0.46.63

package/dist/models/scallopUtils.d.ts

@@ -191,7 +191,7 @@ export declare class ScallopUtils {
      */
     parseAprToApy(apr: number, compoundFrequency?: number): number;
     /**
-     * Convert apr to apy.
+     * Convert apy to apr.
      *
      * @param apr The equivalent annual percentage yield (APY).
      * @param compoundFrequency How often interest is compounded per year. Default is daily (365 times a year).

package/dist/types/query/core.d.ts

@@ -122,7 +122,7 @@ export type MarketPool = {
     coinWrappedType: CoinWrappedType;
     coinDecimal: number;
     coinPrice: number;
-    supplyLimit: string;
+    maxSupplyCoin: number;
 } & Required<Pick<ParsedMarketPoolData, 'highKink' | 'midKink' | 'reserveFactor' | 'borrowWeight' | 'borrowFee' | 'marketCoinSupplyAmount' | 'minBorrowAmount'>> & CalculatedMarketPoolData;
 export type MarketCollateral = {
     coinName: SupportCollateralCoins;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "0.46.61",
+  "version": "0.46.63",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/models/scallopClient.ts

@@ -817,7 +817,7 @@ export class ScallopClient {
       await this.utils.mergeSimilarCoins(
         txBlock,
         coin,
-        this.utils.parseCoinType(this.utils.parseCoinName(stakeCoinName)),
+        this.utils.parseCoinType(stakeCoinName),
         requireSender(txBlock)
       );
 

package/src/models/scallopUtils.ts

@@ -582,7 +582,7 @@ export class ScallopUtils {
   }
 
   /**
-   * Convert apr to apy.
+   * Convert apy to apr.
    *
    * @param apr The equivalent annual percentage yield (APY).
    * @param compoundFrequency How often interest is compounded per year. Default is daily (365 times a year).

package/src/queries/coreQuery.ts

@@ -125,8 +125,13 @@ export const queryMarket = async (
       parsedMarketPoolData
     );
 
-    const supplyLimit =
-      (await getSupplyLimit(query.utils, poolCoinName)) ?? '0';
+    const coinDecimal = query.utils.getCoinDecimal(poolCoinName);
+    const maxSupplyCoin = BigNumber(
+      (await getSupplyLimit(query.utils, poolCoinName)) ?? '0'
+    )
+      .shiftedBy(-coinDecimal)
+      .toNumber();
+
     pools[poolCoinName] = {
       coinName: poolCoinName,
       symbol: query.utils.parseSymbol(poolCoinName),
@@ -136,7 +141,7 @@ export const queryMarket = async (
         query.utils.parseMarketCoinName(poolCoinName)
       ),
       coinWrappedType: query.utils.getCoinWrappedType(poolCoinName),
-      coinDecimal: query.utils.getCoinDecimal(poolCoinName),
+      coinDecimal,
       coinPrice: coinPrice,
       highKink: parsedMarketPoolData.highKink,
       midKink: parsedMarketPoolData.midKink,
@@ -145,7 +150,7 @@ export const queryMarket = async (
       borrowFee: parsedMarketPoolData.borrowFee,
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
       minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
-      supplyLimit,
+      maxSupplyCoin,
       ...calculatedMarketPoolData,
     };
   }
@@ -455,8 +460,12 @@ export const getMarketPool = async (
       parsedMarketPoolData
     );
 
-    const supplyLimit =
-      (await getSupplyLimit(query.utils, poolCoinName)) ?? '0';
+    const coinDecimal = query.utils.getCoinDecimal(poolCoinName);
+    const maxSupplyCoin = BigNumber(
+      (await getSupplyLimit(query.utils, poolCoinName)) ?? '0'
+    )
+      .shiftedBy(-coinDecimal)
+      .toNumber();
 
     marketPool = {
       coinName: poolCoinName,
@@ -467,7 +476,7 @@ export const getMarketPool = async (
         query.utils.parseMarketCoinName(poolCoinName)
       ),
       coinWrappedType: query.utils.getCoinWrappedType(poolCoinName),
-      coinDecimal: query.utils.getCoinDecimal(poolCoinName),
+      coinDecimal,
       coinPrice: coinPrice ?? 0,
       highKink: parsedMarketPoolData.highKink,
       midKink: parsedMarketPoolData.midKink,
@@ -476,7 +485,7 @@ export const getMarketPool = async (
       borrowFee: parsedMarketPoolData.borrowFee,
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
       minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
-      supplyLimit,
+      maxSupplyCoin,
       ...calculatedMarketPoolData,
     };
   }

package/src/types/query/core.ts

@@ -129,7 +129,7 @@ export type MarketPool = {
   coinWrappedType: CoinWrappedType;
   coinDecimal: number;
   coinPrice: number;
-  supplyLimit: string;
+  maxSupplyCoin: number;
 } & Required<
   Pick<
     ParsedMarketPoolData,