From e7f291f11f36d7a797a739c0345e17c343d27190 Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Thu, 4 May 2017 00:21:22 +0200 Subject: [PATCH 01/10] [electron-builder] fix 'node_modules' copy (#2196) copying errored due to symlinks in unnecessary 'electron' devDep package --- gulpTasks/building.js | 4 +++- gulpfile.js | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gulpTasks/building.js b/gulpTasks/building.js index 3f0fb5665..bcdbc0ffb 100644 --- a/gulpTasks/building.js +++ b/gulpTasks/building.js @@ -25,7 +25,9 @@ gulp.task('clean-dist', (cb) => { gulp.task('copy-app-source-files', () => { return gulp.src([ - 'node_modules/**', + 'node_modules/**/*', + '!node_modules/electron/', + '!node_modules/electron/**/*', './main.js', './clientBinaries.json', './modules/**', diff --git a/gulpfile.js b/gulpfile.js index 519e429b5..ccef18459 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -11,9 +11,18 @@ const gulp = require('gulp'); const minimist = require('minimist'); const runSeq = require('run-sequence'); +// available crossplatform builds +let platforms; +if (process.platform === 'darwin') { + platforms = ['mac', 'linux', 'win']; +} else if (process.platform === 'win32') { + platforms = ['win']; +} else { + platforms = ['linux', 'win']; +} + // parse commandline arguments const args = process.argv.slice(2); -const platforms = (process.platform === 'darwin') ? ['mac', 'linux', 'win'] : ['linux', 'win']; const options = minimist(args, { string: ['walletSource', 'test'], boolean: _.flatten(['wallet', platforms]), From 11919d5cd61ec0dc3822ab1aea418fa4a80aa6ac Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Thu, 4 May 2017 10:14:35 +0200 Subject: [PATCH 02/10] add windows code-signing (#2194) --- .travis.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f17d06128..31a1a32a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,11 +68,17 @@ install: - yarn script: - - if [[ $TRAVIS_BRANCH != "master" ]]; then unset CSC_LINK CSC_KEY_PASSWORD; fi # disable macOS code-signing (production certificate) on develop branch + # disable macOS code-signing (production certificate) on develop branch + - if [[ $TRAVIS_BRANCH != "master" ]]; then unset CSC_LINK CSC_KEY_PASSWORD; fi + # windows code-signing on master branch + - if [[ $GULP_PLATFORM == "win" && $TRAVIS_BRANCH == "master" ]]; then export CSC_LINK=$CSC_WIN_LINK && CSC_KEY_PASSWORD=$CSC_WIN_KEY_PASSWORD; fi + # build mist - if [[ $GULP_PLATFORM == "mac" ]]; then travis_wait 60 gulp --$GULP_PLATFORM; fi # increase timeout for slower mac builds - if [[ $GULP_PLATFORM != "mac" ]]; then gulp --$GULP_PLATFORM; fi - - if [[ $TRAVIS_BRANCH == "master" ]]; then travis_wait 60 gulp --wallet --$GULP_PLATFORM; fi # also build wallet if on master branch - - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi # prepare for integration testing + # build wallet if on master branch + - if [[ $TRAVIS_BRANCH == "master" ]]; then travis_wait 60 gulp --wallet --$GULP_PLATFORM; fi + # prepare and run integration tests + - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi - if [[ $GULP_PLATFORM != "win" ]]; then gulp test; fi after_success: From bebfe6d8b6d84753c425507bfb086a48161d5d8d Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Thu, 4 May 2017 16:00:03 +0200 Subject: [PATCH 03/10] [yarn] update solc 0.4.11 (#2203) --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index d27c2df8d..444541fa7 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "oboe": "^2.1.3", "os-timesync": "^1.0.7", "semver": "^5.1.0", - "solc": "^0.4.10", + "solc": "^0.4.11", "typescript": "^2.2.2", "underscore": "^1.8.3", "underscore-deep-extend": "^1.1.5", diff --git a/yarn.lock b/yarn.lock index af4f78cfc..1a4367c3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3805,9 +3805,9 @@ sntp@1.x.x: dependencies: hoek "2.x.x" -solc@^0.4.10: - version "0.4.10" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.10.tgz#92094789d33bae4be94b4977b1d1bfa432271cd2" +solc@^0.4.11: + version "0.4.11" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.11.tgz#2522eb43e7c0419bac2060b96e20a2593bfb5e8b" dependencies: fs-extra "^0.30.0" memorystream "^0.3.1" From 36fbc4a5a560b3e5bf40fd74ed8c2eae2179ef3c Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Fri, 5 May 2017 22:10:53 +0200 Subject: [PATCH 04/10] [travis] also upload wallet on release build (#2208) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 31a1a32a8..21c352654 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,7 +82,7 @@ script: - if [[ $GULP_PLATFORM != "win" ]]; then gulp test; fi after_success: - - if [[ $TRAVIS_BRANCH == "master" ]]; then gulp uploadQueue --$GULP_PLATFORM; fi + - if [[ $TRAVIS_BRANCH == "master" ]]; then gulp uploadQueue --$GULP_PLATFORM && gulp uploadQueue --wallet --$GULP_PLATFORM; fi notifications: webhooks: From fd219a5276af6e66cd305c318b9e9cb899102a3b Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Mon, 8 May 2017 15:29:13 +0200 Subject: [PATCH 05/10] [travis] update github publish (#2218) * [travis] update github publish * fix indent --- gulpTasks/building.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/gulpTasks/building.js b/gulpTasks/building.js index bcdbc0ffb..eed87b855 100644 --- a/gulpTasks/building.js +++ b/gulpTasks/building.js @@ -133,17 +133,18 @@ gulp.task('build-dist', (cb) => { dmg: { background: '../build/dmg-background.jpg', iconSize: 128, - contents: [{ - x: 441, - y: 448, - type: 'link', - path: '/Applications' - }, - { - x: 441, - y: 142, - type: 'file' - } + contents: [ + { + x: 441, + y: 448, + type: 'link', + path: '/Applications' + }, + { + x: 441, + y: 142, + type: 'file' + } ] } } @@ -162,6 +163,7 @@ gulp.task('build-dist', (cb) => { builder.build({ targets: builder.createTargets(targets, null, 'all'), projectDir: path.join(__dirname, `../dist_${type}`, 'app'), + publish: 'never', config: { afterPack(params) { return Q.try(() => { From 1af03cee298c935a2061e02077987f4656292382 Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Tue, 9 May 2017 09:15:09 +0200 Subject: [PATCH 06/10] numeral.js: console.warn instead of console.error (#2154) --- interface/client/appStart.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/client/appStart.js b/interface/client/appStart.js index ad9bfbffd..2995350ef 100644 --- a/interface/client/appStart.js +++ b/interface/client/appStart.js @@ -91,7 +91,7 @@ Meteor.startup(function () { try { numeral.language(lang); } catch (err) { - console.error(`numeral.js couldn't set number formating: ${err.message}`); + console.warn(`numeral.js couldn't set number formating: ${err.message}`); } EthTools.setLocale(lang); } From c401c7c6ffcc0c3ed0451a2fdf6cb5c6cce830b6 Mon Sep 17 00:00:00 2001 From: Everton Fraga Date: Tue, 9 May 2017 12:10:16 -0300 Subject: [PATCH 07/10] Fixing backup typo --- interface/i18n/mist.en.i18n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/i18n/mist.en.i18n.json b/interface/i18n/mist.en.i18n.json index 00f55f4b7..bccc23875 100644 --- a/interface/i18n/mist.en.i18n.json +++ b/interface/i18n/mist.en.i18n.json @@ -187,7 +187,7 @@ "enterPassword": "Enter password", "repeatPassword": "Repeat password", "creating": "Generating account...", - "backupHint": "Make sure you backup your keyfiles AND password!\n\nYou can find your keyfiles folder using the main menu -> Accounts -> Backup -> Accounts. Keep a copy of the \"keystore\" folder where you can't loose it!", + "backupHint": "Make sure you backup your keyfiles AND password!\n\nYou can find your keyfiles folder using the main menu -> Accounts -> Backup -> Accounts. Keep a copy of the \"keystore\" folder where you can't lose it!", "errors": { "passwordMismatch": "Your passwords don't match.", "passwordTooShort": "Make a longer password" From 808a2cd30146f88fb2996859eb45770fd9bcbdee Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Thu, 11 May 2017 13:44:13 +0200 Subject: [PATCH 08/10] [travis] fix github uploader (github API behaviour changed) (#2240) --- gulpTasks/publishing.js | 1 + 1 file changed, 1 insertion(+) diff --git a/gulpTasks/publishing.js b/gulpTasks/publishing.js index 005e51fbf..9fccbb98b 100644 --- a/gulpTasks/publishing.js +++ b/gulpTasks/publishing.js @@ -91,6 +91,7 @@ gulp.task('upload-binaries', (cb) => { if (draft.body && checksums) { got.patch(`https://api.github.com/repos/ethereum/mist/releases/${draft.id}?access_token=${GITHUB_TOKEN}`, { body: JSON.stringify({ + tag_name: `v${version}`, body: `${draft.body}\n\n## Checksums\n\`\`\`\n${checksums.join('')}\`\`\`` }) }); From d27a578473c495ce4ec760dcb1903a4e656dd849 Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Thu, 18 May 2017 15:09:19 +0200 Subject: [PATCH 09/10] update geth 1.6.1 (#2277) --- clientBinaries.json | 80 +++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 28 deletions(-) diff --git a/clientBinaries.json b/clientBinaries.json index e26ab1890..764e45599 100644 --- a/clientBinaries.json +++ b/clientBinaries.json @@ -1,37 +1,46 @@ - { "clients": { "Geth": { - "version": "1.6.0", + "version": "1.6.1", "platforms": { "linux": { "x64": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.6.0-facc47cb.tar.gz", + "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.6.1-021c3c28.tar.gz", "type": "tar", - "md5": "048b0618696b040f6d3ff18ee2e5763a", - "bin": "geth-linux-amd64-1.6.0-facc47cb/geth" + "md5": "fdb7810fc6da33f4fb55bc4277751003", + "bin": "geth-linux-amd64-1.6.1-021c3c28/geth" }, "bin": "geth", "commands": { "sanity": { - "args": ["version"], - "output": [ "Geth", "1.6.0" ] + "args": [ + "version" + ], + "output": [ + "Geth", + "1.6.1" + ] } } }, "ia32": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.6.0-facc47cb.tar.gz", + "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.6.1-021c3c28.tar.gz", "type": "tar", - "md5": "44215076b4d50e079878bcabeaae2117", - "bin": "geth-linux-386-1.6.0-facc47cb/geth" + "md5": "651c2ced8ed2817c83b537b3ae323711", + "bin": "geth-linux-386-1.6.1-021c3c28/geth" }, "bin": "geth", "commands": { "sanity": { - "args": ["version"], - "output": [ "Geth", "1.6.0" ] + "args": [ + "version" + ], + "output": [ + "Geth", + "1.6.1" + ] } } } @@ -39,16 +48,21 @@ "mac": { "x64": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.6.0-facc47cb.tar.gz", + "url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.6.1-021c3c28.tar.gz", "type": "tar", - "md5": "446308f1d702bf5d30892bda43c25d23", - "bin": "geth-darwin-amd64-1.6.0-facc47cb/geth" + "md5": "84d48160bf53c0d959486ac7c5b1542e", + "bin": "geth-darwin-amd64-1.6.1-021c3c28/geth" }, "bin": "geth", "commands": { "sanity": { - "args": ["version"], - "output": [ "Geth", "1.6.0" ] + "args": [ + "version" + ], + "output": [ + "Geth", + "1.6.1" + ] } } } @@ -56,31 +70,41 @@ "win": { "x64": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-1.6.0-facc47cb.zip", + "url": "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-1.6.1-021c3c28.zip", "type": "zip", - "md5": "e4bb82c4d7078269a932cb7d46c5acb4", - "bin": "geth-windows-amd64-1.6.0-facc47cb\\geth.exe" + "md5": "005b4040060d597026f3054462c4e2af", + "bin": "geth-windows-amd64-1.6.1-021c3c28\\geth.exe" }, "bin": "geth.exe", "commands": { "sanity": { - "args": ["version"], - "output": [ "Geth", "1.6.0" ] + "args": [ + "version" + ], + "output": [ + "Geth", + "1.6.1" + ] } } }, "ia32": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-windows-386-1.6.0-facc47cb.zip", + "url": "https://gethstore.blob.core.windows.net/builds/geth-windows-386-1.6.1-021c3c28.zip", "type": "zip", - "md5": "0935e22c5626c73b9f0b556b3323c71a", - "bin": "geth-windows-386-1.6.0-facc47cb\\geth.exe" + "md5": "baf642bfb0c8f309e9e579bbb8fcf420", + "bin": "geth-windows-386-1.6.1-021c3c28\\geth.exe" }, "bin": "geth.exe", "commands": { "sanity": { - "args": ["version"], - "output": [ "Geth", "1.6.0" ] + "args": [ + "version" + ], + "output": [ + "Geth", + "1.6.1" + ] } } } @@ -88,4 +112,4 @@ } } } -} +} \ No newline at end of file From 2e362c920da7576ff1ee7daf73b4d403a5f6fa5b Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Mon, 22 May 2017 09:33:57 +0200 Subject: [PATCH 10/10] [spectron] increase some timeouts for travis (#2282) --- tests/mist/basic.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/mist/basic.test.js b/tests/mist/basic.test.js index 187083036..cb3edcc89 100644 --- a/tests/mist/basic.test.js +++ b/tests/mist/basic.test.js @@ -32,7 +32,7 @@ test['Browser bar should not render script tags on breadcrumb view'] = function* return client.getText('.url-breadcrumb').then((e) => { return /404\.html$/.test(e); }); - }, 5000, 'expected breadcrumb to render as HTML encoded'); + }, 8000, 'expected breadcrumb to render as HTML encoded'); should.exist(yield this.getUiElement('form.url')); should.not.exist(yield this.getUiElement('form.url script')); @@ -128,7 +128,7 @@ test['"javascript" protocol should be disallowed on browser bar'] = function* () })).value; isProtocolBlocked.should.be.true; - yield Q.delay(500); + yield Q.delay(800); const browserBarText = yield this.getBrowserBarText(); browserBarText.should.eql('http://localhost:8080'); // checks that hasn't changed displayed URL };