Skip to content

B
baas-ide
Commit b454a9a0 authored by yann300's avatar yann300 Committed by GitHub
Browse files
Options

Merge pull request #782 from ethereum/invalidAddress

Try catch on sendTransaction (metamask can throw)
parents 780e93b3 691ec1cf
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
src/app/execution/txRunner.js
View file @ b454a9a0
...@@ -64,6 +64,7 @@ TxRunner.prototype.execute = function (args, callback) { ...@@ -64,6 +64,7 @@ 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
try {
sendTransaction(tx, function (err, resp) { sendTransaction(tx, function (err, resp) {
if (err) { if (err) {
return callback(err, resp) return callback(err, resp)
...@@ -71,6 +72,9 @@ TxRunner.prototype.execute = function (args, callback) { ...@@ -71,6 +72,9 @@ TxRunner.prototype.execute = function (args, callback) {
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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment