diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-04-27 05:16:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 05:16:35 +0800 |
| commit | 4e7b0ff15c5a57cd58497aa292c884a97e8a5d23 (patch) | |
| tree | b0d825eac0e2c187c89aacba0df2d7d2a9d44131 /app/scripts/controllers/network | |
| parent | dcd04091cc0149cbb0a49bfdf7897e2ac480c7bc (diff) | |
| parent | b97457e9e2b74ca1bffc7655568e4f61dba1c409 (diff) | |
| download | tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar.gz tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar.bz2 tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar.lz tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar.xz tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar.zst tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.zip | |
Merge pull request #4095 from MetaMask/v4.6.0v4.6.0
Version 4.6.0
Diffstat (limited to 'app/scripts/controllers/network')
| -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') |