Merge pull request #4083 from MetaMask/pe-bump

rpc - bump provider-engine + eth-json-rpc-filters

3 files changed, 176 insertions, 42 deletions

diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js
index 6fd983bb2..2f5b81cd2 100644
--- a/app/scripts/controllers/network/network.js
+++ b/app/scripts/controllers/network/network.js
@@ -1,7 +1,7 @@
 const assert = require('assert')
 const EventEmitter = require('events')
 const createMetamaskProvider = require('web3-provider-engine/zero.js')
-const SubproviderFromProvider = require('web3-provider-engine/subproviders/web3.js')
+const SubproviderFromProvider = require('web3-provider-engine/subproviders/provider.js')
 const createInfuraProvider = require('eth-json-rpc-infura/src/createProvider')
 const ObservableStore = require('obs-store')
 const ComposedStore = require('obs-store/lib/composed')
diff --git a/package-lock.json b/package-lock.json
index 4b6fb2296..5b5b82450 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2084,6 +2084,14 @@
       "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
       "dev": true
     },
+    "backoff": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz",
+      "integrity": "sha1-9hbtqdPktmuMp/ynn2lXIsX44m8=",
+      "requires": {
+        "precond": "0.2.3"
+      }
+    },
     "bail": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz",
@@ -3904,6 +3912,22 @@
         "is-windows": "1.0.2"
       }
     },
+    "cross-fetch": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.1.0.tgz",
+      "integrity": "sha512-FTIt2WK44RiafWQ62xIvd+oBoVd392abh1lF872trLlA74JCR1s4oTHlixwoIKy44ehn8WbQ0Ds2P16sw7ZQxg==",
+      "requires": {
+        "node-fetch": "2.1.1",
+        "whatwg-fetch": "2.0.3"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.1.tgz",
+          "integrity": "sha1-NpynC4L1DIZJYQSmx3bSdPTkotQ="
+        }
+      }
+    },
     "cross-spawn": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -5832,37 +5856,13 @@
       }
     },
     "eth-json-rpc-filters": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/eth-json-rpc-filters/-/eth-json-rpc-filters-1.2.5.tgz",
-      "integrity": "sha512-MUcUzwDy0cPso1BEnY5T5DtlI8r8gA7lNqn+BOFzDX1Ll6C8mCPz8pzSKrTkbKV9KTfgQYJ/M4vJbR83TqhROg==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/eth-json-rpc-filters/-/eth-json-rpc-filters-1.2.6.tgz",
+      "integrity": "sha512-6G9t43s3lxJckeSfNduc3Ww/40BGm1Cf8MU1nL8rrumZbEg44ZSexWUowB00D4kJ9qSOH+CbzdI+m3oVMi4xFw==",
       "requires": {
         "await-semaphore": "0.1.3",
-        "eth-json-rpc-middleware": "1.5.0",
-        "json-rpc-engine": "3.4.0",
+        "json-rpc-engine": "3.6.1",
         "lodash.flatmap": "4.5.0"
-      },
-      "dependencies": {
-        "babelify": {
-          "version": "7.3.0",
-          "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"
-          }
-        },
-        "json-rpc-engine": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-3.4.0.tgz",
-          "integrity": "sha1-ihZHp/LMcBj0gC9B7III0oH3i/w=",
-          "requires": {
-            "async": "2.6.0",
-            "babel-preset-env": "1.6.1",
-            "babelify": "7.3.0",
-            "json-rpc-error": "2.0.0",
-            "promise-to-callback": "1.0.0"
-          }
-        }
       }
     },
     "eth-json-rpc-infura": {
@@ -6242,6 +6242,50 @@
         "through2": "2.0.3",
         "treeify": "1.1.0",
         "web3-provider-engine": "13.8.0"
+      },
+      "dependencies": {
+        "web3-provider-engine": {
+          "version": "13.8.0",
+          "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-13.8.0.tgz",
+          "integrity": "sha512-fZXhX5VWwWpoFfrfocslyg6P7cN3YWPG/ASaevNfeO80R+nzgoPUBXcWQekSGSsNDkeRTis4aMmpmofYf1TNtQ==",
+          "requires": {
+            "async": "2.6.0",
+            "clone": "2.1.1",
+            "eth-block-tracker": "2.3.0",
+            "eth-sig-util": "1.4.2",
+            "ethereumjs-block": "1.7.0",
+            "ethereumjs-tx": "1.3.3",
+            "ethereumjs-util": "5.1.5",
+            "ethereumjs-vm": "2.3.2",
+            "fetch-ponyfill": "4.1.0",
+            "json-rpc-error": "2.0.0",
+            "json-stable-stringify": "1.0.1",
+            "promise-to-callback": "1.0.0",
+            "readable-stream": "2.3.3",
+            "request": "2.83.0",
+            "semaphore": "1.1.0",
+            "solc": "0.4.23",
+            "tape": "4.8.0",
+            "xhr": "2.4.1",
+            "xtend": "4.0.1"
+          },
+          "dependencies": {
+            "ethereumjs-util": {
+              "version": "5.1.5",
+              "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.1.5.tgz",
+              "integrity": "sha512-xPaSEATYJpMTCGowIt0oMZwFP4R1bxd6QsWgkcDvFL0JtXsr39p32WEcD14RscCjfP41YXZPCVWA4yAg0nrJmw==",
+              "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"
+              }
+            }
+          }
+        }
       }
     },
     "ethereum-common": {
@@ -9119,6 +9163,32 @@
             "web3-utils": "1.0.0-beta.34"
           }
         },
