Unverified Commit 6a607935 authored by yann300's avatar yann300 Committed by GitHub

Merge pull request #572 from ethereum/yann300-patch-15

Adapt to Metamask breaking change
parents 7c6d5612 9d09c559
...@@ -12,8 +12,8 @@ const LogsManager = require('./logsManager.js') ...@@ -12,8 +12,8 @@ const LogsManager = require('./logsManager.js')
const rlp = ethUtil.rlp const rlp = ethUtil.rlp
let web3 let web3
if (typeof window !== 'undefined' && typeof window.web3 !== 'undefined') { if (typeof window !== 'undefined' && typeof window.ethereum !== 'undefined') {
var injectedProvider = window.web3.currentProvider var injectedProvider = window.ethereum
web3 = new Web3(injectedProvider) web3 = new Web3(injectedProvider)
} else { } else {
web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545')) web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545'))
......
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