diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-05-23 13:56:10 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-05-23 13:56:10 +0800 |
| commit | 529304c005318852b60bb93846a58d6eb3da2066 (patch) | |
| tree | 2e3b5f29e8fd0b8151d178361dba7aef9c87cabd /app/scripts/lib | |
| parent | e08c1541e5a91d7958b15753982d22066c1a0a7d (diff) | |
| download | tangerine-wallet-browser-529304c005318852b60bb93846a58d6eb3da2066.tar tangerine-wallet-browser-529304c005318852b60bb93846a58d6eb3da2066.tar.gz tangerine-wallet-browser-529304c005318852b60bb93846a58d6eb3da2066.tar.bz2 tangerine-wallet-browser-529304c005318852b60bb93846a58d6eb3da2066.tar.lz tangerine-wallet-browser-529304c005318852b60bb93846a58d6eb3da2066.tar.xz tangerine-wallet-browser-529304c005318852b60bb93846a58d6eb3da2066.tar.zst tangerine-wallet-browser-529304c005318852b60bb93846a58d6eb3da2066.zip | |
Wrap the provider in a proxy
Diffstat (limited to 'app/scripts/lib')
| -rw-r--r-- | app/scripts/lib/config-manager.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index 6ca9bd9ea..fee8423fa 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -1,14 +1,13 @@ const ethUtil = require('ethereumjs-util') const normalize = require('eth-sig-util').normalize +const MetamaskConfig = require('../config.js') + -<<<<<<< HEAD -======= const MAINNET_RPC = MetamaskConfig.network.mainnet const ROPSTEN_RPC = MetamaskConfig.network.ropsten const KOVAN_RPC = MetamaskConfig.network.kovan const RINKEBY_RPC = MetamaskConfig.network.rinkeby ->>>>>>> master /* The config-manager is a convenience object * wrapping a pojo-migrator. * |