From 266d7d93d5bd9c18e9bc2c942b6a5e67968a0fd3 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 23 Nov 2022 18:49:24 -0600
Subject: [PATCH] Fix #15050 - MV3: Keep the user logged in when service worker
 restarts (#15558)

---
 app/scripts/background.js                |    5 -
 app/scripts/metamask-controller.js       |  104 +-
 app/scripts/ui.js                        |    7 +-
 lavamoat/browserify/beta/policy.json     |   73 +-
 lavamoat/browserify/flask/policy.json    |  101 +-
 lavamoat/browserify/main/policy.json     |   73 +-
 lavamoat/browserify/policy-override.json |    2 +-
 lavamoat/build-system/policy.json        | 1441 +++++++++++++++++-----
 package.json                             |    2 +-
 test/e2e/tests/from-import-ui.spec.js    |    2 +-
 test/lib/mock-encryptor.js               |    6 +
 yarn.lock                                |   17 +
 12 files changed, 1428 insertions(+), 405 deletions(-)

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 736e60603..0239eda85 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -491,11 +491,6 @@ function setupController(initState, initLangCode, remoteSourcePort) {
       controller.setupTrustedCommunication(portStream, remotePort.sender);
 
       if (isManifestV3) {
-        // Message below if captured by UI code in app/scripts/ui.js which will trigger UI initialisation
-        // This ensures that UI is initialised only after background is ready
-        // It fixes the issue of blank screen coming when extension is loaded, the issue is very frequent in MV3
-        remotePort.postMessage({ name: EXTENSION_MESSAGES.CONNECTION_READY });
-
         // If we get a WORKER_KEEP_ALIVE message, we respond with an ACK
         remotePort.onMessage.addListener((message) => {
           if (message.name === WORKER_KEEP_ALIVE_MESSAGE) {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 47c958b84..ecbf52003 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -55,6 +55,7 @@ import {
 } from '@metamask/snaps-controllers';
 ///: END:ONLY_INCLUDE_IN
 
+import browser from 'webextension-polyfill';
 import {
   ASSET_TYPES,
   TRANSACTION_STATUSES,
@@ -140,6 +141,7 @@ import seedPhraseVerifier from './lib/seed-phrase-verifier';
 import MetaMetricsController from './controllers/metametrics';
 import { segment } from './lib/segment';
 import createMetaRPCHandler from './lib/createMetaRPCHandler';
+
 import {
   CaveatMutatorFactories,
   getCaveatSpecifications,
@@ -589,6 +591,7 @@ export default class MetamaskController extends EventEmitter {
       keyringTypes: additionalKeyrings,
       initState: initState.KeyringController,
       encryptor: opts.encryptor || undefined,
+      cacheEncryptionKey: isManifestV3,
     });
     this.keyringController.memStore.subscribe((state) =>
       this._onKeyringControllerUpdate(state),
@@ -1118,7 +1121,6 @@ export default class MetamaskController extends EventEmitter {
       },
       controllerMessenger: this.controllerMessenger,
     });
-    this.memStore.subscribe(this.sendUpdate.bind(this));
 
     // if this is the first time, clear the state of by calling these methods
     const resetMethods = [
@@ -1144,13 +1146,14 @@ export default class MetamaskController extends EventEmitter {
       this.resetStates(resetMethods);
     }
 
-    const password = process.env.CONF?.PASSWORD;
+    // Automatic login via config password or loginToken
     if (
-      password &&
       !this.isUnlocked() &&
       this.onboardingController.store.getState().completedOnboarding
     ) {
-      this.submitPassword(password);
+      this._loginUser();
+    } else {
+      this._startUISync();
     }
 
     // Lazily update the store with the current extension environment
@@ -2388,6 +2391,68 @@ export default class MetamaskController extends EventEmitter {
     return this.keyringController.fullUpdate();
   }
 
+  async _loginUser() {
+    try {
+      // Automatic login via config password
+      const password = process.env.CONF?.PASSWORD;
+      if (password) {
+        await this.submitPassword(password);
+      }
+      // Automatic login via storage encryption key
+      else if (isManifestV3) {
+        await this.submitEncryptionKey();
+      }
+      // Updating accounts in this.accountTracker before starting UI syncing ensure that
+      // state has account balance before it is synced with UI
+      await this.accountTracker._updateAccounts();
+    } finally {
+      this._startUISync();
+    }
+  }
+
+  _startUISync() {
+    // Message startUISync is used in MV3 to start syncing state with UI
+    // Sending this message after login is completed helps to ensure that incomplete state without
+    // account details are not flushed to UI.
+    this.emit('startUISync');
+    this.startUISync = true;
+    this.memStore.subscribe(this.sendUpdate.bind(this));
+  }
+
+  /**
+   * Submits a user's encryption key to log the user in via login token
+   */
+  async submitEncryptionKey() {
+    try {
+      const { loginToken, loginSalt } = await browser.storage.session.get([
+        'loginToken',
+        'loginSalt',
+      ]);
+      if (loginToken && loginSalt) {
+        const { vault } = this.keyringController.store.getState();
+
+        if (vault.salt !== loginSalt) {
+          console.warn(
+            'submitEncryptionKey: Stored salt and vault salt do not match',
+          );
+          await this.clearLoginArtifacts();
+          return;
+        }
+
+        await this.keyringController.submitEncryptionKey(loginToken, loginSalt);
+      }
+    } catch (e) {
+      // If somehow this login token doesn't work properly,
+      // remove it and the user will get shown back to the unlock screen
+      await this.clearLoginArtifacts();
+      throw e;
+    }
+  }
+
+  async clearLoginArtifacts() {
+    await browser.storage.session.remove(['loginToken', 'loginSalt']);
+  }
+
   /**
    * Submits a user's password to check its validity.
    *
@@ -3526,6 +3591,23 @@ export default class MetamaskController extends EventEmitter {
       });
     };
     this.on('update', handleUpdate);
+    const startUISync = () => {
+      if (outStream._writableState.ended) {
+        return;
+      }
+      // send notification to client-side
+      outStream.write({
+        jsonrpc: '2.0',
+        method: 'startUISync',
+      });
+    };
+
+    if (this.startUISync) {
+      startUISync();
+    } else {
+      this.once('startUISync', startUISync);
+    }
+
     outStream.on('end', () => {
       this.activeControllerConnections -= 1;
       this.emit(
@@ -3969,12 +4051,20 @@ export default class MetamaskController extends EventEmitter {
    * @private
    */
   async _onKeyringControllerUpdate(state) {
-    const { keyrings } = state;
+    const {
+      keyrings,
+      encryptionKey: loginToken,
+      encryptionSalt: loginSalt,
+    } = state;
     const addresses = keyrings.reduce(
       (acc, { accounts }) => acc.concat(accounts),
       [],
     );
 
+    if (isManifestV3) {
+      await browser.storage.session.set({ loginToken, loginSalt });
+    }
+
     if (!addresses.length) {
       return;
     }
@@ -4366,6 +4456,10 @@ export default class MetamaskController extends EventEmitter {
     );
     ledgerKeyring?.destroy?.();
 
+    if (isManifestV3) {
+      this.clearLoginArtifacts();
+    }
+
     return this.keyringController.setLocked();
   }
 
diff --git a/app/scripts/ui.js b/app/scripts/ui.js
index c0f0bb7d1..d335f60e5 100644
--- a/app/scripts/ui.js
+++ b/app/scripts/ui.js
@@ -15,7 +15,6 @@ import launchMetaMaskUi, { updateBackgroundConnection } from '../../ui';
 import {
   ENVIRONMENT_TYPE_FULLSCREEN,
   ENVIRONMENT_TYPE_POPUP,
-  EXTENSION_MESSAGES,
   PLATFORM_FIREFOX,
 } from '../../shared/constants/app';
 import { isManifestV3 } from '../../shared/modules/mv3.utils';
@@ -117,11 +116,13 @@ async function start() {
   if (isManifestV3) {
     /*
      * In case of MV3 the issue of blank screen was very frequent, it is caused by UI initialising before background is ready to send state.
-     * Code below ensures that UI is rendered only after CONNECTION_READY message is received thus background is ready.
+     * Code below ensures that UI is rendered only after "CONNECTION_READY" or "startUISync"
+     * messages are received thus the background is ready, and ensures that streams and
+     * phishing warning page load only after the "startUISync" message is received.
      * In case the UI is already rendered, only update the streams.
      */
     const messageListener = async (message) => {
-      if (message?.name === EXTENSION_MESSAGES.CONNECTION_READY) {
+      if (message?.data?.method === 'startUISync') {
         if (isUIInitialised) {
           // Currently when service worker is revived we create new streams
           // in later version we might try to improve it by reviving same streams.
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index abef5b6fe..ec8653289 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -490,6 +490,7 @@
         "@metamask/controllers>abort-controller": true,
         "@metamask/controllers>async-mutex": true,
         "@metamask/controllers>eth-json-rpc-infura": true,
+        "@metamask/controllers>eth-keyring-controller": true,
         "@metamask/controllers>eth-method-registry": true,
         "@metamask/controllers>eth-phishing-detect": true,
         "@metamask/controllers>ethereumjs-wallet": true,
@@ -504,7 +505,6 @@
         "deep-freeze-strict": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
-        "eth-keyring-controller": true,
         "eth-query": true,
         "eth-rpc-errors": true,
         "eth-sig-util": true,
@@ -660,6 +660,37 @@
         "safe-event-emitter": true
       }
     },
+    "@metamask/controllers>eth-keyring-controller": {
+      "packages": {
+        "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "eth-keyring-controller>eth-simple-keyring": true,
+        "eth-keyring-controller>obs-store": true,
+        "eth-sig-util": true
+      }
+    },
+    "@metamask/controllers>eth-keyring-controller>browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto.getRandomValues": true,
+        "crypto.subtle.decrypt": true,
+        "crypto.subtle.deriveKey": true,
+        "crypto.subtle.encrypt": true,
+        "crypto.subtle.importKey": true
+      },
+      "packages": {
+        "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": true
+      }
+    },
+    "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      }
+    },
     "@metamask/controllers>eth-method-registry": {
       "packages": {
         "@metamask/controllers>eth-method-registry>ethjs": true
@@ -1274,6 +1305,7 @@
         "@metamask/controllers>web3": true,
         "@metamask/controllers>web3-provider-engine": true,
         "@metamask/metamask-eth-abis": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": true,
         "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
         "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
         "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
@@ -1282,7 +1314,6 @@
         "deep-freeze-strict": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
-        "eth-keyring-controller": true,
         "eth-query": true,
         "eth-rpc-errors": true,
         "eth-sig-util": true,
@@ -1296,6 +1327,18 @@
         "uuid": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": {
+      "packages": {
+        "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "eth-keyring-controller>eth-simple-keyring": true,
+        "eth-keyring-controller>obs-store": true,
+        "eth-sig-util": true
+      }
+    },
     "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
       "packages": {
         "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
@@ -2465,8 +2508,8 @@
         "browserify>buffer": true,
         "browserify>events": true,
         "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/browser-passworder": true,
         "eth-keyring-controller>@metamask/eth-hd-keyring": true,
-        "eth-keyring-controller>browser-passworder": true,
         "eth-keyring-controller>eth-simple-keyring": true,
         "eth-keyring-controller>obs-store": true,
         "eth-sig-util": true
@@ -2480,6 +2523,15 @@
         "ethereumjs-wallet>randombytes": true
       }
     },
+    "eth-keyring-controller>@metamask/browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto": true
+      },
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "eth-keyring-controller>@metamask/eth-hd-keyring": {
       "packages": {
         "browserify>buffer": true,
@@ -2509,21 +2561,6 @@
         "msCrypto": true
       }
     },
-    "eth-keyring-controller>browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      }
-    },
     "eth-keyring-controller>eth-simple-keyring": {
       "packages": {
         "browserify>buffer": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 24bcf3f63..fcbf820d7 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -635,6 +635,7 @@
         "@metamask/controllers>abort-controller": true,
         "@metamask/controllers>async-mutex": true,
         "@metamask/controllers>eth-json-rpc-infura": true,
+        "@metamask/controllers>eth-keyring-controller": true,
         "@metamask/controllers>eth-method-registry": true,
         "@metamask/controllers>eth-phishing-detect": true,
         "@metamask/controllers>ethereumjs-wallet": true,
@@ -649,7 +650,6 @@
         "deep-freeze-strict": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
-        "eth-keyring-controller": true,
         "eth-query": true,
         "eth-rpc-errors": true,
         "eth-sig-util": true,
@@ -805,6 +805,37 @@
         "safe-event-emitter": true
       }
     },
+    "@metamask/controllers>eth-keyring-controller": {
+      "packages": {
+        "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "eth-keyring-controller>eth-simple-keyring": true,
+        "eth-keyring-controller>obs-store": true,
+        "eth-sig-util": true
+      }
+    },
+    "@metamask/controllers>eth-keyring-controller>browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto.getRandomValues": true,
+        "crypto.subtle.decrypt": true,
+        "crypto.subtle.deriveKey": true,
+        "crypto.subtle.encrypt": true,
+        "crypto.subtle.importKey": true
+      },
+      "packages": {
+        "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": true
+      }
+    },
+    "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      }
+    },
     "@metamask/controllers>eth-method-registry": {
       "packages": {
         "@metamask/controllers>eth-method-registry>ethjs": true
@@ -1463,6 +1494,7 @@
         "@metamask/controllers>web3": true,
         "@metamask/controllers>web3-provider-engine": true,
         "@metamask/metamask-eth-abis": true,
+        "@metamask/rpc-methods>@metamask/controllers>eth-keyring-controller": true,
         "@metamask/rpc-methods>@metamask/controllers>eth-method-registry": true,
         "@metamask/rpc-methods>@metamask/controllers>ethereumjs-wallet": true,
         "@metamask/rpc-methods>nanoid": true,
@@ -1471,7 +1503,6 @@
         "deep-freeze-strict": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
-        "eth-keyring-controller": true,
         "eth-query": true,
         "eth-rpc-errors": true,
         "eth-sig-util": true,
@@ -1485,6 +1516,18 @@
         "uuid": true
       }
     },
+    "@metamask/rpc-methods>@metamask/controllers>eth-keyring-controller": {
+      "packages": {
+        "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "eth-keyring-controller>eth-simple-keyring": true,
+        "eth-keyring-controller>obs-store": true,
+        "eth-sig-util": true
+      }
+    },
     "@metamask/rpc-methods>@metamask/controllers>eth-method-registry": {
       "packages": {
         "@metamask/rpc-methods>@metamask/controllers>eth-method-registry>ethjs": true
@@ -1651,6 +1694,7 @@
         "@metamask/controllers>web3": true,
         "@metamask/controllers>web3-provider-engine": true,
         "@metamask/metamask-eth-abis": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": true,
         "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
         "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
         "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
@@ -1659,7 +1703,6 @@
         "deep-freeze-strict": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
-        "eth-keyring-controller": true,
         "eth-query": true,
         "eth-rpc-errors": true,
         "eth-sig-util": true,
@@ -1673,6 +1716,18 @@
         "uuid": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": {
+      "packages": {
+        "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "eth-keyring-controller>eth-simple-keyring": true,
+        "eth-keyring-controller>obs-store": true,
+        "eth-sig-util": true
+      }
+    },
     "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
       "packages": {
         "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
@@ -1848,6 +1903,7 @@
         "@metamask/controllers>web3": true,
         "@metamask/controllers>web3-provider-engine": true,
         "@metamask/metamask-eth-abis": true,
+        "@metamask/snaps-controllers>@metamask/controllers>eth-keyring-controller": true,
         "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry": true,
         "@metamask/snaps-controllers>@metamask/controllers>ethereumjs-wallet": true,
         "@metamask/snaps-controllers>nanoid": true,
@@ -1856,7 +1912,6 @@
         "deep-freeze-strict": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
-        "eth-keyring-controller": true,
         "eth-query": true,
         "eth-rpc-errors": true,
         "eth-sig-util": true,
@@ -1870,6 +1925,18 @@
         "uuid": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/controllers>eth-keyring-controller": {
+      "packages": {
+        "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "eth-keyring-controller>eth-simple-keyring": true,
+        "eth-keyring-controller>obs-store": true,
+        "eth-sig-util": true
+      }
+    },
     "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry": {
       "packages": {
         "@metamask/snaps-controllers>@metamask/controllers>eth-method-registry>ethjs": true
@@ -3250,8 +3317,8 @@
         "browserify>buffer": true,
         "browserify>events": true,
         "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/browser-passworder": true,
         "eth-keyring-controller>@metamask/eth-hd-keyring": true,
-        "eth-keyring-controller>browser-passworder": true,
         "eth-keyring-controller>eth-simple-keyring": true,
         "eth-keyring-controller>obs-store": true,
         "eth-sig-util": true
@@ -3265,6 +3332,15 @@
         "ethereumjs-wallet>randombytes": true
       }
     },
+    "eth-keyring-controller>@metamask/browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto": true
+      },
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "eth-keyring-controller>@metamask/eth-hd-keyring": {
       "packages": {
         "browserify>buffer": true,
@@ -3294,21 +3370,6 @@
         "msCrypto": true
       }
     },
-    "eth-keyring-controller>browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      }
-    },
     "eth-keyring-controller>eth-simple-keyring": {
       "packages": {
         "browserify>buffer": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index abef5b6fe..ec8653289 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -490,6 +490,7 @@
         "@metamask/controllers>abort-controller": true,
         "@metamask/controllers>async-mutex": true,
         "@metamask/controllers>eth-json-rpc-infura": true,
+        "@metamask/controllers>eth-keyring-controller": true,
         "@metamask/controllers>eth-method-registry": true,
         "@metamask/controllers>eth-phishing-detect": true,
         "@metamask/controllers>ethereumjs-wallet": true,
@@ -504,7 +505,6 @@
         "deep-freeze-strict": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
-        "eth-keyring-controller": true,
         "eth-query": true,
         "eth-rpc-errors": true,
         "eth-sig-util": true,
@@ -660,6 +660,37 @@
         "safe-event-emitter": true
       }
     },
+    "@metamask/controllers>eth-keyring-controller": {
+      "packages": {
+        "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "eth-keyring-controller>eth-simple-keyring": true,
+        "eth-keyring-controller>obs-store": true,
+        "eth-sig-util": true
+      }
+    },
+    "@metamask/controllers>eth-keyring-controller>browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto.getRandomValues": true,
+        "crypto.subtle.decrypt": true,
+        "crypto.subtle.deriveKey": true,
+        "crypto.subtle.encrypt": true,
+        "crypto.subtle.importKey": true
+      },
+      "packages": {
+        "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": true
+      }
+    },
+    "@metamask/controllers>eth-keyring-controller>browser-passworder>browserify-unibabel": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      }
+    },
     "@metamask/controllers>eth-method-registry": {
       "packages": {
         "@metamask/controllers>eth-method-registry>ethjs": true
@@ -1274,6 +1305,7 @@
         "@metamask/controllers>web3": true,
         "@metamask/controllers>web3-provider-engine": true,
         "@metamask/metamask-eth-abis": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": true,
         "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
         "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
         "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
@@ -1282,7 +1314,6 @@
         "deep-freeze-strict": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
-        "eth-keyring-controller": true,
         "eth-query": true,
         "eth-rpc-errors": true,
         "eth-sig-util": true,
@@ -1296,6 +1327,18 @@
         "uuid": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-keyring-controller": {
+      "packages": {
+        "@metamask/controllers>eth-keyring-controller>browser-passworder": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "eth-keyring-controller>eth-simple-keyring": true,
+        "eth-keyring-controller>obs-store": true,
+        "eth-sig-util": true
+      }
+    },
     "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
       "packages": {
         "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
@@ -2465,8 +2508,8 @@
         "browserify>buffer": true,
         "browserify>events": true,
         "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/browser-passworder": true,
         "eth-keyring-controller>@metamask/eth-hd-keyring": true,
-        "eth-keyring-controller>browser-passworder": true,
         "eth-keyring-controller>eth-simple-keyring": true,
         "eth-keyring-controller>obs-store": true,
         "eth-sig-util": true
@@ -2480,6 +2523,15 @@
         "ethereumjs-wallet>randombytes": true
       }
     },
