@suilend/sdk 1.0.8 → 1.1.0

package/core/parsers/lendingMarket.js

@@ -10,7 +10,19 @@ const reserve_1 = require("./reserve");
 const parseLendingMarket = ({ LendingMarket, Reserve, PoolRewardManager, PoolReward, simulate, RateLimiter, }, lendingMarket, reserves, coinMetadataMap, currentTime) => {
     const id = lendingMarket.id;
     const version = lendingMarket.version;
-    const parsedReserves = reserves.map((reserve) => (0, reserve_1.parseReserve)({ Reserve, PoolRewardManager, PoolReward, simulate }, reserve, coinMetadataMap));
+    const parsedReserves = reserves
+        .map((reserve) => (0, reserve_1.parseReserve)({ Reserve, PoolRewardManager, PoolReward, simulate }, reserve, coinMetadataMap))
+        .sort((a, b) => {
+        const customOrder = ["SUI", "wUSDC", "USDC"];
+        const aCustomOrderIndex = customOrder.indexOf(a.symbol);
+        const bCustomOrderIndex = customOrder.indexOf(b.symbol);
+        if (aCustomOrderIndex > -1 && bCustomOrderIndex > -1)
+            return aCustomOrderIndex - bCustomOrderIndex;
+        else if (aCustomOrderIndex === -1 && bCustomOrderIndex === -1)
+            return 0;
+        else
+            return aCustomOrderIndex > -1 ? -1 : 1;
+    });
     const obligations = lendingMarket.obligations;
     const parsedRateLimiter = (0, rateLimiter_1.parseRateLimiter)({ RateLimiter }, lendingMarket.rateLimiter, currentTime);
     const feeReceiver = lendingMarket.feeReceiver;

package/core/parsers/obligation.d.ts

@@ -3,7 +3,7 @@ import { Deps } from "./deps";
 import { ParsedReserve } from "./reserve";
 export type ParsedObligation = ReturnType<typeof parseObligation>;
 export type ParsedPosition = ParsedObligation["deposits"][0] | ParsedObligation["borrows"][0];
-export declare const parseObligation: ({ Obligation }: Pick<Deps, "Obligation">, obligation: any, parsedReserveMap: {
+export declare const parseObligation: ({ Obligation }: Pick<Deps, "Obligation">, obligation: typeof Obligation, parsedReserveMap: {
     [coinType: string]: ParsedReserve;
 }) => {
     id: any;
@@ -15,6 +15,8 @@ export declare const parseObligation: ({ Obligation }: Pick<Deps, "Obligation">,
     borrowLimitUsd: BigNumber;
     minPriceBorrowLimitUsd: BigNumber;
     unhealthyBorrowValueUsd: BigNumber;
+    depositPositionCount: number;
+    borrowPositionCount: number;
     positionCount: number;
     deposits: {
         coinType: string;
@@ -23,6 +25,7 @@ export declare const parseObligation: ({ Obligation }: Pick<Deps, "Obligation">,
         userRewardManager: any;
         depositedAmount: BigNumber;
         depositedAmountUsd: BigNumber;
+        depositedCtokenAmount: BigNumber;
         reserve: {
             config: {
                 $typeName: any;
@@ -39,7 +42,7 @@ export declare const parseObligation: ({ Obligation }: Pick<Deps, "Obligation">,
                 borrowFeeBps: number;
                 spreadFeeBps: number;
                 protocolLiquidationFeeBps: number;
-                isolated: any;
+                isolated: boolean;
                 openAttributedBorrowLimitUsd: number;
                 closeAttributedBorrowLimitUsd: number;
                 interestRate: {
@@ -147,7 +150,7 @@ export declare const parseObligation: ({ Obligation }: Pick<Deps, "Obligation">,
                 borrowFeeBps: number;
                 spreadFeeBps: number;
                 protocolLiquidationFeeBps: number;
-                isolated: any;
+                isolated: boolean;
                 openAttributedBorrowLimitUsd: number;
                 closeAttributedBorrowLimitUsd: number;
                 interestRate: {

package/core/parsers/obligation.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseObligation = void 0;
-const utils_1 = require("@mysten/sui.js/utils");
+const utils_1 = require("@mysten/sui/utils");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("../constants");
 const parseObligation = ({ Obligation }, obligation, parsedReserveMap) => {
@@ -15,13 +15,14 @@ const parseObligation = ({ Obligation }, obligation, parsedReserveMap) => {
     let borrowLimitUsd = new bignumber_js_1.default(0);
     let minPriceBorrowLimitUsd = new bignumber_js_1.default(0);
     let unhealthyBorrowValueUsd = new bignumber_js_1.default(0);
-    let positionCount = 0;
+    let depositPositionCount = 0;
+    let borrowPositionCount = 0;
     const deposits = obligation.deposits.map((deposit) => {
         const coinType = (0, utils_1.normalizeStructTag)(deposit.coinType.name);
         const reserve = parsedReserveMap[coinType];
         if (!reserve)
             throw new Error(`Reserve with coinType ${deposit.coinType.name} not found`);
-        positionCount++;
+        depositPositionCount++;
         const depositedCtokenAmount = new bignumber_js_1.default(deposit.depositedCtokenAmount.toString()).div(10 ** reserve.mintDecimals);
         const depositedAmount = depositedCtokenAmount.times(reserve.cTokenExchangeRate);
         const depositedAmountUsd = depositedAmount.times(reserve.price);
@@ -41,6 +42,7 @@ const parseObligation = ({ Obligation }, obligation, parsedReserveMap) => {
             userRewardManager,
             depositedAmount,
             depositedAmountUsd,
+            depositedCtokenAmount,
             reserve,
             original: obligation,
         };
@@ -50,7 +52,7 @@ const parseObligation = ({ Obligation }, obligation, parsedReserveMap) => {
         const reserve = parsedReserveMap[coinType];
         if (!reserve)
             throw new Error(`Reserve with coinType ${borrow.coinType.name} not found`);
-        positionCount++;
+        borrowPositionCount++;
         const cumulativeBorrowRate = new bignumber_js_1.default(borrow.cumulativeBorrowRate.value.toString()).div(constants_1.WAD);
         const borrowedAmountInitial = new bignumber_js_1.default(borrow.borrowedAmount.value.toString())
             .div(constants_1.WAD)
@@ -90,7 +92,9 @@ const parseObligation = ({ Obligation }, obligation, parsedReserveMap) => {
         borrowLimitUsd,
         minPriceBorrowLimitUsd,
         unhealthyBorrowValueUsd,
-        positionCount,
+        depositPositionCount,
+        borrowPositionCount,
+        positionCount: depositPositionCount + borrowPositionCount,
         deposits,
         borrows,
         weightedConservativeBorrowUtilizationPercent,

package/core/parsers/rateLimiter.d.ts

@@ -2,7 +2,7 @@ import BigNumber from "bignumber.js";
 import { Deps } from "./deps";
 export type ParsedRateLimiter = ReturnType<typeof parseRateLimiter>;
 export type ParsedRateLimiterConfig = ReturnType<typeof parseRateLimiterConfig>;
-export declare const parseRateLimiter: ({ RateLimiter }: Pick<Deps, "RateLimiter">, rateLimiter: any, currentTime: number) => {
+export declare const parseRateLimiter: ({ RateLimiter }: Pick<Deps, "RateLimiter">, rateLimiter: typeof RateLimiter, currentTime: number) => {
     config: {
         windowDuration: any;
         maxOutflow: any;
@@ -13,7 +13,7 @@ export declare const parseRateLimiter: ({ RateLimiter }: Pick<Deps, "RateLimiter
     curQty: any;
     remainingOutflow: BigNumber;
 };
-export declare const parseRateLimiterConfig: ({ RateLimiter }: Pick<Deps, "RateLimiter">, rateLimiter: any) => {
+export declare const parseRateLimiterConfig: ({ RateLimiter }: Pick<Deps, "RateLimiter">, rateLimiter: typeof RateLimiter) => {
     windowDuration: any;
     maxOutflow: any;
 };

package/core/parsers/reserve.d.ts

@@ -1,11 +1,11 @@
-import { CoinMetadata } from "@mysten/sui.js/client";
+import { CoinMetadata } from "@mysten/sui/client";
 import BigNumber from "bignumber.js";
 import { Deps } from "./deps";
 export type ParsedReserve = ReturnType<typeof parseReserve>;
 export type ParsedReserveConfig = ReturnType<typeof parseReserveConfig>;
 export type ParsedPoolRewardManager = ReturnType<typeof parsePoolRewardManager>;
 export type ParsedPoolReward = NonNullable<ReturnType<typeof parsePoolReward>>;
-export declare const parseReserve: ({ Reserve, PoolRewardManager, PoolReward, simulate, }: Pick<Deps, "Reserve" | "PoolRewardManager" | "PoolReward" | "simulate">, reserve: any, coinMetadataMap: Record<string, CoinMetadata>) => {
+export declare const parseReserve: ({ Reserve, PoolRewardManager, PoolReward, simulate, }: Pick<Deps, "Reserve" | "PoolRewardManager" | "PoolReward" | "simulate">, reserve: typeof Reserve, coinMetadataMap: Record<string, CoinMetadata>) => {
     config: {
         $typeName: any;
         openLtvPct: any;
@@ -21,7 +21,7 @@ export declare const parseReserve: ({ Reserve, PoolRewardManager, PoolReward, si
         borrowFeeBps: number;
         spreadFeeBps: number;
         protocolLiquidationFeeBps: number;
-        isolated: any;
+        isolated: boolean;
         openAttributedBorrowLimitUsd: number;
         closeAttributedBorrowLimitUsd: number;
         interestRate: {
@@ -107,7 +107,7 @@ export declare const parseReserve: ({ Reserve, PoolRewardManager, PoolReward, si
      */
     totalDeposits: BigNumber;
 };
-export declare const parseReserveConfig: ({ Reserve }: Pick<Deps, "Reserve">, reserve: any) => {
+export declare const parseReserveConfig: ({ Reserve }: Pick<Deps, "Reserve">, reserve: typeof Reserve) => {
     $typeName: any;
     openLtvPct: any;
     closeLtvPct: any;
@@ -122,7 +122,7 @@ export declare const parseReserveConfig: ({ Reserve }: Pick<Deps, "Reserve">, re
     borrowFeeBps: number;
     spreadFeeBps: number;
     protocolLiquidationFeeBps: number;
-    isolated: any;
+    isolated: boolean;
     openAttributedBorrowLimitUsd: number;
     closeAttributedBorrowLimitUsd: number;
     interestRate: {
@@ -131,7 +131,7 @@ export declare const parseReserveConfig: ({ Reserve }: Pick<Deps, "Reserve">, re
         aprPercent: BigNumber;
     }[];
 };
-export declare const parsePoolRewardManager: ({ PoolRewardManager, PoolReward, }: Pick<Deps, "PoolRewardManager" | "PoolReward">, poolRewardManager: any, coinMetadataMap: Record<string, CoinMetadata>) => {
+export declare const parsePoolRewardManager: ({ PoolRewardManager, PoolReward, }: Pick<Deps, "PoolRewardManager" | "PoolReward">, poolRewardManager: typeof PoolRewardManager, coinMetadataMap: Record<string, CoinMetadata>) => {
     $typeName: any;
     id: any;
     totalShares: any;
@@ -152,7 +152,7 @@ export declare const parsePoolRewardManager: ({ PoolRewardManager, PoolReward, }
     }[];
     lastUpdateTimeMs: any;
 };
-export declare const parsePoolReward: ({ PoolReward }: Pick<Deps, "PoolReward">, poolReward: any, rewardIndex: number, coinMetadataMap: Record<string, CoinMetadata>) => {
+export declare const parsePoolReward: ({ PoolReward }: Pick<Deps, "PoolReward">, poolReward: typeof PoolReward | null, rewardIndex: number, coinMetadataMap: Record<string, CoinMetadata>) => {
     $typeName: any;
     id: any;
     poolRewardManagerId: any;

package/core/parsers/reserve.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parsePoolReward = exports.parsePoolRewardManager = exports.parseReserveConfig = exports.parseReserve = void 0;
-const utils_1 = require("@mysten/sui.js/utils");
+const utils_1 = require("@mysten/sui/utils");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const uuid_1 = require("uuid");
 const constants_1 = require("../constants");

package/core/types.d.ts

@@ -1,7 +1,6 @@
 import { BcsType, InferBcsType } from "@mysten/bcs";
-import { ObjectArg as SuiObjectArg } from "@mysten/sui.js/bcs";
-import { SuiClient } from "@mysten/sui.js/client";
-import { TransactionArgument } from "@mysten/sui.js/transactions";
+import { SuiClient } from "@mysten/sui/client";
+import { TransactionArgument, TransactionObjectInput } from "@mysten/sui/transactions";
 export declare const ID: BcsType<{
     bytes: string;
 }, {
@@ -524,22 +523,17 @@ export declare enum Side {
     DEPOSIT = "deposit",
     BORROW = "borrow"
 }
-export type ObjectId = string;
-export type ObjectCallArg = {
-    Object: SuiObjectArg;
-};
-export type ObjectArg = string | ObjectCallArg | TransactionArgument;
 export interface PhantomReified<P> {
     phantomType: P;
     kind: "PhantomReified";
 }
 export interface AddReserveArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
-    priceInfo: ObjectArg;
-    config: ObjectArg;
-    coinMetadata: ObjectArg;
-    clock: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
+    priceInfo: TransactionObjectInput;
+    config: TransactionObjectInput;
+    coinMetadata: TransactionObjectInput;
+    clock: TransactionObjectInput;
 }
 export interface CreateReserveConfigArgs {
     openLtvPct: number | TransactionArgument;
@@ -562,49 +556,49 @@ export interface CreateReserveConfigArgs {
     closeAttributedBorrowLimitUsd: bigint | TransactionArgument;
 }
 export interface UpdateReserveConfigArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    config: ObjectArg;
+    config: TransactionObjectInput;
 }
 export interface AddPoolRewardArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
     isDepositReward: boolean | TransactionArgument;
-    rewards: ObjectArg;
+    rewards: TransactionObjectInput;
     startTimeMs: bigint | TransactionArgument;
     endTimeMs: bigint | TransactionArgument;
-    clock: ObjectArg;
+    clock: TransactionObjectInput;
 }
 export interface CancelPoolRewardArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
     isDepositReward: boolean | TransactionArgument;
     rewardIndex: bigint | TransactionArgument;
-    clock: ObjectArg;
+    clock: TransactionObjectInput;
 }
 export interface ClosePoolRewardArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
     isDepositReward: boolean | TransactionArgument;
     rewardIndex: bigint | TransactionArgument;
-    clock: ObjectArg;
+    clock: TransactionObjectInput;
 }
 export interface ClaimRewardsArgs {
-    lendingMarket: ObjectArg;
-    cap: ObjectArg;
-    clock: ObjectArg;
+    lendingMarket: TransactionObjectInput;
+    cap: TransactionObjectInput;
+    clock: TransactionObjectInput;
     reserveId: bigint | TransactionArgument;
     rewardIndex: bigint | TransactionArgument;
     isDepositReward: boolean | TransactionArgument;
 }
 export interface ClaimRewardsAndDepositArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     obligationId: string | TransactionArgument;
-    clock: ObjectArg;
+    clock: TransactionObjectInput;
     rewardReserveId: bigint | TransactionArgument;
     rewardIndex: bigint | TransactionArgument;
     isDepositReward: boolean | TransactionArgument;
@@ -615,62 +609,73 @@ export interface CreateRateLimiterConfigArgs {
     maxOutflow: bigint | TransactionArgument;
 }
 export interface UpdateRateLimiterConfigArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
-    clock: ObjectArg;
-    config: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
+    clock: TransactionObjectInput;
+    config: TransactionObjectInput;
 }
 export interface RefreshReservePriceArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    clock: ObjectArg;
-    priceInfo: ObjectArg;
+    clock: TransactionObjectInput;
+    priceInfo: TransactionObjectInput;
 }
 export interface DepositLiquidityAndMintCtokensArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    clock: ObjectArg;
-    deposit: ObjectArg;
+    clock: TransactionObjectInput;
+    deposit: TransactionObjectInput;
 }
 export interface DepositCtokensIntoObligationArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    obligationOwnerCap: ObjectArg;
-    clock: ObjectArg;
-    deposit: ObjectArg;
+    obligationOwnerCap: TransactionObjectInput;
+    clock: TransactionObjectInput;
+    deposit: TransactionObjectInput;
 }
 export interface WithdrawCtokensArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    obligationOwnerCap: ObjectArg;
-    clock: ObjectArg;
+    obligationOwnerCap: TransactionObjectInput;
+    clock: TransactionObjectInput;
     amount: bigint | TransactionArgument;
 }
 export interface BorrowArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    obligationOwnerCap: ObjectArg;
-    clock: ObjectArg;
+    obligationOwnerCap: TransactionObjectInput;
+    clock: TransactionObjectInput;
     amount: bigint | TransactionArgument;
 }
 export interface RepayArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
     obligationId: string | TransactionArgument;
-    clock: ObjectArg;
-    maxRepayCoins: ObjectArg;
+    clock: TransactionObjectInput;
+    maxRepayCoins: TransactionObjectInput;
 }
 export interface LiquidateArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     obligationId: string | TransactionArgument;
     repayReserveArrayIndex: bigint | TransactionArgument;
     withdrawReserveArrayIndex: bigint | TransactionArgument;
-    clock: ObjectArg;
-    repayCoins: ObjectArg;
+    clock: TransactionObjectInput;
+    repayCoins: TransactionObjectInput;
 }
 export interface MigrateArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
+}
+export interface ClaimFeesArgs {
+    lendingMarket: TransactionObjectInput;
+    reserveArrayIndex: bigint | TransactionArgument;
+}
+export interface RedeemCtokensAndWithdrawLiquidityArgs {
+    lendingMarket: TransactionObjectInput;
+    reserveArrayIndex: bigint | TransactionArgument;
+    clock: TransactionObjectInput;
+    ctokens: TransactionObjectInput;
+    rateLimiterExemption: TransactionObjectInput | TransactionArgument | null;
 }
 export type ApiInterestUpdateEvent = {
     id: number;

package/core/types.js

@@ -9,12 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Side = exports.load = exports.LendingMarket = exports.ObjectBag = exports.Reserve = exports.PriceIdentifier = exports.ReserveConfig = exports.InterestRateModel = exports.Obligation = exports.Bag = exports.Deposit = exports.Borrow = exports.Decimal = exports.ObligationOwnerCap = exports.UID = exports.ID = void 0;
+exports.Side = exports.LendingMarket = exports.ObjectBag = exports.Reserve = exports.PriceIdentifier = exports.ReserveConfig = exports.InterestRateModel = exports.Obligation = exports.Bag = exports.Deposit = exports.Borrow = exports.Decimal = exports.ObligationOwnerCap = exports.UID = exports.ID = void 0;
+exports.load = load;
 const bcs_1 = require("@mysten/bcs");
+const utils_1 = require("@mysten/sui/utils");
 exports.ID = bcs_1.bcs.struct("ID", {
     bytes: bcs_1.bcs.bytes(32).transform({
-        input: (val) => (0, bcs_1.fromHEX)(val),
-        output: (val) => (0, bcs_1.toHEX)(val),
+        input: (val) => (0, utils_1.fromHex)(val),
+        output: (val) => (0, utils_1.toHex)(val),
     }),
 });
 exports.UID = bcs_1.bcs.struct("UID", {
@@ -45,8 +47,8 @@ exports.Bag = bcs_1.bcs.struct("Bag", {
 exports.Obligation = bcs_1.bcs.struct("Obligation", {
     id: exports.UID,
     owner: bcs_1.bcs.bytes(32).transform({
-        input: (val) => (0, bcs_1.fromHEX)(val),
-        output: (val) => (0, bcs_1.toHEX)(val),
+        input: (val) => (0, utils_1.fromHex)(val),
+        output: (val) => (0, utils_1.toHex)(val),
     }),
     deposits: bcs_1.bcs.vector(exports.Deposit),
     borrows: bcs_1.bcs.vector(exports.Borrow),
@@ -112,10 +114,10 @@ function load(client, type, id) {
         if (((_b = (_a = data.data) === null || _a === void 0 ? void 0 : _a.bcs) === null || _b === void 0 ? void 0 : _b.dataType) !== "moveObject") {
             throw new Error("Error: invalid data type");
         }
-        return type.parse((0, bcs_1.fromB64)(data.data.bcs.bcsBytes));
+        return type.parse((0, utils_1.fromBase64)(data.data.bcs.bcsBytes));
     });
 }
-exports.load = load;
+//
 var Side;
 (function (Side) {
     Side["DEPOSIT"] = "deposit";

package/core/utils/events.d.ts

@@ -1,4 +1,4 @@
-import { SuiClient, SuiEvent } from "@mysten/sui.js/client";
+import { SuiClient, SuiEvent } from "@mysten/sui/client";
 type TypeName = {
     name: string;
 };
@@ -30,7 +30,7 @@ declare class TypedParamsSuiEvent<T> {
     params(): T;
     isType(module: SuilendTransactionModule, eventType: SuilendEventType): boolean;
 }
-export declare class GenericSuilendEvent extends TypedParamsSuiEvent<{}> {
+export declare class GenericSuilendEvent extends TypedParamsSuiEvent<object> {
 }
 export declare class InterestUpdateEvent extends TypedParamsSuiEvent<{
     lending_market_id: address;

package/core/utils/events.js

@@ -9,7 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRedeemEvent = exports.getEvents = exports.ObligationDataEvent = exports.ClaimRewardEvent = exports.LiquidateEvent = exports.RepayEvent = exports.BorrowEvent = exports.WithdrawEvent = exports.DepositEvent = exports.RedeemEvent = exports.MintEvent = exports.ReserveAssetDataEvent = exports.InterestUpdateEvent = exports.GenericSuilendEvent = exports.SuilendTransactionModule = exports.SuilendEventType = void 0;
+exports.ObligationDataEvent = exports.ClaimRewardEvent = exports.LiquidateEvent = exports.RepayEvent = exports.BorrowEvent = exports.WithdrawEvent = exports.DepositEvent = exports.RedeemEvent = exports.MintEvent = exports.ReserveAssetDataEvent = exports.InterestUpdateEvent = exports.GenericSuilendEvent = exports.SuilendTransactionModule = exports.SuilendEventType = void 0;
+exports.getEvents = getEvents;
+exports.getRedeemEvent = getRedeemEvent;
 var SuilendEventType;
 (function (SuilendEventType) {
     SuilendEventType["InterestUpdateEvent"] = "InterestUpdateEvent";
@@ -89,7 +91,6 @@ function getEvents(client, digest) {
         return events;
     });
 }
-exports.getEvents = getEvents;
 function getRedeemEvent(client, digest) {
     return __awaiter(this, void 0, void 0, function* () {
         const events = yield getEvents(client, digest);
@@ -101,4 +102,3 @@ function getRedeemEvent(client, digest) {
         return null;
     });
 }
-exports.getRedeemEvent = getRedeemEvent;

package/core/utils/simulate.d.ts

@@ -1,5 +1,5 @@
+import { SuiPriceServiceConnection } from "@pythnetwork/pyth-sui-js";
 import BigNumber from "bignumber.js";
-import { SuiPriceServiceConnection } from "../../pyth-sdk";
 interface Deps {
     Decimal: any;
     Obligation: any;

package/core/utils/simulate.js

@@ -13,10 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Simulate = void 0;
-const bcs_1 = require("@mysten/sui.js/bcs");
-const utils_1 = require("@mysten/sui.js/utils");
+const bcs_1 = require("@mysten/sui/bcs");
+const utils_1 = require("@mysten/sui/utils");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const uuid_1 = require("uuid");
 const constants_1 = require("../constants");
+const utils_2 = require("../utils");
 class Simulate {
     constructor({ Decimal, Obligation, Deposit, Borrow, Reserve, ReserveConfig, PoolRewardManager, PoolReward, UserRewardManager, UserReward, }) {
         this.Decimal = Decimal;
@@ -35,7 +37,7 @@ class Simulate {
      */
     calculateUtilizationRate(reserve) {
         const { mintDecimals } = reserve;
-        // Parsing logic from core/parsers/reserve.ts
+        // From core/parsers/reserve.ts > parseReserve
         const availableAmount = new bignumber_js_1.default(reserve.availableAmount.toString()).div(10 ** mintDecimals);
         const borrowedAmount = new bignumber_js_1.default(reserve.borrowedAmount.value.toString())
             .div(constants_1.WAD)
@@ -59,22 +61,13 @@ class Simulate {
     calculateBorrowApr(reserve) {
         const config = reserve.config.element;
         const utilizationPercent = this.calculateUtilizationPercent(reserve);
-        let i = 1;
-        while (i < config.interestRateUtils.length) {
-            // Parsing logic from core/parsers/reserve.ts
-            const leftUtilPercent = new bignumber_js_1.default(config.interestRateUtils[i - 1]);
-            const rightUtilPercent = new bignumber_js_1.default(config.interestRateUtils[i]);
-            if (utilizationPercent.gte(leftUtilPercent) &&
-                utilizationPercent.lte(rightUtilPercent)) {
-                const leftAprPercent = new bignumber_js_1.default(config.interestRateAprs[i - 1].toString()).div(100);
-                const rightAprPercent = new bignumber_js_1.default(config.interestRateAprs[i].toString()).div(100);
-                const weight = new bignumber_js_1.default(utilizationPercent.minus(leftUtilPercent)).div(rightUtilPercent.minus(leftUtilPercent));
-                return leftAprPercent.plus(weight.times(rightAprPercent.minus(leftAprPercent)));
-            }
-            i = i + 1;
-        }
-        // Should never reach here
-        return new bignumber_js_1.default(0);
+        // From core/parsers/reserve.ts > parseReserveConfig
+        const interestRate = config.interestRateUtils.map((util, index) => ({
+            id: (0, uuid_1.v4)(),
+            utilPercent: new bignumber_js_1.default(util.toString()),
+            aprPercent: new bignumber_js_1.default(config.interestRateAprs[index].toString()).div(100),
+        }));
+        return (0, utils_2.linearlyInterpolate)(interestRate, "utilPercent", "aprPercent", utilizationPercent);
     }
     calculateBorrowAprPercent(reserve) {
         return this.calculateBorrowApr(reserve);
@@ -86,9 +79,11 @@ class Simulate {
         const config = reserve.config.element;
         const utilizationPercent = this.calculateUtilizationPercent(reserve);
         const borrowAprPercent = this.calculateBorrowAprPercent(reserve);
+        // From core/parsers/reserve.ts > parseReserveConfig
+        const spreadFeeBps = Number(config.spreadFeeBps.toString());
         return new bignumber_js_1.default(utilizationPercent.div(100))
             .times(borrowAprPercent.div(100))
-            .times(1 - +config.spreadFeeBps.toString() / 10000)
+            .times(1 - spreadFeeBps / 10000)
             .times(100);
     }
     calculateDepositAprPercent(reserve) {
@@ -157,7 +152,7 @@ class Simulate {
     }
     refreshReservePrice(reserves, pythConnection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const priceIdentifiers = reserves.map((r) => (0, utils_1.toHEX)(new Uint8Array(r.priceIdentifier.bytes)));
+            const priceIdentifiers = reserves.map((r) => (0, utils_1.toHex)(new Uint8Array(r.priceIdentifier.bytes)));
             const priceData = yield pythConnection.getLatestPriceFeeds(priceIdentifiers);
             if (!priceData)
                 return reserves;

package/core/utils.d.ts

@@ -1 +1,7 @@
+import BigNumber from "bignumber.js";
+import { ParsedReserve } from "./parsers/reserve";
 export declare const toHexString: (bytes: number[]) => string;
+export declare const reserveSort: (reserves: ParsedReserve[], aCoinType: string, bCoinType: string) => number;
+export declare const linearlyInterpolate: (array: any[], xKey: string, yKey: string, _xValue: number | BigNumber) => BigNumber;
+export declare const isCTokenCoinType: (coinType: string) => boolean;
+export declare const extractCTokenCoinType: (coinType: string) => string;

package/core/utils.js

@@ -1,7 +1,41 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toHexString = void 0;
+exports.extractCTokenCoinType = exports.isCTokenCoinType = exports.linearlyInterpolate = exports.reserveSort = exports.toHexString = void 0;
+const utils_1 = require("@mysten/sui/utils");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const toHexString = (bytes) => Array.from(bytes, function (byte) {
     return ("0" + (byte & 0xff).toString(16)).slice(-2);
 }).join("");
 exports.toHexString = toHexString;
+const reserveSort = (reserves, aCoinType, bCoinType) => reserves.findIndex((r) => r.coinType === aCoinType) -
+    reserves.findIndex((r) => r.coinType === bCoinType);
+exports.reserveSort = reserveSort;
+const linearlyInterpolate = (array, xKey, yKey, _xValue) => {
+    let i = 1;
+    while (i < array.length) {
+        const leftXValue = new bignumber_js_1.default(array[i - 1][xKey]);
+        const leftYValue = new bignumber_js_1.default(array[i - 1][yKey]);
+        const xValue = new bignumber_js_1.default(_xValue);
+        const rightXValue = new bignumber_js_1.default(array[i][xKey]);
+        const rightYValue = new bignumber_js_1.default(array[i][yKey]);
+        if (xValue.gte(leftXValue) && xValue.lte(rightXValue)) {
+            const weight = new bignumber_js_1.default(xValue.minus(leftXValue)).div(rightXValue.minus(leftXValue));
+            return leftYValue.plus(weight.times(rightYValue.minus(leftYValue)));
+        }
+        i = i + 1;
+    }
+    // Should never reach here
+    return new bignumber_js_1.default(0);
+};
+exports.linearlyInterpolate = linearlyInterpolate;
+const isCTokenCoinType = (coinType) => coinType.includes("::reserve::CToken<") && coinType.endsWith(">");
+exports.isCTokenCoinType = isCTokenCoinType;
+const extractCTokenCoinType = (coinType) => {
+    if (!(0, exports.isCTokenCoinType)(coinType))
+        throw new Error("Not a CToken ");
+    return (0, utils_1.normalizeStructTag)(coinType.split("::reserve::CToken")[1].split(",")[1].slice(0, -1));
+};
+exports.extractCTokenCoinType = extractCTokenCoinType;