From 536cab0687b6eb652401859cb41ae90dd7a62c1f Mon Sep 17 00:00:00 2001 From: kumavis Date: Thu, 10 Nov 2016 21:19:34 -0800 Subject: detect tx error - show warning and fix gasLimit --- app/scripts/lib/idStore.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'app/scripts/lib/idStore.js') diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index dd895a6c0..cd717df28 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -259,10 +259,24 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone } function estimateGas(cb){ - query.estimateGas(txParams, function(err, result){ + var estimationParams = extend(txParams) + // 1 billion gas for estimation + var gasLimit = '0x3b9aca00' + estimationParams.gas = gasLimit + query.estimateGas(estimationParams, function(err, result){ if (err) return cb(err) + if (result === estimationParams.gas) { + txData.simulationFails = true + query.getBlockByNumber('latest', true, function(err, block){ + if (err) return cb(err) + txData.estimatedGas = block.gasLimit + txData.txParams.gas = block.gasLimit + cb() + }) + return + } txData.estimatedGas = self.addGasBuffer(result) - txData.txParams.gasLimit = txData.estimatedGas + txData.txParams.gas = txData.estimatedGas cb() }) } -- cgit