From cc23158bfee2b723e8e80e0d25cbca2c2c6406a3 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 18 Oct 2016 13:51:50 -0700 Subject: [PATCH 1/5] Wait for first metamask data to establish ping-pong stream. Prevents infinite reload loops when dapps take too long to load. Fixes #746. --- CHANGELOG.md | 2 ++ app/scripts/inpage.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f6e82e94..eac50a0b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,13 @@ ## Current Master - Increase default max gas to `100000` over the RPC's `estimateGas` response. +- Fix bug where slow-loading dapps would sometimes trigger infinite reload loops. ## 2.13.4 2016-10-17 - Add custom transaction fee field to send form. - Fix bug where web3 was being injected into XML files. +- Fix bug where changing network would not reload current Dapps. ## 2.13.3 2016-10-4 diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index ef199946c..85dd70b4d 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -43,7 +43,7 @@ reloadStream.once('data', triggerReload) var pingChannel = inpageProvider.multiStream.createStream('pingpong') var pingStream = new PingStream({ objectMode: true }) // wait for first successful reponse -metamaskStream.once('data', function(){ +metamaskStream.once('_data', function(){ pingStream.pipe(pingChannel).pipe(pingStream) }) endOfStream(pingStream, triggerReload) From 60097d8fbaf10281e1f3ff3189e7e732d491f8bf Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 18 Oct 2016 14:00:20 -0700 Subject: [PATCH 2/5] Remove livereload from prod builds --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea67eee75..57387f953 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "start": "gulp dev", "lint": "gulp lint", "dev": "gulp dev", - "dist": "gulp dist", + "dist": "gulp dist --disablelivereload", "test": "npm run fastTest && npm run ci && npm run lint", "fastTest": "mocha --require test/helper.js --compilers js:babel-register --recursive \"test/unit/**/*.js\"", "watch": "mocha watch --compilers js:babel-register --recursive \"test/unit/**/*.js\"", From 70f3d24e905dd913dc49d399b5ba4baaafb12b8a Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 18 Oct 2016 14:00:33 -0700 Subject: [PATCH 3/5] Version 2.13.5 --- CHANGELOG.md | 2 ++ app/manifest.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eac50a0b1..3718438c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +## 2.13.5 2016-10-17 + - Increase default max gas to `100000` over the RPC's `estimateGas` response. - Fix bug where slow-loading dapps would sometimes trigger infinite reload loops. diff --git a/app/manifest.json b/app/manifest.json index cbce01468..8f5a34ea6 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "2.13.4", + "version": "2.13.5", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", From 182fd30db568201bde89469a77932b782aac84d6 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 18 Oct 2016 14:02:06 -0700 Subject: [PATCH 4/5] Fix cli flag capitalization --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 57387f953..2af0aebfc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "start": "gulp dev", "lint": "gulp lint", "dev": "gulp dev", - "dist": "gulp dist --disablelivereload", + "dist": "gulp dist --disableLiveReload", "test": "npm run fastTest && npm run ci && npm run lint", "fastTest": "mocha --require test/helper.js --compilers js:babel-register --recursive \"test/unit/**/*.js\"", "watch": "mocha watch --compilers js:babel-register --recursive \"test/unit/**/*.js\"", From f31fef034fb92420ec6cab3156566b7751333b9c Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 18 Oct 2016 14:07:47 -0700 Subject: [PATCH 5/5] Fix changelog date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3718438c2..d6d400b66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Current Master -## 2.13.5 2016-10-17 +## 2.13.5 2016-10-18 - Increase default max gas to `100000` over the RPC's `estimateGas` response. - Fix bug where slow-loading dapps would sometimes trigger infinite reload loops.