@defisaver/positions-sdk 0.0.52 → 0.0.54

package/src/markets/llamaLend/index.ts

@@ -1,65 +1,65 @@
-import { getConfigContractAddress } from '../../contracts';
-import { LlamaLendMarketData, LlamaLendVersions } from '../../types';
-import { NetworkNumber } from '../../types/common';
-
-export const LLAMALEND_WSTETH_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
-  chainIds: [1],
-  label: 'LlamaLend - wstETH/crvUSD',
-  shortLabel: 'wstETH/crvUSD',
-  value: LlamaLendVersions.LlamaLendwstETHcrvUSD,
-  collAsset: 'wstETH',
-  baseAsset: 'crvUSD',
-  controllerAddress: getConfigContractAddress('LlamaLendWstETHCrvUSDController', networkId),
-  vaultAddress: '0x8cf1DE26729cfB7137AF1A6B2a665e099EC319b5',
-  url: 'wstethcrvusd',
-});
-export const LLAMALEND_CRVUSD_CRV_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
-  chainIds: [1],
-  label: 'LlamaLend - crvUSD/CRV',
-  shortLabel: 'crvUSD/CRV',
-  value: LlamaLendVersions.LlamaLendcrvUSDCRV,
-  collAsset: 'crvUSD',
-  baseAsset: 'CRV',
-  controllerAddress: getConfigContractAddress('LlamaLendCrvUSDCRVController', networkId),
-  vaultAddress: '0x4D2f44B0369f3C20c3d670D2C26b048985598450',
-  url: 'crvusdcrv',
-});
-export const LLAMALEND_CRV_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
-  chainIds: [1],
-  label: 'LlamaLend - CRV/crvUSD',
-  shortLabel: 'CRV/crvUSD',
-  value: LlamaLendVersions.LlamaLendCRVcrvUSD,
-  collAsset: 'CRV',
-  baseAsset: 'crvUSD',
-  controllerAddress: getConfigContractAddress('LlamaLendCRVCrvUSDController', networkId),
-  vaultAddress: '0xCeA18a8752bb7e7817F9AE7565328FE415C0f2cA',
-  url: 'crvcrvusd',
-});
-
-export const LLAMALEND_TBTC_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
-  chainIds: [1],
-  label: 'LlamaLend - TBTC/crvUSD',
-  shortLabel: 'TBTC/crvUSD',
-  value: LlamaLendVersions.LlamaLendTBTCcrvUSD,
-  collAsset: 'tBTC',
-  baseAsset: 'crvUSD',
-  controllerAddress: getConfigContractAddress('LlamaLendTBTCCrvUSDController', networkId),
-  vaultAddress: '0xb2b23C87a4B6d1b03Ba603F7C3EB9A81fDC0AAC9',
-  url: 'tbtccrvusd',
-});
-
-export const LlamaLendMarkets = (networkId: NetworkNumber) => ({
-  [LlamaLendVersions.LlamaLendwstETHcrvUSD]: LLAMALEND_WSTETH_CRVUSD_MARKET(networkId),
-  [LlamaLendVersions.LlamaLendcrvUSDCRV]: LLAMALEND_CRVUSD_CRV_MARKET(networkId),
-  [LlamaLendVersions.LlamaLendCRVcrvUSD]: LLAMALEND_CRV_CRVUSD_MARKET(networkId),
-  [LlamaLendVersions.LlamaLendTBTCcrvUSD]: LLAMALEND_TBTC_CRVUSD_MARKET(networkId),
-}) as const;
-
-
-export const LLAMALEND_ALL_VERSIONS = [
-  LlamaLendVersions.LlamaLendwstETHcrvUSD,
-  LlamaLendVersions.LlamaLendcrvUSDCRV,
-  LlamaLendVersions.LlamaLendCRVcrvUSD,
-  LlamaLendVersions.LlamaLendTBTCcrvUSD,
-];
-export const getLlamaLendMarketData = (market: LlamaLendVersions, network: NetworkNumber = 1) => LlamaLendMarkets(network)[market];
+import { getConfigContractAddress } from '../../contracts';
+import { LlamaLendMarketData, LlamaLendVersions } from '../../types';
+import { NetworkNumber } from '../../types/common';
+
+export const LLAMALEND_WSTETH_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
+  chainIds: [1],
+  label: 'LlamaLend - wstETH/crvUSD',
+  shortLabel: 'wstETH/crvUSD',
+  value: LlamaLendVersions.LlamaLendwstETHcrvUSD,
+  collAsset: 'wstETH',
+  baseAsset: 'crvUSD',
+  controllerAddress: getConfigContractAddress('LlamaLendWstETHCrvUSDController', networkId),
+  vaultAddress: '0x8cf1DE26729cfB7137AF1A6B2a665e099EC319b5',
+  url: 'wstethcrvusd',
+});
+export const LLAMALEND_CRVUSD_CRV_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
+  chainIds: [1],
+  label: 'LlamaLend - crvUSD/CRV',
+  shortLabel: 'crvUSD/CRV',
+  value: LlamaLendVersions.LlamaLendcrvUSDCRV,
+  collAsset: 'crvUSD',
+  baseAsset: 'CRV',
+  controllerAddress: getConfigContractAddress('LlamaLendCrvUSDCRVController', networkId),
+  vaultAddress: '0x4D2f44B0369f3C20c3d670D2C26b048985598450',
+  url: 'crvusdcrv',
+});
+export const LLAMALEND_CRV_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
+  chainIds: [1],
+  label: 'LlamaLend - CRV/crvUSD',
+  shortLabel: 'CRV/crvUSD',
+  value: LlamaLendVersions.LlamaLendCRVcrvUSD,
+  collAsset: 'CRV',
+  baseAsset: 'crvUSD',
+  controllerAddress: getConfigContractAddress('LlamaLendCRVCrvUSDController', networkId),
+  vaultAddress: '0xCeA18a8752bb7e7817F9AE7565328FE415C0f2cA',
+  url: 'crvcrvusd',
+});
+
+export const LLAMALEND_TBTC_CRVUSD_MARKET = (networkId: NetworkNumber): LlamaLendMarketData => ({
+  chainIds: [1],
+  label: 'LlamaLend - TBTC/crvUSD',
+  shortLabel: 'TBTC/crvUSD',
+  value: LlamaLendVersions.LlamaLendTBTCcrvUSD,
+  collAsset: 'tBTC',
+  baseAsset: 'crvUSD',
+  controllerAddress: getConfigContractAddress('LlamaLendTBTCCrvUSDController', networkId),
+  vaultAddress: '0xb2b23C87a4B6d1b03Ba603F7C3EB9A81fDC0AAC9',
+  url: 'tbtccrvusd',
+});
+
+export const LlamaLendMarkets = (networkId: NetworkNumber) => ({
+  [LlamaLendVersions.LlamaLendwstETHcrvUSD]: LLAMALEND_WSTETH_CRVUSD_MARKET(networkId),
+  [LlamaLendVersions.LlamaLendcrvUSDCRV]: LLAMALEND_CRVUSD_CRV_MARKET(networkId),
+  [LlamaLendVersions.LlamaLendCRVcrvUSD]: LLAMALEND_CRV_CRVUSD_MARKET(networkId),
+  [LlamaLendVersions.LlamaLendTBTCcrvUSD]: LLAMALEND_TBTC_CRVUSD_MARKET(networkId),
+}) as const;
+
+
+export const LLAMALEND_ALL_VERSIONS = [
+  LlamaLendVersions.LlamaLendwstETHcrvUSD,
+  LlamaLendVersions.LlamaLendcrvUSDCRV,
+  LlamaLendVersions.LlamaLendCRVcrvUSD,
+  LlamaLendVersions.LlamaLendTBTCcrvUSD,
+];
+export const getLlamaLendMarketData = (market: LlamaLendVersions, network: NetworkNumber = 1) => LlamaLendMarkets(network)[market];

