0.8.10 into master

.codeclimate.yml

@@ -20,5 +20,4 @@ ratings:  ## enables GPA rating
    - "**.js"
 
 exclude_paths:
-- "interface/client/lib/signatures.js"
 - "tests/"

.eslintignore

@@ -0,0 +1,2 @@
+node_modules
+interface/client/lib/signatures.js

.eslintrc.yml

@@ -19,15 +19,19 @@ rules:
   arrow-body-style: off
   prefer-arrow-callback: off
   no-underscore-dangle: off
+  object-curly-spacing: off
+  func-names: off
+  global-require: off
+  class-methods-use-this: off
   comma-dangle:
     - error
     - only-multiline  ## no comma after last item if one line, though allow comma if multiline
   import/no-extraneous-dependencies:  ## checks if required modules are missing in packages.json
     - error
     - devDependencies:  ## declares files, whose imports belong to devDependencies
-      - "**/scripts/build-dist.js"
       - "**/tests/_base.js"
       - "**/*.test.js"
+      - "**/gulpTasks/*.js"
 
 globals:  # don't warn about missing declarations
   i18n: true

.travis.yml

@@ -28,8 +28,6 @@ matrix:
         - sudo dpkg --add-architecture i386 && sudo add-apt-repository ppa:ubuntu-wine/ppa -y
         - sudo apt-get update -q
         - sudo apt-get install --no-install-recommends -y mono-devel ca-certificates-mono wine1.8
-      after_script:
-        - makensis -V2 scripts/windows-installer.nsi
 
 
     # LINUX
@@ -71,14 +69,14 @@ install:
 
 script:
   - if [[ $TRAVIS_BRANCH != "master" ]]; then unset CSC_LINK CSC_KEY_PASSWORD; fi  # disable macOS code-signing (production certificate) on develop branch
-  - travis_wait 60 gulp mist --platform $GULP_PLATFORM
-  - if [[ $TRAVIS_BRANCH == "master" ]]; then travis_wait 60 gulp wallet --platform $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
-  - if [[ $GULP_PLATFORM != "win" ]]; then gulp test-mist; fi
+  - 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
+  - if [[ $GULP_PLATFORM != "win" ]]; then gulp test; fi
 
 after_success:
-  - gulp mist-checksums --platform $GULP_PLATFORM
-  - if [[ $TRAVIS_BRANCH == "master" ]]; then gulp wallet-checksums --platform $GULP_PLATFORM; fi
+  - if [[ $TRAVIS_BRANCH == "master" ]]; then gulp uploadQueue --$GULP_PLATFORM; fi
 
 notifications:
   webhooks:

README.md

