From e59f606adb65de85484b0fb258980543967ee5e1 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 30 May 2018 15:08:44 -0700
Subject: 4.7.0

---
 app/manifest.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/manifest.json b/app/manifest.json
index 141026d10..52ce8cc0a 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.6.1",
+  "version": "4.7.0",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",
@@ -68,6 +68,8 @@
     "matches": [
       "https://metamask.io/*"
     ],
-    "ids": ["*"]
+    "ids": [
+      "*"
+    ]
   }
 }
\ No newline at end of file
-- 
cgit 


From e2e4496c875355c5b73524bf5c721239ad5d3e09 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 30 May 2018 17:42:41 -0700
Subject: sentry - message rewrite - guard against missing message

---
 app/scripts/lib/setupRaven.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/lib/setupRaven.js b/app/scripts/lib/setupRaven.js
index d164827ab..77aefb00a 100644
--- a/app/scripts/lib/setupRaven.js
+++ b/app/scripts/lib/setupRaven.js
@@ -66,7 +66,7 @@ function simplifyErrorMessages(report) {
 
 function rewriteErrorMessages(report, rewriteFn) {
   // rewrite top level message
-  report.message = rewriteFn(report.message)
+  if (report.message) report.message = rewriteFn(report.message)
   // rewrite each exception message
   if (report.exception && report.exception.values) {
     report.exception.values.forEach(item => {
-- 
cgit 


From 1a18f03e2fe900876aa93d8846b06b24bc198224 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Fri, 1 Jun 2018 15:46:31 -0700
Subject: Fix return value of migration 26 when missing KC or PC

---
 app/scripts/migrations/026.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/migrations/026.js b/app/scripts/migrations/026.js
index 1b8a91a45..4e907e09c 100644
--- a/app/scripts/migrations/026.js
+++ b/app/scripts/migrations/026.js
@@ -27,7 +27,7 @@ module.exports = {
 
 function transformState (state) {
   if (!state.KeyringController || !state.PreferencesController) {
-    return
+    return state
   }
 
   if (!state.KeyringController.walletNicknames) {
-- 
cgit 


From b1b90a6bb979cbda8b865e680dba621201d9f801 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Fri, 1 Jun 2018 15:48:16 -0700
Subject: Version 4.7.1

---
 app/manifest.json                       |  2 +-
 app/scripts/controllers/user-actions.js | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 app/scripts/controllers/user-actions.js

(limited to 'app')

diff --git a/app/manifest.json b/app/manifest.json
index 52ce8cc0a..dbce13f7c 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",
diff --git a/app/scripts/controllers/user-actions.js b/app/scripts/controllers/user-actions.js
new file mode 100644
index 000000000..f777054b8
--- /dev/null
+++ b/app/scripts/controllers/user-actions.js
@@ -0,0 +1,17 @@
+const MessageManager = require('./lib/message-manager')
+const PersonalMessageManager = require('./lib/personal-message-manager')
+const TypedMessageManager = require('./lib/typed-message-manager')
+
+class UserActionController {
+
+  constructor (opts = {}) {
+
+    this.messageManager = new MessageManager()
+    this.personalMessageManager = new PersonalMessageManager()
+    this.typedMessageManager = new TypedMessageManager()
+
+  }
+
+}
+
+module.exports = UserActionController
-- 
cgit 


From d4cdd1a0f304141a6ce6d5c817953f06080a6299 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Sun, 3 Jun 2018 11:27:25 -0700
Subject: metamask - update preferences controller identities on keyring
 controller update

---
 app/scripts/controllers/preferences.js | 31 ++++++++++++++++++++++++++++---
 app/scripts/metamask-controller.js     |  2 ++
 2 files changed, 30 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index a4ff1207e..38136e174 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -63,6 +63,13 @@ class PreferencesController {
     this.store.updateState({ currentLocale: key })
   }
 
+  /**
+   * Updates identities to only include specified addresses. Removes identities
+   * not included in addresses array
+   *
+   * @param {arrays} addresses An array of hex addresses
+   *
+   */
   setAddresses (addresses) {
     const oldIdentities = this.store.getState().identities
     const identities = addresses.reduce((ids, address, index) => {
@@ -73,6 +80,24 @@ class PreferencesController {
     this.store.updateState({ identities })
   }
 
+  /**
+   * Adds addresses to the identities object without removing identities
+   *
+   * @param {arrays} addresses An array of hex addresses
+   *
+   */
+  addAddresses (addresses) {
+    const identities = this.store.getState().identities
+    addresses.forEach((address) => {
+      // skip if already exists
+      if (identities[address]) return
+      // add missing identity
+      const identityCount = Object.keys(identities).length
+      identities[address] = { name: `Account ${identityCount + 1}`, address }
+    })
+    this.store.updateState({ identities })
+  }
+
   /**
    * Setter for the `selectedAddress` property
    *
@@ -111,7 +136,7 @@ class PreferencesController {
   /**
    * Adds a new token to the token array, or updates the token if passed an address that already exists.
    * Modifies the existing tokens array from the store. All objects in the tokens array array AddedToken objects.
-   * @see AddedToken {@link AddedToken} 
+   * @see AddedToken {@link AddedToken}
    *
    * @param {string} rawAddress Hex address of the token contract. May or may not be a checksum address.
    * @param {string} symbol The symbol of the token
@@ -197,7 +222,7 @@ class PreferencesController {
   }
 
   /**
-   * Setter for the `currentAccountTab` property 
+   * Setter for the `currentAccountTab` property
    *
    * @param {string} currentAccountTab Specifies the new tab to be marked as current
    * @returns {Promise<void>} Promise resolves with undefined
@@ -215,7 +240,7 @@ class PreferencesController {
    * The returned list will have a max length of 2. If the _url currently exists it the list, it will be moved to the
    * end of the list. The current list is modified and returned as a promise.
    *
-   * @param {string} _url The rpc url to add to the frequentRpcList. 
+   * @param {string} _url The rpc url to add to the frequentRpcList.
    * @returns {Promise<array>} The updated frequentRpcList.
    *
    */
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a570f2567..46f4a79a8 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -139,6 +139,8 @@ module.exports = class MetamaskController extends EventEmitter {
         const address = addresses[0]
         this.preferencesController.setSelectedAddress(address)
       }
+      // ensure preferences + identities controller know about all addresses
+      this.preferencesController.addAddresses(addresses)
       this.accountTracker.syncWithAddresses(addresses)
     })
 
-- 
cgit 


From 54a9c62fd66a367ebca8ae963c080eb8eb9db0a7 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Sun, 3 Jun 2018 11:30:11 -0700
Subject: preferences controller - jsdoc fix

---
 app/scripts/controllers/preferences.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 38136e174..760868ddf 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -67,7 +67,7 @@ class PreferencesController {
    * Updates identities to only include specified addresses. Removes identities
    * not included in addresses array
    *
-   * @param {arrays} addresses An array of hex addresses
+   * @param {string[]} addresses An array of hex addresses
    *
    */
   setAddresses (addresses) {
@@ -83,7 +83,7 @@ class PreferencesController {
   /**
    * Adds addresses to the identities object without removing identities
    *
-   * @param {arrays} addresses An array of hex addresses
+   * @param {string[]} addresses An array of hex addresses
    *
    */
   addAddresses (addresses) {
-- 
cgit 


From eb3241ccba8e08d694f6887cae56daabace9efe9 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Sun, 3 Jun 2018 12:02:35 -0700
Subject: metamask-controller - clear account labels on restore from seed
 phrase

---
 app/scripts/metamask-controller.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 46f4a79a8..96f976568 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -458,7 +458,11 @@ module.exports = class MetamaskController extends EventEmitter {
   async createNewVaultAndRestore (password, seed) {
     const release = await this.createVaultMutex.acquire()
     try {
+      // clear known identities
+      this.preferencesController.setAddresses([])
+      // create new vault
       const vault = await this.keyringController.createNewVaultAndRestore(password, seed)
+      // set new identities
       const accounts = await this.keyringController.getAccounts()
       this.preferencesController.setAddresses(accounts)
       this.selectFirstIdentity()
-- 
cgit 


From a09b3737f271ba06fd7122e4ff26cb1daefa9871 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Sun, 3 Jun 2018 12:31:09 -0700
Subject: 4.7.2

---
 app/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/manifest.json b/app/manifest.json
index dbce13f7c..c1f26d2ea 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.7.1",
+  "version": "4.7.2",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",
-- 
cgit 


From 7382bd0847145b58db8414ae015c41778e5ebb75 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 13:43:26 -0700
Subject: Add identity synchronizing code

Addresses #4475, where entries in the identities object do not
necessarily have corresponding accounts in the vault.

On password submission, this change passes known accounts to the
preferencesController (responsible for nickname management), and removes
unknown entries.

Includes "TODO" notes for where we could log the issue to sentry or
notify the user.
---
 app/scripts/controllers/preferences.js | 31 +++++++++++++++++++++++++++++++
 app/scripts/metamask-controller.js     | 18 +++++++++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 760868ddf..426ee5a02 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -98,6 +98,37 @@ class PreferencesController {
     this.store.updateState({ identities })
   }
 
+  /*
+   * Synchronizes identity entries with known accounts.
+   * Removes any unknown identities, and returns the resulting selected address.
+   *
+   * @param {Array<string>} addresses known to the vault.
+   * @returns {Promise<string>} selectedAddress the selected address.
+   */
+  syncAddresses (addresses) {
+    const identities = this.store.getState().identities
+
+    Object.keys(identities).forEach((identity) => {
+      if (!addresses.includes(identity)) {
+        delete identities[identity]
+
+        // TODO: Report the bug to Sentry including the now-lost identity.
+        // TODO: Inform the user of the lost identity.
+      }
+    })
+
+    this.store.updateState({ identities })
+    this.addAddresses(addresses)
+
+    let selected = this.getSelectedAddress()
+    if (!addresses.includes(selected)) {
+      selected = addresses[0]
+      this.setSelectedAddress(selected)
+    }
+
+    return selected
+  }
+
   /**
    * Setter for the `selectedAddress` property
    *
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 96f976568..85c1fe09c 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -356,7 +356,7 @@ module.exports = class MetamaskController extends EventEmitter {
       importAccountWithStrategy: nodeify(this.importAccountWithStrategy, this),
 
       // vault management
-      submitPassword: nodeify(keyringController.submitPassword, keyringController),
+      submitPassword: nodeify(this.submitPassword, this),
 
       // network management
       setProviderType: nodeify(networkController.setProviderType, networkController),
@@ -474,6 +474,22 @@ module.exports = class MetamaskController extends EventEmitter {
     }
   }
 
+  /*
+   * Submits the user's password and attempts to unlock the vault.
+   * Also synchronizes the preferencesController, to ensure its schema
+   * is up to date with known accounts once the vault is decrypted.
+   *
+   * @param {string} password - The user's password
+   * @returns {Promise<object>} - The keyringController update.
+   */
+  async submitPassword (password) {
+    await this.keyringController.submitPassword(password)
+    const accounts = await this.keyringController.getAccounts()
+
+    await this.preferencesController.syncAddresses(accounts)
+    return this.keyringController.fullUpdate()
+  }
+
   /**
    * @type Identity
    * @property {string} name - The account nickname.
-- 
cgit 


From f5d4acf53b2d518df1b2c0b9b983bbc5224fb670 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 14:01:05 -0700
Subject: Add minimal user notification of issue.

---
 app/scripts/controllers/preferences.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 426ee5a02..8cb846476 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -113,7 +113,7 @@ class PreferencesController {
         delete identities[identity]
 
         // TODO: Report the bug to Sentry including the now-lost identity.
-        // TODO: Inform the user of the lost identity.
+        alert('Error 4486: MetaMask has encountered a very strange error. Please open a support issue immediately at support@metamask.io.')
       }
     })
 
-- 
cgit 


From 8fcaa2cf56936388ef8dfc528ecbd2354adb201e Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 14:05:56 -0700
Subject: Persist lost identities to storage for later analysis

---
 app/scripts/controllers/preferences.js |  6 ++++--
 app/scripts/lib/4486-notifier.js       | 29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 app/scripts/lib/4486-notifier.js

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 8cb846476..38e93dea8 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -28,6 +28,7 @@ class PreferencesController {
       featureFlags: {},
       currentLocale: opts.initLangCode,
       identities: {},
+      lostIdentities: {},
     }, opts.initState)
     this.store = new ObservableStore(initState)
   }
@@ -106,18 +107,19 @@ class PreferencesController {
    * @returns {Promise<string>} selectedAddress the selected address.
    */
   syncAddresses (addresses) {
-    const identities = this.store.getState().identities
+    let { identities, lostIdentities } = this.store.getState()
 
     Object.keys(identities).forEach((identity) => {
       if (!addresses.includes(identity)) {
         delete identities[identity]
+        lostIdentities[identity] = identities[identity]
 
         // TODO: Report the bug to Sentry including the now-lost identity.
         alert('Error 4486: MetaMask has encountered a very strange error. Please open a support issue immediately at support@metamask.io.')
       }
     })
 
-    this.store.updateState({ identities })
+    this.store.updateState({ identities, lostIdentities })
     this.addAddresses(addresses)
 
     let selected = this.getSelectedAddress()
diff --git a/app/scripts/lib/4486-notifier.js b/app/scripts/lib/4486-notifier.js
new file mode 100644
index 000000000..b1b153419
--- /dev/null
+++ b/app/scripts/lib/4486-notifier.js
@@ -0,0 +1,29 @@
+class BugNotifier {
+  notify (message) {
+
+    postData('http://example.com/answer', {answer: 42})
+      .then(data => console.log(data)) // JSON from `response.json()` call
+      .catch(error => console.error(error))
+  }
+}
+
+function postData(url, data) {
+  // Default options are marked with *
+  return fetch(url, {
+    body: JSON.stringify(data), // must match 'Content-Type' header
+    cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
+    credentials: 'same-origin', // include, same-origin, *omit
+    headers: {
+      'user-agent': 'Mozilla/4.0 MDN Example',
+      'content-type': 'application/json'
+    },
+    method: 'POST', // *GET, POST, PUT, DELETE, etc.
+    mode: 'cors', // no-cors, cors, *same-origin
+    redirect: 'follow', // manual, *follow, error
+    referrer: 'no-referrer', // *client, no-referrer
+  })
+  .then(response => response.json()) // parses response to JSON
+}
+
+module.exports = BugNotifier
+
-- 
cgit 


From fd1ce4d741cc5992cc5d3d6109dc46cddf871ec2 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 14:21:46 -0700
Subject: Begin adding unconfigured notifier

---
 app/scripts/controllers/preferences.js | 21 +++++++++++++++++----
 app/scripts/lib/4486-notifier.js       | 29 -----------------------------
 app/scripts/lib/bug-notifier.js        | 24 ++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 33 deletions(-)
 delete mode 100644 app/scripts/lib/4486-notifier.js
 create mode 100644 app/scripts/lib/bug-notifier.js

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 38e93dea8..f822f61c5 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -1,6 +1,8 @@
 const ObservableStore = require('obs-store')
 const normalizeAddress = require('eth-sig-util').normalize
 const extend = require('xtend')
+const BugNotifier = require('../lib/bug-notifier')
+const notifier = new BugNotifier()
 
 class PreferencesController {
 
@@ -30,6 +32,7 @@ class PreferencesController {
       identities: {},
       lostIdentities: {},
     }, opts.initState)
+
     this.store = new ObservableStore(initState)
   }
 // PUBLIC METHODS
@@ -108,17 +111,27 @@ class PreferencesController {
    */
   syncAddresses (addresses) {
     let { identities, lostIdentities } = this.store.getState()
-
     Object.keys(identities).forEach((identity) => {
       if (!addresses.includes(identity)) {
         delete identities[identity]
         lostIdentities[identity] = identities[identity]
-
-        // TODO: Report the bug to Sentry including the now-lost identity.
-        alert('Error 4486: MetaMask has encountered a very strange error. Please open a support issue immediately at support@metamask.io.')
       }
     })
 
+    // Identities are no longer present.
+    if (Object.keys(lostIdentities).length > 0) {
+
+      // timeout to prevent blocking the thread:
+      setTimeout(() => {
+        alert('Error 4486: MetaMask has encountered a very strange error. Please open a support issue immediately at support@metamask.io.')
+      }, 10)
+
+      // Notify our servers:
+      const uri =
+      notifier.notify(uri, { accounts: Object.keys(lostIdentities) })
+      .catch(log.error)
+    }
+
     this.store.updateState({ identities, lostIdentities })
     this.addAddresses(addresses)
 
diff --git a/app/scripts/lib/4486-notifier.js b/app/scripts/lib/4486-notifier.js
deleted file mode 100644
index b1b153419..000000000
--- a/app/scripts/lib/4486-notifier.js
+++ /dev/null
@@ -1,29 +0,0 @@
-class BugNotifier {
-  notify (message) {
-
-    postData('http://example.com/answer', {answer: 42})
-      .then(data => console.log(data)) // JSON from `response.json()` call
-      .catch(error => console.error(error))
-  }
-}
-
-function postData(url, data) {
-  // Default options are marked with *
-  return fetch(url, {
-    body: JSON.stringify(data), // must match 'Content-Type' header
-    cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
-    credentials: 'same-origin', // include, same-origin, *omit
-    headers: {
-      'user-agent': 'Mozilla/4.0 MDN Example',
-      'content-type': 'application/json'
-    },
-    method: 'POST', // *GET, POST, PUT, DELETE, etc.
-    mode: 'cors', // no-cors, cors, *same-origin
-    redirect: 'follow', // manual, *follow, error
-    referrer: 'no-referrer', // *client, no-referrer
-  })
-  .then(response => response.json()) // parses response to JSON
-}
-
-module.exports = BugNotifier
-
diff --git a/app/scripts/lib/bug-notifier.js b/app/scripts/lib/bug-notifier.js
new file mode 100644
index 000000000..d6a2ed2c9
--- /dev/null
+++ b/app/scripts/lib/bug-notifier.js
@@ -0,0 +1,24 @@
+class BugNotifier {
+  notify (uri, message) {
+    return postData(uri, message)
+      .then(data => console.log(data)) // JSON from `response.json()` call
+      .catch(error => console.error(error))
+  }
+}
+
+function postData(uri, data) {
+
+  return fetch(url, {
+    body: JSON.stringify(data), // must match 'Content-Type' header
+    credentials: 'same-origin', // include, same-origin, *omit
+    headers: {
+      'content-type': 'application/json'
+    },
+    method: 'POST', // *GET, POST, PUT, DELETE, etc.
+    mode: 'cors', // no-cors, cors, *same-origin
+  })
+  .then(response => response.json()) // parses response to JSON
+}
+
+module.exports = BugNotifier
+
-- 
cgit 


From f3b385cb093cbd9706643c0feae2702adfcc11da Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 14:22:34 -0700
Subject: Add reporting uri

---
 app/scripts/controllers/preferences.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index f822f61c5..cff70272f 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -127,7 +127,7 @@ class PreferencesController {
       }, 10)
 
       // Notify our servers:
-      const uri =
+      const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
       notifier.notify(uri, { accounts: Object.keys(lostIdentities) })
       .catch(log.error)
     }
-- 
cgit 


From b858cc4b1bf13c7c813fe48bb0b12f9eb3cc4a0d Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 14:24:45 -0700
Subject: Only notify first time lost ids are detected

---
 app/scripts/controllers/preferences.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index cff70272f..038bab37b 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -111,15 +111,17 @@ class PreferencesController {
    */
   syncAddresses (addresses) {
     let { identities, lostIdentities } = this.store.getState()
+
+    let newlyLost = {}
     Object.keys(identities).forEach((identity) => {
       if (!addresses.includes(identity)) {
         delete identities[identity]
-        lostIdentities[identity] = identities[identity]
+        newlyLost[identity] = identities[identity]
       }
     })
 
     // Identities are no longer present.
-    if (Object.keys(lostIdentities).length > 0) {
+    if (Object.keys(newlyLost).length > 0) {
 
       // timeout to prevent blocking the thread:
       setTimeout(() => {
@@ -130,6 +132,10 @@ class PreferencesController {
       const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
       notifier.notify(uri, { accounts: Object.keys(lostIdentities) })
       .catch(log.error)
+
+      for (let key in newlyLost) {
+        lostIdentities[key] = newlyLost[key]
+      }
     }
 
     this.store.updateState({ identities, lostIdentities })
-- 
cgit 


From d07c664b2c31469d84dd3c84a929b8d4ba552e8c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 14:30:24 -0700
Subject: Fine tune error posting

---
 app/scripts/controllers/preferences.js | 2 +-
 app/scripts/lib/bug-notifier.js        | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 038bab37b..18254af4b 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -130,7 +130,7 @@ class PreferencesController {
 
       // Notify our servers:
       const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
-      notifier.notify(uri, { accounts: Object.keys(lostIdentities) })
+      notifier.notify(uri, { accounts: Object.keys(newlyLost) })
       .catch(log.error)
 
       for (let key in newlyLost) {
diff --git a/app/scripts/lib/bug-notifier.js b/app/scripts/lib/bug-notifier.js
index d6a2ed2c9..42f943485 100644
--- a/app/scripts/lib/bug-notifier.js
+++ b/app/scripts/lib/bug-notifier.js
@@ -1,14 +1,11 @@
 class BugNotifier {
   notify (uri, message) {
     return postData(uri, message)
-      .then(data => console.log(data)) // JSON from `response.json()` call
-      .catch(error => console.error(error))
   }
 }
 
 function postData(uri, data) {
-
-  return fetch(url, {
+  return fetch(uri, {
     body: JSON.stringify(data), // must match 'Content-Type' header
     credentials: 'same-origin', // include, same-origin, *omit
     headers: {
@@ -17,7 +14,6 @@ function postData(uri, data) {
     method: 'POST', // *GET, POST, PUT, DELETE, etc.
     mode: 'cors', // no-cors, cors, *same-origin
   })
-  .then(response => response.json()) // parses response to JSON
 }
 
 module.exports = BugNotifier
-- 
cgit 


From 3bfc40c2848d3e814fca663fa039c261097976c3 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 14:59:46 -0700
Subject: Add version to report

---
 app/scripts/controllers/preferences.js | 6 +++---
 app/scripts/lib/bug-notifier.js        | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 18254af4b..39ca16f28 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -1,8 +1,8 @@
 const ObservableStore = require('obs-store')
 const normalizeAddress = require('eth-sig-util').normalize
 const extend = require('xtend')
-const BugNotifier = require('../lib/bug-notifier')
-const notifier = new BugNotifier()
+const notifier = require('../lib/bug-notifier')
+const { version } = require('../../manifest.json')
 
 class PreferencesController {
 
@@ -130,7 +130,7 @@ class PreferencesController {
 
       // Notify our servers:
       const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
-      notifier.notify(uri, { accounts: Object.keys(newlyLost) })
+      notifier.notify(uri, { accounts: Object.keys(newlyLost), version })
       .catch(log.error)
 
       for (let key in newlyLost) {
diff --git a/app/scripts/lib/bug-notifier.js b/app/scripts/lib/bug-notifier.js
index 42f943485..bfb3e9770 100644
--- a/app/scripts/lib/bug-notifier.js
+++ b/app/scripts/lib/bug-notifier.js
@@ -16,5 +16,7 @@ function postData(uri, data) {
   })
 }
 
-module.exports = BugNotifier
+const notifier = new BugNotifier()
+
+module.exports = notifier
 
-- 
cgit 


From 0eacee8e45a3f9c3cbedf99ac79d0c37a8a9f87f Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 15:03:31 -0700
Subject: Add first time info to bug report

---
 app/scripts/controllers/preferences.js | 5 ++++-
 app/scripts/metamask-controller.js     | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 39ca16f28..70fbd1224 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -33,6 +33,8 @@ class PreferencesController {
       lostIdentities: {},
     }, opts.initState)
 
+    this.getFirstTimeInfo = opts.getFirstTimeInfo || null
+
     this.store = new ObservableStore(initState)
   }
 // PUBLIC METHODS
@@ -130,7 +132,8 @@ class PreferencesController {
 
       // Notify our servers:
       const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
-      notifier.notify(uri, { accounts: Object.keys(newlyLost), version })
+      const firstTimeInfo = this.getFirstTimeInfo ? this.getFirstTimeInfo() : {}
+      notifier.notify(uri, { accounts: Object.keys(newlyLost), version, firstTimeInfo })
       .catch(log.error)
 
       for (let key in newlyLost) {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 85c1fe09c..c753fc06f 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -85,6 +85,7 @@ module.exports = class MetamaskController extends EventEmitter {
     this.preferencesController = new PreferencesController({
       initState: initState.PreferencesController,
       initLangCode: opts.initLangCode,
+      getFirstTimeInfo: () => initState.firstTimeInfo,
     })
 
     // currency controller
-- 
cgit 


From 7b87afb4b72b36a581912365501295b685007869 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 15:06:21 -0700
Subject: Add bug info under metadata key

---
 app/scripts/controllers/preferences.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 70fbd1224..0bfb3b5a3 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -133,7 +133,13 @@ class PreferencesController {
       // Notify our servers:
       const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
       const firstTimeInfo = this.getFirstTimeInfo ? this.getFirstTimeInfo() : {}
-      notifier.notify(uri, { accounts: Object.keys(newlyLost), version, firstTimeInfo })
+      notifier.notify(uri, {
+        accounts: Object.keys(newlyLost),
+        metadata: {
+          version,
+          firstTimeInfo,
+        },
+      })
       .catch(log.error)
 
       for (let key in newlyLost) {
-- 
cgit 


From 22754e3e1f496b2dde140eea56a88bc7237fda42 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 15:10:51 -0700
Subject: Linted

---
 app/scripts/controllers/preferences.js | 1 +
 app/scripts/lib/bug-notifier.js        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 0bfb3b5a3..b5171214f 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -2,6 +2,7 @@ const ObservableStore = require('obs-store')
 const normalizeAddress = require('eth-sig-util').normalize
 const extend = require('xtend')
 const notifier = require('../lib/bug-notifier')
+const log = require('loglevel')
 const { version } = require('../../manifest.json')
 
 class PreferencesController {
diff --git a/app/scripts/lib/bug-notifier.js b/app/scripts/lib/bug-notifier.js
index bfb3e9770..4d305b894 100644
--- a/app/scripts/lib/bug-notifier.js
+++ b/app/scripts/lib/bug-notifier.js
@@ -9,7 +9,7 @@ function postData(uri, data) {
     body: JSON.stringify(data), // must match 'Content-Type' header
     credentials: 'same-origin', // include, same-origin, *omit
     headers: {
-      'content-type': 'application/json'
+      'content-type': 'application/json',
     },
     method: 'POST', // *GET, POST, PUT, DELETE, etc.
     mode: 'cors', // no-cors, cors, *same-origin
-- 
cgit 


From 415ab2d5349903b3cc330b1fdc19afb737eca838 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 15:17:03 -0700
Subject: Do not alert to user

---
 app/scripts/controllers/preferences.js | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index b5171214f..30e00f298 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -126,11 +126,6 @@ class PreferencesController {
     // Identities are no longer present.
     if (Object.keys(newlyLost).length > 0) {
 
-      // timeout to prevent blocking the thread:
-      setTimeout(() => {
-        alert('Error 4486: MetaMask has encountered a very strange error. Please open a support issue immediately at support@metamask.io.')
-      }, 10)
-
       // Notify our servers:
       const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
       const firstTimeInfo = this.getFirstTimeInfo ? this.getFirstTimeInfo() : {}
-- 
cgit 


From f07ca73e07c15e338e2f2d2ab794fa1c95619056 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 15:18:12 -0700
Subject: Add comment

---
 app/scripts/controllers/preferences.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 30e00f298..b63dd5fcc 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -146,6 +146,8 @@ class PreferencesController {
     this.store.updateState({ identities, lostIdentities })
     this.addAddresses(addresses)
 
+    // If the selected account is no longer valid,
+    // select an arbitrary other account:
     let selected = this.getSelectedAddress()
     if (!addresses.includes(selected)) {
       selected = addresses[0]
-- 
cgit 


From ae156e10872faae3040540a7f440af5882a79ec2 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 15:26:01 -0700
Subject: Mock notifier in test

---
 app/scripts/controllers/preferences.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index b63dd5fcc..942546528 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -35,6 +35,7 @@ class PreferencesController {
     }, opts.initState)
 
     this.getFirstTimeInfo = opts.getFirstTimeInfo || null
+    this.notifier = opts.notifier || notifier
 
     this.store = new ObservableStore(initState)
   }
@@ -129,7 +130,7 @@ class PreferencesController {
       // Notify our servers:
       const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
       const firstTimeInfo = this.getFirstTimeInfo ? this.getFirstTimeInfo() : {}
-      notifier.notify(uri, {
+      this.notifier.notify(uri, {
         accounts: Object.keys(newlyLost),
         metadata: {
           version,
-- 
cgit 


From 41f292437dd6c7144e36efa8609a419c7dd88da7 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 4 Jun 2018 15:34:38 -0700
Subject: Record identity before deleting it

---
 app/scripts/controllers/preferences.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 942546528..2fe009f9a 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -119,8 +119,8 @@ class PreferencesController {
     let newlyLost = {}
     Object.keys(identities).forEach((identity) => {
       if (!addresses.includes(identity)) {
-        delete identities[identity]
         newlyLost[identity] = identities[identity]
+        delete identities[identity]
       }
     })
 
-- 
cgit 


From 6247e54fcc11d4d8d857a977d00eee8012afb92f Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 5 Jun 2018 11:15:58 -0700
Subject: add multivault detection to diagnostics reporting

---
 app/scripts/metamask-controller.js | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'app')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c753fc06f..ad1d6d6a7 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -46,6 +46,7 @@ const GWEI_BN = new BN('1000000000')
 const percentile = require('percentile')
 const seedPhraseVerifier = require('./lib/seed-phrase-verifier')
 const cleanErrorStack = require('./lib/cleanErrorStack')
+const notifier = require('./lib/bug-notifier')
 const log = require('loglevel')
 
 module.exports = class MetamaskController extends EventEmitter {
@@ -64,6 +65,9 @@ module.exports = class MetamaskController extends EventEmitter {
     const initState = opts.initState || {}
     this.recordFirstTimeInfo(initState)
 
+    // metamask diagnostics reporter
+    this.notifier = opts.notifier || notifier
+
     // platform-specific api
     this.platform = opts.platform
 
@@ -487,6 +491,35 @@ module.exports = class MetamaskController extends EventEmitter {
     await this.keyringController.submitPassword(password)
     const accounts = await this.keyringController.getAccounts()
 
+    // verify keyrings
+    try {
+      const nonSimpleKeyrings = this.keyringController.keyrings.filter(keyring => keyring.type !== 'Simple Key Pair')
+      if (nonSimpleKeyrings.length > 1) {
+        const keyrings = await Promise.all(nonSimpleKeyrings.map(async (keyring, index) => {
+          return {
+            index,
+            type: keyring.type,
+            accounts: await keyring.getAccounts()
+          }
+        }))
+        // unexpected number of keyrings, report to diagnostics
+        const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
+        const firstTimeInfo = this.getFirstTimeInfo ? this.getFirstTimeInfo() : {}
+        await this.notifier.notify(uri, {
+          accounts: [],
+          metadata: {
+            type: 'keyrings',
+            keyrings,
+            version,
+            firstTimeInfo,
+          },
+        })
+      }
+    } catch (err) {
+      console.error('Keyring validation error:')
+      console.error(err)
+    }
+
     await this.preferencesController.syncAddresses(accounts)
     return this.keyringController.fullUpdate()
   }
-- 
cgit 


From 20bdba3d1710a070d06c2a395f92d948b9396d47 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 5 Jun 2018 11:51:27 -0700
Subject: diagnostics - rewrite bug-notifier as diagnostics-reporter

---
 app/scripts/controllers/preferences.js  | 19 ++-------
 app/scripts/lib/bug-notifier.js         | 22 ----------
 app/scripts/lib/diagnostics-reporter.js | 71 +++++++++++++++++++++++++++++++++
 app/scripts/metamask-controller.js      | 38 +++++-------------
 4 files changed, 84 insertions(+), 66 deletions(-)
 delete mode 100644 app/scripts/lib/bug-notifier.js
 create mode 100644 app/scripts/lib/diagnostics-reporter.js

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 2fe009f9a..a5d8cc27b 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -1,9 +1,7 @@
 const ObservableStore = require('obs-store')
 const normalizeAddress = require('eth-sig-util').normalize
 const extend = require('xtend')
-const notifier = require('../lib/bug-notifier')
-const log = require('loglevel')
-const { version } = require('../../manifest.json')
+
 
 class PreferencesController {
 
@@ -34,8 +32,7 @@ class PreferencesController {
       lostIdentities: {},
     }, opts.initState)
 
-    this.getFirstTimeInfo = opts.getFirstTimeInfo || null
-    this.notifier = opts.notifier || notifier
+    this.diagnostics = opts.diagnostics
 
     this.store = new ObservableStore(initState)
   }
@@ -128,17 +125,9 @@ class PreferencesController {
     if (Object.keys(newlyLost).length > 0) {
 
       // Notify our servers:
-      const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
-      const firstTimeInfo = this.getFirstTimeInfo ? this.getFirstTimeInfo() : {}
-      this.notifier.notify(uri, {
-        accounts: Object.keys(newlyLost),
-        metadata: {
-          version,
-          firstTimeInfo,
-        },
-      })
-      .catch(log.error)
+      if (this.diagnostics) this.diagnostics.reportOrphans(newlyLost)
 
+      // store lost accounts
       for (let key in newlyLost) {
         lostIdentities[key] = newlyLost[key]
       }
diff --git a/app/scripts/lib/bug-notifier.js b/app/scripts/lib/bug-notifier.js
deleted file mode 100644
index 4d305b894..000000000
--- a/app/scripts/lib/bug-notifier.js
+++ /dev/null
@@ -1,22 +0,0 @@
-class BugNotifier {
-  notify (uri, message) {
-    return postData(uri, message)
-  }
-}
-
-function postData(uri, data) {
-  return fetch(uri, {
-    body: JSON.stringify(data), // must match 'Content-Type' header
-    credentials: 'same-origin', // include, same-origin, *omit
-    headers: {
-      'content-type': 'application/json',
-    },
-    method: 'POST', // *GET, POST, PUT, DELETE, etc.
-    mode: 'cors', // no-cors, cors, *same-origin
-  })
-}
-
-const notifier = new BugNotifier()
-
-module.exports = notifier
-
diff --git a/app/scripts/lib/diagnostics-reporter.js b/app/scripts/lib/diagnostics-reporter.js
new file mode 100644
index 000000000..6c77923bd
--- /dev/null
+++ b/app/scripts/lib/diagnostics-reporter.js
@@ -0,0 +1,71 @@
+class DiagnosticsReporter {
+
+  constructor ({ firstTimeInfo, version }) {
+    this.firstTimeInfo = firstTimeInfo
+    this.version = version
+  }
+
+  async reportOrphans(orphans) {
+    try {
+      await this.submit({
+        accounts: Object.keys(orphans),
+        metadata: {
+          type: 'orphans'
+        },
+      })
+    } catch (err) {
+      console.error('DiagnosticsReporter - "reportOrphans" encountered an error:')
+      console.error(err)
+    }
+  }
+
+  async reportMultipleKeyrings(rawKeyrings) {
+    try {
+      const keyrings = await Promise.all(rawKeyrings.map(async (keyring, index) => {
+        return {
+          index,
+          type: keyring.type,
+          accounts: await keyring.getAccounts(),
+        }
+      }))
+      await this.submit({
+        accounts: [],
+        metadata: {
+          type: 'keyrings',
+          keyrings,
+        },
+      })
+    } catch (err) {
+      console.error('DiagnosticsReporter - "reportMultipleKeyrings" encountered an error:')
+      console.error(err)
+    }
+  }
+
+  async submit (message) {
+    try {
+      // add metadata
+      message.metadata.version = this.version
+      message.metadata.firstTimeInfo = this.firstTimeInfo
+      return await postData(message)
+    } catch (err) {
+      console.error('DiagnosticsReporter - "submit" encountered an error:')
+      console.error(err)
+    }
+  }
+
+}
+
+function postData(data) {
+  const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
+  return fetch(uri, {
+    body: JSON.stringify(data), // must match 'Content-Type' header
+    credentials: 'same-origin', // include, same-origin, *omit
+    headers: {
+      'content-type': 'application/json',
+    },
+    method: 'POST', // *GET, POST, PUT, DELETE, etc.
+    mode: 'cors', // no-cors, cors, *same-origin
+  })
+}
+
+module.exports = DiagnosticsReporter
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index ad1d6d6a7..4b0b00306 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -46,7 +46,7 @@ const GWEI_BN = new BN('1000000000')
 const percentile = require('percentile')
 const seedPhraseVerifier = require('./lib/seed-phrase-verifier')
 const cleanErrorStack = require('./lib/cleanErrorStack')
-const notifier = require('./lib/bug-notifier')
+const DiagnosticsReporter = require('./lib/diagnostics-reporter')
 const log = require('loglevel')
 
 module.exports = class MetamaskController extends EventEmitter {
@@ -66,7 +66,10 @@ module.exports = class MetamaskController extends EventEmitter {
     this.recordFirstTimeInfo(initState)
 
     // metamask diagnostics reporter
-    this.notifier = opts.notifier || notifier
+    this.diagnostics = opts.diagnostics || new DiagnosticsReporter({
+      firstTimeInfo: initState.firstTimeInfo,
+      version,
+    })
 
     // platform-specific api
     this.platform = opts.platform
@@ -89,7 +92,7 @@ module.exports = class MetamaskController extends EventEmitter {
     this.preferencesController = new PreferencesController({
       initState: initState.PreferencesController,
       initLangCode: opts.initLangCode,
-      getFirstTimeInfo: () => initState.firstTimeInfo,
+      diagnostics: this.diagnostics,
     })
 
     // currency controller
@@ -492,32 +495,9 @@ module.exports = class MetamaskController extends EventEmitter {
     const accounts = await this.keyringController.getAccounts()
 
     // verify keyrings
-    try {
-      const nonSimpleKeyrings = this.keyringController.keyrings.filter(keyring => keyring.type !== 'Simple Key Pair')
-      if (nonSimpleKeyrings.length > 1) {
-        const keyrings = await Promise.all(nonSimpleKeyrings.map(async (keyring, index) => {
-          return {
-            index,
-            type: keyring.type,
-            accounts: await keyring.getAccounts()
-          }
-        }))
-        // unexpected number of keyrings, report to diagnostics
-        const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
-        const firstTimeInfo = this.getFirstTimeInfo ? this.getFirstTimeInfo() : {}
-        await this.notifier.notify(uri, {
-          accounts: [],
-          metadata: {
-            type: 'keyrings',
-            keyrings,
-            version,
-            firstTimeInfo,
-          },
-        })
-      }
-    } catch (err) {
-      console.error('Keyring validation error:')
-      console.error(err)
+    const nonSimpleKeyrings = this.keyringController.keyrings.filter(keyring => keyring.type !== 'Simple Key Pair')
+    if (nonSimpleKeyrings.length > 1) {
+      if (this.diagnostics) await this.reportMultipleKeyrings(nonSimpleKeyrings)
     }
 
     await this.preferencesController.syncAddresses(accounts)
-- 
cgit 


From ece5cfc7858cb3e8077fad2c11f165a437e60413 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 5 Jun 2018 11:53:21 -0700
Subject: lint - fix diagnostics reporter

---
 app/scripts/lib/diagnostics-reporter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/lib/diagnostics-reporter.js b/app/scripts/lib/diagnostics-reporter.js
index 6c77923bd..534a0fa8a 100644
--- a/app/scripts/lib/diagnostics-reporter.js
+++ b/app/scripts/lib/diagnostics-reporter.js
@@ -10,7 +10,7 @@ class DiagnosticsReporter {
       await this.submit({
         accounts: Object.keys(orphans),
         metadata: {
-          type: 'orphans'
+          type: 'orphans',
         },
       })
     } catch (err) {
-- 
cgit 


From 36a0574f566ba2b9aac53396721c0075dd1107e5 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 5 Jun 2018 12:20:24 -0700
Subject: diagnostics - minor fixes

---
 app/scripts/lib/diagnostics-reporter.js | 6 +++---
 app/scripts/metamask-controller.js      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/scripts/lib/diagnostics-reporter.js b/app/scripts/lib/diagnostics-reporter.js
index 534a0fa8a..aa4ca6e26 100644
--- a/app/scripts/lib/diagnostics-reporter.js
+++ b/app/scripts/lib/diagnostics-reporter.js
@@ -7,7 +7,7 @@ class DiagnosticsReporter {
 
   async reportOrphans(orphans) {
     try {
-      await this.submit({
+      return await this.submit({
         accounts: Object.keys(orphans),
         metadata: {
           type: 'orphans',
@@ -28,7 +28,7 @@ class DiagnosticsReporter {
           accounts: await keyring.getAccounts(),
         }
       }))
-      await this.submit({
+      return await this.submit({
         accounts: [],
         metadata: {
           type: 'keyrings',
@@ -49,7 +49,7 @@ class DiagnosticsReporter {
       return await postData(message)
     } catch (err) {
       console.error('DiagnosticsReporter - "submit" encountered an error:')
-      console.error(err)
+      throw err
     }
   }
 
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 4b0b00306..18a2e7c48 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -496,8 +496,8 @@ module.exports = class MetamaskController extends EventEmitter {
 
     // verify keyrings
     const nonSimpleKeyrings = this.keyringController.keyrings.filter(keyring => keyring.type !== 'Simple Key Pair')
-    if (nonSimpleKeyrings.length > 1) {
-      if (this.diagnostics) await this.reportMultipleKeyrings(nonSimpleKeyrings)
+    if (nonSimpleKeyrings.length > 1 && this.diagnostics) {
+      await this.reportMultipleKeyrings(nonSimpleKeyrings)
     }
 
     await this.preferencesController.syncAddresses(accounts)
-- 
cgit 


From 60e61e6834a4502fcd9d19e1417725c301c79a13 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 5 Jun 2018 12:36:15 -0700
Subject: diagnostics - fix reportMultipleKeyrings call

---
 app/scripts/metamask-controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 18a2e7c48..1bb0af5ee 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -497,7 +497,7 @@ module.exports = class MetamaskController extends EventEmitter {
     // verify keyrings
     const nonSimpleKeyrings = this.keyringController.keyrings.filter(keyring => keyring.type !== 'Simple Key Pair')
     if (nonSimpleKeyrings.length > 1 && this.diagnostics) {
-      await this.reportMultipleKeyrings(nonSimpleKeyrings)
+      await this.diagnostics.reportMultipleKeyrings(nonSimpleKeyrings)
     }
 
     await this.preferencesController.syncAddresses(accounts)
-- 
cgit