package/src/markets/morphoBlue/index.ts

@@ -1,122 +1,154 @@
-import { MorphoBlueMarketData, MorphoBlueVersions } from '../../types';
-import { NetworkNumber } from '../../types/common';
-
-export const MORPHO_BLUE_WSTETH_ETH = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
-  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 = NetworkNumber.Eth): MorphoBlueMarketData => ({
-  chainIds: [1],
-  label: 'Morpho Blue',
-  shortLabel: 'wstETH/USDC',
-  value: MorphoBlueVersions.MorphoBlueWstEthUSDC,
-  url: 'wstethusdc',
-  loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-  collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
-  oracle: '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',
-  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-  lltv: 0.86,
-  marketId: '0xb323495f7e4148be5643a4ea4a8221eef163e4bccfdedc2a6f4696baacbc86cc',
-  // icon: SvgAdapter(protocolIcons.spark),
-  protocolName: 'morpho-blue',
-});
-
-export const MORPHO_BLUE_SDAI_USDC = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
-  chainIds: [1],
-  label: 'Morpho Blue',
-  shortLabel: 'sDAI/USDC',
-  value: MorphoBlueVersions.MorphoBlueSDAIUSDC,
-  url: 'sdaiusdc',
-  loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-  collateralToken: '0x83F20F44975D03b1b09e64809B757c47f942BEeA',
-  oracle: '0x6CAFE228eC0B0bC2D076577d56D35Fe704318f6d',
-  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-  lltv: 0.965,
-  marketId: '0x06f2842602373d247c4934f7656e513955ccc4c377f0febc0d9ca2c3bcc191b1',
-  // icon: SvgAdapter(protocolIcons.spark),
-  protocolName: 'morpho-blue',
-});
-
-export const MORPHO_BLUE_WBTC_USDC = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
-  chainIds: [1],
-  label: 'Morpho Blue',
-  shortLabel: 'WBTC/USDC',
-  value: MorphoBlueVersions.MorphoBlueWBTCUSDC,
-  url: 'wbtcusdc',
-  loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-  collateralToken: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
-  oracle: '0xDddd770BADd886dF3864029e4B377B5F6a2B6b83',
-  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-  lltv: 0.86,
-  marketId: '0x3a85e619751152991742810df6ec69ce473daef99e28a64ab2340d7b7ccfee49',
-  // icon: SvgAdapter(protocolIcons.spark),
-  protocolName: 'morpho-blue',
-});
-
-export const MORPHO_BLUE_ETH_USDC = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
-  chainIds: [1],
-  label: 'Morpho Blue',
-  shortLabel: 'ETH/USDC',
-  value: MorphoBlueVersions.MorphoBlueEthUSDC,
-  url: 'ethusdc',
-  loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-  collateralToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-  oracle: '0xdC6fd5831277c693b1054e19E94047cB37c77615',
-  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-  lltv: 0.915,
-  marketId: '0xf9acc677910cc17f650416a22e2a14d5da7ccb9626db18f1bf94efe64f92b372',
-  // icon: SvgAdapter(protocolIcons.spark),
-  protocolName: 'morpho-blue',
-});
-export const MORPHO_BLUE_WBTC_USDT = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
-  chainIds: [1],
-  label: 'Morpho Blue',
-  shortLabel: 'WBTC/USDT',
-  value: MorphoBlueVersions.MorphoBlueWBTCUSDT,
-  url: 'wbtcusdt',
-  loanToken: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
-  collateralToken: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
-  oracle: '0x008bF4B1cDA0cc9f0e882E0697f036667652E1ef',
-  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-  lltv: 0.86,
-  marketId: '0xa921ef34e2fc7a27ccc50ae7e4b154e16c9799d3387076c421423ef52ac4df99',
-  // icon: SvgAdapter(protocolIcons.spark),
-  protocolName: 'morpho-blue',
-});
-export const MORPHO_BLUE_WSTETH_USDT = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
-  chainIds: [1],
-  label: 'Morpho Blue',
-  shortLabel: 'wstETH/USDT',
-  value: MorphoBlueVersions.MorphoBlueWstEthUSDT,
-  url: 'wstethusdt',
-  loanToken: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
-  collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
-  oracle: '0x95DB30fAb9A3754e42423000DF27732CB2396992',
-  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-  lltv: 0.86,
-  marketId: '0xe7e9694b754c4d4f7e21faf7223f6fa71abaeb10296a4c43a54a7977149687d2',
-  // icon: SvgAdapter(protocolIcons.spark),
-  protocolName: 'morpho-blue',
-});
-
-export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
-  [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),
+import { MorphoBlueMarketData, MorphoBlueVersions } from '../../types';
+import { NetworkNumber } from '../../types/common';
+
+export const MORPHO_BLUE_WSTETH_ETH = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  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 = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [1],
+  label: 'Morpho Blue',
+  shortLabel: 'wstETH/USDC',
+  value: MorphoBlueVersions.MorphoBlueWstEthUSDC,
+  url: 'wstethusdc',
+  loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+  collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+  oracle: '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',
+  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+  lltv: 0.86,
+  marketId: '0xb323495f7e4148be5643a4ea4a8221eef163e4bccfdedc2a6f4696baacbc86cc',
+  // icon: SvgAdapter(protocolIcons.spark),
+  protocolName: 'morpho-blue',
+});
+
+export const MORPHO_BLUE_SDAI_USDC = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [1],
+  label: 'Morpho Blue',
+  shortLabel: 'sDAI/USDC',
+  value: MorphoBlueVersions.MorphoBlueSDAIUSDC,
+  url: 'sdaiusdc',
+  loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+  collateralToken: '0x83F20F44975D03b1b09e64809B757c47f942BEeA',
+  oracle: '0x6CAFE228eC0B0bC2D076577d56D35Fe704318f6d',
+  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+  lltv: 0.965,
+  marketId: '0x06f2842602373d247c4934f7656e513955ccc4c377f0febc0d9ca2c3bcc191b1',
+  // icon: SvgAdapter(protocolIcons.spark),
+  protocolName: 'morpho-blue',
+});
+
+export const MORPHO_BLUE_WBTC_USDC = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [1],
+  label: 'Morpho Blue',
+  shortLabel: 'WBTC/USDC',
+  value: MorphoBlueVersions.MorphoBlueWBTCUSDC,
+  url: 'wbtcusdc',
+  loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+  collateralToken: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
+  oracle: '0xDddd770BADd886dF3864029e4B377B5F6a2B6b83',
+  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+  lltv: 0.86,
+  marketId: '0x3a85e619751152991742810df6ec69ce473daef99e28a64ab2340d7b7ccfee49',
+  // icon: SvgAdapter(protocolIcons.spark),
+  protocolName: 'morpho-blue',
+});
+
+export const MORPHO_BLUE_ETH_USDC = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [1],
+  label: 'Morpho Blue',
+  shortLabel: 'ETH/USDC',
+  value: MorphoBlueVersions.MorphoBlueEthUSDC,
+  url: 'ethusdc',
+  loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+  collateralToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+  oracle: '0xdC6fd5831277c693b1054e19E94047cB37c77615',
+  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+  lltv: 0.915,
+  marketId: '0xf9acc677910cc17f650416a22e2a14d5da7ccb9626db18f1bf94efe64f92b372',
+  // icon: SvgAdapter(protocolIcons.spark),
+  protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WBTC_USDT = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [1],
+  label: 'Morpho Blue',
+  shortLabel: 'WBTC/USDT',
+  value: MorphoBlueVersions.MorphoBlueWBTCUSDT,
+  url: 'wbtcusdt',
+  loanToken: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+  collateralToken: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
+  oracle: '0x008bF4B1cDA0cc9f0e882E0697f036667652E1ef',
+  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+  lltv: 0.86,
+  marketId: '0xa921ef34e2fc7a27ccc50ae7e4b154e16c9799d3387076c421423ef52ac4df99',
+  // icon: SvgAdapter(protocolIcons.spark),
+  protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WSTETH_USDT = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [1],
+  label: 'Morpho Blue',
+  shortLabel: 'wstETH/USDT',
+  value: MorphoBlueVersions.MorphoBlueWstEthUSDT,
+  url: 'wstethusdt',
+  loanToken: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+  collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+  oracle: '0x95DB30fAb9A3754e42423000DF27732CB2396992',
+  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+  lltv: 0.86,
+  marketId: '0xe7e9694b754c4d4f7e21faf7223f6fa71abaeb10296a4c43a54a7977149687d2',
+  // icon: SvgAdapter(protocolIcons.spark),
+  protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_SUSDE_DAI = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [1],
+  label: 'Morpho Blue',
+  shortLabel: 'sUSDe/DAI',
+  value: MorphoBlueVersions.MorphoBlueSUSDeDAI,
+  url: 'susdedai',
+  loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
+  collateralToken: '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497',
+  oracle: '0x5D916980D5Ae1737a8330Bf24dF812b2911Aae25',
+  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+  lltv: 0.915,
+  marketId: '0x1247f1c237eceae0602eab1470a5061a6dd8f734ba88c7cdc5d6109fb0026b28',
+  // icon: SvgAdapter(protocolIcons.spark),
+  protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_USDE_DAI = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [1],
+  label: 'Morpho Blue',
+  shortLabel: 'USDe/DAI',
+  value: MorphoBlueVersions.MorphoBlueUSDeDAI,
+  url: 'usdedai',
+  loanToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
+  collateralToken: '0x4c9EDD5852cd905f086C759E8383e09bff1E68B3',
+  oracle: '0xaE4750d0813B5E37A51f7629beedd72AF1f9cA35',
+  irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+  lltv: 0.915,
+  marketId: '0xe7e9694b754c4d4f7e21faf7223f6fa71abaeb10296a4c43a54a7977149687d2',
+  // icon: SvgAdapter(protocolIcons.spark),
+  protocolName: 'morpho-blue',
+});
+
+export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
+  [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.MorphoBlueSUSDeDAI]: MORPHO_BLUE_SUSDE_DAI(networkId),
+  [MorphoBlueVersions.MorphoBlueUSDeDAI]: MORPHO_BLUE_USDE_DAI(networkId),
 }) as const;

