@defisaver/positions-sdk 0.0.27 → 0.0.29

package/src/liquity/index.ts

@@ -1,117 +1,117 @@
-import Web3 from 'web3';
-import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
-import {
-  Blockish, EthAddress, NetworkNumber, PositionBalances,
-} from '../types/common';
-import {
-  LiquityActivePoolContract, LiquityCollSurplusPoolContract, LiquityPriceFeedContract, LiquityTroveManagerContract, LiquityViewContract,
-} from '../contracts';
-import { multicall } from '../multicall';
-import { LIQUITY_TROVE_STATUS_ENUM, LiquityTroveInfo } from '../types';
-import { ZERO_ADDRESS } from '../constants';
-
-export const LIQUITY_NORMAL_MODE_RATIO = 110; // MCR
-export const LIQUITY_RECOVERY_MODE_RATIO = 150; // CCR
-
-export const getLiquityAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
-  let balances: PositionBalances = {
-    collateral: {},
-    debt: {},
-  };
-
-  if (!address) {
-    return balances;
-  }
-
-  const viewContract = LiquityViewContract(web3, network, block);
-  const troveInfo = await viewContract.methods.getTroveInfo(address).call({}, block);
-
-  balances = {
-    collateral: {
-      [addressMapping ? getAssetInfo('ETH', network).address.toLowerCase() : 'ETH']: troveInfo[1],
-    },
-    debt: {
-      [addressMapping ? getAssetInfo('LUSD', network).address.toLowerCase() : 'LUSD']: troveInfo[2],
-    },
-  };
-
-  return balances;
-};
-
-const _getDebtInFront = async (viewContract: any, address: string, accumulatedSum = '0', iterations = 2000) => viewContract.methods.getDebtInFront(address, accumulatedSum, iterations).call();
-
-export const getDebtInFront = async (viewContract: any, address: string, accumulatedSum = '0', iterations = 2000): Promise<string> => {
-  const { debt, next } = await _getDebtInFront(viewContract, address, accumulatedSum, iterations);
-  if (next === ZERO_ADDRESS) return assetAmountInEth(debt, 'LUSD');
-  return getDebtInFront(viewContract, next, debt, iterations);
-};
-
-export const getLiquityTroveInfo = async (web3: Web3, network: NetworkNumber, address: string): Promise<LiquityTroveInfo> => {
-  const viewContract = LiquityViewContract(web3, network);
-  const collSurplusPoolContract = LiquityCollSurplusPoolContract(web3, network);
-  const troveManagerContract = LiquityTroveManagerContract(web3, network);
-  const priceFeedContract = LiquityPriceFeedContract(web3, network);
-  const activePoolContract = LiquityActivePoolContract(web3, network);
-
-  const multicallData = [
-    {
-      target: viewContract.options.address,
-      abiItem: viewContract.options.jsonInterface.find(({ name }) => name === 'getTroveInfo'),
-      params: [address],
-    },
-    {
-      target: collSurplusPoolContract.options.address,
-      abiItem: collSurplusPoolContract.options.jsonInterface.find(({ name }) => name === 'getCollateral'),
-      params: [address],
-    },
-    {
-      target: troveManagerContract.options.address,
-      abiItem: troveManagerContract.options.jsonInterface.find(({ name }) => name === 'getBorrowingRateWithDecay'),
-      params: [],
-    },
-    {
-      target: priceFeedContract.options.address,
-      abiItem: priceFeedContract.options.jsonInterface.find(({ name }) => name === 'fetchPrice'),
-      params: [],
-    },
-    {
-      target: activePoolContract.options.address,
-      abiItem: activePoolContract.options.jsonInterface.find(({ name }) => name === 'getETH'),
-      params: [],
-    },
-    {
-      target: activePoolContract.options.address,
-      abiItem: activePoolContract.options.jsonInterface.find(({ name }) => name === 'getLUSDDebt'),
-      params: [],
-    },
-  ];
-
-  const [multiRes, debtInFront] = await Promise.all([
-    multicall(multicallData, web3, network),
-    getDebtInFront(viewContract, address),
-  ]);
-
-  const recoveryMode = multiRes[0][6];
-  const totalETH = multiRes[4][0];
-  const totalLUSD = multiRes[5][0];
-
-  const payload = {
-    troveStatus: LIQUITY_TROVE_STATUS_ENUM[+multiRes[0][0].toString()],
-    collateral: assetAmountInEth(multiRes[0][1]),
-    debtInAsset: assetAmountInEth(multiRes[0][2]),
-    TCRatio: assetAmountInEth(multiRes[0][4]),
-    recoveryMode,
-    claimableCollateral: assetAmountInEth(multiRes[1][0]),
-    borrowingRateWithDecay: assetAmountInEth(multiRes[2][0]),
-    assetPrice: assetAmountInEth(multiRes[3][0]),
-    totalETH,
-    totalLUSD,
-    debtInFront,
-    minCollateralRatio: recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO,
-    priceForRecovery: new Dec(recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO).mul(totalLUSD).div(totalETH).div(100)
-      .toString(),
-  };
-
-  return payload;
+import Web3 from 'web3';
+import Dec from 'decimal.js';
+import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
+import {
+  Blockish, EthAddress, NetworkNumber, PositionBalances,
+} from '../types/common';
+import {
+  LiquityActivePoolContract, LiquityCollSurplusPoolContract, LiquityPriceFeedContract, LiquityTroveManagerContract, LiquityViewContract,
+} from '../contracts';
+import { multicall } from '../multicall';
+import { LIQUITY_TROVE_STATUS_ENUM, LiquityTroveInfo } from '../types';
+import { ZERO_ADDRESS } from '../constants';
+
+export const LIQUITY_NORMAL_MODE_RATIO = 110; // MCR
+export const LIQUITY_RECOVERY_MODE_RATIO = 150; // CCR
+
+export const getLiquityAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
+  let balances: PositionBalances = {
+    collateral: {},
+    debt: {},
+  };
+
+  if (!address) {
+    return balances;
+  }
+
+  const viewContract = LiquityViewContract(web3, network, block);
+  const troveInfo = await viewContract.methods.getTroveInfo(address).call({}, block);
+
+  balances = {
+    collateral: {
+      [addressMapping ? getAssetInfo('ETH', network).address.toLowerCase() : 'ETH']: troveInfo[1],
+    },
+    debt: {
+      [addressMapping ? getAssetInfo('LUSD', network).address.toLowerCase() : 'LUSD']: troveInfo[2],
+    },
+  };
+
+  return balances;
+};
+
+const _getDebtInFront = async (viewContract: any, address: string, accumulatedSum = '0', iterations = 2000) => viewContract.methods.getDebtInFront(address, accumulatedSum, iterations).call();
+
+export const getDebtInFront = async (viewContract: any, address: string, accumulatedSum = '0', iterations = 2000): Promise<string> => {
+  const { debt, next } = await _getDebtInFront(viewContract, address, accumulatedSum, iterations);
+  if (next === ZERO_ADDRESS) return assetAmountInEth(debt, 'LUSD');
+  return getDebtInFront(viewContract, next, debt, iterations);
+};
+
+export const getLiquityTroveInfo = async (web3: Web3, network: NetworkNumber, address: string): Promise<LiquityTroveInfo> => {
+  const viewContract = LiquityViewContract(web3, network);
+  const collSurplusPoolContract = LiquityCollSurplusPoolContract(web3, network);
+  const troveManagerContract = LiquityTroveManagerContract(web3, network);
+  const priceFeedContract = LiquityPriceFeedContract(web3, network);
+  const activePoolContract = LiquityActivePoolContract(web3, network);
+
+  const multicallData = [
+    {
+      target: viewContract.options.address,
+      abiItem: viewContract.options.jsonInterface.find(({ name }) => name === 'getTroveInfo'),
+      params: [address],
+    },
+    {
+      target: collSurplusPoolContract.options.address,
+      abiItem: collSurplusPoolContract.options.jsonInterface.find(({ name }) => name === 'getCollateral'),
+      params: [address],
+    },
+    {
+      target: troveManagerContract.options.address,
+      abiItem: troveManagerContract.options.jsonInterface.find(({ name }) => name === 'getBorrowingRateWithDecay'),
+      params: [],
+    },
+    {
+      target: priceFeedContract.options.address,
+      abiItem: priceFeedContract.options.jsonInterface.find(({ name }) => name === 'fetchPrice'),
+      params: [],
+    },
+    {
+      target: activePoolContract.options.address,
+      abiItem: activePoolContract.options.jsonInterface.find(({ name }) => name === 'getETH'),
+      params: [],
+    },
+    {
+      target: activePoolContract.options.address,
+      abiItem: activePoolContract.options.jsonInterface.find(({ name }) => name === 'getLUSDDebt'),
+      params: [],
+    },
+  ];
+
+  const [multiRes, debtInFront] = await Promise.all([
+    multicall(multicallData, web3, network),
+    getDebtInFront(viewContract, address),
+  ]);
+
+  const recoveryMode = multiRes[0][6];
+  const totalETH = multiRes[4][0];
+  const totalLUSD = multiRes[5][0];
+
+  const payload = {
+    troveStatus: LIQUITY_TROVE_STATUS_ENUM[+multiRes[0][0].toString()],
+    collateral: assetAmountInEth(multiRes[0][1]),
+    debtInAsset: assetAmountInEth(multiRes[0][2]),
+    TCRatio: assetAmountInEth(multiRes[0][4]),
+    recoveryMode,
+    claimableCollateral: assetAmountInEth(multiRes[1][0]),
+    borrowingRateWithDecay: assetAmountInEth(multiRes[2][0]),
+    assetPrice: assetAmountInEth(multiRes[3][0]),
+    totalETH,
+    totalLUSD,
+    debtInFront,
+    minCollateralRatio: recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO,
+    priceForRecovery: new Dec(recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO).mul(totalLUSD).div(totalETH).div(100)
+      .toString(),
+  };
+
+  return payload;
 };

package/src/maker/index.ts

@@ -1,102 +1,102 @@
-import Web3 from 'web3';
-import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo, ilkToAsset } from '@defisaver/tokens';
-import { Blockish, 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): Promise<PositionBalances> => {
-  let balances: PositionBalances = {
-    collateral: {},
-    debt: {},
-  };
-
-  if (!cdpId) {
-    return balances;
-  }
-
-  const viewContract = McdViewContract(web3, network, block);
-  // @ts-ignore
-  const cdpInfo = await viewContract.methods.getCdpInfo(cdpId).call({}, block);
-  const ilkInfo = await makerHelpers.getCollateralInfo(cdpInfo.ilk, web3, network, block);
-
-  const asset = wethToEth(ilkToAsset(cdpInfo.ilk));
-
-  balances = {
-    collateral: {
-      [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: asset === 'WBTC' ? new Dec(cdpInfo.collateral).div(1e10).floor().toString() : cdpInfo.collateral,
-    },
-    debt: {
-      [addressMapping ? getAssetInfo('DAI', network).address.toLowerCase() : 'DAI']: new Dec(cdpInfo.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, 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): Promise<PositionBalances> => {
+  let balances: PositionBalances = {
+    collateral: {},
+    debt: {},
+  };
+
+  if (!cdpId) {
+    return balances;
+  }
+
+  const viewContract = McdViewContract(web3, network, block);
+  // @ts-ignore
+  const cdpInfo = await viewContract.methods.getCdpInfo(cdpId).call({}, block);
+  const ilkInfo = await makerHelpers.getCollateralInfo(cdpInfo.ilk, web3, network, block);
+
+  const asset = wethToEth(ilkToAsset(cdpInfo.ilk));
+
+  balances = {
+    collateral: {
+      [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: asset === 'WBTC' ? new Dec(cdpInfo.collateral).div(1e10).floor().toString() : cdpInfo.collateral,
+    },
+    debt: {
+      [addressMapping ? getAssetInfo('DAI', network).address.toLowerCase() : 'DAI']: new Dec(cdpInfo.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,80 +1,80 @@
-import { getConfigContractAddress } from '../../contracts';
-import {
-  AaveMarketInfo, AaveVersions, MorphoAaveV2MarketInfo, MorphoAaveV3MarketInfo,
-} from '../../types';
-import { NetworkNumber } from '../../types/common';
-import {
-  aaveV2AssetsDefaultMarket, aaveV3AssetsDefaultMarket, morphoAaveV2AssetDefaultMarket, morphoAaveV3AssetEthMarket,
-} from './marketAssets';
-
-export const AAVE_V2: AaveMarketInfo = {
-  chainIds: [1],
-  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: '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 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),
-  lendingPool: 'MorphoAaveV3ProxyEthMarket',
-  lendingPoolAddress: getConfigContractAddress('MorphoAaveV3ProxyEthMarket', 1),
-  // icon: SvgAdapter(protocolIcons.morpho),
-  protocolName: 'morpho',
-});
-
-
-export const AaveMarkets = (networkId: NetworkNumber) => ({
-  [AaveVersions.AaveV2]: AAVE_V2,
-  [AaveVersions.AaveV3]: AAVE_V3(networkId),
-  [AaveVersions.MorphoAaveV3Eth]: MORPHO_AAVE_V3_ETH(networkId),
-  [AaveVersions.MorphoAaveV2]: MORPHO_AAVE_V2,
-}) as const;
+import { getConfigContractAddress } from '../../contracts';
+import {
+  AaveMarketInfo, AaveVersions, MorphoAaveV2MarketInfo, MorphoAaveV3MarketInfo,
+} from '../../types';
+import { NetworkNumber } from '../../types/common';
+import {
+  aaveV2AssetsDefaultMarket, aaveV3AssetsDefaultMarket, morphoAaveV2AssetDefaultMarket, morphoAaveV3AssetEthMarket,
+} from './marketAssets';
+
+export const AAVE_V2: AaveMarketInfo = {
+  chainIds: [1],
+  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: '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 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),
+  lendingPool: 'MorphoAaveV3ProxyEthMarket',
+  lendingPoolAddress: getConfigContractAddress('MorphoAaveV3ProxyEthMarket', 1),
+  // icon: SvgAdapter(protocolIcons.morpho),
+  protocolName: 'morpho',
+});
+
+
+export const AaveMarkets = (networkId: NetworkNumber) => ({
+  [AaveVersions.AaveV2]: AAVE_V2,
+  [AaveVersions.AaveV3]: AAVE_V3(networkId),
+  [AaveVersions.MorphoAaveV3Eth]: MORPHO_AAVE_V3_ETH(networkId),
+  [AaveVersions.MorphoAaveV2]: MORPHO_AAVE_V2,
+}) as const;