diff --git a/src/adaptors/truefi/getPoolValue.ts b/src/adaptors/truefi/getPoolValue.ts deleted file mode 100644 index be93f81ef4..0000000000 --- a/src/adaptors/truefi/getPoolValue.ts +++ /dev/null @@ -1,18 +0,0 @@ -const poolAbi = require('./abis/pool.json') -const { web3 } = require('./connection') - -const unitsMap = { - 6: 'mwei', - 18: 'ether' -} - -async function getPoolValue(poolAddress: string, tokenDecimals: number) { - const pool = new web3.eth.Contract(poolAbi, poolAddress) - const poolValueRaw: string = await pool.methods.liquidValue().call() - const poolValue = web3.utils.fromWei(poolValueRaw, unitsMap[tokenDecimals]) - return poolValue -} - -module.exports = { - getPoolValue -} diff --git a/src/adaptors/truefi/getPoolValues.ts b/src/adaptors/truefi/getPoolValues.ts new file mode 100644 index 0000000000..545a284233 --- /dev/null +++ b/src/adaptors/truefi/getPoolValues.ts @@ -0,0 +1,23 @@ +const poolAbi = require('./abis/pool.json') +const { web3 } = require('./connection') + +const unitsMap = { + 6: 'mwei', + 18: 'ether' +} + +async function getPoolValues(poolAddress: string, tokenDecimals: number) { + const pool = new web3.eth.Contract(poolAbi, poolAddress) + + const poolValueRaw: string = await pool.methods.poolValue().call() + const poolValue = web3.utils.fromWei(poolValueRaw, unitsMap[tokenDecimals]) + + const liquidValueRaw: string = await pool.methods.liquidValue().call() + const liquidValue = web3.utils.fromWei(liquidValueRaw, unitsMap[tokenDecimals]) + + return { poolValue, liquidValue } +} + +module.exports = { + getPoolValues +} diff --git a/src/adaptors/truefi/index.ts b/src/adaptors/truefi/index.ts index 8d5b5aa614..72c398042c 100644 --- a/src/adaptors/truefi/index.ts +++ b/src/adaptors/truefi/index.ts @@ -2,7 +2,7 @@ const BigNumber = require('bignumber.js') const superagent = require('superagent') const { web3 } = require('./connection') -const { getPoolValue } = require('./getPoolValue') +const { getPoolValues } = require('./getPoolValues') const { getActiveLoans } = require('./getActiveLoans') const { getPoolApyBase } = require('./getPoolApyBase') const { getPoolApyRewards } = require('./getPoolApyRewards') @@ -71,7 +71,7 @@ const buildPoolAdapter = async ( distributor: any ): Promise => { const poolActiveLoans = allActiveLoans.filter(({ poolAddress }) => poolAddress === address) - const poolValue = await getPoolValue(address, decimals) + const { poolValue, liquidValue } = await getPoolValues(address, decimals) const poolApyBase = await getPoolApyBase(poolActiveLoans, poolValue, decimals) const poolApyRewards = await getPoolApyRewards(address, decimals, truPrice, multifarm, distributor) @@ -80,7 +80,7 @@ const buildPoolAdapter = async ( chain: utils.formatChain('ethereum'), project: 'truefi', symbol, - tvlUsd: poolValue * tokenPrice, + tvlUsd: liquidValue * tokenPrice, apyBase: poolApyBase, apyReward: poolApyRewards, rewardTokens: [TRU_ADDRESS],