aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/scripts/config.js2
-rw-r--r--app/scripts/controllers/network.js1
-rw-r--r--app/scripts/metamask-controller.js7
3 files changed, 3 insertions, 7 deletions
diff --git a/app/scripts/config.js b/app/scripts/config.js
index c5f260583..1d4ff7c0d 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -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,
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 9e05afe75..9079e0653 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -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)
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fa6f1a245..eb978115d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -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)