Merge pull request #782 from ethereum/invalidAddress

Try catch on sendTransaction (metamask can throw)

Merge pull request #782 from ethereum/invalidAddress
b454a9a0 · yann300 · GitHub · 780e93b3 · 691ec1cf · b454a9a0
Commit b454a9a0 authored Sep 11, 2017 by yann300 Committed by GitHub Sep 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

txRunner.js src/app/execution/txRunner.js +10 -6

No files found.
--- a/src/app/execution/txRunner.js
+++ b/src/app/execution/txRunner.js
@@ -64,13 +64,17 @@ TxRunner.prototype.execute = function (args, callback) {
        }
        tx.gas = gasEstimation
        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 {