@defisaver/positions-sdk 0.0.198 → 0.0.199-dev-1

package/src/maker/index.ts

@@ -1,118 +1,118 @@
-import Web3 from 'web3';
-import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo, ilkToAsset } from '@defisaver/tokens';
-import {
-  Blockish, EthAddress, NetworkNumber, PositionBalances,
-} from '../types/common';
-import { McdViewContract } from '../contracts';
-import { makerHelpers } from '../helpers';
-import { CdpData } from '../types';
-import { wethToEth } from '../services/utils';
-
-export const getMakerAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, cdpId: string, _managerAddress?: EthAddress): Promise<PositionBalances> => {
-  let balances: PositionBalances = {
-    collateral: {},
-    debt: {},
-  };
-  const managerAddress = _managerAddress || '0x5ef30b9986345249bc32d8928B7ee64DE9435E39'; // Default CDP Manager (This is used only to differentiate BProtocol CDPs)
-
-  if (!cdpId) {
-    return balances;
-  }
-
-  const viewContract = McdViewContract(web3, network, block);
-
-  let ilk;
-
-  const needsIlk = block !== 'latest' && new Dec(block).lt(14410792) && new Dec(block).gte(14384301);
-
-  if (needsIlk) {
-    ilk = (await viewContract.methods.getUrnAndIlk(managerAddress, cdpId).call({}, block)).ilk;
-  }
-
-  // @ts-ignore
-  const cdpInfo = await viewContract.methods.getCdpInfo(...(needsIlk ? [managerAddress, cdpId, ilk] : [cdpId])).call({}, block);
-  const ilkInfo = await makerHelpers.getCollateralInfo(needsIlk ? ilk : cdpInfo.ilk, web3, network, block);
-
-
-  const collateral = needsIlk ? cdpInfo[1] : cdpInfo.collateral;
-  const debt = needsIlk ? cdpInfo[0] : cdpInfo.debt;
-
-  const asset = wethToEth(ilkToAsset(needsIlk ? ilk : cdpInfo.ilk));
-
-  balances = {
-    collateral: {
-      [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: asset === 'WBTC' ? new Dec(collateral).div(1e10).floor().toString() : collateral,
-    },
-    debt: {
-      [addressMapping ? getAssetInfo('DAI', network).address.toLowerCase() : 'DAI']: new Dec(debt).times(ilkInfo.currentRate).div(1e27).floor()
-        .toString(),
-    },
-  };
-
-  return balances;
-};
-
-export const getMakerCdpData = async (web3: Web3, network: NetworkNumber, cdpId: string): Promise<CdpData> => {
-  const viewContract = McdViewContract(web3, network);
-
-  // @ts-ignore
-  const cdpInfo = await viewContract.methods.getCdpInfo(cdpId).call();
-
-  const [ilkInfo, coll] = await Promise.all([
-    makerHelpers.getCollateralInfo(cdpInfo.ilk, web3, network),
-    makerHelpers.getUnclaimedCollateral(web3, network, cdpInfo.urn, cdpInfo.ilk),
-  ]);
-
-  const asset = ilkToAsset(cdpInfo.ilk);
-
-  const collateralUsd = new Dec(cdpInfo.collateral).mul(ilkInfo.assetPrice).floor().toString();
-  const debt = new Dec(cdpInfo.debt).times(ilkInfo.currentRate).div(1e27).floor()
-    .toString();
-  const futureDebt = new Dec(cdpInfo.debt).times(ilkInfo.futureRate).div(1e27).floor()
-    .toString(); // after drip
-  const debtDripDelta = assetAmountInEth(new Dec(futureDebt).sub(debt).toString(), 'DAI');
-  const liquidationPrice = new Dec(debt).times(ilkInfo.liqRatio).div(cdpInfo.collateral).toString();
-
-  let ratio = new Dec(cdpInfo.collateral).times(ilkInfo.assetPrice).div(debt).times(100)
-    .toString();
-  if (new Dec(debt).eq(0)) ratio = '0';
-
-  const debtTooLow = new Dec(debt).gt(0) && new Dec(assetAmountInEth(debt, 'DAI')).lt(ilkInfo.minDebt);
-
-  const par = '1';
-  return {
-    owner: cdpInfo.owner,
-    userAddress: cdpInfo.userAddr,
-    id: cdpId,
-    urn: cdpInfo.urn,
-    type: 'mcd',
-    ilk: cdpInfo.ilk,
-    ilkLabel: ilkInfo.ilkLabel,
-    asset,
-    collateral: assetAmountInEth(cdpInfo.collateral, `MCD-${asset}`),
-    collateralUsd: assetAmountInEth(collateralUsd, `MCD-${asset}`),
-    futureDebt: assetAmountInEth(futureDebt, 'DAI'),
-    debtDai: assetAmountInEth(debt, 'DAI'),
-    debtUsd: assetAmountInEth(debt, 'DAI'),
-    debtInAsset: assetAmountInEth(debt, 'DAI'),
-    debtAssetPrice: par,
-    debtAssetMarketPrice: par,
-    liquidationPrice,
-    ratio,
-    liqRatio: ilkInfo.liqRatio.toString(),
-    liqPercent: parseFloat(ilkInfo.liqPercent.toString()),
-    assetPrice: ilkInfo.assetPrice,
-    daiLabel: 'DAI',
-    debtAsset: 'DAI',
-    unclaimedCollateral: assetAmountInEth(coll, asset),
-    debtTooLow,
-    minDebt: ilkInfo.minDebt,
-    stabilityFee: ilkInfo.stabilityFee,
-    creatableDebt: ilkInfo.creatableDebt,
-    globalDebtCeiling: ilkInfo.globalDebtCeiling,
-    globalDebtCurrent: ilkInfo.globalDebtCurrent,
-    liquidationFee: ilkInfo.liquidationFee,
-    lastUpdated: Date.now(),
-  };
+import Web3 from 'web3';
+import Dec from 'decimal.js';
+import { assetAmountInEth, getAssetInfo, ilkToAsset } from '@defisaver/tokens';
+import {
+  Blockish, EthAddress, NetworkNumber, PositionBalances,
+} from '../types/common';
+import { McdViewContract } from '../contracts';
+import { makerHelpers } from '../helpers';
+import { CdpData } from '../types';
+import { wethToEth } from '../services/utils';
+
+export const getMakerAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, cdpId: string, _managerAddress?: EthAddress): Promise<PositionBalances> => {
+  let balances: PositionBalances = {
+    collateral: {},
+    debt: {},
+  };
+  const managerAddress = _managerAddress || '0x5ef30b9986345249bc32d8928B7ee64DE9435E39'; // Default CDP Manager (This is used only to differentiate BProtocol CDPs)
+
+  if (!cdpId) {
+    return balances;
+  }
+
+  const viewContract = McdViewContract(web3, network, block);
+
+  let ilk;
+
+  const needsIlk = block !== 'latest' && new Dec(block).lt(14410792) && new Dec(block).gte(14384301);
+
+  if (needsIlk) {
+    ilk = (await viewContract.methods.getUrnAndIlk(managerAddress, cdpId).call({}, block)).ilk;
+  }
+
+  // @ts-ignore
+  const cdpInfo = await viewContract.methods.getCdpInfo(...(needsIlk ? [managerAddress, cdpId, ilk] : [cdpId])).call({}, block);
+  const ilkInfo = await makerHelpers.getCollateralInfo(needsIlk ? ilk : cdpInfo.ilk, web3, network, block);
+
+
+  const collateral = needsIlk ? cdpInfo[1] : cdpInfo.collateral;
+  const debt = needsIlk ? cdpInfo[0] : cdpInfo.debt;
+
+  const asset = wethToEth(ilkToAsset(needsIlk ? ilk : cdpInfo.ilk));
+
+  balances = {
+    collateral: {
+      [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: asset === 'WBTC' ? new Dec(collateral).div(1e10).floor().toString() : collateral,
+    },
+    debt: {
+      [addressMapping ? getAssetInfo('DAI', network).address.toLowerCase() : 'DAI']: new Dec(debt).times(ilkInfo.currentRate).div(1e27).floor()
+        .toString(),
+    },
+  };
+
+  return balances;
+};
+
+export const getMakerCdpData = async (web3: Web3, network: NetworkNumber, cdpId: string): Promise<CdpData> => {
+  const viewContract = McdViewContract(web3, network);
+
+  // @ts-ignore
+  const cdpInfo = await viewContract.methods.getCdpInfo(cdpId).call();
+
+  const [ilkInfo, coll] = await Promise.all([
+    makerHelpers.getCollateralInfo(cdpInfo.ilk, web3, network),
+    makerHelpers.getUnclaimedCollateral(web3, network, cdpInfo.urn, cdpInfo.ilk),
+  ]);
+
+  const asset = ilkToAsset(cdpInfo.ilk);
+
+  const collateralUsd = new Dec(cdpInfo.collateral).mul(ilkInfo.assetPrice).floor().toString();
+  const debt = new Dec(cdpInfo.debt).times(ilkInfo.currentRate).div(1e27).floor()
+    .toString();
+  const futureDebt = new Dec(cdpInfo.debt).times(ilkInfo.futureRate).div(1e27).floor()
+    .toString(); // after drip
+  const debtDripDelta = assetAmountInEth(new Dec(futureDebt).sub(debt).toString(), 'DAI');
+  const liquidationPrice = new Dec(debt).times(ilkInfo.liqRatio).div(cdpInfo.collateral).toString();
+
+  let ratio = new Dec(cdpInfo.collateral).times(ilkInfo.assetPrice).div(debt).times(100)
+    .toString();
+  if (new Dec(debt).eq(0)) ratio = '0';
+
+  const debtTooLow = new Dec(debt).gt(0) && new Dec(assetAmountInEth(debt, 'DAI')).lt(ilkInfo.minDebt);
+
+  const par = '1';
+  return {
+    owner: cdpInfo.owner,
+    userAddress: cdpInfo.userAddr,
+    id: cdpId,
+    urn: cdpInfo.urn,
+    type: 'mcd',
+    ilk: cdpInfo.ilk,
+    ilkLabel: ilkInfo.ilkLabel,
+    asset,
+    collateral: assetAmountInEth(cdpInfo.collateral, `MCD-${asset}`),
+    collateralUsd: assetAmountInEth(collateralUsd, `MCD-${asset}`),
+    futureDebt: assetAmountInEth(futureDebt, 'DAI'),
+    debtDai: assetAmountInEth(debt, 'DAI'),
+    debtUsd: assetAmountInEth(debt, 'DAI'),
+    debtInAsset: assetAmountInEth(debt, 'DAI'),
+    debtAssetPrice: par,
+    debtAssetMarketPrice: par,
+    liquidationPrice,
+    ratio,
+    liqRatio: ilkInfo.liqRatio.toString(),
+    liqPercent: parseFloat(ilkInfo.liqPercent.toString()),
+    assetPrice: ilkInfo.assetPrice,
+    daiLabel: 'DAI',
+    debtAsset: 'DAI',
+    unclaimedCollateral: assetAmountInEth(coll, asset),
+    debtTooLow,
+    minDebt: ilkInfo.minDebt,
+    stabilityFee: ilkInfo.stabilityFee,
+    creatableDebt: ilkInfo.creatableDebt,
+    globalDebtCeiling: ilkInfo.globalDebtCeiling,
+    globalDebtCurrent: ilkInfo.globalDebtCurrent,
+    liquidationFee: ilkInfo.liquidationFee,
+    lastUpdated: Date.now(),
+  };
 };

package/src/markets/aave/index.ts

@@ -1,152 +1,152 @@
-import { getConfigContractAddress } from '../../contracts';
-import { compareAddresses } from '../../services/utils';
-import {
-  AaveMarketInfo, AaveVersions, MorphoAaveV2MarketInfo, MorphoAaveV3MarketInfo,
-} from '../../types';
-import { NetworkNumber } from '../../types/common';
-import {
-  aaveV1AssetsDefaultMarket, aaveV2AssetsDefaultMarket, aaveV3AssetsDefaultMarket, aaveV3AssetsEtherfiMarket, aaveV3AssetsLidoMarket, morphoAaveV2AssetDefaultMarket, morphoAaveV3AssetEthMarket,
-} from './marketAssets';
-
-export {
-  aaveV1AssetsDefaultMarket,
-  aaveV2AssetsDefaultMarket,
-  aaveV3AssetsDefaultMarket,
-  morphoAaveV2AssetDefaultMarket,
-  morphoAaveV3AssetEthMarket,
-  aaveV3AssetsLidoMarket,
-};
-
-export const AAVE_V1: AaveMarketInfo = {
-  chainIds: [NetworkNumber.Eth],
-  label: 'Aave v1',
-  shortLabel: 'v1',
-  url: '',
-  value: AaveVersions.AaveV1,
-  assets: aaveV1AssetsDefaultMarket.map((a) => a.underlyingAsset),
-  provider: '',
-  providerAddress: '',
-  lendingPool: '',
-  lendingPoolAddress: '',
-  protocolData: '',
-  protocolDataAddress: '',
-  // icon: SvgAdapter(protocolIcons.aave),
-  disabled: true,
-  protocolName: 'aave',
-};
-
-export const AAVE_V2: AaveMarketInfo = {
-  chainIds: [NetworkNumber.Eth],
-  label: 'Aave v2',
-  shortLabel: 'v2',
-  value: AaveVersions.AaveV2,
-  url: 'default',
-  assets: aaveV2AssetsDefaultMarket,
-  provider: 'LendingPoolAddressesProvider',
-  providerAddress: getConfigContractAddress('LendingPoolAddressesProvider', 1), // rename
-  lendingPool: 'AaveLendingPoolV2',
-  lendingPoolAddress: getConfigContractAddress('AaveLendingPoolV2', 1),
-  protocolData: 'AaveProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('AaveProtocolDataProvider', 1),
-  // icon: SvgAdapter(protocolIcons.aave),
-  protocolName: 'aave',
-};
-
-export const AAVE_V3 = (networkId: NetworkNumber): AaveMarketInfo => ({
-  chainIds: [NetworkNumber.Eth, NetworkNumber.Opt, NetworkNumber.Arb, NetworkNumber.Base],
-  label: networkId === 1 ? 'Aave v3 Core' : 'Aave v3',
-  shortLabel: 'v3',
-  value: AaveVersions.AaveV3,
-  url: 'default',
-  assets: networkId ? aaveV3AssetsDefaultMarket[networkId] : [],
-  provider: 'AaveV3PoolAddressesProvider',
-  providerAddress: getConfigContractAddress('AaveV3PoolAddressesProvider', networkId),
-  lendingPool: 'AaveV3LendingPool',
-  lendingPoolAddress: getConfigContractAddress('AaveV3LendingPool', networkId),
-  protocolData: 'AaveV3ProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('AaveV3ProtocolDataProvider', networkId),
-  // icon: SvgAdapter(protocolIcons.aave),
-  protocolName: 'aave',
-});
-
-export const AAVE_V3_LIDO = (networkId: NetworkNumber): AaveMarketInfo => ({
-  chainIds: [NetworkNumber.Eth],
-  label: 'Aave v3 Prime',
-  shortLabel: 'v3',
-  value: AaveVersions.AaveV3Lido,
-  url: 'lido',
-  assets: networkId ? aaveV3AssetsLidoMarket[networkId] : [],
-  provider: 'AaveV3LidoPoolAddressesProvider',
-  providerAddress: getConfigContractAddress('AaveV3LidoPoolAddressesProvider', networkId),
-  lendingPool: 'AaveV3LidoLendingPool',
-  lendingPoolAddress: getConfigContractAddress('AaveV3LidoLendingPool', networkId),
-  protocolData: 'AaveV3LidoProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('AaveV3LidoProtocolDataProvider', networkId),
-  // icon: SvgAdapter(protocolIcons.aave),
-  protocolName: 'aave',
-});
-
-export const AAVE_V3_ETHERFI = (networkId: NetworkNumber): AaveMarketInfo => ({
-  chainIds: [NetworkNumber.Eth],
-  label: 'Aave v3 EtherFi',
-  shortLabel: 'v3',
-  value: AaveVersions.AaveV3Etherfi,
-  url: 'etherfi',
-  assets: networkId ? aaveV3AssetsEtherfiMarket[networkId] : [],
-  provider: 'AaveV3EtherfiPoolAddressesProvider',
-  providerAddress: getConfigContractAddress('AaveV3EtherfiPoolAddressesProvider', networkId),
-  lendingPool: 'AaveV3EtherfiLendingPool',
-  lendingPoolAddress: getConfigContractAddress('AaveV3EtherfiLendingPool', networkId),
-  protocolData: 'AaveV3EtherfiProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('AaveV3EtherfiProtocolDataProvider', networkId),
-  // icon: SvgAdapter(protocolIcons.aave),
-  protocolName: 'aave',
-});
-
-export const MORPHO_AAVE_V2: MorphoAaveV2MarketInfo = {
-  chainIds: [1],
-  label: 'Morpho-Aave V2',
-  shortLabel: 'morpho-aave-v2',
-  value: AaveVersions.MorphoAaveV2,
-  url: '',
-  assets: morphoAaveV2AssetDefaultMarket,
-  providerAddress: getConfigContractAddress('LendingPoolAddressesProvider', 1),
-  lendingPoolAddress: getConfigContractAddress('MorphoAaveV2Proxy', 1),
-  // icon: SvgAdapter(protocolIcons.morpho),
-  protocolName: 'morpho',
-};
-
-export const MORPHO_AAVE_V3_ETH = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoAaveV3MarketInfo => ({
-  chainIds: [1],
-  label: 'Morpho-Aave V3',
-  shortLabel: 'morpho-aave-v3',
-  subVersionLabel: 'ETH Optimizer',
-  value: AaveVersions.MorphoAaveV3Eth,
-  url: 'eth-optimizer',
-  assets: morphoAaveV3AssetEthMarket,
-  providerAddress: getConfigContractAddress('AaveV3PoolAddressesProvider', networkId), // TODO - check if used and if value is good?
-  protocolData: 'AaveV3ProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('AaveV3ProtocolDataProvider', networkId),
-  aaveLendingPool: 'AaveV3LendingPool',
-  aaveLendingPoolAddress: getConfigContractAddress('AaveV3LendingPool', networkId),
-  lendingPool: 'MorphoAaveV3ProxyEthMarket',
-  lendingPoolAddress: getConfigContractAddress('MorphoAaveV3ProxyEthMarket', 1),
-  // icon: SvgAdapter(protocolIcons.morpho),
-  protocolName: 'morpho',
-});
-
-
-export const AaveMarkets = (networkId: NetworkNumber) => ({
-  [AaveVersions.AaveV1]: AAVE_V1,
-  [AaveVersions.AaveV2]: AAVE_V2,
-  [AaveVersions.AaveV3]: AAVE_V3(networkId),
-  [AaveVersions.AaveV3Lido]: AAVE_V3_LIDO(networkId),
-  [AaveVersions.AaveV3Etherfi]: AAVE_V3_ETHERFI(networkId),
-  [AaveVersions.MorphoAaveV3Eth]: MORPHO_AAVE_V3_ETH(networkId),
-  [AaveVersions.MorphoAaveV2]: MORPHO_AAVE_V2,
-}) as const;
-
-export const getAaveV3MarketByMarketAddress = (marketAddress: string, network = NetworkNumber.Eth): AaveMarketInfo | MorphoAaveV2MarketInfo | MorphoAaveV3MarketInfo | undefined => {
-  const markets = AaveMarkets(network);
-  return Object.values(markets).filter((m) => (![AaveVersions.MorphoAaveV3Eth, AaveVersions.MorphoAaveV2].includes(m.value))).find((m) => compareAddresses(m.providerAddress, marketAddress));
-};
+import { getConfigContractAddress } from '../../contracts';
+import { compareAddresses } from '../../services/utils';
+import {
+  AaveMarketInfo, AaveVersions, MorphoAaveV2MarketInfo, MorphoAaveV3MarketInfo,
+} from '../../types';
+import { NetworkNumber } from '../../types/common';
+import {
+  aaveV1AssetsDefaultMarket, aaveV2AssetsDefaultMarket, aaveV3AssetsDefaultMarket, aaveV3AssetsEtherfiMarket, aaveV3AssetsLidoMarket, morphoAaveV2AssetDefaultMarket, morphoAaveV3AssetEthMarket,
+} from './marketAssets';
+
+export {
+  aaveV1AssetsDefaultMarket,
+  aaveV2AssetsDefaultMarket,
+  aaveV3AssetsDefaultMarket,
+  morphoAaveV2AssetDefaultMarket,
+  morphoAaveV3AssetEthMarket,
+  aaveV3AssetsLidoMarket,
+};
+
+export const AAVE_V1: AaveMarketInfo = {
+  chainIds: [NetworkNumber.Eth],
+  label: 'Aave v1',
+  shortLabel: 'v1',
+  url: '',
+  value: AaveVersions.AaveV1,
+  assets: aaveV1AssetsDefaultMarket.map((a) => a.underlyingAsset),
+  provider: '',
+  providerAddress: '',
+  lendingPool: '',
+  lendingPoolAddress: '',
+  protocolData: '',
+  protocolDataAddress: '',
+  // icon: SvgAdapter(protocolIcons.aave),
+  disabled: true,
+  protocolName: 'aave',
+};
+
+export const AAVE_V2: AaveMarketInfo = {
+  chainIds: [NetworkNumber.Eth],
+  label: 'Aave v2',
+  shortLabel: 'v2',
+  value: AaveVersions.AaveV2,
+  url: 'default',
+  assets: aaveV2AssetsDefaultMarket,
+  provider: 'LendingPoolAddressesProvider',
+  providerAddress: getConfigContractAddress('LendingPoolAddressesProvider', 1), // rename
+  lendingPool: 'AaveLendingPoolV2',
+  lendingPoolAddress: getConfigContractAddress('AaveLendingPoolV2', 1),
+  protocolData: 'AaveProtocolDataProvider',
+  protocolDataAddress: getConfigContractAddress('AaveProtocolDataProvider', 1),
+  // icon: SvgAdapter(protocolIcons.aave),
+  protocolName: 'aave',
+};
+
+export const AAVE_V3 = (networkId: NetworkNumber): AaveMarketInfo => ({
+  chainIds: [NetworkNumber.Eth, NetworkNumber.Opt, NetworkNumber.Arb, NetworkNumber.Base],
+  label: networkId === 1 ? 'Aave v3 Core' : 'Aave v3',
+  shortLabel: 'v3',
+  value: AaveVersions.AaveV3,
+  url: 'default',
+  assets: networkId ? aaveV3AssetsDefaultMarket[networkId] : [],
+  provider: 'AaveV3PoolAddressesProvider',
+  providerAddress: getConfigContractAddress('AaveV3PoolAddressesProvider', networkId),
+  lendingPool: 'AaveV3LendingPool',
+  lendingPoolAddress: getConfigContractAddress('AaveV3LendingPool', networkId),
+  protocolData: 'AaveV3ProtocolDataProvider',
+  protocolDataAddress: getConfigContractAddress('AaveV3ProtocolDataProvider', networkId),
+  // icon: SvgAdapter(protocolIcons.aave),
+  protocolName: 'aave',
+});
+
+export const AAVE_V3_LIDO = (networkId: NetworkNumber): AaveMarketInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Aave v3 Prime',
+  shortLabel: 'v3',
+  value: AaveVersions.AaveV3Lido,
+  url: 'lido',
+  assets: networkId ? aaveV3AssetsLidoMarket[networkId] : [],
+  provider: 'AaveV3LidoPoolAddressesProvider',
+  providerAddress: getConfigContractAddress('AaveV3LidoPoolAddressesProvider', networkId),
+  lendingPool: 'AaveV3LidoLendingPool',
+  lendingPoolAddress: getConfigContractAddress('AaveV3LidoLendingPool', networkId),
+  protocolData: 'AaveV3LidoProtocolDataProvider',
+  protocolDataAddress: getConfigContractAddress('AaveV3LidoProtocolDataProvider', networkId),
+  // icon: SvgAdapter(protocolIcons.aave),
+  protocolName: 'aave',
+});
+
+export const AAVE_V3_ETHERFI = (networkId: NetworkNumber): AaveMarketInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Aave v3 EtherFi',
+  shortLabel: 'v3',
+  value: AaveVersions.AaveV3Etherfi,
+  url: 'etherfi',
+  assets: networkId ? aaveV3AssetsEtherfiMarket[networkId] : [],
+  provider: 'AaveV3EtherfiPoolAddressesProvider',
+  providerAddress: getConfigContractAddress('AaveV3EtherfiPoolAddressesProvider', networkId),
+  lendingPool: 'AaveV3EtherfiLendingPool',
+  lendingPoolAddress: getConfigContractAddress('AaveV3EtherfiLendingPool', networkId),
+  protocolData: 'AaveV3EtherfiProtocolDataProvider',
+  protocolDataAddress: getConfigContractAddress('AaveV3EtherfiProtocolDataProvider', networkId),
+  // icon: SvgAdapter(protocolIcons.aave),
+  protocolName: 'aave',
+});
+
+export const MORPHO_AAVE_V2: MorphoAaveV2MarketInfo = {
+  chainIds: [1],
+  label: 'Morpho-Aave V2',
+  shortLabel: 'morpho-aave-v2',
+  value: AaveVersions.MorphoAaveV2,
+  url: '',
+  assets: morphoAaveV2AssetDefaultMarket,
+  providerAddress: getConfigContractAddress('LendingPoolAddressesProvider', 1),
+  lendingPoolAddress: getConfigContractAddress('MorphoAaveV2Proxy', 1),
+  // icon: SvgAdapter(protocolIcons.morpho),
+  protocolName: 'morpho',
+};
+
+export const MORPHO_AAVE_V3_ETH = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoAaveV3MarketInfo => ({
+  chainIds: [1],
+  label: 'Morpho-Aave V3',
+  shortLabel: 'morpho-aave-v3',
+  subVersionLabel: 'ETH Optimizer',
+  value: AaveVersions.MorphoAaveV3Eth,
+  url: 'eth-optimizer',
+  assets: morphoAaveV3AssetEthMarket,
+  providerAddress: getConfigContractAddress('AaveV3PoolAddressesProvider', networkId), // TODO - check if used and if value is good?
+  protocolData: 'AaveV3ProtocolDataProvider',
+  protocolDataAddress: getConfigContractAddress('AaveV3ProtocolDataProvider', networkId),
+  aaveLendingPool: 'AaveV3LendingPool',
+  aaveLendingPoolAddress: getConfigContractAddress('AaveV3LendingPool', networkId),
+  lendingPool: 'MorphoAaveV3ProxyEthMarket',
+  lendingPoolAddress: getConfigContractAddress('MorphoAaveV3ProxyEthMarket', 1),
+  // icon: SvgAdapter(protocolIcons.morpho),
+  protocolName: 'morpho',
+});
+
+
+export const AaveMarkets = (networkId: NetworkNumber) => ({
+  [AaveVersions.AaveV1]: AAVE_V1,
+  [AaveVersions.AaveV2]: AAVE_V2,
+  [AaveVersions.AaveV3]: AAVE_V3(networkId),
+  [AaveVersions.AaveV3Lido]: AAVE_V3_LIDO(networkId),
+  [AaveVersions.AaveV3Etherfi]: AAVE_V3_ETHERFI(networkId),
+  [AaveVersions.MorphoAaveV3Eth]: MORPHO_AAVE_V3_ETH(networkId),
+  [AaveVersions.MorphoAaveV2]: MORPHO_AAVE_V2,
+}) as const;
+
+export const getAaveV3MarketByMarketAddress = (marketAddress: string, network = NetworkNumber.Eth): AaveMarketInfo | MorphoAaveV2MarketInfo | MorphoAaveV3MarketInfo | undefined => {
+  const markets = AaveMarkets(network);
+  return Object.values(markets).filter((m) => (![AaveVersions.MorphoAaveV3Eth, AaveVersions.MorphoAaveV2].includes(m.value))).find((m) => compareAddresses(m.providerAddress, marketAddress));
+};

package/src/markets/aave/marketAssets.ts

@@ -1,47 +1,45 @@
-import { getAssetInfo } from '@defisaver/tokens';
-import { NetworkNumber } from '../../types/common';
-
-export const aaveV1AssetsDefaultMarket = [
-  'aETH', 'aDAI', 'aUSDC', 'aSUSD', 'aTUSD', 'aUSDT', 'aBUSD', 'aBAT', 'aLEND',
-  'aLINK', 'aMANA', 'aMKR', 'aREP', 'aSNX', 'aWBTC', 'aZRX', 'aENJ', 'aREN', 'aYFI', 'aUNI', 'aAAVE',
-].map((symbol) => getAssetInfo(symbol));
-
-export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
-export const morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
-
-export const morphoAaveV3AssetEthMarket = ['ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT'];
-
-export const aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH'];
-export const aaveV3AssetsDefaultMarketOpt = [
-  'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
-];
-export const aaveV3AssetsDefaultMarketArb = [
-  'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB', 'weETH', 'GHO',
-];
-export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC'];
-
-// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
-export const aaveV3AssetsDefaultMarket = {
-  [NetworkNumber.Eth]: aaveV3AssetsDefaultMarketEth,
-  [NetworkNumber.Opt]: aaveV3AssetsDefaultMarketOpt,
-  [NetworkNumber.Arb]: aaveV3AssetsDefaultMarketArb,
-  [NetworkNumber.Base]: aaveV3AssetsDefaultMarketBase,
-} as const;
-
-export const aaveV3AssetsLidoMarketEth = ['ETH', 'wstETH', 'USDS', 'USDC', 'ezETH', 'sUSDe', 'GHO', 'rsETH'];
-
-export const aaveV3AssetsLidoMarket = {
-  [NetworkNumber.Eth]: aaveV3AssetsLidoMarketEth,
-  [NetworkNumber.Opt]: [],
-  [NetworkNumber.Arb]: [],
-  [NetworkNumber.Base]: [],
-} as const;
-
-export const aaveV3AssetsEtherfiMarketEth = ['weETH', 'USDC', 'PYUSD', 'FRAX'];
-
-export const aaveV3AssetsEtherfiMarket = {
-  [NetworkNumber.Eth]: aaveV3AssetsEtherfiMarketEth,
-  [NetworkNumber.Opt]: [],
-  [NetworkNumber.Arb]: [],
-  [NetworkNumber.Base]: [],
+import { getAssetInfo } from '@defisaver/tokens';
+import { NetworkNumber } from '../../types/common';
+
+export const aaveV1AssetsDefaultMarket = [
+  'aETH', 'aDAI', 'aUSDC', 'aSUSD', 'aTUSD', 'aUSDT', 'aBUSD', 'aBAT', 'aLEND',
+  'aLINK', 'aMANA', 'aMKR', 'aREP', 'aSNX', 'aWBTC', 'aZRX', 'aENJ', 'aREN', 'aYFI', 'aUNI', 'aAAVE',
+].map((symbol) => getAssetInfo(symbol));
+
+export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
+export const morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
+
+export const morphoAaveV3AssetEthMarket = ['ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT'];
+
+export const aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH'];
+export const aaveV3AssetsDefaultMarketOpt = [
+  'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
+];
+export const aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH'];
+export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH'];
+
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
+export const aaveV3AssetsDefaultMarket = {
+  [NetworkNumber.Eth]: aaveV3AssetsDefaultMarketEth,
+  [NetworkNumber.Opt]: aaveV3AssetsDefaultMarketOpt,
+  [NetworkNumber.Arb]: aaveV3AssetsDefaultMarketArb,
+  [NetworkNumber.Base]: aaveV3AssetsDefaultMarketBase,
+} as const;
+
+export const aaveV3AssetsLidoMarketEth = ['ETH', 'wstETH', 'USDS', 'USDC', 'ezETH', 'sUSDe', 'GHO', 'rsETH'];
+
+export const aaveV3AssetsLidoMarket = {
+  [NetworkNumber.Eth]: aaveV3AssetsLidoMarketEth,
+  [NetworkNumber.Opt]: [],
+  [NetworkNumber.Arb]: [],
+  [NetworkNumber.Base]: [],
+} as const;
+
+export const aaveV3AssetsEtherfiMarketEth = ['weETH', 'USDC', 'PYUSD', 'FRAX'];
+
+export const aaveV3AssetsEtherfiMarket = {
+  [NetworkNumber.Eth]: aaveV3AssetsEtherfiMarketEth,
+  [NetworkNumber.Opt]: [],
+  [NetworkNumber.Arb]: [],
+  [NetworkNumber.Base]: [],
 } as const;