@defisaver/positions-sdk 0.0.84 → 0.0.86

package/esm/markets/morphoBlue/index.js

@@ -297,7 +297,7 @@ export const MORPHO_BLUE_SUSDE_DAI_770 = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
     oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
-    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    oracleType: MorphoBlueOracleType.ETHENA_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.77,
     marketId: '0x42dcfb38bb98767afb6e38ccf90d59d0d3f0aa216beb3a234f12850323d17536',
@@ -312,7 +312,7 @@ export const MORPHO_BLUE_SUSDE_DAI_860 = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
     oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
-    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    oracleType: MorphoBlueOracleType.ETHENA_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.86,
     marketId: '0x39d11026eae1c6ec02aa4c0910778664089cdd97c3fd23f68f7cd05e2e95af48',
@@ -327,7 +327,7 @@ export const MORPHO_BLUE_SUSDE_DAI_915 = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
     oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
-    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    oracleType: MorphoBlueOracleType.ETHENA_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.915,
     marketId: '0x1247f1c237eceae0602eab1470a5061a6dd8f734ba88c7cdc5d6109fb0026b28',
@@ -342,7 +342,7 @@ export const MORPHO_BLUE_SUSDE_DAI_945 = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
     oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
-    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    oracleType: MorphoBlueOracleType.ETHENA_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.945,
     marketId: '0xe475337d11be1db07f7c5a156e511f05d1844308e66e17d2ba5da0839d3b34d9',
@@ -358,7 +358,7 @@ export const MORPHO_BLUE_USDE_DAI_770 = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
     oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
-    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    oracleType: MorphoBlueOracleType.ETHENA_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.77,
     marketId: '0xfd8493f09eb6203615221378d89f53fcd92ff4f7d62cca87eece9a2fff59e86f',
@@ -373,7 +373,7 @@ export const MORPHO_BLUE_USDE_DAI_860 = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
     oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
-    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    oracleType: MorphoBlueOracleType.ETHENA_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.86,
     marketId: '0xc581c5f70bd1afa283eed57d1418c6432cbff1d862f94eaf58fdd4e46afbb67f',
@@ -388,7 +388,7 @@ export const MORPHO_BLUE_USDE_DAI_915 = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
     oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
-    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    oracleType: MorphoBlueOracleType.ETHENA_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.915,
     marketId: '0x8e6aeb10c401de3279ac79b4b2ea15fc94b7d9cfc098d6c2a1ff7b2b26d9d02c',
@@ -403,7 +403,7 @@ export const MORPHO_BLUE_USDE_DAI_945 = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
     oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
-    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    oracleType: MorphoBlueOracleType.ETHENA_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.945,
     marketId: '0xdb760246f6859780f6c1b272d47a8f64710777121118e56e0cdb4b8b744a3094',
@@ -425,6 +425,81 @@ export const MORPHO_BLUE_CBETH_USDC_860_BASE = (networkId = NetworkNumber.Eth) =
     marketId: '0xdba352d93a64b17c71104cbddc6aef85cd432322a1446b5b65163cbbc615cd0c',
     protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_WSTETH_ETH_945_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueWstEthEth_945_Base,
