Merge pull request #366 from ethereum/web3-update

Require web3.js 0.18.0
pull/1/head
chriseth 8 years ago committed by GitHub
commit 293b12fac4
  1. 2
      package.json
  2. 2
      src/app/txRunner.js

@ -59,7 +59,7 @@
"solc": "https://github.com/ethereum/solc-js",
"standard": "^8.5.0",
"tape": "^4.5.1",
"web3": "https://github.com/ethereum/web3.js#35bcace7173fda742ddb1bba84c8a70f0fa849e0",
"web3": "^0.18.0",
"webworkify": "^1.2.1",
"yo-yo": "^1.2.2",
"yo-yoify": "^3.3.0"

@ -76,7 +76,7 @@ TxRunner.prototype.execute = function () {
tx.gas = resp
var sendTransaction = self.personalMode ? self.web3.personal.unlockAccountAndSendTransaction : self.web3.eth.sendTransaction
var sendTransaction = self.personalMode ? self.web3.personal.sendTransaction : self.web3.eth.sendTransaction
sendTransaction(tx, function (err, resp) {
if (err) {

Loading…
Cancel
Save