@defisaver/positions-sdk 1.0.7 → 1.0.9

package/src/morphoBlue/index.ts

@@ -1,202 +1,202 @@
-import Web3 from 'web3';
-import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
-import {
-  Blockish, EthAddress, MMUsedAssets, NetworkNumber, PositionBalances,
-} from '../types/common';
-import { DFSFeedRegistryContract, FeedRegistryContract, MorphoBlueViewContract } from '../contracts';
-import {
-  MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
-} from '../types';
-import { USD_QUOTE, WAD } from '../constants';
-import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { isMainnetNetwork, wethToEth } from '../services/utils';
-import {
-  getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate,
-} from '../helpers/morphoBlueHelpers';
-import { getChainlinkAssetAddress } from '../services/priceService';
-
-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);
-
-  const loanTokenFeedAddress = getChainlinkAssetAddress(loanTokenInfo.symbol, network);
-
-  const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
-
-  let marketInfo;
-  let loanTokenPrice;
-  const isTokenUSDA = loanTokenInfo.symbol === 'USDA';
-  const isMainnet = isMainnetNetwork(network);
-  if (isMainnet) {
-    const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
-    const [_loanTokenPrice, _marketInfo] = await Promise.all([
-      isTokenUSDA ? Promise.resolve('100000000') : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
-      morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
-    ]);
-    marketInfo = _marketInfo;
-    loanTokenPrice = _loanTokenPrice;
-  } else {
-    // Currently only base network is supported
-    const feedRegistryContract = DFSFeedRegistryContract(web3, network);
-
-    const [loanTokenPriceRound, _marketInfo] = await Promise.all([
-      isTokenUSDA ? Promise.resolve({ answer: '100000000' }) // Normalize to match the expected object structure
-        : feedRegistryContract.methods.latestRoundData(loanTokenFeedAddress, USD_QUOTE).call(),
-      morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
-    ]);
-    marketInfo = _marketInfo;
-    loanTokenPrice = loanTokenPriceRound.answer;
-  }
-
-  let morphoSupplyApy = '0';
-  let morphoBorrowApy = '0';
-  try {
-    const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = await getRewardsForMarket(selectedMarket.marketId, network);
-    morphoSupplyApy = _morphoSupplyApy;
-    morphoBorrowApy = _morphoBorrowApy;
-  } catch (e) {
-    console.error(e);
-  }
-
-  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,
-    borrowRate: compoundedBorrowRate,
-    totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
-    totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
-    canBeSupplied: true,
-    canBeBorrowed: true,
-    incentiveSupplyApy: morphoSupplyApy,
-    incentiveBorrowApy: morphoBorrowApy,
-    incentiveSupplyToken: 'MORPHO',
-    incentiveBorrowToken: 'MORPHO',
-  };
-
-  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 }),
-  };
-}
+import Web3 from 'web3';
+import Dec from 'decimal.js';
+import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
+import {
+  Blockish, EthAddress, MMUsedAssets, NetworkNumber, PositionBalances,
+} from '../types/common';
+import { DFSFeedRegistryContract, FeedRegistryContract, MorphoBlueViewContract } from '../contracts';
+import {
+  MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
+} from '../types';
+import { USD_QUOTE, WAD } from '../constants';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
+import { isMainnetNetwork, wethToEth } from '../services/utils';
+import {
+  getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate,
+} from '../helpers/morphoBlueHelpers';
+import { getChainlinkAssetAddress } from '../services/priceService';
+
+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);
+
+  const loanTokenFeedAddress = getChainlinkAssetAddress(loanTokenInfo.symbol, network);
+
+  const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
+
+  let marketInfo;
+  let loanTokenPrice;
+  const isTokenUSDA = loanTokenInfo.symbol === 'USDA';
+  const isMainnet = isMainnetNetwork(network);
+  if (isMainnet) {
+    const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
+    const [_loanTokenPrice, _marketInfo] = await Promise.all([
+      isTokenUSDA ? Promise.resolve('100000000') : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
+      morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
+    ]);
+    marketInfo = _marketInfo;
+    loanTokenPrice = _loanTokenPrice;
+  } else {
+    // Currently only base network is supported
+    const feedRegistryContract = DFSFeedRegistryContract(web3, network);
+
+    const [loanTokenPriceRound, _marketInfo] = await Promise.all([
+      isTokenUSDA ? Promise.resolve({ answer: '100000000' }) // Normalize to match the expected object structure
+        : feedRegistryContract.methods.latestRoundData(loanTokenFeedAddress, USD_QUOTE).call(),
+      morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
+    ]);
+    marketInfo = _marketInfo;
+    loanTokenPrice = loanTokenPriceRound.answer;
+  }
+
+  let morphoSupplyApy = '0';
+  let morphoBorrowApy = '0';
+  try {
+    const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = await getRewardsForMarket(selectedMarket.marketId, network);
+    morphoSupplyApy = _morphoSupplyApy;
+    morphoBorrowApy = _morphoBorrowApy;
+  } catch (e) {
+    console.error(e);
+  }
+
+  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,
+    borrowRate: compoundedBorrowRate,
+    totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
+    totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
+    canBeSupplied: true,
+    canBeBorrowed: true,
+    incentiveSupplyApy: morphoSupplyApy,
+    incentiveBorrowApy: morphoBorrowApy,
+    incentiveSupplyToken: 'MORPHO',
+    incentiveBorrowToken: 'MORPHO',
+  };
+
+  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,33 +1,33 @@
-import Web3 from 'web3';
-import { chunk } from 'lodash';
-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 || 1200000 };
-  });
-  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;
-};
-
-export const chunkAndMulticall = async (calls: any[], chunkSize: number, blockNumber: 'latest' | number = 'latest', web3: Web3, network: NetworkNumber = NetworkNumber.Eth) => {
-  const chunkedCalls = chunk(calls, chunkSize);
-
-  // @ts-ignore
-  const results = await Promise.all(chunkedCalls.map((cnk) => multicall(cnk, web3, network, blockNumber)));
-
-  return results.flat(1);
-};
+import Web3 from 'web3';
+import { chunk } from 'lodash';
+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 || 1200000 };
+  });
+  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;
+};
+
+export const chunkAndMulticall = async (calls: any[], chunkSize: number, blockNumber: 'latest' | number = 'latest', web3: Web3, network: NetworkNumber = NetworkNumber.Eth) => {
+  const chunkedCalls = chunk(calls, chunkSize);
+
+  // @ts-ignore
+  const results = await Promise.all(chunkedCalls.map((cnk) => multicall(cnk, web3, network, blockNumber)));
+
+  return results.flat(1);
+};

