aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-11-22 04:18:31 +0800
committerGitHub <noreply@github.com>2016-11-22 04:18:31 +0800
commitdb5a4eab710389eee47b9840c4bb964f7d49b6b9 (patch)
treea49e4e5e87a73df957f0638f375621c90056240c /app/scripts/lib
parent268f6e10f30b579ddce99c22c2037b261e15a626 (diff)
parent7ab9d408201ae65ad30512f1361df61a487a9330 (diff)
downloadtangerine-wallet-browser-db5a4eab710389eee47b9840c4bb964f7d49b6b9.tar
tangerine-wallet-browser-db5a4eab710389eee47b9840c4bb964f7d49b6b9.tar.gz
tangerine-wallet-browser-db5a4eab710389eee47b9840c4bb964f7d49b6b9.tar.bz2
tangerine-wallet-browser-db5a4eab710389eee47b9840c4bb964f7d49b6b9.tar.lz
tangerine-wallet-browser-db5a4eab710389eee47b9840c4bb964f7d49b6b9.tar.xz
tangerine-wallet-browser-db5a4eab710389eee47b9840c4bb964f7d49b6b9.tar.zst
tangerine-wallet-browser-db5a4eab710389eee47b9840c4bb964f7d49b6b9.zip
Merge pull request #833 from MetaMask/i831-AddRopsten-Dev
Begin adding Ropsten support to dev
Diffstat (limited to 'app/scripts/lib')
-rw-r--r--app/scripts/lib/config-manager.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index faf64bfdc..8e63265d2 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -6,6 +6,7 @@ const ethUtil = require('ethereumjs-util')
const TESTNET_RPC = MetamaskConfig.network.testnet
const MAINNET_RPC = MetamaskConfig.network.mainnet
+const MORDEN_RPC = MetamaskConfig.network.morden
const txLimit = 40
/* The config-manager is a convenience object
@@ -182,6 +183,9 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
case 'testnet':
return TESTNET_RPC
+ case 'morden':
+ return MORDEN_RPC
+
default:
return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC
}