@defisaver/positions-sdk 0.0.201-fluid-dev-8 → 0.0.201-fluid-dev-10

package/esm/markets/fluid/index.js

@@ -1188,7 +1188,7 @@ export const WBTC_USDC_12_ARB = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Arb],
     label: 'WBTC / USDC Market 12',
     shortLabel: 'WBTC/USDC',
-    value: FluidArbitrumVersion.ARB_USDT_11_ARB,
+    value: FluidArbitrumVersion.WBTC_USDC_12_ARB,
     url: 'wbtc_usdc_12_arb',
     marketAddress: '0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB',
     hasSmartCollateral: false,
@@ -1206,7 +1206,7 @@ export const WBTC_USDT_13_ARB = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Arb],
     label: 'WBTC / USDT Market 13',
     shortLabel: 'WBTC/USDT',
-    value: FluidArbitrumVersion.ARB_USDT_11_ARB,
+    value: FluidArbitrumVersion.WBTC_USDT_13_ARB,
     url: 'wbtc_usdc_13_arb',
     marketAddress: '0x82B27fA821419F5689381b565a8B0786aA2548De',
     hasSmartCollateral: false,
@@ -1260,7 +1260,7 @@ export const WBTC_ETH_18_ARB = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Arb],
     label: 'WBTC / ETH Market 18',
     shortLabel: 'WBTC/ETH',
-    value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: FluidArbitrumVersion.WBTC_ETH_18_ARB,
     url: 'wbtc_eth_18_arb',
     marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
     hasSmartCollateral: false,
@@ -1278,7 +1278,7 @@ export const ETH_WBTC_19_ARB = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Arb],
     label: 'ETH / WBTC Market 19',
     shortLabel: 'ETH/WBTC',
-    value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: FluidArbitrumVersion.ETH_WBTC_19_ARB,
     url: 'eth_wbtc_19_arb',
     marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
     hasSmartCollateral: false,
@@ -1296,7 +1296,7 @@ export const WSTETH_WBTC_20_ARB = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Arb],
     label: 'wstETH / WBTC Market 20',
     shortLabel: 'wstETH/WBTC',
-    value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: FluidArbitrumVersion.WSTETH_WBTC_20_ARB,
     url: 'wsteth_wbtc_20_arb',
     marketAddress: '0x92643E964CA4b2c165a95CA919b0A819acA6D5F1',
     hasSmartCollateral: false,
@@ -1314,7 +1314,7 @@ export const WEETH_WBTC_21_ARB = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Arb],
     label: 'weETH / WBTC Market 21',
     shortLabel: 'weETH/WBTC',
-    value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: FluidArbitrumVersion.WEETH_WBTC_21_ARB,
     url: 'weeth_wbtc_21_arb',
     marketAddress: '0x6F72895Cf6904489Bcd862c941c3D02a3eE4f03e',
     hasSmartCollateral: false,
@@ -1332,7 +1332,7 @@ export const USDC_ETH_USDC_ETH_22_ARB = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Arb],
     label: 'weETH / WBTC Market 22',
     shortLabel: 'weETH/WBTC',
-    value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: FluidArbitrumVersion.USDC_ETH_USDC_ETH_22_ARB,
     url: 'usdc_eth_usdc_eth_22_arb',
     marketAddress: '0x3A0b7c8840D74D39552EF53F586dD8c3d1234C40',
     hasSmartCollateral: false,
@@ -1350,7 +1350,7 @@ export const ETH_USDC_USDT_23_ARB = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Arb],
     label: 'ETH / USDC-USDT Market 23',
     shortLabel: 'ETH/USDC-USDT',
-    value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: FluidArbitrumVersion.ETH_USDC_USDT_23_ARB,
     url: 'eth_usdc_usdt_23_arb',
     marketAddress: '0xaD439b9D61b25af1ca4Cd211E3eCb9AfBaAEd84a',
     hasSmartCollateral: false,
@@ -1368,7 +1368,7 @@ export const WSTETH_USDC_USDT_24_ARB = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Arb],
     label: 'wstETH / USDC-USDT Market 23',
     shortLabel: 'wstETH/USDC-USDT',