package/src/markets/spark/index.ts

@@ -1,30 +1,30 @@
-import { getConfigContractAddress } from '../../contracts';
-import { SparkMarketData, SparkVersions } from '../../types';
-import { NetworkNumber } from '../../types/common';
-import { sparkAssetsDefaultMarket } from './marketAssets';
-
-export const sparkEthEmodeId = {
-  [NetworkNumber.Eth]: 1,
-} as const;
-
-export const SPARK_V1 = (networkId: NetworkNumber = NetworkNumber.Eth): SparkMarketData => ({
-  chainIds: [1],
-  label: 'Spark',
-  shortLabel: 'v1',
-  value: SparkVersions.SparkV1,
-  url: 'default',
-  assets: networkId ? sparkAssetsDefaultMarket[networkId] : [],
-  provider: 'SparkPoolAddressesProvider',
-  providerAddress: getConfigContractAddress('SparkPoolAddressesProvider', networkId),
-  lendingPool: 'SparkLendingPool',
-  lendingPoolAddress: getConfigContractAddress('SparkLendingPool', networkId),
-  protocolData: 'SparkProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('SparkProtocolDataProvider', networkId),
-  // icon: SvgAdapter(protocolIcons.spark),
-  protocolName: 'spark',
-});
-
-
-export const SparkMarkets = (networkId: NetworkNumber) => ({
-  [SparkVersions.SparkV1]: SPARK_V1(networkId),
+import { getConfigContractAddress } from '../../contracts';
+import { SparkMarketData, SparkVersions } from '../../types';
+import { NetworkNumber } from '../../types/common';
+import { sparkAssetsDefaultMarket } from './marketAssets';
+
+export const sparkEthEmodeId = {
+  [NetworkNumber.Eth]: 1,
+} as const;
+
+export const SPARK_V1 = (networkId: NetworkNumber = NetworkNumber.Eth): SparkMarketData => ({
+  chainIds: [1],
+  label: 'Spark',
+  shortLabel: 'v1',
+  value: SparkVersions.SparkV1,
+  url: 'default',
+  assets: networkId ? sparkAssetsDefaultMarket[networkId] : [],
+  provider: 'SparkPoolAddressesProvider',
+  providerAddress: getConfigContractAddress('SparkPoolAddressesProvider', networkId),
+  lendingPool: 'SparkLendingPool',
+  lendingPoolAddress: getConfigContractAddress('SparkLendingPool', networkId),
+  protocolData: 'SparkProtocolDataProvider',
+  protocolDataAddress: getConfigContractAddress('SparkProtocolDataProvider', networkId),
+  // icon: SvgAdapter(protocolIcons.spark),
+  protocolName: 'spark',
+});
+
+
+export const SparkMarkets = (networkId: NetworkNumber) => ({
+  [SparkVersions.SparkV1]: SPARK_V1(networkId),
 }) as const;

package/src/markets/spark/marketAssets.ts

@@ -1,11 +1,11 @@
-import { NetworkNumber } from '../../types/common';
-
-export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT'];
-
-// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
-export const sparkAssetsDefaultMarket = {
-  [NetworkNumber.Eth]: sparkAssetsDefaultMarketEth,
-  [NetworkNumber.Opt]: [],
-  [NetworkNumber.Base]: [],
-  [NetworkNumber.Arb]: [],
+import { NetworkNumber } from '../../types/common';
+
+export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT'];
+
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
+export const sparkAssetsDefaultMarket = {
+  [NetworkNumber.Eth]: sparkAssetsDefaultMarketEth,
+  [NetworkNumber.Opt]: [],
+  [NetworkNumber.Base]: [],
+  [NetworkNumber.Arb]: [],
 } as const;

package/src/moneymarket/moneymarketCommonService.ts

@@ -1,76 +1,76 @@
-import Dec from 'decimal.js';
-import { BLOCKS_IN_A_YEAR } from '../constants';
-import { MMUsedAssets } from '../types/common';
-
-export const getAssetsTotal = (assets: object, filter: any, transform: any) => (Object.values(assets) as any)
-  .filter(filter)
-  .map(transform)
-  .reduce((acc: any, data: any) => new Dec(acc).add(data), '0')
-  .toString();
-
-export const calcLongLiqPrice = (assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => new Dec(assetPrice).mul(borrowedUsd).div(borrowLimitUsd).toString();
-export const calcShortLiqPrice = (assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => new Dec(assetPrice).div(borrowedUsd).mul(borrowLimitUsd).toString();
-
-export const calcLeverageLiqPrice = (leverageType: string, assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => {
-  if (leverageType === 'short') return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
-  if (leverageType === 'long' || leverageType === 'lsd-leverage') return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
-  console.error('invalid leverageType', leverageType);
-  return '0';
-};
-
-export const calculateBorrowingAssetLimit = (assetBorrowedUsd: string, borrowLimitUsd: string) => new Dec(assetBorrowedUsd).div(borrowLimitUsd).times(100).toString();
-
-export const STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD'];
-
-export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
-  let borrowUnstable = 0;
-  let supplyStable = 0;
-  let borrowStable = 0;
-  let supplyUnstable = 0;
-  let longAsset = '';
-  let shortAsset = '';
-  Object.values(usedAssets).forEach(({
-    symbol, suppliedUsd, borrowedUsd, collateral,
-  }) => {
-    const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
-    const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
-    if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral) supplyStable += 1;
-    if (isBorrowed && STABLE_ASSETS.includes(symbol)) borrowStable += 1;
-    if (isBorrowed && !STABLE_ASSETS.includes(symbol)) {
-      borrowUnstable += 1;
-      shortAsset = symbol;
-    }
-    if (isSupplied && !STABLE_ASSETS.includes(symbol) && collateral) {
-      supplyUnstable += 1;
-      longAsset = symbol;
-    }
-  });
-  const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
-  const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
-  // lsd -> liquid staking derivative
-  const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH'].includes(longAsset);
-  if (isLong) {
-    return {
-      leveragedType: 'long',
-      leveragedAsset: longAsset,
-    };
-  }
-  if (isShort) {
-    return {
-      leveragedType: 'short',
-      leveragedAsset: shortAsset,
-    };
-  }
-  if (isLsdLeveraged) {
-    return {
-      leveragedType: 'lsd-leverage',
-      leveragedAsset: longAsset,
-    };
-  }
-  return {
-    leveragedType: '',
-    leveragedAsset: '',
-  };
-};
-
+import Dec from 'decimal.js';
+import { BLOCKS_IN_A_YEAR } from '../constants';
+import { MMUsedAssets } from '../types/common';
+
+export const getAssetsTotal = (assets: object, filter: any, transform: any) => (Object.values(assets) as any)
+  .filter(filter)
+  .map(transform)
+  .reduce((acc: any, data: any) => new Dec(acc).add(data), '0')
+  .toString();
+
+export const calcLongLiqPrice = (assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => new Dec(assetPrice).mul(borrowedUsd).div(borrowLimitUsd).toString();
+export const calcShortLiqPrice = (assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => new Dec(assetPrice).div(borrowedUsd).mul(borrowLimitUsd).toString();
+
+export const calcLeverageLiqPrice = (leverageType: string, assetPrice: string, borrowedUsd: string, borrowLimitUsd: string) => {
+  if (leverageType === 'short') return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
+  if (leverageType === 'long' || leverageType === 'lsd-leverage') return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
+  console.error('invalid leverageType', leverageType);
+  return '0';
+};
+
+export const calculateBorrowingAssetLimit = (assetBorrowedUsd: string, borrowLimitUsd: string) => new Dec(assetBorrowedUsd).div(borrowLimitUsd).times(100).toString();
+
+export const STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD'];
+
+export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {
+  let borrowUnstable = 0;
+  let supplyStable = 0;
+  let borrowStable = 0;
+  let supplyUnstable = 0;
+  let longAsset = '';
+  let shortAsset = '';
+  Object.values(usedAssets).forEach(({
+    symbol, suppliedUsd, borrowedUsd, collateral,
+  }) => {
+    const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
+    const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
+    if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral) supplyStable += 1;
+    if (isBorrowed && STABLE_ASSETS.includes(symbol)) borrowStable += 1;
+    if (isBorrowed && !STABLE_ASSETS.includes(symbol)) {
+      borrowUnstable += 1;
+      shortAsset = symbol;
+    }
+    if (isSupplied && !STABLE_ASSETS.includes(symbol) && collateral) {
+      supplyUnstable += 1;
+      longAsset = symbol;
+    }
+  });
+  const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
+  const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
+  // lsd -> liquid staking derivative
+  const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH'].includes(longAsset);
+  if (isLong) {
+    return {
+      leveragedType: 'long',
+      leveragedAsset: longAsset,
+    };
+  }
+  if (isShort) {
+    return {
+      leveragedType: 'short',
+      leveragedAsset: shortAsset,
+    };
+  }
+  if (isLsdLeveraged) {
+    return {
+      leveragedType: 'lsd-leverage',
+      leveragedAsset: longAsset,
+    };
+  }
+  return {
+    leveragedType: '',
+    leveragedAsset: '',
+  };
+};
+
 export const aprToApy = (interest: string | number, frequency = BLOCKS_IN_A_YEAR) => ((1 + (+interest / 100) / frequency) ** frequency - 1) * 100; // eslint-disable-line