2 files changed, 35 insertions, 4 deletions
diff --git a/app/scripts/lib/controllers/preferences.js b/app/scripts/lib/controllers/preferences.js
index c5e93a5b9..7bd2e5631 100644
--- a/app/scripts/lib/controllers/preferences.js
+++ b/app/scripts/lib/controllers/preferences.js
@@ -1,10 +1,11 @@
 const ObservableStore = require('obs-store')
-const normalizeAddress = require('eth-sig-util').normalize
+const normalizeAddress = require('../sig-util').normalize
+const extend = require('xtend')
 
 class PreferencesController {
 
   constructor (opts = {}) {
-    const initState = opts.initState || {}
+    const initState = extend({ frequentRpcList: [] }, opts.initState)
     this.store = new ObservableStore(initState)
   }
 
@@ -12,7 +13,7 @@ class PreferencesController {
   // PUBLIC METHODS
   //
 
-  setSelectedAddress(_address) {
+  setSelectedAddress (_address) {
     return new Promise((resolve, reject) => {
       const address = normalizeAddress(_address)
       this.store.updateState({ selectedAddress: address })
@@ -20,14 +21,43 @@ class PreferencesController {
     })
   }
 
-  getSelectedAddress(_address) {
+  getSelectedAddress (_address) {
     return this.store.getState().selectedAddress
   }
 
+  updateFrequentRpcList (_url) {
+    return this.addToFrequentRpcList(_url)
+      .then((rpcList) => {
+        this.store.updateState({ frequentRpcList: rpcList })
+        return rpcList
+      })
+  }
+
+  addToFrequentRpcList (_url) {
+    let rpcList = this.getFrequentRpcList()
+    let index = rpcList.findIndex((element) => { return element === _url })
+    if (index !== -1) {
+      rpcList.splice(index, 1)
+    }
+    if (_url !== 'http://localhost:8545') {
+      rpcList.push(_url)
+    }
+    if (rpcList.length > 2) {
+      rpcList.shift()
+    }
+    return Promise.resolve(rpcList)
+  }
+
+  getFrequentRpcList () {
+    return this.store.getState().frequentRpcList
+  }
+
   //
   // PRIVATE METHODS
   //
 
+
+
 }
 
 module.exports = PreferencesController
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index bd01a260d..cbef8924a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -265,6 +265,7 @@ module.exports = class MetamaskController extends EventEmitter {
 
       // PreferencesController
       setSelectedAddress:        nodeify(preferencesController.setSelectedAddress).bind(preferencesController),
+      updateFrequentRpcList:      nodeify(preferencesController.updateFrequentRpcList).bind(preferencesController),
 
       // KeyringController
       setLocked:                 nodeify(keyringController.setLocked).bind(keyringController),