Improve and simplify the estimation gas.

mesg-foundation · Apr 23, 2019 · 9e9c71d · 9e9c71d
1 parent 308c253
commit 9e9c71d
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/systemservices/marketplace/src/contracts/utils.ts b/systemservices/marketplace/src/contracts/utils.ts
@@ -53,14 +53,15 @@ const createTransactionTemplate = (
     chainID: chainID,
     to: contract.options.address,
     value: '0',
-    data: data
-  }
-  return {
-    ...tx,
-    nonce: (await web3.eth.getTransactionCount(inputs.from)) + (shiftNonce || 0),
+    data: data,
+    gas: inputs.gas,
     gasPrice: inputs.gasPrice || defaultGasPrice,
-    gas: inputs.gas || await web3.eth.estimateGas({...tx, from: inputs.from})
+    nonce: (await web3.eth.getTransactionCount(inputs.from)) + (shiftNonce || 0),
+  }
+  if (!tx.gas) {
+    tx.gas = await web3.eth.estimateGas({...tx, from: inputs.from})
   }
+  return tx
 }
 
 const extractEventFromLogs = (web3: Web3, contract: Contract, eventName: string, logs: Log[]): any => {