Merge branch 'dev' into TxManager

3 files changed, 44 insertions, 166 deletions

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index a32842cc7..c723655fa 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -380,3 +380,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 || []
+}
diff --git a/app/scripts/lib/encryptor.js b/app/scripts/lib/encryptor.js
deleted file mode 100644
index 4770d2f54..000000000
--- a/app/scripts/lib/encryptor.js
+++ /dev/null
@@ -1,156 +0,0 @@
-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 cypher text.
-function encrypt (password, dataObj) {
-  const salt = this.generateSalt()
-
-  return keyFromPassword(password + salt)
-  .then(function (passwordDerivedKey) {
-    return encryptWithKey(passwordDerivedKey, dataObj)
-  })
-  .then(function (payload) {
-    payload.salt = salt
-    return JSON.stringify(payload)
-  })
-}
-
-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 {
-      data: vaultStr,
-      iv: vectorStr,
-    }
-  })
-}
-
-// Takes encrypted text, returns the restored Pojo.
-function decrypt (password, text) {
-  const payload = JSON.parse(text)
-  const salt = payload.salt
-  return keyFromPassword(password + salt)
-  .then(function (key) {
-    return decryptWithKey(key, payload)
-  })
-}
-
-function decryptWithKey (key, payload) {
-  const encryptedData = decodeBase64ToBuffer(payload.data)
-  const vector = decodeBase64ToBuffer(payload.iv)
-  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) {
-  var stripStr = (str.slice(0, 2) === '0x') ? str.slice(2) : str
-  var buf = new Uint8Array(stripStr.length / 2)
-  for (var i = 0; i < stripStr.length; i += 2) {
-    var seg = stripStr.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
index 40b08efee..2e9418376 100644
--- a/app/scripts/lib/idStore-migrator.js
+++ b/app/scripts/lib/idStore-migrator.js
@@ -1,5 +1,8 @@
 const IdentityStore = require('./idStore')
-
+const HdKeyring = require('../keyrings/hd')
+const sigUtil = require('./sig-util')
+const normalize = sigUtil.normalize
+const denodeify = require('denodeify')
 
 module.exports = class IdentityStoreMigrator {
 
@@ -23,15 +26,13 @@ module.exports = class IdentityStoreMigrator {
       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)
-        }
-      })
+    const idStore = this.idStore
+    const submitPassword = denodeify(idStore.submitPassword.bind(idStore))
+
+    return submitPassword(password)
+    .then(() => {
+      const serialized = this.serializeVault()
+      return this.checkForLostAccounts(serialized)
     })
   }
 
@@ -45,6 +46,28 @@ module.exports = class IdentityStoreMigrator {
     }
   }
 
+  checkForLostAccounts (serialized) {
+    const hd = new HdKeyring()
+    return hd.deserialize(serialized.data)
+    .then((hexAccounts) => {
+      const newAccounts = hexAccounts.map(normalize)
+      const oldAccounts = this.idStore._getAddresses().map(normalize)
+      const lostAccounts = oldAccounts.reduce((result, account) => {
+        if (newAccounts.includes(account)) {
+          return result
+        } else {
+          result.push(account)
+          return result
+        }
+      }, [])
+
+      return {
+        serialized,
+        lostAccounts,
+      }
+    })
+  }
+
   hasOldVault () {
     const wallet = this.configManager.getWallet()
     return wallet