package/src/services/priceService.ts

@@ -1,91 +1,91 @@
-import Web3 from 'web3';
-import Dec from 'decimal.js';
-import { getAssetInfo } from '@defisaver/tokens';
-import {
-  COMPPriceFeedContract,
-  ETHPriceFeedContract,
-  USDCPriceFeedContract,
-  WstETHPriceFeedContract,
-} from '../contracts';
-import { NetworkNumber } from '../types/common';
-import { multicall } from '../multicall';
-import { getEthAmountForDecimals } from './utils';
-
-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();
-};
-
-export const getWstETHPrice = async (web3: Web3) => {
-  const wstETHFeedContract = WstETHPriceFeedContract(web3, NetworkNumber.Eth);
-  const ethFeedContract = ETHPriceFeedContract(web3, NetworkNumber.Eth);
-  const calls = [
-    {
-      target: ethFeedContract.options.address,
-      abiItem: ethFeedContract.options.jsonInterface.find(({ name }) => name === 'latestAnswer'),
-      params: [],
-    },
-    {
-      target: wstETHFeedContract.options.address,
-      abiItem: wstETHFeedContract.options.jsonInterface.find(({ name }) => name === 'latestRoundData'),
-      params: [],
-    },
-  ];
-
-  const multicallRes = await multicall(calls, web3);
-
-  const ethPrice = new Dec(multicallRes[0][0]).div(1e8);
-
-  const wstETHRate = new Dec(multicallRes[1].answer).div(1e8);
-
-  return new Dec(ethPrice).mul(wstETHRate).toString();
-};
-// this is a fixed version, the original version is above but requires to refactor comp v3 function, so it's easier to just copy the function for now
-export const getWstETHPriceFluid = async (web3: Web3, network: NetworkNumber) => {
-  const wstETHFeedContract = WstETHPriceFeedContract(web3, network);
-  const ethFeedContract = ETHPriceFeedContract(web3, network);
-  const calls = [
-    {
-      target: ethFeedContract.options.address,
-      abiItem: ethFeedContract.options.jsonInterface.find(({ name }) => name === 'latestAnswer'),
-      params: [],
-    },
-    {
-      target: wstETHFeedContract.options.address,
-      abiItem: wstETHFeedContract.options.jsonInterface.find(({ name }) => name === 'latestRoundData'),
-      params: [],
-    },
-    {
-      target: wstETHFeedContract.options.address,
-      abiItem: wstETHFeedContract.options.jsonInterface.find(({ name }) => name === 'decimals'),
-      params: [],
-    },
-  ];
-  const multicallRes = await multicall(calls, web3, network);
-
-  const ethPrice = new Dec(multicallRes[0][0]).div(1e8);
-  const wstETHRate = getEthAmountForDecimals(multicallRes[1].answer, multicallRes[2][0]);
-
-  return new Dec(ethPrice).mul(wstETHRate).toString();
-};
-
-// chainlink price feed available only on mainnet
-export const getChainlinkAssetAddress = (symbol: string, network: NetworkNumber) => {
-  // Chainlink only has BTC/USD feed so we use that for BTC derivatives
-  if (['WBTC', 'RENBTC'].includes(symbol?.toUpperCase())) return '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB';
-  if (symbol?.toUpperCase() === 'WETH') return getAssetInfo('ETH').addresses[network];
-  return getAssetInfo(symbol).addresses[network];
-};
+import Web3 from 'web3';
+import Dec from 'decimal.js';
+import { getAssetInfo } from '@defisaver/tokens';
+import {
+  COMPPriceFeedContract,
+  ETHPriceFeedContract,
+  USDCPriceFeedContract,
+  WstETHPriceFeedContract,
+} from '../contracts';
+import { NetworkNumber } from '../types/common';
+import { multicall } from '../multicall';
+import { getEthAmountForDecimals } from './utils';
+
+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();
+};
+
+export const getWstETHPrice = async (web3: Web3) => {
+  const wstETHFeedContract = WstETHPriceFeedContract(web3, NetworkNumber.Eth);
+  const ethFeedContract = ETHPriceFeedContract(web3, NetworkNumber.Eth);
+  const calls = [
+    {
+      target: ethFeedContract.options.address,
+      abiItem: ethFeedContract.options.jsonInterface.find(({ name }) => name === 'latestAnswer'),
+      params: [],
+    },
+    {
+      target: wstETHFeedContract.options.address,
+      abiItem: wstETHFeedContract.options.jsonInterface.find(({ name }) => name === 'latestRoundData'),
+      params: [],
+    },
+  ];
+
+  const multicallRes = await multicall(calls, web3);
+
+  const ethPrice = new Dec(multicallRes[0][0]).div(1e8);
+
+  const wstETHRate = new Dec(multicallRes[1].answer).div(1e8);
+
+  return new Dec(ethPrice).mul(wstETHRate).toString();
+};
+// this is a fixed version, the original version is above but requires to refactor comp v3 function, so it's easier to just copy the function for now
+export const getWstETHPriceFluid = async (web3: Web3, network: NetworkNumber) => {
+  const wstETHFeedContract = WstETHPriceFeedContract(web3, network);
+  const ethFeedContract = ETHPriceFeedContract(web3, network);
+  const calls = [
+    {
+      target: ethFeedContract.options.address,
+      abiItem: ethFeedContract.options.jsonInterface.find(({ name }) => name === 'latestAnswer'),
+      params: [],
+    },
+    {
+      target: wstETHFeedContract.options.address,
+      abiItem: wstETHFeedContract.options.jsonInterface.find(({ name }) => name === 'latestRoundData'),
+      params: [],
+    },
+    {
+      target: wstETHFeedContract.options.address,
+      abiItem: wstETHFeedContract.options.jsonInterface.find(({ name }) => name === 'decimals'),
+      params: [],
+    },
+  ];
+  const multicallRes = await multicall(calls, web3, network);
+
+  const ethPrice = new Dec(multicallRes[0][0]).div(1e8);
+  const wstETHRate = getEthAmountForDecimals(multicallRes[1].answer, multicallRes[2][0]);
+
+  return new Dec(ethPrice).mul(wstETHRate).toString();
+};
+
+// chainlink price feed available only on mainnet
+export const getChainlinkAssetAddress = (symbol: string, network: NetworkNumber) => {
+  // Chainlink only has BTC/USD feed so we use that for BTC derivatives
+  if (['WBTC', 'RENBTC'].includes(symbol?.toUpperCase())) return '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB';
+  if (symbol?.toUpperCase() === 'WETH') return getAssetInfo('ETH').addresses[network];
+  return getAssetInfo(symbol).addresses[network];
+};