6 files changed, 281 insertions, 22 deletions
diff --git a/app/scripts/lib/auto-faucet.js b/app/scripts/lib/auto-faucet.js
index 59cf0ec20..1e86f735e 100644
--- a/app/scripts/lib/auto-faucet.js
+++ b/app/scripts/lib/auto-faucet.js
@@ -1,6 +1,9 @@
-var uri = 'https://faucet.metamask.io/'
+const uri = 'https://faucet.metamask.io/'
+const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+const env = process.env.METAMASK_ENV
 
 module.exports = function (address) {
+  if (METAMASK_DEBUG || env === 'test') return // Don't faucet in development or test
   var http = new XMLHttpRequest()
   var data = address
   http.open('POST', uri, true)
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index cced32670..f50d95c12 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -2,6 +2,7 @@ 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 TESTNET_RPC = MetamaskConfig.network.testnet
 const MAINNET_RPC = MetamaskConfig.network.mainnet
@@ -110,6 +111,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 ('vault' in data) && 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
@@ -117,7 +139,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)
 }
 
@@ -132,11 +154,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
@@ -235,13 +269,15 @@ ConfigManager.prototype.getWalletNicknames = function () {
 }
 
 ConfigManager.prototype.nicknameForWallet = function (account) {
+  const address = ethUtil.addHexPrefix(account.toLowerCase())
   const nicknames = this.getWalletNicknames()
-  return nicknames[account]
+  return nicknames[address]
 }
 
 ConfigManager.prototype.setNicknameForWallet = function (account, nickname) {
+  const address = ethUtil.addHexPrefix(account.toLowerCase())
   const nicknames = this.getWalletNicknames()
-  nicknames[account] = nickname
+  nicknames[address] = nickname
   var data = this.getData()
   data.walletNicknames = nicknames
   this.setData(data)
@@ -249,6 +285,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)
@@ -336,21 +383,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 : []
diff --git a/app/scripts/lib/encryptor.js b/app/scripts/lib/encryptor.js
new file mode 100644
index 000000000..fe83b86dd
--- /dev/null
+++ b/app/scripts/lib/encryptor.js
@@ -0,0 +1,149 @@
+var ethUtil = require('ethereumjs-util')
+
+module.exports = {
+
+  // Simple encryption methods:
+  encrypt,
+  decrypt,
+
+  // More advanced encryption methods:
+  keyFromPassword,
+  encryptWithKey,
+  decryptWithKey,
+
+  // Buffer <-> String methods
+  convertArrayBufferViewtoString,
+  convertStringToArrayBufferView,
+
+  // Buffer <-> Hex string methods
+  serializeBufferForStorage,
+  serializeBufferFromStorage,
+
+  // Buffer <-> base64 string methods
+  encodeBufferToBase64,
+  decodeBase64ToBuffer,
+
+  generateSalt,
+}
+
+// Takes a Pojo, returns encrypted text.
+function encrypt (password, dataObj) {
+  return keyFromPassword(password)
+  .then(function (passwordDerivedKey) {
+    return encryptWithKey(passwordDerivedKey, dataObj)
+  })
+}
+
+function encryptWithKey (key, dataObj) {
+  var data = JSON.stringify(dataObj)
+  var dataBuffer = convertStringToArrayBufferView(data)
+  var vector = global.crypto.getRandomValues(new Uint8Array(16))
+
+  return global.crypto.subtle.encrypt({
+    name: 'AES-GCM',
+    iv: vector,
+  }, key, dataBuffer).then(function(buf){
+    var buffer = new Uint8Array(buf)
+    var vectorStr = encodeBufferToBase64(vector)
+    var vaultStr = encodeBufferToBase64(buffer)
+    return `${vaultStr}\\${vectorStr}`
+  })
+}
+
+// Takes encrypted text, returns the restored Pojo.
+function decrypt (password, text) {
+  return keyFromPassword(password)
+  .then(function (key) {
+    return decryptWithKey(key, text)
+  })
+}
+
+function decryptWithKey (key, text) {
+  const parts = text.split('\\')
+  const encryptedData = decodeBase64ToBuffer(parts[0])
+  const vector = decodeBase64ToBuffer(parts[1])
+  return crypto.subtle.decrypt({name: 'AES-GCM', iv: vector}, key, encryptedData)
+  .then(function(result){
+    const decryptedData = new Uint8Array(result)
+    const decryptedStr = convertArrayBufferViewtoString(decryptedData)
+    const decryptedObj = JSON.parse(decryptedStr)
+    return decryptedObj
+  })
+  .catch(function(reason) {
+    throw new Error('Incorrect password')
+  })
+}
+
+function convertStringToArrayBufferView (str) {
+  var bytes = new Uint8Array(str.length)
+  for (var i = 0; i < str.length; i++) {
+    bytes[i] = str.charCodeAt(i)
+  }
+
+  return bytes
+}
+
+function convertArrayBufferViewtoString (buffer) {
+  var str = ''
+  for (var i = 0; i < buffer.byteLength; i++) {
+    str += String.fromCharCode(buffer[i])
+  }
+
+  return str
+}
+
+function keyFromPassword (password) {
+  var passBuffer = convertStringToArrayBufferView(password)
+  return global.crypto.subtle.digest('SHA-256', passBuffer)
+  .then(function (passHash){
+    return global.crypto.subtle.importKey('raw', passHash, {name: 'AES-GCM'}, false, ['encrypt', 'decrypt'])
+  })
+}
+
+function serializeBufferFromStorage (str) {
+  str = ethUtil.stripHexPrefix(str)
+  var buf = new Uint8Array(str.length / 2)
+  for (var i = 0; i < str.length; i += 2) {
+    var seg = str.substr(i, 2)
+    buf[i / 2] = parseInt(seg, 16)
+  }
+  return buf
+}
+
+// Should return a string, ready for storage, in hex format.
+function serializeBufferForStorage (buffer) {
+  var result = '0x'
+  var len = buffer.length || buffer.byteLength
+  for (var i = 0; i < len; i++) {
+    result += unprefixedHex(buffer[i])
+  }
+  return result
+}
+
+function unprefixedHex (num) {
+  var hex = num.toString(16)
+  while (hex.length < 2) {
+    hex = '0' + hex
+  }
+  return hex
+}
+
+function encodeBufferToBase64 (buf) {
+  var b64encoded = btoa(String.fromCharCode.apply(null, buf))
+  return b64encoded
+}
+
+function decodeBase64ToBuffer (base64) {
+  var buf = new Uint8Array(atob(base64).split('')
+  .map(function(c) {
+    return c.charCodeAt(0)
+  }))
+  return buf
+}
+
+function generateSalt (byteCount = 32) {
+  var view = new Uint8Array(byteCount)
+  global.crypto.getRandomValues(view)
+  var b64encoded = btoa(String.fromCharCode.apply(null, view))
+  return b64encoded
+}
diff --git a/app/scripts/lib/idStore-migrator.js b/app/scripts/lib/idStore-migrator.js
new file mode 100644
index 000000000..2d1826641
--- /dev/null
+++ b/app/scripts/lib/idStore-migrator.js
@@ -0,0 +1,52 @@
+const IdentityStore = require('./idStore')
+
+
+module.exports = class IdentityStoreMigrator {
+
+  constructor ({ configManager }) {
+    this.configManager = configManager
+    const hasOldVault = this.hasOldVault()
+    if (!hasOldVault) {
+      this.idStore = new IdentityStore({ configManager })
+    }
+  }
+
+  oldSeedForPassword( password ) {
+    const hasOldVault = this.hasOldVault()
+    const configManager = this.configManager
+
+    if (!this.idStore) {
+      this.idStore = new IdentityStore({ configManager })
+    }
+
+    if (!hasOldVault) {
+      return Promise.resolve(null)
+    }
+
+    return new Promise((resolve, reject) => {
+      this.idStore.submitPassword(password, (err) => {
+        if (err) return reject(err)
+        try {
+          resolve(this.serializeVault())
+        } catch (e) {
+          reject(e)
+        }
+      })
+    })
+  }
+
+  serializeVault() {
+    const mnemonic = this.idStore._idmgmt.getSeed()
+    const n = this.idStore._getAddresses().length
+
+    return {
+      type: 'HD Key Tree',
+      data: { mnemonic, n },
+    }
+  }
+
+  hasOldVault() {
+    const wallet = this.configManager.getWallet()
+    return wallet
+  }
+}
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index dd895a6c0..23b14524e 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -103,7 +103,6 @@ IdentityStore.prototype.getState = function () {
     isUnlocked: this._isUnlocked(),
     seedWords: seedWords,
     isConfirmed: configManager.getConfirmed(),
-    isEthConfirmed: configManager.getShouldntShowWarning(),
     unconfTxs: configManager.unconfirmedTxs(),
     transactions: configManager.getTxList(),
     unconfMsgs: messageManager.unconfirmedMsgs(),
@@ -114,7 +113,6 @@ IdentityStore.prototype.getState = function () {
     conversionRate: configManager.getConversionRate(),
     conversionDate: configManager.getConversionDate(),
     gasMultiplier: configManager.getGasMultiplier(),
-
   }))
 }
 
@@ -426,7 +424,9 @@ IdentityStore.prototype._loadIdentities = function () {
   var addresses = this._getAddresses()
   addresses.forEach((address, i) => {
     // // add to ethStore
-    this._ethStore.addAccount(ethUtil.addHexPrefix(address))
+    if (this._ethStore) {
+      this._ethStore.addAccount(ethUtil.addHexPrefix(address))
+    }
     // add to identities
     const defaultLabel = 'Account ' + (i + 1)
     const nickname = configManager.nicknameForWallet(address)
diff --git a/app/scripts/lib/sig-util.js b/app/scripts/lib/sig-util.js
new file mode 100644
index 000000000..f8748f535
--- /dev/null
+++ b/app/scripts/lib/sig-util.js
@@ -0,0 +1,23 @@
+const ethUtil = require('ethereumjs-util')
+
+module.exports = {
+
+  concatSig: function (v, r, s) {
+    const rSig = ethUtil.fromSigned(r)
+    const sSig = ethUtil.fromSigned(s)
+    const vSig = ethUtil.bufferToInt(v)
+    const rStr = padWithZeroes(ethUtil.toUnsigned(rSig).toString('hex'), 64)
+    const sStr = padWithZeroes(ethUtil.toUnsigned(sSig).toString('hex'), 64)
+    const vStr = ethUtil.stripHexPrefix(ethUtil.intToHex(vSig))
+    return ethUtil.addHexPrefix(rStr.concat(sStr, vStr)).toString('hex')
+  },
+
+}
+
+function padWithZeroes (number, length) {
+  var myString = '' + number
+  while (myString.length < length) {
+    myString = '0' + myString
+  }
+  return myString
+}