1 files changed, 70 insertions, 80 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index b8ffb6991..3a1f12ac0 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -1,12 +1,12 @@
 const Migrator = require('pojo-migrator')
 const MetamaskConfig = require('../config.js')
 const migrations = require('./migrations')
-const rp = require('request-promise')
+const ethUtil = require('ethereumjs-util')
+const normalize = require('./sig-util').normalize
 
 const TESTNET_RPC = MetamaskConfig.network.testnet
 const MAINNET_RPC = MetamaskConfig.network.mainnet
 const MORDEN_RPC = MetamaskConfig.network.morden
-const txLimit = 40
 
 /* The config-manager is a convenience object
  * wrapping a pojo-migrator.
@@ -17,8 +17,6 @@ const txLimit = 40
  */
 module.exports = ConfigManager
 function ConfigManager (opts) {
-  this.txLimit = txLimit
-
   // ConfigManager is observable and will emit updates
   this._subs = []
 
@@ -111,6 +109,27 @@ ConfigManager.prototype.setWallet = function (wallet) {
   this.setData(data)
 }
 
+ConfigManager.prototype.setVault = function (encryptedString) {
+  var data = this.getData()
+  data.vault = encryptedString
+  this.setData(data)
+}
+
+ConfigManager.prototype.getVault = function () {
+  var data = this.getData()
+  return data.vault
+}
+
+ConfigManager.prototype.getKeychains = function () {
+  return this.migrator.getData().keychains || []
+}
+
+ConfigManager.prototype.setKeychains = function (keychains) {
+  var data = this.migrator.getData()
+  data.keychains = keychains
+  this.setData(data)
+}
+
 ConfigManager.prototype.getSelectedAccount = function () {
   var config = this.getConfig()
   return config.selectedAccount
@@ -118,7 +137,7 @@ ConfigManager.prototype.getSelectedAccount = function () {
 
 ConfigManager.prototype.setSelectedAccount = function (address) {
   var config = this.getConfig()
-  config.selectedAccount = address
+  config.selectedAccount = ethUtil.addHexPrefix(address)
   this.setConfig(config)
 }
 
@@ -133,11 +152,23 @@ ConfigManager.prototype.setShowSeedWords = function (should) {
   this.setData(data)
 }
 
+
 ConfigManager.prototype.getShouldShowSeedWords = function () {
   var data = this.migrator.getData()
   return data.showSeedWords
 }
 
+ConfigManager.prototype.setSeedWords = function (words) {
+  var data = this.getData()
+  data.seedWords = words
+  this.setData(data)
+}
+
+ConfigManager.prototype.getSeedWords = function () {
+  var data = this.getData()
+  return ('seedWords' in data) && data.seedWords
+}
+
 ConfigManager.prototype.getCurrentRpcAddress = function () {
   var provider = this.getProvider()
   if (!provider) return null
@@ -174,61 +205,12 @@ ConfigManager.prototype.getTxList = function () {
   }
 }
 
-ConfigManager.prototype.unconfirmedTxs = function () {
-  var transactions = this.getTxList()
-  return transactions.filter(tx => tx.status === 'unconfirmed')
-  .reduce((result, tx) => { result[tx.id] = tx; return result }, {})
-}
-
-ConfigManager.prototype._saveTxList = function (txList) {
+ConfigManager.prototype.setTxList = function (txList) {
   var data = this.migrator.getData()
   data.transactions = txList
   this.setData(data)
 }
 
-ConfigManager.prototype.addTx = function (tx) {
-  var transactions = this.getTxList()
-  while (transactions.length > this.txLimit - 1) {
-    transactions.shift()
-  }
-  transactions.push(tx)
-  this._saveTxList(transactions)
-}
-
-ConfigManager.prototype.getTx = function (txId) {
-  var transactions = this.getTxList()
-  var matching = transactions.filter(tx => tx.id === txId)
-  return matching.length > 0 ? matching[0] : null
-}
-
-ConfigManager.prototype.confirmTx = function (txId) {
-  this._setTxStatus(txId, 'confirmed')
-}
-
-ConfigManager.prototype.rejectTx = function (txId) {
-  this._setTxStatus(txId, 'rejected')
-}
-
-ConfigManager.prototype._setTxStatus = function (txId, status) {
-  var tx = this.getTx(txId)
-  tx.status = status
-  this.updateTx(tx)
-}
-
-ConfigManager.prototype.updateTx = function (tx) {
-  var transactions = this.getTxList()
-  var found, index
-  transactions.forEach((otherTx, i) => {
-    if (otherTx.id === tx.id) {
-      found = true
-      index = i
-    }
-  })
-  if (found) {
-    transactions[index] = tx
-  }
-  this._saveTxList(transactions)
-}
 
 // wallet nickname methods
 
@@ -239,13 +221,15 @@ ConfigManager.prototype.getWalletNicknames = function () {
 }
 
 ConfigManager.prototype.nicknameForWallet = function (account) {
+  const address = normalize(account)
   const nicknames = this.getWalletNicknames()
-  return nicknames[account]
+  return nicknames[address]
 }
 
 ConfigManager.prototype.setNicknameForWallet = function (account, nickname) {
+  const address = normalize(account)
   const nicknames = this.getWalletNicknames()
-  nicknames[account] = nickname
+  nicknames[address] = nickname
   var data = this.getData()
   data.walletNicknames = nicknames
   this.setData(data)
@@ -253,6 +237,17 @@ ConfigManager.prototype.setNicknameForWallet = function (account, nickname) {
 
 // observable
 
+ConfigManager.prototype.getSalt = function () {
+  var data = this.getData()
+  return ('salt' in data) && data.salt
+}
+
+ConfigManager.prototype.setSalt = function (salt) {
+  var data = this.getData()
+  data.salt = salt
+  this.setData(data)
+}
+
 ConfigManager.prototype.subscribe = function (fn) {
   this._subs.push(fn)
   var unsubscribe = this.unsubscribe.bind(this, fn)
@@ -270,15 +265,15 @@ ConfigManager.prototype._emitUpdates = function (state) {
   })
 }
 
-ConfigManager.prototype.setConfirmed = function (confirmed) {
+ConfigManager.prototype.setConfirmedDisclaimer = function (confirmed) {
   var data = this.getData()
-  data.isConfirmed = confirmed
+  data.isDisclaimerConfirmed = confirmed
   this.setData(data)
 }
 
-ConfigManager.prototype.getConfirmed = function () {
+ConfigManager.prototype.getConfirmedDisclaimer = function () {
   var data = this.getData()
-  return ('isConfirmed' in data) && data.isConfirmed
+  return ('isDisclaimerConfirmed' in data) && data.isDisclaimerConfirmed
 }
 
 ConfigManager.prototype.setTOSHash = function (hash) {
@@ -305,9 +300,9 @@ ConfigManager.prototype.getCurrentFiat = function () {
 
 ConfigManager.prototype.updateConversionRate = function () {
   var data = this.getData()
-  return rp(`https://www.cryptonator.com/api/ticker/eth-${data.fiatCurrency}`)
-  .then((response) => {
-    const parsedResponse = JSON.parse(response)
+  return fetch(`https://www.cryptonator.com/api/ticker/eth-${data.fiatCurrency}`)
+  .then(response => response.json())
+  .then((parsedResponse) => {
     this.setConversionPrice(parsedResponse.ticker.price)
     this.setConversionDate(parsedResponse.timestamp)
   }).catch((err) => {
@@ -315,7 +310,6 @@ ConfigManager.prototype.updateConversionRate = function () {
     this.setConversionPrice(0)
     this.setConversionDate('N/A')
   })
-
 }
 
 ConfigManager.prototype.setConversionPrice = function (price) {
@@ -340,21 +334,6 @@ ConfigManager.prototype.getConversionDate = function () {
   return (('conversionDate' in data) && data.conversionDate) || 'N/A'
 }
 
-ConfigManager.prototype.setShouldntShowWarning = function () {
-  var data = this.getData()
-  if (data.isEthConfirmed) {
-    data.isEthConfirmed = !data.isEthConfirmed
-  } else {
-    data.isEthConfirmed = true
-  }
-  this.setData(data)
-}
-
-ConfigManager.prototype.getShouldntShowWarning = function () {
-  var data = this.getData()
-  return ('isEthConfirmed' in data) && data.isEthConfirmed
-}
-
 ConfigManager.prototype.getShapeShiftTxList = function () {
   var data = this.getData()
   var shapeShiftTxList = data.shapeShiftTxList ? data.shapeShiftTxList : []
@@ -400,3 +379,14 @@ ConfigManager.prototype.setGasMultiplier = function (gasMultiplier) {
   data.gasMultiplier = gasMultiplier
   this.setData(data)
 }
+
+ConfigManager.prototype.setLostAccounts = function (lostAccounts) {
+  var data = this.getData()
+  data.lostAccounts = lostAccounts
+  this.setData(data)
+}
+
+ConfigManager.prototype.getLostAccounts = function () {
+  var data = this.getData()
+  return data.lostAccounts || []
+}