diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-22 04:17:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 04:17:46 +0800 |
| commit | b4bee4fb5987ab205c8dd7e7dff86af979facdbe (patch) | |
| tree | 528f87b75425d172db7f3d4b9b563a348535042b /app/scripts | |
| parent | 37d836fa72c75945d436bd94feadb65aa95d7e5f (diff) | |
| parent | e8a83026248e6e27e6d801cf1713551eb740137a (diff) | |
| download | tangerine-wallet-browser-b4bee4fb5987ab205c8dd7e7dff86af979facdbe.tar tangerine-wallet-browser-b4bee4fb5987ab205c8dd7e7dff86af979facdbe.tar.gz tangerine-wallet-browser-b4bee4fb5987ab205c8dd7e7dff86af979facdbe.tar.bz2 tangerine-wallet-browser-b4bee4fb5987ab205c8dd7e7dff86af979facdbe.tar.lz tangerine-wallet-browser-b4bee4fb5987ab205c8dd7e7dff86af979facdbe.tar.xz tangerine-wallet-browser-b4bee4fb5987ab205c8dd7e7dff86af979facdbe.tar.zst tangerine-wallet-browser-b4bee4fb5987ab205c8dd7e7dff86af979facdbe.zip | |
Merge pull request #832 from MetaMask/i831-AddRopsten
Begin adding Ropsten support
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/config.js | 4 | ||||
| -rw-r--r-- | app/scripts/lib/config-manager.js | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/scripts/config.js b/app/scripts/config.js index e40b5e104..9a0f2a50b 100644 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -1,5 +1,6 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask' -const TESTNET_RPC_URL = 'https://morden.infura.io/metamask' +const TESTNET_RPC_URL = 'https://ropsten.infura.io/metamask' +const MORDEN_RPC_URL = 'https://morden.infura.io/metamask' const DEFAULT_RPC_URL = TESTNET_RPC_URL global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' @@ -10,5 +11,6 @@ module.exports = { default: DEFAULT_RPC_URL, mainnet: MAINET_RPC_URL, testnet: TESTNET_RPC_URL, + morden: MORDEN_RPC_URL, }, } diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index cced32670..b8ffb6991 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -5,6 +5,7 @@ const rp = require('request-promise') 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 @@ -148,6 +149,9 @@ ConfigManager.prototype.getCurrentRpcAddress = function () { case 'testnet': return TESTNET_RPC + case 'morden': + return MORDEN_RPC + default: return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC } |