Merge branch 'master' into nonce-tracker

5 files changed, 40 insertions, 36 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 395454b41..cb3fcfb83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@
 - No longer validate nonce client-side in retry loop.
 - Fix bug where insufficient balance error was sometimes shown on successful transactions.
 
+## 3.8.5 2017-7-7
+
+- Fix transaction resubmit logic to fail slightly less eagerly.
+
 ## 3.8.4 2017-7-7
 
 - Improve transaction resubmit logic to fail more eagerly when a user would expect it to.
diff --git a/app/manifest.json b/app/manifest.json
index d386e43aa..f3a1ebeff 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "3.8.4",
+  "version": "3.8.5",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index f1f21b29b..c6c3fde1e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -366,7 +366,7 @@ module.exports = class MetamaskController extends EventEmitter {
     function onResponse (err, request, response) {
       if (err) return console.error(err)
       if (response.error) {
-        console.error('Error in RPC response:\n', response.error)
+        console.error('Error in RPC response:\n', response)
       }
       if (request.isMetamaskInternal) return
       log.info(`RPC (${originDomain}):`, request, '->', response)
diff --git a/package.json b/package.json
index 16149f7b7..201713617 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "0.19.1",
-    "web3-provider-engine": "^13.1.1",
+    "web3-provider-engine": "^13.2.8",
     "web3-stream-provider": "^3.0.1",
     "xtend": "^4.0.1"
   },
diff --git a/test/unit/infura-controller-test.js b/test/unit/infura-controller-test.js
index 7a2a114f9..912867764 100644
--- a/test/unit/infura-controller-test.js
+++ b/test/unit/infura-controller-test.js
@@ -1,34 +1,34 @@
 // polyfill fetch
-global.fetch = function () {return Promise.resolve({
-    json: () => { return Promise.resolve({"mainnet": "ok", "ropsten": "degraded", "kovan": "down", "rinkeby": "ok"}) },
-  })
-}
-const assert = require('assert')
-const InfuraController = require('../../app/scripts/controllers/infura')
-
-describe('infura-controller', function () {
-  var infuraController
-
-  beforeEach(function () {
-    infuraController = new InfuraController()
-  })
-
-  describe('network status queries', function () {
-    describe('#checkInfuraNetworkStatus', function () {
-      it('should return an object reflecting the network statuses', function (done) {
-        this.timeout(15000)
-        infuraController.checkInfuraNetworkStatus()
-          .then(() => {
-            const networkStatus = infuraController.store.getState().infuraNetworkStatus
-            assert.equal(Object.keys(networkStatus).length, 4)
-            assert.equal(networkStatus.mainnet, 'ok')
-            assert.equal(networkStatus.ropsten, 'degraded')
-            assert.equal(networkStatus.kovan, 'down')
-          })
-          .then(() => done())
-          .catch(done)
-
-      })
-    })
-  })
-})
+// global.fetch = function () {return Promise.resolve({
+//     json: () => { return Promise.resolve({"mainnet": "ok", "ropsten": "degraded", "kovan": "down", "rinkeby": "ok"}) },
+//   })
+// }
+// const assert = require('assert')
+// const InfuraController = require('../../app/scripts/controllers/infura')
+//
+// describe('infura-controller', function () {
+//   var infuraController
+//
+//   beforeEach(function () {
+//     infuraController = new InfuraController()
+//   })
+//
+//   describe('network status queries', function () {
+//     describe('#checkInfuraNetworkStatus', function () {
+//       it('should return an object reflecting the network statuses', function (done) {
+//         this.timeout(15000)
+//         infuraController.checkInfuraNetworkStatus()
+//           .then(() => {
+//             const networkStatus = infuraController.store.getState().infuraNetworkStatus
+//             assert.equal(Object.keys(networkStatus).length, 4)
+//             assert.equal(networkStatus.mainnet, 'ok')
+//             assert.equal(networkStatus.ropsten, 'degraded')
+//             assert.equal(networkStatus.kovan, 'down')
+//           })
+//           .then(() => done())
+//           .catch(done)
+//
+//       })
+//     })
+//   })
+// })