@defisaver/positions-sdk 2.0.0 → 2.0.1

package/cjs/fluid/index.js

@@ -199,9 +199,10 @@ const getAdditionalMarketRateForDex = (token1PerShare, token0PerShare, incentive
 const getTradingApy = (poolAddress) => __awaiter(void 0, void 0, void 0, function* () {
     let res;
     try {
-        res = yield fetch(`https://api.fluid.instadapp.io/v2/1/dexes/${poolAddress}/apy`, { signal: AbortSignal.timeout(2000) });
+        res = yield fetch(`https://api.fluid.instadapp.io/v2/1/dexes/${poolAddress}/apy`, { signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT) });
     }
     catch (e) {
+        console.error('External API Failure: Fluid Trading Apy');
         return '0';
     }
     if (!res.ok) {

package/cjs/helpers/compoundHelpers/index.js

@@ -38,7 +38,7 @@ const formatMarketData = (data, network, baseAssetPrice) => {
     const assetInfo = (0, tokens_1.getAssetInfoByAddress)(data.tokenAddr, network);
     const isWETH = assetInfo.symbol === 'WETH';
     const price = (0, utils_1.getEthAmountForDecimals)(data.price, 8);
-    return (Object.assign(Object.assign({}, data), { priceInBaseAsset: (0, utils_1.getEthAmountForDecimals)(data.price, 8), price: new decimal_js_1.default(price).mul(baseAssetPrice).toString(), collateralFactor: (0, utils_1.getEthAmountForDecimals)(data.borrowCollateralFactor, 18), liquidationRatio: (0, utils_1.getEthAmountForDecimals)(data.liquidateCollateralFactor, 18), supplyCap: (0, utils_1.getEthAmountForDecimals)(data.supplyCap, assetInfo.decimals), totalSupply: (0, utils_1.getEthAmountForDecimals)(data.totalSupply, assetInfo.decimals), symbol: isWETH ? 'ETH' : assetInfo.symbol, supplyRate: '0', borrowRate: '0', canBeBorrowed: false, canBeSupplied: true }));
+    return (Object.assign(Object.assign({}, data), { borrowCollateralFactor: data.borrowCollateralFactor.toString(), liquidateCollateralFactor: data.liquidateCollateralFactor.toString(), liquidationFactor: data.liquidationFactor.toString(), supplyReserved: data.supplyReserved.toString(), priceInBaseAsset: (0, utils_1.getEthAmountForDecimals)(data.price, 8), price: new decimal_js_1.default(price).mul(baseAssetPrice).toString(), collateralFactor: (0, utils_1.getEthAmountForDecimals)(data.borrowCollateralFactor, 18), liquidationRatio: (0, utils_1.getEthAmountForDecimals)(data.liquidateCollateralFactor, 18), supplyCap: (0, utils_1.getEthAmountForDecimals)(data.supplyCap, assetInfo.decimals), totalSupply: (0, utils_1.getEthAmountForDecimals)(data.totalSupply, assetInfo.decimals), symbol: isWETH ? 'ETH' : assetInfo.symbol, supplyRate: '0', borrowRate: '0', canBeBorrowed: false, canBeSupplied: true }));
 };
 exports.formatMarketData = formatMarketData;
 // TODO: maybe not hardcode decimals
@@ -46,7 +46,7 @@ const formatBaseData = (data, network, baseAssetPrice) => {
     const assetInfo = (0, tokens_1.getAssetInfoByAddress)(data.tokenAddr, network);
     const totalSupply = (0, utils_1.getEthAmountForDecimals)(new decimal_js_1.default(data.totalSupply).mul(data.supplyIndex).toString(), 15 + assetInfo.decimals);
     const totalBorrow = (0, utils_1.getEthAmountForDecimals)(new decimal_js_1.default(data.totalBorrow).mul(data.borrowIndex).toString(), 15 + assetInfo.decimals);
-    return (Object.assign(Object.assign({}, data), { supplyRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(data.supplyRate).div(1e18).mul(constants_1.SECONDS_PER_YEAR).mul(100)
+    return (Object.assign(Object.assign({}, data), { baseBorrowMin: data.baseBorrowMin.toString(), baseTrackingBorrowRewardsSpeed: data.baseTrackingBorrowRewardsSpeed.toString(), baseTrackingSupplyRewardsSpeed: data.baseTrackingSupplyRewardsSpeed.toString(), borrowIndex: data.borrowIndex.toString(), supplyIndex: data.supplyIndex.toString(), trackingBorrowIndex: data.trackingBorrowIndex.toString(), trackingSupplyIndex: data.trackingSupplyIndex.toString(), supplyRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(data.supplyRate).div(1e18).mul(constants_1.SECONDS_PER_YEAR).mul(100)
             .toString()), borrowRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(data.borrowRate).div(1e18).mul(constants_1.SECONDS_PER_YEAR).mul(100)
             .toString()), utilization: (0, utils_1.getEthAmountForDecimals)(data.utilization, 16), // utilization is totalSupply/totalBorrow in 1e18, but we need % so when we mul with 100 it's 16 decimals
         totalSupply,

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -204,19 +204,29 @@ const REWARDS_QUERY = `
 */
 const getReallocatableLiquidity = (marketId_1, ...args_1) => __awaiter(void 0, [marketId_1, ...args_1], void 0, function* (marketId, network = common_1.NetworkNumber.Eth) {
     var _a;
-    const response = yield fetch(API_URL, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-            query: MARKET_QUERY,
-            variables: { uniqueKey: marketId, chainId: network },
-        }),
-    });
-    const data = yield response.json();
-    const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
-    if (!marketData)
-        throw new Error('Market data not found');
-    return { reallocatableLiquidity: marketData.reallocatableLiquidityAssets, targetBorrowUtilization: marketData.targetBorrowUtilization };
+    try {
+        const response = yield fetch(API_URL, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                query: MARKET_QUERY,
+                variables: { uniqueKey: marketId, chainId: network },
+            }),
+            signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT),
+        });
+        const data = yield response.json();
+        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+        if (!marketData)
+            throw new Error('Market data not found');
+        return {
+            reallocatableLiquidity: marketData.reallocatableLiquidityAssets,
+            targetBorrowUtilization: marketData.targetBorrowUtilization,
+        };
+    }
+    catch (error) {
+        console.error('External API Failure: Morpho blue reallocatable liquidity', error);
+        throw new Error('Failed to fetch reallocatable liquidity');
+    }
 });
 exports.getReallocatableLiquidity = getReallocatableLiquidity;
 /**
@@ -257,71 +267,78 @@ exports.getLiquidityToAllocate = getLiquidityToAllocate;
  */
 const getReallocation = (market_1, assetsData_1, amountToBorrow_1, ...args_1) => __awaiter(void 0, [market_1, assetsData_1, amountToBorrow_1, ...args_1], void 0, function* (market, assetsData, amountToBorrow, network = common_1.NetworkNumber.Eth) {
     var _a, _b, _c;
-    const { marketId, loanToken } = market;
-    const response = yield fetch(API_URL, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-            query: MARKET_QUERY,
-            variables: { uniqueKey: marketId, chainId: network },
-        }),
-    });
-    const data = yield response.json();
-    const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
-    if (!marketData)
-        throw new Error('Market data not found');
-    const loanAssetInfo = (0, tokens_1.getAssetInfoByAddress)(loanToken, network);
-    const { totalBorrow, totalSupply } = assetsData[loanAssetInfo.symbol] || { totalBorrow: '0', totalSupply: '0' };
-    const totalBorrowWei = (0, tokens_1.assetAmountInWei)(totalBorrow, loanAssetInfo.symbol);
-    const totalSupplyWei = (0, tokens_1.assetAmountInWei)(totalSupply, loanAssetInfo.symbol);
-    const newTotalBorrowAssets = new decimal_js_1.default(totalBorrowWei).add(amountToBorrow).toString();
-    const newUtil = new decimal_js_1.default(newTotalBorrowAssets).div(totalSupplyWei).toString();
-    const newUtilScaled = new decimal_js_1.default(newUtil).mul(1e18).toString();
-    if (new decimal_js_1.default(newUtilScaled).lt(marketData.targetBorrowUtilization))
-        return { vaults: [], withdrawals: [] };
-    const liquidityToAllocate = (0, exports.getLiquidityToAllocate)(amountToBorrow, totalBorrowWei, totalSupplyWei, marketData.targetBorrowUtilization, marketData.reallocatableLiquidityAssets);
-    const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce((acc, item) => {
-        const vaultAddress = item.vault.address;
-        acc[vaultAddress] = new decimal_js_1.default(acc[vaultAddress] || '0').add(item.assets).toString();
-        return acc;
-    }, {});
-    const sortedVaults = Object.entries(vaultTotalAssets).sort(([, a], [, b]) => new decimal_js_1.default(b || '0').sub(a || '0').toNumber());
-    const withdrawalsPerVault = {};
-    let totalReallocated = '0';
-    for (const [vaultAddress] of sortedVaults) {
-        if (new decimal_js_1.default(totalReallocated).gte(liquidityToAllocate))
-            break;
-        const vaultAllocations = marketData.publicAllocatorSharedLiquidity.filter((item) => (0, utils_1.compareAddresses)(item.vault.address, vaultAddress));
-        for (const item of vaultAllocations) {
+    try {
+        const { marketId, loanToken } = market;
+        const response = yield fetch(API_URL, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                query: MARKET_QUERY,
+                variables: { uniqueKey: marketId, chainId: network },
+            }),
+            signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT),
+        });
+        const data = yield response.json();
+        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+        if (!marketData)
+            throw new Error('Market data not found');
+        const loanAssetInfo = (0, tokens_1.getAssetInfoByAddress)(loanToken, network);
+        const { totalBorrow, totalSupply } = assetsData[loanAssetInfo.symbol] || { totalBorrow: '0', totalSupply: '0' };
+        const totalBorrowWei = (0, tokens_1.assetAmountInWei)(totalBorrow, loanAssetInfo.symbol);
+        const totalSupplyWei = (0, tokens_1.assetAmountInWei)(totalSupply, loanAssetInfo.symbol);
+        const newTotalBorrowAssets = new decimal_js_1.default(totalBorrowWei).add(amountToBorrow).toString();
+        const newUtil = new decimal_js_1.default(newTotalBorrowAssets).div(totalSupplyWei).toString();
+        const newUtilScaled = new decimal_js_1.default(newUtil).mul(1e18).toString();
+        if (new decimal_js_1.default(newUtilScaled).lt(marketData.targetBorrowUtilization))
+            return { vaults: [], withdrawals: [] };
+        const liquidityToAllocate = (0, exports.getLiquidityToAllocate)(amountToBorrow, totalBorrowWei, totalSupplyWei, marketData.targetBorrowUtilization, marketData.reallocatableLiquidityAssets);
+        const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce((acc, item) => {
+            const vaultAddress = item.vault.address;
+            acc[vaultAddress] = new decimal_js_1.default(acc[vaultAddress] || '0').add(item.assets).toString();
+            return acc;
+        }, {});
+        const sortedVaults = Object.entries(vaultTotalAssets).sort(([, a], [, b]) => new decimal_js_1.default(b || '0').sub(a || '0').toNumber());
+        const withdrawalsPerVault = {};
+        let totalReallocated = '0';
+        for (const [vaultAddress] of sortedVaults) {
             if (new decimal_js_1.default(totalReallocated).gte(liquidityToAllocate))
                 break;
-            const itemAmount = item.assets;
-            const leftToAllocate = new decimal_js_1.default(liquidityToAllocate).sub(totalReallocated).toString();
-            const amountToTake = new decimal_js_1.default(itemAmount).lt(leftToAllocate) ? itemAmount : leftToAllocate;
-            totalReallocated = new decimal_js_1.default(totalReallocated).add(amountToTake).toString();
-            const withdrawal = [
-                [
-                    item.allocationMarket.loanAsset.address,
-                    (_b = item.allocationMarket.collateralAsset) === null || _b === void 0 ? void 0 : _b.address,
-                    (_c = item.allocationMarket.oracle) === null || _c === void 0 ? void 0 : _c.address,
-                    item.allocationMarket.irmAddress,
-                    item.allocationMarket.lltv,
-                ],
-                amountToTake.toString(),
-                item.allocationMarket.uniqueKey,
-            ];
-            if (!withdrawalsPerVault[vaultAddress]) {
-                withdrawalsPerVault[vaultAddress] = [];
+            const vaultAllocations = marketData.publicAllocatorSharedLiquidity.filter((item) => (0, utils_1.compareAddresses)(item.vault.address, vaultAddress));
+            for (const item of vaultAllocations) {
+                if (new decimal_js_1.default(totalReallocated).gte(liquidityToAllocate))
+                    break;
+                const itemAmount = item.assets;
+                const leftToAllocate = new decimal_js_1.default(liquidityToAllocate).sub(totalReallocated).toString();
+                const amountToTake = new decimal_js_1.default(itemAmount).lt(leftToAllocate) ? itemAmount : leftToAllocate;
+                totalReallocated = new decimal_js_1.default(totalReallocated).add(amountToTake).toString();
+                const withdrawal = [
+                    [
+                        item.allocationMarket.loanAsset.address,
+                        (_b = item.allocationMarket.collateralAsset) === null || _b === void 0 ? void 0 : _b.address,
+                        (_c = item.allocationMarket.oracle) === null || _c === void 0 ? void 0 : _c.address,
+                        item.allocationMarket.irmAddress,
+                        item.allocationMarket.lltv,
+                    ],
+                    amountToTake.toString(),
+                    item.allocationMarket.uniqueKey,
+                ];
+                if (!withdrawalsPerVault[vaultAddress]) {
+                    withdrawalsPerVault[vaultAddress] = [];
+                }
+                withdrawalsPerVault[vaultAddress].push(withdrawal);
             }
-            withdrawalsPerVault[vaultAddress].push(withdrawal);
         }
+        const vaults = Object.keys(withdrawalsPerVault);
+        const withdrawals = vaults.map((vaultAddress) => withdrawalsPerVault[vaultAddress].sort((a, b) => a[2].localeCompare(b[2])).map(w => [w[0], w[1]]));
+        return {
+            vaults,
+            withdrawals,
+        };
+    }
+    catch (error) {
+        console.error('External API Failure: Morpho blue reallocation', error);
+        throw new Error('Failed to fetch reallocation data');
     }
-    const vaults = Object.keys(withdrawalsPerVault);
-    const withdrawals = vaults.map((vaultAddress) => withdrawalsPerVault[vaultAddress].sort((a, b) => a[2].localeCompare(b[2])).map(w => [w[0], w[1]]));
-    return {
-        vaults,
-        withdrawals,
-    };
 });
 exports.getReallocation = getReallocation;
 const getRewardsForMarket = (marketId_1, ...args_1) => __awaiter(void 0, [marketId_1, ...args_1], void 0, function* (marketId, network = common_1.NetworkNumber.Eth) {

package/cjs/services/utils.d.ts

@@ -24,3 +24,4 @@ export declare const isEnabledOnBitmap: (bitmap: number, assetId: number) => big
 export declare const MAXUINT: string;
 export declare const isMaxuint: (amount: string) => boolean;
 export declare const isMainnetNetwork: (network: NetworkNumber) => network is NetworkNumber.Eth;
+export declare const DEFAULT_TIMEOUT = 2000;

package/cjs/services/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMainnetNetwork = exports.isMaxuint = exports.MAXUINT = exports.isEnabledOnBitmap = exports.mapRange = exports.bytesToString = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.wethToEth = exports.ethToWeth = exports.addToArrayIf = exports.addToObjectIf = exports.isLayer2Network = void 0;
+exports.DEFAULT_TIMEOUT = exports.isMainnetNetwork = exports.isMaxuint = exports.MAXUINT = exports.isEnabledOnBitmap = exports.mapRange = exports.bytesToString = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.wethToEth = exports.ethToWeth = exports.addToArrayIf = exports.addToObjectIf = exports.isLayer2Network = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -63,3 +63,4 @@ const isMaxuint = (amount) => (0, exports.compareAddresses)(exports.MAXUINT, amo
 exports.isMaxuint = isMaxuint;
 const isMainnetNetwork = (network) => network === common_1.NetworkNumber.Eth;
 exports.isMainnetNetwork = isMainnetNetwork;
+exports.DEFAULT_TIMEOUT = 2000; // 2 seconds

package/cjs/staking/staking.js

@@ -16,34 +16,54 @@ exports.calculateNetApy = exports.isEligibleForEthenaUSDeRewards = exports.calcu
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const memoizee_1 = __importDefault(require("memoizee"));
 const constants_1 = require("../constants");
+const utils_1 = require("../services/utils");
 const getSsrApy = () => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield fetch('https://fe.defisaver.com/api/sky/data');
-    const data = yield res.json();
-    return new decimal_js_1.default(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
+    try {
+        const res = yield fetch('https://fe.defisaver.com/api/sky/data', { signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT) });
+        const data = yield res.json();
+        return new decimal_js_1.default(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
+    }
+    catch (e) {
+        console.error('External API Failure: Failed to fetch SSR APY from external API', e);
+        return '0';
+    }
 });
 const getSuperOETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield fetch('https://origin.squids.live/origin-squid/graphql', {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-            query: '\n    query OTokenApy($chainId: Int!, $token: String!) {\n  oTokenApies(\n    limit: 1\n    orderBy: timestamp_DESC\n    where: {chainId_eq: $chainId, otoken_containsInsensitive: $token}\n  ) {\n    apy7DayAvg\n    apy14DayAvg\n    apy30DayAvg\n    apr\n    apy\n  }\n}\n    ',
-            variables: {
-                token: '0xdbfefd2e8460a6ee4955a68582f85708baea60a3',
-                chainId: 8453,
+    try {
+        const res = yield fetch('https://origin.squids.live/origin-squid/graphql', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
             },
-        }),
-    });
-    const data = yield res.json();
-    return new decimal_js_1.default(data.data.oTokenApies[0].apy).mul(100).toString();
+            body: JSON.stringify({
+                query: '\n    query OTokenApy($chainId: Int!, $token: String!) {\n  oTokenApies(\n    limit: 1\n    orderBy: timestamp_DESC\n    where: {chainId_eq: $chainId, otoken_containsInsensitive: $token}\n  ) {\n    apy7DayAvg\n    apy14DayAvg\n    apy30DayAvg\n    apr\n    apy\n  }\n}\n    ',
+                variables: {
+                    token: '0xdbfefd2e8460a6ee4955a68582f85708baea60a3',
+                    chainId: 8453,
+                },
+            }),
+            signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT),
+        });
+        const data = yield res.json();
+        return new decimal_js_1.default(data.data.oTokenApies[0].apy).mul(100).toString();
+    }
+    catch (e) {
+        console.error('External API Failure: Failed to fetch Super OETH APY from external API', e);
+        return '0';
+    }
 });
 const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield fetch(`https://fe.defisaver.com/api/staking/apy?asset=${asset}`);
-    if (!res.ok)
-        throw new Error(`Failed to fetch APY for ${asset}`);
-    const data = yield res.json();
-    return String(data.apy);
+    try {
+        const res = yield fetch(`https://fe.defisaver.com/api/staking/apy?asset=${asset}`, { signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT) });
+        if (!res.ok)
+            throw new Error(`Failed to fetch APY for ${asset}`);
+        const data = yield res.json();
+        return String(data.apy);
+    }
+    catch (e) {
+        console.error(`External API Failure: Failed to fetch APY for ${asset} from DFS API`, e);
+        return '0';
+    }
 });
 exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep'];
 exports.getStakingApy = (0, memoizee_1.default)((asset) => __awaiter(void 0, void 0, void 0, function* () {

package/cjs/types/compound.d.ts

@@ -50,7 +50,9 @@ export interface CompoundV2AssetData extends CompoundAssetData {
 export interface CompoundV3AssetData extends CompoundAssetData {
     borrowCollateralFactor: string;
     liquidateCollateralFactor: string;
+    liquidationFactor: string;
     minDebt: string;
+    supplyReserved: string;
     liquidationRatio: string;
     supplyCap: string;
     priceInBaseAsset: string;

package/esm/fluid/index.js

@@ -12,7 +12,7 @@ import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress, } from '@defisav
 import { NetworkNumber } from '../types/common';
 import { FluidVaultType, } from '../types';
 import { BTCPriceFeedContractViem, DFSFeedRegistryContractViem, ETHPriceFeedContractViem, FeedRegistryContractViem, FluidViewContractViem, } from '../contracts';
-import { compareAddresses, getEthAmountForDecimals, isMainnetNetwork } from '../services/utils';
+import { compareAddresses, DEFAULT_TIMEOUT, getEthAmountForDecimals, isMainnetNetwork, } from '../services/utils';
 import { getFluidAggregatedData, mergeAssetData, mergeUsedAssets, parseDexBorrowData, parseDexSupplyData, } from '../helpers/fluidHelpers';
 import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
 import { USD_QUOTE, ZERO_ADDRESS } from '../constants';
@@ -193,9 +193,10 @@ const getAdditionalMarketRateForDex = (token1PerShare, token0PerShare, incentive
 const getTradingApy = (poolAddress) => __awaiter(void 0, void 0, void 0, function* () {
     let res;
     try {
-        res = yield fetch(`https://api.fluid.instadapp.io/v2/1/dexes/${poolAddress}/apy`, { signal: AbortSignal.timeout(2000) });
+        res = yield fetch(`https://api.fluid.instadapp.io/v2/1/dexes/${poolAddress}/apy`, { signal: AbortSignal.timeout(DEFAULT_TIMEOUT) });
     }
     catch (e) {
+        console.error('External API Failure: Fluid Trading Apy');
         return '0';
     }
     if (!res.ok) {

package/esm/helpers/compoundHelpers/index.js

@@ -32,14 +32,14 @@ export const formatMarketData = (data, network, baseAssetPrice) => {
     const assetInfo = getAssetInfoByAddress(data.tokenAddr, network);
     const isWETH = assetInfo.symbol === 'WETH';
     const price = getEthAmountForDecimals(data.price, 8);
-    return (Object.assign(Object.assign({}, data), { priceInBaseAsset: getEthAmountForDecimals(data.price, 8), price: new Dec(price).mul(baseAssetPrice).toString(), collateralFactor: getEthAmountForDecimals(data.borrowCollateralFactor, 18), liquidationRatio: getEthAmountForDecimals(data.liquidateCollateralFactor, 18), supplyCap: getEthAmountForDecimals(data.supplyCap, assetInfo.decimals), totalSupply: getEthAmountForDecimals(data.totalSupply, assetInfo.decimals), symbol: isWETH ? 'ETH' : assetInfo.symbol, supplyRate: '0', borrowRate: '0', canBeBorrowed: false, canBeSupplied: true }));
+    return (Object.assign(Object.assign({}, data), { borrowCollateralFactor: data.borrowCollateralFactor.toString(), liquidateCollateralFactor: data.liquidateCollateralFactor.toString(), liquidationFactor: data.liquidationFactor.toString(), supplyReserved: data.supplyReserved.toString(), priceInBaseAsset: getEthAmountForDecimals(data.price, 8), price: new Dec(price).mul(baseAssetPrice).toString(), collateralFactor: getEthAmountForDecimals(data.borrowCollateralFactor, 18), liquidationRatio: getEthAmountForDecimals(data.liquidateCollateralFactor, 18), supplyCap: getEthAmountForDecimals(data.supplyCap, assetInfo.decimals), totalSupply: getEthAmountForDecimals(data.totalSupply, assetInfo.decimals), symbol: isWETH ? 'ETH' : assetInfo.symbol, supplyRate: '0', borrowRate: '0', canBeBorrowed: false, canBeSupplied: true }));
 };
 // TODO: maybe not hardcode decimals
 export const formatBaseData = (data, network, baseAssetPrice) => {
     const assetInfo = getAssetInfoByAddress(data.tokenAddr, network);
     const totalSupply = getEthAmountForDecimals(new Dec(data.totalSupply).mul(data.supplyIndex).toString(), 15 + assetInfo.decimals);
     const totalBorrow = getEthAmountForDecimals(new Dec(data.totalBorrow).mul(data.borrowIndex).toString(), 15 + assetInfo.decimals);
-    return (Object.assign(Object.assign({}, data), { supplyRate: aprToApy(new Dec(data.supplyRate).div(1e18).mul(SECONDS_PER_YEAR).mul(100)
+    return (Object.assign(Object.assign({}, data), { baseBorrowMin: data.baseBorrowMin.toString(), baseTrackingBorrowRewardsSpeed: data.baseTrackingBorrowRewardsSpeed.toString(), baseTrackingSupplyRewardsSpeed: data.baseTrackingSupplyRewardsSpeed.toString(), borrowIndex: data.borrowIndex.toString(), supplyIndex: data.supplyIndex.toString(), trackingBorrowIndex: data.trackingBorrowIndex.toString(), trackingSupplyIndex: data.trackingSupplyIndex.toString(), supplyRate: aprToApy(new Dec(data.supplyRate).div(1e18).mul(SECONDS_PER_YEAR).mul(100)
             .toString()), borrowRate: aprToApy(new Dec(data.borrowRate).div(1e18).mul(SECONDS_PER_YEAR).mul(100)
             .toString()), utilization: getEthAmountForDecimals(data.utilization, 16), // utilization is totalSupply/totalBorrow in 1e18, but we need % so when we mul with 100 it's 16 decimals
         totalSupply,

package/esm/helpers/morphoBlueHelpers/index.js

@@ -14,7 +14,7 @@ import { calculateNetApy } from '../../staking';
 import { NetworkNumber, } from '../../types/common';
 import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
 import { MorphoBlueViewContractViem } from '../../contracts';
-import { compareAddresses } from '../../services/utils';
+import { compareAddresses, DEFAULT_TIMEOUT } from '../../services/utils';
 import { getViemProvider } from '../../services/viem';
 export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
     var _a, _b, _c, _d, _e, _f;
@@ -194,19 +194,29 @@ const REWARDS_QUERY = `
 */
 export const getReallocatableLiquidity = (marketId_1, ...args_1) => __awaiter(void 0, [marketId_1, ...args_1], void 0, function* (marketId, network = NetworkNumber.Eth) {
     var _a;
-    const response = yield fetch(API_URL, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-            query: MARKET_QUERY,
-            variables: { uniqueKey: marketId, chainId: network },
-        }),
-    });
-    const data = yield response.json();
-    const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
-    if (!marketData)
-        throw new Error('Market data not found');
-    return { reallocatableLiquidity: marketData.reallocatableLiquidityAssets, targetBorrowUtilization: marketData.targetBorrowUtilization };
+    try {
+        const response = yield fetch(API_URL, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                query: MARKET_QUERY,
+                variables: { uniqueKey: marketId, chainId: network },
+            }),
+            signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+        });
+        const data = yield response.json();
+        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+        if (!marketData)
+            throw new Error('Market data not found');
+        return {
+            reallocatableLiquidity: marketData.reallocatableLiquidityAssets,
+            targetBorrowUtilization: marketData.targetBorrowUtilization,
+        };
+    }
+    catch (error) {
+        console.error('External API Failure: Morpho blue reallocatable liquidity', error);
+        throw new Error('Failed to fetch reallocatable liquidity');
+    }
 });
 /**
  * Get liquidity to allocate for a given amount to borrow.
@@ -245,71 +255,78 @@ export const getLiquidityToAllocate = (amountToBorrow, totalBorrow, totalSupply,
  */
 export const getReallocation = (market_1, assetsData_1, amountToBorrow_1, ...args_1) => __awaiter(void 0, [market_1, assetsData_1, amountToBorrow_1, ...args_1], void 0, function* (market, assetsData, amountToBorrow, network = NetworkNumber.Eth) {
     var _a, _b, _c;
-    const { marketId, loanToken } = market;
-    const response = yield fetch(API_URL, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-            query: MARKET_QUERY,
-            variables: { uniqueKey: marketId, chainId: network },
-        }),
-    });
-    const data = yield response.json();
-    const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
-    if (!marketData)
-        throw new Error('Market data not found');
-    const loanAssetInfo = getAssetInfoByAddress(loanToken, network);
-    const { totalBorrow, totalSupply } = assetsData[loanAssetInfo.symbol] || { totalBorrow: '0', totalSupply: '0' };
-    const totalBorrowWei = assetAmountInWei(totalBorrow, loanAssetInfo.symbol);
-    const totalSupplyWei = assetAmountInWei(totalSupply, loanAssetInfo.symbol);
-    const newTotalBorrowAssets = new Dec(totalBorrowWei).add(amountToBorrow).toString();
-    const newUtil = new Dec(newTotalBorrowAssets).div(totalSupplyWei).toString();
-    const newUtilScaled = new Dec(newUtil).mul(1e18).toString();
-    if (new Dec(newUtilScaled).lt(marketData.targetBorrowUtilization))
-        return { vaults: [], withdrawals: [] };
-    const liquidityToAllocate = getLiquidityToAllocate(amountToBorrow, totalBorrowWei, totalSupplyWei, marketData.targetBorrowUtilization, marketData.reallocatableLiquidityAssets);
-    const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce((acc, item) => {
-        const vaultAddress = item.vault.address;
-        acc[vaultAddress] = new Dec(acc[vaultAddress] || '0').add(item.assets).toString();
-        return acc;
-    }, {});
-    const sortedVaults = Object.entries(vaultTotalAssets).sort(([, a], [, b]) => new Dec(b || '0').sub(a || '0').toNumber());
-    const withdrawalsPerVault = {};
-    let totalReallocated = '0';
-    for (const [vaultAddress] of sortedVaults) {
-        if (new Dec(totalReallocated).gte(liquidityToAllocate))
-            break;
-        const vaultAllocations = marketData.publicAllocatorSharedLiquidity.filter((item) => compareAddresses(item.vault.address, vaultAddress));
-        for (const item of vaultAllocations) {
+    try {
+        const { marketId, loanToken } = market;
+        const response = yield fetch(API_URL, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                query: MARKET_QUERY,
+                variables: { uniqueKey: marketId, chainId: network },
+            }),
+            signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+        });
+        const data = yield response.json();
+        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+        if (!marketData)
+            throw new Error('Market data not found');
+        const loanAssetInfo = getAssetInfoByAddress(loanToken, network);
+        const { totalBorrow, totalSupply } = assetsData[loanAssetInfo.symbol] || { totalBorrow: '0', totalSupply: '0' };
+        const totalBorrowWei = assetAmountInWei(totalBorrow, loanAssetInfo.symbol);
+        const totalSupplyWei = assetAmountInWei(totalSupply, loanAssetInfo.symbol);
+        const newTotalBorrowAssets = new Dec(totalBorrowWei).add(amountToBorrow).toString();
+        const newUtil = new Dec(newTotalBorrowAssets).div(totalSupplyWei).toString();
+        const newUtilScaled = new Dec(newUtil).mul(1e18).toString();
+        if (new Dec(newUtilScaled).lt(marketData.targetBorrowUtilization))
+            return { vaults: [], withdrawals: [] };
+        const liquidityToAllocate = getLiquidityToAllocate(amountToBorrow, totalBorrowWei, totalSupplyWei, marketData.targetBorrowUtilization, marketData.reallocatableLiquidityAssets);
+        const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce((acc, item) => {
+            const vaultAddress = item.vault.address;
+            acc[vaultAddress] = new Dec(acc[vaultAddress] || '0').add(item.assets).toString();
+            return acc;
+        }, {});
+        const sortedVaults = Object.entries(vaultTotalAssets).sort(([, a], [, b]) => new Dec(b || '0').sub(a || '0').toNumber());
+        const withdrawalsPerVault = {};
+        let totalReallocated = '0';
+        for (const [vaultAddress] of sortedVaults) {
             if (new Dec(totalReallocated).gte(liquidityToAllocate))
                 break;
-            const itemAmount = item.assets;
-            const leftToAllocate = new Dec(liquidityToAllocate).sub(totalReallocated).toString();
-            const amountToTake = new Dec(itemAmount).lt(leftToAllocate) ? itemAmount : leftToAllocate;
-            totalReallocated = new Dec(totalReallocated).add(amountToTake).toString();
-            const withdrawal = [
-                [
-                    item.allocationMarket.loanAsset.address,
-                    (_b = item.allocationMarket.collateralAsset) === null || _b === void 0 ? void 0 : _b.address,
-                    (_c = item.allocationMarket.oracle) === null || _c === void 0 ? void 0 : _c.address,
-                    item.allocationMarket.irmAddress,
-                    item.allocationMarket.lltv,
-                ],
-                amountToTake.toString(),
-                item.allocationMarket.uniqueKey,
-            ];
-            if (!withdrawalsPerVault[vaultAddress]) {
-                withdrawalsPerVault[vaultAddress] = [];
+            const vaultAllocations = marketData.publicAllocatorSharedLiquidity.filter((item) => compareAddresses(item.vault.address, vaultAddress));
+            for (const item of vaultAllocations) {
+                if (new Dec(totalReallocated).gte(liquidityToAllocate))
+                    break;
+                const itemAmount = item.assets;
+                const leftToAllocate = new Dec(liquidityToAllocate).sub(totalReallocated).toString();
+                const amountToTake = new Dec(itemAmount).lt(leftToAllocate) ? itemAmount : leftToAllocate;
+                totalReallocated = new Dec(totalReallocated).add(amountToTake).toString();
+                const withdrawal = [
+                    [
+                        item.allocationMarket.loanAsset.address,
+                        (_b = item.allocationMarket.collateralAsset) === null || _b === void 0 ? void 0 : _b.address,
+                        (_c = item.allocationMarket.oracle) === null || _c === void 0 ? void 0 : _c.address,
+                        item.allocationMarket.irmAddress,
+                        item.allocationMarket.lltv,
+                    ],
+                    amountToTake.toString(),
+                    item.allocationMarket.uniqueKey,
+                ];
+                if (!withdrawalsPerVault[vaultAddress]) {
+                    withdrawalsPerVault[vaultAddress] = [];
+                }
+                withdrawalsPerVault[vaultAddress].push(withdrawal);
             }
-            withdrawalsPerVault[vaultAddress].push(withdrawal);
         }
+        const vaults = Object.keys(withdrawalsPerVault);
+        const withdrawals = vaults.map((vaultAddress) => withdrawalsPerVault[vaultAddress].sort((a, b) => a[2].localeCompare(b[2])).map(w => [w[0], w[1]]));
+        return {
+            vaults,
+            withdrawals,
+        };
+    }
+    catch (error) {
+        console.error('External API Failure: Morpho blue reallocation', error);
+        throw new Error('Failed to fetch reallocation data');
     }
-    const vaults = Object.keys(withdrawalsPerVault);
-    const withdrawals = vaults.map((vaultAddress) => withdrawalsPerVault[vaultAddress].sort((a, b) => a[2].localeCompare(b[2])).map(w => [w[0], w[1]]));
-    return {
-        vaults,
-        withdrawals,
-    };
 });
 export const getRewardsForMarket = (marketId_1, ...args_1) => __awaiter(void 0, [marketId_1, ...args_1], void 0, function* (marketId, network = NetworkNumber.Eth) {
     var _a;

package/esm/services/utils.d.ts

@@ -24,3 +24,4 @@ export declare const isEnabledOnBitmap: (bitmap: number, assetId: number) => big
 export declare const MAXUINT: string;
 export declare const isMaxuint: (amount: string) => boolean;
 export declare const isMainnetNetwork: (network: NetworkNumber) => network is NetworkNumber.Eth;
+export declare const DEFAULT_TIMEOUT = 2000;

package/esm/services/utils.js

@@ -37,3 +37,4 @@ export const isEnabledOnBitmap = (bitmap, assetId) => (BigInt(bitmap) >> BigInt(
 export const MAXUINT = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
 export const isMaxuint = (amount) => compareAddresses(MAXUINT, amount);
 export const isMainnetNetwork = (network) => network === NetworkNumber.Eth;
+export const DEFAULT_TIMEOUT = 2000; // 2 seconds

package/esm/staking/staking.js

@@ -10,34 +10,54 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import Dec from 'decimal.js';
 import memoize from 'memoizee';
 import { BLOCKS_IN_A_YEAR } from '../constants';
+import { DEFAULT_TIMEOUT } from '../services/utils';
 const getSsrApy = () => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield fetch('https://fe.defisaver.com/api/sky/data');
-    const data = yield res.json();
-    return new Dec(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
+    try {
+        const res = yield fetch('https://fe.defisaver.com/api/sky/data', { signal: AbortSignal.timeout(DEFAULT_TIMEOUT) });
+        const data = yield res.json();
+        return new Dec(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
+    }
+    catch (e) {
+        console.error('External API Failure: Failed to fetch SSR APY from external API', e);
+        return '0';
+    }
 });
 const getSuperOETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield fetch('https://origin.squids.live/origin-squid/graphql', {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-            query: '\n    query OTokenApy($chainId: Int!, $token: String!) {\n  oTokenApies(\n    limit: 1\n    orderBy: timestamp_DESC\n    where: {chainId_eq: $chainId, otoken_containsInsensitive: $token}\n  ) {\n    apy7DayAvg\n    apy14DayAvg\n    apy30DayAvg\n    apr\n    apy\n  }\n}\n    ',
-            variables: {
-                token: '0xdbfefd2e8460a6ee4955a68582f85708baea60a3',
-                chainId: 8453,
+    try {
+        const res = yield fetch('https://origin.squids.live/origin-squid/graphql', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
             },
-        }),
-    });
-    const data = yield res.json();
-    return new Dec(data.data.oTokenApies[0].apy).mul(100).toString();
+            body: JSON.stringify({
+                query: '\n    query OTokenApy($chainId: Int!, $token: String!) {\n  oTokenApies(\n    limit: 1\n    orderBy: timestamp_DESC\n    where: {chainId_eq: $chainId, otoken_containsInsensitive: $token}\n  ) {\n    apy7DayAvg\n    apy14DayAvg\n    apy30DayAvg\n    apr\n    apy\n  }\n}\n    ',
+                variables: {
+                    token: '0xdbfefd2e8460a6ee4955a68582f85708baea60a3',
+                    chainId: 8453,
+                },
+            }),
+            signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+        });
+        const data = yield res.json();
+        return new Dec(data.data.oTokenApies[0].apy).mul(100).toString();
+    }
+    catch (e) {
+        console.error('External API Failure: Failed to fetch Super OETH APY from external API', e);
+        return '0';
+    }
 });
 const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield fetch(`https://fe.defisaver.com/api/staking/apy?asset=${asset}`);
-    if (!res.ok)
-        throw new Error(`Failed to fetch APY for ${asset}`);
-    const data = yield res.json();
-    return String(data.apy);
+    try {
+        const res = yield fetch(`https://fe.defisaver.com/api/staking/apy?asset=${asset}`, { signal: AbortSignal.timeout(DEFAULT_TIMEOUT) });
+        if (!res.ok)
+            throw new Error(`Failed to fetch APY for ${asset}`);
+        const data = yield res.json();
+        return String(data.apy);
+    }
+    catch (e) {
+        console.error(`External API Failure: Failed to fetch APY for ${asset} from DFS API`, e);
+        return '0';
+    }
 });
 export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep'];
 export const getStakingApy = memoize((asset) => __awaiter(void 0, void 0, void 0, function* () {

package/esm/types/compound.d.ts

@@ -50,7 +50,9 @@ export interface CompoundV2AssetData extends CompoundAssetData {
 export interface CompoundV3AssetData extends CompoundAssetData {
     borrowCollateralFactor: string;
     liquidateCollateralFactor: string;
+    liquidationFactor: string;
     minDebt: string;
+    supplyReserved: string;
     liquidationRatio: string;
     supplyCap: string;
     priceInBaseAsset: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/fluid/index.ts

@@ -22,7 +22,9 @@ import {
 import {
   BTCPriceFeedContractViem, DFSFeedRegistryContractViem, ETHPriceFeedContractViem, FeedRegistryContractViem, FluidViewContractViem,
 } from '../contracts';
-import { compareAddresses, getEthAmountForDecimals, isMainnetNetwork } from '../services/utils';
+import {
+  compareAddresses, DEFAULT_TIMEOUT, getEthAmountForDecimals, isMainnetNetwork,
+} from '../services/utils';
 import {
   getFluidAggregatedData,
   mergeAssetData,
@@ -256,8 +258,10 @@ const getAdditionalMarketRateForDex = (token1PerShare: string, token0PerShare: s
 const getTradingApy = async (poolAddress: EthAddress) => {
   let res;
   try {
-    res = await fetch(`https://api.fluid.instadapp.io/v2/1/dexes/${poolAddress}/apy`, { signal: AbortSignal.timeout(2000) });
+    res = await fetch(`https://api.fluid.instadapp.io/v2/1/dexes/${poolAddress}/apy`,
+      { signal: AbortSignal.timeout(DEFAULT_TIMEOUT) });
   } catch (e) {
+    console.error('External API Failure: Fluid Trading Apy');
     return '0';
   }
   if (!res.ok) {

package/src/helpers/compoundHelpers/index.ts

@@ -19,6 +19,10 @@ export const formatMarketData = (data: any, network: NetworkNumber, baseAssetPri
   const price = getEthAmountForDecimals(data.price, 8);
   return ({
     ...data,
+    borrowCollateralFactor: data.borrowCollateralFactor.toString(),
+    liquidateCollateralFactor: data.liquidateCollateralFactor.toString(),
+    liquidationFactor: data.liquidationFactor.toString(),
+    supplyReserved: data.supplyReserved.toString(),
     priceInBaseAsset: getEthAmountForDecimals(data.price, 8),
     price: new Dec(price).mul(baseAssetPrice).toString(),
     collateralFactor: getEthAmountForDecimals(data.borrowCollateralFactor, 18),
@@ -40,6 +44,13 @@ export const formatBaseData = (data: any, network: NetworkNumber, baseAssetPrice
   const totalBorrow = getEthAmountForDecimals(new Dec(data.totalBorrow).mul(data.borrowIndex).toString(), 15 + assetInfo.decimals);
   return ({
     ...data,
+    baseBorrowMin: data.baseBorrowMin.toString(),
+    baseTrackingBorrowRewardsSpeed: data.baseTrackingBorrowRewardsSpeed.toString(),
+    baseTrackingSupplyRewardsSpeed: data.baseTrackingSupplyRewardsSpeed.toString(),
+    borrowIndex: data.borrowIndex.toString(),
+    supplyIndex: data.supplyIndex.toString(),
+    trackingBorrowIndex: data.trackingBorrowIndex.toString(),
+    trackingSupplyIndex: data.trackingSupplyIndex.toString(),
     supplyRate: aprToApy(new Dec(data.supplyRate).div(1e18).mul(SECONDS_PER_YEAR).mul(100)
       .toString()),
     borrowRate: aprToApy(new Dec(data.borrowRate).div(1e18).mul(SECONDS_PER_YEAR).mul(100)

package/src/helpers/morphoBlueHelpers/index.ts

@@ -14,7 +14,7 @@ import {
 } from '../../types';
 import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
 import { MorphoBlueViewContractViem } from '../../contracts';
-import { compareAddresses } from '../../services/utils';
+import { compareAddresses, DEFAULT_TIMEOUT } from '../../services/utils';
 import { getViemProvider } from '../../services/viem';
 
 export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }: { usedAssets: MMUsedAssets, assetsData: MorphoBlueAssetsData, marketInfo: MorphoBlueMarketInfo }): MorphoBlueAggregatedPositionData => {
@@ -214,21 +214,30 @@ const REWARDS_QUERY = `
  * @returns The reallocatable liquidity and target borrow utilization
 */
 export const getReallocatableLiquidity = async (marketId: string, network: NetworkNumber = NetworkNumber.Eth): Promise<{ reallocatableLiquidity: string, targetBorrowUtilization: string }> => {
-  const response = await fetch(API_URL, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({
-      query: MARKET_QUERY,
-      variables: { uniqueKey: marketId, chainId: network },
-    }),
-  });
-
-  const data: { data: { marketByUniqueKey: MorphoBlueRealloactionMarketData } } = await response.json();
-  const marketData: MorphoBlueRealloactionMarketData = data?.data?.marketByUniqueKey;
-
-  if (!marketData) throw new Error('Market data not found');
+  try {
+    const response = await fetch(API_URL, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        query: MARKET_QUERY,
+        variables: { uniqueKey: marketId, chainId: network },
+      }),
+      signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+    });
+
+    const data: { data: { marketByUniqueKey: MorphoBlueRealloactionMarketData } } = await response.json();
+    const marketData: MorphoBlueRealloactionMarketData = data?.data?.marketByUniqueKey;
+
+    if (!marketData) throw new Error('Market data not found');
 
-  return { reallocatableLiquidity: marketData.reallocatableLiquidityAssets, targetBorrowUtilization: marketData.targetBorrowUtilization };
+    return {
+      reallocatableLiquidity: marketData.reallocatableLiquidityAssets,
+      targetBorrowUtilization: marketData.targetBorrowUtilization,
+    };
+  } catch (error) {
+    console.error('External API Failure: Morpho blue reallocatable liquidity', error);
+    throw new Error('Failed to fetch reallocatable liquidity');
+  }
 };
 
 /**
@@ -269,90 +278,96 @@ export const getLiquidityToAllocate = (amountToBorrow: string, totalBorrow: stri
  * @returns The vaults and withdrawals needed to reallocate liquidity
  */
 export const getReallocation = async (market: MorphoBlueMarketData, assetsData: MorphoBlueAssetsData, amountToBorrow: string, network: NetworkNumber = NetworkNumber.Eth): Promise<{ vaults: string[], withdrawals: (string | string[])[][][] }> => {
-  const { marketId, loanToken } = market;
-  const response = await fetch(API_URL, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({
-      query: MARKET_QUERY,
-      variables: { uniqueKey: marketId, chainId: network },
-    }),
-  });
-
-  const data: { data: { marketByUniqueKey: MorphoBlueRealloactionMarketData } } = await response.json();
-  const marketData: MorphoBlueRealloactionMarketData = data?.data?.marketByUniqueKey;
-
-  if (!marketData) throw new Error('Market data not found');
-
-  const loanAssetInfo = getAssetInfoByAddress(loanToken, network);
-  const { totalBorrow, totalSupply } = assetsData[loanAssetInfo.symbol] || { totalBorrow: '0', totalSupply: '0' };
-  const totalBorrowWei = assetAmountInWei(totalBorrow!, loanAssetInfo.symbol);
-  const totalSupplyWei = assetAmountInWei(totalSupply!, loanAssetInfo.symbol);
-
-  const newTotalBorrowAssets = new Dec(totalBorrowWei).add(amountToBorrow).toString();
-
-  const newUtil = new Dec(newTotalBorrowAssets).div(totalSupplyWei).toString();
-  const newUtilScaled = new Dec(newUtil).mul(1e18).toString();
-
-  if (new Dec(newUtilScaled).lt(marketData.targetBorrowUtilization)) return { vaults: [], withdrawals: [] };
-
-  const liquidityToAllocate = getLiquidityToAllocate(amountToBorrow, totalBorrowWei, totalSupplyWei, marketData.targetBorrowUtilization, marketData.reallocatableLiquidityAssets);
-
-  const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce(
-    (acc: Record<string, string>, item: MorphoBluePublicAllocatorItem) => {
-      const vaultAddress = item.vault.address;
-      acc[vaultAddress] = new Dec(acc[vaultAddress] || '0').add(item.assets).toString();
-      return acc;
-    },
-    {},
-  );
-
-  const sortedVaults = Object.entries(vaultTotalAssets).sort(
-    ([, a]: [string, string], [, b]: [string, string]) => new Dec(b || '0').sub(a || '0').toNumber(),
-  );
-
-  const withdrawalsPerVault: Record<string, [string[], string, string][]> = {};
-  let totalReallocated = '0';
-  for (const [vaultAddress] of sortedVaults) {
-    if (new Dec(totalReallocated).gte(liquidityToAllocate)) break;
+  try {
+    const { marketId, loanToken } = market;
+    const response = await fetch(API_URL, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        query: MARKET_QUERY,
+        variables: { uniqueKey: marketId, chainId: network },
+      }),
+      signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+    });
+
+    const data: { data: { marketByUniqueKey: MorphoBlueRealloactionMarketData } } = await response.json();
+    const marketData: MorphoBlueRealloactionMarketData = data?.data?.marketByUniqueKey;
+
+    if (!marketData) throw new Error('Market data not found');
+
+    const loanAssetInfo = getAssetInfoByAddress(loanToken, network);
+    const { totalBorrow, totalSupply } = assetsData[loanAssetInfo.symbol] || { totalBorrow: '0', totalSupply: '0' };
+    const totalBorrowWei = assetAmountInWei(totalBorrow!, loanAssetInfo.symbol);
+    const totalSupplyWei = assetAmountInWei(totalSupply!, loanAssetInfo.symbol);
+
+    const newTotalBorrowAssets = new Dec(totalBorrowWei).add(amountToBorrow).toString();
+
+    const newUtil = new Dec(newTotalBorrowAssets).div(totalSupplyWei).toString();
+    const newUtilScaled = new Dec(newUtil).mul(1e18).toString();
+
+    if (new Dec(newUtilScaled).lt(marketData.targetBorrowUtilization)) return { vaults: [], withdrawals: [] };
+
+    const liquidityToAllocate = getLiquidityToAllocate(amountToBorrow, totalBorrowWei, totalSupplyWei, marketData.targetBorrowUtilization, marketData.reallocatableLiquidityAssets);
+
+    const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce(
+      (acc: Record<string, string>, item: MorphoBluePublicAllocatorItem) => {
+        const vaultAddress = item.vault.address;
+        acc[vaultAddress] = new Dec(acc[vaultAddress] || '0').add(item.assets).toString();
+        return acc;
+      },
+      {},
+    );
 
-    const vaultAllocations = marketData.publicAllocatorSharedLiquidity.filter(
-      (item: MorphoBluePublicAllocatorItem) => compareAddresses(item.vault.address, vaultAddress),
+    const sortedVaults = Object.entries(vaultTotalAssets).sort(
+      ([, a]: [string, string], [, b]: [string, string]) => new Dec(b || '0').sub(a || '0').toNumber(),
     );
-    for (const item of vaultAllocations) {
+
+    const withdrawalsPerVault: Record<string, [string[], string, string][]> = {};
+    let totalReallocated = '0';
+    for (const [vaultAddress] of sortedVaults) {
       if (new Dec(totalReallocated).gte(liquidityToAllocate)) break;
-      const itemAmount = item.assets;
-      const leftToAllocate = new Dec(liquidityToAllocate).sub(totalReallocated).toString();
-      const amountToTake = new Dec(itemAmount).lt(leftToAllocate) ? itemAmount : leftToAllocate;
-      totalReallocated = new Dec(totalReallocated).add(amountToTake).toString();
-      const withdrawal: [string[], string, string] = [
-        [
-          item.allocationMarket.loanAsset.address,
-          item.allocationMarket.collateralAsset?.address,
-          item.allocationMarket.oracle?.address,
-          item.allocationMarket.irmAddress,
-          item.allocationMarket.lltv,
-        ],
-        amountToTake.toString(),
-        item.allocationMarket.uniqueKey,
-      ];
-      if (!withdrawalsPerVault[vaultAddress]) {
-        withdrawalsPerVault[vaultAddress] = [];
+
+      const vaultAllocations = marketData.publicAllocatorSharedLiquidity.filter(
+        (item: MorphoBluePublicAllocatorItem) => compareAddresses(item.vault.address, vaultAddress),
+      );
+      for (const item of vaultAllocations) {
+        if (new Dec(totalReallocated).gte(liquidityToAllocate)) break;
+        const itemAmount = item.assets;
+        const leftToAllocate = new Dec(liquidityToAllocate).sub(totalReallocated).toString();
+        const amountToTake = new Dec(itemAmount).lt(leftToAllocate) ? itemAmount : leftToAllocate;
+        totalReallocated = new Dec(totalReallocated).add(amountToTake).toString();
+        const withdrawal: [string[], string, string] = [
+          [
+            item.allocationMarket.loanAsset.address,
+            item.allocationMarket.collateralAsset?.address,
+            item.allocationMarket.oracle?.address,
+            item.allocationMarket.irmAddress,
+            item.allocationMarket.lltv,
+          ],
+          amountToTake.toString(),
+          item.allocationMarket.uniqueKey,
+        ];
+        if (!withdrawalsPerVault[vaultAddress]) {
+          withdrawalsPerVault[vaultAddress] = [];
+        }
+        withdrawalsPerVault[vaultAddress].push(withdrawal);
       }
-      withdrawalsPerVault[vaultAddress].push(withdrawal);
     }
-  }
 
-  const vaults = Object.keys(withdrawalsPerVault);
-  const withdrawals = vaults.map(
-    (vaultAddress) => withdrawalsPerVault[vaultAddress].sort(
-      (a, b) => a[2].localeCompare(b[2]),
-    ).map(w => [w[0], w[1]]),
-  );
-  return {
-    vaults,
-    withdrawals,
-  };
+    const vaults = Object.keys(withdrawalsPerVault);
+    const withdrawals = vaults.map(
+      (vaultAddress) => withdrawalsPerVault[vaultAddress].sort(
+        (a, b) => a[2].localeCompare(b[2]),
+      ).map(w => [w[0], w[1]]),
+    );
+    return {
+      vaults,
+      withdrawals,
+    };
+  } catch (error) {
+    console.error('External API Failure: Morpho blue reallocation', error);
+    throw new Error('Failed to fetch reallocation data');
+  }
 };
 
 export const getRewardsForMarket = async (marketId: string, network: NetworkNumber = NetworkNumber.Eth) => {

package/src/services/utils.ts

@@ -60,3 +60,5 @@ export const MAXUINT:string = '1157920892373161954235709850086879078532699846656
 export const isMaxuint = (amount: string) => compareAddresses(MAXUINT, amount);
 
 export const isMainnetNetwork = (network: NetworkNumber) => network === NetworkNumber.Eth;
+
+export const DEFAULT_TIMEOUT = 2000; // 2 seconds

package/src/staking/staking.ts

@@ -2,37 +2,56 @@ import Dec from 'decimal.js';
 import memoize from 'memoizee';
 import { MMAssetsData, MMUsedAssets } from '../types/common';
 import { BLOCKS_IN_A_YEAR } from '../constants';
+import { DEFAULT_TIMEOUT } from '../services/utils';
 
 const getSsrApy = async () => {
-  const res = await fetch('https://fe.defisaver.com/api/sky/data');
-  const data = await res.json();
-  return new Dec(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
+  try {
+    const res = await fetch('https://fe.defisaver.com/api/sky/data',
+      { signal: AbortSignal.timeout(DEFAULT_TIMEOUT) });
+    const data = await res.json();
+    return new Dec(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
+  } catch (e) {
+    console.error('External API Failure: Failed to fetch SSR APY from external API', e);
+    return '0';
+  }
 };
 
 const getSuperOETHApy = async () => {
-  const res = await fetch('https://origin.squids.live/origin-squid/graphql', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      query: '\n    query OTokenApy($chainId: Int!, $token: String!) {\n  oTokenApies(\n    limit: 1\n    orderBy: timestamp_DESC\n    where: {chainId_eq: $chainId, otoken_containsInsensitive: $token}\n  ) {\n    apy7DayAvg\n    apy14DayAvg\n    apy30DayAvg\n    apr\n    apy\n  }\n}\n    ',
-      variables: {
-        token: '0xdbfefd2e8460a6ee4955a68582f85708baea60a3',
-        chainId: 8453,
+  try {
+    const res = await fetch('https://origin.squids.live/origin-squid/graphql', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    }),
-  });
-
-  const data = await res.json();
-  return new Dec(data.data.oTokenApies[0].apy).mul(100).toString();
+      body: JSON.stringify({
+        query: '\n    query OTokenApy($chainId: Int!, $token: String!) {\n  oTokenApies(\n    limit: 1\n    orderBy: timestamp_DESC\n    where: {chainId_eq: $chainId, otoken_containsInsensitive: $token}\n  ) {\n    apy7DayAvg\n    apy14DayAvg\n    apy30DayAvg\n    apr\n    apy\n  }\n}\n    ',
+        variables: {
+          token: '0xdbfefd2e8460a6ee4955a68582f85708baea60a3',
+          chainId: 8453,
+        },
+      }),
+      signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+    });
+
+    const data = await res.json();
+    return new Dec(data.data.oTokenApies[0].apy).mul(100).toString();
+  } catch (e) {
+    console.error('External API Failure: Failed to fetch Super OETH APY from external API', e);
+    return '0';
+  }
 };
 
 const getApyFromDfsApi = async (asset: string) => {
-  const res = await fetch(`https://fe.defisaver.com/api/staking/apy?asset=${asset}`);
-  if (!res.ok) throw new Error(`Failed to fetch APY for ${asset}`);
-  const data = await res.json();
-  return String(data.apy);
+  try {
+    const res = await fetch(`https://fe.defisaver.com/api/staking/apy?asset=${asset}`,
+      { signal: AbortSignal.timeout(DEFAULT_TIMEOUT) });
+    if (!res.ok) throw new Error(`Failed to fetch APY for ${asset}`);
+    const data = await res.json();
+    return String(data.apy);
+  } catch (e) {
+    console.error(`External API Failure: Failed to fetch APY for ${asset} from DFS API`, e);
+    return '0';
+  }
 };
 
 export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep'];

package/src/types/compound.ts

@@ -63,7 +63,9 @@ export interface CompoundV2AssetData extends CompoundAssetData {
 export interface CompoundV3AssetData extends CompoundAssetData {
   borrowCollateralFactor: string,
   liquidateCollateralFactor: string,
+  liquidationFactor: string,
   minDebt: string,
+  supplyReserved: string,
   liquidationRatio: string,
   supplyCap: string,
   priceInBaseAsset: string,