@defisaver/positions-sdk 0.0.96 → 0.0.98

package/src/morphoBlue/index.ts

@@ -1,162 +1,199 @@
-import Web3 from 'web3';
-import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import { MMUsedAssets, NetworkNumber } from '../types/common';
-import {
-  FeedRegistryContract,
-  MorphoBlueViewContract,
-} from '../contracts';
-import {
-  MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
-} from '../types';
-import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
-import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { wethToEth } from '../services/utils';
-import { getMorphoBlueAggregatedPositionData } from '../helpers/morphoBlueHelpers';
-
-
-const compound = (ratePerSeconds: string) => {
-  const compounding = new Dec(ratePerSeconds).mul(SECONDS_PER_YEAR).toString();
-  const apyNumber = Math.expm1(new Dec(compounding).div(WAD).toNumber());
-  return new Dec(apyNumber).mul(WAD).floor().toString();
-};
-
-const getSupplyRate = (totalSupplyAssets: string, totalBorrowAssets: string, borrowRate: string, fee: string) => {
-  if (totalBorrowAssets === '0' || totalSupplyAssets === '0') {
-    return 0;
-  }
-  const utillization = new Dec(totalBorrowAssets).mul(WAD).div(totalSupplyAssets).ceil()
-    .toString();
-  const supplyRate = new Dec(utillization).mul(borrowRate).div(WAD).ceil()
-    .toString();
-  const ratePerSecond = new Dec(supplyRate).mul(new Dec(WAD).minus(fee)).div(WAD).ceil()
-    .toString();
-  return compound(ratePerSecond);
-};
-
-const getBorrowRate = (borrowRate: string, totalBorrowShares: string) => {
-  if (totalBorrowShares === '0') {
-    return 0;
-  }
-  return compound(borrowRate);
-};
-
-
-export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, mainnetWeb3: Web3): Promise<MorphoBlueMarketInfo> {
-  const {
-    loanToken, collateralToken, oracle, irm, lltv, oracleType,
-  } = selectedMarket;
-  const lltvInWei = new Dec(lltv).mul(WAD).toString();
-  const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
-  const collateralTokenInfo = getAssetInfoByAddress(collateralToken, network);
-  let loanTokenFeedAddress = loanTokenInfo.addresses[NetworkNumber.Eth];
-  if (loanTokenInfo.symbol === 'WETH') {
-    const ethAddress = getAssetInfo('ETH').address;
-    loanTokenFeedAddress = ethAddress;
-  }
-
-  const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
-  const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
-
-  const [loanTokenPrice, marketInfo] = await Promise.all([
-    loanTokenInfo.symbol === 'USDA' ? '100000000' : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
-    morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
-  ]);
-
-  const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
-  const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
-  const utillization = new Dec(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
-
-  const oracleScaleFactor = new Dec(36).add(loanTokenInfo.decimals).sub(collateralTokenInfo.decimals).toString();
-  const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
-
-  const scale = new Dec(10).pow(loanTokenInfo.decimals).toString();
-
-  const oracleRate = new Dec(marketInfo.oracle).div(oracleScale).toString();
-  const assetsData: MorphoBlueAssetsData = {};
-  assetsData[wethToEth(loanTokenInfo.symbol)] = {
-    symbol: wethToEth(loanTokenInfo.symbol),
-    address: loanToken,
-    price: new Dec(loanTokenPrice).div(1e8).toString(),
-    supplyRate: new Dec(supplyRate).div(WAD).mul(100).toString(),
-    borrowRate: new Dec(compoundedBorrowRate).div(WAD).mul(100).toString(),
-    totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
-    totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
-    canBeSupplied: true,
-    canBeBorrowed: true,
-  };
-
-  assetsData[wethToEth(collateralTokenInfo.symbol)] = {
-    symbol: wethToEth(collateralTokenInfo.symbol),
-    address: collateralToken,
-    price: new Dec(assetsData[wethToEth(loanTokenInfo.symbol)].price).mul(oracleRate).toString(),
-    supplyRate: '0',
-    borrowRate: '0',
-    canBeSupplied: true,
-    canBeBorrowed: false,
-  };
-  if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
-    assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = await getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
-    assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
-  }
-
-  return {
-    id: marketInfo.id,
-    fee: new Dec(marketInfo.fee).div(WAD).toString(),
-    loanToken: wethToEth(loanTokenInfo.symbol),
-    collateralToken: wethToEth(collateralTokenInfo.symbol),
-    utillization,
-    oracle: oracleRate,
-    oracleType,
-    lltv: new Dec(lltv).toString(),
-    minRatio: new Dec(1).div(lltv).mul(100).toString(),
-    assetsData,
-  };
-}
-
-export async function getMorphoBlueAccountData(web3: Web3, network: NetworkNumber, account: string, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData> {
-  const {
-    loanToken, collateralToken, oracle, irm, lltv,
-  } = selectedMarket;
-  const lltvInWei = new Dec(lltv).mul(WAD).toString();
-  const marketObject = {
-    loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
-  };
-  const viewContract = MorphoBlueViewContract(web3, network);
-  const loanInfo = await viewContract.methods.getUserInfo(marketObject, account).call();
-  const usedAssets: MMUsedAssets = {};
-
-  const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
-  const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets, marketInfo.loanToken);
-  const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets, marketInfo.loanToken);
-  usedAssets[marketInfo.loanToken] = {
-    symbol: loanTokenInfo.symbol,
-    supplied: loanTokenSupplied,
-    borrowed: loanTokenBorrowed,
-    isSupplied: new Dec(loanInfo.suppliedInAssets).gt(0),
-    isBorrowed: new Dec(loanInfo.borrowedInAssets).gt(0),
-    collateral: false,
-    suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
-    borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
-  };
-
-  const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
-  const collateralTokenSupplied = assetAmountInEth(loanInfo.collateral, marketInfo.collateralToken);
-  usedAssets[marketInfo.collateralToken] = {
-    symbol: collateralTokenInfo.symbol,
-    supplied: collateralTokenSupplied,
-    borrowed: '0',
-    isSupplied: new Dec(loanInfo.collateral).gt(0),
-    isBorrowed: false,
-    collateral: true,
-    suppliedUsd: new Dec(collateralTokenSupplied).mul(collateralTokenInfo.price).toString(),
-    borrowedUsd: '0',
-  };
-
-  return {
-    supplyShares: loanInfo.supplyShares,
-    borrowShares: loanInfo.borrowShares,
-    usedAssets,
-    ...getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }),
-  };
-}
+import Web3 from 'web3';
+import Dec from 'decimal.js';
+import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import {
+  Blockish, EthAddress, MMUsedAssets, NetworkNumber, PositionBalances,
+} from '../types/common';
+import {
+  FeedRegistryContract,
+  MorphoBlueViewContract,
+} from '../contracts';
+import {
+  MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
+} from '../types';
+import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
+import { wethToEth } from '../services/utils';
+import { getMorphoBlueAggregatedPositionData } from '../helpers/morphoBlueHelpers';
+
+
+const compound = (ratePerSeconds: string) => {
+  const compounding = new Dec(ratePerSeconds).mul(SECONDS_PER_YEAR).toString();
+  const apyNumber = Math.expm1(new Dec(compounding).div(WAD).toNumber());
+  return new Dec(apyNumber).mul(WAD).floor().toString();
+};
+
+const getSupplyRate = (totalSupplyAssets: string, totalBorrowAssets: string, borrowRate: string, fee: string) => {
+  if (totalBorrowAssets === '0' || totalSupplyAssets === '0') {
+    return 0;
+  }
+  const utillization = new Dec(totalBorrowAssets).mul(WAD).div(totalSupplyAssets).ceil()
+    .toString();
+  const supplyRate = new Dec(utillization).mul(borrowRate).div(WAD).ceil()
+    .toString();
+  const ratePerSecond = new Dec(supplyRate).mul(new Dec(WAD).minus(fee)).div(WAD).ceil()
+    .toString();
+  return compound(ratePerSecond);
+};
+
+const getBorrowRate = (borrowRate: string, totalBorrowShares: string) => {
+  if (totalBorrowShares === '0') {
+    return 0;
+  }
+  return compound(borrowRate);
+};
+
+
+export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, mainnetWeb3: Web3): Promise<MorphoBlueMarketInfo> {
+  const {
+    loanToken, collateralToken, oracle, irm, lltv, oracleType,
+  } = selectedMarket;
+  const lltvInWei = new Dec(lltv).mul(WAD).toString();
+  const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
+  const collateralTokenInfo = getAssetInfoByAddress(collateralToken, network);
+  let loanTokenFeedAddress = loanTokenInfo.addresses[NetworkNumber.Eth];
+  if (loanTokenInfo.symbol === 'WETH') {
+    const ethAddress = getAssetInfo('ETH').address;
+    loanTokenFeedAddress = ethAddress;
+  }
+
+  const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
+  const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
+
+  const [loanTokenPrice, marketInfo] = await Promise.all([
+    loanTokenInfo.symbol === 'USDA' ? '100000000' : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
+    morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
+  ]);
+
+  const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
+  const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
+  const utillization = new Dec(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
+
+  const oracleScaleFactor = new Dec(36).add(loanTokenInfo.decimals).sub(collateralTokenInfo.decimals).toString();
+  const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
+
+  const scale = new Dec(10).pow(loanTokenInfo.decimals).toString();
+
+  const oracleRate = new Dec(marketInfo.oracle).div(oracleScale).toString();
+  const assetsData: MorphoBlueAssetsData = {};
+  assetsData[wethToEth(loanTokenInfo.symbol)] = {
+    symbol: wethToEth(loanTokenInfo.symbol),
+    address: loanToken,
+    price: new Dec(loanTokenPrice).div(1e8).toString(),
+    supplyRate: new Dec(supplyRate).div(WAD).mul(100).toString(),
+    borrowRate: new Dec(compoundedBorrowRate).div(WAD).mul(100).toString(),
+    totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
+    totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
+    canBeSupplied: true,
+    canBeBorrowed: true,
+  };
+
+  assetsData[wethToEth(collateralTokenInfo.symbol)] = {
+    symbol: wethToEth(collateralTokenInfo.symbol),
+    address: collateralToken,
+    price: new Dec(assetsData[wethToEth(loanTokenInfo.symbol)].price).mul(oracleRate).toString(),
+    supplyRate: '0',
+    borrowRate: '0',
+    canBeSupplied: true,
+    canBeBorrowed: false,
+  };
+  if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
+    assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = await getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
+    assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
+  }
+
+  return {
+    id: marketInfo.id,
+    fee: new Dec(marketInfo.fee).div(WAD).toString(),
+    loanToken: wethToEth(loanTokenInfo.symbol),
+    collateralToken: wethToEth(collateralTokenInfo.symbol),
+    utillization,
+    oracle: oracleRate,
+    oracleType,
+    lltv: new Dec(lltv).toString(),
+    minRatio: new Dec(1).div(lltv).mul(100).toString(),
+    assetsData,
+  };
+}
+
+export const getMorphoBlueAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData): Promise<PositionBalances> => {
+  let balances: PositionBalances = {
+    collateral: {},
+    debt: {},
+  };
+
+  if (!address) {
+    return balances;
+  }
+
+  const viewContract = MorphoBlueViewContract(web3, network, block);
+  const {
+    loanToken, collateralToken, oracle, irm, lltv,
+  } = selectedMarket;
+  const lltvInWei = new Dec(lltv).mul(WAD).toString();
+  const marketObject = {
+    loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
+  };
+
+  const loanInfo = await viewContract.methods.getUserInfo(marketObject, address).call({}, block);
+  const loanTokenInfo = getAssetInfoByAddress(selectedMarket.loanToken, network);
+  const collateralTokenInfo = getAssetInfoByAddress(selectedMarket.collateralToken, network);
+
+  balances = {
+    collateral: {
+      [addressMapping ? collateralTokenInfo.address.toLowerCase() : wethToEth(collateralTokenInfo.symbol)]: assetAmountInEth(loanInfo.collateral, collateralTokenInfo.symbol),
+    },
+    debt: {
+      [addressMapping ? loanTokenInfo.address.toLowerCase() : wethToEth(loanTokenInfo.symbol)]: assetAmountInEth(loanInfo.borrowedInAssets, loanTokenInfo.symbol),
+    },
+  };
+
+  return balances;
+};
+
+export async function getMorphoBlueAccountData(web3: Web3, network: NetworkNumber, account: string, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData> {
+  const {
+    loanToken, collateralToken, oracle, irm, lltv,
+  } = selectedMarket;
+  const lltvInWei = new Dec(lltv).mul(WAD).toString();
+  const marketObject = {
+    loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
+  };
+  const viewContract = MorphoBlueViewContract(web3, network);
+  const loanInfo = await viewContract.methods.getUserInfo(marketObject, account).call();
+  const usedAssets: MMUsedAssets = {};
+
+  const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
+  const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets, marketInfo.loanToken);
+  const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets, marketInfo.loanToken);
+  usedAssets[marketInfo.loanToken] = {
+    symbol: loanTokenInfo.symbol,
+    supplied: loanTokenSupplied,
+    borrowed: loanTokenBorrowed,
+    isSupplied: new Dec(loanInfo.suppliedInAssets).gt(0),
+    isBorrowed: new Dec(loanInfo.borrowedInAssets).gt(0),
+    collateral: false,
+    suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
+    borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
+  };
+
+  const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
+  const collateralTokenSupplied = assetAmountInEth(loanInfo.collateral, marketInfo.collateralToken);
+  usedAssets[marketInfo.collateralToken] = {
+    symbol: collateralTokenInfo.symbol,
+    supplied: collateralTokenSupplied,
+    borrowed: '0',
+    isSupplied: new Dec(loanInfo.collateral).gt(0),
+    isBorrowed: false,
+    collateral: true,
+    suppliedUsd: new Dec(collateralTokenSupplied).mul(collateralTokenInfo.price).toString(),
+    borrowedUsd: '0',
+  };
+
+  return {
+    supplyShares: loanInfo.supplyShares,
+    borrowShares: loanInfo.borrowShares,
+    usedAssets,
+    ...getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }),
+  };
+}

