Merge pull request #782 from ethereum/invalidAddress

Try catch on sendTransaction (metamask can throw)
pull/1/head
yann300 8 years ago committed by GitHub
commit b454a9a0fe
  1. 16
      src/app/execution/txRunner.js

@ -64,13 +64,17 @@ TxRunner.prototype.execute = function (args, callback) {
} }
tx.gas = gasEstimation tx.gas = gasEstimation
var sendTransaction = self.personalMode ? executionContext.web3().personal.sendTransaction : executionContext.web3().eth.sendTransaction var sendTransaction = self.personalMode ? executionContext.web3().personal.sendTransaction : executionContext.web3().eth.sendTransaction
sendTransaction(tx, function (err, resp) { try {
if (err) { sendTransaction(tx, function (err, resp) {
return callback(err, resp) if (err) {
} return callback(err, resp)
}
tryTillResponse(resp, callback) tryTillResponse(resp, callback)
}) })
} catch (e) {
return callback(`Send transaction failed: ${e.message} . if you use an injected provider, please check it is properly unlocked. `)
}
}) })
} }
} else { } else {

Loading…
Cancel
Save