oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

Remove try...catch from ContractUtils

Browse Source
This commit is contained in:
Miquel A. Cabot 2022-06-21 11:42:55 +02:00
parent 3a1abb2813
commit d387076a08
1 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/utils/ContractUtils.ts
View File

@ -32,22 +32,18 @@ export async function unitsToAmount(
amount: string,
tokenDecimals?: number
): Promise<string> {
try {
const tokenContract = new web3.eth.Contract(minAbi, token)
let decimals = tokenDecimals || (await tokenContract.methods.decimals().call())
if (decimals === '0') {
decimals = 18
}
const amountFormatted = new BigNumber(amount).div(
new BigNumber(10).exponentiatedBy(decimals)
)
BigNumber.config({ EXPONENTIAL_AT: 50 })
return amountFormatted.toString()
} catch (e) {
LoggerInstance.error(`ERROR: FAILED TO CALL DECIMALS(), USING 18' : ${e.message}`)
const tokenContract = new web3.eth.Contract(minAbi, token)
let decimals = tokenDecimals || (await tokenContract.methods.decimals().call())
if (decimals === '0') {
decimals = 18
}
const amountFormatted = new BigNumber(amount).div(
new BigNumber(10).exponentiatedBy(decimals)
)
BigNumber.config({ EXPONENTIAL_AT: 50 })
return amountFormatted.toString()
}
export async function amountToUnits(
@ -56,22 +52,18 @@ export async function amountToUnits(
amount: string,
tokenDecimals?: number
): Promise<string> {
try {
const tokenContract = new web3.eth.Contract(minAbi, token)
let decimals = tokenDecimals || (await tokenContract.methods.decimals().call())
if (decimals === '0') {
decimals = 18
}
BigNumber.config({ EXPONENTIAL_AT: 50 })
const amountFormatted = new BigNumber(amount).times(
new BigNumber(10).exponentiatedBy(decimals)
)
return amountFormatted.toString()
} catch (e) {
LoggerInstance.error(`ERROR: FAILED TO CALL DECIMALS(), USING 18', ${e.message}`)
const tokenContract = new web3.eth.Contract(minAbi, token)
let decimals = tokenDecimals || (await tokenContract.methods.decimals().call())
if (decimals === '0') {
decimals = 18
}
BigNumber.config({ EXPONENTIAL_AT: 50 })
const amountFormatted = new BigNumber(amount).times(
new BigNumber(10).exponentiatedBy(decimals)
)
return amountFormatted.toString()
}
/**
@ -86,16 +78,11 @@ export async function calculateEstimatedGas(
functionToEstimateGas: Function,
...args: any[]
): Promise<any> {
let estimatedGas = GASLIMIT_DEFAULT
try {
estimatedGas = await functionToEstimateGas.apply(null, args).estimateGas(
{
from: from
},
(err, estGas) => (err ? GASLIMIT_DEFAULT : estGas)
)
} catch (e) {
LoggerInstance.error(`ERROR: Estimate gas failed!`, e)
}
const estimatedGas = await functionToEstimateGas.apply(null, args).estimateGas(
{
from: from
},
(err, estGas) => (err ? GASLIMIT_DEFAULT : estGas)
)
return estimatedGas
}