ethereum · alexvandesande · Jun 15, 2016 · May 11, 2016 · May 11, 2016 · May 14, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,9 @@
+.DS_Store
 node_modules/
 packages/
 interface_build/
+interface/public/i18n/
 dist_wallet/
-dist_mist/
+dist_mist/
+config.json
+nodes/geth/
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,27 @@
+sudo: required
+dist: trusty
+
+language: node_js
+
+branches:
+  only:
+    - develop
+
+node_js:
+  - "4"
+
+before_script:
+  - "npm install"
+  - "npm install -g electron-prebuilt@1.0.1"
+  - "npm install -g meteor-build-client"
+  - "gulp update-nodes"
+
+script:
+  - "npm test"
+
+notifications:
+  email:
+    - mist@ethereum.org
+
+
+
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ you can simply run the executeable after download.
 For updating simply download the new version and copy it over the old one (keep a backup of the old one if you want to be sure).
 The data folder for Mist is stored in other places:
 
-- Windows `%APPDATA%\Roaming\Mist`
+- Windows `%APPDATA%\Mist`
 - MacOSX `~/Library/Application Support/Mist`
 - Linux `~/.config/Mist`
 
@@ -32,12 +32,16 @@ Once a Mist version is released the Meteor frontend part is bundled using `meteo
 
 ### Dependencies
 
-Requires electron version 0.37.2 and Node.js version 4.3.0 or above.
+Requirements: 
+
+* Electron v1.2.2
+* Node v4.3.0 or above
 
 To run mist in development you need [Node.js NPM](https://nodejs.org) and [Meteor](https://www.meteor.com/install) and electron installed:
 
     $ curl https://install.meteor.com/ | sh
-    $ npm install -g electron-prebuilt@0.37.2
+    $ npm install -g electron-prebuilt@1.2.2
+    $ npm install -g gulp
 
 ### Installation
 
@@ -47,11 +51,13 @@ Now you're ready to install Mist:
     $ cd mist
     $ git submodule update --init
     $ npm install
+    $ gulp update-nodes
 
 To update Mist in the future, run:
 
     $ cd mist
     $ git pull && git submodule update
+    $ gulp update-nodes
 
 
 ### Run Mist
@@ -83,11 +89,27 @@ In the original window you can then start Mist using wallet mode:
     $ electron . --mode wallet
 
 
+### Passing options to Geth
+
+You can pass command-line options directly to Geth by placing them after `--` in 
+the command-line invocation:
+
+```bash
+$ electron . --mode mist -- --rpcport 19343 --networkid 2 
+```
+
+
 ### Using Mist with a privatenet
 
-To run a privatenet you need to have `geth` installed separately and run it with the `ipcpath` flag:
+To run a private network you will need to set the `networkdid`, `ipcpath` and 
+`datadir` flags:
 
-    $ geth --networkid 1234 --ipcpath /Users/you/Library/Ethereum/geth.ipc --datadir ...
+```bash
+$ electron . -- --networkid 1234 --ipcpath ~/Library/Ethereum/geth.ipc --datadir ~/Library/Ethereum/privatenet
+```
+
+You can also run `geth` separately yourself with the same options prior to start 
+Mist normally.
 
 
 ### Deployment
@@ -108,6 +130,9 @@ To create a binaries you need to install the following tools:
 To generate the binaries simply run:
 
     $ cd mist
+    $ gulp update-nodes
+
+    // to generate mist
     $ gulp mist
 
     // Or to generate the wallet (using the https://github.com/ethereum/meteor-dapp-wallet -> master)

diff --git a/config.js b/config.js
diff --git a/customProtocols.js b/customProtocols.js
@@ -1,4 +1,5 @@
-const protocol = require('protocol');
+const electron = require('electron');
+const protocol = electron.protocol;
 const path = require('path');
 
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -7,10 +7,13 @@ var packager = require('electron-packager');
 var spawn = require('child_process').spawn;
 var merge = require('merge-stream');
 var rename = require("gulp-rename");
+var download = require('gulp-download');
+var decompress = require('gulp-decompress');
+var tap = require("gulp-tap");
 // const zip = require('gulp-zip');
 // var zip = require('gulp-zip');
 // var zip = require('gulp-jszip');
-var EasyZip = require('easy-zip').EasyZip;
+// var EasyZip = require('easy-zip').EasyZip;
 var minimist = require('minimist');
 var fs = require('fs');
 var rcedit = require('rcedit');
@@ -35,8 +38,16 @@ var type = 'mist';
 var filenameLowercase = 'mist';
 var filenameUppercase = 'Mist';
 var applicationName = 'Mist'; 
+var electronVersion = '1.2.2';
+var gethVersion = '1.4.7';
+var nodeUrls = {
+    'darwin-x64': 'https://github.com/ethereum/go-ethereum/releases/download/v1.4.7/geth-OSX-2016061509421-1.4.7-667a386.zip',
+    'linux-x64': 'https://github.com/ethereum/go-ethereum/releases/download/v1.4.7/geth-Linux64-20160615125500-1.4.7-667a386.tar.bz2',
+    'win32-x64': 'https://github.com/ethereum/go-ethereum/releases/download/v1.4.7/Geth-Win64-20160615094032-1.4.7-667a386.zip',
+    'linux-ia32': 'https://bintray.com/karalabe/ethereum/download_file?file_path=geth-1.4.7-stable-667a386-linux-386.tar.bz2',
+    'win32-ia32': 'https://bintray.com/karalabe/ethereum/download_file?file_path=geth-1.4.7-stable-667a386-windows-4.0-386.exe.zip'
+};
 
-var electronVersion = '0.37.2';
 var osVersions = [];
 var packJson = require('./package.json');
 var version = packJson.version;
@@ -114,7 +125,108 @@ gulp.task('clean:dist', function (cb) {
   ], cb);
 });
 
-gulp.task('copy-files', ['clean:dist'], function() {
+// DOWNLOAD NODES
+
+gulp.task('clean:nodes', function (cb) {
+  return del([
+    './nodes/geth/',
+  ], cb);
+});
+
+gulp.task('downloadNodes', ['clean:nodes'], function(done) {
+    var streams = [];
+
+    _.each(nodeUrls, function(nodeUrl, os){
+
+        //var destPath = (os === 'darwin-x64')
+          //  ? path +'/'+ filenameUppercase +'.app/Contents/Frameworks/node'
+            //: path +'/resources/node';
+
+
+        // donwload nodes
+        streams.push(download(nodeUrl)
+            .pipe(gulp.dest('./nodes/geth/')));
+
+    });
+
+    return merge.apply(null, streams);
+});
+
+gulp.task('unzipNodes', ['downloadNodes'], function(done) {
+    var streams = [];
+
+    _.each(nodeUrls, function(nodeUrl, os){
+
+        var fileName = nodeUrl.substr(nodeUrl.lastIndexOf('/'));
+
+        // unzip nodes
+        streams.push(gulp.src('./nodes/geth'+ fileName)
+            .pipe(decompress({strip: 1}))
+            .pipe(gulp.dest('./nodes/geth/'+ os)));
+
+    });
+
+    return merge.apply(null, streams);
+});
+
+gulp.task('renameNodes', ['unzipNodes'], function(done) {
+    var streams = [];
+
    _.each(nodeUrls, function(nodeUrl, os){
+
+        var fileName = nodeUrl.substr(nodeUrl.lastIndexOf('/')).replace('download_file?file_path=','').replace('.tar.bz2','').replace('.zip','');
+
+        // unzip nodes
+        if(os === 'linux-ia32' || os === 'win32-ia32') {
+            console.log(fileName);
+            var task = gulp.src('./nodes/geth/'+ os + fileName);
+
+            if(os === 'linux-ia32')
+                task.pipe(rename('geth/'+ os + '/geth'));
+            if(os === 'win32-ia32')
+                task.pipe(rename('geth/'+ os + '/geth.exe'));
+
+            task.pipe(gulp.dest('./nodes/'));
+
+            streams.push(task);
+        }
+
+    });
+
+    return merge.apply(null, streams);
+});
+
+gulp.task('renameNodesDeleteOld', ['renameNodes'], function (cb) {
+  return del([
+    './nodes/geth/linux-ia32/'+ nodeUrls['linux-ia32'].substr(nodeUrls['linux-ia32'].lastIndexOf('/')).replace('download_file?file_path=','').replace('.tar.bz2','').replace('.zip',''),
+    './nodes/geth/win32-ia32/'+ nodeUrls['win32-ia32'].substr(nodeUrls['linux-ia32'].lastIndexOf('/')).replace('download_file?file_path=','').replace('.tar.bz2','').replace('.zip',''),
+  ], cb);
+});
+
+// CHECK FOR NODES
+
+var updatedNeeded = true;
+gulp.task('checkNodes', function() {
+    return gulp.src('./nodes/geth/*.{zip,tar.bz2}')
+    .pipe(tap(function(file, t) {
+        if(!!~file.path.indexOf('-'+ gethVersion +'-')) {
+            updatedNeeded = false;
+        }
+    }))
+    .pipe(gulp.dest('./nodes/geth/'));
+});
+
+
+// BUNLDE PROCESS
+
+gulp.task('copy-files', ['checkNodes', 'clean:dist'], function() {
+
+    // check if nodes are there
+    if(updatedNeeded){
+        console.error('YOUR NODES NEED TO BE UPDATED run $ gulp update-nodes');
+        throw new Error('YOUR NODES NEED TO BE UPDATED run $ gulp update-nodes');
+    }
+
     return gulp.src([
         './tests/**/*.*',
         './modules/**/*.*',
@@ -125,17 +237,18 @@ gulp.task('copy-files', ['clean:dist'], function() {
         '!./interface/**/*.*',
         '!./geth',
         '!./geth.exe',
-        '!./main.js',
         '!./Wallet-README.txt'
         ], { base: './' })
         .pipe(gulp.dest('./dist_'+ type +'/app'));
 });
 
-gulp.task('switch-production', ['clean:dist'], function() {
-    return gulp.src(['./main.js'])
-        .pipe(replace('global.production = false;', 'global.production = true;'))
-        .pipe(replace('global.mode = (argv.mode ? argv.mode : \'mist\');', 'global.mode = (argv.mode ? argv.mode : \''+ type +'\');'))
-        .pipe(gulp.dest('./dist_'+ type +'/app'));
+gulp.task('switch-production', ['clean:dist', 'copy-files'], function(cb) {
+    fs.writeFileSync(__dirname+'/dist_'+ type +'/app/config.json', JSON.stringify({
+        production: true,
+        mode: type,
+    }));
+
+    cb();
 });
 
 
@@ -222,13 +335,13 @@ gulp.task('create-binaries', ['copy-i18n'], function(cb) {
     });
 });
 
+// FILE RENAMING
 
 gulp.task('change-files', ['create-binaries'], function() {
     var streams = [];
 
     osVersions.map(function(os){
-        var stream,
-            path = './dist_'+ type +'/'+ filenameUppercase +'-'+ os;
+        var path = './dist_'+ type +'/'+ filenameUppercase +'-'+ os;
 
         // change version file
         streams.push(gulp.src([
@@ -364,11 +477,7 @@ gulp.task('getChecksums', [], function(done) {
         var fileName = path.replace('./dist_'+ type +'/', '');
         var sha = spawn('shasum', [path]);
         sha.stdout.on('data', function(data){
-            console.log('SHASUM '+ fileName +': '+ data.toString().replace(path, ''));
-        });
-        var md5 = spawn('md5', [path]);
-        md5.stdout.on('data', function(data){
-            console.log('MD5 '+ fileName +': '+ data.toString().replace('MD5 ('+ path +') = ', ''));
+            console.log('SHASUM -a 256'+ fileName +': '+ data.toString().replace(path, ''));
         });
 
 
@@ -394,6 +503,11 @@ gulp.task('taskQueue', [
     // 'zip'
 ]);
 
+// DOWNLOAD nodes
+gulp.task('update-nodes', [
+    'renameNodesDeleteOld'
+]);
+gulp.task('download-nodes', ['update-nodes']);
 
 // MIST task
 gulp.task('mist', [
@@ -417,4 +531,6 @@ gulp.task('wallet-checksums', [
     'getChecksums'
 ]);
 
-gulp.task('default', ['mist']);
+gulp.task('default', ['mist']);
+
+
diff --git a/icons/mist/icon.icns b/icons/mist/icon.icns
diff --git a/icons/mist/icon.ico b/icons/mist/icon.ico
diff --git a/icons/mist/icon.png b/icons/mist/icon.png
diff --git a/icons/mist/icon2x.png b/icons/mist/icon2x.png