From 89cc48789af2bb6f0925384abe4d4a53179a3956 Mon Sep 17 00:00:00 2001
From: brunobar79 <brunobar79@gmail.com>
Date: Wed, 11 Jul 2018 20:01:44 -0400
Subject: update to temp dependencies

---
 app/scripts/metamask-controller.js |  7 ++++++-
 package-lock.json                  | 23 ++++++++++-------------
 package.json                       |  4 ++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index e8f0eba90..cd6fdcc37 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -708,13 +708,18 @@ module.exports = class MetamaskController extends EventEmitter {
   }
 
   /**
-   * Removes a "Loose" account from state.
+   * Removes an account from state / storage.
    *
    * @param {string[]} address A hex address
    *
    */
   async removeAccount (address) {
+    // Remove account from the preferences controller
     this.preferencesController.removeAddress(address)
+    // Remove account from the account tracker controller
+    this.accountTracker.removeAccount(address)
+    // Remove account from the keyring
+    await this.keyringController.removeAccount(address)
     return address
   }
 
diff --git a/package-lock.json b/package-lock.json
index 57e1e3dcd..8b5976bc9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8458,9 +8458,8 @@
             }
         },
         "eth-keyring-controller": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/eth-keyring-controller/-/eth-keyring-controller-3.2.0.tgz",
-            "integrity": "sha512-GU1blKGftP6VDfI/5+9QZxPVkgm6VB7/UWTywd49rA/lNfm64mwTFjkBLG26S6UjdEJZiAU1kI1CdNWdAzZg5w==",
+            "version": "github:brunobar79/KeyringController#51f9ea9f015c8e6f06f4e15d17e24d4f724f505e",
+            "from": "github:brunobar79/KeyringController#remove-account",
             "dev": true,
             "requires": {
                 "bip39": "^2.4.0",
@@ -8468,7 +8467,7 @@
                 "browser-passworder": "^2.0.3",
                 "eth-hd-keyring": "^1.2.2",
                 "eth-sig-util": "^1.4.0",
-                "eth-simple-keyring": "^1.2.2",
+                "eth-simple-keyring": "github:brunobar79/eth-simple-keyring#c4ea3459268bcbee8cbe6940699b4c3bda2e2771",
                 "ethereumjs-util": "^5.1.2",
                 "loglevel": "^1.5.0",
                 "obs-store": "^2.4.1",
@@ -8581,9 +8580,8 @@
             }
         },
         "eth-simple-keyring": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/eth-simple-keyring/-/eth-simple-keyring-1.2.2.tgz",
-            "integrity": "sha512-uQVBYshHUOaXVoat1BpLA/QNMCr4hgdFBgwIB7rRmQ+m3vQQAseUsOM+biPDYzq6end+6LjcccElLpQaIZe6dg==",
+            "version": "github:brunobar79/eth-simple-keyring#c4ea3459268bcbee8cbe6940699b4c3bda2e2771",
+            "from": "github:brunobar79/eth-simple-keyring#remove-account",
             "dev": true,
             "requires": {
                 "eth-sig-util": "^1.4.2",
@@ -8780,9 +8778,8 @@
             }
         },
         "eth-trezor-keyring": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/eth-trezor-keyring/-/eth-trezor-keyring-0.0.1.tgz",
-            "integrity": "sha512-guXGx4tiBukuRMkNSRa3YS003X6gDWnsVL6PZ7X/dPY7bbt1nRQYVonABh/gSZSJYnKws1CrvW5/ORAHd7i8Dg==",
+            "version": "github:MetaMask/eth-trezor-keyring#7e5874ae1069a7f289e4996b79a3dac2ea40538d",
+            "from": "github:MetaMask/eth-trezor-keyring#remove-and-forget",
             "requires": {
                 "eth-sig-util": "^1.4.2",
                 "ethereumjs-tx": "^1.3.4",
@@ -17710,9 +17707,9 @@
             }
         },
         "level-sublevel": {
-            "version": "6.6.2",
-            "resolved": "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.2.tgz",
-            "integrity": "sha512-+hptqmFYPKFju9QG4F6scvx3ZXkhrSmmhYui+hPzRn/jiC3DJ6VNZRKsIhGMpeajVBWfRV7XiysUThrJ/7PgXQ==",
+            "version": "6.6.5",
+            "resolved": "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.5.tgz",
+            "integrity": "sha512-SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA==",
             "dev": true,
             "requires": {
                 "bytewise": "~1.1.0",
diff --git a/package.json b/package.json
index 7a25b6e00..be1cd8d85 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "eth-query": "^2.1.2",
     "eth-sig-util": "^1.4.2",
     "eth-token-tracker": "^1.1.4",
-    "eth-trezor-keyring": "0.0.1",
+    "eth-trezor-keyring": "github:MetaMask/eth-trezor-keyring#remove-and-forget",
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-tx": "^1.3.0",
     "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
@@ -232,7 +232,7 @@
     "eslint-plugin-mocha": "^5.0.0",
     "eslint-plugin-react": "^7.4.0",
     "eth-json-rpc-middleware": "^1.6.0",
-    "eth-keyring-controller": "^3.2.0",
+    "eth-keyring-controller": "github:brunobar79/KeyringController#remove-account",
     "file-loader": "^1.1.11",
     "fs-promise": "^2.0.3",
     "ganache-cli": "^6.1.0",
-- 
cgit v1.2.3