-    value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: FluidArbitrumVersion.WSTETH_USDC_USDT_24_ARB,
     url: 'wsteth_usdc_usdt_23_arb',
     marketAddress: '0x991416539E9DA46db233bCcbaEA38C4f852776D4',
     hasSmartCollateral: false,
@@ -1386,7 +1386,7 @@ export const WEETH_USDC_USDT_25_ARB = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Arb],
     label: 'weETH / USDC-USDT Market 25',
     shortLabel: 'weETH/USDC-USDT',
-    value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: FluidArbitrumVersion.WEETH_USDC_USDT_25_ARB,
     url: 'weeth_usdc_usdt_25_arb',
     marketAddress: '0x03271C337c86a6Fd89625A2820e48621DC2a128b',
     hasSmartCollateral: false,
@@ -1404,7 +1404,7 @@ export const WBTC_USDC_USDT_26_ARB = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Arb],
     label: 'WBTC / USDC-USDT Market 26',
     shortLabel: 'WBTC/USDC-USDT',
-    value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: FluidArbitrumVersion.WBTC_USDC_USDT_26_ARB,
     url: 'wbtc_usdc_usdt_26_arb',
     marketAddress: '0xF74cb9D69ada3559903149CFD60fD57cEAF95F30',
     hasSmartCollateral: false,

package/package.json

@@ -1,51 +1,51 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.201-fluid-dev-8",
-  "description": "",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./esm/index.d.ts",
-  "scripts": {
-    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
-    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-    "build": "npm run lint && npm run generate-contracts && npm run build:cjs && npm run build:esm",
-    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
-    "lint": "eslint src/ --fix",
-    "lint-check": "eslint src/",
-    "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
-    "test-single": "mocha ./tests/$npm_config_name.ts",
-    "test:debugger": "mocha --inspect-brk tests/*",
-    "build-test": "npm run build && npm run test",
-    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@types/lodash": "^4.17.15",
-    "@defisaver/tokens": "^1.5.55",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "decimal.js": "^10.4.3",
-    "lodash": "^4.17.21"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "@types/chai": "^5.0.0",
-    "@types/mocha": "^10.0.9",
-    "@types/web3": "^1.0.20",
-    "chai": "^4.3.8",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
-    "eslint-plugin-import": "^2.31.0",
-    "mocha": "^10.2.0",
-    "ts-node": "^10.9.2",
-    "typechain": "^8.3.1",
-    "typechain-target-web3-v1-3mihai3": "^6.0.2",
-    "typescript": "^5.2.2"
-  },
-  "peerDependencies": {
-    "web3": "^1.10.2"
-  }
-}
+{
+  "name": "@defisaver/positions-sdk",
+  "version": "0.0.201-fluid-dev-10",
+  "description": "",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
+  "scripts": {
+    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
+    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
+    "build": "npm run lint && npm run generate-contracts && npm run build:cjs && npm run build:esm",
+    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
+    "lint": "eslint src/ --fix",
+    "lint-check": "eslint src/",
+    "generate-contracts": "node scripts/generateContracts.js",
+    "test": "mocha tests/*",
+    "test-single": "mocha ./tests/$npm_config_name.ts",
+    "test:debugger": "mocha --inspect-brk tests/*",
+    "build-test": "npm run build && npm run test",
+    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@types/lodash": "^4.17.15",
+    "@defisaver/tokens": "^1.5.55",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "decimal.js": "^10.4.3",
+    "lodash": "^4.17.21"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "@types/chai": "^5.0.0",
+    "@types/mocha": "^10.0.9",
+    "@types/web3": "^1.0.20",
+    "chai": "^4.3.8",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.49.0",
+    "eslint-plugin-import": "^2.31.0",
+    "mocha": "^10.2.0",
+    "ts-node": "^10.9.2",
+    "typechain": "^8.3.1",
+    "typechain-target-web3-v1-3mihai3": "^6.0.2",
+    "typescript": "^5.2.2"
+  },
+  "peerDependencies": {
+    "web3": "^1.10.2"
+  }
+}

package/src/aaveV2/index.ts

