diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2017-04-28 06:08:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-28 06:08:13 +0800 |
| commit | d8a5e6a8e43f04a9f123167326fe46dfb8fc2ae6 (patch) | |
| tree | 9143b42107d8aeb75fa58f8de45c5730bb8621dd /app/scripts | |
| parent | a90b010de891f7936bc17c09c5fd27c61fc0610d (diff) | |
| parent | d1a10691802fc7eef65f13126c684b6cdf13d461 (diff) | |
| download | tangerine-wallet-browser-d8a5e6a8e43f04a9f123167326fe46dfb8fc2ae6.tar tangerine-wallet-browser-d8a5e6a8e43f04a9f123167326fe46dfb8fc2ae6.tar.gz tangerine-wallet-browser-d8a5e6a8e43f04a9f123167326fe46dfb8fc2ae6.tar.bz2 tangerine-wallet-browser-d8a5e6a8e43f04a9f123167326fe46dfb8fc2ae6.tar.lz tangerine-wallet-browser-d8a5e6a8e43f04a9f123167326fe46dfb8fc2ae6.tar.xz tangerine-wallet-browser-d8a5e6a8e43f04a9f123167326fe46dfb8fc2ae6.tar.zst tangerine-wallet-browser-d8a5e6a8e43f04a9f123167326fe46dfb8fc2ae6.zip | |
Merge pull request #1352 from MetaMask/rinkeby
Rinkeby
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/config.js | 2 | ||||
| -rw-r--r-- | app/scripts/lib/buy-eth-url.js | 4 | ||||
| -rw-r--r-- | app/scripts/lib/config-manager.js | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/app/scripts/config.js b/app/scripts/config.js index ec421744d..391c67230 100644 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -1,6 +1,7 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask' const TESTNET_RPC_URL = 'https://ropsten.infura.io/metamask' const KOVAN_RPC_URL = 'https://kovan.infura.io/metamask' +const RINKEBY_RPC_URL = 'https://rinkeby.infura.io/metamask' const DEFAULT_RPC_URL = TESTNET_RPC_URL global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' @@ -12,5 +13,6 @@ module.exports = { testnet: TESTNET_RPC_URL, morden: TESTNET_RPC_URL, kovan: KOVAN_RPC_URL, + rinkeby: RINKEBY_RPC_URL, }, } diff --git a/app/scripts/lib/buy-eth-url.js b/app/scripts/lib/buy-eth-url.js index 30db78a6c..b9dde3c28 100644 --- a/app/scripts/lib/buy-eth-url.js +++ b/app/scripts/lib/buy-eth-url.js @@ -11,6 +11,10 @@ function getBuyEthUrl ({ network, amount, address }) { url = 'https://faucet.metamask.io/' break + case '4': + url = 'https://www.rinkeby.io/' + break + case '42': url = 'https://github.com/kovan-testnet/faucet' break diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index e31cb45ed..340ad4292 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -6,6 +6,8 @@ const TESTNET_RPC = MetamaskConfig.network.testnet const MAINNET_RPC = MetamaskConfig.network.mainnet const MORDEN_RPC = MetamaskConfig.network.morden const KOVAN_RPC = MetamaskConfig.network.kovan +const RINKEBY_RPC = MetamaskConfig.network.rinkeby + /* The config-manager is a convenience object * wrapping a pojo-migrator. @@ -153,6 +155,9 @@ ConfigManager.prototype.getCurrentRpcAddress = function () { case 'kovan': return KOVAN_RPC + + case 'rinkeby': + return RINKEBY_RPC default: return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC |