@suilend/sdk 1.1.37 → 1.1.39

package/_generated/suilend/index.d.ts

@@ -3,4 +3,5 @@ export declare let PUBLISHED_AT: string;
 export declare const PKG_V1: string;
 export declare const PKG_V8: string;
 export declare const PKG_V10: string;
+export declare const PKG_V11: string;
 export declare function setPublishedAt(publishedAt: string): void;

package/_generated/suilend/index.js

@@ -1,22 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PKG_V10 = exports.PKG_V8 = exports.PKG_V1 = exports.PUBLISHED_AT = exports.PACKAGE_ID = void 0;
+exports.PKG_V11 = exports.PKG_V10 = exports.PKG_V8 = exports.PKG_V1 = exports.PUBLISHED_AT = exports.PACKAGE_ID = void 0;
 exports.setPublishedAt = setPublishedAt;
-exports.PACKAGE_ID = process.env.NEXT_PUBLIC_USE_BETA_MARKET
+exports.PACKAGE_ID = process.env.NEXT_PUBLIC_SUILEND_USE_BETA_MARKET
     ? "0x1f54a9a2d71799553197e9ea24557797c6398d6a65f2d4d3818c9304b75d5e21"
     : "0xf95b06141ed4a174f239417323bde3f209b972f5930d8521ea38a52aff3a6ddf";
-exports.PUBLISHED_AT = process.env.NEXT_PUBLIC_USE_BETA_MARKET
-    ? "0xe5ed361add4433f4d23e56fc0e3bacab39b93592d5e65d508e33fd19ff696669"
+exports.PUBLISHED_AT = process.env.NEXT_PUBLIC_SUILEND_USE_BETA_MARKET
+    ? "0x5bb8cb3894945f523736f4f5059b1621056e8093b165ea56b20805d0ef2461a9"
     : "0xe37cc7bb50fd9b6dbd3873df66fa2c554e973697f50ef97707311dc78bd08444";
-exports.PKG_V1 = process.env.NEXT_PUBLIC_USE_BETA_MARKET
+exports.PKG_V1 = process.env.NEXT_PUBLIC_SUILEND_USE_BETA_MARKET
     ? "0x1f54a9a2d71799553197e9ea24557797c6398d6a65f2d4d3818c9304b75d5e21"
     : "0xf95b06141ed4a174f239417323bde3f209b972f5930d8521ea38a52aff3a6ddf";
-exports.PKG_V8 = process.env.NEXT_PUBLIC_USE_BETA_MARKET
+exports.PKG_V8 = process.env.NEXT_PUBLIC_SUILEND_USE_BETA_MARKET
     ? "0xe5ed361add4433f4d23e56fc0e3bacab39b93592d5e65d508e33fd19ff696669"
     : "0x5b54b47971238403d6ade3c8c2cc75814cb55145a5184af916bb5b12aaf184cb";
-exports.PKG_V10 = process.env.NEXT_PUBLIC_USE_BETA_MARKET
+exports.PKG_V10 = process.env.NEXT_PUBLIC_SUILEND_USE_BETA_MARKET
     ? "0xe5ed361add4433f4d23e56fc0e3bacab39b93592d5e65d508e33fd19ff696669"
     : "0xe37cc7bb50fd9b6dbd3873df66fa2c554e973697f50ef97707311dc78bd08444";
+exports.PKG_V11 = process.env.NEXT_PUBLIC_SUILEND_USE_BETA_MARKET
+    ? "0xe5ed361add4433f4d23e56fc0e3bacab39b93592d5e65d508e33fd19ff696669"
+    : "0xd2a67633ccb8de063163e25bcfca242929caf5cf1a26c2929dab519ee0b8f331";
 function setPublishedAt(publishedAt) {
     exports.PUBLISHED_AT = publishedAt;
 }

package/_generated/suilend/lending-market/functions.d.ts

@@ -16,6 +16,7 @@ export declare function init(tx: Transaction, otw: TransactionObjectInput): impo
 export interface ClaimFeesArgs {
     lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
+    systemState: TransactionObjectInput;
 }
 export declare function claimFees(tx: Transaction, typeArgs: [string, string], args: ClaimFeesArgs): import("@mysten/sui/transactions").TransactionResult;
 export interface AddPoolRewardArgs {
@@ -57,6 +58,12 @@ export interface ClosePoolRewardArgs {
 }
 export declare function closePoolReward(tx: Transaction, typeArgs: [string, string], args: ClosePoolRewardArgs): import("@mysten/sui/transactions").TransactionResult;
 export declare function reserve(tx: Transaction, typeArgs: [string, string], lendingMarket: TransactionObjectInput): import("@mysten/sui/transactions").TransactionResult;
+export interface CompoundInterestArgs {
+    lendingMarket: TransactionObjectInput;
+    reserveArrayIndex: bigint | TransactionArgument;
+    clock: TransactionObjectInput;
+}
+export declare function compoundInterest(tx: Transaction, typeArg: string, args: CompoundInterestArgs): import("@mysten/sui/transactions").TransactionResult;
 export interface DepositLiquidityAndMintCtokensArgs {
     lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
@@ -137,6 +144,7 @@ export interface LiquidateArgs {
     repayCoins: TransactionObjectInput;
 }
 export declare function liquidate(tx: Transaction, typeArgs: [string, string, string], args: LiquidateArgs): import("@mysten/sui/transactions").TransactionResult;
+export declare function reserves(tx: Transaction, typeArg: string, lendingMarket: TransactionObjectInput): import("@mysten/sui/transactions").TransactionResult;
 export interface MaxWithdrawAmountArgs {
     rateLimiter: TransactionObjectInput;
     obligation: TransactionObjectInput;

package/_generated/suilend/lending-market/functions.js

@@ -9,6 +9,7 @@ exports.cancelPoolReward = cancelPoolReward;
 exports.claimRewards = claimRewards;
 exports.closePoolReward = closePoolReward;
 exports.reserve = reserve;
+exports.compoundInterest = compoundInterest;
 exports.depositLiquidityAndMintCtokens = depositLiquidityAndMintCtokens;
 exports.fulfillLiquidityRequest = fulfillLiquidityRequest;
 exports.initStaker = initStaker;
@@ -22,6 +23,7 @@ exports.createObligation = createObligation;
 exports.reserveArrayIndex = reserveArrayIndex;
 exports.forgive = forgive;
 exports.liquidate = liquidate;
+exports.reserves = reserves;
 exports.maxWithdrawAmount = maxWithdrawAmount;
 exports.repay = repay;
 exports.obligationId = obligationId;
@@ -81,6 +83,7 @@ function claimFees(tx, typeArgs, args) {
         arguments: [
             (0, util_1.obj)(tx, args.lendingMarket),
             (0, util_1.pure)(tx, args.reserveArrayIndex, `u64`),
+            (0, util_1.obj)(tx, args.systemState),
         ],
     });
 }
@@ -149,6 +152,17 @@ function reserve(tx, typeArgs, lendingMarket) {
         arguments: [(0, util_1.obj)(tx, lendingMarket)],
     });
 }
+function compoundInterest(tx, typeArg, args) {
+    return tx.moveCall({
+        target: `${__1.PUBLISHED_AT}::lending_market::compound_interest`,
+        typeArguments: [typeArg],
+        arguments: [
+            (0, util_1.obj)(tx, args.lendingMarket),
+            (0, util_1.pure)(tx, args.reserveArrayIndex, `u64`),
+            (0, util_1.obj)(tx, args.clock),
+        ],
+    });
+}
 function depositLiquidityAndMintCtokens(tx, typeArgs, args) {
     return tx.moveCall({
         target: `${__1.PUBLISHED_AT}::lending_market::deposit_liquidity_and_mint_ctokens`,
@@ -296,6 +310,13 @@ function liquidate(tx, typeArgs, args) {
         ],
     });
 }