+        "web3-provider-engine": {
+          "version": "13.8.0",
+          "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-13.8.0.tgz",
+          "integrity": "sha512-fZXhX5VWwWpoFfrfocslyg6P7cN3YWPG/ASaevNfeO80R+nzgoPUBXcWQekSGSsNDkeRTis4aMmpmofYf1TNtQ==",
+          "requires": {
+            "async": "2.6.0",
+            "clone": "2.1.1",
+            "eth-block-tracker": "2.3.0",
+            "eth-sig-util": "1.4.2",
+            "ethereumjs-block": "1.2.2",
+            "ethereumjs-tx": "1.3.3",
+            "ethereumjs-util": "5.1.5",
+            "ethereumjs-vm": "2.3.3",
+            "fetch-ponyfill": "4.1.0",
+            "json-rpc-error": "2.0.0",
+            "json-stable-stringify": "1.0.1",
+            "promise-to-callback": "1.0.0",
+            "readable-stream": "2.3.3",
+            "request": "2.83.0",
+            "semaphore": "1.1.0",
+            "solc": "0.4.18",
+            "tape": "4.8.0",
+            "xhr": "2.4.1",
+            "xtend": "4.0.1"
+          }
+        },
         "yargs": {
           "version": "7.1.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
@@ -20049,6 +20119,11 @@
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
       "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU="
     },