+    "eth-keyring-controller>@metamask/browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto": true
+      },
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "eth-keyring-controller>@metamask/eth-hd-keyring": {
       "packages": {
         "browserify>buffer": true,
@@ -2509,21 +2561,6 @@
         "msCrypto": true
       }
     },
-    "eth-keyring-controller>browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      }
-    },
     "eth-keyring-controller>eth-simple-keyring": {
       "packages": {
         "browserify>buffer": true,
diff --git a/lavamoat/browserify/policy-override.json b/lavamoat/browserify/policy-override.json
index 7aacc76ff..b8c26285a 100644
--- a/lavamoat/browserify/policy-override.json
+++ b/lavamoat/browserify/policy-override.json
@@ -38,7 +38,7 @@
         "crypto.getRandomValues": true
       }
     },
-    "eth-keyring-controller>browser-passworder": {
+    "eth-keyring-controller>@metamask/browser-passworder": {
       "globals": {
         "crypto": true
       }
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index de3161d63..c080ec25a 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -1813,6 +1813,7 @@
       },
       "packages": {
         "chokidar>braces": true,
+        "chokidar>fsevents": true,
         "chokidar>glob-parent": true,
         "chokidar>is-binary-path": true,
         "chokidar>normalize-path": true,
@@ -1839,6 +1840,12 @@
         "chokidar>braces>fill-range>to-regex-range>is-number": true
       }
     },
