mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Remove morden testnet provider
Instances configured to point at Morden will now point at Ropsten.
This commit is contained in:
parent
ff94cf6d10
commit
83880a5c92
@ -1,6 +1,5 @@
|
|||||||
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://ropsten.infura.io/metamask'
|
||||||
const MORDEN_RPC_URL = 'https://morden.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'
|
||||||
@ -11,6 +10,6 @@ module.exports = {
|
|||||||
default: DEFAULT_RPC_URL,
|
default: DEFAULT_RPC_URL,
|
||||||
mainnet: MAINET_RPC_URL,
|
mainnet: MAINET_RPC_URL,
|
||||||
testnet: TESTNET_RPC_URL,
|
testnet: TESTNET_RPC_URL,
|
||||||
morden: MORDEN_RPC_URL,
|
morden: TESTNET_RPC_URL,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -243,15 +243,6 @@ App.prototype.renderNetworkDropdown = function () {
|
|||||||
provider: props.provider,
|
provider: props.provider,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
h(DropMenuItem, {
|
|
||||||
label: 'Morden Test Network',
|
|
||||||
closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
|
|
||||||
action: () => props.dispatch(actions.setProviderType('morden')),
|
|
||||||
icon: h('.menu-icon.red-dot'),
|
|
||||||
activeNetworkRender: props.network,
|
|
||||||
provider: props.provider,
|
|
||||||
}),
|
|
||||||
|
|
||||||
h(DropMenuItem, {
|
h(DropMenuItem, {
|
||||||
label: 'Localhost 8545',
|
label: 'Localhost 8545',
|
||||||
closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
|
closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
|
||||||
|
@ -44,9 +44,6 @@ DropMenuItem.prototype.activeNetworkRender = function () {
|
|||||||
case 'Ropsten Test Network':
|
case 'Ropsten Test Network':
|
||||||
if (provider.type === 'testnet') return h('.check', '✓')
|
if (provider.type === 'testnet') return h('.check', '✓')
|
||||||
break
|
break
|
||||||
case 'Morden Test Network':
|
|
||||||
if (provider.type === 'morden') return h('.check', '✓')
|
|
||||||
break
|
|
||||||
case 'Localhost 8545':
|
case 'Localhost 8545':
|
||||||
if (activeNetwork === 'http://localhost:8545') return h('.check', '✓')
|
if (activeNetwork === 'http://localhost:8545') return h('.check', '✓')
|
||||||
break
|
break
|
||||||
|
@ -42,9 +42,6 @@ Network.prototype.render = function () {
|
|||||||
} else if (parseInt(networkNumber) === 3) {
|
} else if (parseInt(networkNumber) === 3) {
|
||||||
hoverText = 'Ropsten Test Network'
|
hoverText = 'Ropsten Test Network'
|
||||||
iconName = 'ropsten-test-network'
|
iconName = 'ropsten-test-network'
|
||||||
} else if (parseInt(networkNumber) === 2) {
|
|
||||||
hoverText = 'Morden Test Network'
|
|
||||||
iconName = 'morden-test-network'
|
|
||||||
} else {
|
} else {
|
||||||
hoverText = 'Unknown Private Network'
|
hoverText = 'Unknown Private Network'
|
||||||
iconName = 'unknown-private-network'
|
iconName = 'unknown-private-network'
|
||||||
@ -79,15 +76,6 @@ Network.prototype.render = function () {
|
|||||||
}},
|
}},
|
||||||
'Ropsten Test Net'),
|
'Ropsten Test Net'),
|
||||||
])
|
])
|
||||||
case 'morden-test-network':
|
|
||||||
return h('.network-indicator', [
|
|
||||||
h('.menu-icon.red-dot'),
|
|
||||||
h('.network-name', {
|
|
||||||
style: {
|
|
||||||
color: '#ff6666',
|
|
||||||
}},
|
|
||||||
'Morden Test Net'),
|
|
||||||
])
|
|
||||||
default:
|
default:
|
||||||
return h('.network-indicator', [
|
return h('.network-indicator', [
|
||||||
h('i.fa.fa-question-circle.fa-lg', {
|
h('i.fa.fa-question-circle.fa-lg', {
|
||||||
|
@ -133,7 +133,7 @@ function currentProviderDisplay (metamaskState) {
|
|||||||
|
|
||||||
case 'testnet':
|
case 'testnet':
|
||||||
title = 'Current Network'
|
title = 'Current Network'
|
||||||
value = 'Morden Test Network'
|
value = 'Ropsten Test Network'
|
||||||
break
|
break
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user