package/src/multicall/index.ts

@@ -1,23 +1,23 @@
-import Web3 from 'web3';
-import { UniMulticallContract } from '../contracts';
-import { NetworkNumber } from '../types/common';
-
-export const multicall = async (calls: any[], web3: Web3, network: NetworkNumber = NetworkNumber.Eth, blockNumber: 'latest' | number = 'latest') => {
-  const multicallContract = UniMulticallContract(web3, network);
-  const formattedCalls = calls.map((call) => {
-    const callData = web3.eth.abi.encodeFunctionCall(call.abiItem, call.params);
-    return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1e6 };
-  });
-  const callResult = await multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, blockNumber);
-
-  let formattedResult: any[] = [];
-
-  callResult.returnData.forEach(([success, gasUsed, result], i) => {
-    const formattedRes = result !== '0x'
-      ? web3.eth.abi.decodeParameters(calls[i].abiItem.outputs, result)
-      : undefined;
-    formattedResult = [...formattedResult, formattedRes];
-  });
-
-  return formattedResult;
+import Web3 from 'web3';
+import { UniMulticallContract } from '../contracts';
+import { NetworkNumber } from '../types/common';
+
+export const multicall = async (calls: any[], web3: Web3, network: NetworkNumber = NetworkNumber.Eth, blockNumber: 'latest' | number = 'latest') => {
+  const multicallContract = UniMulticallContract(web3, network);
+  const formattedCalls = calls.map((call) => {
+    const callData = web3.eth.abi.encodeFunctionCall(call.abiItem, call.params);
+    return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1e6 };
+  });
+  const callResult = await multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, blockNumber);
+
+  let formattedResult: any[] = [];
+
+  callResult.returnData.forEach(([success, gasUsed, result], i) => {
+    const formattedRes = result !== '0x'
+      ? web3.eth.abi.decodeParameters(calls[i].abiItem.outputs, result)
+      : undefined;
+    formattedResult = [...formattedResult, formattedRes];
+  });
+
+  return formattedResult;
 };

