aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-05-23 06:59:07 +0800
committerkumavis <aaron@kumavis.me>2017-05-23 06:59:07 +0800
commit1c1400b584a97e05e3f39748e5f44f076328d89b (patch)
treec55cc2458e02c055ec8f8d193183d0d1918764a2
parentcbfaa6f56f685d515e170de2bf305da76b8ec1e0 (diff)
downloadtangerine-wallet-browser-1c1400b584a97e05e3f39748e5f44f076328d89b.tar
tangerine-wallet-browser-1c1400b584a97e05e3f39748e5f44f076328d89b.tar.gz
tangerine-wallet-browser-1c1400b584a97e05e3f39748e5f44f076328d89b.tar.bz2
tangerine-wallet-browser-1c1400b584a97e05e3f39748e5f44f076328d89b.tar.lz
tangerine-wallet-browser-1c1400b584a97e05e3f39748e5f44f076328d89b.tar.xz
tangerine-wallet-browser-1c1400b584a97e05e3f39748e5f44f076328d89b.tar.zst
tangerine-wallet-browser-1c1400b584a97e05e3f39748e5f44f076328d89b.zip
deps - use stream-subprovider from provider-engine
-rw-r--r--app/scripts/lib/inpage-provider.js2
-rw-r--r--app/scripts/popup-core.js4
-rw-r--r--package.json4
3 files changed, 5 insertions, 5 deletions
diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index 3b60756b9..d24121ade 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -1,7 +1,7 @@
const pipe = require('pump')
const ProviderEngine = require('web3-provider-engine')
const FilterSubprovider = require('web3-provider-engine/subproviders/filters')
-const StreamSubprovider = require('web3-stream-provider/stream-subprovider')
+const StreamSubprovider = require('web3-provider-engine/subproviders/stream')
const LocalStorageStore = require('obs-store')
const ObjectMultiplex = require('./obj-multiplex')
const createRandomId = require('./random-id')
diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
index 7de1a6fda..f1eb394d7 100644
--- a/app/scripts/popup-core.js
+++ b/app/scripts/popup-core.js
@@ -29,9 +29,9 @@ function connectToAccountManager (connectionStream, cb) {
function setupWeb3Connection (connectionStream) {
var providerStream = new StreamProvider()
- providerStream.stream.pipe(connectionStream).pipe(providerStream.stream)
+ providerStream.pipe(connectionStream).pipe(providerStream)
connectionStream.on('error', console.error.bind(console))
- providerStream.stream.on('error', console.error.bind(console))
+ providerStream.on('error', console.error.bind(console))
global.ethereumProvider = providerStream
global.ethQuery = new EthQuery(providerStream)
}
diff --git a/package.json b/package.json
index 5512fa6a4..dba82d17c 100644
--- a/package.json
+++ b/package.json
@@ -121,8 +121,8 @@
"valid-url": "^1.0.9",
"vreme": "^3.0.2",
"web3": "0.18.2",
- "web3-provider-engine": "^12.0.6",
- "web3-stream-provider": "^3.0.0",
+ "web3-provider-engine": "^12.1.0",
+ "web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1"
},
"devDependencies": {