network - provider - infura - use block-reemit middleware

3 files changed, 29 insertions, 28 deletions

diff --git a/app/scripts/controllers/network/createInfuraClient.js b/app/scripts/controllers/network/createInfuraClient.js
index adbf4c001..663a2595a 100644
--- a/app/scripts/controllers/network/createInfuraClient.js
+++ b/app/scripts/controllers/network/createInfuraClient.js
@@ -1,6 +1,6 @@
 const mergeMiddleware = require('json-rpc-engine/src/mergeMiddleware')
 const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware')
-const createBlockRefMiddleware = require('eth-json-rpc-middleware/block-ref')
+const createBlockReEmitMiddleware = require('eth-json-rpc-middleware/block-reemit')
 const createBlockCacheMiddleware = require('eth-json-rpc-middleware/block-cache')
 const createInflightMiddleware = require('eth-json-rpc-middleware/inflight-cache')
 const providerFromMiddleware = require('eth-json-rpc-middleware/providerFromMiddleware')
@@ -15,7 +15,7 @@ function createInfuraClient ({ network }) {
   const blockTracker = new BlockTracker({ provider: blockProvider })
 
   const networkMiddleware = mergeMiddleware([
-    createBlockRefMiddleware({ blockTracker }),
+    createBlockReEmitMiddleware({ blockTracker, provider: blockProvider }),
     createBlockCacheMiddleware({ blockTracker }),
     createInflightMiddleware(),
     createBlockTrackerInspectorMiddleware({ blockTracker }),
diff --git a/package-lock.json b/package-lock.json
index a32b86e4d..f59eaf017 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8217,25 +8217,26 @@
       }
     },
     "eth-json-rpc-middleware": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/eth-json-rpc-middleware/-/eth-json-rpc-middleware-2.2.2.tgz",
-      "integrity": "sha512-ZyFnMxjYKucDC8GHIIE7Fhwj4psdRr7xrGONHolH3uqV+4V1iE8VJphlQpDkRTx2Ar1oM2gKJCQsZCuhG8Wucw==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/eth-json-rpc-middleware/-/eth-json-rpc-middleware-2.3.0.tgz",
+      "integrity": "sha512-pMG8pDbmipPIellAoAz494ShJ/vLiCy0QOOLXPv2IwTtrdnpr04Zj9NTVxPhg6F+c87cyiUgHi6zOgoZQKvaGQ==",
       "requires": {
-        "async": "2.6.0",
-        "eth-query": "2.1.2",
-        "eth-sig-util": "1.4.2",
-        "eth-tx-summary": "3.2.1",
-        "ethereumjs-block": "1.7.0",
-        "ethereumjs-tx": "1.3.3",
-        "ethereumjs-util": "5.2.0",
-        "ethereumjs-vm": "2.3.2",
-        "fetch-ponyfill": "4.1.0",
-        "json-rpc-engine": "3.7.3",
-        "json-rpc-error": "2.0.0",
-        "json-stable-stringify": "1.0.1",
-        "pify": "3.0.0",
-        "promise-to-callback": "1.0.0",
-        "tape": "4.8.0"
+        "async": "^2.5.0",
+        "clone": "^2.1.1",
+        "eth-query": "^2.1.2",
+        "eth-sig-util": "^1.4.2",
+        "eth-tx-summary": "^3.1.2",
+        "ethereumjs-block": "^1.6.0",
+        "ethereumjs-tx": "^1.3.3",
+        "ethereumjs-util": "^5.1.2",
+        "ethereumjs-vm": "^2.1.0",
+        "fetch-ponyfill": "^4.0.0",
+        "json-rpc-engine": "^3.6.3",
+        "json-rpc-error": "^2.0.0",
+        "json-stable-stringify": "^1.0.1",
+        "pify": "^3.0.0",
+        "promise-to-callback": "^1.0.0",
+        "tape": "^4.6.3"
       },
       "dependencies": {
         "ethereumjs-util": {
@@ -8243,13 +8244,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"
           }
         }
       }
diff --git a/package.json b/package.json
index 707a90ffe..564db99c9 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "eth-hd-keyring": "^1.2.1",
     "eth-json-rpc-filters": "^2.1.1",
     "eth-json-rpc-infura": "^3.0.0",
-    "eth-json-rpc-middleware": "^2.2.2",
+    "eth-json-rpc-middleware": "^2.3.0",
     "eth-keyring-controller": "^3.1.4",
     "eth-phishing-detect": "^1.1.4",
     "eth-query": "^2.1.2",