+function reserves(tx, typeArg, lendingMarket) {
+    return tx.moveCall({
+        target: `${__1.PUBLISHED_AT}::lending_market::reserves`,
+        typeArguments: [typeArg],
+        arguments: [(0, util_1.obj)(tx, lendingMarket)],
+    });
+}
 function maxWithdrawAmount(tx, typeArg, args) {
     return tx.moveCall({
         target: `${__1.PUBLISHED_AT}::lending_market::max_withdraw_amount`,

package/_generated/suilend/lending-market/structs.d.ts

@@ -452,7 +452,7 @@ export declare class FeeReceivers implements StructClass {
     static reified(): FeeReceiversReified;
     static get r(): reified.StructClassReified<FeeReceivers, FeeReceiversFields>;
     static phantom(): PhantomReified<ToTypeStr<FeeReceivers>>;
-    static get p(): reified.PhantomReified<"0xe5ed361add4433f4d23e56fc0e3bacab39b93592d5e65d508e33fd19ff696669::lending_market::FeeReceivers" | "0xe37cc7bb50fd9b6dbd3873df66fa2c554e973697f50ef97707311dc78bd08444::lending_market::FeeReceivers">;
+    static get p(): reified.PhantomReified<"0xe37cc7bb50fd9b6dbd3873df66fa2c554e973697f50ef97707311dc78bd08444::lending_market::FeeReceivers" | "0xe5ed361add4433f4d23e56fc0e3bacab39b93592d5e65d508e33fd19ff696669::lending_market::FeeReceivers">;
     static get bcs(): import("@mysten/sui/bcs").BcsType<{
         receivers: string[];
         weights: string[];
@@ -506,7 +506,7 @@ export declare class FeeReceiversKey implements StructClass {
     static reified(): FeeReceiversKeyReified;
     static get r(): reified.StructClassReified<FeeReceiversKey, FeeReceiversKeyFields>;
     static phantom(): PhantomReified<ToTypeStr<FeeReceiversKey>>;
-    static get p(): reified.PhantomReified<"0xe5ed361add4433f4d23e56fc0e3bacab39b93592d5e65d508e33fd19ff696669::lending_market::FeeReceiversKey" | "0xe37cc7bb50fd9b6dbd3873df66fa2c554e973697f50ef97707311dc78bd08444::lending_market::FeeReceiversKey">;
+    static get p(): reified.PhantomReified<"0xe37cc7bb50fd9b6dbd3873df66fa2c554e973697f50ef97707311dc78bd08444::lending_market::FeeReceiversKey" | "0xe5ed361add4433f4d23e56fc0e3bacab39b93592d5e65d508e33fd19ff696669::lending_market::FeeReceiversKey">;
     static get bcs(): import("@mysten/sui/bcs").BcsType<{
         dummy_field: boolean;
     }, {

package/_generated/suilend/obligation/structs.d.ts

@@ -5,7 +5,7 @@ import { PhantomReified, PhantomToTypeStr, PhantomTypeArgument, Reified, StructC
 import { FieldsWithTypes } from "../../_framework/util";
 import { Vector } from "../../_framework/vector";
 import { Decimal } from "../decimal/structs";
-import { PKG_V1 } from "../index";
+import { PKG_V1, PKG_V11 } from "../index";
 import { UserRewardManager } from "../liquidity-mining/structs";
 import { SuiClient, SuiObjectData, SuiParsedData } from "@mysten/sui/client";
 export declare function isBorrow(type: string): boolean;
@@ -432,6 +432,48 @@ export declare class DepositRecord implements StructClass {
     static fromSuiObjectData(data: SuiObjectData): DepositRecord;
     static fetch(client: SuiClient, id: string): Promise<DepositRecord>;
 }
+export declare function isExistStaleOracles(type: string): boolean;
+export interface ExistStaleOraclesFields {
+    dummyField: ToField<"bool">;
+}
+export type ExistStaleOraclesReified = Reified<ExistStaleOracles, ExistStaleOraclesFields>;
+export declare class ExistStaleOracles implements StructClass {
+    __StructClass: true;
+    static readonly $typeName: string;
+    static readonly $numTypeParams = 0;
+    static readonly $isPhantom: readonly [];
+    readonly $typeName: string;
+    readonly $fullTypeName: `${typeof PKG_V11}::obligation::ExistStaleOracles`;
+    readonly $typeArgs: [];
+    readonly $isPhantom: readonly [];
+    readonly dummyField: ToField<"bool">;
+    private constructor();
+    static reified(): ExistStaleOraclesReified;
+    static get r(): reified.StructClassReified<ExistStaleOracles, ExistStaleOraclesFields>;
+    static phantom(): PhantomReified<ToTypeStr<ExistStaleOracles>>;
+    static get p(): reified.PhantomReified<"0xe5ed361add4433f4d23e56fc0e3bacab39b93592d5e65d508e33fd19ff696669::obligation::ExistStaleOracles" | "0xd2a67633ccb8de063163e25bcfca242929caf5cf1a26c2929dab519ee0b8f331::obligation::ExistStaleOracles">;
+    static get bcs(): import("@mysten/sui/bcs").BcsType<{
+        dummy_field: boolean;
+    }, {
+        dummy_field: boolean;
+    }>;
+    static fromFields(fields: Record<string, any>): ExistStaleOracles;
+    static fromFieldsWithTypes(item: FieldsWithTypes): ExistStaleOracles;
+    static fromBcs(data: Uint8Array): ExistStaleOracles;
+    toJSONField(): {
+        dummyField: boolean;
+    };
+    toJSON(): {
+        dummyField: boolean;
+        $typeName: string;
+        $typeArgs: [];
+    };
+    static fromJSONField(field: any): ExistStaleOracles;
+    static fromJSON(json: Record<string, any>): ExistStaleOracles;
+    static fromSuiParsedData(content: SuiParsedData): ExistStaleOracles;
+    static fromSuiObjectData(data: SuiObjectData): ExistStaleOracles;
+    static fetch(client: SuiClient, id: string): Promise<ExistStaleOracles>;
+}
 export declare function isObligation(type: string): boolean;
 export interface ObligationFields<P extends PhantomTypeArgument> {
     id: ToField<UID>;

package/_generated/suilend/obligation/structs.js

@@ -42,11 +42,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObligationDataEvent = exports.Obligation = exports.DepositRecord = exports.Deposit = exports.BorrowRecord = exports.Borrow = void 0;
+exports.ObligationDataEvent = exports.Obligation = exports.ExistStaleOracles = exports.DepositRecord = exports.Deposit = exports.BorrowRecord = exports.Borrow = void 0;
 exports.isBorrow = isBorrow;
 exports.isBorrowRecord = isBorrowRecord;
 exports.isDeposit = isDeposit;
 exports.isDepositRecord = isDepositRecord;
+exports.isExistStaleOracles = isExistStaleOracles;
 exports.isObligation = isObligation;
 exports.isObligationDataEvent = isObligationDataEvent;
 const reified = __importStar(require("../../_framework/reified"));
@@ -681,6 +682,132 @@ exports.DepositRecord = DepositRecord;
 DepositRecord.$typeName = `${index_1.PKG_V1}::obligation::DepositRecord`;
 DepositRecord.$numTypeParams = 0;
 DepositRecord.$isPhantom = [];
+/* ============================== ExistStaleOracles =============================== */
+function isExistStaleOracles(type) {
+    type = (0, util_1.compressSuiType)(type);
+    return type === `${index_1.PKG_V11}::obligation::ExistStaleOracles`;
+}
+class ExistStaleOracles {
+    constructor(typeArgs, fields) {
+        this.__StructClass = true;
+        this.$typeName = ExistStaleOracles.$typeName;
+        this.$isPhantom = ExistStaleOracles.$isPhantom;
+        this.$fullTypeName = (0, util_1.composeSuiType)(ExistStaleOracles.$typeName, ...typeArgs);
+        this.$typeArgs = typeArgs;
+        this.dummyField = fields.dummyField;
+    }
+    static reified() {
+        return {
+            typeName: ExistStaleOracles.$typeName,
+            fullTypeName: (0, util_1.composeSuiType)(ExistStaleOracles.$typeName, ...[]),
+            typeArgs: [],
+            isPhantom: ExistStaleOracles.$isPhantom,
+            reifiedTypeArgs: [],
+            fromFields: (fields) => ExistStaleOracles.fromFields(fields),
+            fromFieldsWithTypes: (item) => ExistStaleOracles.fromFieldsWithTypes(item),
+            fromBcs: (data) => ExistStaleOracles.fromBcs(data),
+            bcs: ExistStaleOracles.bcs,
+            fromJSONField: (field) => ExistStaleOracles.fromJSONField(field),
+            fromJSON: (json) => ExistStaleOracles.fromJSON(json),
+            fromSuiParsedData: (content) => ExistStaleOracles.fromSuiParsedData(content),
+            fromSuiObjectData: (content) => ExistStaleOracles.fromSuiObjectData(content),
+            fetch: (client, id) => __awaiter(this, void 0, void 0, function* () { return ExistStaleOracles.fetch(client, id); }),
+            new: (fields) => {
+                return new ExistStaleOracles([], fields);
+            },
+            kind: "StructClassReified",
+        };
+    }
+    static get r() {
+        return ExistStaleOracles.reified();
+    }
+    static phantom() {
+        return (0, reified_1.phantom)(ExistStaleOracles.reified());
+    }
+    static get p() {
+        return ExistStaleOracles.phantom();
+    }
+    static get bcs() {
+        return bcs_1.bcs.struct("ExistStaleOracles", {
+            dummy_field: bcs_1.bcs.bool(),
+        });
+    }
+    static fromFields(fields) {
+        return ExistStaleOracles.reified().new({
+            dummyField: (0, reified_1.decodeFromFields)("bool", fields.dummy_field),
+        });
+    }
+    static fromFieldsWithTypes(item) {
+        if (!isExistStaleOracles(item.type)) {
+            throw new Error("not a ExistStaleOracles type");
+        }
+        return ExistStaleOracles.reified().new({
+            dummyField: (0, reified_1.decodeFromFieldsWithTypes)("bool", item.fields.dummy_field),
+        });
+    }
+    static fromBcs(data) {
+        return ExistStaleOracles.fromFields(ExistStaleOracles.bcs.parse(data));
+    }
+    toJSONField() {
+        return {
+            dummyField: this.dummyField,
+        };
+    }
+    toJSON() {
+        return Object.assign({ $typeName: this.$typeName, $typeArgs: this.$typeArgs }, this.toJSONField());
+    }
+    static fromJSONField(field) {
+        return ExistStaleOracles.reified().new({
+            dummyField: (0, reified_1.decodeFromJSONField)("bool", field.dummyField),
+        });
+    }
+    static fromJSON(json) {
+        if (json.$typeName !== ExistStaleOracles.$typeName) {
+            throw new Error("not a WithTwoGenerics json object");
+        }
+        return ExistStaleOracles.fromJSONField(json);
+    }
+    static fromSuiParsedData(content) {
+        if (content.dataType !== "moveObject") {
+            throw new Error("not an object");
+        }
+        if (!isExistStaleOracles(content.type)) {
+            throw new Error(`object at ${content.fields.id} is not a ExistStaleOracles object`);
+        }
+        return ExistStaleOracles.fromFieldsWithTypes(content);
+    }
+    static fromSuiObjectData(data) {
+        if (data.bcs) {
+            if (data.bcs.dataType !== "moveObject" ||
+                !isExistStaleOracles(data.bcs.type)) {
+                throw new Error(`object at is not a ExistStaleOracles object`);
+            }
+            return ExistStaleOracles.fromBcs((0, utils_1.fromB64)(data.bcs.bcsBytes));
+        }
+        if (data.content) {
+            return ExistStaleOracles.fromSuiParsedData(data.content);
+        }
+        throw new Error("Both `bcs` and `content` fields are missing from the data. Include `showBcs` or `showContent` in the request.");
+    }
+    static fetch(client, id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const res = yield client.getObject({ id, options: { showBcs: true } });
+            if (res.error) {
+                throw new Error(`error fetching ExistStaleOracles object at id ${id}: ${res.error.code}`);
+            }
+            if (((_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.bcs) === null || _b === void 0 ? void 0 : _b.dataType) !== "moveObject" ||
+                !isExistStaleOracles(res.data.bcs.type)) {
+                throw new Error(`object at id ${id} is not a ExistStaleOracles object`);
+            }
+            return ExistStaleOracles.fromSuiObjectData(res.data);
+        });
+    }
+}
+exports.ExistStaleOracles = ExistStaleOracles;
+ExistStaleOracles.$typeName = `${index_1.PKG_V11}::obligation::ExistStaleOracles`;
+ExistStaleOracles.$numTypeParams = 0;
+ExistStaleOracles.$isPhantom = [];
 /* ============================== Obligation =============================== */
 function isObligation(type) {
     type = (0, util_1.compressSuiType)(type);

package/client.d.ts

@@ -6,6 +6,21 @@ import { Obligation } from "./_generated/suilend/obligation/structs";
 import { NewConfigArgs as CreateRateLimiterConfigArgs } from "./_generated/suilend/rate-limiter/functions";
 import { CreateReserveConfigArgs } from "./_generated/suilend/reserve-config/functions";
 import { Side } from "./lib/types";
+export declare const ADMIN_ADDRESS: string;
+export declare const LENDING_MARKET_REGISTRY_ID: string;
+export declare const LENDING_MARKETS: ({
+    name: string;
+    id: string;
+    type: string;
+    ownerCapId: string;
+    isHidden?: undefined;
+} | {
+    name: string;
+    id: string;
+    type: string;
+    ownerCapId: string;
+    isHidden: boolean;
+})[];
 export declare const LENDING_MARKET_ID: string;
 export declare const LENDING_MARKET_TYPE: string;
 export type ClaimRewardsReward = {
@@ -29,8 +44,8 @@ export declare class SuilendClient {
     static getObligationOwnerCaps(ownerId: string, lendingMarketTypeArgs: string[], client: SuiClient): Promise<ObligationOwnerCap<string>[]>;
     static getObligation(obligationId: string, lendingMarketTypeArgs: string[], client: SuiClient): Promise<Obligation<string>>;
     getObligation(obligationId: string): Promise<Obligation<string>>;
-    static getLendingMarketOwnerCapId(ownerId: string, lendingMarketTypeArgs: string[], client: SuiClient): Promise<string | null>;
-    getLendingMarketOwnerCapId(ownerId: string): Promise<string | null>;
+    static getLendingMarketOwnerCapId(ownerId: string, lendingMarketTypeArgs: string[], client: SuiClient): Promise<string | undefined>;
+    getLendingMarketOwnerCapId(ownerId: string): Promise<string | undefined>;
     createReserve(lendingMarketOwnerCapId: string, transaction: Transaction, pythPriceId: string, coinType: string, createReserveConfigArgs: CreateReserveConfigArgs): Promise<TransactionResult>;
     addReward(ownerId: string, lendingMarketOwnerCapId: string, reserveArrayIndex: bigint, isDepositReward: boolean, rewardCoinType: string, rewardValue: string, startTimeMs: bigint, endTimeMs: bigint, transaction: Transaction, mergeCoins?: boolean): Promise<TransactionResult>;
     cancelReward(lendingMarketOwnerCapId: string, reserveArrayIndex: bigint, isDepositReward: boolean, rewardIndex: bigint, rewardCoinType: string, transaction: Transaction): TransactionResult;

package/client.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SuilendClient = exports.LENDING_MARKET_TYPE = exports.LENDING_MARKET_ID = void 0;
+exports.SuilendClient = exports.LENDING_MARKET_TYPE = exports.LENDING_MARKET_ID = exports.LENDING_MARKETS = exports.LENDING_MARKET_REGISTRY_ID = exports.ADMIN_ADDRESS = void 0;
 const utils_1 = require("@mysten/sui/utils");
 const pyth_sui_js_1 = require("@pythnetwork/pyth-sui-js");
 const frontend_sui_1 = require("@suilend/frontend-sui");
@@ -29,15 +29,55 @@ const NORMALIZED_SUI_COINTYPE = (0, utils_1.normalizeStructTag)(SUI_COINTYPE);
 const isSui = (coinType) => (0, utils_1.normalizeStructTag)(coinType) === NORMALIZED_SUI_COINTYPE;
 const WORMHOLE_STATE_ID = "0xaeab97f96cf9877fee2883315d459552b2b921edc16d7ceac6eab944dd88919c";
 const PYTH_STATE_ID = "0x1f9310238ee9298fb703c3419030b35b22bb1cc37113e3bb5007c99aec79e5b8";
-const SUILEND_UPGRADE_CAP_ID = process.env.NEXT_PUBLIC_USE_BETA_MARKET
+exports.ADMIN_ADDRESS = process.env.NEXT_PUBLIC_SUILEND_USE_BETA_MARKET
+    ? "0xa902504c338e17f44dfee1bd1c3cad1ff03326579b9cdcfe2762fc12c46fc033" // beta owner
+    : "0xb1ffbc2e1915f44b8f271a703becc1bf8aa79bc22431a58900a102892b783c25";
+const SUILEND_UPGRADE_CAP_ID = process.env.NEXT_PUBLIC_SUILEND_USE_BETA_MARKET
     ? "0x05da14368a42a351e106806c09727968ae26be77a6741a018239ef0f99d5185e"
     : "0x3d4ef1859c3ee9fc72858f588b56a09da5466e64f8cc4e90a7b3b909fba8a7ae";
-exports.LENDING_MARKET_ID = process.env.NEXT_PUBLIC_USE_BETA_MARKET
-    ? "0x12e46de3eafaf0308a2dd64f1158782ed19e6621835bf883a1dd6b3061115667"
-    : "0x84030d26d85eaa7035084a057f2f11f701b7e2e4eda87551becbc7c97505ece1";
-exports.LENDING_MARKET_TYPE = process.env.NEXT_PUBLIC_USE_BETA_MARKET
-    ? "0x83556891f4a0f233ce7b05cfe7f957d4020492a34f5405b2cb9377d060bef4bf::spring_sui::SPRING_SUI"
-    : "0xf95b06141ed4a174f239417323bde3f209b972f5930d8521ea38a52aff3a6ddf::suilend::MAIN_POOL";
+exports.LENDING_MARKET_REGISTRY_ID = process.env
+    .NEXT_PUBLIC_SUILEND_USE_BETA_MARKET
+    ? "0x925c9a2336b02fc2b68099837bd66f6b5b4d45cd460e0a4b81708bac6c440eff"
+    : "0x64faff8d91a56c4f55debbb44767b009ee744a70bc2cc8e3bbd2718c92f85931";
+exports.LENDING_MARKETS = process.env.NEXT_PUBLIC_SUILEND_USE_BETA_MARKET
+    ? [
+        // {
+        //   name: "Old",
+        //   id: "0x850850ef3ec0aa8c3345a2c3c486b571fdc31f3ebcaff931d7f9b9707aace2f8",
+        //   type: "0x2::sui::SUI",
+        //   ownerCapId:
+        //     "0xa92aae3be305687d3abe36deb4d92f78ec17bfce7d8d07972722d1166e4bc6ab",
+        // },
+        {
+            name: "Main market",
+            id: "0x12e46de3eafaf0308a2dd64f1158782ed19e6621835bf883a1dd6b3061115667",
+            type: "0x83556891f4a0f233ce7b05cfe7f957d4020492a34f5405b2cb9377d060bef4bf::spring_sui::SPRING_SUI",
+            ownerCapId: "0xf0df3204ecd426bc83f5e5dccb07ea35f1af220a40ec02dfd63fb7f2fea00824",
+        },
+        {
+            name: "Isolated 1",
+            id: "0xb1d89cf9082cedce09d3647f0ebda4a8b5db125aff5d312a8bfd7eefa715bd35",
+            type: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP",
+            ownerCapId: "0xed8262012d34105c5ac59cf2dd6473d492e6ab7529fe7f9ea6cb1fa8dc2dba56",
+            isHidden: true, // FOR TESTING ONLY
+        },
+    ]
+    : [
+        {
+            name: "Main market",
+            id: "0x84030d26d85eaa7035084a057f2f11f701b7e2e4eda87551becbc7c97505ece1",
+            type: "0xf95b06141ed4a174f239417323bde3f209b972f5930d8521ea38a52aff3a6ddf::suilend::MAIN_POOL",
+            ownerCapId: "0xf7a4defe0b6566b6a2674a02a0c61c9f99bd012eed21bc741a069eaa82d35927",
+        },
+        {
+            name: "STEAMM LP",
+            id: "0xc1888ec1b81a414e427a44829310508352aec38252ee0daa9f8b181b6947de9f",
+            type: "0x0a071f4976abae1a7f722199cf0bfcbe695ef9408a878e7d12a7ca87b7e582a6::lp_rewards::LP_REWARDS",
+            ownerCapId: "0x55a0f33b24e091830302726c8cfbff8cf8abd2ec1f83a4e6f4bf51c7ba3ad5ab",
+        },
+    ];
+exports.LENDING_MARKET_ID = exports.LENDING_MARKETS[0].id; // Main market, for backwards compatibility
+exports.LENDING_MARKET_TYPE = exports.LENDING_MARKETS[0].type; // Main market, for backwards compatibility
 function getLatestPackageId(client, upgradeCapId) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -162,7 +202,7 @@ class SuilendClient {
             if (objs.data.length > 0)
                 return (_a = objs.data[0].data) === null || _a === void 0 ? void 0 : _a.objectId;
             else
-                return null;
+                return undefined;
         });
     }
     getLendingMarketOwnerCapId(ownerId) {
@@ -608,6 +648,7 @@ class SuilendClient {
         return (0, functions_1.claimFees)(transaction, [this.lendingMarket.$typeArgs[0], coinType], {
             lendingMarket: transaction.object(this.lendingMarket.id),
             reserveArrayIndex: transaction.pure.u64(this.findReserveArrayIndex(coinType)),
+            systemState: transaction.object(utils_1.SUI_SYSTEM_STATE_OBJECT_ID),
         });
     }
     setFeeReceiversAndWeights(transaction, lendingMarketOwnerCapId, receivers, weights) {

package/lib/constants.d.ts

@@ -1,4 +1,3 @@
 import BigNumber from "bignumber.js";
-export declare const maxU64: BigNumber;
 export declare const WAD: BigNumber;
 export declare const msPerYear = 31556952000;

package/lib/constants.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.msPerYear = exports.WAD = exports.maxU64 = void 0;
+exports.msPerYear = exports.WAD = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
-exports.maxU64 = new bignumber_js_1.default(2).pow(64).minus(1);
 exports.WAD = new bignumber_js_1.default(10).pow(18);
-exports.msPerYear = 31556952000; // Approx. 1000 * 60 * 60 * 24 * 365;
+exports.msPerYear = 31556952000; // Approx. 1000 * 60 * 60 * 24 * 365; // Used by external dependencies (e.g. msafe-sui-app-store)

package/lib/initialize.d.ts

@@ -1,11 +1,13 @@
-import { CoinMetadata, SuiClient } from "@mysten/sui/client";
+import { SuiClient } from "@mysten/sui/client";
 import BigNumber from "bignumber.js";
+import { Reserve } from "../_generated/suilend/reserve/structs";
 import { SuilendClient } from "../client";
-import { ParsedObligation, ParsedReserve } from "../parsers";
+import { ParsedReserve } from "../parsers";
 export declare const RESERVES_CUSTOM_ORDER: string[];
-export declare const initializeSuilend: (suiClient: SuiClient, suilendClient: SuilendClient, address?: string) => Promise<{
+export declare const initializeSuilend: (suiClient: SuiClient, suilendClient: SuilendClient) => Promise<{
     lendingMarket: {
         id: string;
+        type: string;
         version: bigint;
         reserves: {
             config: {
@@ -133,10 +135,15 @@ export declare const initializeSuilend: (suiClient: SuiClient, suilendClient: Su
         depositedAmountUsd: BigNumber;
         borrowedAmountUsd: BigNumber;
         tvlUsd: BigNumber;
+        name: string;
+        ownerCapId: string;
         totalSupplyUsd: BigNumber;
         totalBorrowUsd: BigNumber;
     };
-    refreshedRawReserves: import("../_generated/suilend/reserve/structs").Reserve<string>[];
+    coinMetadataMap: {
+        [x: string]: import("@mysten/sui/client").CoinMetadata;
+    };
+    refreshedRawReserves: Reserve<string>[];
     reserveMap: Record<string, {
         config: {
             $typeName: string;
@@ -246,13 +253,16 @@ export declare const initializeSuilend: (suiClient: SuiClient, suilendClient: Su
         totalDeposits: BigNumber;
     }>;
     reserveCoinTypes: string[];
+    reserveCoinMetadataMap: Record<string, import("@mysten/sui/client").CoinMetadata>;
     rewardCoinTypes: string[];
-    reserveCoinMetadataMap: Record<string, CoinMetadata>;
-    rewardCoinMetadataMap: Record<string, CoinMetadata>;
-    coinMetadataMap: {
-        [x: string]: CoinMetadata;
-    };
-    obligationOwnerCaps: import("../_generated/suilend/lending-market/structs").ObligationOwnerCap<string>[] | undefined;
+    activeRewardCoinTypes: string[];
+    rewardCoinMetadataMap: Record<string, import("@mysten/sui/client").CoinMetadata>;
+}>;
+export declare const initializeSuilendRewards: (reserveMap: Record<string, ParsedReserve>, activeRewardCoinTypes: string[]) => Promise<{
+    rewardPriceMap: Record<string, BigNumber | undefined>;
+}>;
+export declare const initializeObligations: (suiClient: SuiClient, suilendClient: SuilendClient, refreshedRawReserves: Reserve<string>[], reserveMap: Record<string, ParsedReserve>, address?: string) => Promise<{
+    obligationOwnerCaps: import("../_generated/suilend/lending-market/structs").ObligationOwnerCap<string>[];
     obligations: {
         id: string;
         depositedAmountUsd: BigNumber;
@@ -509,9 +519,5 @@ export declare const initializeSuilend: (suiClient: SuiClient, suilendClient: Su
         maxPriceTotalWeightedBorrowUsd: BigNumber;
         borrowLimit: BigNumber;
         minPriceBorrowLimit: BigNumber;
-    }[] | undefined;
-}>;
-export declare const initializeSuilendRewards: (reserveMap: Record<string, ParsedReserve>, rewardCoinTypes: string[], rewardCoinMetadataMap: Record<string, CoinMetadata>, obligations?: ParsedObligation[]) => Promise<{
-    rewardPriceMap: Record<string, BigNumber | undefined>;
-    rewardMap: import("./liquidityMining").RewardMap;
+    }[];
 }>;

package/lib/initialize.js

@@ -45,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeSuilendRewards = exports.initializeSuilend = exports.RESERVES_CUSTOM_ORDER = void 0;
+exports.initializeObligations = exports.initializeSuilendRewards = exports.initializeSuilend = exports.RESERVES_CUSTOM_ORDER = void 0;
 const utils_1 = require("@mysten/sui/utils");
 const pyth_sui_js_1 = require("@pythnetwork/pyth-sui-js");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
@@ -54,11 +54,10 @@ const client_1 = require("../client");
 const parsers_1 = require("../parsers");
 const simulate = __importStar(require("../utils/simulate"));
 const constants_1 = require("./constants");
-const liquidityMining_1 = require("./liquidityMining");
 exports.RESERVES_CUSTOM_ORDER = [
-    // Main assets
+    // MAIN ASSETS
     frontend_sui_1.NORMALIZED_sSUI_COINTYPE,
-    // Main assets - Ecosystem LSTs
+    // MAIN ASSETS - Ecosystem LSTs
     frontend_sui_1.NORMALIZED_mSUI_COINTYPE,
     frontend_sui_1.NORMALIZED_fudSUI_COINTYPE,
     frontend_sui_1.NORMALIZED_kSUI_COINTYPE,
@@ -67,29 +66,32 @@ exports.RESERVES_CUSTOM_ORDER = [
     frontend_sui_1.NORMALIZED_SUI_COINTYPE,
     frontend_sui_1.NORMALIZED_USDC_COINTYPE,
     frontend_sui_1.NORMALIZED_suiUSDT_COINTYPE,
-    frontend_sui_1.NORMALIZED_wUSDT_COINTYPE,
     frontend_sui_1.NORMALIZED_AUSD_COINTYPE,
+    frontend_sui_1.NORMALIZED_wBTC_COINTYPE,
     frontend_sui_1.NORMALIZED_suiETH_COINTYPE,
     frontend_sui_1.NORMALIZED_SOL_COINTYPE,
-    // Isolated assets
+    // ISOLATED ASSETS
     frontend_sui_1.NORMALIZED_SEND_COINTYPE,
     frontend_sui_1.NORMALIZED_DEEP_COINTYPE,
-    frontend_sui_1.NORMALIZED_BLUE_COINTYPE, // Not listed
+    frontend_sui_1.NORMALIZED_BLUE_COINTYPE,
     frontend_sui_1.NORMALIZED_NS_COINTYPE,
     frontend_sui_1.NORMALIZED_BUCK_COINTYPE,
-    // Isolated assets - Memecoins
+    // ISOLATED ASSETS - Memecoins
     frontend_sui_1.NORMALIZED_HIPPO_COINTYPE,
     frontend_sui_1.NORMALIZED_LOFI_COINTYPE, // Not listed
     frontend_sui_1.NORMALIZED_FUD_COINTYPE,
-    // Deprecated assets
+    // DEPRECATED ASSETS
     frontend_sui_1.NORMALIZED_wUSDC_COINTYPE,
+    frontend_sui_1.NORMALIZED_wUSDT_COINTYPE,
     frontend_sui_1.NORMALIZED_WETH_COINTYPE,
 ];
-const initializeSuilend = (suiClient, suilendClient, address) => __awaiter(void 0, void 0, void 0, function* () {
-    const now = Math.floor(Date.now() / 1000);
-    const refreshedRawReserves = yield simulate.refreshReservePrice(suilendClient.lendingMarket.reserves.map((r) => simulate.compoundReserveInterest(r, now)), new pyth_sui_js_1.SuiPriceServiceConnection("https://hermes.pyth.network"));
+const initializeSuilend = (suiClient, suilendClient) => __awaiter(void 0, void 0, void 0, function* () {
+    const nowMs = Date.now();
+    const nowS = Math.floor(nowMs / 1000);
+    const refreshedRawReserves = yield simulate.refreshReservePrice(suilendClient.lendingMarket.reserves.map((r) => simulate.compoundReserveInterest(r, nowS)), new pyth_sui_js_1.SuiPriceServiceConnection("https://hermes.pyth.network"));
     const reserveCoinTypes = [];
     const rewardCoinTypes = [];
+    const activeRewardCoinTypes = [];
     refreshedRawReserves.forEach((r) => {
         reserveCoinTypes.push((0, utils_1.normalizeStructTag)(r.coinType.name));
         [
@@ -98,13 +100,19 @@ const initializeSuilend = (suiClient, suilendClient, address) => __awaiter(void
         ].forEach((pr) => {
             if (!pr)
                 return;
+            const isActive = nowMs >= Number(pr.startTimeMs) && nowMs < Number(pr.endTimeMs);
             rewardCoinTypes.push((0, utils_1.normalizeStructTag)(pr.coinType.name));
+            if (isActive)
+                activeRewardCoinTypes.push((0, utils_1.normalizeStructTag)(pr.coinType.name));
         });
     });
-    const uniqueReservesCoinTypes = Array.from(new Set(reserveCoinTypes));
-    const uniqueRewardsCoinTypes = Array.from(new Set(rewardCoinTypes));
-    const reserveCoinMetadataMap = yield (0, frontend_sui_1.getCoinMetadataMap)(suiClient, uniqueReservesCoinTypes);
-    const rewardCoinMetadataMap = yield (0, frontend_sui_1.getCoinMetadataMap)(suiClient, uniqueRewardsCoinTypes);
+    const uniqueReserveCoinTypes = Array.from(new Set(reserveCoinTypes));
+    const uniqueRewardCoinTypes = Array.from(new Set(rewardCoinTypes));
+    const uniqueActiveRewardsCoinTypes = Array.from(new Set(activeRewardCoinTypes));
+    const [reserveCoinMetadataMap, rewardCoinMetadataMap] = yield Promise.all([
+        (0, frontend_sui_1.getCoinMetadataMap)(suiClient, uniqueReserveCoinTypes),
+        (0, frontend_sui_1.getCoinMetadataMap)(suiClient, uniqueRewardCoinTypes),
+    ]);
     const coinMetadataMap = Object.assign(Object.assign({}, reserveCoinMetadataMap), rewardCoinMetadataMap);
     const reservesWithTemporaryPythPriceFeeds = refreshedRawReserves.filter((r) => frontend_sui_1.TEMPORARY_PYTH_PRICE_FEED_COINTYPES.includes((0, utils_1.normalizeStructTag)(r.coinType.name)));
     for (const reserve of reservesWithTemporaryPythPriceFeeds) {
@@ -117,7 +125,7 @@ const initializeSuilend = (suiClient, suilendClient, address) => __awaiter(void
         reserve.price.value = parsedBirdeyePrice;
         reserve.smoothedPrice.value = parsedBirdeyePrice;
     }
-    const lendingMarket = (0, parsers_1.parseLendingMarket)(suilendClient.lendingMarket, refreshedRawReserves, coinMetadataMap, now);
+    const lendingMarket = (0, parsers_1.parseLendingMarket)(suilendClient.lendingMarket, refreshedRawReserves, coinMetadataMap, nowS);
     lendingMarket.reserves = lendingMarket.reserves.slice().sort((a, b) => {
         const aCustomOrderIndex = exports.RESERVES_CUSTOM_ORDER.indexOf(a.coinType);
         const bCustomOrderIndex = exports.RESERVES_CUSTOM_ORDER.indexOf(b.coinType);
@@ -129,42 +137,42 @@ const initializeSuilend = (suiClient, suilendClient, address) => __awaiter(void
             return aCustomOrderIndex > -1 ? -1 : 1;
     });
     const reserveMap = lendingMarket.reserves.reduce((acc, reserve) => (Object.assign(Object.assign({}, acc), { [reserve.coinType]: reserve })), {});
-    // Obligations
-    let obligationOwnerCaps, obligations;
-    if (address) {
-        obligationOwnerCaps = yield client_1.SuilendClient.getObligationOwnerCaps(address, suilendClient.lendingMarket.$typeArgs, suiClient);
-        obligations = (yield Promise.all(obligationOwnerCaps.map((ownerCap) => client_1.SuilendClient.getObligation(ownerCap.obligationId, suilendClient.lendingMarket.$typeArgs, suiClient))))
-            .map((rawObligation) => simulate.refreshObligation(rawObligation, refreshedRawReserves))
-            .map((refreshedObligation) => (0, parsers_1.parseObligation)(refreshedObligation, reserveMap))
-            .sort((a, b) => +b.netValueUsd.minus(a.netValueUsd));
-    }
     return {
         lendingMarket,
+        coinMetadataMap,
         refreshedRawReserves,
         reserveMap,
-        reserveCoinTypes: uniqueReservesCoinTypes,
-        rewardCoinTypes: uniqueRewardsCoinTypes,
+        reserveCoinTypes: uniqueReserveCoinTypes,
         reserveCoinMetadataMap,
+        rewardCoinTypes: uniqueRewardCoinTypes,
+        activeRewardCoinTypes: uniqueActiveRewardsCoinTypes,
         rewardCoinMetadataMap,
-        coinMetadataMap,
-        obligationOwnerCaps,
-        obligations,
     };
 });
 exports.initializeSuilend = initializeSuilend;
-const initializeSuilendRewards = (reserveMap, rewardCoinTypes, rewardCoinMetadataMap, obligations) => __awaiter(void 0, void 0, void 0, function* () {
+const initializeSuilendRewards = (reserveMap, activeRewardCoinTypes) => __awaiter(void 0, void 0, void 0, function* () {
     const rewardPriceMap = Object.entries(reserveMap).reduce((acc, [coinType, reserve]) => (Object.assign(Object.assign({}, acc), { [coinType]: reserve.price })), {});
     rewardPriceMap[frontend_sui_1.NORMALIZED_TREATS_COINTYPE] = new bignumber_js_1.default(0.1);
-    const reservelessRewardCoinTypes = rewardCoinTypes.filter((coinType) => !((0, frontend_sui_1.isSendPoints)(coinType) || coinType === frontend_sui_1.NORMALIZED_MAYA_COINTYPE) &&
+    const reservelessActiveRewardCoinTypes = activeRewardCoinTypes.filter((coinType) => !((0, frontend_sui_1.isSendPoints)(coinType) || coinType === frontend_sui_1.NORMALIZED_MAYA_COINTYPE) &&
         !rewardPriceMap[coinType]);
-    const reservelessRewardBirdeyePrices = yield Promise.all(reservelessRewardCoinTypes.map((coinType) => (0, frontend_sui_1.getPrice)(coinType)));
-    for (let i = 0; i < reservelessRewardCoinTypes.length; i++) {
-        const birdeyePrice = reservelessRewardBirdeyePrices[i];
+    const reservelessActiveRewardBirdeyePrices = yield Promise.all(reservelessActiveRewardCoinTypes.map((coinType) => (0, frontend_sui_1.getPrice)(coinType)));
+    for (let i = 0; i < reservelessActiveRewardCoinTypes.length; i++) {
+        const birdeyePrice = reservelessActiveRewardBirdeyePrices[i];
         if (birdeyePrice === undefined)
             continue;
-        rewardPriceMap[reservelessRewardCoinTypes[i]] = new bignumber_js_1.default(birdeyePrice);
+        rewardPriceMap[reservelessActiveRewardCoinTypes[i]] = new bignumber_js_1.default(birdeyePrice);
     }
-    const rewardMap = (0, liquidityMining_1.formatRewards)(reserveMap, rewardCoinMetadataMap, rewardPriceMap, obligations);
-    return { rewardPriceMap, rewardMap };
+    return { rewardPriceMap };
 });
 exports.initializeSuilendRewards = initializeSuilendRewards;
+const initializeObligations = (suiClient, suilendClient, refreshedRawReserves, reserveMap, address) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!address)
+        return { obligationOwnerCaps: [], obligations: [] };
+    const obligationOwnerCaps = yield client_1.SuilendClient.getObligationOwnerCaps(address, suilendClient.lendingMarket.$typeArgs, suiClient);
+    const obligations = (yield Promise.all(obligationOwnerCaps.map((ownerCap) => client_1.SuilendClient.getObligation(ownerCap.obligationId, suilendClient.lendingMarket.$typeArgs, suiClient))))
+        .map((rawObligation) => simulate.refreshObligation(rawObligation, refreshedRawReserves))
+        .map((refreshedObligation) => (0, parsers_1.parseObligation)(refreshedObligation, reserveMap))
+        .sort((a, b) => +b.netValueUsd.minus(a.netValueUsd));
+    return { obligationOwnerCaps, obligations };
+});
+exports.initializeObligations = initializeObligations;

package/lib/liquidityMining.d.ts

@@ -4,8 +4,8 @@ import { ParsedObligation, ParsedReserve } from "../parsers";
 import { Side } from "./types";
 export type RewardMap = {
     [coinType: string]: {
-        deposit: RewardSummary[];
-        borrow: RewardSummary[];
+        [Side.DEPOSIT]: RewardSummary[];
+        [Side.BORROW]: RewardSummary[];
     };
 };
 type ObligationClaim = {

package/lib/liquidityMining.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNetAprPercent = exports.getTotalAprPercent = exports.getStakingYieldAprPercent = exports.getDedupedPerDayRewards = exports.getDedupedAprRewards = exports.getFilteredRewards = exports.formatRewards = exports.getBorrowShare = exports.getDepositShare = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const lodash_1 = require("lodash");
+const frontend_sui_1 = require("@suilend/frontend-sui");
 const constants_1 = require("./constants");
 const types_1 = require("./types");
 const getDepositShare = (reserve, share) => share.div(10 ** reserve.mintDecimals).times(reserve.cTokenExchangeRate);
@@ -15,18 +16,16 @@ const getBorrowShare = (reserve, share) => share.div(10 ** reserve.mintDecimals)
 exports.getBorrowShare = getBorrowShare;
 const getBorrowShareUsd = (reserve, share) => (0, exports.getBorrowShare)(reserve, share).times(reserve.price);
 const formatRewards = (parsedReserveMap, coinMetadataMap, priceMap, obligations) => {
-    const currentTime = new Date().getTime();
+    const nowMs = Date.now();
     const rewardMap = {};
     const getRewardSummary = (reserve, poolReward, side) => {
-        var _a;
         const rewardCoinMetadata = coinMetadataMap[poolReward.coinType];
         const rewardPrice = priceMap === null || priceMap === void 0 ? void 0 : priceMap[poolReward.coinType];
-        const isActive = currentTime >= poolReward.startTimeMs &&
-            currentTime < poolReward.endTimeMs;
+        const isActive = nowMs >= poolReward.startTimeMs && nowMs < poolReward.endTimeMs;
         const aprPercent = rewardPrice
             ? poolReward.totalRewards
                 .times(rewardPrice)
-                .times(new bignumber_js_1.default(constants_1.msPerYear).div(poolReward.endTimeMs - poolReward.startTimeMs))
+                .times(new bignumber_js_1.default(frontend_sui_1.MS_PER_YEAR).div(poolReward.endTimeMs - poolReward.startTimeMs))
                 .div(side === types_1.Side.DEPOSIT
                 ? getDepositShareUsd(reserve, new bignumber_js_1.default(reserve.depositsPoolRewardManager.totalShares.toString()))
                 : getBorrowShareUsd(reserve, new bignumber_js_1.default(reserve.borrowsPoolRewardManager.totalShares.toString())))
@@ -35,7 +34,7 @@ const formatRewards = (parsedReserveMap, coinMetadataMap, priceMap, obligations)
         const perDay = rewardPrice
             ? undefined
             : poolReward.totalRewards
-                .times(new bignumber_js_1.default(constants_1.msPerYear).div(poolReward.endTimeMs - poolReward.startTimeMs))
+                .times(new bignumber_js_1.default(frontend_sui_1.MS_PER_YEAR).div(poolReward.endTimeMs - poolReward.startTimeMs))
                 .div(365)
                 .div(side === types_1.Side.DEPOSIT
                 ? (0, exports.getDepositShare)(reserve, new bignumber_js_1.default(reserve.depositsPoolRewardManager.totalShares.toString()))
@@ -55,29 +54,30 @@ const formatRewards = (parsedReserveMap, coinMetadataMap, priceMap, obligations)
                 perDay,
                 side,
             },
-            obligationClaims: Object.fromEntries((_a = obligations === null || obligations === void 0 ? void 0 : obligations.map((ob) => {
-                const claim = getObligationClaims(ob, poolReward, side === types_1.Side.DEPOSIT
+            obligationClaims: Object.fromEntries((obligations !== null && obligations !== void 0 ? obligations : [])
+                .map((obligation) => {
+                const claim = getObligationClaim(obligation, poolReward, side === types_1.Side.DEPOSIT
                     ? reserve.depositsPoolRewardManager.id
                     : reserve.borrowsPoolRewardManager.id, reserve.arrayIndex);
-                if (!claim) {
+                if (!claim)
                     return undefined;
-                }
-                return [ob.id, claim];
-            }).filter(Boolean)) !== null && _a !== void 0 ? _a : []),
+                return [obligation.id, claim];
+            })
+                .filter(Boolean)),
         };
     };
     Object.values(parsedReserveMap).forEach((reserve) => {
         const depositRewards = reserve.depositsPoolRewardManager.poolRewards.map((poolReward) => getRewardSummary(reserve, poolReward, types_1.Side.DEPOSIT));
         const borrowRewards = reserve.borrowsPoolRewardManager.poolRewards.map((poolReward) => getRewardSummary(reserve, poolReward, types_1.Side.BORROW));
         rewardMap[reserve.coinType] = {
-            deposit: depositRewards,
-            borrow: borrowRewards,
+            [types_1.Side.DEPOSIT]: depositRewards,
+            [types_1.Side.BORROW]: borrowRewards,
         };
     });
     return rewardMap;
 };
 exports.formatRewards = formatRewards;
-const getObligationClaims = (obligation, poolReward, reservePoolManagerId, reserveArrayIndex) => {
+const getObligationClaim = (obligation, poolReward, reservePoolManagerId, reserveArrayIndex) => {
     const userRewardManager = obligation.original.userRewardManagers.find((urm) => urm.poolRewardManagerId === reservePoolManagerId);
     if (!userRewardManager)
         return;
@@ -85,8 +85,6 @@ const getObligationClaims = (obligation, poolReward, reservePoolManagerId, reser
     if (!userReward)
         return;
     return {
-        // TODO: earnedRewards is refreshed via simulate.ts to only show unclaimed rewards.
-        // Lifetime earned amount is not available right yet as a result.
         claimableAmount: (userReward === null || userReward === void 0 ? void 0 : userReward.earnedRewards)
             ? new bignumber_js_1.default(userReward.earnedRewards.value.toString())
                 .div(constants_1.WAD)

package/package.json

@@ -1 +1 @@
-{"name":"@suilend/sdk","version":"1.1.37","private":false,"description":"A TypeScript SDK for interacting with the Suilend program","author":"Suilend","license":"MIT","main":"./index.js","exports":{".":"./index.js","./client":"./client.js","./api/events":"./api/events.js","./api":"./api/index.js","./lib/constants":"./lib/constants.js","./lib":"./lib/index.js","./lib/initialize":"./lib/initialize.js","./lib/liquidityMining":"./lib/liquidityMining.js","./lib/transactions":"./lib/transactions.js","./lib/types":"./lib/types.js","./parsers/apiReserveAssetDataEvent":"./parsers/apiReserveAssetDataEvent.js","./parsers":"./parsers/index.js","./parsers/lendingMarket":"./parsers/lendingMarket.js","./parsers/obligation":"./parsers/obligation.js","./parsers/rateLimiter":"./parsers/rateLimiter.js","./parsers/reserve":"./parsers/reserve.js","./utils/events":"./utils/events.js","./utils":"./utils/index.js","./utils/obligation":"./utils/obligation.js","./utils/simulate":"./utils/simulate.js","./_generated/_framework/reified":"./_generated/_framework/reified.js","./_generated/_framework/util":"./_generated/_framework/util.js","./_generated/_framework/vector":"./_generated/_framework/vector.js","./_generated/suilend":"./_generated/suilend/index.js","./_generated/suilend/cell/structs":"./_generated/suilend/cell/structs.js","./_generated/suilend/decimal/structs":"./_generated/suilend/decimal/structs.js","./_generated/suilend/lending-market/functions":"./_generated/suilend/lending-market/functions.js","./_generated/suilend/lending-market/structs":"./_generated/suilend/lending-market/structs.js","./_generated/suilend/lending-market-registry/functions":"./_generated/suilend/lending-market-registry/functions.js","./_generated/suilend/liquidity-mining/structs":"./_generated/suilend/liquidity-mining/structs.js","./_generated/suilend/obligation/structs":"./_generated/suilend/obligation/structs.js","./_generated/suilend/rate-limiter/functions":"./_generated/suilend/rate-limiter/functions.js","./_generated/suilend/rate-limiter/structs":"./_generated/suilend/rate-limiter/structs.js","./_generated/suilend/reserve/structs":"./_generated/suilend/reserve/structs.js","./_generated/suilend/reserve-config/functions":"./_generated/suilend/reserve-config/functions.js","./_generated/suilend/reserve-config/structs":"./_generated/suilend/reserve-config/structs.js","./_generated/_dependencies/source/0x1":"./_generated/_dependencies/source/0x1/index.js","./_generated/_dependencies/source/0x2":"./_generated/_dependencies/source/0x2/index.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/index.js","./_generated/_dependencies/source/0x1/ascii/structs":"./_generated/_dependencies/source/0x1/ascii/structs.js","./_generated/_dependencies/source/0x1/option/structs":"./_generated/_dependencies/source/0x1/option/structs.js","./_generated/_dependencies/source/0x1/type-name/structs":"./_generated/_dependencies/source/0x1/type-name/structs.js","./_generated/_dependencies/source/0x2/bag/structs":"./_generated/_dependencies/source/0x2/bag/structs.js","./_generated/_dependencies/source/0x2/balance/structs":"./_generated/_dependencies/source/0x2/balance/structs.js","./_generated/_dependencies/source/0x2/object/structs":"./_generated/_dependencies/source/0x2/object/structs.js","./_generated/_dependencies/source/0x2/object-table/structs":"./_generated/_dependencies/source/0x2/object-table/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/i64/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/i64/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-feed/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-feed/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-identifier/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-identifier/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-info/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-info/structs.js"},"types":"./index.js","scripts":{"build":"rm -rf ./dist && bun tsc","eslint":"eslint --fix \"./src/**/*.ts\"","prettier":"prettier --write \"./src/**/*\"","lint":"bun eslint && bun prettier && bun tsc --noEmit","release":"bun run build && bun ts-node ./release.ts && cd ./dist && npm publish --access public"},"repository":{"type":"git","url":"git+https://github.com/solendprotocol/suilend-public.git"},"bugs":{"url":"https://github.com/solendprotocol/suilend-public/issues"},"dependencies":{"@pythnetwork/pyth-sui-js":"^2.1.0","bignumber.js":"^9.1.2","p-limit":"3.1.0","uuid":"^11.0.3"},"devDependencies":{"ts-node":"^10.9.2"},"peerDependencies":{"@mysten/bcs":"1.2.1","@mysten/sui":"1.20.0","@suilend/frontend-sui":"^0.2.33"}}
+{"name":"@suilend/sdk","version":"1.1.39","private":false,"description":"A TypeScript SDK for interacting with the Suilend program","author":"Suilend","license":"MIT","main":"./index.js","exports":{".":"./index.js","./client":"./client.js","./api/events":"./api/events.js","./api":"./api/index.js","./lib/constants":"./lib/constants.js","./lib":"./lib/index.js","./lib/initialize":"./lib/initialize.js","./lib/liquidityMining":"./lib/liquidityMining.js","./lib/transactions":"./lib/transactions.js","./lib/types":"./lib/types.js","./parsers/apiReserveAssetDataEvent":"./parsers/apiReserveAssetDataEvent.js","./parsers":"./parsers/index.js","./parsers/lendingMarket":"./parsers/lendingMarket.js","./parsers/obligation":"./parsers/obligation.js","./parsers/rateLimiter":"./parsers/rateLimiter.js","./parsers/reserve":"./parsers/reserve.js","./utils/events":"./utils/events.js","./utils":"./utils/index.js","./utils/obligation":"./utils/obligation.js","./utils/simulate":"./utils/simulate.js","./_generated/_framework/reified":"./_generated/_framework/reified.js","./_generated/_framework/util":"./_generated/_framework/util.js","./_generated/_framework/vector":"./_generated/_framework/vector.js","./_generated/suilend":"./_generated/suilend/index.js","./_generated/suilend/cell/structs":"./_generated/suilend/cell/structs.js","./_generated/suilend/decimal/structs":"./_generated/suilend/decimal/structs.js","./_generated/suilend/lending-market/functions":"./_generated/suilend/lending-market/functions.js","./_generated/suilend/lending-market/structs":"./_generated/suilend/lending-market/structs.js","./_generated/suilend/lending-market-registry/functions":"./_generated/suilend/lending-market-registry/functions.js","./_generated/suilend/liquidity-mining/structs":"./_generated/suilend/liquidity-mining/structs.js","./_generated/suilend/obligation/structs":"./_generated/suilend/obligation/structs.js","./_generated/suilend/rate-limiter/functions":"./_generated/suilend/rate-limiter/functions.js","./_generated/suilend/rate-limiter/structs":"./_generated/suilend/rate-limiter/structs.js","./_generated/suilend/reserve/structs":"./_generated/suilend/reserve/structs.js","./_generated/suilend/reserve-config/functions":"./_generated/suilend/reserve-config/functions.js","./_generated/suilend/reserve-config/structs":"./_generated/suilend/reserve-config/structs.js","./_generated/_dependencies/source/0x1":"./_generated/_dependencies/source/0x1/index.js","./_generated/_dependencies/source/0x2":"./_generated/_dependencies/source/0x2/index.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/index.js","./_generated/_dependencies/source/0x1/ascii/structs":"./_generated/_dependencies/source/0x1/ascii/structs.js","./_generated/_dependencies/source/0x1/option/structs":"./_generated/_dependencies/source/0x1/option/structs.js","./_generated/_dependencies/source/0x1/type-name/structs":"./_generated/_dependencies/source/0x1/type-name/structs.js","./_generated/_dependencies/source/0x2/bag/structs":"./_generated/_dependencies/source/0x2/bag/structs.js","./_generated/_dependencies/source/0x2/balance/structs":"./_generated/_dependencies/source/0x2/balance/structs.js","./_generated/_dependencies/source/0x2/object/structs":"./_generated/_dependencies/source/0x2/object/structs.js","./_generated/_dependencies/source/0x2/object-table/structs":"./_generated/_dependencies/source/0x2/object-table/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/i64/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/i64/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-feed/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-feed/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-identifier/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-identifier/structs.js","./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-info/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-info/structs.js"},"types":"./index.js","scripts":{"build":"rm -rf ./dist && bun tsc","eslint":"eslint --fix \"./src/**/*.ts\"","prettier":"prettier --write \"./src/**/*\"","lint":"bun eslint && bun prettier && bun tsc --noEmit","release":"bun run build && bun ts-node ./release.ts && cd ./dist && npm publish --access public"},"repository":{"type":"git","url":"git+https://github.com/solendprotocol/suilend-public.git"},"bugs":{"url":"https://github.com/solendprotocol/suilend-public/issues"},"dependencies":{"@pythnetwork/pyth-sui-js":"^2.1.0","bignumber.js":"^9.1.2","p-limit":"3.1.0","uuid":"^11.0.3"},"devDependencies":{"ts-node":"^10.9.2"},"peerDependencies":{"@mysten/bcs":"1.2.1","@mysten/sui":"1.20.0","@suilend/frontend-sui":"^0.2.38"}}

package/parsers/lendingMarket.d.ts

@@ -3,8 +3,9 @@ import BigNumber from "bignumber.js";
 import { LendingMarket } from "../_generated/suilend/lending-market/structs";
 import { Reserve } from "../_generated/suilend/reserve/structs";
 export type ParsedLendingMarket = ReturnType<typeof parseLendingMarket>;
-export declare const parseLendingMarket: (lendingMarket: LendingMarket<string>, reserves: Reserve<string>[], coinMetadataMap: Record<string, CoinMetadata>, currentTime: number) => {
+export declare const parseLendingMarket: (lendingMarket: LendingMarket<string>, reserves: Reserve<string>[], coinMetadataMap: Record<string, CoinMetadata>, nowS: number) => {
     id: string;
+    type: string;
     version: bigint;
     reserves: {
         config: {
@@ -132,6 +133,8 @@ export declare const parseLendingMarket: (lendingMarket: LendingMarket<string>,
     depositedAmountUsd: BigNumber;
     borrowedAmountUsd: BigNumber;
     tvlUsd: BigNumber;
+    name: string;
+    ownerCapId: string;
     /**
      * @deprecated since version 1.0.3. Use `depositedAmountUsd` instead.
      */

package/parsers/lendingMarket.js

@@ -5,14 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseLendingMarket = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const client_1 = require("../client");
 const rateLimiter_1 = require("./rateLimiter");
 const reserve_1 = require("./reserve");
-const parseLendingMarket = (lendingMarket, reserves, coinMetadataMap, currentTime) => {
+const parseLendingMarket = (lendingMarket, reserves, coinMetadataMap, nowS) => {
+    var _a, _b;
     const id = lendingMarket.id;
+    const type = lendingMarket.$typeArgs[0];
     const version = lendingMarket.version;
     const parsedReserves = reserves.map((reserve) => (0, reserve_1.parseReserve)(reserve, coinMetadataMap));
     const obligations = lendingMarket.obligations;
-    const parsedRateLimiter = (0, rateLimiter_1.parseRateLimiter)(lendingMarket.rateLimiter, currentTime);
+    const parsedRateLimiter = (0, rateLimiter_1.parseRateLimiter)(lendingMarket.rateLimiter, nowS);
     const feeReceiver = lendingMarket.feeReceiver;
     const badDebtUsd = new bignumber_js_1.default(lendingMarket.badDebtUsd.value.toString());
     const badDebtLimitUsd = new bignumber_js_1.default(lendingMarket.badDebtLimitUsd.value.toString());
@@ -25,8 +28,14 @@ const parseLendingMarket = (lendingMarket, reserves, coinMetadataMap, currentTim
         borrowedAmountUsd = borrowedAmountUsd.plus(parsedReserve.borrowedAmountUsd);
         tvlUsd = tvlUsd.plus(parsedReserve.availableAmountUsd);
     });
+    const LENDING_MARKET = client_1.LENDING_MARKETS.find((lm) => lm.id === id);
+    if (!LENDING_MARKET)
+        console.error(`Missing LENDING_MARKETS definition for lending market with id: ${id}`);
+    const name = (_a = LENDING_MARKET === null || LENDING_MARKET === void 0 ? void 0 : LENDING_MARKET.name) !== null && _a !== void 0 ? _a : "Unknown";
+    const ownerCapId = (_b = LENDING_MARKET === null || LENDING_MARKET === void 0 ? void 0 : LENDING_MARKET.ownerCapId) !== null && _b !== void 0 ? _b : "Unknown";
     return {
         id,
+        type,
         version,
         reserves: parsedReserves,
         obligations,
@@ -37,6 +46,8 @@ const parseLendingMarket = (lendingMarket, reserves, coinMetadataMap, currentTim
         depositedAmountUsd,
         borrowedAmountUsd,
         tvlUsd,
+        name,
+        ownerCapId,
         /**
          * @deprecated since version 1.0.3. Use `depositedAmountUsd` instead.
          */

package/parsers/rateLimiter.d.ts

@@ -2,7 +2,7 @@ import BigNumber from "bignumber.js";
 import { RateLimiter } from "../_generated/suilend/rate-limiter/structs";
 export type ParsedRateLimiter = ReturnType<typeof parseRateLimiter>;
 export type ParsedRateLimiterConfig = ReturnType<typeof parseRateLimiterConfig>;
-export declare const parseRateLimiter: (rateLimiter: RateLimiter, currentTime: number) => {
+export declare const parseRateLimiter: (rateLimiter: RateLimiter, nowS: number) => {
     config: {
         windowDuration: bigint;
         maxOutflow: bigint;

package/parsers/rateLimiter.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRateLimiterConfig = exports.parseRateLimiter = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("../lib/constants");
-const parseRateLimiter = (rateLimiter, currentTime) => {
+const parseRateLimiter = (rateLimiter, nowS) => {
     const config = (0, exports.parseRateLimiterConfig)(rateLimiter);
     const $typeName = rateLimiter.$typeName;
     const prevQty = rateLimiter.prevQty.value;
@@ -14,7 +14,7 @@ const parseRateLimiter = (rateLimiter, currentTime) => {
     const curQty = rateLimiter.curQty.value;
     // Custom
     const prevWeight = new bignumber_js_1.default(config.windowDuration.toString())
-        .minus((BigInt(currentTime) - windowStart + BigInt(1)).toString())
+        .minus((BigInt(nowS) - windowStart + BigInt(1)).toString())
         .div(config.windowDuration.toString());
     const currentOutflow = prevWeight
         .times(new bignumber_js_1.default(prevQty.toString()))

package/utils/obligation.d.ts

@@ -1,7 +1,7 @@
 import { SuiClient } from "@mysten/sui/client";
 import { Obligation } from "../_generated/suilend/obligation/structs";
-export declare function fetchAllObligationsForMarketWithHandler(client: SuiClient, marketAddress: string, chunkHandler: (obligations: Obligation<string>[]) => Promise<void>): Promise<void>;
-export declare function fetchAllObligationsForMarket(client: SuiClient, marketAddress: string): Promise<Obligation<string>[]>;
+export declare function fetchAllObligationsForMarketWithHandler(client: SuiClient, lendingMarketId: string, lendingMarketType: string, chunkHandler: (obligations: Obligation<string>[]) => Promise<void>): Promise<void>;
+export declare function fetchAllObligationsForMarket(client: SuiClient, lendingMarketId: string, lendingMarketType: string): Promise<Obligation<string>[]>;
 export type FormattedObligationHistory = NonLiquidationHistoryEvent | LiquidationHistoryEvent;
 export type NonLiquidationHistoryEvent = {
     reserveId: string;

package/utils/obligation.js

@@ -53,14 +53,13 @@ const p_limit_1 = __importDefault(require("p-limit"));
 const reified_1 = require("../_generated/_framework/reified");
 const suilend_1 = require("../_generated/suilend");
 const structs_1 = require("../_generated/suilend/obligation/structs");
-const client_1 = require("../client");
 const parsed = __importStar(require("./events"));
-function fetchAllObligationsForMarketWithHandler(client, marketAddress, chunkHandler) {
+function fetchAllObligationsForMarketWithHandler(client, lendingMarketId, lendingMarketType, chunkHandler) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
         const limit = (0, p_limit_1.default)(30);
         const rawLendingMarket = yield client.getObject({
-            id: marketAddress,
+            id: lendingMarketId,
             options: {
                 showType: true,
                 showContent: true,
@@ -86,7 +85,7 @@ function fetchAllObligationsForMarketWithHandler(client, marketAddress, chunkHan
                 const obligationObjects = yield chunkedMultiGet(client, response.data.map((x) => x.objectId));
                 const obligations = [];
                 for (const rawObligation of obligationObjects) {
-                    obligations.push(structs_1.Obligation.fromBcs((0, reified_1.phantom)(client_1.LENDING_MARKET_TYPE), (0, utils_1.fromBase64)(((_a = rawObligation.data) === null || _a === void 0 ? void 0 : _a.bcs).bcsBytes)));
+                    obligations.push(structs_1.Obligation.fromBcs((0, reified_1.phantom)(lendingMarketType), (0, utils_1.fromBase64)(((_a = rawObligation.data) === null || _a === void 0 ? void 0 : _a.bcs).bcsBytes)));
                 }
                 yield chunkHandler(obligations);
             })));
@@ -94,11 +93,11 @@ function fetchAllObligationsForMarketWithHandler(client, marketAddress, chunkHan
         yield Promise.all(promises);
     });
 }
-function fetchAllObligationsForMarket(client, marketAddress) {
+function fetchAllObligationsForMarket(client, lendingMarketId, lendingMarketType) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const rawLendingMarket = yield client.getObject({
-            id: marketAddress,
+            id: lendingMarketId,
             options: {
                 showType: true,
                 showContent: true,
@@ -124,7 +123,7 @@ function fetchAllObligationsForMarket(client, marketAddress) {
         const obligationObjects = yield chunkedMultiGet(client, fields.map((x) => x.objectId));
         const obligations = [];
         for (const rawObligation of obligationObjects) {
-            obligations.push(structs_1.Obligation.fromBcs((0, reified_1.phantom)(client_1.LENDING_MARKET_TYPE), (0, utils_1.fromBase64)(((_b = rawObligation.data) === null || _b === void 0 ? void 0 : _b.bcs).bcsBytes)));
+            obligations.push(structs_1.Obligation.fromBcs((0, reified_1.phantom)(lendingMarketType), (0, utils_1.fromBase64)(((_b = rawObligation.data) === null || _b === void 0 ? void 0 : _b.bcs).bcsBytes)));
         }
         return obligations;
     });

package/utils/simulate.d.ts

@@ -19,10 +19,10 @@ export declare const calculateBorrowAprPercent: (reserve: Reserve<string>) => Bi
  */
 export declare const calculateSupplyApr: (reserve: Reserve<string>) => BigNumber;
 export declare const calculateDepositAprPercent: (reserve: Reserve<string>) => BigNumber;
-export declare const compoundReserveInterest: (reserve: Reserve<string>, now: number) => Reserve<string>;
+export declare const compoundReserveInterest: (reserve: Reserve<string>, nowS: number) => Reserve<string>;
 export declare const updatePoolRewardsManager: (manager: PoolRewardManager, nowMs: number) => PoolRewardManager;
 export declare const refreshReservePrice: (reserves: Reserve<string>[], pythConnection: SuiPriceServiceConnection) => Promise<Reserve<string>[]>;
-export declare const updateUserRewardManager: (poolManager: PoolRewardManager, userRewardManager: UserRewardManager, now: number) => UserRewardManager;
+export declare const updateUserRewardManager: (poolManager: PoolRewardManager, userRewardManager: UserRewardManager, nowMs: number) => UserRewardManager;
 export declare const refreshObligation: (unrefreshedObligation: Obligation<string>, refreshedReserves: Reserve<string>[]) => Obligation<string>;
 export declare const numberToDecimal: (value: number) => Decimal;
 export declare const stringToDecimal: (value: string) => Decimal;

package/utils/simulate.js

@@ -79,9 +79,9 @@ const calculateDepositAprPercent = (reserve) => {
     return (0, exports.calculateSupplyApr)(reserve);
 };
 exports.calculateDepositAprPercent = calculateDepositAprPercent;
-const compoundReserveInterest = (reserve, now) => {
+const compoundReserveInterest = (reserve, nowS) => {
     var _a, _b;
-    const timeElapsedSeconds = now - Number(reserve.interestLastUpdateTimestampS);
+    const timeElapsedSeconds = nowS - Number(reserve.interestLastUpdateTimestampS);
     if (timeElapsedSeconds === 0) {
         return reserve;
     }
@@ -102,9 +102,9 @@ const compoundReserveInterest = (reserve, now) => {
         .plus(netNewDebt.multipliedBy(spreadFee.dividedBy(10000)))
         .toString());
     updatedReserve.borrowedAmount = (0, exports.stringToDecimal)(oldBorrowedAmount.plus(netNewDebt).toString());
-    updatedReserve.interestLastUpdateTimestampS = BigInt(now);
-    updatedReserve.depositsPoolRewardManager = (0, exports.updatePoolRewardsManager)(updatedReserve.depositsPoolRewardManager, now * 1000);
-    updatedReserve.borrowsPoolRewardManager = (0, exports.updatePoolRewardsManager)(updatedReserve.borrowsPoolRewardManager, now * 1000);
+    updatedReserve.interestLastUpdateTimestampS = BigInt(nowS);
+    updatedReserve.depositsPoolRewardManager = (0, exports.updatePoolRewardsManager)(updatedReserve.depositsPoolRewardManager, nowS * 1000);
+    updatedReserve.borrowsPoolRewardManager = (0, exports.updatePoolRewardsManager)(updatedReserve.borrowsPoolRewardManager, nowS * 1000);
     return updatedReserve;
 };
 exports.compoundReserveInterest = compoundReserveInterest;
@@ -161,7 +161,7 @@ const refreshReservePrice = (reserves, pythConnection) => __awaiter(void 0, void
     return updatedReserves;
 });
 exports.refreshReservePrice = refreshReservePrice;
-const updateUserRewardManager = (poolManager, userRewardManager, now) => {
+const updateUserRewardManager = (poolManager, userRewardManager, nowMs) => {
     const updatedUserRewardManager = Object.assign({}, userRewardManager);
     for (let i = 0; i < poolManager.poolRewards.length; i++) {
         const poolReward = poolManager.poolRewards[i];
@@ -193,7 +193,7 @@ const updateUserRewardManager = (poolManager, userRewardManager, now) => {
             }
         }
     }
-    updatedUserRewardManager.lastUpdateTimeMs = BigInt(now);
+    updatedUserRewardManager.lastUpdateTimeMs = BigInt(nowMs);
     return updatedUserRewardManager;
 };
 exports.updateUserRewardManager = updateUserRewardManager;