+    url: 'wstetheth-e3c4d4d0',
+    loanToken: '0x4200000000000000000000000000000000000006',
+    collateralToken: '0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452',
+    oracle: '0xaE10cbdAa587646246c8253E4532A002EE4fa7A4',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.945,
+    marketId: '0xe3c4d4d0e214fdc52635d7f9b2f7b3b0081771ae2efeb3cb5aae26009f34f7a7',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WSTETH_ETH_965_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueWstEthEth_965_Base,
+    url: 'wstetheth-6aa81f51',
+    loanToken: '0x4200000000000000000000000000000000000006',
+    collateralToken: '0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452',
+    oracle: '0xaE10cbdAa587646246c8253E4532A002EE4fa7A4',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.965,
+    marketId: '0x6aa81f51dfc955df598e18006deae56ce907ac02b0b5358705f1a28fcea23cc0',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WSTETH_USDC_860_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/USDC',
+    value: MorphoBlueVersions.MorphoBlueWstEthUSDC_860_Base,
+    url: 'wstethusdc-a066f389',
+    loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+    collateralToken: '0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452',
+    oracle: '0x957e76d8f2D3ab0B4f342cd5f4b03A6f6eF2ce5F',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.86,
+    marketId: '0xa066f3893b780833699043f824e5bb88b8df039886f524f62b9a1ac83cb7f1f0',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_CBETH_ETH_965_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'cbETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueCbEthEth_965_Base,
+    url: 'cbetheth-6600aae6',
+    loanToken: '0x4200000000000000000000000000000000000006',
+    collateralToken: '0x2Ae3F1Ec7F1F5012CFEab0185bfc7aa3cf0DEc22',
+    oracle: '0xB03855Ad5AFD6B8db8091DD5551CAC4ed621d9E6',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.965,
+    marketId: '0x6600aae6c56d242fa6ba68bd527aff1a146e77813074413186828fd3f1cdca91',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_ETH_USDC_860_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'ETH/USDC',
+    value: MorphoBlueVersions.MorphoBlueEthUSDC_860_Base,
+    url: 'ethusdc-8793cf30',
+    loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+    collateralToken: '0x4200000000000000000000000000000000000006',
+    oracle: '0xFEa2D58cEfCb9fcb597723c6bAE66fFE4193aFE4',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.86,
+    marketId: '0x8793cf302b8ffd655ab97bd1c695dbd967807e8367a65cb2f4edaf1380ba1bda',
+    protocolName: 'morpho-blue',
+});
 export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueSDAIUSDC]: MORPHO_BLUE_SDAI_USDC(networkId),
@@ -456,7 +531,13 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueUSDeDAI_860]: MORPHO_BLUE_USDE_DAI_860(networkId),
     [MorphoBlueVersions.MorphoBlueUSDeDAI_915]: MORPHO_BLUE_USDE_DAI_915(networkId),
     [MorphoBlueVersions.MorphoBlueUSDeDAI_945]: MORPHO_BLUE_USDE_DAI_945(networkId),
+    // Base
     [MorphoBlueVersions.MorphoBlueCbEthUSDC_860_Base]: MORPHO_BLUE_CBETH_USDC_860_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueWstEthEth_945_Base]: MORPHO_BLUE_WSTETH_ETH_945_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueWstEthEth_965_Base]: MORPHO_BLUE_WSTETH_ETH_965_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueWstEthUSDC_860_Base]: MORPHO_BLUE_WSTETH_USDC_860_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: MORPHO_BLUE_CBETH_ETH_965_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueEthUSDC_860_Base]: MORPHO_BLUE_ETH_USDC_860_BASE(networkId),
 });
 export const findMorphoBlueMarket = (collateralToken, loanToken, lltv, oracle, irm, network = NetworkNumber.Eth) => {
     const markets = MorphoBlueMarkets(network);

package/esm/moneymarket/moneymarketCommonService.d.ts

@@ -9,4 +9,4 @@ export declare const isLeveragedPos: (usedAssets: MMUsedAssets, dustLimit?: numb
     leveragedType: string;
     leveragedAsset: string;
 };
-export declare const aprToApy: (interest: string | number, frequency?: number) => number;
+export declare const aprToApy: (interest: string | number, frequency?: number) => string;

package/esm/moneymarket/moneymarketCommonService.js

@@ -67,4 +67,4 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
         leveragedAsset: '',
     };
 };
-export const aprToApy = (interest, frequency = BLOCKS_IN_A_YEAR) => (Math.pow((1 + (+interest / 100) / frequency), frequency) - 1) * 100; // eslint-disable-line
+export const aprToApy = (interest, frequency = BLOCKS_IN_A_YEAR) => new Dec(interest).div(100).div(frequency).plus(1).pow(frequency).minus(1).times(100).toString();

package/esm/morphoAaveV2/index.js

@@ -13,7 +13,7 @@ import { wethToEthByAddress } from '../services/utils';
 import { getStETHApr } from '../staking';
 import { MorphoAaveV2ViewContract } from '../contracts';
 import { AaveVersions, } from '../types';
-import { calculateBorrowingAssetLimit } from '../moneymarket';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
 import { getEthPrice } from '../services/priceService';
@@ -34,8 +34,8 @@ export const getMorphoAaveV2MarketsData = (web3, network, mainnetWeb3) => __awai
         const aaveInfo = aaveTokenInfo[index];
         const { symbol, address } = getAssetInfoByAddress(wethToEthByAddress(aaveInfo.underlyingTokenAddress));
         const morphoReward = (_a = morphoRewardsData === null || morphoRewardsData === void 0 ? void 0 : morphoRewardsData.markets) === null || _a === void 0 ? void 0 : _a[aaveInfo.aTokenAddress.toLowerCase()];
