From de967d2dfd2119d2468263ecb9646fd0a92df195 Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 7 Jul 2017 20:05:03 -0700 Subject: 3.8.5 --- CHANGELOG.md | 4 ++++ app/manifest.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 696d68345..2c61c31b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Current Master +## 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", -- cgit From 6587f6eabda08629b7fce431820f92ab275bbf75 Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 11 Jul 2017 12:43:15 -0700 Subject: deps - bump prov-eng for retry on gateway timeout --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 27fe7a84a..47f5db15d 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,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.0", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, -- cgit From 9f46984fee8f4fa8268ac9bd70081c58708ac8ea Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 11 Jul 2017 14:17:47 -0700 Subject: metamask - on rpc err show whole error body --- app/scripts/metamask-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 73093dfad..0e7ccbd66 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -367,7 +367,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) -- cgit From 0cc60fda8f14174b978e49a9b1e97e0accbce31d Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 11 Jul 2017 14:18:09 -0700 Subject: deps - bump prov-eng for fetch retry --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 47f5db15d..fb278b398 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "0.19.1", - "web3-provider-engine": "^13.2.0", + "web3-provider-engine": "^13.2.7", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, -- cgit From 23d44e53996c04fb0e6fb2e1c2ca90728397aa0c Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 11 Jul 2017 15:30:36 -0700 Subject: tests - disable infura test --- test/unit/infura-controller-test.js | 66 ++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 33 deletions(-) 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) +// +// }) +// }) +// }) +// }) -- cgit From 1448090ec76a5ab9274b27e4c71aef9970ca0214 Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 11 Jul 2017 15:33:12 -0700 Subject: deps - bump prov-eng --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fb278b398..10b175975 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "0.19.1", - "web3-provider-engine": "^13.2.7", + "web3-provider-engine": "^13.2.8", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, -- cgit