package/src/services/dsrService.ts

@@ -1,16 +1,16 @@
-import Dec from 'decimal.js';
-import Web3 from 'web3';
-import { NetworkNumber } from '../types/common';
-import { SECONDS_PER_YEAR } from '../constants';
-import { PotContract } from '../contracts';
-
-
-export const getDsrApy = async (web3: Web3, network: NetworkNumber) => {
-  const potContract = PotContract(web3, network);
-  return new Dec(await potContract.methods.dsr().call())
-    .div(new Dec(1e27))
-    .pow(SECONDS_PER_YEAR)
-    .sub(1)
-    .mul(100)
-    .toString();
+import Dec from 'decimal.js';
+import Web3 from 'web3';
+import { NetworkNumber } from '../types/common';
+import { SECONDS_PER_YEAR } from '../constants';
+import { PotContract } from '../contracts';
+
+
+export const getDsrApy = async (web3: Web3, network: NetworkNumber) => {
+  const potContract = PotContract(web3, network);
+  return new Dec(await potContract.methods.dsr().call())
+    .div(new Dec(1e27))
+    .pow(SECONDS_PER_YEAR)
+    .sub(1)
+    .mul(100)
+    .toString();
 };

package/src/services/priceService.ts

@@ -1,22 +1,22 @@
-import Web3 from 'web3';
-import Dec from 'decimal.js';
-import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract } from '../contracts';
-import { NetworkNumber } from '../types/common';
-
-export const getEthPrice = async (web3: Web3) => {
-  const contract = ETHPriceFeedContract(web3, NetworkNumber.Eth);
-  const price = await contract.methods.latestAnswer().call();
-  return new Dec(price).div(1e8).toString();
-};
-
-export const getUSDCPrice = async (web3: Web3) => {
-  const contract = USDCPriceFeedContract(web3, NetworkNumber.Eth);
-  const price = await contract.methods.latestAnswer().call();
-  return new Dec(price).div(1e8).toString();
-};
-
-export const getCompPrice = async (web3: Web3) => {
-  const contract = COMPPriceFeedContract(web3, NetworkNumber.Eth);
-  const price = await contract.methods.latestAnswer().call();
-  return new Dec(price).div(1e8).toString();
+import Web3 from 'web3';
+import Dec from 'decimal.js';
+import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract } from '../contracts';
+import { NetworkNumber } from '../types/common';
+
+export const getEthPrice = async (web3: Web3) => {
+  const contract = ETHPriceFeedContract(web3, NetworkNumber.Eth);
+  const price = await contract.methods.latestAnswer().call();
+  return new Dec(price).div(1e8).toString();
+};
+
+export const getUSDCPrice = async (web3: Web3) => {
+  const contract = USDCPriceFeedContract(web3, NetworkNumber.Eth);
+  const price = await contract.methods.latestAnswer().call();
+  return new Dec(price).div(1e8).toString();
+};
+
+export const getCompPrice = async (web3: Web3) => {
+  const contract = COMPPriceFeedContract(web3, NetworkNumber.Eth);
+  const price = await contract.methods.latestAnswer().call();
+  return new Dec(price).div(1e8).toString();
 };

