Merge pull request #4403 from MetaMask/bugfix-keyring-controller

deps - bump eth-keyring-controller + update package-lock
7 years ago · 77c55ecd83
parent 4789e981c2 73afb263cb
commit 77c55ecd83
3 changed files with 60 additions and 55 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -309,7 +309,7 @@
    },
    "@sinonjs/formatio": {
      "version": "2.0.0",
-      "resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
      "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
      "dev": true,
      "requires": {
@ -1500,7 +1500,8 @@
      },
      "dependencies": {
        "bignumber.js": {
-          "version": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
+          "version": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2",
+          "from": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
        },
        "chai": {
          "version": "3.5.0",
@ -8013,6 +8014,7 @@
      "dependencies": {
        "async-eventemitter": {
          "version": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c",
+          "from": "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c",
          "requires": {
            "async": "2.6.0"
          }
@ -8167,20 +8169,20 @@
      }
    },
    "eth-keyring-controller": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/eth-keyring-controller/-/eth-keyring-controller-3.1.1.tgz",
-      "integrity": "sha512-Z9HTzrop/V4Ld8Wq7uwetKecfWIyx25/uL8aFoZxV3kegZGoXaWoRmNy+4oW0WNLp4BcJ1lk6QfsGEdlymGjmA==",
-      "requires": {
-        "bip39": "2.4.0",
-        "bluebird": "3.5.1",
-        "browser-passworder": "2.0.3",
-        "eth-hd-keyring": "1.2.2",
-        "eth-sig-util": "1.4.2",
-        "eth-simple-keyring": "1.2.1",
-        "ethereumjs-util": "5.2.0",
-        "loglevel": "1.6.0",
-        "obs-store": "2.4.1",
-        "promise-filter": "1.1.0"
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/eth-keyring-controller/-/eth-keyring-controller-3.1.3.tgz",
+      "integrity": "sha512-5xzUeT2mq+S2GvTRnvhdZjrasZg+TqeSTH5sZRbDSXgXC9TYobFvEcK6g2wP/RkOQ3dt0xo/6/TWgwiXFfNZjw==",
+      "requires": {
+        "bip39": "^2.4.0",
+        "bluebird": "^3.5.0",
+        "browser-passworder": "^2.0.3",
+        "eth-hd-keyring": "^1.2.2",
+        "eth-sig-util": "^1.4.0",
+        "eth-simple-keyring": "^1.2.1",
+        "ethereumjs-util": "^5.1.2",
+        "loglevel": "^1.5.0",
+        "obs-store": "^2.4.1",
+        "promise-filter": "^1.1.0"
      },
      "dependencies": {
        "babelify": {
@ -8188,8 +8190,8 @@
          "resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz",
          "integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=",
          "requires": {
-            "babel-core": "6.26.0",
-            "object-assign": "4.1.1"
+            "babel-core": "^6.0.14",
+            "object-assign": "^4.0.0"
          }
        },
        "ethereumjs-util": {
@ -8197,13 +8199,13 @@
          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
          "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
          "requires": {
-            "bn.js": "4.11.8",
-            "create-hash": "1.1.3",
-            "ethjs-util": "0.1.4",
-            "keccak": "1.4.0",
-            "rlp": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "secp256k1": "3.4.0"
+            "bn.js": "^4.11.0",
+            "create-hash": "^1.1.2",
+            "ethjs-util": "^0.1.3",
+            "keccak": "^1.0.2",
+            "rlp": "^2.0.0",
+            "safe-buffer": "^5.1.1",
+            "secp256k1": "^3.0.1"
          }
        },
        "obs-store": {
@ -8211,11 +8213,11 @@
          "resolved": "https://registry.npmjs.org/obs-store/-/obs-store-2.4.1.tgz",
          "integrity": "sha512-wpA8G4uSn8cnCKZ0pFTvqsamvy0Sm1hR2ot0Qonbfj5yBMwdAp/eD4vDI+U/ZCbV1hb2V5GapL8YKUdGCvahgg==",
          "requires": {
-            "babel-preset-es2015": "6.24.1",
-            "babelify": "7.3.0",
-            "readable-stream": "2.3.3",
-            "through2": "2.0.3",
-            "xtend": "4.0.1"
+            "babel-preset-es2015": "^6.22.0",
+            "babelify": "^7.3.0",
+            "readable-stream": "^2.2.2",
+            "through2": "^2.0.3",
+            "xtend": "^4.0.1"
          }
        }
      }
@ -8262,6 +8264,7 @@
      "dependencies": {
        "ethereumjs-abi": {
          "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#4ea2fdfed09e8f99117d9362d17c6b01b64a2bcf",
+          "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
          "requires": {
            "bn.js": "4.11.8",
            "ethereumjs-util": "5.1.3"
@ -8288,11 +8291,11 @@
      "resolved": "https://registry.npmjs.org/eth-simple-keyring/-/eth-simple-keyring-1.2.1.tgz",
      "integrity": "sha1-bXs1LcWppQINYfafryHvsvY2P0U=",
      "requires": {
-        "eth-sig-util": "1.4.2",
-        "ethereumjs-util": "5.2.0",
-        "ethereumjs-wallet": "0.6.0",
-        "events": "1.1.1",
-        "xtend": "4.0.1"
+        "eth-sig-util": "^1.4.2",
+        "ethereumjs-util": "^5.1.1",
+        "ethereumjs-wallet": "^0.6.0",
+        "events": "^1.1.1",
+        "xtend": "^4.0.1"
      },
      "dependencies": {
        "ethereumjs-util": {
@ -8300,13 +8303,13 @@
          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
          "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
          "requires": {
-            "bn.js": "4.11.8",
-            "create-hash": "1.1.3",
-            "ethjs-util": "0.1.4",
-            "keccak": "1.4.0",
-            "rlp": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "secp256k1": "3.4.0"
+            "bn.js": "^4.11.0",
+            "create-hash": "^1.1.2",
+            "ethjs-util": "^0.1.3",
+            "keccak": "^1.0.2",
+            "rlp": "^2.0.0",
+            "safe-buffer": "^5.1.1",
+            "secp256k1": "^3.0.1"
          }
        }
      }
@ -8493,7 +8496,7 @@
        "eth-query": "2.1.2",
        "ethereumjs-block": "1.7.0",
        "ethereumjs-tx": "1.3.3",
-        "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
+        "ethereumjs-util": "^5.0.1",
        "ethereumjs-vm": "2.3.5",
        "through2": "2.0.3",
        "treeify": "1.1.0",
@ -8642,7 +8645,7 @@
        "async": "2.6.0",
        "ethereum-common": "0.2.0",
        "ethereumjs-tx": "1.3.3",
-        "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
+        "ethereumjs-util": "^5.0.0",
        "merkle-patricia-tree": "2.3.0"
      }
    },
@ -8652,7 +8655,7 @@
      "integrity": "sha1-7OBR0+/b53GtKlGNYWMsoqt17Ls=",
      "requires": {
        "ethereum-common": "0.0.18",
-        "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9"
+        "ethereumjs-util": "^5.0.0"
      },
      "dependencies": {
        "ethereum-common": {
@ -8664,6 +8667,7 @@
    },
    "ethereumjs-util": {
      "version": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
+      "from": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
      "requires": {
        "bn.js": "4.11.8",
        "create-hash": "1.1.3",
@ -9101,7 +9105,7 @@
    },
    "event-stream": {
      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
      "dev": true,
      "requires": {
@ -11817,6 +11821,7 @@
    },
    "gulp": {
      "version": "github:gulpjs/gulp#71c094a51c7972d26f557899ddecab0210ef3776",
+      "from": "github:gulpjs/gulp#4.0",
      "requires": {
        "glob-watcher": "4.0.0",
        "gulp-cli": "2.0.1",
@ -18199,7 +18204,7 @@
      "integrity": "sha512-LKd2OoIT9Re/OG38zXbd5pyHIk2IfcOUczCwkYXl5iJIbufg9nqpweh66VfPwMkUlrEvc7YVvtQdmSrB9V9TkQ==",
      "requires": {
        "async": "1.5.2",
-        "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
+        "ethereumjs-util": "^5.0.0",
        "level-ws": "0.0.0",
        "levelup": "1.3.9",
        "memdown": "1.4.1",
@ -31221,7 +31226,8 @@
      },
      "dependencies": {
        "bignumber.js": {
-          "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934"
+          "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
+          "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git"
        }
      }
    },
@ -31702,6 +31708,7 @@
        },
        "websocket": {
          "version": "git://github.com/frozeman/WebSocket-Node.git#7004c39c42ac98875ab61126e5b4a925430f592c",
+          "from": "websocket@git://github.com/frozeman/WebSocket-Node.git#7004c39c42ac98875ab61126e5b4a925430f592c",
          "requires": {
            "debug": "2.6.9",
            "nan": "2.8.0",
--- a/package.json
+++ b/package.json
@ -98,7 +98,7 @@
    "eth-hd-keyring": "^1.2.1",
    "eth-json-rpc-filters": "^1.2.6",
    "eth-json-rpc-infura": "^3.0.0",
-    "eth-keyring-controller": "^3.1.1",
+    "eth-keyring-controller": "^3.1.3",
    "eth-phishing-detect": "^1.1.4",
    "eth-query": "^2.1.2",
    "eth-sig-util": "^1.4.2",
--- a/test/screens/new-ui.js
+++ b/test/screens/new-ui.js
@ -11,9 +11,8 @@ const GIFEncoder = require('gifencoder')
 const pngFileStream = require('png-file-stream')
 const sizeOfPng = require('image-size/lib/types/png')
 const By = webdriver.By
-const { delay, buildWebDriver } = require('./func')
 const localesIndex = require('../../app/_locales/index.json')
-// const localesIndex = []
+const { delay, buildChromeWebDriver, buildFirefoxWebdriver, installWebExt, getExtensionIdChrome, getExtensionIdFirefox } = require('../e2e/func')

 const eth = new Ethjs(new Ethjs.HttpProvider('http://localhost:8545'))

@ -50,11 +49,10 @@ async function captureAllScreens() {

  await cleanScreenShotDir()

-  // setup selenium and install extension
  const extPath = path.resolve('dist/chrome')
-  driver = buildWebDriver(extPath)
-  await driver.get('chrome://extensions-frame')
-  const extensionId = await driver.executeScript('return document.querySelector("extensions-manager").shadowRoot.querySelector("extensions-view-manager extensions-item-list").shadowRoot.querySelector("#container > div.items-container > extensions-item:nth-child(2)").getAttribute("id")')
+  driver = buildChromeWebDriver(extPath)
+  const extensionId = await getExtensionIdChrome(driver)
+
  await driver.get(`chrome-extension://${extensionId}/home.html`)
  await delay(500)
  tabs = await driver.getAllWindowHandles()