@defisaver/positions-sdk 0.0.27 → 0.0.29

package/src/compoundV2/index.ts

@@ -1,220 +1,220 @@
-import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import Dec from 'decimal.js';
-import Web3 from 'web3';
-import { BLOCKS_IN_A_YEAR } from '../constants';
-import { aprToApy } from '../moneymarket';
-import { compareAddresses, handleWbtcLegacy, wethToEth } from '../services/utils';
-import {
-  Blockish, EthAddress, NetworkNumber, PositionBalances,
-} from '../types/common';
-import { CompoundLoanInfoContract, ComptrollerContract } from '../contracts';
-import { compoundV2CollateralAssets } from '../markets/compound/marketsAssets';
-import {
-  CompoundV2AssetsData, CompoundV2MarketsData, CompoundV2PositionData, CompoundV2UsedAsset, CompoundV2UsedAssets,
-} from '../types';
-import { getCompoundV2AggregatedData } from '../helpers/compoundHelpers';
-
-const compAddress = '0xc00e94cb662c3520282e6f5717214004a7f26888';
-
-export const getCompoundV2MarketsData = async (web3: Web3, network: NetworkNumber): Promise<CompoundV2MarketsData> => {
-  const cAddresses = compoundV2CollateralAssets.map(a => a.address);
-
-  const loanInfoContract = CompoundLoanInfoContract(web3, network);
-  const loanInfo = await loanInfoContract.methods.getFullTokensInfo(cAddresses).call();
-
-  const compPrice = loanInfo.find(m => compareAddresses(m.underlyingTokenAddress, compAddress))!.price.toString();
-
-  const assetsData = loanInfo
-    .map((market, i) => {
-      let symbol = getAssetInfoByAddress(cAddresses[i]).underlyingAsset;
-      let isWbtcLegacy = false;
-      const totalSupply = new Dec(market.totalSupply.toString()).div(1e18).times(market.exchangeRate.toString());
-      const totalBorrow = market.totalBorrow.toString();
-      const borrowCap = market.borrowCap.toString();
-      const compSupplySpeeds = market.compSupplySpeeds.toString();
-      const compBorrowSpeeds = market.compBorrowSpeeds.toString();
-      const assetPrice = market.price.toString();
-
-      const pricePrecisionDiff = 18 - getAssetInfo(getAssetInfoByAddress(cAddresses[i]).underlyingAsset).decimals;
-
-      // compSupplySpeeds/compBorrowSpeeds is per block per market (borrow & supply are separate markets)
-      const incentiveSupplyApy = aprToApy((100 * BLOCKS_IN_A_YEAR * +compSupplySpeeds * +compPrice) / +assetPrice / +totalSupply).toString();
-      const incentiveBorrowApy = aprToApy((100 * BLOCKS_IN_A_YEAR * +compBorrowSpeeds * +compPrice) / +assetPrice / +totalBorrow).toString();
-
-      if (cAddresses[i].toLowerCase() === '0xc11b1268c1a384e55c48c2391d8d480264a3a7f4'.toLowerCase()) {
-        symbol = 'WBTC Legacy';
-        isWbtcLegacy = true;
-      }
-      return {
-        symbol,
-        underlyingTokenAddress: market.underlyingTokenAddress,
-        supplyRate: aprToApy(new Dec(BLOCKS_IN_A_YEAR).times(market.supplyRate.toString()).div(1e16).toString()).toString(),
-        borrowRate: aprToApy(new Dec(BLOCKS_IN_A_YEAR).times(market.borrowRate.toString()).div(1e16).toString()).toString(),
-        incentiveSupplyToken: 'COMP',
-        incentiveBorrowToken: 'COMP',
-        incentiveSupplyApy,
-        incentiveBorrowApy,
-        collateralFactor: new Dec(market.collateralFactor.toString()).div(1e18).toString(),
-        marketLiquidity: assetAmountInEth(market.marketLiquidity.toString(), handleWbtcLegacy(symbol)),
-        utilization: new Dec(market.totalBorrow.toString()).div(totalSupply).times(100).toString(),
-        totalSupply: assetAmountInEth(totalSupply, handleWbtcLegacy(symbol)),
-        totalBorrow: assetAmountInEth(totalBorrow, handleWbtcLegacy(symbol)),
-        exchangeRate: new Dec(market.exchangeRate.toString()).div(1e28).toString(),
-        borrowCap: assetAmountInEth(borrowCap, handleWbtcLegacy(symbol)),
-        canBeBorrowed: market.canBorrow,
-        canBeSupplied: market.canMint,
-        price: new Dec(market.price.toString()).div(10 ** (18 + pricePrecisionDiff)).toString(),
-      };
-    });
-
-  const payload = {} as CompoundV2AssetsData;
-  // Sort by market size
-  assetsData
-    .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((market, i) => { payload[market.symbol] = { ...market, sortIndex: i }; });
-
-  return { assetsData: payload };
-};
-
-export const EMPTY_COMPOUND_DATA = {
-  usedAssets: {},
-  suppliedUsd: '0',
-  borrowedUsd: '0',
-  borrowLimitUsd: '0',
-  leftToBorrowUsd: '0',
-  ratio: '0',
-  minRatio: '0',
-  netApy: '0',
-  incentiveUsd: '0',
-  totalInterestUsd: '0',
-  borrowStableSupplyUnstable: false,
-};
-
-export const getCollateralAssetsAddresses = async (web3: Web3, network: NetworkNumber, account: string) => {
-  const contract = ComptrollerContract(web3, network);
-
-  return contract.methods.getAssetsIn(account).call();
-};
-
-export const getAllMarketAddresses = async (web3: Web3, network: NetworkNumber, block: Blockish) => {
-  const contract = ComptrollerContract(web3, network);
-
-  return contract.methods.getAllMarkets().call({}, block);
-};
-
-
-export const getCompoundV2AccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
-  let balances: PositionBalances = {
-    collateral: {},
-    debt: {},
-  };
-
-  if (!address) {
-    return balances;
-  }
-
-  const assets = await getAllMarketAddresses(web3, network, block);
-  const assetInfo = assets.map(a => getAssetInfoByAddress(a, network));
-  const loanInfoContract = CompoundLoanInfoContract(web3, network, block);
-  const loanInfo = await loanInfoContract.methods.getTokenBalances(address, assets).call({}, block);
-
-  loanInfo.balances.forEach((weiAmount: any, i: number) => {
-    const asset = wethToEth(
-      assetInfo[i].symbol === 'cWBTC Legacy'
-        ? `${assetInfo[i].underlyingAsset} Legacy`
-        : assetInfo[i].underlyingAsset,
-    );
-
-    balances = {
-      collateral: {
-        ...balances.collateral,
-        [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: weiAmount.toString(),
-      },
-    };
-  });
-  loanInfo.borrows.forEach((weiAmount: any, i: number) => {
-    const asset = wethToEth(
-      assetInfo[i].symbol === 'cWBTC Legacy'
-        ? `${assetInfo[i].underlyingAsset} Legacy`
-        : assetInfo[i].underlyingAsset,
-    );
-
-    balances = {
-      ...balances,
-      debt: {
-        ...balances.debt,
-        [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: weiAmount.toString(),
-      },
-    };
-  });
-
-  return balances;
-};
-
-export const getCompoundV2AccountData = async (web3: Web3, network: NetworkNumber, address: string, assetsData: CompoundV2AssetsData): Promise<CompoundV2PositionData> => {
-  if (!address) throw new Error('No address provided');
-
-  let payload = { ...EMPTY_COMPOUND_DATA, lastUpdated: Date.now() };
-
-  const loanInfoContract = CompoundLoanInfoContract(web3, network);
-  const loanInfo = await loanInfoContract.methods.getTokenBalances(address, compoundV2CollateralAssets.map(a => a.address)).call();
-  const collateralAssetsAddresses = await getCollateralAssetsAddresses(web3, network, address);
-
-  const usedAssets = {} as CompoundV2UsedAssets;
-
-  loanInfo.balances.forEach((weiAmount: string, i: number) => {
-    const asset = compoundV2CollateralAssets[i].symbol === 'cWBTC Legacy'
-      ? `${compoundV2CollateralAssets[i].underlyingAsset} Legacy`
-      : compoundV2CollateralAssets[i].underlyingAsset;
-    const amount = assetAmountInEth(weiAmount.toString(), asset);
-    const collateral = !!collateralAssetsAddresses.find(a => compareAddresses(a, compoundV2CollateralAssets[i].address));
-    if (weiAmount.toString() === '0' && !collateral) return;
-    if (!usedAssets[asset]) usedAssets[asset] = {} as CompoundV2UsedAsset;
-    usedAssets[asset] = {
-      ...usedAssets[asset],
-      symbol: asset,
-      supplied: amount,
-      suppliedUsd: new Dec(amount).mul(assetsData[handleWbtcLegacy(asset)].price).toString(),
-      isSupplied: +amount > 0,
-      collateral,
-    };
-  });
-
-  loanInfo.borrows.forEach((weiAmount, i) => {
-    if (weiAmount.toString() === '0') return;
-    const asset = compoundV2CollateralAssets[i].symbol === 'cWBTC Legacy'
-      ? `${compoundV2CollateralAssets[i].underlyingAsset} Legacy`
-      : compoundV2CollateralAssets[i].underlyingAsset;
-    const amount = assetAmountInEth(weiAmount.toString(), asset);
-    if (!usedAssets[asset]) usedAssets[asset] = {} as CompoundV2UsedAsset;
-    usedAssets[asset] = {
-      ...usedAssets[asset],
-      symbol: asset,
-      borrowed: amount,
-      borrowedUsd: new Dec(amount).mul(assetsData[handleWbtcLegacy(asset)].price).toString(),
-      isBorrowed: true,
-      collateral: !!usedAssets[asset].collateral,
-    };
-  });
-
-  payload = {
-    ...payload,
-    usedAssets,
-    ...getCompoundV2AggregatedData({
-      usedAssets, assetsData,
-    }),
-  };
-
-  return payload;
-};
-
-export const getCompoundV2FullPositionData = async (web3: Web3, network: NetworkNumber, address: string): Promise<CompoundV2PositionData> => {
-  const marketData = await getCompoundV2MarketsData(web3, network);
-  const positionData = await getCompoundV2AccountData(web3, network, address, marketData.assetsData);
-  return positionData;
+import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import Dec from 'decimal.js';
+import Web3 from 'web3';
+import { BLOCKS_IN_A_YEAR } from '../constants';
+import { aprToApy } from '../moneymarket';
+import { compareAddresses, handleWbtcLegacy, wethToEth } from '../services/utils';
+import {
+  Blockish, EthAddress, NetworkNumber, PositionBalances,
+} from '../types/common';
+import { CompoundLoanInfoContract, ComptrollerContract } from '../contracts';
+import { compoundV2CollateralAssets } from '../markets/compound/marketsAssets';
+import {
+  CompoundV2AssetsData, CompoundV2MarketsData, CompoundV2PositionData, CompoundV2UsedAsset, CompoundV2UsedAssets,
+} from '../types';
+import { getCompoundV2AggregatedData } from '../helpers/compoundHelpers';
+
+const compAddress = '0xc00e94cb662c3520282e6f5717214004a7f26888';
+
+export const getCompoundV2MarketsData = async (web3: Web3, network: NetworkNumber): Promise<CompoundV2MarketsData> => {
+  const cAddresses = compoundV2CollateralAssets.map(a => a.address);
+
+  const loanInfoContract = CompoundLoanInfoContract(web3, network);
+  const loanInfo = await loanInfoContract.methods.getFullTokensInfo(cAddresses).call();
+
+  const compPrice = loanInfo.find(m => compareAddresses(m.underlyingTokenAddress, compAddress))!.price.toString();
+
+  const assetsData = loanInfo
+    .map((market, i) => {
+      let symbol = getAssetInfoByAddress(cAddresses[i]).underlyingAsset;
+      let isWbtcLegacy = false;
+      const totalSupply = new Dec(market.totalSupply.toString()).div(1e18).times(market.exchangeRate.toString());
+      const totalBorrow = market.totalBorrow.toString();
+      const borrowCap = market.borrowCap.toString();
+      const compSupplySpeeds = market.compSupplySpeeds.toString();
+      const compBorrowSpeeds = market.compBorrowSpeeds.toString();
+      const assetPrice = market.price.toString();
+
+      const pricePrecisionDiff = 18 - getAssetInfo(getAssetInfoByAddress(cAddresses[i]).underlyingAsset).decimals;
+
+      // compSupplySpeeds/compBorrowSpeeds is per block per market (borrow & supply are separate markets)
+      const incentiveSupplyApy = aprToApy((100 * BLOCKS_IN_A_YEAR * +compSupplySpeeds * +compPrice) / +assetPrice / +totalSupply).toString();
+      const incentiveBorrowApy = aprToApy((100 * BLOCKS_IN_A_YEAR * +compBorrowSpeeds * +compPrice) / +assetPrice / +totalBorrow).toString();
+
+      if (cAddresses[i].toLowerCase() === '0xc11b1268c1a384e55c48c2391d8d480264a3a7f4'.toLowerCase()) {
+        symbol = 'WBTC Legacy';
+        isWbtcLegacy = true;
+      }
+      return {
+        symbol,
+        underlyingTokenAddress: market.underlyingTokenAddress,
+        supplyRate: aprToApy(new Dec(BLOCKS_IN_A_YEAR).times(market.supplyRate.toString()).div(1e16).toString()).toString(),
+        borrowRate: aprToApy(new Dec(BLOCKS_IN_A_YEAR).times(market.borrowRate.toString()).div(1e16).toString()).toString(),
+        incentiveSupplyToken: 'COMP',
+        incentiveBorrowToken: 'COMP',
+        incentiveSupplyApy,
+        incentiveBorrowApy,
+        collateralFactor: new Dec(market.collateralFactor.toString()).div(1e18).toString(),
+        marketLiquidity: assetAmountInEth(market.marketLiquidity.toString(), handleWbtcLegacy(symbol)),
+        utilization: new Dec(market.totalBorrow.toString()).div(totalSupply).times(100).toString(),
+        totalSupply: assetAmountInEth(totalSupply, handleWbtcLegacy(symbol)),
+        totalBorrow: assetAmountInEth(totalBorrow, handleWbtcLegacy(symbol)),
+        exchangeRate: new Dec(market.exchangeRate.toString()).div(1e28).toString(),
+        borrowCap: assetAmountInEth(borrowCap, handleWbtcLegacy(symbol)),
+        canBeBorrowed: market.canBorrow,
+        canBeSupplied: market.canMint,
+        price: new Dec(market.price.toString()).div(10 ** (18 + pricePrecisionDiff)).toString(),
+      };
+    });
+
+  const payload = {} as CompoundV2AssetsData;
+  // Sort by market size
+  assetsData
+    .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((market, i) => { payload[market.symbol] = { ...market, sortIndex: i }; });
+
+  return { assetsData: payload };
+};
+
+export const EMPTY_COMPOUND_DATA = {
+  usedAssets: {},
+  suppliedUsd: '0',
+  borrowedUsd: '0',
+  borrowLimitUsd: '0',
+  leftToBorrowUsd: '0',
+  ratio: '0',
+  minRatio: '0',
+  netApy: '0',
+  incentiveUsd: '0',
+  totalInterestUsd: '0',
+  borrowStableSupplyUnstable: false,
+};
+
+export const getCollateralAssetsAddresses = async (web3: Web3, network: NetworkNumber, account: string) => {
+  const contract = ComptrollerContract(web3, network);
+
+  return contract.methods.getAssetsIn(account).call();
+};
+
+export const getAllMarketAddresses = async (web3: Web3, network: NetworkNumber, block: Blockish) => {
+  const contract = ComptrollerContract(web3, network);
+
+  return contract.methods.getAllMarkets().call({}, block);
+};
+
+
+export const getCompoundV2AccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
+  let balances: PositionBalances = {
+    collateral: {},
+    debt: {},
+  };
+
+  if (!address) {
+    return balances;
+  }
+
+  const assets = await getAllMarketAddresses(web3, network, block);
+  const assetInfo = assets.map(a => getAssetInfoByAddress(a, network));
+  const loanInfoContract = CompoundLoanInfoContract(web3, network, block);
+  const loanInfo = await loanInfoContract.methods.getTokenBalances(address, assets).call({}, block);
+
+  loanInfo.balances.forEach((weiAmount: any, i: number) => {
+    const asset = wethToEth(
+      assetInfo[i].symbol === 'cWBTC Legacy'
+        ? `${assetInfo[i].underlyingAsset} Legacy`
+        : assetInfo[i].underlyingAsset,
+    );
+
+    balances = {
+      collateral: {
+        ...balances.collateral,
+        [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: weiAmount.toString(),
+      },
+    };
+  });
+  loanInfo.borrows.forEach((weiAmount: any, i: number) => {
+    const asset = wethToEth(
+      assetInfo[i].symbol === 'cWBTC Legacy'
+        ? `${assetInfo[i].underlyingAsset} Legacy`
+        : assetInfo[i].underlyingAsset,
+    );
+
+    balances = {
+      ...balances,
+      debt: {
+        ...balances.debt,
+        [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: weiAmount.toString(),
+      },
+    };
+  });
+
+  return balances;
+};
+
+export const getCompoundV2AccountData = async (web3: Web3, network: NetworkNumber, address: string, assetsData: CompoundV2AssetsData): Promise<CompoundV2PositionData> => {
+  if (!address) throw new Error('No address provided');
+
+  let payload = { ...EMPTY_COMPOUND_DATA, lastUpdated: Date.now() };
+
+  const loanInfoContract = CompoundLoanInfoContract(web3, network);
+  const loanInfo = await loanInfoContract.methods.getTokenBalances(address, compoundV2CollateralAssets.map(a => a.address)).call();
+  const collateralAssetsAddresses = await getCollateralAssetsAddresses(web3, network, address);
+
+  const usedAssets = {} as CompoundV2UsedAssets;
+
+  loanInfo.balances.forEach((weiAmount: string, i: number) => {
+    const asset = compoundV2CollateralAssets[i].symbol === 'cWBTC Legacy'
+      ? `${compoundV2CollateralAssets[i].underlyingAsset} Legacy`
+      : compoundV2CollateralAssets[i].underlyingAsset;
+    const amount = assetAmountInEth(weiAmount.toString(), asset);
+    const collateral = !!collateralAssetsAddresses.find(a => compareAddresses(a, compoundV2CollateralAssets[i].address));
+    if (weiAmount.toString() === '0' && !collateral) return;
+    if (!usedAssets[asset]) usedAssets[asset] = {} as CompoundV2UsedAsset;
+    usedAssets[asset] = {
+      ...usedAssets[asset],
+      symbol: asset,
+      supplied: amount,
+      suppliedUsd: new Dec(amount).mul(assetsData[handleWbtcLegacy(asset)].price).toString(),
+      isSupplied: +amount > 0,
+      collateral,
+    };
+  });
+
+  loanInfo.borrows.forEach((weiAmount, i) => {
+    if (weiAmount.toString() === '0') return;
+    const asset = compoundV2CollateralAssets[i].symbol === 'cWBTC Legacy'
+      ? `${compoundV2CollateralAssets[i].underlyingAsset} Legacy`
+      : compoundV2CollateralAssets[i].underlyingAsset;
+    const amount = assetAmountInEth(weiAmount.toString(), asset);
+    if (!usedAssets[asset]) usedAssets[asset] = {} as CompoundV2UsedAsset;
+    usedAssets[asset] = {
+      ...usedAssets[asset],
+      symbol: asset,
+      borrowed: amount,
+      borrowedUsd: new Dec(amount).mul(assetsData[handleWbtcLegacy(asset)].price).toString(),
+      isBorrowed: true,
+      collateral: !!usedAssets[asset].collateral,
+    };
+  });
+
+  payload = {
+    ...payload,
+    usedAssets,
+    ...getCompoundV2AggregatedData({
+      usedAssets, assetsData,
+    }),
+  };
+
+  return payload;
+};
+
+export const getCompoundV2FullPositionData = async (web3: Web3, network: NetworkNumber, address: string): Promise<CompoundV2PositionData> => {
+  const marketData = await getCompoundV2MarketsData(web3, network);
+  const positionData = await getCompoundV2AccountData(web3, network, address, marketData.assetsData);
+  return positionData;
 };