+    "precond": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz",
+      "integrity": "sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw="
+    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -22585,9 +22660,9 @@
       }
     },
     "solc": {
-      "version": "0.4.21",
-      "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.21.tgz",
-      "integrity": "sha512-8lJmimVjOG9AJOQRWS2ph4rSctPMsPGZ4H360HLs5iI+euUlt7iAvUxSLeFZZzwk0kas4Qta7HmlMXNU3yYwhw==",
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.23.tgz",
+      "integrity": "sha512-AT7anLHY6uIRg2It6N0UlCHeZ7YeecIkUhnlirrCgCPCUevtnoN48BxvgigN/4jJTRljv5oFhAJtI6gvHzT5DQ==",
       "requires": {
         "fs-extra": "0.30.0",
         "memorystream": "0.3.1",
@@ -24928,7 +25003,7 @@
       "optional": true
     },
     "uglifyify": {
-      "version": "github:danfinlay/uglifyify#8662585e39125a96a5379d71cb4a606829790f87",
+      "version": "github:MetaMask/uglifyify#8662585e39125a96a5379d71cb4a606829790f87",
       "dev": true,
       "requires": {
         "convert-source-map": "1.1.3",
@@ -26195,31 +26270,59 @@
       }
     },
     "web3-provider-engine": {
-      "version": "13.8.0",
-      "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-13.8.0.tgz",
-      "integrity": "sha512-fZXhX5VWwWpoFfrfocslyg6P7cN3YWPG/ASaevNfeO80R+nzgoPUBXcWQekSGSsNDkeRTis4aMmpmofYf1TNtQ==",
+      "version": "14.0.5",
+      "resolved": "https://registry.npmjs.org/web3-provider-engine/-/web3-provider-engine-14.0.5.tgz",
+      "integrity": "sha512-1W/ue7VOwOMnmKgMY3HCpbixi6qhfl4r1dK8W597AwJLbrQ+twJKwWlFAedDpJjCc9MwRCCB3pyexW4HJVSiBg==",
       "requires": {
         "async": "2.6.0",
+        "backoff": "2.5.0",
         "clone": "2.1.1",
-        "eth-block-tracker": "2.3.0",
+        "cross-fetch": "2.1.0",
+        "eth-block-tracker": "3.0.0",
+        "eth-json-rpc-infura": "3.1.0",
         "eth-sig-util": "1.4.2",
         "ethereumjs-block": "1.7.0",
         "ethereumjs-tx": "1.3.3",
         "ethereumjs-util": "5.1.5",
-        "ethereumjs-vm": "2.3.2",
-        "fetch-ponyfill": "4.1.0",
+        "ethereumjs-vm": "2.3.4",
         "json-rpc-error": "2.0.0",
         "json-stable-stringify": "1.0.1",
         "promise-to-callback": "1.0.0",
         "readable-stream": "2.3.3",
         "request": "2.83.0",
         "semaphore": "1.1.0",
-        "solc": "0.4.21",
         "tape": "4.8.0",
+        "ws": "5.1.1",
         "xhr": "2.4.1",
         "xtend": "4.0.1"
       },
       "dependencies": {
+        "eth-block-tracker": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/eth-block-tracker/-/eth-block-tracker-3.0.0.tgz",
+          "integrity": "sha512-Lhhu/+1GOeekMRDRhUcM7VSJRmX279DByrwzEbmG0JL1tcT3xRo6GLNXnidyJ7ahHJm+0JFhw/RqtTeIxagQwA==",
+          "requires": {
+            "eth-query": "2.1.2",
+            "ethereumjs-tx": "1.3.3",
+            "ethereumjs-util": "5.1.5",
+            "ethjs-util": "0.1.4",
+            "json-rpc-engine": "3.6.1",
+            "pify": "2.3.0",
+            "tape": "4.8.0"
+          }
+        },
+        "eth-json-rpc-infura": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/eth-json-rpc-infura/-/eth-json-rpc-infura-3.1.0.tgz",
+          "integrity": "sha512-uMYkEP6fga8CyNo8TMoA/7cxi6bL3V8pTvjKQikOi9iYl6/AO5xlfgniyAMElSiq2mmXz3lYa/9VYDMzt/J5aA==",
+          "requires": {
+            "cross-fetch": "2.1.0",
+            "eth-json-rpc-middleware": "1.5.0",
+            "json-rpc-engine": "3.6.1",
+            "json-rpc-error": "2.0.0",
+            "tape": "4.8.0"
+          }
+        },
         "ethereumjs-util": {
           "version": "5.1.5",
           "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.1.5.tgz",
@@ -26233,6 +26336,37 @@
             "safe-buffer": "5.1.1",
             "secp256k1": "3.4.0"
           }
+        },
+        "ethereumjs-vm": {
+          "version": "2.3.4",
+          "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.3.4.tgz",
+          "integrity": "sha512-Y4SlzNDqxrCO58jhp98HdnZVdjOqB+HC0hoU+N/DEp1aU+hFkRX/nru5F7/HkQRPIlA6aJlQp/xIA6xZs1kspw==",
+          "requires": {
+            "async": "2.6.0",
+            "async-eventemitter": "0.2.4",
+            "ethereum-common": "0.2.0",
+            "ethereumjs-account": "2.0.4",
+            "ethereumjs-block": "1.7.0",
+            "ethereumjs-util": "5.1.5",
+            "fake-merkle-patricia-tree": "1.0.1",
+            "functional-red-black-tree": "1.0.1",
+            "merkle-patricia-tree": "2.3.0",
+            "rustbn.js": "0.1.1",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+        },
+        "ws": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-5.1.1.tgz",
+          "integrity": "sha512-bOusvpCb09TOBLbpMKszd45WKC2KPtxiyiHanv+H2DE3Az+1db5a/L7sVJZVDPUC1Br8f0SKRr1KjLpD1U/IAw==",
+          "requires": {
+            "async-limiter": "1.0.0"
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index f47b232b7..73892bc28 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "eth-block-tracker": "^2.3.0",
     "eth-contract-metadata": "^1.1.5",
     "eth-hd-keyring": "^1.2.1",
-    "eth-json-rpc-filters": "^1.2.5",
+    "eth-json-rpc-filters": "^1.2.6",
     "eth-json-rpc-infura": "^3.0.0",
     "eth-keyring-controller": "^2.2.0",
     "eth-phishing-detect": "^1.1.4",
@@ -185,7 +185,7 @@
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "^0.20.1",
-    "web3-provider-engine": "^13.8.0",
+    "web3-provider-engine": "^14.0.5",
     "web3-stream-provider": "^3.0.1",
     "xtend": "^4.0.1"
   },