+    "chokidar>fsevents": {
+      "globals": {
+        "process.platform": true
+      },
+      "native": true
+    },
     "chokidar>glob-parent": {
       "builtin": {
         "os.platform": true,
@@ -4184,6 +4191,7 @@
         "gulp-watch>chokidar>anymatch": true,
         "gulp-watch>chokidar>async-each": true,
         "gulp-watch>chokidar>braces": true,
+        "gulp-watch>chokidar>fsevents": true,
         "gulp-watch>chokidar>is-binary-path": true,
         "gulp-watch>chokidar>normalize-path": true,
         "gulp-watch>chokidar>readdirp": true,
@@ -4332,552 +4340,1319 @@
         "webpack>micromatch>braces>fill-range>repeat-string": true
       }
     },
-    "gulp-watch>chokidar>is-binary-path": {
-      "builtin": {
-        "path.extname": true
-      },
-      "packages": {
-        "gulp-watch>chokidar>is-binary-path>binary-extensions": true
-      }
-    },
-    "gulp-watch>chokidar>readdirp": {
+    "gulp-watch>chokidar>fsevents": {
       "builtin": {
+        "events.EventEmitter": true,
+        "fs.stat": true,
         "path.join": true,
-        "path.relative": true,
         "util.inherits": true
       },
       "globals": {
+        "__dirname": true,
+        "process.nextTick": true,
+        "process.platform": true,
         "setImmediate": true
       },
       "packages": {
-        "fs-extra>graceful-fs": true,
-        "gulp-watch>chokidar>readdirp>micromatch": true,
-        "readable-stream": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp": {
       "builtin": {
-        "path.basename": true,
-        "path.sep": true,
-        "util.inspect": true
+        "events.EventEmitter": true,
+        "fs.existsSync": true,
+        "fs.readFileSync": true,
+        "fs.renameSync": true,
+        "path.dirname": true,
+        "path.existsSync": true,
+        "path.join": true,
+        "path.resolve": true,
+        "url.parse": true,
+        "url.resolve": true,
+        "util.inherits": true
       },
       "globals": {
-        "process.platform": true
+        "__dirname": true,
+        "console.log": true,
+        "process.arch": true,
+        "process.cwd": true,
+        "process.env": true,
+        "process.platform": true,
+        "process.version.substr": true,
+        "process.versions": true
       },
       "packages": {
-        "gulp-watch>chokidar>braces": true,
-        "gulp-watch>chokidar>readdirp>micromatch>arr-diff": true,
-        "gulp-watch>chokidar>readdirp>micromatch>array-unique": true,
-        "gulp-watch>chokidar>readdirp>micromatch>define-property": true,
-        "gulp-watch>chokidar>readdirp>micromatch>extend-shallow": true,
-        "gulp-watch>chokidar>readdirp>micromatch>extglob": true,
-        "gulp-watch>chokidar>readdirp>micromatch>kind-of": true,
-        "webpack>micromatch>fragment-cache": true,
-        "webpack>micromatch>nanomatch": true,
-        "webpack>micromatch>object.pick": true,
-        "webpack>micromatch>regex-not": true,
-        "webpack>micromatch>snapdragon": true,
-        "webpack>micromatch>to-regex": true
-      }
-    },
-    "gulp-watch>chokidar>readdirp>micromatch>define-property": {
-      "packages": {
-        "gulp>gulp-cli>isobject": true,
-        "webpack>micromatch>define-property>is-descriptor": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extend-shallow": {
-      "packages": {
-        "gulp-watch>chokidar>readdirp>micromatch>extend-shallow>is-extendable": true,
-        "webpack>micromatch>extend-shallow>assign-symbols": true
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": {
+      "builtin": {
+        "child_process.spawnSync": true,
+        "fs.readdirSync": true,
+        "os.platform": true
+      },
+      "globals": {
+        "process.env": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extend-shallow>is-extendable": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": {
+      "builtin": {
+        "path": true,
+        "stream.Stream": true,
+        "url": true
+      },
+      "globals": {
+        "console": true,
+        "process.argv": true,
+        "process.env.DEBUG_NOPT": true,
+        "process.env.NOPT_DEBUG": true,
+        "process.platform": true
+      },
       "packages": {
-        "@babel/register>clone-deep>is-plain-object": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>abbrev": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extglob": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": {
+      "builtin": {
+        "child_process.exec": true,
+        "path": true
+      },
+      "globals": {
+        "process.env.COMPUTERNAME": true,
+        "process.env.ComSpec": true,
+        "process.env.EDITOR": true,
+        "process.env.HOSTNAME": true,
+        "process.env.PATH": true,
+        "process.env.PROMPT": true,
+        "process.env.PS1": true,
+        "process.env.Path": true,
+        "process.env.SHELL": true,
+        "process.env.USER": true,
+        "process.env.USERDOMAIN": true,
+        "process.env.USERNAME": true,
+        "process.env.VISUAL": true,
+        "process.env.path": true,
+        "process.nextTick": true,
+        "process.platform": true
+      },
       "packages": {
-        "gulp-watch>chokidar>readdirp>micromatch>array-unique": true,
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>define-property": true,
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets": true,
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow": true,
-        "webpack>micromatch>fragment-cache": true,
-        "webpack>micromatch>regex-not": true,
-        "webpack>micromatch>snapdragon": true,
-        "webpack>micromatch>to-regex": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extglob>define-property": {
-      "packages": {
-        "webpack>micromatch>define-property>is-descriptor": true
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": {
+      "builtin": {
+        "os.homedir": true
+      },
+      "globals": {
+        "process.env": true,
+        "process.getuid": true,
+        "process.platform": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": {
       "globals": {
-        "__filename": true
-      },
-      "packages": {
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug": true,
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property": true,
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow": true,
-        "webpack>micromatch>extglob>expand-brackets>posix-character-classes": true,
-        "webpack>micromatch>regex-not": true,
-        "webpack>micromatch>snapdragon": true,
-        "webpack>micromatch>to-regex": true
+        "process.env.SystemRoot": true,
+        "process.env.TEMP": true,
+        "process.env.TMP": true,
+        "process.env.TMPDIR": true,
+        "process.env.windir": true,
+        "process.platform": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog": {
       "builtin": {
-        "fs.SyncWriteStream": true,
-        "net.Socket": true,
-        "tty.WriteStream": true,
-        "tty.isatty": true,
+        "events.EventEmitter": true,
         "util": true
       },
       "globals": {
-        "chrome": true,
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
+        "process.nextTick": true,
+        "process.stderr": true
       },
       "packages": {
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug>ms": true
-      }
-    },
-    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property": {
-      "packages": {
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>console-control-strings": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>set-blocking": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "util.inherits": true
+      },
       "packages": {
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": true,
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": true,
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>kind-of": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>delegates": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
       "packages": {
-        "gulp-watch>anymatch>micromatch>kind-of": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>core-util-is": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>isarray": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>process-nextick-args": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>string_decoder": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>util-deprecate": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>kind-of": true
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>core-util-is": {
+      "globals": {
+        "Buffer.isBuffer": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow": {
-      "packages": {
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow>is-extendable": true
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>process-nextick-args": {
+      "globals": {
+        "process": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>string_decoder": {
       "packages": {
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow>is-extendable": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": true
       }
     },
-    "gulp-watch>chokidar>upath": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>util-deprecate": {
       "builtin": {
-        "path": true
+        "util.deprecate": true
       }
     },
-    "gulp-watch>fancy-log": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge": {
+      "builtin": {
+        "util.format": true
+      },
       "globals": {
-        "console": true,
-        "process.argv.indexOf": true,
-        "process.stderr.write": true,
-        "process.stdout.write": true
+        "clearInterval": true,
+        "process": true,
+        "setImmediate": true,
+        "setInterval": true
       },
       "packages": {
-        "fancy-log>ansi-gray": true,
-        "fancy-log>color-support": true,
-        "fancy-log>time-stamp": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>console-control-strings": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>aproba": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>has-unicode": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>object-assign": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>signal-exit": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": true
       }
     },
-    "gulp-watch>glob-parent": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>has-unicode": {
       "builtin": {
-        "os.platform": true,
-        "path": true
+        "os.type": true
       },
-      "packages": {
-        "gulp-watch>glob-parent>is-glob": true,
-        "gulp-watch>glob-parent>path-dirname": true
-      }
-    },
-    "gulp-watch>glob-parent>is-glob": {
-      "packages": {
-        "gulp-watch>glob-parent>is-glob>is-extglob": true
+      "globals": {
+        "process.env.LANG": true,
+        "process.env.LC_ALL": true,
+        "process.env.LC_CTYPE": true
       }
     },
-    "gulp-watch>glob-parent>path-dirname": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>signal-exit": {
       "builtin": {
-        "path": true,
-        "util.inspect": true
+        "assert.equal": true,
+        "events": true
       },
       "globals": {
-        "process.platform": true
+        "process": true
       }
     },
-    "gulp-watch>path-is-absolute": {
-      "globals": {
-        "process.platform": true
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": {
+      "packages": {
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>code-point-at": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": true
       }
     },
-    "gulp-watch>vinyl-file": {
-      "builtin": {
-        "path.resolve": true
-      },
-      "globals": {
-        "process.cwd": true
-      },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": {
       "packages": {
-        "del>globby>pinkie-promise": true,
-        "fs-extra>graceful-fs": true,
-        "gulp-watch>vinyl-file>pify": true,
-        "gulp-watch>vinyl-file>strip-bom": true,
-        "gulp-watch>vinyl-file>strip-bom-stream": true,
-        "gulp-watch>vinyl-file>vinyl": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point>number-is-nan": true
       }
     },
-    "gulp-watch>vinyl-file>strip-bom": {
-      "globals": {
-        "Buffer.isBuffer": true
-      },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": {
       "packages": {
-        "gulp>vinyl-fs>remove-bom-buffer>is-utf8": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi>ansi-regex": true
       }
     },
-    "gulp-watch>vinyl-file>strip-bom-stream": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": {
       "packages": {
-        "gulp-watch>vinyl-file>strip-bom": true,
-        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": true
       }
     },
-    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>set-blocking": {
+      "globals": {
+        "process.stderr": true,
+        "process.stdout": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": {
       "builtin": {
-        "util.inherits": true
+        "assert": true,
+        "fs": true,
+        "path.join": true
       },
       "globals": {
-        "Buffer.concat": true,
-        "setImmediate": true
+        "process.platform": true,
+        "setTimeout": true
       },
       "packages": {
-        "readable-stream": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob": true
       }
     },
-    "gulp-watch>vinyl-file>vinyl": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob": {
+      "builtin": {
+        "assert": true,
+        "events.EventEmitter": true,
+        "fs.lstat": true,
+        "fs.lstatSync": true,
+        "fs.readdir": true,
+        "fs.readdirSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "path.join": true,
+        "path.resolve": true,
+        "util": true
+      },
+      "globals": {
+        "console.error": true,
+        "process.cwd": true,
+        "process.nextTick": true,
+        "process.platform": true
+      },
+      "packages": {
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>fs.realpath": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>inflight": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>path-is-absolute": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>fs.realpath": {
+      "builtin": {
+        "fs.lstat": true,
+        "fs.lstatSync": true,
+        "fs.readlink": true,
+        "fs.readlinkSync": true,
+        "fs.realpath": true,
+        "fs.realpathSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "path.normalize": true,
+        "path.resolve": true
+      },
+      "globals": {
+        "console.error": true,
+        "console.trace": true,
+        "process.env.NODE_DEBUG": true,
+        "process.nextTick": true,
+        "process.noDeprecation": true,
+        "process.platform": true,
+        "process.throwDeprecation": true,
+        "process.traceDeprecation": true,
+        "process.version": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>inflight": {
+      "globals": {
+        "process.nextTick": true
+      },
+      "packages": {
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>once>wrappy": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": {
+      "builtin": {
+        "util.inherits": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch": {
+      "builtin": {
+        "path": true
+      },
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion": {
+      "packages": {
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion>balanced-match": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion>concat-map": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": {
+      "packages": {
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>once>wrappy": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob>path-is-absolute": {
+      "globals": {
+        "process.platform": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": {
+      "globals": {
+        "console": true,
+        "process": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": {
+      "builtin": {
+        "buffer": true
+      }
+    },
+    "gulp-watch>chokidar>is-binary-path": {
+      "builtin": {
+        "path.extname": true
+      },
+      "packages": {
+        "gulp-watch>chokidar>is-binary-path>binary-extensions": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp": {
+      "builtin": {
+        "path.join": true,
+        "path.relative": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "setImmediate": true
+      },
+      "packages": {
+        "fs-extra>graceful-fs": true,
+        "gulp-watch>chokidar>readdirp>micromatch": true,
+        "readable-stream": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch": {
+      "builtin": {
+        "path.basename": true,
+        "path.sep": true,
+        "util.inspect": true
+      },
+      "globals": {
+        "process.platform": true
+      },
+      "packages": {
+        "gulp-watch>chokidar>braces": true,
+        "gulp-watch>chokidar>readdirp>micromatch>arr-diff": true,
+        "gulp-watch>chokidar>readdirp>micromatch>array-unique": true,
+        "gulp-watch>chokidar>readdirp>micromatch>define-property": true,
+        "gulp-watch>chokidar>readdirp>micromatch>extend-shallow": true,
+        "gulp-watch>chokidar>readdirp>micromatch>extglob": true,
+        "gulp-watch>chokidar>readdirp>micromatch>kind-of": true,
+        "webpack>micromatch>fragment-cache": true,
+        "webpack>micromatch>nanomatch": true,
+        "webpack>micromatch>object.pick": true,
+        "webpack>micromatch>regex-not": true,
+        "webpack>micromatch>snapdragon": true,
+        "webpack>micromatch>to-regex": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>define-property": {
+      "packages": {
+        "gulp>gulp-cli>isobject": true,
+        "webpack>micromatch>define-property>is-descriptor": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extend-shallow": {
+      "packages": {
+        "gulp-watch>chokidar>readdirp>micromatch>extend-shallow>is-extendable": true,
+        "webpack>micromatch>extend-shallow>assign-symbols": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extend-shallow>is-extendable": {
+      "packages": {
+        "@babel/register>clone-deep>is-plain-object": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob": {
+      "packages": {
+        "gulp-watch>chokidar>readdirp>micromatch>array-unique": true,
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>define-property": true,
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets": true,
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow": true,
+        "webpack>micromatch>fragment-cache": true,
+        "webpack>micromatch>regex-not": true,
+        "webpack>micromatch>snapdragon": true,
+        "webpack>micromatch>to-regex": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob>define-property": {
+      "packages": {
+        "webpack>micromatch>define-property>is-descriptor": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets": {
+      "globals": {
+        "__filename": true
+      },
+      "packages": {
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug": true,
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property": true,
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow": true,
+        "webpack>micromatch>extglob>expand-brackets>posix-character-classes": true,
+        "webpack>micromatch>regex-not": true,
+        "webpack>micromatch>snapdragon": true,
+        "webpack>micromatch>to-regex": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug": {
+      "builtin": {
+        "fs.SyncWriteStream": true,
+        "net.Socket": true,
+        "tty.WriteStream": true,
+        "tty.isatty": true,
+        "util": true
+      },
+      "globals": {
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
+      },
+      "packages": {
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>debug>ms": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property": {
+      "packages": {
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor": {
+      "packages": {
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": true,
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": true,
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>kind-of": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>kind-of": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>kind-of": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow": {
+      "packages": {
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow>is-extendable": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow": {
+      "packages": {
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow>is-extendable": true
+      }
+    },
+    "gulp-watch>chokidar>upath": {
+      "builtin": {
+        "path": true
+      }
+    },
+    "gulp-watch>fancy-log": {
+      "globals": {
+        "console": true,
+        "process.argv.indexOf": true,
+        "process.stderr.write": true,
+        "process.stdout.write": true
+      },
+      "packages": {
+        "fancy-log>ansi-gray": true,
+        "fancy-log>color-support": true,
+        "fancy-log>time-stamp": true
+      }
+    },
+    "gulp-watch>glob-parent": {
+      "builtin": {
+        "os.platform": true,
+        "path": true
+      },
+      "packages": {
+        "gulp-watch>glob-parent>is-glob": true,
+        "gulp-watch>glob-parent>path-dirname": true
+      }
+    },
+    "gulp-watch>glob-parent>is-glob": {
+      "packages": {
+        "gulp-watch>glob-parent>is-glob>is-extglob": true
+      }
+    },
+    "gulp-watch>glob-parent>path-dirname": {
+      "builtin": {
+        "path": true,
+        "util.inspect": true
+      },
+      "globals": {
+        "process.platform": true
+      }
+    },
+    "gulp-watch>path-is-absolute": {
+      "globals": {
+        "process.platform": true
+      }
+    },
+    "gulp-watch>vinyl-file": {
+      "builtin": {
+        "path.resolve": true
+      },
+      "globals": {
+        "process.cwd": true
+      },
+      "packages": {
+        "del>globby>pinkie-promise": true,
+        "fs-extra>graceful-fs": true,
+        "gulp-watch>vinyl-file>pify": true,
+        "gulp-watch>vinyl-file>strip-bom": true,
+        "gulp-watch>vinyl-file>strip-bom-stream": true,
+        "gulp-watch>vinyl-file>vinyl": true
+      }
+    },
+    "gulp-watch>vinyl-file>strip-bom": {
+      "globals": {
+        "Buffer.isBuffer": true
+      },
+      "packages": {
+        "gulp>vinyl-fs>remove-bom-buffer>is-utf8": true
+      }
+    },
+    "gulp-watch>vinyl-file>strip-bom-stream": {
+      "packages": {
+        "gulp-watch>vinyl-file>strip-bom": true,
+        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": true
+      }
+    },
+    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": {
+      "builtin": {
+        "util.inherits": true
+      },
+      "globals": {
+        "Buffer.concat": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "readable-stream": true
+      }
+    },
+    "gulp-watch>vinyl-file>vinyl": {
+      "builtin": {
+        "buffer.Buffer": true,
+        "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.join": true,
+        "path.relative": true,
+        "stream.PassThrough": true,
+        "stream.Stream": true
+      },
+      "globals": {
+        "process.cwd": true
+      },
+      "packages": {
+        "gulp-watch>vinyl-file>vinyl>clone": true,
+        "gulp-watch>vinyl-file>vinyl>clone-stats": true,
+        "gulp-watch>vinyl-file>vinyl>replace-ext": true
+      }
+    },
+    "gulp-watch>vinyl-file>vinyl>clone": {
+      "globals": {
+        "Buffer": true
+      }
+    },
+    "gulp-watch>vinyl-file>vinyl>clone-stats": {
+      "builtin": {
+        "fs.Stats": true
+      }
+    },
+    "gulp-watch>vinyl-file>vinyl>replace-ext": {
+      "builtin": {
+        "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.join": true
+      }
+    },
+    "gulp-zip": {
+      "builtin": {
+        "buffer.constants.MAX_LENGTH": true,
+        "path.join": true
+      },
+      "packages": {
+        "gulp-zip>get-stream": true,
+        "gulp-zip>plugin-error": true,
+        "gulp-zip>through2": true,
+        "gulp-zip>yazl": true,
+        "vinyl": true
+      }
+    },
+    "gulp-zip>get-stream": {
+      "builtin": {
+        "buffer.constants.MAX_LENGTH": true,
+        "stream.PassThrough": true
+      },
+      "globals": {
+        "Buffer.concat": true
+      },
+      "packages": {
+        "pump": true
+      }
+    },
+    "gulp-zip>plugin-error": {
+      "builtin": {
+        "util.inherits": true
+      },
+      "packages": {
+        "gulp-watch>ansi-colors": true,
+        "gulp-zip>plugin-error>arr-union": true,
+        "gulp-zip>plugin-error>extend-shallow": true,
+        "webpack>micromatch>arr-diff": true
+      }
+    },
+    "gulp-zip>plugin-error>extend-shallow": {
+      "packages": {
+        "gulp-zip>plugin-error>extend-shallow>is-extendable": true,
+        "webpack>micromatch>extend-shallow>assign-symbols": true
+      }
+    },
+    "gulp-zip>plugin-error>extend-shallow>is-extendable": {
+      "packages": {
+        "@babel/register>clone-deep>is-plain-object": true
+      }
+    },
+    "gulp-zip>through2": {
+      "builtin": {
+        "util.inherits": true
+      },
+      "globals": {
+        "process.nextTick": true
+      },
+      "packages": {
+        "gulp-zip>through2>readable-stream": true
+      }
+    },
+    "gulp-zip>through2>readable-stream": {
       "builtin": {
         "buffer.Buffer": true,
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.env.READABLE_STREAM": true,
+        "process.nextTick": true,
+        "process.stderr": true,
+        "process.stdout": true
+      },
+      "packages": {
+        "@storybook/api>util-deprecate": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true
+      }
+    },
+    "gulp-zip>yazl": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "fs.createReadStream": true,
+        "fs.stat": true,
+        "stream.PassThrough": true,
+        "stream.Transform": true,
+        "util.inherits": true,
+        "zlib.DeflateRaw": true,
+        "zlib.deflateRaw": true
+      },
+      "globals": {
+        "Buffer": true,
+        "setImmediate": true,
+        "utf8FileName.length": true
+      },
+      "packages": {
+        "gulp-zip>yazl>buffer-crc32": true
+      }
+    },
+    "gulp-zip>yazl>buffer-crc32": {
+      "builtin": {
+        "buffer.Buffer": true
+      }
+    },
+    "gulp>glob-watcher": {
+      "packages": {
+        "gulp>glob-watcher>anymatch": true,
+        "gulp>glob-watcher>async-done": true,
+        "gulp>glob-watcher>chokidar": true,
+        "gulp>glob-watcher>is-negated-glob": true,
+        "gulp>glob-watcher>just-debounce": true,
+        "gulp>undertaker>object.defaults": true
+      }
+    },
+    "gulp>glob-watcher>anymatch": {
+      "builtin": {
+        "path.sep": true
+      },
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch": true,
+        "gulp>glob-watcher>anymatch>normalize-path": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch": {
+      "builtin": {
+        "path.basename": true,
+        "path.sep": true,
+        "util.inspect": true
+      },
+      "globals": {
+        "process.platform": true
+      },
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>define-property": true,
+        "gulp>glob-watcher>anymatch>micromatch>extend-shallow": true,
+        "gulp>glob-watcher>chokidar>braces": true,
+        "webpack>micromatch>arr-diff": true,
+        "webpack>micromatch>array-unique": true,
+        "webpack>micromatch>extglob": true,
+        "webpack>micromatch>fragment-cache": true,
+        "webpack>micromatch>kind-of": true,
+        "webpack>micromatch>nanomatch": true,
+        "webpack>micromatch>object.pick": true,
+        "webpack>micromatch>regex-not": true,
+        "webpack>micromatch>snapdragon": true,
+        "webpack>micromatch>to-regex": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>define-property": {
+      "packages": {
+        "gulp>gulp-cli>isobject": true,
+        "webpack>micromatch>define-property>is-descriptor": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extend-shallow": {
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>extend-shallow>is-extendable": true,
+        "webpack>micromatch>extend-shallow>assign-symbols": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extend-shallow>is-extendable": {
+      "packages": {
+        "@babel/register>clone-deep>is-plain-object": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>normalize-path": {
+      "packages": {
+        "vinyl>remove-trailing-separator": true
+      }
+    },
+    "gulp>glob-watcher>async-done": {
+      "builtin": {
+        "domain.create": true
+      },
+      "globals": {
+        "process.nextTick": true
+      },
+      "packages": {
+        "end-of-stream": true,
+        "gulp>glob-watcher>async-done>process-nextick-args": true,
+        "gulp>glob-watcher>async-done>stream-exhaust": true,
+        "pump>once": true
+      }
+    },
+    "gulp>glob-watcher>async-done>process-nextick-args": {
+      "globals": {
+        "process": true
+      }
+    },
+    "gulp>glob-watcher>async-done>stream-exhaust": {
+      "builtin": {
+        "stream.Writable": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "setImmediate": true
+      }
+    },
+    "gulp>glob-watcher>chokidar": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "fs": true,
         "path.basename": true,
         "path.dirname": true,
         "path.extname": true,
         "path.join": true,
         "path.relative": true,
-        "stream.PassThrough": true,
-        "stream.Stream": true
+        "path.resolve": true,
+        "path.sep": true
       },
       "globals": {
-        "process.cwd": true
+        "clearTimeout": true,
+        "console.error": true,
+        "process.env.CHOKIDAR_INTERVAL": true,
+        "process.env.CHOKIDAR_PRINT_FSEVENTS_REQUIRE_ERROR": true,
+        "process.env.CHOKIDAR_USEPOLLING": true,
+        "process.nextTick": true,
+        "process.platform": true,
+        "setTimeout": true
       },
       "packages": {
-        "gulp-watch>vinyl-file>vinyl>clone": true,
-        "gulp-watch>vinyl-file>vinyl>clone-stats": true,
-        "gulp-watch>vinyl-file>vinyl>replace-ext": true
+        "eslint>is-glob": true,
+        "gulp-watch>chokidar>async-each": true,
+        "gulp-watch>glob-parent": true,
+        "gulp-watch>path-is-absolute": true,
+        "gulp>glob-watcher>anymatch": true,
+        "gulp>glob-watcher>chokidar>braces": true,
+        "gulp>glob-watcher>chokidar>fsevents": true,
+        "gulp>glob-watcher>chokidar>is-binary-path": true,
+        "gulp>glob-watcher>chokidar>normalize-path": true,
+        "gulp>glob-watcher>chokidar>readdirp": true,
+        "gulp>glob-watcher>chokidar>upath": true,
+        "pumpify>inherits": true
       }
     },
-    "gulp-watch>vinyl-file>vinyl>clone": {
-      "globals": {
-        "Buffer": true
+    "gulp>glob-watcher>chokidar>braces": {
+      "packages": {
+        "gulp>glob-watcher>chokidar>braces>fill-range": true,
+        "gulp>gulp-cli>isobject": true,
+        "gulp>undertaker>arr-flatten": true,
+        "webpack>micromatch>array-unique": true,
+        "webpack>micromatch>braces>repeat-element": true,
+        "webpack>micromatch>braces>snapdragon-node": true,
+        "webpack>micromatch>braces>split-string": true,
+        "webpack>micromatch>extglob>extend-shallow": true,
+        "webpack>micromatch>snapdragon": true,
+        "webpack>micromatch>to-regex": true
       }
     },
-    "gulp-watch>vinyl-file>vinyl>clone-stats": {
+    "gulp>glob-watcher>chokidar>braces>fill-range": {
       "builtin": {
-        "fs.Stats": true
+        "util.inspect": true
+      },
+      "packages": {
+        "gulp>glob-watcher>chokidar>braces>fill-range>is-number": true,
+        "gulp>glob-watcher>chokidar>braces>fill-range>to-regex-range": true,
+        "webpack>micromatch>braces>fill-range>repeat-string": true,
+        "webpack>micromatch>extglob>extend-shallow": true
       }
     },
-    "gulp-watch>vinyl-file>vinyl>replace-ext": {
+    "gulp>glob-watcher>chokidar>braces>fill-range>is-number": {
+      "packages": {
+        "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": {
+      "packages": {
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>braces>fill-range>to-regex-range": {
+      "packages": {
+        "gulp>glob-watcher>chokidar>braces>fill-range>is-number": true,
+        "webpack>micromatch>braces>fill-range>repeat-string": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>fsevents": {
       "builtin": {
-        "path.basename": true,
+        "events.EventEmitter": true,
+        "fs.stat": true,
+        "path.join": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "__dirname": true,
+        "process.nextTick": true,
+        "process.platform": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "fs.existsSync": true,
+        "fs.readFileSync": true,
+        "fs.renameSync": true,
         "path.dirname": true,
-        "path.extname": true,
-        "path.join": true
+        "path.existsSync": true,
+        "path.join": true,
+        "path.resolve": true,
+        "url.parse": true,
+        "url.resolve": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "__dirname": true,
+        "console.log": true,
+        "process.arch": true,
+        "process.cwd": true,
+        "process.env": true,
+        "process.platform": true,
+        "process.version.substr": true,
+        "process.versions": true
+      },
+      "packages": {
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>detect-libc": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>semver": true
       }
     },
-    "gulp-zip": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>detect-libc": {
       "builtin": {
-        "buffer.constants.MAX_LENGTH": true,
-        "path.join": true
+        "child_process.spawnSync": true,
+        "fs.readdirSync": true,
+        "os.platform": true
+      },
+      "globals": {
+        "process.env": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt": {
+      "builtin": {
+        "path": true,
+        "stream.Stream": true,
+        "url": true
+      },
+      "globals": {
+        "console": true,
+        "process.argv": true,
+        "process.env.DEBUG_NOPT": true,
+        "process.env.NOPT_DEBUG": true,
+        "process.platform": true
       },
       "packages": {
-        "gulp-zip>get-stream": true,
-        "gulp-zip>plugin-error": true,
-        "gulp-zip>through2": true,
-        "gulp-zip>yazl": true,
-        "vinyl": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>abbrev": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv": true
       }
     },
-    "gulp-zip>get-stream": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv": {
       "builtin": {
-        "buffer.constants.MAX_LENGTH": true,
-        "stream.PassThrough": true
+        "child_process.exec": true,
+        "path": true
       },
       "globals": {
-        "Buffer.concat": true
+        "process.env.COMPUTERNAME": true,
+        "process.env.ComSpec": true,
+        "process.env.EDITOR": true,
+        "process.env.HOSTNAME": true,
+        "process.env.PATH": true,
+        "process.env.PROMPT": true,
+        "process.env.PS1": true,
+        "process.env.Path": true,
+        "process.env.SHELL": true,
+        "process.env.USER": true,
+        "process.env.USERDOMAIN": true,
+        "process.env.USERNAME": true,
+        "process.env.VISUAL": true,
+        "process.env.path": true,
+        "process.nextTick": true,
+        "process.platform": true
       },
       "packages": {
-        "pump": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true
       }
     },
-    "gulp-zip>plugin-error": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": {
       "builtin": {
-        "util.inherits": true
+        "os.homedir": true
       },
-      "packages": {
-        "gulp-watch>ansi-colors": true,
-        "gulp-zip>plugin-error>arr-union": true,
-        "gulp-zip>plugin-error>extend-shallow": true,
-        "webpack>micromatch>arr-diff": true
+      "globals": {
+        "process.env": true,
+        "process.getuid": true,
+        "process.platform": true
       }
     },
-    "gulp-zip>plugin-error>extend-shallow": {
-      "packages": {
-        "gulp-zip>plugin-error>extend-shallow>is-extendable": true,
-        "webpack>micromatch>extend-shallow>assign-symbols": true
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": {
+      "globals": {
+        "process.env.SystemRoot": true,
+        "process.env.TEMP": true,
+        "process.env.TMP": true,
+        "process.env.TMPDIR": true,
+        "process.env.windir": true,
+        "process.platform": true
       }
     },
-    "gulp-zip>plugin-error>extend-shallow>is-extendable": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "util": true
+      },
+      "globals": {
+        "process.nextTick": true,
+        "process.stderr": true
+      },
       "packages": {
-        "@babel/register>clone-deep>is-plain-object": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>console-control-strings": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>set-blocking": true
       }
     },
-    "gulp-zip>through2": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": {
       "builtin": {
+        "events.EventEmitter": true,
         "util.inherits": true
       },
-      "globals": {
-        "process.nextTick": true
-      },
       "packages": {
-        "gulp-zip>through2>readable-stream": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>delegates": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream": true
       }
     },
-    "gulp-zip>through2>readable-stream": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream": {
       "builtin": {
-        "buffer.Buffer": true,
         "events.EventEmitter": true,
         "stream": true,
         "util": true
       },
       "globals": {
+        "process.browser": true,
         "process.env.READABLE_STREAM": true,
-        "process.nextTick": true,
         "process.stderr": true,
-        "process.stdout": true
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
       },
       "packages": {
-        "@storybook/api>util-deprecate": true,
-        "browserify>string_decoder": true,
-        "pumpify>inherits": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>core-util-is": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>isarray": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>process-nextick-args": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>string_decoder": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>util-deprecate": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": true
       }
     },
-    "gulp-zip>yazl": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "fs.createReadStream": true,
-        "fs.stat": true,
-        "stream.PassThrough": true,
-        "stream.Transform": true,
-        "util.inherits": true,
-        "zlib.DeflateRaw": true,
-        "zlib.deflateRaw": true
-      },
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>core-util-is": {
       "globals": {
-        "Buffer": true,
-        "setImmediate": true,
-        "utf8FileName.length": true
-      },
-      "packages": {
-        "gulp-zip>yazl>buffer-crc32": true
+        "Buffer.isBuffer": true
       }
     },
-    "gulp-zip>yazl>buffer-crc32": {
-      "builtin": {
-        "buffer.Buffer": true
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>process-nextick-args": {
+      "globals": {
+        "process": true
       }
     },
-    "gulp>glob-watcher": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>string_decoder": {
       "packages": {
-        "gulp>glob-watcher>anymatch": true,
-        "gulp>glob-watcher>async-done": true,
-        "gulp>glob-watcher>chokidar": true,
-        "gulp>glob-watcher>is-negated-glob": true,
-        "gulp>glob-watcher>just-debounce": true,
-        "gulp>undertaker>object.defaults": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": true
       }
     },
-    "gulp>glob-watcher>anymatch": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet>readable-stream>util-deprecate": {
       "builtin": {
-        "path.sep": true
-      },
-      "packages": {
-        "gulp>glob-watcher>anymatch>micromatch": true,
-        "gulp>glob-watcher>anymatch>normalize-path": true
+        "util.deprecate": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge": {
       "builtin": {
-        "path.basename": true,
-        "path.sep": true,
-        "util.inspect": true
+        "util.format": true
       },
       "globals": {
-        "process.platform": true
+        "clearInterval": true,
+        "process": true,
+        "setImmediate": true,
+        "setInterval": true
       },
       "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>define-property": true,
-        "gulp>glob-watcher>anymatch>micromatch>extend-shallow": true,
-        "gulp>glob-watcher>chokidar>braces": true,
-        "webpack>micromatch>arr-diff": true,
-        "webpack>micromatch>array-unique": true,
-        "webpack>micromatch>extglob": true,
-        "webpack>micromatch>fragment-cache": true,
-        "webpack>micromatch>kind-of": true,
-        "webpack>micromatch>nanomatch": true,
-        "webpack>micromatch>object.pick": true,
-        "webpack>micromatch>regex-not": true,
-        "webpack>micromatch>snapdragon": true,
-        "webpack>micromatch>to-regex": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>console-control-strings": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>aproba": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>has-unicode": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>object-assign": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>signal-exit": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>define-property": {
-      "packages": {
-        "gulp>gulp-cli>isobject": true,
-        "webpack>micromatch>define-property>is-descriptor": true
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>has-unicode": {
+      "builtin": {
+        "os.type": true
+      },
+      "globals": {
+        "process.env.LANG": true,
+        "process.env.LC_ALL": true,
+        "process.env.LC_CTYPE": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extend-shallow": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>signal-exit": {
+      "builtin": {
+        "assert.equal": true,
+        "events": true
+      },
+      "globals": {
+        "process": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": {
       "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extend-shallow>is-extendable": true,
-        "webpack>micromatch>extend-shallow>assign-symbols": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>code-point-at": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extend-shallow>is-extendable": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": {
       "packages": {
-        "@babel/register>clone-deep>is-plain-object": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point>number-is-nan": true
       }
     },
-    "gulp>glob-watcher>anymatch>normalize-path": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": {
       "packages": {
-        "vinyl>remove-trailing-separator": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi>ansi-regex": true
       }
     },
-    "gulp>glob-watcher>async-done": {
-      "builtin": {
-        "domain.create": true
-      },
-      "globals": {
-        "process.nextTick": true
-      },
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": {
       "packages": {
-        "end-of-stream": true,
-        "gulp>glob-watcher>async-done>process-nextick-args": true,
-        "gulp>glob-watcher>async-done>stream-exhaust": true,
-        "pump>once": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": true
       }
     },
-    "gulp>glob-watcher>async-done>process-nextick-args": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>npmlog>set-blocking": {
       "globals": {
-        "process": true
+        "process.stderr": true,
+        "process.stdout": true
       }
     },
-    "gulp>glob-watcher>async-done>stream-exhaust": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf": {
       "builtin": {
-        "stream.Writable": true,
-        "util.inherits": true
+        "assert": true,
+        "fs": true,
+        "path.join": true
       },
       "globals": {
-        "setImmediate": true
+        "process.platform": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob": true
       }
     },
-    "gulp>glob-watcher>chokidar": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob": {
       "builtin": {
+        "assert": true,
         "events.EventEmitter": true,
-        "fs": true,
-        "path.basename": true,
-        "path.dirname": true,
-        "path.extname": true,
+        "fs.lstat": true,
+        "fs.lstatSync": true,
+        "fs.readdir": true,
+        "fs.readdirSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
         "path.join": true,
-        "path.relative": true,
         "path.resolve": true,
-        "path.sep": true
+        "util": true
       },
       "globals": {
-        "clearTimeout": true,
         "console.error": true,
-        "process.env.CHOKIDAR_INTERVAL": true,
-        "process.env.CHOKIDAR_PRINT_FSEVENTS_REQUIRE_ERROR": true,
-        "process.env.CHOKIDAR_USEPOLLING": true,
+        "process.cwd": true,
         "process.nextTick": true,
-        "process.platform": true,
-        "setTimeout": true
+        "process.platform": true
       },
       "packages": {
-        "eslint>is-glob": true,
-        "gulp-watch>chokidar>async-each": true,
-        "gulp-watch>glob-parent": true,
-        "gulp-watch>path-is-absolute": true,
-        "gulp>glob-watcher>anymatch": true,
-        "gulp>glob-watcher>chokidar>braces": true,
-        "gulp>glob-watcher>chokidar>is-binary-path": true,
-        "gulp>glob-watcher>chokidar>normalize-path": true,
-        "gulp>glob-watcher>chokidar>readdirp": true,
-        "gulp>glob-watcher>chokidar>upath": true,
-        "pumpify>inherits": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>fs.realpath": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inflight": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>path-is-absolute": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>fs.realpath": {
+      "builtin": {
+        "fs.lstat": true,
+        "fs.lstatSync": true,
+        "fs.readlink": true,
+        "fs.readlinkSync": true,
+        "fs.realpath": true,
+        "fs.realpathSync": true,
+        "fs.stat": true,
+        "fs.statSync": true,
+        "path.normalize": true,
+        "path.resolve": true
+      },
+      "globals": {
+        "console.error": true,
+        "console.trace": true,
+        "process.env.NODE_DEBUG": true,
+        "process.nextTick": true,
+        "process.noDeprecation": true,
+        "process.platform": true,
+        "process.throwDeprecation": true,
+        "process.traceDeprecation": true,
+        "process.version": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inflight": {
+      "globals": {
+        "process.nextTick": true
+      },
       "packages": {
-        "gulp>glob-watcher>chokidar>braces>fill-range": true,
-        "gulp>gulp-cli>isobject": true,
-        "gulp>undertaker>arr-flatten": true,
-        "webpack>micromatch>array-unique": true,
-        "webpack>micromatch>braces>repeat-element": true,
-        "webpack>micromatch>braces>snapdragon-node": true,
-        "webpack>micromatch>braces>split-string": true,
-        "webpack>micromatch>extglob>extend-shallow": true,
-        "webpack>micromatch>snapdragon": true,
-        "webpack>micromatch>to-regex": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once>wrappy": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces>fill-range": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>inherits": {
       "builtin": {
-        "util.inspect": true
+        "util.inherits": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch": {
+      "builtin": {
+        "path": true
+      },
+      "globals": {
+        "console.error": true
       },
       "packages": {
-        "gulp>glob-watcher>chokidar>braces>fill-range>is-number": true,
-        "gulp>glob-watcher>chokidar>braces>fill-range>to-regex-range": true,
-        "webpack>micromatch>braces>fill-range>repeat-string": true,
-        "webpack>micromatch>extglob>extend-shallow": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces>fill-range>is-number": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion": {
       "packages": {
-        "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion>balanced-match": true,
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>minimatch>brace-expansion>concat-map": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": {
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once": {
       "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+        "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>once>wrappy": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces>fill-range>to-regex-range": {
-      "packages": {
-        "gulp>glob-watcher>chokidar>braces>fill-range>is-number": true,
-        "webpack>micromatch>braces>fill-range>repeat-string": true
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>rimraf>glob>path-is-absolute": {
+      "globals": {
+        "process.platform": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>semver": {
+      "globals": {
+        "console": true,
+        "process": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>fsevents>node-pre-gyp>tar>safe-buffer": {
+      "builtin": {
+        "buffer": true
       }
     },
     "gulp>glob-watcher>chokidar>is-binary-path": {
diff --git a/package.json b/package.json
index 120643bdf..3cf5e5ef5 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "eth-ens-namehash": "^2.0.8",
     "eth-json-rpc-filters": "^4.2.1",
     "eth-json-rpc-middleware": "^9.0.1",
-    "eth-keyring-controller": "^7.0.2",
+    "eth-keyring-controller": "^8.0.1",
     "eth-lattice-keyring": "^0.12.3",
     "eth-method-registry": "^2.0.0",
     "eth-query": "^2.1.2",
diff --git a/test/e2e/tests/from-import-ui.spec.js b/test/e2e/tests/from-import-ui.spec.js
index 9c87f6c66..e09da607b 100644
--- a/test/e2e/tests/from-import-ui.spec.js
+++ b/test/e2e/tests/from-import-ui.spec.js
@@ -397,7 +397,7 @@ describe('MetaMask Import UI', function () {
         // error should occur
         await driver.waitForSelector({
           css: '.error',
-          text: "The account you're are trying to import is a duplicate",
+          text: 'The account you are trying to import is a duplicate',
         });
       },
     );
diff --git a/test/lib/mock-encryptor.js b/test/lib/mock-encryptor.js
index 75a8488a8..1d2add75d 100644
--- a/test/lib/mock-encryptor.js
+++ b/test/lib/mock-encryptor.js
@@ -12,6 +12,12 @@ const mockEncryptor = {
     return Promise.resolve(cacheVal || {});
   },
 
+  encryptWithDetail(_, dataObj) {
+    cacheVal = dataObj;
+
+    return Promise.resolve({ vault: mockHex, exportedKeyString: '' });
+  },
+
   encryptWithKey(key, dataObj) {
     return this.encrypt(key, dataObj);
   },
diff --git a/yarn.lock b/yarn.lock
index 756972d7c..a4e40e3cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2786,6 +2786,11 @@
   resolved "https://registry.yarnpkg.com/@metamask/browser-passworder/-/browser-passworder-3.0.0.tgz#c06744e66a968ffa13f70cc71a7d3b15d86b0ee7"
   integrity sha512-hD10mgvhcDkZX8wnauw8udp1K2MzcbZfrN7Yon9sQ+OqVK9kiQ4VhZAyZNZTy9KJLtfoVD9Y2F6L4gEese7hDA==
 
+"@metamask/browser-passworder@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@metamask/browser-passworder/-/browser-passworder-4.0.1.tgz#bb2613bb1886774e18da4107ab94a21042e5e3da"
+  integrity sha512-mtekzCKph/S/15hRfWFDIUrpvz9mNoIU0CmH0SOlTHpLhalonEsZ+56MbQQUDshXbytzHp1eKr29OHrIx0u9iQ==
+
 "@metamask/contract-metadata@^1.31.0", "@metamask/contract-metadata@^1.35.0":
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/@metamask/contract-metadata/-/contract-metadata-1.36.0.tgz#8e277190195e9c26733752457d2004d149fd7e0e"
@@ -11187,6 +11192,18 @@ eth-keyring-controller@^7.0.2:
     eth-simple-keyring "^4.2.0"
     obs-store "^4.0.3"
 
+eth-keyring-controller@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-8.0.1.tgz#02bddda96251aadc739179802ab3dd2f9415d12a"
+  integrity sha512-6LDnvOIxbA+P6lAAAzde4Kb6hyB70Zs8gPp/enuDrvvFO79LCWGCzP0rre7OQC+agwFsU0gSHJXkRZK8llgPSg==
+  dependencies:
+    "@metamask/bip39" "^4.0.0"
+    "@metamask/browser-passworder" "^4.0.1"
+    "@metamask/eth-hd-keyring" "^4.0.2"
+    eth-sig-util "^3.0.1"
+    eth-simple-keyring "^4.2.0"
+    obs-store "^4.0.3"
+
 eth-lattice-keyring@^0.12.3:
   version "0.12.3"
   resolved "https://registry.yarnpkg.com/eth-lattice-keyring/-/eth-lattice-keyring-0.12.3.tgz#32ee3db427d15f1d76f907a36ddc34f4aab205ba"