Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine

1 files changed, 35 insertions, 10 deletions

diff --git a/package-lock.json b/package-lock.json
index 24e766334..2e0bb8184 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8777,16 +8777,16 @@
       "integrity": "sha1-x7kULEtZUJsziiBLYyiupA3Txk4="
     },
     "ethjs": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/ethjs/-/ethjs-0.3.6.tgz",
-      "integrity": "sha512-9ojnSkV5XXSM5vo0pKgZpE+SNBPxqSUN0dZmMP5dBZVFOYctRd9tfaZ80Jnde3M4JrfUhhkbG5QFvewitaAY7Q==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/ethjs/-/ethjs-0.4.0.tgz",
+      "integrity": "sha512-UnQeRMpQ+JETN2FviexEskUwByid+eO8rybjPnk2DNUzjUn0VKNrUbiCAud7Es6otDFwjUeOS58vMZwkZxIIog==",
       "requires": {
         "bn.js": "4.11.6",
         "ethjs-abi": "0.2.1",
-        "ethjs-contract": "0.1.9",
-        "ethjs-filter": "0.1.5",
+        "ethjs-contract": "0.2.3",
+        "ethjs-filter": "0.1.8",
         "ethjs-provider-http": "0.1.6",
-        "ethjs-query": "0.3.4",
+        "ethjs-query": "0.3.8",
         "ethjs-unit": "0.1.6",
         "ethjs-util": "0.1.3",
         "js-sha3": "0.5.5",
@@ -8809,12 +8809,13 @@
           }
         },
         "ethjs-contract": {
-          "version": "0.1.9",
-          "resolved": "https://registry.npmjs.org/ethjs-contract/-/ethjs-contract-0.1.9.tgz",
-          "integrity": "sha1-HCdmiWpW1H7B1tZhgpxJzDilUgo=",
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/ethjs-contract/-/ethjs-contract-0.2.3.tgz",
+          "integrity": "sha512-fKsHm57wxwHrZhVlD8AHU2lC2G3c1fmvoEz15BpqIkuGWiTbjuvrQo2Avc+3EQpSsTFWNdyxC0h1WKRcn5kkyQ==",
           "requires": {
+            "babel-runtime": "6.26.0",
             "ethjs-abi": "0.2.0",
-            "ethjs-filter": "0.1.5",
+            "ethjs-filter": "0.1.8",
             "ethjs-util": "0.1.3",
             "js-sha3": "0.5.5"
           },
@@ -8831,6 +8832,30 @@
             }
           }
         },
+        "ethjs-filter": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/ethjs-filter/-/ethjs-filter-0.1.8.tgz",
+          "integrity": "sha512-qTDPskDL2UadHwjvM8A+WG9HwM4/FoSY3p3rMJORkHltYcAuiQZd2otzOYKcL5w2Q3sbAkW/E3yt/FPFL/AVXA=="
+        },
+        "ethjs-query": {
+          "version": "0.3.8",
+          "resolved": "https://registry.npmjs.org/ethjs-query/-/ethjs-query-0.3.8.tgz",
+          "integrity": "sha512-/J5JydqrOzU8O7VBOwZKUWXxHDGr46VqNjBCJgBVNNda+tv7Xc8Y2uJc6aMHHVbeN3YOQ7YRElgIc0q1CI02lQ==",
+          "requires": {
+            "babel-runtime": "6.26.0",
+            "ethjs-format": "0.2.7",
+            "ethjs-rpc": "0.2.0",
+            "promise-to-callback": "1.0.0"
+          }
+        },
+        "ethjs-rpc": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/ethjs-rpc/-/ethjs-rpc-0.2.0.tgz",
+          "integrity": "sha512-RINulkNZTKnj4R/cjYYtYMnFFaBcVALzbtEJEONrrka8IeoarNB9Jbzn+2rT00Cv8y/CxAI+GgY1d0/i2iQeOg==",
+          "requires": {
+            "promise-to-callback": "1.0.0"
+          }
+        },
         "ethjs-util": {
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.3.tgz",