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

network - convert localhost from custom rpc to network type

Browse Source
This commit is contained in:
kumavis 2017-09-29 16:35:58 -07:00
parent b88d11f86e
commit d6ea2fa425
5 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/config.js
View File

@ -2,11 +2,13 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask'
const ROPSTEN_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 LOCALHOST_RPC_URL = 'http://localhost:8545'
global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
module.exports = {
network: {
localhost: LOCALHOST_RPC_URL,
mainnet: MAINET_RPC_URL,
ropsten: ROPSTEN_RPC_URL,
kovan: KOVAN_RPC_URL,

1
app/scripts/controllers/network.js
View File

@ -10,6 +10,7 @@ const RPC_ADDRESS_LIST = require('../config.js').network
const DEFAULT_RPC = RPC_ADDRESS_LIST['rinkeby']
module.exports = class NetworkController extends EventEmitter {
constructor (config) {
super()
config.provider.rpcTarget = this.getRpcAddressForType(config.provider.type, config.provider)

7
app/scripts/metamask-controller.js
View File

@ -336,7 +336,6 @@ module.exports = class MetamaskController extends EventEmitter {
// network management
setProviderType: nodeify(networkController.setProviderType, networkController),
setDefaultRpc: nodeify(this.setDefaultRpc, this),
setCustomRpc: nodeify(this.setCustomRpc, this),
// PreferencesController
@ -696,12 +695,6 @@ module.exports = class MetamaskController extends EventEmitter {
// network
async setDefaultRpc () {
const localhost = 'http://localhost:8545'
this.networkController.setRpcTarget(localhost)
return localhost
}
async setCustomRpc (rpcTarget, rpcList) {
this.networkController.setRpcTarget(rpcTarget)
await this.preferencesController.updateFrequentRpcList(rpcTarget)

23
ui/app/actions.js
View File

@ -126,7 +126,6 @@ var actions = {
showAddTokenPage,
addToken,
setRpcTarget: setRpcTarget,
setDefaultRpcTarget: setDefaultRpcTarget,
setProviderType: setProviderType,
// loading overlay
SHOW_LOADING: 'SHOW_LOADING_INDICATION',
@ -706,16 +705,19 @@ function markAccountsFound () {
// config
//
// default rpc target refers to localhost:8545 in this instance.
function setDefaultRpcTarget () {
log.debug(`background.setDefaultRpcTarget`)
function setProviderType (type) {
return (dispatch) => {
background.setDefaultRpc((err, result) => {
log.debug(`background.setProviderType`)
background.setProviderType(type, (err, result) => {
if (err) {
log.error(err)
return dispatch(self.displayWarning('Had a problem changing networks.'))
return dispatch(self.displayWarning('Had a problem changing networks!'))
}
})
return {
type: actions.SET_PROVIDER_TYPE,
value: type,
}
}
}
@ -744,15 +746,6 @@ function addToAddressBook (recipient, nickname) {
}
}
function setProviderType (type) {
log.debug(`background.setProviderType`)
background.setProviderType(type)
return {
type: actions.SET_PROVIDER_TYPE,
value: type,
}
}
function useEtherscanProvider () {
log.debug(`background.useEtherscanProvider`)
background.useEtherscanProvider()

2
ui/app/app.js
View File

@ -319,7 +319,7 @@ App.prototype.renderNetworkDropdown = function () {
{
key: 'default',
closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }),
onClick: () => props.dispatch(actions.setDefaultRpcTarget()),
onClick: () => props.dispatch(actions.setProviderType('localhost')),
style: {
fontSize: '18px',
},