@defisaver/positions-sdk 0.0.69 → 0.0.71

package/esm/markets/llamaLend/index.js

@@ -28,7 +28,7 @@ export const LlamaLendMarkets = (networkId) => ({
 export const getLlamaLendMarketData = (market, network = 1) => LlamaLendMarkets(network)[market];
 export const getLlamaLendMarketFromControllerAddress = (controllerAddress, network) => {
     const markets = LlamaLendMarkets(network);
-    const market = Object.values(markets).find((market) => market.controllerAddress === controllerAddress);
+    const market = Object.values(markets).find((tempMarket) => tempMarket.controllerAddress === controllerAddress);
     if (!market)
         throw new Error('Market not found');
     return market;

package/esm/markets/morphoBlue/index.d.ts

@@ -1,12 +1,23 @@
 import { MorphoBlueMarketData } from '../../types';
 import { NetworkNumber } from '../../types/common';
-export declare const MORPHO_BLUE_WSTETH_ETH: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_USDC: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SDAI_USDC: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WBTC_USDC: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_ETH_USDC: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WBTC_USDT: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WBTC_PYUSD: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WBTC_ETH: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_USDT: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WSTETH_PYUSD: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WEETH_ETH: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_USDE_USDT: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_SUSDE_USDT: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_SDAI_ETH: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_EZETH_ETH: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WSTETH_ETH_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SUSDE_DAI_770: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SUSDE_DAI_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SUSDE_DAI_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -16,13 +27,24 @@ export declare const MORPHO_BLUE_USDE_DAI_860: (networkId?: NetworkNumber) => Mo
 export declare const MORPHO_BLUE_USDE_DAI_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_USDE_DAI_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
-    readonly morphobluewstetheth: MorphoBlueMarketData;
     readonly morphobluewstethusdc: MorphoBlueMarketData;
     readonly morphobluesdaiusdc: MorphoBlueMarketData;
     readonly morphobluewbtcusdc: MorphoBlueMarketData;
     readonly morphoblueethusdc: MorphoBlueMarketData;
     readonly morphobluewbtcusdt: MorphoBlueMarketData;
     readonly morphobluewstethusdt: MorphoBlueMarketData;
+    readonly morphobluewstethusda_exchange_rate: MorphoBlueMarketData;
+    readonly morphobluwstethpyusd: MorphoBlueMarketData;
+    readonly morphoblueweetheth: MorphoBlueMarketData;
+    readonly morphobluewbtcpyusd: MorphoBlueMarketData;
+    readonly morphobluewbtceth: MorphoBlueMarketData;
+    readonly morphoblueusdeusdt: MorphoBlueMarketData;
+    readonly morphobluesusdeusdt: MorphoBlueMarketData;
+    readonly morphobluesdaieth: MorphoBlueMarketData;
+    readonly morphoblueezetheth: MorphoBlueMarketData;
+    readonly morphobluewstetheth_945: MorphoBlueMarketData;
+    readonly morphobluewstetheth_945_exchange_rate: MorphoBlueMarketData;
+    readonly morphobluewstetheth_965_exchange_rate: MorphoBlueMarketData;
     readonly morphobluesusdedai_770: MorphoBlueMarketData;
     readonly morphobluesusdedai_860: MorphoBlueMarketData;
     readonly morphobluesusdedai_915: MorphoBlueMarketData;

package/esm/markets/morphoBlue/index.js

@@ -1,20 +1,5 @@
-import { MorphoBlueVersions } from '../../types';
+import { MorphoBlueOracleType, MorphoBlueVersions } from '../../types';
 import { NetworkNumber } from '../../types/common';
-export const MORPHO_BLUE_WSTETH_ETH = (networkId = NetworkNumber.Eth) => ({
-    chainIds: [1],
-    label: 'Morpho Blue',
-    shortLabel: 'wstETH/ETH',
-    value: MorphoBlueVersions.MorphoBlueWstEthEth,
-    url: 'wstetheth',
-    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
-    oracle: '0x2a01eb9496094da03c4e364def50f5ad1280ad72',
-    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-    lltv: 0.945,
-    marketId: '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec41',
-    // icon: SvgAdapter(protocolIcons.spark),
-    protocolName: 'morpho-blue',
-});
 export const MORPHO_BLUE_WSTETH_USDC = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho Blue',
@@ -24,10 +9,10 @@ export const MORPHO_BLUE_WSTETH_USDC = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
     collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
     oracle: '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.86,
     marketId: '0xb323495f7e4148be5643a4ea4a8221eef163e4bccfdedc2a6f4696baacbc86cc',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 export const MORPHO_BLUE_SDAI_USDC = (networkId = NetworkNumber.Eth) => ({
@@ -39,10 +24,10 @@ export const MORPHO_BLUE_SDAI_USDC = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
     collateralToken: '0x83F20F44975D03b1b09e64809B757c47f942BEeA',
     oracle: '0x6CAFE228eC0B0bC2D076577d56D35Fe704318f6d',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.965,
     marketId: '0x06f2842602373d247c4934f7656e513955ccc4c377f0febc0d9ca2c3bcc191b1',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 export const MORPHO_BLUE_WBTC_USDC = (networkId = NetworkNumber.Eth) => ({
@@ -54,10 +39,10 @@ export const MORPHO_BLUE_WBTC_USDC = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
     collateralToken: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
     oracle: '0xDddd770BADd886dF3864029e4B377B5F6a2B6b83',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.86,
     marketId: '0x3a85e619751152991742810df6ec69ce473daef99e28a64ab2340d7b7ccfee49',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 export const MORPHO_BLUE_ETH_USDC = (networkId = NetworkNumber.Eth) => ({
@@ -69,10 +54,10 @@ export const MORPHO_BLUE_ETH_USDC = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
     collateralToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
     oracle: '0xdC6fd5831277c693b1054e19E94047cB37c77615',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.915,
     marketId: '0xf9acc677910cc17f650416a22e2a14d5da7ccb9626db18f1bf94efe64f92b372',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 export const MORPHO_BLUE_WBTC_USDT = (networkId = NetworkNumber.Eth) => ({
@@ -84,10 +69,40 @@ export const MORPHO_BLUE_WBTC_USDT = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
     collateralToken: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
     oracle: '0x008bF4B1cDA0cc9f0e882E0697f036667652E1ef',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.86,
     marketId: '0xa921ef34e2fc7a27ccc50ae7e4b154e16c9799d3387076c421423ef52ac4df99',
-    // icon: SvgAdapter(protocolIcons.spark),
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WBTC_PYUSD = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'WBTC/PYUSD',
+    value: MorphoBlueVersions.MorphoBlueWBTCPYUSD,
+    url: 'wbtcpyusd',
+    loanToken: '0x6c3ea9036406852006290770BEdFcAbA0e23A0e8',
+    collateralToken: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
+    oracle: '0xc53c90d6E9A5B69E4ABf3d5Ae4c79225C7FeF3d2',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    marketId: '0x9337a95dcb09d10abb33fdb955dd27b46e345f5510d54d9403f570f8f37b5983',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WBTC_ETH = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'WBTC/ETH',
+    value: MorphoBlueVersions.MorphoBlueWBTCEth,
+    url: 'wbtceth',
+    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+    collateralToken: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
+    oracle: '0xc29B3Bc033640baE31ca53F8a0Eb892AdF68e663',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.915,
+    marketId: '0x138eec0e4a1937eb92ebc70043ed539661dd7ed5a89fb92a720b341650288a40',
     protocolName: 'morpho-blue',
 });
 export const MORPHO_BLUE_WSTETH_USDT = (networkId = NetworkNumber.Eth) => ({
@@ -99,10 +114,161 @@ export const MORPHO_BLUE_WSTETH_USDT = (networkId = NetworkNumber.Eth) => ({
     loanToken: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
     collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
     oracle: '0x95DB30fAb9A3754e42423000DF27732CB2396992',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.86,
     marketId: '0xe7e9694b754c4d4f7e21faf7223f6fa71abaeb10296a4c43a54a7977149687d2',
-    // icon: SvgAdapter(protocolIcons.spark),
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/USDA',
+    value: MorphoBlueVersions.MorphoBlueWstEthUSDA_Exchange_Rate,
+    url: 'wstethusda',
+    loanToken: '0x0000206329b97DB379d5E1Bf586BbDB969C63274',
+    collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+    oracle: '0xBC693693fDBB177Ad05ff38633110016BC043AC5',
+    oracleType: MorphoBlueOracleType.LIDO_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    marketId: '0x423cb007534ac88febb8ce39f544ab303e8b757f8415ed891fc76550f8f4c965',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WSTETH_PYUSD = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/PYUSD',
+    value: MorphoBlueVersions.MorphoBlueWstEthPYUSD,
+    url: 'wstethpyusd',
+    loanToken: '0x6c3ea9036406852006290770BEdFcAbA0e23A0e8',
+    collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+    oracle: '0x27679a17b7419fB10Bd9D143f21407760fdA5C53',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    marketId: '0x124ddf1fa02a94085d1fcc35c46c7e180ddb8a0d3ec1181cf67a75341501c9e6',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WEETH_ETH = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'weETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueWeEthEth,
+    url: 'weetheth',
+    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+    collateralToken: '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee',
+    oracle: '0x3fa58b74e9a8eA8768eb33c8453e9C2Ed089A40a',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    marketId: '0x698fe98247a40c5771537b5786b2f3f9d78eb487b4ce4d75533cd0e94d88a115',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_USDE_USDT = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'USDe/USDT',
+    value: MorphoBlueVersions.MorphoBlueUSDeUSDT,
+    url: 'usdeusdt',
+    loanToken: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+    collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
+    oracle: '0xAf5060C11D3E8325a8ECF84c07fAB7Ac2297A72d',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.915,
+    marketId: '0xcec858380cba2d9ca710fce3ce864d74c3f620d53826f69d08508902e09be86f',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_SUSDE_USDT = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'sUSDe/USDT',
+    value: MorphoBlueVersions.MorphoBlueSUSDeUSDT,
+    url: 'susdeusdt',
+    loanToken: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+    collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
+    oracle: '0xE47E36457D0cF83A74AE1e45382B7A044f7abd99',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.915,
+    marketId: '0xdc5333039bcf15f1237133f74d5806675d83d9cf19cfd4cfdd9be674842651bf',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_SDAI_ETH = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'sDAI/ETH',
+    value: MorphoBlueVersions.MorphoBlueSDAIEth,
+    url: 'sdaieth',
+    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+    collateralToken: '0x83F20F44975D03b1b09e64809B757c47f942BEeA',
+    oracle: '0x0f9bb760D76af1B5Ca89102084E1963F6698AFda',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    marketId: '0x1929f8139224cb7d5db8c270addc9ce366d37ad279e1135f73c0adce74b0f936',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_EZETH_ETH = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'ezETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueEzEthEth,
+    url: 'ezetheth',
+    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+    collateralToken: '0xbf5495Efe5DB9ce00f80364C8B423567e58d2110',
+    oracle: '0x61025e2B0122ac8bE4e37365A4003d87ad888Cc3',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    marketId: '0x49bb2d114be9041a787432952927f6f144f05ad3e83196a7d062f374ee11d0ee',
+    protocolName: 'morpho-blue',
+});
+// wstETH/WETH
+export const MORPHO_BLUE_WSTETH_ETH_945 = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueWstEthEth_945,
+    url: 'wstetheth-c54d7acf',
+    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+    collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+    oracle: '0x2a01eb9496094da03c4e364def50f5ad1280ad72',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.945,
+    marketId: '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec41',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate,
+    url: 'wstetheth-d0e50cda',
+    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+    collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+    oracle: '0xbD60A6770b27E084E8617335ddE769241B0e71D8',
+    oracleType: MorphoBlueOracleType.LIDO_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.945,
+    marketId: '0xd0e50cdac92fe2172043f5e0c36532c6369d24947e40968f34a5e8819ca9ec5d',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueWstEthEth_965_Exchange_Rate,
+    url: 'wstetheth-b8fc70e8',
+    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+    collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+    oracle: '0xbD60A6770b27E084E8617335ddE769241B0e71D8',
+    oracleType: MorphoBlueOracleType.LIDO_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.965,
+    marketId: '0xb8fc70e82bc5bb53e773626fcc6a23f7eefa036918d7ef216ecfb1950a94a85e',
     protocolName: 'morpho-blue',
 });
 // sUSDe/DAI
@@ -110,64 +276,60 @@ export const MORPHO_BLUE_SUSDE_DAI_770 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho Blue',
     shortLabel: 'sUSDe/DAI',
-    pill: '77%',
     value: MorphoBlueVersions.MorphoBlueSUSDeDAI_770,
     url: 'susdedai-42dcfb38',
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
     oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.77,
     marketId: '0x42dcfb38bb98767afb6e38ccf90d59d0d3f0aa216beb3a234f12850323d17536',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 export const MORPHO_BLUE_SUSDE_DAI_860 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho Blue',
     shortLabel: 'sUSDe/DAI',
-    pill: '86%',
     value: MorphoBlueVersions.MorphoBlueSUSDeDAI_860,
     url: 'susdedai-39d11026',
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
     oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.86,
     marketId: '0x39d11026eae1c6ec02aa4c0910778664089cdd97c3fd23f68f7cd05e2e95af48',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 export const MORPHO_BLUE_SUSDE_DAI_915 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho Blue',
     shortLabel: 'sUSDe/DAI',
-    pill: '91.5%',
     value: MorphoBlueVersions.MorphoBlueSUSDeDAI_915,
     url: 'susdedai-1247f1c2',
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
     oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.915,
     marketId: '0x1247f1c237eceae0602eab1470a5061a6dd8f734ba88c7cdc5d6109fb0026b28',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 export const MORPHO_BLUE_SUSDE_DAI_945 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho Blue',
     shortLabel: 'sUSDe/DAI',
-    pill: '94.5%',
     value: MorphoBlueVersions.MorphoBlueSUSDeDAI_945,
     url: 'susdedai-0e475337',
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
     oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.945,
     marketId: '0xe475337d11be1db07f7c5a156e511f05d1844308e66e17d2ba5da0839d3b34d9',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 // USDe/DAI
@@ -175,74 +337,82 @@ export const MORPHO_BLUE_USDE_DAI_770 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho Blue',
     shortLabel: 'USDe/DAI',
-    pill: '77%',
     value: MorphoBlueVersions.MorphoBlueUSDeDAI_770,
     url: 'usdedai-fd8493f0',
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
     oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.77,
     marketId: '0xfd8493f09eb6203615221378d89f53fcd92ff4f7d62cca87eece9a2fff59e86f',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 export const MORPHO_BLUE_USDE_DAI_860 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho Blue',
     shortLabel: 'USDe/DAI',
-    pill: '86%',
     value: MorphoBlueVersions.MorphoBlueUSDeDAI_860,
     url: 'usdedai-c581c5f7',
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
     oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.86,
     marketId: '0xc581c5f70bd1afa283eed57d1418c6432cbff1d862f94eaf58fdd4e46afbb67f',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 export const MORPHO_BLUE_USDE_DAI_915 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho Blue',
     shortLabel: 'USDe/DAI',
-    pill: '91.5%',
     value: MorphoBlueVersions.MorphoBlueUSDeDAI_915,
     url: 'usdedai-8e6aeb10',
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
     oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.915,
     marketId: '0x8e6aeb10c401de3279ac79b4b2ea15fc94b7d9cfc098d6c2a1ff7b2b26d9d02c',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 export const MORPHO_BLUE_USDE_DAI_945 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [1],
     label: 'Morpho Blue',
     shortLabel: 'USDe/DAI',
-    pill: '94.5%',
     value: MorphoBlueVersions.MorphoBlueUSDeDAI_945,
     url: 'usdedai-db760246',
     loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
     collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
     oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
     irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
     lltv: 0.945,
     marketId: '0xdb760246f6859780f6c1b272d47a8f64710777121118e56e0cdb4b8b744a3094',
-    // icon: SvgAdapter(protocolIcons.spark),
     protocolName: 'morpho-blue',
 });
 export const MorphoBlueMarkets = (networkId) => ({
-    [MorphoBlueVersions.MorphoBlueWstEthEth]: MORPHO_BLUE_WSTETH_ETH(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueSDAIUSDC]: MORPHO_BLUE_SDAI_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueWBTCUSDC]: MORPHO_BLUE_WBTC_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueEthUSDC]: MORPHO_BLUE_ETH_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueWBTCUSDT]: MORPHO_BLUE_WBTC_USDT(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthUSDT]: MORPHO_BLUE_WSTETH_USDT(networkId),
+    [MorphoBlueVersions.MorphoBlueWstEthUSDA_Exchange_Rate]: MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE(networkId),
+    [MorphoBlueVersions.MorphoBlueWstEthPYUSD]: MORPHO_BLUE_WSTETH_PYUSD(networkId),
+    [MorphoBlueVersions.MorphoBlueWeEthEth]: MORPHO_BLUE_WEETH_ETH(networkId),
+    [MorphoBlueVersions.MorphoBlueWBTCPYUSD]: MORPHO_BLUE_WBTC_PYUSD(networkId),
+    [MorphoBlueVersions.MorphoBlueWBTCEth]: MORPHO_BLUE_WBTC_ETH(networkId),
+    [MorphoBlueVersions.MorphoBlueUSDeUSDT]: MORPHO_BLUE_USDE_USDT(networkId),
+    [MorphoBlueVersions.MorphoBlueSUSDeUSDT]: MORPHO_BLUE_SUSDE_USDT(networkId),
+    [MorphoBlueVersions.MorphoBlueSDAIEth]: MORPHO_BLUE_SDAI_ETH(networkId),
+    [MorphoBlueVersions.MorphoBlueEzEthEth]: MORPHO_BLUE_EZETH_ETH(networkId),
+    // wstETH/WETH
+    [MorphoBlueVersions.MorphoBlueWstEthEth_945]: MORPHO_BLUE_WSTETH_ETH_945(networkId),
+    [MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE(networkId),
+    [MorphoBlueVersions.MorphoBlueWstEthEth_965_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE(networkId),
     // sUSDe/DAI
     [MorphoBlueVersions.MorphoBlueSUSDeDAI_770]: MORPHO_BLUE_SUSDE_DAI_770(networkId),
     [MorphoBlueVersions.MorphoBlueSUSDeDAI_860]: MORPHO_BLUE_SUSDE_DAI_860(networkId),

package/esm/morphoBlue/index.js

@@ -40,7 +40,7 @@ const getBorrowRate = (borrowRate, totalBorrowShares) => {
 };
 export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { loanToken, collateralToken, oracle, irm, lltv, } = selectedMarket;
+        const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
         const lltvInWei = new Dec(lltv).mul(WAD).toString();
         const loanTokenInfo = getAssetInfoByAddress(loanToken);
         const collateralTokenInfo = getAssetInfoByAddress(collateralToken);
@@ -107,6 +107,7 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
             collateralToken: wethToEth(collateralTokenInfo.symbol),
             utillization,
             oracle: oracleRate,
+            oracleType,
             lltv: new Dec(lltv).toString(),
             minRatio: new Dec(1).div(lltv).mul(100).toString(),
             assetsData,

package/esm/staking/staking.js

@@ -8,6 +8,7 @@ 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';
@@ -82,12 +83,16 @@ export const getSUSDeApy = () => __awaiter(void 0, void 0, void 0, function* ()
     return data.apy;
 });
 const getWeEthApr = () => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield fetch('https://www.etherfi.bid/api/etherfi/apr');
+    const res = yield fetch('https://app.defisaver.com/api/staking/apy?asset=weETH');
     const data = yield res.json();
-    const total = data.latest_aprs.reduce((acc, apr) => new Dec(acc).add(apr).toString());
-    return new Dec(total).div(data.latest_aprs.length).div(100).toString();
+    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'];
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH'];
 export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -102,6 +107,8 @@ export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = u
             return getSUSDeApy();
         if (asset === 'weETH')
             return getWeEthApr();
+        if (asset === 'osETH')
+            return getOsETHApy();
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

package/esm/types/llamaLend.js

@@ -1,6 +1,6 @@
 export var LLVersionsEth;
 (function (LLVersionsEth) {
-    //long only
+    // long only
     LLVersionsEth["LLWstethCrvusd"] = "llamaLendwstETHcrvUSD";
     LLVersionsEth["LLSusdeCrvusd"] = "llamaLendsUSDecrvUSD";
     // long and short crv
@@ -15,7 +15,7 @@ export var LLVersionsEth;
 })(LLVersionsEth || (LLVersionsEth = {}));
 export var LLVersionsArb;
 (function (LLVersionsArb) {
-    //long only
+    // long only
     LLVersionsArb["LLArbCrvusd"] = "llamaLendArbcrvUSD";
     LLVersionsArb["LLFxnCrvusd"] = "llamaLendFXNcrvUSD";
     LLVersionsArb["LLWbtcCrvusd"] = "llamaLendWBTCcrvUSD";

package/esm/types/morphoBlue.d.ts

@@ -1,12 +1,23 @@
 import { MMUsedAssets, NetworkNumber } from './common';
 export declare enum MorphoBlueVersions {
-    MorphoBlueWstEthEth = "morphobluewstetheth",
     MorphoBlueWstEthUSDC = "morphobluewstethusdc",
     MorphoBlueSDAIUSDC = "morphobluesdaiusdc",
     MorphoBlueWBTCUSDC = "morphobluewbtcusdc",
     MorphoBlueEthUSDC = "morphoblueethusdc",
     MorphoBlueWBTCUSDT = "morphobluewbtcusdt",
     MorphoBlueWstEthUSDT = "morphobluewstethusdt",
+    MorphoBlueWstEthUSDA_Exchange_Rate = "morphobluewstethusda_exchange_rate",
+    MorphoBlueWstEthPYUSD = "morphobluwstethpyusd",
+    MorphoBlueWeEthEth = "morphoblueweetheth",
+    MorphoBlueWBTCPYUSD = "morphobluewbtcpyusd",
+    MorphoBlueWBTCEth = "morphobluewbtceth",
+    MorphoBlueUSDeUSDT = "morphoblueusdeusdt",
+    MorphoBlueSUSDeUSDT = "morphobluesusdeusdt",
+    MorphoBlueSDAIEth = "morphobluesdaieth",
+    MorphoBlueEzEthEth = "morphoblueezetheth",
+    MorphoBlueWstEthEth_945 = "morphobluewstetheth_945",
+    MorphoBlueWstEthEth_945_Exchange_Rate = "morphobluewstetheth_945_exchange_rate",
+    MorphoBlueWstEthEth_965_Exchange_Rate = "morphobluewstetheth_965_exchange_rate",
     MorphoBlueSUSDeDAI_770 = "morphobluesusdedai_770",
     MorphoBlueSUSDeDAI_860 = "morphobluesusdedai_860",
     MorphoBlueSUSDeDAI_915 = "morphobluesusdedai_915",
@@ -16,16 +27,20 @@ export declare enum MorphoBlueVersions {
     MorphoBlueUSDeDAI_915 = "morphoblueusdedai_915",
     MorphoBlueUSDeDAI_945 = "morphoblueusdedai_945"
 }
+export declare enum MorphoBlueOracleType {
+    MARKET_RATE = "Market rate",
+    LIDO_RATE = "Lido Exchange rate"
+}
 export interface MorphoBlueMarketData {
     chainIds: NetworkNumber[];
     label: string;
     shortLabel: string;
-    pill?: string;
     url: string;
     value: MorphoBlueVersions;
     loanToken: string;
     collateralToken: string;
     oracle: string;
+    oracleType: MorphoBlueOracleType;
     irm: string;
     lltv: number | string;
     marketId: string;
@@ -54,6 +69,7 @@ export interface MorphoBlueMarketInfo {
     collateralToken: string;
     utillization: string;
     oracle: string;
+    oracleType: MorphoBlueOracleType;
     lltv: string;
     minRatio: string;
     assetsData: MorphoBlueAssetsData;

package/esm/types/morphoBlue.js

@@ -1,12 +1,24 @@
 export var MorphoBlueVersions;
 (function (MorphoBlueVersions) {
-    MorphoBlueVersions["MorphoBlueWstEthEth"] = "morphobluewstetheth";
     MorphoBlueVersions["MorphoBlueWstEthUSDC"] = "morphobluewstethusdc";
     MorphoBlueVersions["MorphoBlueSDAIUSDC"] = "morphobluesdaiusdc";
     MorphoBlueVersions["MorphoBlueWBTCUSDC"] = "morphobluewbtcusdc";
     MorphoBlueVersions["MorphoBlueEthUSDC"] = "morphoblueethusdc";
     MorphoBlueVersions["MorphoBlueWBTCUSDT"] = "morphobluewbtcusdt";
     MorphoBlueVersions["MorphoBlueWstEthUSDT"] = "morphobluewstethusdt";
+    MorphoBlueVersions["MorphoBlueWstEthUSDA_Exchange_Rate"] = "morphobluewstethusda_exchange_rate";
+    MorphoBlueVersions["MorphoBlueWstEthPYUSD"] = "morphobluwstethpyusd";
+    MorphoBlueVersions["MorphoBlueWeEthEth"] = "morphoblueweetheth";
+    MorphoBlueVersions["MorphoBlueWBTCPYUSD"] = "morphobluewbtcpyusd";
+    MorphoBlueVersions["MorphoBlueWBTCEth"] = "morphobluewbtceth";
+    MorphoBlueVersions["MorphoBlueUSDeUSDT"] = "morphoblueusdeusdt";
+    MorphoBlueVersions["MorphoBlueSUSDeUSDT"] = "morphobluesusdeusdt";
+    MorphoBlueVersions["MorphoBlueSDAIEth"] = "morphobluesdaieth";
+    MorphoBlueVersions["MorphoBlueEzEthEth"] = "morphoblueezetheth";
+    // wstETH/WETH
+    MorphoBlueVersions["MorphoBlueWstEthEth_945"] = "morphobluewstetheth_945";
+    MorphoBlueVersions["MorphoBlueWstEthEth_945_Exchange_Rate"] = "morphobluewstetheth_945_exchange_rate";
+    MorphoBlueVersions["MorphoBlueWstEthEth_965_Exchange_Rate"] = "morphobluewstetheth_965_exchange_rate";
     // sUSDe/DAI
     MorphoBlueVersions["MorphoBlueSUSDeDAI_770"] = "morphobluesusdedai_770";
     MorphoBlueVersions["MorphoBlueSUSDeDAI_860"] = "morphobluesusdedai_860";
@@ -18,3 +30,8 @@ export var MorphoBlueVersions;
     MorphoBlueVersions["MorphoBlueUSDeDAI_915"] = "morphoblueusdedai_915";
     MorphoBlueVersions["MorphoBlueUSDeDAI_945"] = "morphoblueusdedai_945";
 })(MorphoBlueVersions || (MorphoBlueVersions = {}));
+export var MorphoBlueOracleType;
+(function (MorphoBlueOracleType) {
+    MorphoBlueOracleType["MARKET_RATE"] = "Market rate";
+    MorphoBlueOracleType["LIDO_RATE"] = "Lido Exchange rate";
+})(MorphoBlueOracleType || (MorphoBlueOracleType = {}));