@@ -30,43 +30,35 @@ Once a Mist version is released the Meteor frontend part is bundled using `meteo
 
 ### Dependencies
 
-Requirements:
+To run mist in development you need:
 
-* Electron v1.3.13
-* Node v6.0 or above
-* [Yarn package manager](https://yarnpkg.com/)
+- [Node.js](https://nodejs.org) `v6.x` (use the prefered installation method for your OS)
+- [Meteor](https://www.meteor.com/install) javascript app framework
+- [Yarn](https://yarnpkg.com/) package manager
+- [Electron](http://electron.atom.io/) `v1.3.13` cross platform desktop app framework
+- [Gulp](http://gulpjs.com/) build and automation system
 
-To run mist in development you need [Node.js NPM](https://nodejs.org) and [Meteor](https://www.meteor.com/install) and electron installed:
+Install the later ones via:
 
     $ curl https://install.meteor.com/ | sh
-    $ npm install -g electron@1.3.13
-    $ npm install -g gulp
+    $ curl -o- -L https://yarnpkg.com/install.sh | bash
+    $ yarn global add electron@1.3.13
+    $ yarn global add gulp
 
-And some further tools to help with downloading and unzipping client nodes:
+### Initialisation
 
-_Linux:_
-
-    $ apt-get install unzip
-
-
-### Installation
-
-Now you're ready to install Mist:
+Now you're ready to initialise Mist for development:
 
     $ git clone https://github.com/ethereum/mist.git
     $ cd mist
-    $ git submodule update --init
     $ yarn
 
 To update Mist in the future, run:
 
     $ cd mist
-    $ git pull && git submodule update
+    $ git pull
     $ yarn
 
-#### Options
-It may be preferable to only download platform-specific nodes by passing the `--platform` flag, please refer to the [options section](#platform).
-
 ### Run Mist
 
 For development we start the interface with a Meteor server for autoreload etc.
@@ -144,60 +136,61 @@ $ electron . --rpc ~/Library/Ethereum/geth.ipc --node-networkid 1234  --node-dat
 _NOTE: since `ipcpath` is also a Mist option you do not need to also include a
 `--node-ipcpath` option._
 
-You can also run `geth` separately yourself with the same options prior to start
-Mist normally.
+You can also launch `geth` separately with the same options prior starting
+Mist.
 
 
 ### Deployment
 
+Our build system relies on [gulp](http://gulpjs.com/) and [electron-builder](https://github.com/electron-userland/electron-builder/).
 
-To create a binaries you need to install [`electron-builder` dependencies](https://github.com/electron-userland/electron-builder/wiki/Multi-Platform-Build#macos):
+#### Dependencies
+
+[meteor-build-client](https://github.com/frozeman/meteor-build-client) bundles the [meteor](https://www.meteor.com/)-based interface. Install it via:
 
-    // tools for the windows binaries
-    $ brew install wine --without-x11 mono makensis
-    // tools for the Linux binaries
-    $ brew install gnu-tar libicns graphicsmagick xz
-    // general dependencies
     $ npm install -g meteor-build-client
 
-To generate the binaries simply run:
+Furthermore cross-platform builds require additional [`electron-builder` dependencies](https://github.com/electron-userland/electron-builder/wiki/Multi-Platform-Build#linux). On macOS those are:
 
-    $ cd mist
-    $ gulp
+    // windows deps
+    $ brew install wine --without-x11 mono makensis
+
+    // linux deps
+    $ brew install gnu-tar libicns graphicsmagick xz
 
-    // Or to generate the wallet (using the https://github.com/ethereum/meteor-dapp-wallet -> master)
-    $ gulp wallet
+#### Generate packages
 
-This will generate the binaries inside the `dist_mist/release` or `dist_wallet/release` folder.
+To generate the binaries for Mist run:
 
-#### Options
+    $ gulp
 
-##### platform
+To generate the Ethereum Wallet (this will pack the one Ðapp from https://github.com/ethereum/meteor-dapp-wallet):
 
-Additional you can only build the windows, linux, mac or all binary by using the `platform` option:
+    $ gulp --wallet
 
-    $ gulp update-nodes --platform mac
+The generated binaries will be under `dist_mist/release` or `dist_wallet/release`.
 
-    // And
-    $ gulp mist --platform mac
 
-    // Or
-    $ gulp mist --platform mac,win
+#### Options
 
+##### platform
 
-Options are:
+To build binaries for specific platforms (default: all available) use the following flags:
 
-- `mac` (Mac OSX)
-- `win` (Windows)
-- `linux` (Linux)
-- `all` (default)
+    // on mac
+    $ gulp --win --linux --mac
 
+    // on linux
+    $ gulp --win --linux
+
+    // on win
+    $ gulp --win
 
 ##### walletSource
 
-With the `walletSource` you can specify the branch to use, default ist `master`:
+With the `walletSource` you can specify the Wallet branch to use, default is `master`:
 
-    $ gulp mist --walletSource develop
+    $ gulp --wallet --walletSource develop
 
 
 Options are:
@@ -206,28 +199,25 @@ Options are:
 - `develop`
 - `local` Will try to build the wallet from [mist/]../meteor-dapp-wallet/app
 
-##### mist-checksums | wallet-checksums
+*Note: applicable only when combined with `--wallet`*
+
+#### Checksums
 
-Spits out the SHA256 checksums of distributables.
+Spits out the MD5 checksums of distributables.
 
 It expects installer/zip files to be in the generated folders e.g. `dist_mist/release`
 
-    $ gulp mist-checksums
+    $ gulp checksums [--wallet]
 
-    3f726fff186b85c600ea2459413d0bf5ada2dbc98877764efbefa545f96eb975  ./dist_mist/release/Mist-0.8.1-ia32.exe
-    ab4d26d5ebc66e9aba0fa610071266bacbb83faacbb7ed0dd2acb24386190bdb  ./dist_mist/release/Mist-0.8.1.exe
-    909b0fb4c7b09b731b2a442c457747e04ffdd9c03b6edc06079ae05a46200d13  ./dist_mist/release/Mist-0.8.1-ia32.deb
-    e114d6188963dfdae0489abf4e8923da58b39ff9cdbaad26e803af27c7ce55d1  ./dist_mist/release/Mist-0.8.1.deb
-    930787dd2f5ed6931068bff9244bccc01f397f552c48ded0f08e515e276dd080  ./dist_mist/release/Mist-0.8.1.dmg
 
-### Code signing for production
+## Testing
 
-**As of [#972](https://github.com/ethereum/mist/pull/972) we've updated the build process and thus need to redo code-signing.**
+First make sure to build Mist with:
 
+    $ gulp [--wallet]
 
-## Testing
+Then run the tests:
 
-First make sure to build Mist with:
-`gulp mist --platform [mac,linux]` or `gulp wallet --platform [mac,linux]`.
+    $ gulp test [--wallet]
 
-Then run `gulp test-mist` or `gulp test-wallet`, accordingly.
+*Note: Integration tests are not yet supported on Windows.*

clientBinaries.json

@@ -2,85 +2,85 @@
 {
     "clients": {
         "Geth": {
-            "version": "1.5.9",
+            "version": "1.6.0",
             "platforms": {
                 "linux": {
                     "x64": {
                         "download": {
-                            "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.5.9-a07539fb.tar.gz",
+                            "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.6.0-facc47cb.tar.gz",
                             "type": "tar",
-                            "md5": "a0b0dda353a655a65c6d3d809ee852fd",
-                            "bin": "geth-linux-amd64-1.5.9-a07539fb/geth"
+                            "md5": "048b0618696b040f6d3ff18ee2e5763a",
+                            "bin": "geth-linux-amd64-1.6.0-facc47cb/geth"
                         },
                         "bin": "geth",
                         "commands": {
                             "sanity": {
                                 "args": ["version"],
-                                "output": [ "Geth", "1.5.9" ]
+                                "output": [ "Geth", "1.6.0" ]
                             }
                         }
                     },
                     "ia32": {
                         "download": {
-                            "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.5.9-a07539fb.tar.gz",
+                            "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.6.0-facc47cb.tar.gz",
                             "type": "tar",
-                            "md5": "3198330842cbfc6baa7e7b2624f8f6bd",
-                            "bin": "geth-linux-386-1.5.9-a07539fb/geth"
+                            "md5": "44215076b4d50e079878bcabeaae2117",
+                            "bin": "geth-linux-386-1.6.0-facc47cb/geth"
                         },
                         "bin": "geth",
                         "commands": {
                             "sanity": {
                                 "args": ["version"],
-                                "output": [ "Geth", "1.5.9" ]
+                                "output": [ "Geth", "1.6.0" ]
                             }
                         }
                     }
                 },
                 "mac": {
                     "x64": {
                         "download": {
-                            "url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.5.9-a07539fb.tar.gz",
+                            "url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.6.0-facc47cb.tar.gz",
                             "type": "tar",
-                            "md5": "6a797a930a0930ec88b810e6b2d204eb",
-                            "bin": "geth-darwin-amd64-1.5.9-a07539fb/geth"
+                            "md5": "446308f1d702bf5d30892bda43c25d23",
+                            "bin": "geth-darwin-amd64-1.6.0-facc47cb/geth"
                         },
                         "bin": "geth",
                         "commands": {
                             "sanity": {
                                 "args": ["version"],
-                                "output": [ "Geth", "1.5.9" ]
+                                "output": [ "Geth", "1.6.0" ]
                             }
                         }
                     }
                 },
                 "win": {
                     "x64": {
                         "download": {
-                            "url": "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-1.5.9-a07539fb.zip",
+                            "url": "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-1.6.0-facc47cb.zip",
                             "type": "zip",
-                            "md5": "057cdfdf4347ec9d5c0bf0b964f1b97b",
-                            "bin": "geth-windows-amd64-1.5.9-a07539fb\\geth.exe"
+                            "md5": "e4bb82c4d7078269a932cb7d46c5acb4",
+                            "bin": "geth-windows-amd64-1.6.0-facc47cb\\geth.exe"
                         },
                         "bin": "geth.exe",
                         "commands": {
                             "sanity": {
                                 "args": ["version"],
-                                "output": [ "Geth", "1.5.9" ]
+                                "output": [ "Geth", "1.6.0" ]
                             }
                         }
                     },
                     "ia32": {
                         "download": {
-                            "url": "https://gethstore.blob.core.windows.net/builds/geth-windows-386-1.5.9-a07539fb.zip",
+                            "url": "https://gethstore.blob.core.windows.net/builds/geth-windows-386-1.6.0-facc47cb.zip",
                             "type": "zip",
-                            "md5": "fa3511985215e151bafdc080e9b1fef6",
-                            "bin": "geth-windows-386-1.5.9-a07539fb\\geth.exe"
+                            "md5": "0935e22c5626c73b9f0b556b3323c71a",
+                            "bin": "geth-windows-386-1.6.0-facc47cb\\geth.exe"
                         },
                         "bin": "geth.exe",
                         "commands": {
                             "sanity": {
                                 "args": ["version"],
-                                "output": [ "Geth", "1.5.9" ]
+                                "output": [ "Geth", "1.6.0" ]
                             }
                         }
                     }