diff options
author | frankiebee <frankie.diamond@gmail.com> | 2017-03-24 06:44:29 +0800 |
---|---|---|
committer | frankiebee <frankie.diamond@gmail.com> | 2017-03-24 06:44:29 +0800 |
commit | 8e30acb41a2cd97efd5428c60c2a5c910758b412 (patch) | |
tree | ae797e27d776827424fb9f15be07d3b02e5c9f92 /app/scripts/lib/config-manager.js | |
parent | c8540261c1c9b60c98845bdd19095efc064fdde8 (diff) | |
parent | f29a116d4027e387180aa1232d35afcc15b920b0 (diff) | |
download | tangerine-wallet-browser-8e30acb41a2cd97efd5428c60c2a5c910758b412.tar tangerine-wallet-browser-8e30acb41a2cd97efd5428c60c2a5c910758b412.tar.gz tangerine-wallet-browser-8e30acb41a2cd97efd5428c60c2a5c910758b412.tar.bz2 tangerine-wallet-browser-8e30acb41a2cd97efd5428c60c2a5c910758b412.tar.lz tangerine-wallet-browser-8e30acb41a2cd97efd5428c60c2a5c910758b412.tar.xz tangerine-wallet-browser-8e30acb41a2cd97efd5428c60c2a5c910758b412.tar.zst tangerine-wallet-browser-8e30acb41a2cd97efd5428c60c2a5c910758b412.zip |
Merge branch 'master' into mascara
Diffstat (limited to 'app/scripts/lib/config-manager.js')
-rw-r--r-- | app/scripts/lib/config-manager.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index 6868637e5..e31cb45ed 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -5,6 +5,7 @@ const normalize = require('eth-sig-util').normalize const TESTNET_RPC = MetamaskConfig.network.testnet const MAINNET_RPC = MetamaskConfig.network.mainnet const MORDEN_RPC = MetamaskConfig.network.morden +const KOVAN_RPC = MetamaskConfig.network.kovan /* The config-manager is a convenience object * wrapping a pojo-migrator. @@ -150,6 +151,9 @@ ConfigManager.prototype.getCurrentRpcAddress = function () { case 'morden': return MORDEN_RPC + case 'kovan': + return KOVAN_RPC + default: return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC } |