aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-05-09 03:29:08 +0800
committerkumavis <aaron@kumavis.me>2017-05-09 03:29:08 +0800
commit68be86abe959afd26ea50e0833c552c442bfce51 (patch)
tree23eb3f52e9ce9ce053dd40ad10d71ce5c7842460
parent1c44dd3353c51b6135c06188e8cd57690e0d30fc (diff)
downloadtangerine-wallet-browser-68be86abe959afd26ea50e0833c552c442bfce51.tar
tangerine-wallet-browser-68be86abe959afd26ea50e0833c552c442bfce51.tar.gz
tangerine-wallet-browser-68be86abe959afd26ea50e0833c552c442bfce51.tar.bz2
tangerine-wallet-browser-68be86abe959afd26ea50e0833c552c442bfce51.tar.lz
tangerine-wallet-browser-68be86abe959afd26ea50e0833c552c442bfce51.tar.xz
tangerine-wallet-browser-68be86abe959afd26ea50e0833c552c442bfce51.tar.zst
tangerine-wallet-browser-68be86abe959afd26ea50e0833c552c442bfce51.zip
ui - remove web3, use eth-query
-rw-r--r--app/scripts/popup-core.js5
-rw-r--r--ui/app/actions.js2
-rw-r--r--ui/app/components/ens-input.js2
3 files changed, 5 insertions, 4 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) {
diff --git a/ui/app/actions.js b/ui/app/actions.js
index c15c9be7e..1a3557cb4 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -393,7 +393,7 @@ function signPersonalMsg (msgData) {
function signTx (txData) {
return (dispatch) => {
- web3.eth.sendTransaction(txData, (err, data) => {
+ global.ethQuery.sendTransaction(txData, (err, data) => {
dispatch(actions.hideLoadingIndication())
if (err) return dispatch(actions.displayWarning(err.message))
dispatch(actions.hideWarning())
diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js
index f1cf49998..0457bde2e 100644
--- a/ui/app/components/ens-input.js
+++ b/ui/app/components/ens-input.js
@@ -75,7 +75,7 @@ EnsInput.prototype.componentDidMount = function () {
const resolverAddress = networkResolvers[network]
if (resolverAddress) {
- const provider = web3.currentProvider
+ const provider = global.ethereumProvider
this.ens = new ENS({ provider, network })
this.checkName = debounce(this.lookupEnsName.bind(this), 200)
}