diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-05-20 08:06:35 +0800 |
|---|---|---|
| committer | kumavis <kumavis@users.noreply.github.com> | 2016-05-20 08:06:35 +0800 |
| commit | b01b4893c9de0c853e8ba2a2aef5c7fb466e5691 (patch) | |
| tree | d4d98a55a1ba1d79ef8ab9d1e694e9761cbbc8a4 /app/scripts/lib/config-manager.js | |
| parent | 9daf170b98f71f4845fe0c71faad22dc32514d1b (diff) | |
| parent | a703706cb115c17d072f277045a2ef7d838d9762 (diff) | |
| download | tangerine-wallet-browser-b01b4893c9de0c853e8ba2a2aef5c7fb466e5691.tar tangerine-wallet-browser-b01b4893c9de0c853e8ba2a2aef5c7fb466e5691.tar.gz tangerine-wallet-browser-b01b4893c9de0c853e8ba2a2aef5c7fb466e5691.tar.bz2 tangerine-wallet-browser-b01b4893c9de0c853e8ba2a2aef5c7fb466e5691.tar.lz tangerine-wallet-browser-b01b4893c9de0c853e8ba2a2aef5c7fb466e5691.tar.xz tangerine-wallet-browser-b01b4893c9de0c853e8ba2a2aef5c7fb466e5691.tar.zst tangerine-wallet-browser-b01b4893c9de0c853e8ba2a2aef5c7fb466e5691.zip | |
Merge pull request #193 from MetaMask/syncrpcfix
sync rpc fix
Diffstat (limited to 'app/scripts/lib/config-manager.js')
| -rw-r--r-- | app/scripts/lib/config-manager.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index 3c9326db9..847d85a20 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -1,11 +1,12 @@ const Migrator = require('pojo-migrator') const extend = require('xtend') +const MetamaskConfig = require('./config.js') +const migrations = require('./migrations') const STORAGE_KEY = 'metamask-config' -const TESTNET_RPC = 'https://morden.infura.io' -const MAINNET_RPC = 'https://mainnet.infura.io/' +const TESTNET_RPC = MetamaskConfig.network.testnet +const MAINNET_RPC = MetamaskConfig.network.mainnet -const migrations = require('./migrations') /* The config-manager is a convenience object * wrapping a pojo-migrator. |