@@ -1,227 +1,227 @@
-import Web3 from 'web3';
-import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
-import {
-  Blockish, EthAddress, NetworkNumber, PositionBalances,
-} from '../types/common';
-import { calculateNetApy, getStETHApy } from '../staking';
-import { ethToWeth, wethToEth, wethToEthByAddress } from '../services/utils';
-import { AaveLoanInfoV2Contract, createContractWrapper } from '../contracts';
-import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
-import {
-  AaveMarketInfo, AaveV2AssetData, AaveV2AssetsData, AaveV2PositionData, AaveV2UsedAsset, AaveV2UsedAssets,
-} from '../types';
-import { EMPTY_AAVE_DATA } from '../aaveV3';
-import { AAVE_V2 } from '../markets/aave';
-import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
-import { getEthPrice } from '../services/priceService';
-
-export const getAaveV2MarketsData = async (web3: Web3, network: NetworkNumber, selectedMarket: AaveMarketInfo, mainnetWeb3: Web3) => {
-  const ethPrice = await getEthPrice(web3);
-  const _addresses = selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address);
-  const loanInfoContract = AaveLoanInfoV2Contract(web3, network);
-  const marketAddress = selectedMarket.providerAddress;
-  const loanInfo = await loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call();
-  const markets = loanInfo
-    .map((market, i) => ({
-      symbol: selectedMarket.assets[i],
-      underlyingTokenAddress: market.underlyingTokenAddress,
-      supplyRate: aprToApy(new Dec(market.supplyRate.toString()).div(1e25).toString()),
-      borrowRate: aprToApy(new Dec(market.borrowRateVariable.toString()).div(1e25).toString()),
-      borrowRateStable: aprToApy(new Dec(market.borrowRateStable.toString()).div(1e25).toString()),
-      collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
-      liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
-      marketLiquidity: assetAmountInEth(new Dec(market.totalSupply.toString())
-        .sub(market.totalBorrow.toString())
-        .toString(), selectedMarket.assets[i]),
-      utilization: new Dec(market.totalBorrow.toString())
-        .div(new Dec(market.totalSupply.toString()))
-        .times(100)
-        .toString(),
-      usageAsCollateralEnabled: market.usageAsCollateralEnabled,
-      supplyCap: '0',
-      borrowCap: '0', // v2 doesnt have borrow cap but adding it for compatability with v3
-      totalSupply: assetAmountInEth(market.totalSupply.toString(), selectedMarket.assets[i]),
-      isInactive: !market.isActive,
-      isFrozen: market.isFrozen,
-      canBeBorrowed: market.isActive && market.borrowingEnabled && !market.isFrozen,
-      canBeSupplied: market.isActive && !market.isFrozen,
-      canBeWithdrawn: market.isActive,
-      canBePayBacked: market.isActive,
-      disabledStableBorrowing: !market.stableBorrowRateEnabled,
-      totalBorrow: assetAmountInEth(market.totalBorrow.toString(), selectedMarket.assets[i]),
-      totalBorrowVar: assetAmountInEth(market.totalBorrowVar.toString(), selectedMarket.assets[i]),
-      priceInEth: new Dec(market.price.toString()).div(1e18).toString(),
-      incentiveSupplyToken: 'AAVE',
-      incentiveBorrowToken: 'AAVE',
-      incentiveSupplyApy: '0',
-      price: new Dec(market.price.toString()).div(1e18).mul(ethPrice).toString(),
-    }));
-
-  const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
-  if (stEthMarket) {
-    stEthMarket.incentiveSupplyApy = await getStETHApy(mainnetWeb3);
-    stEthMarket.incentiveSupplyToken = 'stETH';
-  }
-
-  const payload: AaveV2AssetsData = {};
-  // Sort by market size
-  markets
-    .sort((a, b) => {
-      const aMarket = new Dec(a.price).times(a.totalSupply).toString();
-      const bMarket = new Dec(b.price).times(b.totalSupply).toString();
-
-      return new Dec(bMarket).minus(aMarket).toNumber();
-    })
-    .forEach((assetData: AaveV2AssetData, i) => {
-      payload[assetData.symbol] = { ...assetData, sortIndex: i };
-    });
-
-  return { assetsData: payload };
-};
-
-export const getAaveV2AccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
-  let balances: PositionBalances = {
-    collateral: {},
-    debt: {},
-  };
-
-  if (!address) {
-    return balances;
-  }
-
-  const market = AAVE_V2;
-
-  const loanInfoContract = AaveLoanInfoV2Contract(web3, network, block);
-
-  const marketAddress = market.providerAddress;
-  // @ts-ignore
-  const protocolDataProviderContract = createContractWrapper(web3, network, market.protocolData, market.protocolDataAddress);
-
-  const reserveTokens = await protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
-  const symbols = reserveTokens.map(({ symbol }: { symbol: string }) => symbol);
-  const _addresses = reserveTokens.map(({ tokenAddress }: { tokenAddress: EthAddress }) => tokenAddress);
-
-  const loanInfo = await loanInfoContract.methods.getTokenBalances(marketAddress, address, _addresses).call({}, block);
-
-  loanInfo.forEach((_tokenInfo: any, i: number) => {
-    const asset = wethToEth(symbols[i]);
-    const assetAddr = wethToEthByAddress(_addresses[i], network).toLowerCase();
-    const tokenInfo = { ..._tokenInfo };
-
-    // known bug: stETH leaves 1 wei on every transfer
-    if (asset === 'stETH' && tokenInfo.balance.toString() === '1') {
-      tokenInfo.balance = '0';
-    }
-
-    balances = {
-      collateral: {
-        ...balances.collateral,
-        [addressMapping ? assetAddr : asset]: tokenInfo.balance.toString(),
-      },
-      debt: {
-        ...balances.debt,
-        [addressMapping ? assetAddr : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString(),
-      },
-    };
-  });
-
-  return balances;
-};
-
-export const getAaveV2AccountData = async (web3: Web3, network: NetworkNumber, address: string, assetsData: AaveV2AssetsData, market: AaveMarketInfo): Promise<AaveV2PositionData> => {
-  if (!address) throw new Error('Address is required');
-
-  let payload: AaveV2PositionData = {
-    ...EMPTY_AAVE_DATA,
-    lastUpdated: Date.now(),
-  };
-
-  const loanInfoContract = AaveLoanInfoV2Contract(web3, network);
-  const marketAddress = market.providerAddress;
-  const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a)).address);
-  const loanInfo = await loanInfoContract.methods.getTokenBalances(marketAddress, address, _addresses).call();
-  const usedAssets = {} as AaveV2UsedAssets;
-  loanInfo.forEach((_tokenInfo, i) => {
-    const asset = market.assets[i];
-    const tokenInfo = { ..._tokenInfo };
-
-    // known bug: stETH leaves 1 wei on every transfer
-    if (asset === 'stETH' && tokenInfo.balance.toString() === '1') tokenInfo.balance = '0';
-
-    const isSupplied = tokenInfo.balance.toString() !== '0';
-    const isBorrowed = tokenInfo.borrowsStable.toString() !== '0' || tokenInfo.borrowsVariable.toString() !== '0';
-    if (!isSupplied && !isBorrowed) return;
-
-    const supplied = assetAmountInEth(tokenInfo.balance.toString(), asset);
-    const borrowedStable = assetAmountInEth(tokenInfo.borrowsStable.toString(), asset);
-    const borrowedVariable = assetAmountInEth(tokenInfo.borrowsVariable.toString(), asset);
-    const enabledAsCollateral = assetsData[asset].usageAsCollateralEnabled ? tokenInfo.enabledAsCollateral : false;
-    let interestMode;
-    if (borrowedVariable === '0' && borrowedStable !== '0') {
-      interestMode = '1';
-    } else if (borrowedVariable !== '0' && borrowedStable === '0') {
-      interestMode = '2';
-    } else {
-      interestMode = 'both';
-    }
-    if (!usedAssets[asset]) usedAssets[asset] = {} as AaveV2UsedAsset;
-    usedAssets[asset] = {
-      ...usedAssets[asset],
-      symbol: asset,
-      supplied,
-      suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(),
-      isSupplied,
-      collateral: enabledAsCollateral,
-      stableBorrowRate: aprToApy(new Dec(tokenInfo.stableBorrowRate).div(1e25).toString()),
-      borrowedStable,
-      borrowedVariable,
-      borrowedUsdStable: new Dec(borrowedStable).mul(assetsData[asset].price).toString(),
-      borrowedUsdVariable: new Dec(borrowedVariable).mul(assetsData[asset].price).toString(),
-      borrowed: new Dec(borrowedStable).add(borrowedVariable).toString(),
-      borrowedUsd: new Dec(new Dec(borrowedVariable).add(borrowedStable)).mul(assetsData[asset].price).toString(),
-      isBorrowed,
-      interestMode,
-    };
-  });
-  payload = {
-    ...payload,
-    usedAssets,
-    ...aaveAnyGetAggregatedPositionData({
-      usedAssets, assetsData, eModeCategory: 0, selectedMarket: market,
-    }),
-  };
-
-  payload.ratio = payload.borrowedUsd && payload.borrowedUsd !== '0'
-    ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString()
-    : '0';
-  payload.minRatio = '100';
-  payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
-    ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString()
-    : '0';
-
-  // Calculate borrow limits per asset
-  Object.values(payload.usedAssets).forEach((item) => {
-    if (item.isBorrowed) {
-      // eslint-disable-next-line no-param-reassign
-      item.stableLimit = calculateBorrowingAssetLimit(item.borrowedUsdStable, payload.borrowLimitUsd);
-      // eslint-disable-next-line no-param-reassign
-      item.variableLimit = calculateBorrowingAssetLimit(item.borrowedUsdVariable, payload.borrowLimitUsd);
-      // eslint-disable-next-line no-param-reassign
-      item.limit = calculateBorrowingAssetLimit(item.borrowedUsd, payload.borrowLimitUsd);
-    }
-  });
-
-  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({ usedAssets, assetsData });
-  payload.netApy = netApy;
-  payload.incentiveUsd = incentiveUsd;
-  payload.totalInterestUsd = totalInterestUsd;
-
-  return payload;
-};
-
-export const getAaveV2FullPositionData = async (web3: Web3, network: NetworkNumber, address: string, market: AaveMarketInfo, mainnetWeb3: Web3): Promise<AaveV2PositionData> => {
-  const marketData = await getAaveV2MarketsData(web3, network, market, mainnetWeb3);
-  const positionData = await getAaveV2AccountData(web3, network, address, marketData.assetsData, market);
-  return positionData;
-};
+import Web3 from 'web3';
+import Dec from 'decimal.js';
+import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
+import {
+  Blockish, EthAddress, NetworkNumber, PositionBalances,
+} from '../types/common';
+import { calculateNetApy, getStETHApy } from '../staking';
+import { ethToWeth, wethToEth, wethToEthByAddress } from '../services/utils';
+import { AaveLoanInfoV2Contract, createContractWrapper } from '../contracts';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
+import {
+  AaveMarketInfo, AaveV2AssetData, AaveV2AssetsData, AaveV2PositionData, AaveV2UsedAsset, AaveV2UsedAssets,
+} from '../types';
+import { EMPTY_AAVE_DATA } from '../aaveV3';
+import { AAVE_V2 } from '../markets/aave';
+import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
+import { getEthPrice } from '../services/priceService';
+
+export const getAaveV2MarketsData = async (web3: Web3, network: NetworkNumber, selectedMarket: AaveMarketInfo, mainnetWeb3: Web3) => {
+  const ethPrice = await getEthPrice(web3);
+  const _addresses = selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address);
+  const loanInfoContract = AaveLoanInfoV2Contract(web3, network);
+  const marketAddress = selectedMarket.providerAddress;
+  const loanInfo = await loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call();
+  const markets = loanInfo
+    .map((market, i) => ({
+      symbol: selectedMarket.assets[i],
+      underlyingTokenAddress: market.underlyingTokenAddress,
+      supplyRate: aprToApy(new Dec(market.supplyRate.toString()).div(1e25).toString()),
+      borrowRate: aprToApy(new Dec(market.borrowRateVariable.toString()).div(1e25).toString()),
+      borrowRateStable: aprToApy(new Dec(market.borrowRateStable.toString()).div(1e25).toString()),
+      collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
+      liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
+      marketLiquidity: assetAmountInEth(new Dec(market.totalSupply.toString())
+        .sub(market.totalBorrow.toString())
+        .toString(), selectedMarket.assets[i]),
+      utilization: new Dec(market.totalBorrow.toString())
+        .div(new Dec(market.totalSupply.toString()))
+        .times(100)
+        .toString(),
+      usageAsCollateralEnabled: market.usageAsCollateralEnabled,
+      supplyCap: '0',
+      borrowCap: '0', // v2 doesnt have borrow cap but adding it for compatability with v3
+      totalSupply: assetAmountInEth(market.totalSupply.toString(), selectedMarket.assets[i]),
+      isInactive: !market.isActive,
+      isFrozen: market.isFrozen,
+      canBeBorrowed: market.isActive && market.borrowingEnabled && !market.isFrozen,
+      canBeSupplied: market.isActive && !market.isFrozen,
+      canBeWithdrawn: market.isActive,
+      canBePayBacked: market.isActive,
+      disabledStableBorrowing: !market.stableBorrowRateEnabled,
+      totalBorrow: assetAmountInEth(market.totalBorrow.toString(), selectedMarket.assets[i]),
+      totalBorrowVar: assetAmountInEth(market.totalBorrowVar.toString(), selectedMarket.assets[i]),
+      priceInEth: new Dec(market.price.toString()).div(1e18).toString(),
+      incentiveSupplyToken: 'AAVE',
+      incentiveBorrowToken: 'AAVE',
+      incentiveSupplyApy: '0',
+      price: new Dec(market.price.toString()).div(1e18).mul(ethPrice).toString(),
+    }));
+
+  const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
+  if (stEthMarket) {
+    stEthMarket.incentiveSupplyApy = await getStETHApy(mainnetWeb3);
+    stEthMarket.incentiveSupplyToken = 'stETH';
+  }
+
+  const payload: AaveV2AssetsData = {};
+  // Sort by market size
+  markets
+    .sort((a, b) => {
+      const aMarket = new Dec(a.price).times(a.totalSupply).toString();
+      const bMarket = new Dec(b.price).times(b.totalSupply).toString();
+
+      return new Dec(bMarket).minus(aMarket).toNumber();
+    })
+    .forEach((assetData: AaveV2AssetData, i) => {
+      payload[assetData.symbol] = { ...assetData, sortIndex: i };
+    });
+
+  return { assetsData: payload };
+};
+
+export const getAaveV2AccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
+  let balances: PositionBalances = {
+    collateral: {},
+    debt: {},
+  };
+
+  if (!address) {
+    return balances;
+  }
+
+  const market = AAVE_V2;
+
+  const loanInfoContract = AaveLoanInfoV2Contract(web3, network, block);
+
+  const marketAddress = market.providerAddress;
+  // @ts-ignore
+  const protocolDataProviderContract = createContractWrapper(web3, network, market.protocolData, market.protocolDataAddress);
+
+  const reserveTokens = await protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
+  const symbols = reserveTokens.map(({ symbol }: { symbol: string }) => symbol);
+  const _addresses = reserveTokens.map(({ tokenAddress }: { tokenAddress: EthAddress }) => tokenAddress);
+
+  const loanInfo = await loanInfoContract.methods.getTokenBalances(marketAddress, address, _addresses).call({}, block);
+
+  loanInfo.forEach((_tokenInfo: any, i: number) => {
+    const asset = wethToEth(symbols[i]);
+    const assetAddr = wethToEthByAddress(_addresses[i], network).toLowerCase();
+    const tokenInfo = { ..._tokenInfo };
+
+    // known bug: stETH leaves 1 wei on every transfer
+    if (asset === 'stETH' && tokenInfo.balance.toString() === '1') {
+      tokenInfo.balance = '0';
+    }
+
+    balances = {
+      collateral: {
+        ...balances.collateral,
+        [addressMapping ? assetAddr : asset]: tokenInfo.balance.toString(),
+      },
+      debt: {
+        ...balances.debt,
+        [addressMapping ? assetAddr : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString(),
+      },
+    };
+  });
+
+  return balances;
+};
+
+export const getAaveV2AccountData = async (web3: Web3, network: NetworkNumber, address: string, assetsData: AaveV2AssetsData, market: AaveMarketInfo): Promise<AaveV2PositionData> => {
+  if (!address) throw new Error('Address is required');
+
+  let payload: AaveV2PositionData = {
+    ...EMPTY_AAVE_DATA,
+    lastUpdated: Date.now(),
+  };
+
+  const loanInfoContract = AaveLoanInfoV2Contract(web3, network);
+  const marketAddress = market.providerAddress;
+  const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a)).address);
+  const loanInfo = await loanInfoContract.methods.getTokenBalances(marketAddress, address, _addresses).call();
+  const usedAssets = {} as AaveV2UsedAssets;
+  loanInfo.forEach((_tokenInfo, i) => {
+    const asset = market.assets[i];
+    const tokenInfo = { ..._tokenInfo };
+
+    // known bug: stETH leaves 1 wei on every transfer
+    if (asset === 'stETH' && tokenInfo.balance.toString() === '1') tokenInfo.balance = '0';
+
+    const isSupplied = tokenInfo.balance.toString() !== '0';
+    const isBorrowed = tokenInfo.borrowsStable.toString() !== '0' || tokenInfo.borrowsVariable.toString() !== '0';
+    if (!isSupplied && !isBorrowed) return;
+
+    const supplied = assetAmountInEth(tokenInfo.balance.toString(), asset);
+    const borrowedStable = assetAmountInEth(tokenInfo.borrowsStable.toString(), asset);
+    const borrowedVariable = assetAmountInEth(tokenInfo.borrowsVariable.toString(), asset);
+    const enabledAsCollateral = assetsData[asset].usageAsCollateralEnabled ? tokenInfo.enabledAsCollateral : false;
+    let interestMode;
+    if (borrowedVariable === '0' && borrowedStable !== '0') {
+      interestMode = '1';
+    } else if (borrowedVariable !== '0' && borrowedStable === '0') {
+      interestMode = '2';
+    } else {
+      interestMode = 'both';
+    }
+    if (!usedAssets[asset]) usedAssets[asset] = {} as AaveV2UsedAsset;
+    usedAssets[asset] = {
+      ...usedAssets[asset],
+      symbol: asset,
+      supplied,
+      suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(),
+      isSupplied,
+      collateral: enabledAsCollateral,
+      stableBorrowRate: aprToApy(new Dec(tokenInfo.stableBorrowRate).div(1e25).toString()),
+      borrowedStable,
+      borrowedVariable,
+      borrowedUsdStable: new Dec(borrowedStable).mul(assetsData[asset].price).toString(),
+      borrowedUsdVariable: new Dec(borrowedVariable).mul(assetsData[asset].price).toString(),
+      borrowed: new Dec(borrowedStable).add(borrowedVariable).toString(),
+      borrowedUsd: new Dec(new Dec(borrowedVariable).add(borrowedStable)).mul(assetsData[asset].price).toString(),
+      isBorrowed,
+      interestMode,
+    };
+  });
+  payload = {
+    ...payload,
+    usedAssets,
+    ...aaveAnyGetAggregatedPositionData({
+      usedAssets, assetsData, eModeCategory: 0, selectedMarket: market,
+    }),
+  };
+
+  payload.ratio = payload.borrowedUsd && payload.borrowedUsd !== '0'
+    ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString()
+    : '0';
+  payload.minRatio = '100';
+  payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
+    ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString()
+    : '0';
+
+  // Calculate borrow limits per asset
+  Object.values(payload.usedAssets).forEach((item) => {
+    if (item.isBorrowed) {
+      // eslint-disable-next-line no-param-reassign
+      item.stableLimit = calculateBorrowingAssetLimit(item.borrowedUsdStable, payload.borrowLimitUsd);
+      // eslint-disable-next-line no-param-reassign
+      item.variableLimit = calculateBorrowingAssetLimit(item.borrowedUsdVariable, payload.borrowLimitUsd);
+      // eslint-disable-next-line no-param-reassign
+      item.limit = calculateBorrowingAssetLimit(item.borrowedUsd, payload.borrowLimitUsd);
+    }
+  });
+
+  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({ usedAssets, assetsData });
+  payload.netApy = netApy;
+  payload.incentiveUsd = incentiveUsd;
+  payload.totalInterestUsd = totalInterestUsd;
+
+  return payload;
+};
+
+export const getAaveV2FullPositionData = async (web3: Web3, network: NetworkNumber, address: string, market: AaveMarketInfo, mainnetWeb3: Web3): Promise<AaveV2PositionData> => {
+  const marketData = await getAaveV2MarketsData(web3, network, market, mainnetWeb3);
+  const positionData = await getAaveV2AccountData(web3, network, address, marketData.assetsData, market);
+  return positionData;
+};