@suilend/sdk 12.4.1 → 12.5.0

package/client.d.ts

@@ -53,6 +53,11 @@ export type ClaimRewardsReward = {
 export type PatchReserveConfigArgs = Partial<CreateReserveConfigArgs> & {
     confidenceMultiplierBps?: bigint | TransactionArgument;
 };
+export type LendingMarketObject = {
+    objectId: string;
+    type: string;
+    content: Uint8Array;
+};
 export declare class SuilendClient {
     lendingMarket: LendingMarket<string>;
     suiGrpcClient: SuiGrpcClient;
@@ -79,6 +84,10 @@ export declare class SuilendClient {
         id: string;
         type: string;
     }[], suiGrpcClient: SuiGrpcClient, logPackageId?: boolean): Promise<SuilendClient[]>;
+    static initializeAllFromObjects(lendingMarkets: {
+        id: string;
+        type: string;
+    }[], objects: readonly (LendingMarketObject | Error)[], publishedAt: string, suiGrpcClient: SuiGrpcClient, logPackageId?: boolean): SuilendClient[];
     static getFeeReceivers(suiGrpcClient: SuiGrpcClient, lendingMarketId: string): Promise<{
         receivers: string[];
         weights: string[];

package/client.js

@@ -1,5 +1,5 @@
 import { bcs } from "@mysten/sui/bcs";
-import { SUI_CLOCK_OBJECT_ID, SUI_SYSTEM_STATE_OBJECT_ID, normalizeStructTag, normalizeSuiObjectId, toHex, } from "@mysten/sui/utils";
+import { SUI_CLOCK_OBJECT_ID, SUI_SYSTEM_STATE_OBJECT_ID, isValidSuiAddress, normalizeStructTag, normalizeSuiObjectId, toHex, } from "@mysten/sui/utils";
 import { SuiPythClient } from "@pythnetwork/pyth-sui-js";
 import BigNumber from "bignumber.js";
 import { extractCTokenCoinType, getAllCoins, getSpendableCoin, } from "@suilend/sui-core";
@@ -237,6 +237,44 @@ async function findBagEntryByTypeSuffix(suiGrpcClient, parentId, typeSuffix) {
         cursor = response.cursor;
     }
 }
+function applyPublishedAt(publishedAt, logPackageId) {
+    if (logPackageId)
+        console.log("@suilend/sdk | publishedAt:", publishedAt);
+    setPublishedAt(publishedAt);
+}
+function clientsFromObjects(lendingMarkets, objects, suiGrpcClient) {
+    // Paired by objectId rather than by position: BatchGetObjectsResponse
+    // documents no ordering guarantee, and every object here is a
+    // LendingMarket, so a type check cannot catch a reordered response — it
+    // would silently attach the wrong type arg to a market.
+    const objectById = new Map();
+    const failures = [];
+    for (const object of objects) {
+        // The error branch of GetObjectResult carries no objectId, so a failed
+        // entry cannot be attributed by id. Rather than fall back to position —
+        // which the pairing above deliberately does not trust — failures are
+        // identified by which requested ids are missing below.
+        if (object instanceof Error)
+            failures.push(object);
+        else
+            objectById.set(normalizeSuiObjectId(object.objectId), object);
+    }
+    return lendingMarkets.map(({ id, type }) => {
+        const object = objectById.get(normalizeSuiObjectId(id));
+        if (!object)
+            throw new Error(`Failed to fetch lending market ${id}${failures.length > 0 ? `: ${failures[0].message}` : ""}`, failures.length > 0 ? { cause: failures[0] } : undefined);
+        // Compares the full parameterized type, not just the struct name: an
+        // id/type pair built from two drifted lists would otherwise pass and
+        // decode under the wrong phantom type.
+        const expectedType = normalizeStructTag(`${PACKAGE_ID}::lending_market::LendingMarket<${type}>`);
+        if (normalizeStructTag(object.type) !== expectedType)
+            throw new Error(`object at id ${id} is not a LendingMarket<${type}> (got ${object.type})`);
+        const lendingMarket = LendingMarket.fromBcs(phantom(type), object.content);
+        if (normalizeSuiObjectId(lendingMarket.id) !== normalizeSuiObjectId(id))
+            throw new Error(`object at id ${id} decodes to lending market ${lendingMarket.id}`);
+        return new SuilendClient(lendingMarket, suiGrpcClient);
+    });
+}
 export class SuilendClient {
     lendingMarket;
     suiGrpcClient;
@@ -280,9 +318,7 @@ export class SuilendClient {
     static async initialize(lendingMarketId, lendingMarketType, suiGrpcClient, logPackageId) {
         const lendingMarket = await LendingMarket.fetch(suiGrpcClient, phantom(lendingMarketType), lendingMarketId);
         const publishedAt = await getLatestPackageId(suiGrpcClient, SUILEND_UPGRADE_CAP_ID);
-        if (logPackageId)
-            console.log("@suilend/sdk | publishedAt:", publishedAt);
-        setPublishedAt(publishedAt);
+        applyPublishedAt(publishedAt, logPackageId);
         return new SuilendClient(lendingMarket, suiGrpcClient);
     }
     /**
@@ -293,44 +329,29 @@ export class SuilendClient {
         // Refreshed even for an empty list, so PUBLISHED_AT parity with
         // initialize() holds for every call — move-call targets are built off that
         // module global regardless of how many clients came back.
-        const publishedAt = await getLatestPackageId(suiGrpcClient, SUILEND_UPGRADE_CAP_ID);
-        if (logPackageId)
-            console.log("@suilend/sdk | publishedAt:", publishedAt);
-        setPublishedAt(publishedAt);
-        if (lendingMarkets.length === 0)
-            return [];
-        const { objects } = await suiGrpcClient.getObjects({
-            objectIds: lendingMarkets.map((lendingMarket) => lendingMarket.id),
-            include: { content: true },
-        });
-        // Paired by objectId rather than by position: BatchGetObjectsResponse
-        // documents no ordering guarantee, and every object here is a
-        // LendingMarket, so a type check cannot catch a reordered response — it
-        // would silently attach the wrong type arg to a market.
-        const objectById = new Map();
-        const failures = [];
-        for (const object of objects) {
-            // The error branch of GetObjectResult carries no objectId, so a failed
-            // entry cannot be attributed by id. Rather than fall back to position —
-            // which the pairing above deliberately does not trust — failures are
-            // identified by which requested ids are missing below.
-            if (object instanceof Error)
-                failures.push(object);
-            else
-                objectById.set(normalizeSuiObjectId(object.objectId), object);
-        }
-        return lendingMarkets.map(({ id, type }) => {
-            const object = objectById.get(normalizeSuiObjectId(id));
-            if (!object)
-                throw new Error(`Failed to fetch lending market ${id}${failures.length > 0 ? `: ${failures[0].message}` : ""}`, failures.length > 0 ? { cause: failures[0] } : undefined);
-            // Compares the full parameterized type, not just the struct name: an
-            // id/type pair built from two drifted lists would otherwise pass and
-            // decode under the wrong phantom type.
-            const expectedType = normalizeStructTag(`${PACKAGE_ID}::lending_market::LendingMarket<${type}>`);
-            if (normalizeStructTag(object.type) !== expectedType)
-                throw new Error(`object at id ${id} is not a LendingMarket<${type}> (got ${object.type})`);
-            return new SuilendClient(LendingMarket.fromBcs(phantom(type), object.content), suiGrpcClient);
-        });
+        const [packageId, objects] = await Promise.allSettled([
+            getLatestPackageId(suiGrpcClient, SUILEND_UPGRADE_CAP_ID).then((publishedAt) => applyPublishedAt(publishedAt, logPackageId)),
+            lendingMarkets.length === 0
+                ? []
+                : suiGrpcClient
+                    .getObjects({
+                    objectIds: lendingMarkets.map((lendingMarket) => lendingMarket.id),
+                    include: { content: true },
+                })
+                    .then((response) => response.objects),
+        ]);
+        if (packageId.status === "rejected")
+            throw packageId.reason;
+        if (objects.status === "rejected")
+            throw objects.reason;
+        return clientsFromObjects(lendingMarkets, objects.value, suiGrpcClient);
+    }
+    static initializeAllFromObjects(lendingMarkets, objects, publishedAt, suiGrpcClient, logPackageId) {
+        if (!isValidSuiAddress(publishedAt))
+            throw new Error(`publishedAt ${publishedAt} is not a Sui package id`);
+        const clients = clientsFromObjects(lendingMarkets, objects, suiGrpcClient);
+        applyPublishedAt(publishedAt, logPackageId);
+        return clients;
     }
     static async getFeeReceivers(suiGrpcClient, lendingMarketId) {
         const json = await fetchDynamicFieldJson(suiGrpcClient, lendingMarketId, `${PKG_V10}::lending_market::FeeReceiversKey`);

package/lib/initialize.d.ts

@@ -59,8 +59,8 @@ export declare const refreshReservesForInitialize: (reserves: Reserve<string>[],
  * inline in it cannot be tested, and "is this price real" is not something to
  * leave unverified.
  */
-export declare const priceTemporaryPythFeedReserves: (reserves: Reserve<string>[], fetchPrices?: (coinTypes: string[]) => Promise<Record<string, number | undefined>>) => Promise<string[]>;
-export declare const priceTemporaryPythFeedReservesAll: (reservesByMarket: Reserve<string>[][], fetchPrices?: (coinTypes: string[]) => Promise<Record<string, number | undefined>>) => Promise<string[][]>;
+export declare const priceTemporaryPythFeedReserves: (reserves: Reserve<string>[], fetchPrices?: FetchPrices) => Promise<string[]>;
+export declare const priceTemporaryPythFeedReservesAll: (reservesByMarket: Reserve<string>[][], fetchPrices?: FetchPrices) => Promise<string[][]>;
 export type InitializeSuilendOptions = {
     /**
      * Price connection to use instead of the one this function would build.
@@ -141,11 +141,273 @@ export type InitializeSuilendOptions = {
      * prices them at literal zero.
      */
     tolerateMissingPriceFeeds?: boolean;
+    fetchPrices?: FetchPrices;
 };
-export declare const initializeSuilendAll: (suiGrpcClient: SuiGrpcClient, markets: {
+export type FetchPrices = (coinTypes: string[]) => Promise<Record<string, number | undefined>>;
+type InitializeSuilendMarket = {
     suilendClient: SuilendClient;
     lendingMarketMetadata?: LendingMarketMetadata;
-}[], fallbackPythEndpoint?: string, options?: InitializeSuilendOptions) => Promise<{
+};
+export declare const initializeSuilendAll: (suiGrpcClient: SuiGrpcClient, markets: InitializeSuilendMarket[], fallbackPythEndpoint?: string, options?: InitializeSuilendOptions) => Promise<{
+    lendingMarket: {
+        version: bigint;
+        reserves: {
+            config: {
+                $typeName: string;
+                openLtvPct: number;
+                closeLtvPct: number;
+                maxCloseLtvPct: number;
+                borrowWeightBps: BigNumber;
+                depositLimit: BigNumber;
+                borrowLimit: BigNumber;
+                liquidationBonusBps: number;
+                maxLiquidationBonusBps: number;
+                depositLimitUsd: BigNumber;
+                borrowLimitUsd: BigNumber;
+                borrowFeeBps: number;
+                spreadFeeBps: number;
+                protocolLiquidationFeeBps: number;
+                isolated: boolean;
+                openAttributedBorrowLimitUsd: number;
+                closeAttributedBorrowLimitUsd: number;
+                additionalFields: import("../_generated/_dependencies/source/0x2/bag/structs").Bag;
+                interestRate: {
+                    id: string;
+                    utilPercent: BigNumber;
+                    aprPercent: BigNumber;
+                }[];
+            };
+            $typeName: string;
+            id: string;
+            arrayIndex: bigint;
+            coinType: string;
+            mintDecimals: number;
+            priceIdentifier: string;
+            price: BigNumber;
+            smoothedPrice: BigNumber;
+            minPrice: BigNumber;
+            maxPrice: BigNumber;
+            priceLastUpdateTimestampS: bigint;
+            availableAmount: BigNumber;
+            ctokenSupply: BigNumber;
+            borrowedAmount: BigNumber;
+            cumulativeBorrowRate: BigNumber;
+            interestLastUpdateTimestampS: bigint;
+            unclaimedSpreadFees: BigNumber;
+            attributedBorrowValue: BigNumber;
+            depositsPoolRewardManager: {
+                $typeName: string;
+                id: string;
+                totalShares: bigint;
+                poolRewards: {
+                    $typeName: string;
+                    id: string;
+                    poolRewardManagerId: string;
+                    coinType: string;
+                    startTimeMs: number;
+                    endTimeMs: number;
+                    totalRewards: BigNumber;
+                    allocatedRewards: BigNumber;
+                    cumulativeRewardsPerShare: BigNumber;
+                    numUserRewardManagers: bigint;
+                    rewardIndex: number;
+                    symbol: string;
+                    mintDecimals: number;
+                }[];
+                lastUpdateTimeMs: bigint;
+            };
+            borrowsPoolRewardManager: {
+                $typeName: string;
+                id: string;
+                totalShares: bigint;
+                poolRewards: {
+                    $typeName: string;
+                    id: string;
+                    poolRewardManagerId: string;
+                    coinType: string;
+                    startTimeMs: number;
+                    endTimeMs: number;
+                    totalRewards: BigNumber;
+                    allocatedRewards: BigNumber;
+                    cumulativeRewardsPerShare: BigNumber;
+                    numUserRewardManagers: bigint;
+                    rewardIndex: number;
+                    symbol: string;
+                    mintDecimals: number;
+                }[];
+                lastUpdateTimeMs: bigint;
+            };
+            availableAmountUsd: BigNumber;
+            borrowedAmountUsd: BigNumber;
+            depositedAmount: BigNumber;
+            depositedAmountUsd: BigNumber;
+            cTokenExchangeRate: BigNumber;
+            borrowAprPercent: BigNumber;
+            depositAprPercent: BigNumber;
+            utilizationPercent: BigNumber;
+            token: {
+                id: string | null;
+                decimals: number;
+                name: string;
+                symbol: string;
+                description: string;
+                iconUrl: string | null;
+                coinType: string;
+            };
+            symbol: string;
+            name: string;
+            iconUrl: string | null;
+            description: string;
+            totalDeposits: BigNumber;
+        }[];
+        obligations: import("../_generated/_dependencies/source/0x2/object-table/structs").ObjectTable<"0x2::object::ID", `0x1f54a9a2d71799553197e9ea24557797c6398d6a65f2d4d3818c9304b75d5e21::obligation::Obligation<${string}>` | `0xf95b06141ed4a174f239417323bde3f209b972f5930d8521ea38a52aff3a6ddf::obligation::Obligation<${string}>`>;
+        rateLimiter: {
+            config: {
+                windowDuration: bigint;
+                maxOutflow: bigint;
+            };
+            $typeName: string;
+            prevQty: bigint;
+            windowStart: bigint;
+            curQty: bigint;
+            remainingOutflow: BigNumber;
+        };
+        feeReceiver: string;
+        badDebtUsd: BigNumber;
+        badDebtLimitUsd: BigNumber;
+        depositedAmountUsd: BigNumber;
+        borrowedAmountUsd: BigNumber;
+        tvlUsd: BigNumber;
+        id: string;
+        type: string;
+        ownerCapId: string | undefined;
+        name: string;
+        isHidden: boolean;
+        iconUrl: string | null;
+        description: string | null;
+        totalSupplyUsd: BigNumber;
+        totalBorrowUsd: BigNumber;
+    };
+    coinMetadataMap: Record<string, import("@suilend/sui-core").Token>;
+    refreshedRawReserves: Reserve<string>[];
+    unpricedCoinTypes: string[];
+    reserveMap: Record<string, {
+        config: {
+            $typeName: string;
+            openLtvPct: number;
+            closeLtvPct: number;
+            maxCloseLtvPct: number;
+            borrowWeightBps: BigNumber;
+            depositLimit: BigNumber;
+            borrowLimit: BigNumber;
+            liquidationBonusBps: number;
+            maxLiquidationBonusBps: number;
+            depositLimitUsd: BigNumber;
+            borrowLimitUsd: BigNumber;
+            borrowFeeBps: number;
+            spreadFeeBps: number;
+            protocolLiquidationFeeBps: number;
+            isolated: boolean;
+            openAttributedBorrowLimitUsd: number;
+            closeAttributedBorrowLimitUsd: number;
+            additionalFields: import("../_generated/_dependencies/source/0x2/bag/structs").Bag;
+            interestRate: {
+                id: string;
+                utilPercent: BigNumber;
+                aprPercent: BigNumber;
+            }[];
+        };
+        $typeName: string;
+        id: string;
+        arrayIndex: bigint;
+        coinType: string;
+        mintDecimals: number;
+        priceIdentifier: string;
+        price: BigNumber;
+        smoothedPrice: BigNumber;
+        minPrice: BigNumber;
+        maxPrice: BigNumber;
+        priceLastUpdateTimestampS: bigint;
+        availableAmount: BigNumber;
+        ctokenSupply: BigNumber;
+        borrowedAmount: BigNumber;
+        cumulativeBorrowRate: BigNumber;
+        interestLastUpdateTimestampS: bigint;
+        unclaimedSpreadFees: BigNumber;
+        attributedBorrowValue: BigNumber;
+        depositsPoolRewardManager: {
+            $typeName: string;
+            id: string;
+            totalShares: bigint;
+            poolRewards: {
+                $typeName: string;
+                id: string;
+                poolRewardManagerId: string;
+                coinType: string;
+                startTimeMs: number;
+                endTimeMs: number;
+                totalRewards: BigNumber;
+                allocatedRewards: BigNumber;
+                cumulativeRewardsPerShare: BigNumber;
+                numUserRewardManagers: bigint;
+                rewardIndex: number;
+                symbol: string;
+                mintDecimals: number;
+            }[];
+            lastUpdateTimeMs: bigint;
+        };
+        borrowsPoolRewardManager: {
+            $typeName: string;
+            id: string;
+            totalShares: bigint;
+            poolRewards: {
+                $typeName: string;
+                id: string;
+                poolRewardManagerId: string;
+                coinType: string;
+                startTimeMs: number;
+                endTimeMs: number;
+                totalRewards: BigNumber;
+                allocatedRewards: BigNumber;
+                cumulativeRewardsPerShare: BigNumber;
+                numUserRewardManagers: bigint;
+                rewardIndex: number;
+                symbol: string;
+                mintDecimals: number;
+            }[];
+            lastUpdateTimeMs: bigint;
+        };
+        availableAmountUsd: BigNumber;
+        borrowedAmountUsd: BigNumber;
+        depositedAmount: BigNumber;
+        depositedAmountUsd: BigNumber;
+        cTokenExchangeRate: BigNumber;
+        borrowAprPercent: BigNumber;
+        depositAprPercent: BigNumber;
+        utilizationPercent: BigNumber;
+        token: {
+            id: string | null;
+            decimals: number;
+            name: string;
+            symbol: string;
+            description: string;
+            iconUrl: string | null;
+            coinType: string;
+        };
+        symbol: string;
+        name: string;
+        iconUrl: string | null;
+        description: string;
+        totalDeposits: BigNumber;
+    }>;
+    reserveCoinTypes: string[];
+    reserveCoinMetadataMap: Record<string, import("@suilend/sui-core").Token>;
+    rewardCoinTypes: string[];
+    activeRewardCoinTypes: string[];
+    rewardCoinMetadataMap: Record<string, import("@suilend/sui-core").Token>;
+}[]>;
+export declare const initializeSuilendWithRewardsAll: (suiGrpcClient: SuiGrpcClient, markets: InitializeSuilendMarket[], fallbackPythEndpoint?: string, options?: InitializeSuilendOptions) => Promise<{
+    rewardPriceMap: Record<string, BigNumber | undefined>;
     lendingMarket: {
         version: bigint;
         reserves: {
@@ -664,10 +926,10 @@ export declare const initializeSuilend: (suiGrpcClient: SuiGrpcClient, suilendCl
 export declare const initializeSuilendRewardsAll: (markets: {
     reserveMap: Record<string, ParsedReserve>;
     activeRewardCoinTypes: string[];
-}[], fetchPrices?: (coinTypes: string[]) => Promise<Record<string, number | undefined>>) => Promise<{
+}[], fetchPrices?: FetchPrices) => Promise<{
     rewardPriceMap: Record<string, BigNumber | undefined>;
 }[]>;
-export declare const initializeSuilendRewards: (reserveMap: Record<string, ParsedReserve>, activeRewardCoinTypes: string[], fetchPrices?: (coinTypes: string[]) => Promise<Record<string, number | undefined>>) => Promise<{
+export declare const initializeSuilendRewards: (reserveMap: Record<string, ParsedReserve>, activeRewardCoinTypes: string[], fetchPrices?: FetchPrices) => Promise<{
     rewardPriceMap: Record<string, BigNumber | undefined>;
 }>;
 export declare const initializeObligations: (suiGrpcClient: SuiGrpcClient, suilendClient: SuilendClient, refreshedRawReserves: Reserve<string>[], reserveMap: Record<string, ParsedReserve>, address?: string) => Promise<{
@@ -1192,3 +1454,4 @@ export declare const initializeObligations: (suiGrpcClient: SuiGrpcClient, suile
         minPriceBorrowLimit: BigNumber;
     }[];
 }>;
+export {};

package/lib/initialize.js

@@ -243,9 +243,58 @@ export const priceTemporaryPythFeedReservesAll = async (reservesByMarket, fetchP
     const fabricatedPriceCoinTypes = new Set(await priceTemporaryPythFeedReserves(reservesByMarket.flat(), fetchPrices));
     return reservesByMarket.map((reserves) => Array.from(new Set(reserves.map((reserve) => normalizeStructTag(reserve.coinType.name)))).filter((coinType) => fabricatedPriceCoinTypes.has(coinType)));
 };
-export const initializeSuilendAll = async (suiGrpcClient, markets, fallbackPythEndpoint, options) => {
+const marketCoinTypes = (reserves, nowMs) => {
+    const miscCoinTypes = [
+        NORMALIZED_SEND_POINTS_S1_COINTYPE,
+        NORMALIZED_SEND_POINTS_S2_COINTYPE,
+        NORMALIZED_SEND_COINTYPE,
+    ];
+    const reserveCoinTypes = [];
+    const rewardCoinTypes = [];
+    const activeRewardCoinTypes = [];
+    reserves.forEach((r) => {
+        reserveCoinTypes.push(normalizeStructTag(r.coinType.name));
+        [
+            ...r.depositsPoolRewardManager.poolRewards,
+            ...r.borrowsPoolRewardManager.poolRewards,
+        ].forEach((pr) => {
+            if (!pr)
+                return;
+            const isActive = nowMs >= Number(pr.startTimeMs) && nowMs < Number(pr.endTimeMs);
+            rewardCoinTypes.push(normalizeStructTag(pr.coinType.name));
+            if (isActive)
+                activeRewardCoinTypes.push(normalizeStructTag(pr.coinType.name));
+        });
+    });
+    return {
+        uniqueMiscCoinTypes: Array.from(new Set(miscCoinTypes)),
+        uniqueReserveCoinTypes: Array.from(new Set(reserveCoinTypes)),
+        uniqueRewardCoinTypes: Array.from(new Set(rewardCoinTypes)),
+        uniqueActiveRewardsCoinTypes: Array.from(new Set(activeRewardCoinTypes)),
+    };
+};
+const isUnpricedRewardCoinType = (coinType) => isSendPoints(coinType) ||
+    isSteammPoints(coinType) ||
+    coinType === NORMALIZED_MAYA_COINTYPE ||
+    coinType === NORMALIZED_mPOINTS_COINTYPE;
+const seedRewardPriceMap = (reserveMap) => {
+    const rewardPriceMap = Object.entries(reserveMap).reduce((acc, [coinType, reserve]) => ({ ...acc, [coinType]: reserve.price }), {});
+    rewardPriceMap[NORMALIZED_TREATS_COINTYPE] = new BigNumber(0.1);
+    return rewardPriceMap;
+};
+const fillRewardPriceMap = (rewardPriceMap, reservelessActiveRewardCoinTypes, cachedUsdPrices) => {
+    for (const coinType of reservelessActiveRewardCoinTypes) {
+        const cachedUsdPrice = cachedUsdPrices[coinType];
+        if (cachedUsdPrice === undefined)
+            continue;
+        rewardPriceMap[coinType] = new BigNumber(cachedUsdPrice);
+    }
+    return rewardPriceMap;
+};
+const initializeSuilendMarkets = async (markets, fallbackPythEndpoint, options, includeRewards) => {
     const nowMs = Date.now();
     const nowS = Math.floor(nowMs / 1000);
+    const fetchPrices = options?.fetchPrices ?? getPrices;
     const reservesByMarket = markets.map(({ suilendClient }) => {
         const withoutTemporaryPythPriceFeeds = [];
         const withTemporaryPythPriceFeeds = [];
@@ -260,10 +309,26 @@ export const initializeSuilendAll = async (suiGrpcClient, markets, fallbackPythE
         }
         return { withoutTemporaryPythPriceFeeds, withTemporaryPythPriceFeeds };
     });
-    const pythConnection = await resolvePythConnection(options?.pythConnection, fallbackPythEndpoint, options?.pythConnectionConfig);
-    const [refreshedWithoutTemporaryByMarket, fabricatedPriceCoinTypesByMarket] = await Promise.all([
-        refreshReservesForInitializeAll(reservesByMarket.map((r) => r.withoutTemporaryPythPriceFeeds), pythConnection, options?.tolerateMissingPriceFeeds),
-        priceTemporaryPythFeedReservesAll(reservesByMarket.map((r) => r.withTemporaryPythPriceFeeds)),
+    const coinTypesByMarket = reservesByMarket.map(({ withoutTemporaryPythPriceFeeds, withTemporaryPythPriceFeeds }) => marketCoinTypes([...withoutTemporaryPythPriceFeeds, ...withTemporaryPythPriceFeeds], nowMs));
+    const reservelessActiveRewardCoinTypesByMarket = coinTypesByMarket.map(({ uniqueReserveCoinTypes, uniqueActiveRewardsCoinTypes }) => uniqueActiveRewardsCoinTypes.filter((coinType) => !isUnpricedRewardCoinType(coinType) &&
+        coinType !== NORMALIZED_TREATS_COINTYPE &&
+        !uniqueReserveCoinTypes.includes(coinType)));
+    const [[refreshedWithoutTemporaryByMarket, fabricatedPriceCoinTypesByMarket], coinMetadataByMarket, rewardUsdPrices,] = await Promise.all([
+        Promise.all([
+            resolvePythConnection(options?.pythConnection, fallbackPythEndpoint, options?.pythConnectionConfig).then((pythConnection) => refreshReservesForInitializeAll(reservesByMarket.map((r) => r.withoutTemporaryPythPriceFeeds), pythConnection, options?.tolerateMissingPriceFeeds)),
+            priceTemporaryPythFeedReservesAll(reservesByMarket.map((r) => r.withTemporaryPythPriceFeeds), fetchPrices),
+        ]),
+        resolveCoinMetadataForInitializeAll(coinTypesByMarket.map(({ uniqueMiscCoinTypes, uniqueReserveCoinTypes, uniqueRewardCoinTypes, }) => ({
+            miscCoinTypes: uniqueMiscCoinTypes,
+            reserveCoinTypes: uniqueReserveCoinTypes,
+            rewardCoinTypes: uniqueRewardCoinTypes,
+        }))),
+        includeRewards
+            ? fetchPrices(Array.from(new Set(reservelessActiveRewardCoinTypesByMarket.flat()))).catch((err) => {
+                console.error(err);
+                return {};
+            })
+            : Promise.resolve({}),
     ]);
     const prepared = markets.map(({ suilendClient, lendingMarketMetadata }, index) => {
         const refreshedRawReserves = [
@@ -289,49 +354,15 @@ export const initializeSuilendAll = async (suiGrpcClient, markets, fallbackPythE
             ...refreshedWithoutTemporaryByMarket[index].unpricedCoinTypes,
             ...fabricatedPriceCoinTypesByMarket[index],
         ];
-        const miscCoinTypes = [
-            NORMALIZED_SEND_POINTS_S1_COINTYPE,
-            NORMALIZED_SEND_POINTS_S2_COINTYPE,
-            NORMALIZED_SEND_COINTYPE,
-        ];
-        const reserveCoinTypes = [];
-        const rewardCoinTypes = [];
-        const activeRewardCoinTypes = [];
-        refreshedRawReserves.forEach((r) => {
-            reserveCoinTypes.push(normalizeStructTag(r.coinType.name));
-            [
-                ...r.depositsPoolRewardManager.poolRewards,
-                ...r.borrowsPoolRewardManager.poolRewards,
-            ].forEach((pr) => {
-                if (!pr)
-                    return;
-                const isActive = nowMs >= Number(pr.startTimeMs) && nowMs < Number(pr.endTimeMs);
-                rewardCoinTypes.push(normalizeStructTag(pr.coinType.name));
-                if (isActive)
-                    activeRewardCoinTypes.push(normalizeStructTag(pr.coinType.name));
-            });
-        });
-        const uniqueMiscCoinTypes = Array.from(new Set(miscCoinTypes));
-        const uniqueReserveCoinTypes = Array.from(new Set(reserveCoinTypes));
-        const uniqueRewardCoinTypes = Array.from(new Set(rewardCoinTypes));
-        const uniqueActiveRewardsCoinTypes = Array.from(new Set(activeRewardCoinTypes));
         return {
             suilendClient,
             lendingMarketMetadata,
             refreshedRawReserves,
             unpricedCoinTypes,
-            uniqueMiscCoinTypes,
-            uniqueReserveCoinTypes,
-            uniqueRewardCoinTypes,
-            uniqueActiveRewardsCoinTypes,
+            ...coinTypesByMarket[index],
         };
     });
-    const coinMetadataByMarket = await resolveCoinMetadataForInitializeAll(prepared.map(({ uniqueMiscCoinTypes, uniqueReserveCoinTypes, uniqueRewardCoinTypes, }) => ({
-        miscCoinTypes: uniqueMiscCoinTypes,
-        reserveCoinTypes: uniqueReserveCoinTypes,
-        rewardCoinTypes: uniqueRewardCoinTypes,
-    })));
-    return prepared.map(({ suilendClient, lendingMarketMetadata, refreshedRawReserves, unpricedCoinTypes, uniqueReserveCoinTypes, uniqueRewardCoinTypes, uniqueActiveRewardsCoinTypes, }, index) => {
+    const initialized = prepared.map(({ suilendClient, lendingMarketMetadata, refreshedRawReserves, unpricedCoinTypes, uniqueReserveCoinTypes, uniqueRewardCoinTypes, uniqueActiveRewardsCoinTypes, }, index) => {
         const { coinMetadataMap, reserveCoinMetadataMap, rewardCoinMetadataMap } = coinMetadataByMarket[index];
         // const walReserve = refreshedRawReserves.find(
         //   (r) => normalizeStructTag(r.coinType.name) === NORMALIZED_WAL_COINTYPE,
@@ -362,6 +393,21 @@ export const initializeSuilendAll = async (suiGrpcClient, markets, fallbackPythE
             rewardCoinMetadataMap,
         };
     });
+    const rewardPriceMaps = includeRewards
+        ? initialized.map(({ reserveMap }, index) => fillRewardPriceMap(seedRewardPriceMap(reserveMap), reservelessActiveRewardCoinTypesByMarket[index], rewardUsdPrices))
+        : [];
+    return { initialized, rewardPriceMaps };
+};
+export const initializeSuilendAll = async (suiGrpcClient, markets, fallbackPythEndpoint, options) => {
+    const { initialized } = await initializeSuilendMarkets(markets, fallbackPythEndpoint, options, false);
+    return initialized;
+};
+export const initializeSuilendWithRewardsAll = async (suiGrpcClient, markets, fallbackPythEndpoint, options) => {
+    const { initialized, rewardPriceMaps } = await initializeSuilendMarkets(markets, fallbackPythEndpoint, options, true);
+    return initialized.map((market, index) => ({
+        ...market,
+        rewardPriceMap: rewardPriceMaps[index],
+    }));
 };
 export const initializeSuilend = async (suiGrpcClient, suilendClient, lendingMarketMetadata, fallbackPythEndpoint, options) => {
     const [initialized] = await initializeSuilendAll(suiGrpcClient, [{ suilendClient, lendingMarketMetadata }], fallbackPythEndpoint, options);
@@ -369,24 +415,14 @@ export const initializeSuilend = async (suiGrpcClient, suilendClient, lendingMar
 };
 export const initializeSuilendRewardsAll = async (markets, fetchPrices = getPrices) => {
     const seeded = markets.map(({ reserveMap, activeRewardCoinTypes }) => {
-        const rewardPriceMap = Object.entries(reserveMap).reduce((acc, [coinType, reserve]) => ({ ...acc, [coinType]: reserve.price }), {});
-        rewardPriceMap[NORMALIZED_TREATS_COINTYPE] = new BigNumber(0.1);
-        const reservelessActiveRewardCoinTypes = activeRewardCoinTypes.filter((coinType) => !(isSendPoints(coinType) ||
-            isSteammPoints(coinType) ||
-            coinType === NORMALIZED_MAYA_COINTYPE ||
-            coinType === NORMALIZED_mPOINTS_COINTYPE) && !rewardPriceMap[coinType]);
+        const rewardPriceMap = seedRewardPriceMap(reserveMap);
+        const reservelessActiveRewardCoinTypes = activeRewardCoinTypes.filter((coinType) => !isUnpricedRewardCoinType(coinType) && !rewardPriceMap[coinType]);
         return { rewardPriceMap, reservelessActiveRewardCoinTypes };
     });
     const cachedUsdPrices = await fetchPrices(Array.from(new Set(seeded.flatMap((m) => m.reservelessActiveRewardCoinTypes))));
-    return seeded.map(({ rewardPriceMap, reservelessActiveRewardCoinTypes }) => {
-        for (const coinType of reservelessActiveRewardCoinTypes) {
-            const cachedUsdPrice = cachedUsdPrices[coinType];
-            if (cachedUsdPrice === undefined)
-                continue;
-            rewardPriceMap[coinType] = new BigNumber(cachedUsdPrice);
-        }
-        return { rewardPriceMap };
-    });
+    return seeded.map(({ rewardPriceMap, reservelessActiveRewardCoinTypes }) => ({
+        rewardPriceMap: fillRewardPriceMap(rewardPriceMap, reservelessActiveRewardCoinTypes, cachedUsdPrices),
+    }));
 };
 export const initializeSuilendRewards = async (reserveMap, activeRewardCoinTypes, fetchPrices = getPrices) => {
     const [rewards] = await initializeSuilendRewardsAll([{ reserveMap, activeRewardCoinTypes }], fetchPrices);

package/package.json

@@ -1 +1 @@
-{"name":"@suilend/sdk","version":"12.4.1","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","./mmt":"./mmt.js","./strategies":"./strategies.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/proCompatible":"./lib/proCompatible.js","./lib/pyth":"./lib/pyth.js","./lib/strategyOwnerCap":"./lib/strategyOwnerCap.js","./lib/transactions":"./lib/transactions.js","./lib/types":"./lib/types.js","./margin":"./margin/index.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","./swap":"./swap/index.js","./swap/quote":"./swap/quote.js","./swap/transaction":"./swap/transaction.js","./utils/events":"./utils/events.js","./utils/feedId":"./utils/feedId.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","./margin/margin/admin_cap":"./margin/margin/admin_cap.js","./margin/margin/market":"./margin/margin/market.js","./margin/margin/permissions":"./margin/margin/permissions.js","./margin/margin/position":"./margin/margin/position.js","./margin/margin/router":"./margin/margin/router.js","./margin/margin/version":"./margin/margin/version.js","./margin/utils":"./margin/utils/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","./margin/margin/deps/std/type_name":"./margin/margin/deps/std/type_name.js","./margin/margin/deps/sui/vec_set":"./margin/margin/deps/sui/vec_set.js","./margin/margin/deps/suilend/lending_market":"./margin/margin/deps/suilend/lending_market.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/price-identifier/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-identifier/structs.js"},"types":"./index.d.ts","scripts":{"build":"rm -rf ./dist && tsc && node ./fix-esm-imports.js","typecheck":"tsc --noEmit && tsc --noEmit -p tsconfig.test.json","test":"vitest run","lint:ci":"yarn run typecheck","prettier":"prettier --write src/ tests/","release":"yarn run build && node ./release.js && cd ./dist && npm publish --access public"},"repository":{"type":"git","url":"git+https://github.com/fireflyprotocol/lending-mono.git","directory":"ts/sdks/sdk"},"dependencies":{"@bluefin-exchange/bluefin7k-aggregator-sdk":"7.6.3","@cetusprotocol/aggregator-sdk":"1.7.2","@flowx-finance/sdk":"2.1.0","@pythnetwork/hermes-client":"3.1.0","@pythnetwork/pyth-sui-js":"4.0.0","@suilend/springsui-sdk":"4.1.0","bignumber.js":"11.1.5","bn.js":"5.2.5","crypto-js":"4.2.0","lodash":"4.18.1","p-limit":"7.3.2","uuid":"14.0.2"},"devDependencies":{"@mysten/bcs":"2.1.1","@mysten/sui":"2.29.0","@suilend/sui-core":"2.1.0","@tsconfig/recommended":"1.0.13","@types/bn.js":"5.2.0","@types/lodash":"4.17.25","@types/node":"26.5.1","fast-check":"4.10.0","prettier":"3.9.6","ts-node":"10.9.2","typescript":"6.0.3","vite":"8.3.0","vitest":"5.0.0"},"peerDependencies":{"@mysten/bcs":"^2.1.1","@mysten/sui":">=2.22.1 <3","@suilend/sui-core":"^2.0.1"},"type":"module"}
+{"name":"@suilend/sdk","version":"12.5.0","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","./mmt":"./mmt.js","./strategies":"./strategies.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/proCompatible":"./lib/proCompatible.js","./lib/pyth":"./lib/pyth.js","./lib/strategyOwnerCap":"./lib/strategyOwnerCap.js","./lib/transactions":"./lib/transactions.js","./lib/types":"./lib/types.js","./margin":"./margin/index.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","./swap":"./swap/index.js","./swap/quote":"./swap/quote.js","./swap/transaction":"./swap/transaction.js","./utils/events":"./utils/events.js","./utils/feedId":"./utils/feedId.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","./margin/margin/admin_cap":"./margin/margin/admin_cap.js","./margin/margin/market":"./margin/margin/market.js","./margin/margin/permissions":"./margin/margin/permissions.js","./margin/margin/position":"./margin/margin/position.js","./margin/margin/router":"./margin/margin/router.js","./margin/margin/version":"./margin/margin/version.js","./margin/utils":"./margin/utils/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","./margin/margin/deps/std/type_name":"./margin/margin/deps/std/type_name.js","./margin/margin/deps/sui/vec_set":"./margin/margin/deps/sui/vec_set.js","./margin/margin/deps/suilend/lending_market":"./margin/margin/deps/suilend/lending_market.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/price-identifier/structs":"./_generated/_dependencies/source/0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a6a565a9e/price-identifier/structs.js"},"types":"./index.d.ts","scripts":{"build":"rm -rf ./dist && tsc && node ./fix-esm-imports.js","typecheck":"tsc --noEmit && tsc --noEmit -p tsconfig.test.json","test":"vitest run","lint:ci":"yarn run typecheck","prettier":"prettier --write src/ tests/","release":"yarn run build && node ./release.js && cd ./dist && npm publish --access public"},"repository":{"type":"git","url":"git+https://github.com/fireflyprotocol/lending-mono.git","directory":"ts/sdks/sdk"},"dependencies":{"@bluefin-exchange/bluefin7k-aggregator-sdk":"7.6.3","@cetusprotocol/aggregator-sdk":"1.7.3","@flowx-finance/sdk":"2.1.0","@pythnetwork/hermes-client":"3.1.0","@pythnetwork/pyth-sui-js":"4.0.0","@suilend/springsui-sdk":"4.1.0","bignumber.js":"11.1.5","bn.js":"5.2.5","crypto-js":"4.2.0","lodash":"4.18.1","p-limit":"7.3.3","uuid":"14.0.2"},"devDependencies":{"@mysten/bcs":"2.1.1","@mysten/sui":"2.29.0","@suilend/sui-core":"2.1.0","@tsconfig/recommended":"1.0.13","@types/bn.js":"5.2.0","@types/lodash":"4.17.25","@types/node":"26.5.1","fast-check":"4.10.2","prettier":"3.9.9","ts-node":"10.9.2","typescript":"6.0.3","vite":"8.3.0","vitest":"5.0.1"},"peerDependencies":{"@mysten/bcs":"^2.1.1","@mysten/sui":">=2.22.1 <3","@suilend/sui-core":"^2.0.1"},"type":"module"}