@defisaver/positions-sdk 2.0.0 → 2.0.4

package/.mocharc.json

@@ -1,4 +1,4 @@
-{
-    "require": "ts-node/register",
-    "extension": ["ts"]
-}
+{
+    "require": "ts-node/register",
+    "extension": ["ts"]
+}

package/.nvmrc

@@ -1 +1 @@
-v20.17.0
+v20.17.0

package/README.md

@@ -1,64 +1,64 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    provider, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    provider,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
-
-## Testing
-
-`npm run test` - Run all tests
-
-`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    provider, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    provider,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+
+## Testing
+
+`npm run test` - Run all tests
+
+`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest

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

@@ -128,73 +128,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, provider, network)
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization
@@ -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/markets/aave/marketAssets.js

@@ -10,7 +10,7 @@ exports.aaveV1AssetsDefaultMarket = [
 exports.aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 exports.aaveV3AssetsDefaultMarketEth = [
     'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
-    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep',
+    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH',
 ];
 exports.aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

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,36 +16,56 @@ 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.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep'];
 exports.getStakingApy = (0, memoizee_1.default)((asset) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')

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;