diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/lib/idStore.js | 8 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 31895b9bc..eb625987f 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -246,7 +246,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone function analyzeForDelegateCall (cb) { if (txParams.to) { query.getCode(txParams.to, (err, result) => { - if (err) return cb(err) + if (err) return cb(err.message || err) var containsDelegateCall = self.checkForDelegateCall(result) txData.containsDelegateCall = containsDelegateCall cb() @@ -261,8 +261,8 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone // 1 billion gas for estimation var gasLimit = '0x3b9aca00' estimationParams.gas = gasLimit - query.estimateGas(estimationParams, function (err, result) { - if (err) return cb(err) + query.estimateGas(estimationParams, function(err, result){ + if (err) return cb(err.message || err) if (result === estimationParams.gas) { txData.simulationFails = true query.getBlockByNumber('latest', true, function (err, block) { @@ -280,7 +280,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone } function didComplete (err) { - if (err) return cb(err) + if (err) return cb(err.message || err) configManager.addTx(txData) // signal update self._didUpdate() diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 3d6c0eb50..951918460 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -199,7 +199,6 @@ module.exports = class MetamaskController { newUnsignedTransaction (txParams, onTxDoneCb) { const keyringController = this.keyringController - const err = this.enforceTxValidations(txParams) if (err) return onTxDoneCb(err) keyringController.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => { |