diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-04-26 06:34:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-26 06:34:11 +0800 |
| commit | bd04fe592e5f7913d7348c481cb29270a1c4353b (patch) | |
| tree | 7a5b16250c74a87299c71d645469cd0125bc9425 /app/scripts/controllers | |
| parent | bdd35b12b68590687cc9e00607bf398079ac7e63 (diff) | |
| parent | 1c63b11e3f338d81a19385274edfa52b9e7e6983 (diff) | |
| download | tangerine-wallet-browser-bd04fe592e5f7913d7348c481cb29270a1c4353b.tar tangerine-wallet-browser-bd04fe592e5f7913d7348c481cb29270a1c4353b.tar.gz tangerine-wallet-browser-bd04fe592e5f7913d7348c481cb29270a1c4353b.tar.bz2 tangerine-wallet-browser-bd04fe592e5f7913d7348c481cb29270a1c4353b.tar.lz tangerine-wallet-browser-bd04fe592e5f7913d7348c481cb29270a1c4353b.tar.xz tangerine-wallet-browser-bd04fe592e5f7913d7348c481cb29270a1c4353b.tar.zst tangerine-wallet-browser-bd04fe592e5f7913d7348c481cb29270a1c4353b.zip | |
Merge pull request #4083 from MetaMask/pe-bump
rpc - bump provider-engine + eth-json-rpc-filters
Diffstat (limited to 'app/scripts/controllers')
| -rw-r--r-- | app/scripts/controllers/network/network.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index 6fd983bb2..2f5b81cd2 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -1,7 +1,7 @@ const assert = require('assert') const EventEmitter = require('events') const createMetamaskProvider = require('web3-provider-engine/zero.js') -const SubproviderFromProvider = require('web3-provider-engine/subproviders/web3.js') +const SubproviderFromProvider = require('web3-provider-engine/subproviders/provider.js') const createInfuraProvider = require('eth-json-rpc-infura/src/createProvider') const ObservableStore = require('obs-store') const ComposedStore = require('obs-store/lib/composed') |