status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix wrong estimation when only executing and selected safeTxGas is 0 (#2013)

This commit is contained in:
Daniel Sanchez 2021-03-10 19:50:26 +01:00 committed by GitHub
parent b12e1906f5
commit 26de414e12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/logic/safe/transactions/gas.ts
View File

@ -296,10 +296,12 @@ export const estimateGasForTransactionExecution = async ({
}: TransactionExecutionEstimationProps): Promise<number> => { }: TransactionExecutionEstimationProps): Promise<number> => {
const safeInstance = await getGnosisSafeInstanceAt(safeAddress) const safeInstance = await getGnosisSafeInstanceAt(safeAddress)
try { try {
if (approvalAndExecution) { let gasEstimation
console.info(`Estimating transaction success for execution & approval...`) // If safeTxGas === 0 we still have to estimate the gas limit to execute the transaction so we need to get an estimation
if (approvalAndExecution || safeTxGas === 0) {
console.info(`Estimating transaction necessary gas...`)
// @todo (agustin) once we solve the problem with the preApprovingOwner, we need to use the method bellow (execTransaction) with sigs = generateSignaturesFromTxConfirmations(txConfirmations,from) // @todo (agustin) once we solve the problem with the preApprovingOwner, we need to use the method bellow (execTransaction) with sigs = generateSignaturesFromTxConfirmations(txConfirmations,from)
const gasEstimation = await estimateGasForTransactionCreation( gasEstimation = await estimateGasForTransactionCreation(
safeAddress, safeAddress,
txData, txData,
txRecipient, txRecipient,
@ -307,17 +309,21 @@ export const estimateGasForTransactionExecution = async ({
operation, operation,
safeTxGas, safeTxGas,
) )
console.info(`Gas estimation successfully finished with gas amount: ${gasEstimation}`)
return gasEstimation if (approvalAndExecution) {
// If it's approve and execute we don't have all the signatures to do a complete simulation, we return the gas estimation
console.info(`Gas estimation successfully finished with gas amount: ${gasEstimation}`)
return gasEstimation
}
} }
// If we have all signatures we can do a call to ensure the transaction will be successful or fail
const sigs = generateSignaturesFromTxConfirmations(txConfirmations) const sigs = generateSignaturesFromTxConfirmations(txConfirmations)
console.info(`Estimating transaction success for with gas amount: ${safeTxGas}...`) console.info(`Check transaction success with gas amount: ${safeTxGas}...`)
await safeInstance.methods await safeInstance.methods
.execTransaction(txRecipient, txAmount, txData, operation, safeTxGas, 0, gasPrice, gasToken, refundReceiver, sigs) .execTransaction(txRecipient, txAmount, txData, operation, safeTxGas, 0, gasPrice, gasToken, refundReceiver, sigs)
.call() .call()
console.info(`Gas estimation successfully finished with gas amount: ${safeTxGas}`) console.info(`Gas estimation successfully finished with gas amount: ${safeTxGas}`)
return safeTxGas return safeTxGas || gasEstimation
} catch (error) { } catch (error) {
throw new Error(`Gas estimation failed with gas amount: ${safeTxGas}`) throw new Error(`Gas estimation failed with gas amount: ${safeTxGas}`)
} }