package/src/services/utils.ts

@@ -1,51 +1,51 @@
-import Dec from 'decimal.js';
-import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import { NetworkNumber } from '../types/common';
-
-export const isLayer2Network = (networkId: NetworkNumber) => [10, 42161, 8453].includes(+networkId);
-
-export const addToObjectIf = (condition: any, item: any) => (condition ? item : {});
-
-export const ethToWeth = (maybeEth: any) => maybeEth?.replace(/^ETH$/, 'WETH');
-
-export const wethToEth = (maybeWeth: any) => maybeWeth?.replace(/^WETH$/, 'ETH');
-
-export const stEthToWstEth = (maybeStEth: any) => maybeStEth?.replace(/^stETH$/, 'wstETH');
-
-export const wstEthToStEth = (maybeStEth: any) => maybeStEth?.replace(/^wstETH$/, 'stETH');
-
-export const getAbiItem = (abi: any, methodName: string) => abi.find((i: any) => i.name === methodName);
-
-export const ADDRESS_REGEX = /0x[0-9a-fA-F]{40}/;
-export const isAddress = (address: string) => typeof address === 'string' && (new RegExp(ADDRESS_REGEX).test(address));
-
-export const compareAddresses = (addr1 = '', addr2 = '') => addr1.toLowerCase() === addr2.toLowerCase();
-
-export const getWeiAmountForDecimals = (amount: string | number, decimals: number) => new Dec(amount).mul(10 ** decimals).floor().toString();
-
-export const getEthAmountForDecimals = (amount: string | number, decimals: string | number) => new Dec(amount).div(10 ** +decimals).toString();
-
-export const handleWbtcLegacy = (asset: string) => (asset === 'WBTC Legacy' ? 'WBTC' : asset);
-
-export const wethToEthByAddress = (maybeWethAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(wethToEth(getAssetInfoByAddress(maybeWethAddr, chainId).symbol), chainId).address;
-
-export const ethToWethByAddress = (maybeEthAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(ethToWeth(getAssetInfoByAddress(maybeEthAddr, chainId).symbol), chainId).address;
-
-export const bytesToString = (hex: string) => Buffer.from(hex.replace(/^0x/, ''), 'hex')
-  .toString()
-  // eslint-disable-next-line no-control-regex
-  .replace(/\x00/g, '');
-
-/**
- * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
- */
-export const mapRange = (input: number | string, minInput: number | string, maxInput: number | string, minOutput:number | string, maxOutput: number | string) => {
-  // slope = 1.0 * (output_end - output_start) / (input_end - input_start)
-  const inputDiff = new Dec(maxInput).minus(minInput);
-  const outputDiff = new Dec(maxOutput).minus(minOutput);
-  const slope = new Dec(outputDiff).div(inputDiff);
-
-  // output = output_start + slope * (input - input_start)
-  return new Dec(minOutput).plus(new Dec(slope).mul(new Dec(input).minus(minInput))).toDP(2).toNumber();
-};
-
+import Dec from 'decimal.js';
+import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { NetworkNumber } from '../types/common';
+
+export const isLayer2Network = (networkId: NetworkNumber) => [10, 42161, 8453].includes(+networkId);
+
+export const addToObjectIf = (condition: any, item: any) => (condition ? item : {});
+
+export const ethToWeth = (maybeEth: any) => maybeEth?.replace(/^ETH$/, 'WETH');
+
+export const wethToEth = (maybeWeth: any) => maybeWeth?.replace(/^WETH$/, 'ETH');
+
+export const stEthToWstEth = (maybeStEth: any) => maybeStEth?.replace(/^stETH$/, 'wstETH');
+
+export const wstEthToStEth = (maybeStEth: any) => maybeStEth?.replace(/^wstETH$/, 'stETH');
+
+export const getAbiItem = (abi: any, methodName: string) => abi.find((i: any) => i.name === methodName);
+
+export const ADDRESS_REGEX = /0x[0-9a-fA-F]{40}/;
+export const isAddress = (address: string) => typeof address === 'string' && (new RegExp(ADDRESS_REGEX).test(address));
+
+export const compareAddresses = (addr1 = '', addr2 = '') => addr1.toLowerCase() === addr2.toLowerCase();
+
+export const getWeiAmountForDecimals = (amount: string | number, decimals: number) => new Dec(amount).mul(10 ** decimals).floor().toString();
+
+export const getEthAmountForDecimals = (amount: string | number, decimals: string | number) => new Dec(amount).div(10 ** +decimals).toString();
+
+export const handleWbtcLegacy = (asset: string) => (asset === 'WBTC Legacy' ? 'WBTC' : asset);
+
+export const wethToEthByAddress = (maybeWethAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(wethToEth(getAssetInfoByAddress(maybeWethAddr, chainId).symbol), chainId).address;
+
+export const ethToWethByAddress = (maybeEthAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(ethToWeth(getAssetInfoByAddress(maybeEthAddr, chainId).symbol), chainId).address;
+
+export const bytesToString = (hex: string) => Buffer.from(hex.replace(/^0x/, ''), 'hex')
+  .toString()
+  // eslint-disable-next-line no-control-regex
+  .replace(/\x00/g, '');
+
+/**
+ * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
+ */
+export const mapRange = (input: number | string, minInput: number | string, maxInput: number | string, minOutput:number | string, maxOutput: number | string) => {
+  // slope = 1.0 * (output_end - output_start) / (input_end - input_start)
+  const inputDiff = new Dec(maxInput).minus(minInput);
+  const outputDiff = new Dec(maxOutput).minus(minOutput);
+  const slope = new Dec(outputDiff).div(inputDiff);
+
+  // output = output_start + slope * (input - input_start)
+  return new Dec(minOutput).plus(new Dec(slope).mul(new Dec(input).minus(minInput))).toDP(2).toNumber();
+};
+

package/src/setup.ts

@@ -1,8 +1,8 @@
-import Decimal from 'decimal.js';
-
-Decimal.set({
-  rounding: Decimal.ROUND_DOWN,
-  toExpPos: 9e15,
-  toExpNeg: -9e15,
-  precision: 50,
-});
+import Decimal from 'decimal.js';
+
+Decimal.set({
+  rounding: Decimal.ROUND_DOWN,
+  toExpPos: 9e15,
+  toExpNeg: -9e15,
+  precision: 50,
+});