-        const supplyRateP2P = new Dec(market.p2pSupplyRate).div(1e25).toString();
-        const borrowRateP2P = new Dec(market.p2pBorrowRate).div(1e25).toString();
+        const supplyRateP2P = aprToApy(new Dec(market.p2pSupplyRate).div(1e25).toString());
+        const borrowRateP2P = aprToApy(new Dec(market.p2pBorrowRate).div(1e25).toString());
         const hasDelta = new Dec(borrowRateP2P).minus(supplyRateP2P).gte(0.3);
         return {
             symbol,
@@ -44,9 +44,9 @@ export const getMorphoAaveV2MarketsData = (web3, network, mainnetWeb3) => __awai
             underlyingTokenAddress: address,
             priceInEth: new Dec(aaveInfo.price).div(1e18).toString(),
             price: new Dec(aaveInfo.price).div(1e18).times(ethPrice).toString(),
-            supplyRate: new Dec(market.poolSupplyRate).div(1e25).toString(),
+            supplyRate: aprToApy(new Dec(market.poolSupplyRate).div(1e25).toString()),
             supplyRateP2P,
-            borrowRate: new Dec(market.poolBorrowRate).div(1e25).toString(),
+            borrowRate: aprToApy(new Dec(market.poolBorrowRate).div(1e25).toString()),
             borrowRateP2P,
             totalSupply: assetAmountInEth(aaveInfo.totalSupply, symbol),
             totalBorrow: assetAmountInEth(aaveInfo.totalBorrow, symbol),
@@ -170,8 +170,8 @@ export const getMorphoAaveV2AccountData = (web3, network, address, assetsData) =
             borrowedUsdVariable: borrowedUsd,
             isSupplied: new Dec(supplied).gt(0),
             isBorrowed: new Dec(borrowed).gt(0),
-            supplyRate: new Dec(market.userSupplyRate).div(1e25).toString(),
-            borrowRate: new Dec(market.userBorrowRate).div(1e25).toString(),
+            supplyRate: aprToApy(new Dec(market.userSupplyRate).div(1e25).toString()),
+            borrowRate: aprToApy(new Dec(market.userBorrowRate).div(1e25).toString()),
             limit: '0',
             collateral: true,
             eModeCategory: 0,

package/esm/morphoAaveV3/index.js

@@ -18,7 +18,7 @@ import { createContractWrapper, getConfigContractAbi, getConfigContractAddress,
 import { multicall } from '../multicall';
 import { getCbETHApr, getREthApr, getStETHApr } from '../staking';
 import { getDsrApy } from '../services/dsrService';
-import { calculateBorrowingAssetLimit } from '../moneymarket';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
 import { MORPHO_AAVE_V3_ETH } from '../markets/aave';
@@ -141,9 +141,9 @@ export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainne
             aTokenAddress: marketData.aTokenAddress,
             underlyingTokenAddress: address,
             price: new Dec(marketData.price.toString()).div(1e8).toString(),
-            supplyRate: new Dec(marketData.supplyRate.toString()).div(1e25).toString(),
+            supplyRate: aprToApy(new Dec(marketData.supplyRate.toString()).div(1e25).toString()),
             supplyRateP2P: marketData.p2pSupplyAPY,
-            borrowRate: new Dec(marketData.borrowRateVariable.toString()).div(1e25).toString(),
+            borrowRate: aprToApy(new Dec(marketData.borrowRateVariable.toString()).div(1e25).toString()),
             borrowRateP2P: marketData.p2pBorrowAPY,
             totalSupply: assetAmountInEth(marketData.totalSupply.toString(), symbol),
             totalBorrow: assetAmountInEth(marketData.totalBorrow.toString(), symbol),

package/esm/spark/index.js

@@ -15,7 +15,7 @@ import { getDsrApy } from '../services/dsrService';
 import { SparkIncentiveDataProviderContract, SparkViewContract, getConfigContractAbi, createContractWrapper, } from '../contracts';
 import { multicall } from '../multicall';
 import { sparkGetAggregatedPositionData, sparkIsInIsolationMode } from '../helpers/sparkHelpers';
-import { calculateBorrowingAssetLimit } from '../moneymarket';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import { SPARK_V1 } from '../markets/spark';
 export const sparkEmodeCategoriesMapping = (extractedState, usedAssets) => {
     const { assetsData } = extractedState;
@@ -82,9 +82,9 @@ export const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3)
             isolationModeTotalDebt: new Dec(market.isolationModeTotalDebt).div(100).toString(),
             assetId: Number(market.assetId),
             underlyingTokenAddress: market.underlyingTokenAddress,
-            supplyRate: new Dec(market.supplyRate.toString()).div(1e25).toString(),
-            borrowRate: new Dec(market.borrowRateVariable.toString()).div(1e25).toString(),
-            borrowRateStable: new Dec(market.borrowRateStable.toString()).div(1e25).toString(),
+            supplyRate: aprToApy(new Dec(market.supplyRate.toString()).div(1e25).toString()),
+            borrowRate: aprToApy(new Dec(market.borrowRateVariable.toString()).div(1e25).toString()),
+            borrowRateStable: aprToApy(new Dec(market.borrowRateStable.toString()).div(1e25).toString()),
             collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
             liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
             marketLiquidity,
@@ -302,7 +302,7 @@ export const getSparkAccountData = (web3, network, address, extractedState) => _
         }
         if (!usedAssets[asset])
             usedAssets[asset] = {};
-        usedAssets[asset] = Object.assign(Object.assign({}, usedAssets[asset]), { symbol: asset, supplied, suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(), isSupplied, collateral: enabledAsCollateral, stableBorrowRate: new Dec(tokenInfo.stableBorrowRate).div(1e25).toString(), borrowedStable,
+        usedAssets[asset] = Object.assign(Object.assign({}, usedAssets[asset]), { symbol: asset, supplied, suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(), isSupplied, collateral: enabledAsCollateral, stableBorrowRate: aprToApy(new Dec(tokenInfo.stableBorrowRate).div(1e25).toString()), borrowedStable,
             borrowedVariable, borrowedUsdStable: new Dec(borrowedStable).mul(assetsData[asset].price).toString(), borrowedUsdVariable: new Dec(borrowedVariable).mul(assetsData[asset].price).toString(), borrowed: new Dec(borrowedStable).add(borrowedVariable).toString(), borrowedUsd: new Dec(new Dec(borrowedVariable).add(borrowedStable)).mul(assetsData[asset].price).toString(), isBorrowed, eModeCategory: assetsData[asset].eModeCategory, interestMode });
     });
     payload.eModeCategory = +multicallRes[0][0];

package/esm/staking/staking.d.ts

@@ -4,7 +4,6 @@ export declare const getStETHApr: (web3: Web3, fromBlock?: number, blockNumber?:
 export declare const getCbETHApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getREthApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
-export declare const getSUSDeApy: () => Promise<any>;
 export declare const STAKING_ASSETS: string[];
 export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | "0" | undefined;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;

package/esm/staking/staking.js

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { StakeWiseSDK, Network } from '@stakewise/v3-sdk';
 import { CbEthContract, LidoContract, PotContract, REthContract, wstETHContract, } from '../contracts';
 import { NetworkNumber } from '../types/common';
 import { BLOCKS_IN_A_YEAR, SECONDS_PER_YEAR, AVG_BLOCK_TIME } from '../constants';
@@ -77,22 +76,12 @@ export const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, voi
         .mul(100)
         .toString();
 });
