deps - use stream-subprovider from provider-engine

feature/default_network_editable
kumavis 8 years ago
parent cbfaa6f56f
commit 1c1400b584
  1. 2
      app/scripts/lib/inpage-provider.js
  2. 4
      app/scripts/popup-core.js
  3. 4
      package.json

@ -1,7 +1,7 @@
const pipe = require('pump') const pipe = require('pump')
const ProviderEngine = require('web3-provider-engine') const ProviderEngine = require('web3-provider-engine')
const FilterSubprovider = require('web3-provider-engine/subproviders/filters') 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 LocalStorageStore = require('obs-store')
const ObjectMultiplex = require('./obj-multiplex') const ObjectMultiplex = require('./obj-multiplex')
const createRandomId = require('./random-id') const createRandomId = require('./random-id')

@ -29,9 +29,9 @@ function connectToAccountManager (connectionStream, cb) {
function setupWeb3Connection (connectionStream) { function setupWeb3Connection (connectionStream) {
var providerStream = new StreamProvider() var providerStream = new StreamProvider()
providerStream.stream.pipe(connectionStream).pipe(providerStream.stream) providerStream.pipe(connectionStream).pipe(providerStream)
connectionStream.on('error', console.error.bind(console)) 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.ethereumProvider = providerStream
global.ethQuery = new EthQuery(providerStream) global.ethQuery = new EthQuery(providerStream)
} }

@ -121,8 +121,8 @@
"valid-url": "^1.0.9", "valid-url": "^1.0.9",
"vreme": "^3.0.2", "vreme": "^3.0.2",
"web3": "0.18.2", "web3": "0.18.2",
"web3-provider-engine": "^12.0.6", "web3-provider-engine": "^12.1.0",
"web3-stream-provider": "^3.0.0", "web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1" "xtend": "^4.0.1"
}, },
"devDependencies": { "devDependencies": {

Loading…
Cancel
Save