aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-05-09 04:32:01 +0800
committerGitHub <noreply@github.com>2017-05-09 04:32:01 +0800
commit09a0e7ed89c25698161e1952e93160c99456f656 (patch)
treea30f7079fdfae74d746688bd30932884c9f3d7c3 /app
parent86500d0bcbba5222d97e5882985a73234a928b71 (diff)
parent21b6a1b478032fa51505c1be517587515fe8bd6c (diff)
downloadtangerine-wallet-browser-09a0e7ed89c25698161e1952e93160c99456f656.tar.gz
tangerine-wallet-browser-09a0e7ed89c25698161e1952e93160c99456f656.tar.zst
tangerine-wallet-browser-09a0e7ed89c25698161e1952e93160c99456f656.zip
Merge pull request #1390 from MetaMask/ui-slim
Slim down the ui bundle a bit
Diffstat (limited to 'app')
-rw-r--r--app/scripts/popup-core.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
index f9ac4d052..f1eb394d7 100644
--- a/app/scripts/popup-core.js
+++ b/app/scripts/popup-core.js
@@ -1,7 +1,7 @@
const EventEmitter = require('events').EventEmitter
const async = require('async')
const Dnode = require('dnode')
-const Web3 = require('web3')
+const EthQuery = require('eth-query')
const launchMetamaskUi = require('../../ui')
const StreamProvider = require('web3-stream-provider')
const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
@@ -32,7 +32,8 @@ function setupWeb3Connection (connectionStream) {
providerStream.pipe(connectionStream).pipe(providerStream)
connectionStream.on('error', console.error.bind(console))
providerStream.on('error', console.error.bind(console))
- global.web3 = new Web3(providerStream)
+ global.ethereumProvider = providerStream
+ global.ethQuery = new EthQuery(providerStream)
}
function setupControllerConnection (connectionStream, cb) {