-export const getSUSDeApy = () => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield fetch('https://app.defisaver.com/api/staking/apy?asset=sUSDe');
+const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch(`https://app.defisaver.com/api/staking/apy?asset=${asset}`);
     const data = yield res.json();
     return data.apy;
 });
-const getWeEthApr = () => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield fetch('https://app.defisaver.com/api/staking/apy?asset=weETH');
-    const data = yield res.json();
-    return data.apy;
-});
-const getOsETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
-    const sdk = new StakeWiseSDK({ network: Network.Mainnet });
-    const apy = yield sdk.osToken.getAPY();
-    return apy;
-});
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH'];
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH'];
 export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -104,11 +93,13 @@ export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = u
         if (asset === 'sDAI')
             return getDsrApy(web3);
         if (asset === 'sUSDe')
-            return getSUSDeApy();
+            return getApyFromDfsApi('sUSDe');
         if (asset === 'weETH')
-            return getWeEthApr();
+            return getApyFromDfsApi('weETH');
+        if (asset === 'ezETH')
+            return getApyFromDfsApi('ezETH');
         if (asset === 'osETH')
-            return getOsETHApy();
+            return getApyFromDfsApi('osETH');
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

package/esm/types/morphoBlue.d.ts

@@ -27,11 +27,17 @@ export declare enum MorphoBlueVersions {
     MorphoBlueUSDeDAI_860 = "morphoblueusdedai_860",
     MorphoBlueUSDeDAI_915 = "morphoblueusdedai_915",
     MorphoBlueUSDeDAI_945 = "morphoblueusdedai_945",
-    MorphoBlueCbEthUSDC_860_Base = "morphobluecbethusdc_860_base"
+    MorphoBlueCbEthUSDC_860_Base = "morphobluecbethusdc_860_base",
+    MorphoBlueWstEthEth_945_Base = "morphobluewstetheth_945_base",
+    MorphoBlueWstEthEth_965_Base = "morphobluewstetheth_965_base",
+    MorphoBlueWstEthUSDC_860_Base = "morphobluewstethusdc_860_base",
+    MorphoBlueCbEthEth_965_Base = "morphobluecbetheth_965_base",
+    MorphoBlueEthUSDC_860_Base = "morphoblueethusdc_860_base"
 }
 export declare enum MorphoBlueOracleType {
     MARKET_RATE = "Market rate",
-    LIDO_RATE = "Lido rate"
+    LIDO_RATE = "Lido rate",
+    ETHENA_RATE = "Ethena rate"
 }
 export interface MorphoBlueMarketData {
     chainIds: NetworkNumber[];

package/esm/types/morphoBlue.js

@@ -33,9 +33,15 @@ export var MorphoBlueVersions;
     MorphoBlueVersions["MorphoBlueUSDeDAI_945"] = "morphoblueusdedai_945";
     // BASE
     MorphoBlueVersions["MorphoBlueCbEthUSDC_860_Base"] = "morphobluecbethusdc_860_base";
+    MorphoBlueVersions["MorphoBlueWstEthEth_945_Base"] = "morphobluewstetheth_945_base";
+    MorphoBlueVersions["MorphoBlueWstEthEth_965_Base"] = "morphobluewstetheth_965_base";
+    MorphoBlueVersions["MorphoBlueWstEthUSDC_860_Base"] = "morphobluewstethusdc_860_base";
+    MorphoBlueVersions["MorphoBlueCbEthEth_965_Base"] = "morphobluecbetheth_965_base";
+    MorphoBlueVersions["MorphoBlueEthUSDC_860_Base"] = "morphoblueethusdc_860_base";
 })(MorphoBlueVersions || (MorphoBlueVersions = {}));
 export var MorphoBlueOracleType;
 (function (MorphoBlueOracleType) {
     MorphoBlueOracleType["MARKET_RATE"] = "Market rate";
     MorphoBlueOracleType["LIDO_RATE"] = "Lido rate";
+    MorphoBlueOracleType["ETHENA_RATE"] = "Ethena rate";
 })(MorphoBlueOracleType || (MorphoBlueOracleType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.84",
+  "version": "0.0.86",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -22,7 +22,6 @@
     "@defisaver/tokens": "^1.5.23",
     "@ethersproject/bignumber": "^5.7.0",
     "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "@stakewise/v3-sdk": "^1.3.0",
     "decimal.js": "^10.4.3"
   },
   "devDependencies": {

package/src/aaveV2/index.ts

@@ -7,7 +7,7 @@ import {
 import { calculateNetApy, getStETHApr } from '../staking';
 import { ethToWeth, wethToEth, wethToEthByAddress } from '../services/utils';
 import { AaveLoanInfoV2Contract, createContractWrapper } from '../contracts';
-import { calculateBorrowingAssetLimit } from '../moneymarket';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import {
   AaveMarketInfo, AaveV2AssetData, AaveV2AssetsData, AaveV2PositionData, AaveV2UsedAsset, AaveV2UsedAssets,
 } from '../types';
@@ -26,9 +26,9 @@ export const getAaveV2MarketsData = async (web3: Web3, network: NetworkNumber, s
     .map((market, i) => ({
       symbol: selectedMarket.assets[i],
       underlyingTokenAddress: market.underlyingTokenAddress,
-      supplyRate: new Dec(market.supplyRate.toString()).div(1e25).toString(),
-      borrowRate: new Dec(market.borrowRateVariable.toString()).div(1e25).toString(),
-      borrowRateStable: new Dec(market.borrowRateStable.toString()).div(1e25).toString(),
+      supplyRate: aprToApy(new Dec(market.supplyRate.toString()).div(1e25).toString()),
+      borrowRate: aprToApy(new Dec(market.borrowRateVariable.toString()).div(1e25).toString()),
+      borrowRateStable: aprToApy(new Dec(market.borrowRateStable.toString()).div(1e25).toString()),
       collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
       liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
       marketLiquidity: assetAmountInEth(new Dec(market.totalSupply.toString())
@@ -173,7 +173,7 @@ export const getAaveV2AccountData = async (web3: Web3, network: NetworkNumber, a
       suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(),
       isSupplied,
       collateral: enabledAsCollateral,
-      stableBorrowRate: new Dec(tokenInfo.stableBorrowRate).div(1e25).toString(),
+      stableBorrowRate: aprToApy(new Dec(tokenInfo.stableBorrowRate).div(1e25).toString()),
       borrowedStable,
       borrowedVariable,
       borrowedUsdStable: new Dec(borrowedStable).mul(assetsData[asset].price).toString(),

package/src/aaveV3/index.ts

@@ -30,7 +30,7 @@ import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../staking';
 import { multicall } from '../multicall';
 import { IUiIncentiveDataProviderV3 } from '../types/contracts/generated/AaveUiIncentiveDataProviderV3';
 import { getAssetsBalances } from '../assets';
-import { calculateBorrowingAssetLimit } from '../moneymarket';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import {
   aaveAnyGetAggregatedPositionData,
   aaveV3IsInIsolationMode,
@@ -206,7 +206,6 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
       if (new Dec(marketLiquidity).lt(0)) {
         marketLiquidity = '0';
       }
-
       return ({
         nativeAsset,
         ...addToObjectIf(nativeAsset, {
@@ -225,10 +224,10 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
         isolationModeTotalDebt: new Dec(tokenMarket.isolationModeTotalDebt).div(100).toString(),
         assetId: Number(tokenMarket.assetId),
         underlyingTokenAddress: tokenMarket.underlyingTokenAddress,
-        supplyRate: new Dec(tokenMarket.supplyRate.toString()).div(1e25).toString(),
-        borrowRate: new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).toString(),
-        borrowRateDiscounted: nativeAsset ? new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0',
-        borrowRateStable: new Dec(tokenMarket.borrowRateStable.toString()).div(1e25).toString(),
+        supplyRate: aprToApy(new Dec(tokenMarket.supplyRate.toString()).div(1e25).toString()),
+        borrowRate: aprToApy(new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).toString()),
+        borrowRateDiscounted: aprToApy(nativeAsset ? new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0'),
+        borrowRateStable: aprToApy(new Dec(tokenMarket.borrowRateStable.toString()).div(1e25).toString()),
         collateralFactor: new Dec(tokenMarket.collateralFactor.toString()).div(10000).toString(),
         liquidationRatio: new Dec(tokenMarket.liquidationRatio.toString()).div(10000).toString(),
         marketLiquidity,
@@ -500,8 +499,8 @@ export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, a
       suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(),
       isSupplied,
       collateral: enabledAsCollateral,
-      stableBorrowRate: new Dec(tokenInfo.stableBorrowRate).div(1e25).toString(),
-      discountedBorrowRate: new Dec(assetsData[asset].borrowRate).mul(1 - parseFloat(discountRateOnBorrow)).toString(),
+      stableBorrowRate: aprToApy(new Dec(tokenInfo.stableBorrowRate).div(1e25).toString()),
+      discountedBorrowRate: aprToApy(new Dec(assetsData[asset].borrowRate).mul(1 - parseFloat(discountRateOnBorrow)).toString()),
       borrowedStable,
       borrowedVariable,
       borrowedUsdStable: new Dec(borrowedStable).mul(assetsData[asset].price).toString(),

package/src/markets/morphoBlue/index.ts

@@ -301,7 +301,7 @@ export const MORPHO_BLUE_SUSDE_DAI_770 = (networkId: NetworkNumber = NetworkNumb
   loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
   collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
   oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
-  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  oracleType: MorphoBlueOracleType.ETHENA_RATE,
   irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
   lltv: 0.77,
   marketId: '0x42dcfb38bb98767afb6e38ccf90d59d0d3f0aa216beb3a234f12850323d17536',
@@ -316,7 +316,7 @@ export const MORPHO_BLUE_SUSDE_DAI_860 = (networkId: NetworkNumber = NetworkNumb
   loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
   collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
   oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
-  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  oracleType: MorphoBlueOracleType.ETHENA_RATE,
   irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
   lltv: 0.86,
   marketId: '0x39d11026eae1c6ec02aa4c0910778664089cdd97c3fd23f68f7cd05e2e95af48',
@@ -331,7 +331,7 @@ export const MORPHO_BLUE_SUSDE_DAI_915 = (networkId: NetworkNumber = NetworkNumb
   loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
   collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
   oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
-  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  oracleType: MorphoBlueOracleType.ETHENA_RATE,
   irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
   lltv: 0.915,
   marketId: '0x1247f1c237eceae0602eab1470a5061a6dd8f734ba88c7cdc5d6109fb0026b28',
@@ -346,7 +346,7 @@ export const MORPHO_BLUE_SUSDE_DAI_945 = (networkId: NetworkNumber = NetworkNumb
   loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
   collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
   oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
-  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  oracleType: MorphoBlueOracleType.ETHENA_RATE,
   irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
   lltv: 0.945,
   marketId: '0xe475337d11be1db07f7c5a156e511f05d1844308e66e17d2ba5da0839d3b34d9',
@@ -363,7 +363,7 @@ export const MORPHO_BLUE_USDE_DAI_770 = (networkId: NetworkNumber = NetworkNumbe
   loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
   collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
   oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
-  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  oracleType: MorphoBlueOracleType.ETHENA_RATE,
   irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
   lltv: 0.77,
   marketId: '0xfd8493f09eb6203615221378d89f53fcd92ff4f7d62cca87eece9a2fff59e86f',
@@ -378,7 +378,7 @@ export const MORPHO_BLUE_USDE_DAI_860 = (networkId: NetworkNumber = NetworkNumbe
   loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
   collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
   oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
-  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  oracleType: MorphoBlueOracleType.ETHENA_RATE,
   irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
   lltv: 0.86,
   marketId: '0xc581c5f70bd1afa283eed57d1418c6432cbff1d862f94eaf58fdd4e46afbb67f',
@@ -393,7 +393,7 @@ export const MORPHO_BLUE_USDE_DAI_915 = (networkId: NetworkNumber = NetworkNumbe
   loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
   collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
   oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
-  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  oracleType: MorphoBlueOracleType.ETHENA_RATE,
   irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
   lltv: 0.915,
   marketId: '0x8e6aeb10c401de3279ac79b4b2ea15fc94b7d9cfc098d6c2a1ff7b2b26d9d02c',
@@ -408,7 +408,7 @@ export const MORPHO_BLUE_USDE_DAI_945 = (networkId: NetworkNumber = NetworkNumbe
   loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
   collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
   oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
-  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  oracleType: MorphoBlueOracleType.ETHENA_RATE,
   irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
   lltv: 0.945,
   marketId: '0xdb760246f6859780f6c1b272d47a8f64710777121118e56e0cdb4b8b744a3094',
@@ -432,6 +432,81 @@ export const MORPHO_BLUE_CBETH_USDC_860_BASE = (networkId: NetworkNumber = Netwo
   marketId: '0xdba352d93a64b17c71104cbddc6aef85cd432322a1446b5b65163cbbc615cd0c',
   protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_WSTETH_ETH_945_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Blue',
+  shortLabel: 'wstETH/ETH',
+  value: MorphoBlueVersions.MorphoBlueWstEthEth_945_Base,
+  url: 'wstetheth-e3c4d4d0',
+  loanToken: '0x4200000000000000000000000000000000000006',
+  collateralToken: '0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452',
+  oracle: '0xaE10cbdAa587646246c8253E4532A002EE4fa7A4',
+  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+  lltv: 0.945,
+  marketId: '0xe3c4d4d0e214fdc52635d7f9b2f7b3b0081771ae2efeb3cb5aae26009f34f7a7',
+  protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WSTETH_ETH_965_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Blue',
+  shortLabel: 'wstETH/ETH',
+  value: MorphoBlueVersions.MorphoBlueWstEthEth_965_Base,
+  url: 'wstetheth-6aa81f51',
+  loanToken: '0x4200000000000000000000000000000000000006',
+  collateralToken: '0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452',
+  oracle: '0xaE10cbdAa587646246c8253E4532A002EE4fa7A4',
+  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+  lltv: 0.965,
+  marketId: '0x6aa81f51dfc955df598e18006deae56ce907ac02b0b5358705f1a28fcea23cc0',
+  protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WSTETH_USDC_860_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Blue',
+  shortLabel: 'wstETH/USDC',
+  value: MorphoBlueVersions.MorphoBlueWstEthUSDC_860_Base,
+  url: 'wstethusdc-a066f389',
+  loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+  collateralToken: '0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452',
+  oracle: '0x957e76d8f2D3ab0B4f342cd5f4b03A6f6eF2ce5F',
+  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+  lltv: 0.86,
+  marketId: '0xa066f3893b780833699043f824e5bb88b8df039886f524f62b9a1ac83cb7f1f0',
+  protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_CBETH_ETH_965_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Blue',
+  shortLabel: 'cbETH/ETH',
+  value: MorphoBlueVersions.MorphoBlueCbEthEth_965_Base,
+  url: 'cbetheth-6600aae6',
+  loanToken: '0x4200000000000000000000000000000000000006',
+  collateralToken: '0x2Ae3F1Ec7F1F5012CFEab0185bfc7aa3cf0DEc22',
+  oracle: '0xB03855Ad5AFD6B8db8091DD5551CAC4ed621d9E6',
+  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+  lltv: 0.965,
+  marketId: '0x6600aae6c56d242fa6ba68bd527aff1a146e77813074413186828fd3f1cdca91',
+  protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_ETH_USDC_860_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Blue',
+  shortLabel: 'ETH/USDC',
+  value: MorphoBlueVersions.MorphoBlueEthUSDC_860_Base,
+  url: 'ethusdc-8793cf30',
+  loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+  collateralToken: '0x4200000000000000000000000000000000000006',
+  oracle: '0xFEa2D58cEfCb9fcb597723c6bAE66fFE4193aFE4',
+  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+  lltv: 0.86,
+  marketId: '0x8793cf302b8ffd655ab97bd1c695dbd967807e8367a65cb2f4edaf1380ba1bda',
+  protocolName: 'morpho-blue',
+});
 
 export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
   [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
@@ -465,7 +540,13 @@ export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
   [MorphoBlueVersions.MorphoBlueUSDeDAI_915]: MORPHO_BLUE_USDE_DAI_915(networkId),
   [MorphoBlueVersions.MorphoBlueUSDeDAI_945]: MORPHO_BLUE_USDE_DAI_945(networkId),
 
+  // Base
   [MorphoBlueVersions.MorphoBlueCbEthUSDC_860_Base]: MORPHO_BLUE_CBETH_USDC_860_BASE(networkId),
+  [MorphoBlueVersions.MorphoBlueWstEthEth_945_Base]: MORPHO_BLUE_WSTETH_ETH_945_BASE(networkId),
+  [MorphoBlueVersions.MorphoBlueWstEthEth_965_Base]: MORPHO_BLUE_WSTETH_ETH_965_BASE(networkId),
+  [MorphoBlueVersions.MorphoBlueWstEthUSDC_860_Base]: MORPHO_BLUE_WSTETH_USDC_860_BASE(networkId),
+  [MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: MORPHO_BLUE_CBETH_ETH_965_BASE(networkId),
+  [MorphoBlueVersions.MorphoBlueEthUSDC_860_Base]: MORPHO_BLUE_ETH_USDC_860_BASE(networkId),
 }) as const;
 
 export const findMorphoBlueMarket = (collateralToken: string, loanToken: string, lltv: number, oracle: string, irm: string, network = NetworkNumber.Eth) => {

package/src/moneymarket/moneymarketCommonService.ts

@@ -73,4 +73,4 @@ export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
   };
 };
 
-export const aprToApy = (interest: string | number, frequency = BLOCKS_IN_A_YEAR) => ((1 + (+interest / 100) / frequency) ** frequency - 1) * 100; // eslint-disable-line
+export const aprToApy = (interest:string | number, frequency = BLOCKS_IN_A_YEAR) => new Dec(interest).div(100).div(frequency).plus(1).pow(frequency).minus(1).times(100).toString();