@suilend/sdk 3.0.8 → 4.0.0

package/lib/initialize.d.ts

@@ -257,10 +257,10 @@ export declare const initializeSuilend: (suiGrpcClient: SuiGrpcClient, suilendCl
         totalDeposits: BigNumber;
     }>;
     reserveCoinTypes: string[];
-    reserveCoinMetadataMap: Record<string, import("@suilend/sui-fe").Token>;
+    reserveCoinMetadataMap: Record<string, import("@suilend/sui-core").Token>;
     rewardCoinTypes: string[];
     activeRewardCoinTypes: string[];
-    rewardCoinMetadataMap: Record<string, import("@suilend/sui-fe").Token>;
+    rewardCoinMetadataMap: Record<string, import("@suilend/sui-core").Token>;
 }>;
 export declare const initializeSuilendRewards: (reserveMap: Record<string, ParsedReserve>, activeRewardCoinTypes: string[]) => Promise<{
     rewardPriceMap: Record<string, BigNumber | undefined>;

package/lib/initialize.js

@@ -1,16 +1,7 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { normalizeStructTag } from "@mysten/sui/utils";
 import { SuiPriceServiceConnection } from "@pythnetwork/pyth-sui-js";
 import BigNumber from "bignumber.js";
-import { NORMALIZED_ALKIMI_COINTYPE, NORMALIZED_AUSD_COINTYPE, NORMALIZED_BLUE_COINTYPE, NORMALIZED_BUCK_COINTYPE, NORMALIZED_DEEP_COINTYPE, NORMALIZED_DMC_COINTYPE, NORMALIZED_FUD_COINTYPE, NORMALIZED_HAEDAL_COINTYPE, NORMALIZED_HIPPO_COINTYPE, NORMALIZED_IKA_COINTYPE, NORMALIZED_KOBAN_COINTYPE, NORMALIZED_LBTC_COINTYPE, NORMALIZED_NS_COINTYPE, NORMALIZED_SEND_COINTYPE, NORMALIZED_SEND_POINTS_S1_COINTYPE, NORMALIZED_SEND_POINTS_S2_COINTYPE, NORMALIZED_SOL_COINTYPE, NORMALIZED_SUI_COINTYPE, NORMALIZED_UP_COINTYPE, NORMALIZED_USDB_COINTYPE, NORMALIZED_USDC_COINTYPE, NORMALIZED_USDsui_COINTYPE, NORMALIZED_WAL_COINTYPE, NORMALIZED_WBTC_COINTYPE, NORMALIZED_WETH_COINTYPE, NORMALIZED_XAUm_COINTYPE, NORMALIZED_eEARN_COINTYPE, NORMALIZED_eTHIRD_COINTYPE, NORMALIZED_flSUI_COINTYPE, NORMALIZED_fpSUI_COINTYPE, NORMALIZED_fudSUI_COINTYPE, NORMALIZED_iSUI_COINTYPE, NORMALIZED_jugSUI_COINTYPE, NORMALIZED_kSUI_COINTYPE, NORMALIZED_mSUI_COINTYPE, NORMALIZED_mUSD_COINTYPE, NORMALIZED_oshiSUI_COINTYPE, NORMALIZED_sSUI_COINTYPE, NORMALIZED_sdeUSD_COINTYPE, NORMALIZED_stratSUI_COINTYPE, NORMALIZED_suiETH_COINTYPE, NORMALIZED_suiUSDT_COINTYPE, NORMALIZED_suiUSDe_COINTYPE, NORMALIZED_suiWBTC_COINTYPE, NORMALIZED_trevinSUI_COINTYPE, NORMALIZED_upSUI_COINTYPE, NORMALIZED_wUSDC_COINTYPE, NORMALIZED_wUSDT_COINTYPE, NORMALIZED_xBTC_COINTYPE, NORMALIZED_yapSUI_COINTYPE, TEMPORARY_PYTH_PRICE_FEED_COINTYPES, getAllOwnedObjects, getCoinMetadataMap, getPrice, isSendPoints, isSteammPoints, } from "@suilend/sui-fe";
+import { NORMALIZED_ALKIMI_COINTYPE, NORMALIZED_AUSD_COINTYPE, NORMALIZED_BLUE_COINTYPE, NORMALIZED_BUCK_COINTYPE, NORMALIZED_DEEP_COINTYPE, NORMALIZED_DMC_COINTYPE, NORMALIZED_FUD_COINTYPE, NORMALIZED_HAEDAL_COINTYPE, NORMALIZED_HIPPO_COINTYPE, NORMALIZED_IKA_COINTYPE, NORMALIZED_KOBAN_COINTYPE, NORMALIZED_LBTC_COINTYPE, NORMALIZED_NS_COINTYPE, NORMALIZED_SEND_COINTYPE, NORMALIZED_SEND_POINTS_S1_COINTYPE, NORMALIZED_SEND_POINTS_S2_COINTYPE, NORMALIZED_SOL_COINTYPE, NORMALIZED_SUI_COINTYPE, NORMALIZED_UP_COINTYPE, NORMALIZED_USDB_COINTYPE, NORMALIZED_USDC_COINTYPE, NORMALIZED_USDsui_COINTYPE, NORMALIZED_WAL_COINTYPE, NORMALIZED_WBTC_COINTYPE, NORMALIZED_WETH_COINTYPE, NORMALIZED_XAUm_COINTYPE, NORMALIZED_eEARN_COINTYPE, NORMALIZED_eTHIRD_COINTYPE, NORMALIZED_flSUI_COINTYPE, NORMALIZED_fpSUI_COINTYPE, NORMALIZED_fudSUI_COINTYPE, NORMALIZED_iSUI_COINTYPE, NORMALIZED_jugSUI_COINTYPE, NORMALIZED_kSUI_COINTYPE, NORMALIZED_mSUI_COINTYPE, NORMALIZED_mUSD_COINTYPE, NORMALIZED_oshiSUI_COINTYPE, NORMALIZED_sSUI_COINTYPE, NORMALIZED_sdeUSD_COINTYPE, NORMALIZED_stratSUI_COINTYPE, NORMALIZED_suiETH_COINTYPE, NORMALIZED_suiUSDT_COINTYPE, NORMALIZED_suiUSDe_COINTYPE, NORMALIZED_suiWBTC_COINTYPE, NORMALIZED_trevinSUI_COINTYPE, NORMALIZED_upSUI_COINTYPE, NORMALIZED_wUSDC_COINTYPE, NORMALIZED_wUSDT_COINTYPE, NORMALIZED_xBTC_COINTYPE, NORMALIZED_yapSUI_COINTYPE, TEMPORARY_PYTH_PRICE_FEED_COINTYPES, getAllOwnedObjects, getCoinMetadataMap, getPrice, isSendPoints, isSteammPoints, } from "@suilend/sui-core";
 import { LENDING_MARKET_ID, SuilendClient } from "../client.js";
 import { parseLendingMarket, parseObligation } from "../parsers/index.js";
 import * as simulate from "../utils/simulate.js";
@@ -94,7 +85,7 @@ const TREATS_COINTYPE = "0x0dadb7fa2771c2952f96161fc1f0c105d1f22d53926b9ff2498a8
 export const NORMALIZED_MAYA_COINTYPE = normalizeStructTag(MAYA_COINTYPE);
 export const NORMALIZED_mPOINTS_COINTYPE = normalizeStructTag(mPOINTS_COINTYPE);
 export const NORMALIZED_TREATS_COINTYPE = normalizeStructTag(TREATS_COINTYPE);
-export const initializeSuilend = (suiGrpcClient, suilendClient, lendingMarketMetadata, fallbackPythEndpoint) => __awaiter(void 0, void 0, void 0, function* () {
+export const initializeSuilend = async (suiGrpcClient, suilendClient, lendingMarketMetadata, fallbackPythEndpoint) => {
     const nowMs = Date.now();
     const nowS = Math.floor(nowMs / 1000);
     const interestCompoundedRawReserves = suilendClient.lendingMarket.reserves.map((r) => simulate.compoundReserveInterest(r, nowS));
@@ -110,16 +101,16 @@ export const initializeSuilend = (suiGrpcClient, suilendClient, lendingMarketMet
         }
     }
     // Get a working Pyth endpoint (try primary, fallback to fallbackPythEndpoint if provided)
-    const pythEndpoint = yield getWorkingPythEndpoint(fallbackPythEndpoint);
+    const pythEndpoint = await getWorkingPythEndpoint(fallbackPythEndpoint);
     const pythConnection = new SuiPriceServiceConnection(pythEndpoint, {
         timeout: 30 * 1000,
     });
-    const [refreshedReservesWithoutTemporaryPythPriceFeeds] = yield Promise.all([
+    const [refreshedReservesWithoutTemporaryPythPriceFeeds] = await Promise.all([
         simulate.refreshReservePrice(reservesWithoutTemporaryPythPriceFeeds, pythConnection),
-        Promise.all(reservesWithTemporaryPythPriceFeeds.map((reserve) => (() => __awaiter(void 0, void 0, void 0, function* () {
+        Promise.all(reservesWithTemporaryPythPriceFeeds.map((reserve) => (async () => {
             let cachedUsdPrice;
             try {
-                cachedUsdPrice = yield getPrice(normalizeStructTag(reserve.coinType.name));
+                cachedUsdPrice = await getPrice(normalizeStructTag(reserve.coinType.name));
             }
             catch (err) {
                 console.error(err);
@@ -131,7 +122,7 @@ export const initializeSuilend = (suiGrpcClient, suilendClient, lendingMarketMet
                 .integerValue(BigNumber.ROUND_DOWN));
             reserve.price.value = parsedCachedUsdPrice;
             reserve.smoothedPrice.value = parsedCachedUsdPrice;
-        }))())),
+        })())),
     ]);
     // Recombine reserves back into a single array
     const refreshedRawReserves = [
@@ -164,12 +155,16 @@ export const initializeSuilend = (suiGrpcClient, suilendClient, lendingMarketMet
     const uniqueReserveCoinTypes = Array.from(new Set(reserveCoinTypes));
     const uniqueRewardCoinTypes = Array.from(new Set(rewardCoinTypes));
     const uniqueActiveRewardsCoinTypes = Array.from(new Set(activeRewardCoinTypes));
-    const [miscCoinMetadataMap, reserveCoinMetadataMap, rewardCoinMetadataMap] = yield Promise.all([
+    const [miscCoinMetadataMap, reserveCoinMetadataMap, rewardCoinMetadataMap] = await Promise.all([
         getCoinMetadataMap(uniqueMiscCoinTypes),
         getCoinMetadataMap(uniqueReserveCoinTypes),
         getCoinMetadataMap(uniqueRewardCoinTypes),
     ]);
-    const coinMetadataMap = Object.assign(Object.assign(Object.assign({}, miscCoinMetadataMap), reserveCoinMetadataMap), rewardCoinMetadataMap);
+    const coinMetadataMap = {
+        ...miscCoinMetadataMap,
+        ...reserveCoinMetadataMap,
+        ...rewardCoinMetadataMap,
+    };
     // const walReserve = refreshedRawReserves.find(
     //   (r) => normalizeStructTag(r.coinType.name) === NORMALIZED_WAL_COINTYPE,
     // );
@@ -193,7 +188,7 @@ export const initializeSuilend = (suiGrpcClient, suilendClient, lendingMarketMet
                 return aCustomOrderIndex > -1 ? -1 : 1;
         });
     }
-    const reserveMap = lendingMarket.reserves.reduce((acc, reserve) => (Object.assign(Object.assign({}, acc), { [reserve.coinType]: reserve })), {});
+    const reserveMap = lendingMarket.reserves.reduce((acc, reserve) => ({ ...acc, [reserve.coinType]: reserve }), {});
     return {
         lendingMarket,
         coinMetadataMap,
@@ -205,15 +200,15 @@ export const initializeSuilend = (suiGrpcClient, suilendClient, lendingMarketMet
         activeRewardCoinTypes: uniqueActiveRewardsCoinTypes,
         rewardCoinMetadataMap,
     };
-});
-export 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 })), {});
+};
+export const initializeSuilendRewards = async (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 reservelessActiveRewardCachedUsdPrices = yield Promise.all(reservelessActiveRewardCoinTypes.map((coinType) => getPrice(coinType)));
+    const reservelessActiveRewardCachedUsdPrices = await Promise.all(reservelessActiveRewardCoinTypes.map((coinType) => getPrice(coinType)));
     for (let i = 0; i < reservelessActiveRewardCoinTypes.length; i++) {
         const cachedUsdPrice = reservelessActiveRewardCachedUsdPrices[i];
         if (cachedUsdPrice === undefined)
@@ -221,8 +216,8 @@ export const initializeSuilendRewards = (reserveMap, activeRewardCoinTypes) => _
         rewardPriceMap[reservelessActiveRewardCoinTypes[i]] = new BigNumber(cachedUsdPrice);
     }
     return { rewardPriceMap };
-});
-export const initializeObligations = (suiGrpcClient, suilendClient, refreshedRawReserves, reserveMap, address) => __awaiter(void 0, void 0, void 0, function* () {
+};
+export const initializeObligations = async (suiGrpcClient, suilendClient, refreshedRawReserves, reserveMap, address) => {
     if (!address)
         return {
             strategyOwnerCaps: [],
@@ -230,12 +225,12 @@ export const initializeObligations = (suiGrpcClient, suilendClient, refreshedRaw
             obligationOwnerCaps: [],
             obligations: [],
         };
-    const [strategyOwnerCaps, obligationOwnerCaps] = yield Promise.all([
-        (() => __awaiter(void 0, void 0, void 0, function* () {
+    const [strategyOwnerCaps, obligationOwnerCaps] = await Promise.all([
+        (async () => {
             const hasStrategies = Object.values(STRATEGY_TYPE_INFO_MAP).some((info) => info.lendingMarketId === suilendClient.lendingMarket.id);
             if (!hasStrategies)
                 return [];
-            const objects = yield getAllOwnedObjects(suiGrpcClient, address, `${STRATEGY_WRAPPER_PACKAGE_ID_V1}::strategy_wrapper::StrategyOwnerCap<${suilendClient.lendingMarket.$typeArgs[0]}>`);
+            const objects = await getAllOwnedObjects(suiGrpcClient, address, `${STRATEGY_WRAPPER_PACKAGE_ID_V1}::strategy_wrapper::StrategyOwnerCap<${suilendClient.lendingMarket.$typeArgs[0]}>`);
             return objects.map((obj) => {
                 const json = obj.json;
                 const id = json.id;
@@ -250,10 +245,10 @@ export const initializeObligations = (suiGrpcClient, suilendClient, refreshedRaw
                 };
                 return result;
             });
-        }))(),
+        })(),
         SuilendClient.getObligationOwnerCaps(address, suilendClient.lendingMarket.$typeArgs, suiGrpcClient),
     ]);
-    const obligations = (yield Promise.all([
+    const obligations = (await Promise.all([
         ...strategyOwnerCaps.map((soc) => soc.obligationId),
         ...obligationOwnerCaps.map((ownerCap) => ownerCap.obligationId),
     ].map((obligationId) => SuilendClient.getObligation(obligationId, suilendClient.lendingMarket.$typeArgs, suiGrpcClient))))
@@ -269,4 +264,4 @@ export const initializeObligations = (suiGrpcClient, suilendClient, refreshedRaw
         obligationOwnerCaps,
         obligations: nonStrategyObligations,
     };
-});
+};

package/lib/liquidityMining.js

@@ -1,6 +1,6 @@
 import BigNumber from "bignumber.js";
 import cloneDeep from "lodash/cloneDeep.js";
-import { MS_PER_YEAR, NORMALIZED_eEARN_COINTYPE, NORMALIZED_eTHIRD_COINTYPE, NORMALIZED_sdeUSD_COINTYPE, isSendPoints, } from "@suilend/sui-fe";
+import { MS_PER_YEAR, NORMALIZED_eEARN_COINTYPE, NORMALIZED_eTHIRD_COINTYPE, NORMALIZED_sdeUSD_COINTYPE, isSendPoints, } from "@suilend/sui-core";
 import { WAD } from "./constants.js";
 import { Side } from "./types.js";
 export const getDepositShare = (reserve, share) => share.div(10 ** reserve.mintDecimals).times(reserve.cTokenExchangeRate);
@@ -12,7 +12,7 @@ export const formatRewards = (parsedReserveMap, coinMetadataMap, priceMap, oblig
     const rewardMap = {};
     const getRewardSummary = (reserve, poolReward, side) => {
         const rewardCoinMetadata = coinMetadataMap[poolReward.coinType];
-        const rewardPrice = priceMap === null || priceMap === void 0 ? void 0 : priceMap[poolReward.coinType];
+        const rewardPrice = priceMap?.[poolReward.coinType];
         const isActive = nowMs >= poolReward.startTimeMs && nowMs < poolReward.endTimeMs;
         const aprPercent = rewardPrice
             ? new BigNumber(reserve.depositsPoolRewardManager.totalShares.toString()).eq(0)
@@ -48,7 +48,7 @@ export const formatRewards = (parsedReserveMap, coinMetadataMap, priceMap, oblig
                 perDay,
                 side,
             },
-            obligationClaims: Object.fromEntries((obligations !== null && obligations !== void 0 ? obligations : [])
+            obligationClaims: Object.fromEntries((obligations ?? [])
                 .map((obligation) => {
                 const claim = getObligationClaim(obligation, poolReward, side === Side.DEPOSIT
                     ? reserve.depositsPoolRewardManager.id
@@ -96,7 +96,7 @@ const getObligationClaim = (obligation, poolReward, reservePoolManagerId, reserv
     if (!userReward)
         return;
     return {
-        claimableAmount: (userReward === null || userReward === void 0 ? void 0 : userReward.earnedRewards)
+        claimableAmount: userReward?.earnedRewards
             ? new BigNumber(userReward.earnedRewards.value.toString())
                 .div(WAD)
                 .div(10 ** poolReward.mintDecimals)
@@ -132,26 +132,22 @@ export const getDedupedPerDayRewards = (filteredRewards) => {
     return result;
 };
 export const getRewardsAprPercent = (side, filteredRewards) => getDedupedAprRewards(filteredRewards).reduce((acc, reward) => acc.plus(reward.stats.aprPercent.times(side === Side.DEPOSIT ? 1 : -1)), new BigNumber(0));
-export const getStakingYieldAprPercent = (side, coinType, lstStatsMap, sdeUsdAprPercent, eThirdAprPercent, eEarnAprPercent) => {
-    var _a;
-    return side === Side.DEPOSIT
-        ? coinType === NORMALIZED_sdeUSD_COINTYPE
-            ? sdeUsdAprPercent
-            : coinType === NORMALIZED_eTHIRD_COINTYPE
-                ? eThirdAprPercent
-                : coinType === NORMALIZED_eEARN_COINTYPE
-                    ? eEarnAprPercent
-                    : (_a = lstStatsMap[coinType]) === null || _a === void 0 ? void 0 : _a.aprPercent
-        : undefined;
-};
+export const getStakingYieldAprPercent = (side, coinType, lstStatsMap, sdeUsdAprPercent, eThirdAprPercent, eEarnAprPercent) => side === Side.DEPOSIT
+    ? coinType === NORMALIZED_sdeUSD_COINTYPE
+        ? sdeUsdAprPercent
+        : coinType === NORMALIZED_eTHIRD_COINTYPE
+            ? eThirdAprPercent
+            : coinType === NORMALIZED_eEARN_COINTYPE
+                ? eEarnAprPercent
+                : lstStatsMap[coinType]?.aprPercent
+    : undefined;
 export const getTotalAprPercent = (side, aprPercent, filteredRewards, stakingYieldAprPercent) => aprPercent
     .plus(getRewardsAprPercent(side, filteredRewards))
-    .plus(stakingYieldAprPercent !== null && stakingYieldAprPercent !== void 0 ? stakingYieldAprPercent : 0);
+    .plus(stakingYieldAprPercent ?? 0);
 export const getNetAprPercent = (obligation, rewardMap, lstStatsMap, sdeUsdAprPercent, eThirdAprPercent, eEarnAprPercent, noShares) => {
     const weightedDepositedAmountUsd_aprPercent = obligation.deposits.reduce((acc, deposit) => {
-        var _a;
         const weightedDepositedAmountUsd_baseAprPercent = deposit.reserve.depositAprPercent.times(deposit.depositedAmountUsd);
-        const weightedDepositedAmountUsd_stakingYieldAprPercent = new BigNumber((_a = getStakingYieldAprPercent(Side.DEPOSIT, deposit.reserve.coinType, lstStatsMap, sdeUsdAprPercent, eThirdAprPercent, eEarnAprPercent)) !== null && _a !== void 0 ? _a : 0).times(deposit.depositedAmountUsd);
+        const weightedDepositedAmountUsd_stakingYieldAprPercent = new BigNumber(getStakingYieldAprPercent(Side.DEPOSIT, deposit.reserve.coinType, lstStatsMap, sdeUsdAprPercent, eThirdAprPercent, eEarnAprPercent) ?? 0).times(deposit.depositedAmountUsd);
         const weightedDepositedAmountUsd_rewardsAprPercent = getRewardsAprPercent(Side.DEPOSIT, getFilteredRewards(rewardMap[deposit.reserve.coinType].deposit)).times(!noShares
             ? getDepositShareUsd(deposit.reserve, new BigNumber(deposit.userRewardManager.share.toString()))
             : deposit.depositedAmountUsd);

package/lib/pyth.js

@@ -1,20 +1,11 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 export const PRIMARY_PYTH_ENDPOINT = "https://hermes.pyth.network";
 /**
  * Tests if the primary Pyth connection endpoint is working by checking the /live endpoint
  * @returns true if the connection is working, false otherwise
  */
-export const testPrimaryPythConnection = () => __awaiter(void 0, void 0, void 0, function* () {
+export const testPrimaryPythConnection = async () => {
     try {
-        const res = yield fetch(`${PRIMARY_PYTH_ENDPOINT}/live`, {
+        const res = await fetch(`${PRIMARY_PYTH_ENDPOINT}/live`, {
             signal: AbortSignal.timeout(5 * 1000), // 5 second timeout
         });
         return res.ok;
@@ -23,15 +14,15 @@ export const testPrimaryPythConnection = () => __awaiter(void 0, void 0, void 0,
         console.warn(`[testPrimaryPythConnection] Pyth connection test failed for ${PRIMARY_PYTH_ENDPOINT}:`, err);
         return false;
     }
-});
+};
 /**
  * Gets a working Pyth connection endpoint, trying primary first, then fallback if provided
  * @param fallbackPythEndpoint Optional fallback endpoint
  * @returns The endpoint URL that is working, or the primary endpoint if fallback fails
  */
-export const getWorkingPythEndpoint = (fallbackPythEndpoint) => __awaiter(void 0, void 0, void 0, function* () {
+export const getWorkingPythEndpoint = async (fallbackPythEndpoint) => {
     // Test primary endpoint first
-    const primaryWorking = yield testPrimaryPythConnection();
+    const primaryWorking = await testPrimaryPythConnection();
     if (primaryWorking) {
         console.log(`[getWorkingPythEndpoint] Using primary Pyth endpoint: ${PRIMARY_PYTH_ENDPOINT}`);
         return PRIMARY_PYTH_ENDPOINT;
@@ -45,4 +36,4 @@ export const getWorkingPythEndpoint = (fallbackPythEndpoint) => __awaiter(void 0
         console.error(`[getWorkingPythEndpoint] Primary Pyth endpoint failed, no fallback provided, using primary anyway`);
         return PRIMARY_PYTH_ENDPOINT;
     }
-});
+};

package/lib/pythAdapter.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { bcs } from "@mysten/sui/bcs";
 const PYTH_STATE_ID = "0x1f9310238ee9298fb703c3419030b35b22bb1cc37113e3bb5007c99aec79e5b8";
 const PYTH_PRICE_TABLE_ID = "0x234c9ffca44613ab87a2711325b6e17bad9ece0449b917c8bd9c0ad7a0506cc2";
@@ -19,132 +10,125 @@ const PYTH_PACKAGE = "0x8d97f1cd6ac663735be08d1d2b6d02a159e711586461306ce60a2b7a
  */
 export function createJsonRpcAdapter(suiGrpcClient) {
     return {
-        getObject(_a) {
-            return __awaiter(this, arguments, void 0, function* ({ id }) {
-                const { object } = yield suiGrpcClient.getObject({
-                    objectId: id,
-                    include: { json: true },
-                });
+        async getObject({ id }) {
+            const { object } = await suiGrpcClient.getObject({
+                objectId: id,
+                include: { json: true },
+            });
+            return {
+                data: {
+                    objectId: object.objectId,
+                    type: object.type,
+                    content: {
+                        dataType: "moveObject",
+                        fields: wrapNestedObjects(object.json),
+                        type: object.type,
+                    },
+                },
+            };
+        },
+        async getCoins({ owner, coinType, cursor, }) {
+            const result = await suiGrpcClient.listCoins({
+                owner,
+                coinType,
+                cursor,
+            });
+            return {
+                data: result.objects.map((coin) => ({
+                    coinObjectId: coin.objectId,
+                    version: coin.version,
+                    digest: coin.digest,
+                    balance: coin.balance,
+                    coinType: coin.type,
+                })),
+                nextCursor: result.cursor,
+                hasNextPage: result.hasNextPage,
+            };
+        },
+        async getDynamicFieldObject({ parentId, name, }) {
+            // The gRPC node may not have dynamic field wrapper objects indexed.
+            // For known lookups (Pyth price table), use hardcoded values.
+            if (parentId === PYTH_STATE_ID &&
+                name.type === "vector<u8>" &&
+                name.value === "price_info") {
                 return {
                     data: {
-                        objectId: object.objectId,
-                        type: object.type,
+                        objectId: PYTH_PRICE_TABLE_ID,
+                        type: `0x2::table::Table<${PYTH_PACKAGE}::price_identifier::PriceIdentifier, 0x2::object::ID>`,
                         content: {
                             dataType: "moveObject",
-                            fields: wrapNestedObjects(object.json),
-                            type: object.type,
+                            fields: null,
+                            type: `0x2::table::Table<${PYTH_PACKAGE}::price_identifier::PriceIdentifier, 0x2::object::ID>`,
                         },
                     },
                 };
+            }
+            const { dynamicField } = await suiGrpcClient.getDynamicField({
+                parentId,
+                name: {
+                    type: name.type,
+                    bcs: dynamicField_encodeName(name),
+                },
             });
-        },
-        getCoins(_a) {
-            return __awaiter(this, arguments, void 0, function* ({ owner, coinType, cursor, }) {
-                const result = yield suiGrpcClient.listCoins({
-                    owner,
-                    coinType,
-                    cursor,
-                });
-                return {
-                    data: result.objects.map((coin) => ({
-                        coinObjectId: coin.objectId,
-                        version: coin.version,
-                        digest: coin.digest,
-                        balance: coin.balance,
-                        coinType: coin.type,
-                    })),
-                    nextCursor: result.cursor,
-                    hasNextPage: result.hasNextPage,
-                };
-            });
-        },
-        getDynamicFieldObject(_a) {
-            return __awaiter(this, arguments, void 0, function* ({ parentId, name, }) {
-                var _b, _c;
-                // The gRPC node may not have dynamic field wrapper objects indexed.
-                // For known lookups (Pyth price table), use hardcoded values.
-                if (parentId === PYTH_STATE_ID &&
-                    name.type === "vector<u8>" &&
-                    name.value === "price_info") {
+            if (dynamicField.$kind === "DynamicObject" && dynamicField.childId) {
+                try {
+                    const childObject = await suiGrpcClient
+                        .getObject({
+                        objectId: dynamicField.childId,
+                        include: { json: true },
+                    })
+                        .then((r) => r.object);
                     return {
                         data: {
-                            objectId: PYTH_PRICE_TABLE_ID,
-                            type: `0x2::table::Table<${PYTH_PACKAGE}::price_identifier::PriceIdentifier, 0x2::object::ID>`,
+                            objectId: childObject.objectId,
+                            type: childObject.type,
                             content: {
                                 dataType: "moveObject",
-                                fields: null,
-                                type: `0x2::table::Table<${PYTH_PACKAGE}::price_identifier::PriceIdentifier, 0x2::object::ID>`,
+                                fields: childObject.json,
+                                type: childObject.type,
                             },
                         },
                     };
                 }
-                const { dynamicField } = yield suiGrpcClient.getDynamicField({
-                    parentId,
-                    name: {
-                        type: name.type,
-                        bcs: dynamicField_encodeName(name),
-                    },
-                });
-                if (dynamicField.$kind === "DynamicObject" && dynamicField.childId) {
-                    try {
-                        const childObject = yield suiGrpcClient
-                            .getObject({
+                catch {
+                    return {
+                        data: {
                             objectId: dynamicField.childId,
-                            include: { json: true },
-                        })
-                            .then((r) => r.object);
-                        return {
-                            data: {
-                                objectId: childObject.objectId,
-                                type: childObject.type,
-                                content: {
-                                    dataType: "moveObject",
-                                    fields: childObject.json,
-                                    type: childObject.type,
-                                },
-                            },
-                        };
-                    }
-                    catch (_d) {
-                        return {
-                            data: {
-                                objectId: dynamicField.childId,
+                            type: dynamicField.valueType,
+                            content: {
+                                dataType: "moveObject",
+                                fields: null,
                                 type: dynamicField.valueType,
-                                content: {
-                                    dataType: "moveObject",
-                                    fields: null,
-                                    type: dynamicField.valueType,
-                                },
                             },
-                        };
-                    }
+                        },
+                    };
                 }
-                const valueBcs = (_b = dynamicField.value) === null || _b === void 0 ? void 0 : _b.bcs;
-                const type = (_c = dynamicField.valueType) !== null && _c !== void 0 ? _c : dynamicField.type;
-                let fields = null;
-                if (valueBcs && valueBcs.length > 0) {
-                    if (type === "0x2::object::ID" ||
-                        type.endsWith("::object::ID") ||
-                        valueBcs.length === 32) {
-                        const id = "0x" +
-                            Array.from(valueBcs)
-                                .map((b) => b.toString(16).padStart(2, "0"))
-                                .join("");
-                        fields = { value: id };
-                    }
+            }
+            const valueBcs = dynamicField.value?.bcs;
+            const type = dynamicField.valueType ?? dynamicField.type;
+            let fields = null;
+            if (valueBcs && valueBcs.length > 0) {
+                if (type === "0x2::object::ID" ||
+                    type.endsWith("::object::ID") ||
+                    valueBcs.length === 32) {
+                    const id = "0x" +
+                        Array.from(valueBcs)
+                            .map((b) => b.toString(16).padStart(2, "0"))
+                            .join("");
+                    fields = { value: id };
                 }
-                return {
-                    data: {
-                        objectId: dynamicField.fieldId,
+            }
+            return {
+                data: {
+                    objectId: dynamicField.fieldId,
+                    type,
+                    content: {
+                        dataType: "moveObject",
+                        fields,
                         type,
-                        content: {
-                            dataType: "moveObject",
-                            fields,
-                            type,
-                        },
                     },
-                };
-            });
+                },
+            };
         },
     };
 }

package/lib/strategyOwnerCap.js

@@ -1,16 +1,7 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { SUI_CLOCK_OBJECT_ID, SUI_SYSTEM_STATE_OBJECT_ID, } from "@mysten/sui/utils";
 import BigNumber from "bignumber.js";
 import BN from "bn.js";
-import { MAX_U64, NORMALIZED_AUSD_COINTYPE, NORMALIZED_SUI_COINTYPE, NORMALIZED_USDC_COINTYPE, NORMALIZED_USDsui_COINTYPE, NORMALIZED_eEARN_COINTYPE, NORMALIZED_sSUI_COINTYPE, NORMALIZED_stratSUI_COINTYPE, NORMALIZED_suiUSDT_COINTYPE, NORMALIZED_suiWBTC_COINTYPE, NORMALIZED_xBTC_COINTYPE, isSui, } from "@suilend/sui-fe";
+import { MAX_U64, NORMALIZED_AUSD_COINTYPE, NORMALIZED_SUI_COINTYPE, NORMALIZED_USDC_COINTYPE, NORMALIZED_USDsui_COINTYPE, NORMALIZED_eEARN_COINTYPE, NORMALIZED_sSUI_COINTYPE, NORMALIZED_stratSUI_COINTYPE, NORMALIZED_suiUSDT_COINTYPE, NORMALIZED_suiWBTC_COINTYPE, NORMALIZED_xBTC_COINTYPE, isSui, } from "@suilend/sui-core";
 import { LENDING_MARKET_ID, LENDING_MARKET_TYPE, } from "../client.js";
 import { Side } from "./types.js";
 export const STRATEGY_WRAPPER_PACKAGE_ID_V1 = "0xba97dc73a07638d03d77ad2161484eb21db577edc9cadcd7035fef4b4f2f6fa1";
@@ -345,9 +336,9 @@ export const strategyClaimRewardsAndMergeCoins = (strategyType, rewardsMap, stra
     }
     return mergedCoinsMap;
 };
-export const strategySwapSomeDepositsForCoinType = (strategyType, cetusSdk, cetusPartnerId, obligation, noSwapCoinTypes, // coinTypes to not swap for depositReserve.coinType
+export const strategySwapSomeDepositsForCoinType = async (strategyType, cetusSdk, cetusPartnerId, obligation, noSwapCoinTypes, // coinTypes to not swap for depositReserve.coinType
 swapPercent, // percent of deposit to swap for depositReserve.coinType (0-100)
-depositReserve, strategyOwnerCap, transaction) => __awaiter(void 0, void 0, void 0, function* () {
+depositReserve, strategyOwnerCap, transaction) => {
     // 1) MAX withdraw non-swapCoinTypes deposits
     const swapCoinTypeDeposits = obligation.deposits.filter((deposit) => !noSwapCoinTypes.includes(deposit.coinType));
     if (swapCoinTypeDeposits.length === 0)
@@ -371,14 +362,14 @@ depositReserve, strategyOwnerCap, transaction) => __awaiter(void 0, void 0, void
     // 2) Swap
     let resultCoin = undefined;
     // 2.1) Get routers
-    const amountsAndSortedQuotesMap = Object.fromEntries(yield Promise.all(Object.entries(withdrawnCoinsMap).map(([coinType, { deposit, coin }]) => (() => __awaiter(void 0, void 0, void 0, function* () {
+    const amountsAndSortedQuotesMap = Object.fromEntries(await Promise.all(Object.entries(withdrawnCoinsMap).map(([coinType, { deposit, coin }]) => (async () => {
         try {
             // Get amount
             const amount = new BigNumber(deposit.depositedAmount.times(swapPercent.div(100)))
                 .times(10 ** deposit.reserve.token.decimals)
                 .integerValue(BigNumber.ROUND_DOWN); // Use underestimate (deposits keep accruing if deposit APR >0)
             // Get routes
-            const routers = yield cetusSdk.findRouters({
+            const routers = await cetusSdk.findRouters({
                 from: deposit.coinType,
                 target: depositReserve.coinType,
                 amount: new BN(amount.toString()), // Underestimate (deposits keep accruing if deposit APR >0)
@@ -396,7 +387,7 @@ depositReserve, strategyOwnerCap, transaction) => __awaiter(void 0, void 0, void
             console.error(err);
             return [coinType, { coin, routers: undefined }];
         }
-    }))())));
+    })())));
     console.log("[strategySwapSomeDepositsForCoinType] amountsAndSortedQuotesMap", { amountsAndSortedQuotesMap });
     // 2.2) Swap
     for (const [coinType, { coin: coinIn, routers }] of Object.entries(amountsAndSortedQuotesMap)) {
@@ -406,7 +397,7 @@ depositReserve, strategyOwnerCap, transaction) => __awaiter(void 0, void 0, void
         try {
             let coinOut;
             try {
-                coinOut = (yield cetusSdk.fixableRouterSwapV3({
+                coinOut = (await cetusSdk.fixableRouterSwapV3({
                     router: routers,
                     inputCoin: coinIn,
                     slippage: 3 / 100,
@@ -432,7 +423,7 @@ depositReserve, strategyOwnerCap, transaction) => __awaiter(void 0, void 0, void
         throw new Error("No coin to deposit or transfer");
     console.log("[strategySwapSomeDepositsForCoinType] depositing resultCoin");
     strategyDeposit(strategyType, resultCoin, depositReserve.coinType, strategyOwnerCap, depositReserve.arrayIndex, transaction);
-});
+};
 export const createStrategyOwnerCapIfNoneExists = (strategyType, strategyOwnerCap, transaction) => {
     const { lendingMarketId, lendingMarketType } = getStrategyLendingMarket(strategyType);
     let strategyOwnerCapId;

package/margin/margin/admin_cap.d.ts

@@ -1,7 +1,7 @@
 import { MoveStruct } from "../utils/index.js";
 export declare const AdminCap: MoveStruct<{
-    id: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
 }, "0xd5f3054404ec9275b50985851a5b515728f131a3bdd9c9a5f738a9326b738d53::admin_cap::AdminCap">;
 export declare const InitEvent: MoveStruct<{
-    admin_cap_id: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    admin_cap_id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
 }, "0xd5f3054404ec9275b50985851a5b515728f131a3bdd9c9a5f738a9326b738d53::admin_cap::InitEvent">;

package/margin/margin/deps/std/type_name.d.ts

@@ -12,5 +12,5 @@ export declare const TypeName: MoveStruct<{
      * Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or
      * 32 depending on the Move platform)
      */
-    name: import("@mysten/sui/bcs").BcsType<string, string, "string">;
+    name: import("@mysten/bcs").BcsType<string, string, "string">;
 }, "std::type_name::TypeName">;

package/margin/margin/deps/suilend/lending_market.d.ts

@@ -1,5 +1,5 @@
 import { MoveStruct } from "../../../utils/index.js";
 export declare const ObligationOwnerCap: MoveStruct<{
-    id: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
-    obligation_id: import("@mysten/sui/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
+    obligation_id: import("@mysten/bcs").BcsType<string, string | Uint8Array<ArrayBufferLike>, "bytes[32]">;
 }, "suilend::lending_market::ObligationOwnerCap<phantom P>">;