m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Change default network to rinkeby

Browse Source
This commit is contained in:
Thomas Huang 2017-05-15 18:05:11 -07:00
parent 117cf9c331
commit 4c10e2021a
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/config.js
View File

@ -1,7 +1,7 @@
const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask' const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask'
const TESTNET_RPC_URL = 'https://ropsten.infura.io/metamask' const TESTNET_RPC_URL = 'https://rinkeby.infura.io/metamask'
const KOVAN_RPC_URL = 'https://kovan.infura.io/metamask' const KOVAN_RPC_URL = 'https://kovan.infura.io/metamask'
const RINKEBY_RPC_URL = 'https://rinkeby.infura.io/metamask' const ROPSTEN_RPC_URL = 'https://ropsten.infura.io/metamask'
const DEFAULT_RPC_URL = TESTNET_RPC_URL const DEFAULT_RPC_URL = TESTNET_RPC_URL
global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
@ -13,6 +13,6 @@ module.exports = {
testnet: TESTNET_RPC_URL, testnet: TESTNET_RPC_URL,
morden: TESTNET_RPC_URL, morden: TESTNET_RPC_URL,
kovan: KOVAN_RPC_URL, kovan: KOVAN_RPC_URL,
rinkeby: RINKEBY_RPC_URL, ropsten: ROPSTEN_RPC_URL,
}, },
} }

10
app/scripts/lib/config-manager.js
View File

@ -6,7 +6,7 @@ const TESTNET_RPC = MetamaskConfig.network.testnet
const MAINNET_RPC = MetamaskConfig.network.mainnet const MAINNET_RPC = MetamaskConfig.network.mainnet
const MORDEN_RPC = MetamaskConfig.network.morden const MORDEN_RPC = MetamaskConfig.network.morden
const KOVAN_RPC = MetamaskConfig.network.kovan const KOVAN_RPC = MetamaskConfig.network.kovan
const RINKEBY_RPC = MetamaskConfig.network.rinkeby const ROPSTEN_RPC = MetamaskConfig.network.ropsten
/* The config-manager is a convenience object /* The config-manager is a convenience object
@ -147,8 +147,8 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
case 'mainnet': case 'mainnet':
return MAINNET_RPC return MAINNET_RPC
case 'testnet': case 'ropsten':
return TESTNET_RPC return ROPSTEN_RPC
case 'morden': case 'morden':
return MORDEN_RPC return MORDEN_RPC
@ -156,8 +156,8 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
case 'kovan': case 'kovan':
return KOVAN_RPC return KOVAN_RPC
case 'rinkeby': case 'testnet':
return RINKEBY_RPC return TESTNET_RPC
default: default:
return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC

4
ui/app/app.js
View File

@ -249,7 +249,7 @@ App.prototype.renderNetworkDropdown = function () {
h(DropMenuItem, { h(DropMenuItem, {
label: 'Ropsten Test Network', label: 'Ropsten Test Network',
closeMenu: () => this.setState({ isNetworkMenuOpen: false }), closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
action: () => props.dispatch(actions.setProviderType('testnet')), action: () => props.dispatch(actions.setProviderType('ropsten')),
icon: h('.menu-icon.red-dot'), icon: h('.menu-icon.red-dot'),
activeNetworkRender: props.network, activeNetworkRender: props.network,
provider: props.provider, provider: props.provider,
@ -267,7 +267,7 @@ App.prototype.renderNetworkDropdown = function () {
h(DropMenuItem, { h(DropMenuItem, {
label: 'Rinkeby Test Network', label: 'Rinkeby Test Network',
closeMenu: () => this.setState({ isNetworkMenuOpen: false}), closeMenu: () => this.setState({ isNetworkMenuOpen: false}),
action: () => props.dispatch(actions.setProviderType('rinkeby')), action: () => props.dispatch(actions.setProviderType('testnet')),
icon: h('.menu-icon.golden-square'), icon: h('.menu-icon.golden-square'),
activeNetworkRender: props.network, activeNetworkRender: props.network,
provider: props.provider, provider: props.provider,

4
ui/app/components/drop-menu-item.js
View File

@ -42,13 +42,13 @@ DropMenuItem.prototype.activeNetworkRender = function () {
if (providerType === 'mainnet') return h('.check', '✓') if (providerType === 'mainnet') return h('.check', '✓')
break break
case 'Ropsten Test Network': case 'Ropsten Test Network':
if (providerType === 'testnet') return h('.check', '✓') if (providerType === 'ropsten') return h('.check', '✓')
break break
case 'Kovan Test Network': case 'Kovan Test Network':
if (providerType === 'kovan') return h('.check', '✓') if (providerType === 'kovan') return h('.check', '✓')
break break
case 'Rinkeby Test Network': case 'Rinkeby Test Network':
if (providerType === 'rinkeby') return h('.check', '✓') if (providerType === 'testnet') return h('.check', '✓')
break break
case 'Localhost 8545': case 'Localhost 8545':
if (activeNetwork === 'http://localhost:8545') return h('.check', '✓') if (activeNetwork === 'http://localhost:8545') return h('.check', '✓')

6
ui/app/components/network.js
View File

@ -34,7 +34,7 @@ Network.prototype.render = function () {
} else if (providerName === 'mainnet') { } else if (providerName === 'mainnet') {
hoverText = 'Main Ethereum Network' hoverText = 'Main Ethereum Network'
iconName = 'ethereum-network' iconName = 'ethereum-network'
} else if (providerName === 'testnet') { } else if (providerName === 'ropsten') {
hoverText = 'Ropsten Test Network' hoverText = 'Ropsten Test Network'
iconName = 'ropsten-test-network' iconName = 'ropsten-test-network'
} else if (parseInt(networkNumber) === 3) { } else if (parseInt(networkNumber) === 3) {
@ -43,7 +43,7 @@ Network.prototype.render = function () {
} else if (providerName === 'kovan') { } else if (providerName === 'kovan') {
hoverText = 'Kovan Test Network' hoverText = 'Kovan Test Network'
iconName = 'kovan-test-network' iconName = 'kovan-test-network'
} else if (providerName === 'rinkeby') { } else if (providerName === 'testnet') {
hoverText = 'Rinkeby Test Network' hoverText = 'Rinkeby Test Network'
iconName = 'rinkeby-test-network' iconName = 'rinkeby-test-network'
} else { } else {
@ -90,7 +90,7 @@ Network.prototype.render = function () {
h('.menu-icon.golden-square'), h('.menu-icon.golden-square'),
h('.network-name', { h('.network-name', {
style: { style: {
color: '#550077', color: '#e7a218',
}}, }},
'Rinkeby Test Net'), 'Rinkeby Test Net'),
]) ])