Merge pull request #3736 from ethereum/develop

Develop into master

.editorconfig

@@ -2,14 +2,6 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.{yml}]
-indent_style = space
 indent_size = 2
 end_of_line = lf
 charset = utf-8

.github/ISSUE_TEMPLATE.md

@@ -1,17 +1,17 @@
-- [ ] I've asked for help in the [Mist Gitter](http://gitter.im/ethereum/mist) before filing this issue.
-
+* [ ] I've asked for help in the [Mist Gitter](http://gitter.im/ethereum/mist) before filing this issue.
 
 <!-- Please fill in these information below: -->
+
 ```
 Version: `0.0.0`
 OS & Version: windows/linux/osx
-Node version: `geth 0.0.0` 
+Node version: `geth 0.0.0`
 Number of blocks synchronized: 0
 ```
 
 <!--
 
-Check the already existing issues to keep duplicates at a minimum.
+Check the already existing issues to keep duplicates to a minimum.
 
 
 You'll find possible solutions for these common issues below on Mist Wiki: https://github.com/ethereum/mist/wiki.
@@ -31,7 +31,7 @@ When creating this issue, if possible add the following to your report:
 - Screenshots
 - Check the console, of Mist (`CTRL/CMD + ALT + i`) and take a screenshot
 - Log files
-  - go to `menu -> accounts -> backup -> application data`
-  - zip and upload `node.log` and all other `node.log.X` files
+  - Go to the menu `Develop -> Show log files`
+  - Zip and upload `all.log` and any other appropriate `category/*.log` files
 
  -->

.github/config.yml

@@ -0,0 +1,6 @@
+maintainers:
+  - evertonfraga
+  - ryanio
+  - marcgarreau
+  - alexvandesande
+  - philipplgh

.github/move.yml

@@ -0,0 +1,17 @@
+# Configuration for move-issues - https://github.com/dessant/move-issues
+
+# Delete the command comment. Ignored when the comment also contains other content
+deleteCommand: true
+
+# Close the source issue after moving
+closeSourceIssue: true
+
+# Lock the source issue after moving
+lockSourceIssue: false
+
+# Set custom aliases for targets
+aliases:
+    wallet: ethereum/meteor-dapp-wallet
+    geth: ethereum/go-ethereum
+    parity: paritytech/parity
+

.github/triage.yml

@@ -0,0 +1,2 @@
+initLabels:
+  - "Status: Triage"

.prettierignore

@@ -0,0 +1,2 @@
+interface/.meteor
+tests/mocha-in-browser/lib

.prettierrc

@@ -0,0 +1 @@
+singleQuote: true

.travis.yml

@@ -1,4 +1,11 @@
 language: node_js
+node_js: '8'
+cache:
+  yarn: true
+  directories:
+    - node_modules
+    - 'interface/.meteor'
+
 sudo: required
 
 branches:
@@ -8,11 +15,9 @@ branches:
 
 matrix:
   include:
-
     # WINDOWS cross-built from linux
     - os: linux
       dist: trusty
-      node_js: 6
       env:
           - GULP_PLATFORM=win
       addons:
@@ -22,18 +27,17 @@ matrix:
             - graphicsmagick
             - xz-utils
             - nsis
+            - g++-multilib
           sources:
             - mono
       before_install:
         - 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
 
-
     # LINUX
     - os: linux
       dist: trusty
-      node_js: 6
       env:
           - GULP_PLATFORM=linux
       addons:
@@ -47,8 +51,7 @@ matrix:
 
     # MAC
     - os: osx
-      osx_image: xcode8  # currently xcode8.1+ doesn't support electron-builder macOS code-signing (https://github.com/electron-userland/electron-builder/issues/820#issuecomment-267777060)
-      node_js: 6
+      osx_image: xcode8.3  # currently xcode8.1+ doesn't support electron-builder macOS code-signing (https://github.com/electron-userland/electron-builder/issues/820#issuecomment-267777060)
       env:
           - GULP_PLATFORM=mac
       before_install:
@@ -59,32 +62,42 @@ matrix:
 
   fast_finish: true
 
-cache:
-  yarn: true
 
 install:
   - echo $PATH
   - PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh
-  - yarn global add gulp-cli meteor-build-client
+  - export PATH=$PATH:`yarn global bin`
+  - yarn global add gulp-cli meteor-build-client [email protected]
   - yarn
 
 script:
   # 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
+
+  # unit test
+  - if [[ $GULP_PLATFORM == "linux" ]]; then yarn test:unit:once; 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
-  # build wallet if on master branch
+
+ # build wallet if on master branch
   - if [[ $TRAVIS_BRANCH == "master" ]]; then travis_wait 60 gulp --wallet --$GULP_PLATFORM; fi
-  # prepare and run integration tests
+
+  # debug purposes - see what builds were successfully created
+  - ls -la ~/build/ethereum/mist/dist_mist/dist
+
+  # prepare integration tests
   - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi
+  # currently, tests should run in linux and mac
   - if [[ $GULP_PLATFORM != "win" ]]; then gulp test; fi
 
 after_success:
   - if [[ $TRAVIS_BRANCH == "master" ]]; then gulp uploadQueue --$GULP_PLATFORM && gulp uploadQueue --wallet --$GULP_PLATFORM; fi
 
+
 notifications:
   webhooks:
     urls:

CODE_OF_CONDUCT.md

@@ -20,28 +20,28 @@ If you see someone who is making an extra effort to ensure our community is welc
 
 The following behaviors are expected and requested of all community members:
 
-*   Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
-*   Exercise consideration and respect in your speech and actions.
-*   Attempt collaboration before conflict.
-*   Refrain from demeaning, discriminatory, or harassing behavior and speech.
-*   Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
-*   Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
+* Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
+* Exercise consideration and respect in your speech and actions.
+* Attempt collaboration before conflict.
+* Refrain from demeaning, discriminatory, or harassing behavior and speech.
+* Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
+* Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
 
 ## 4. Unacceptable Behavior
 
 The following behaviors are considered harassment and are unacceptable within our community:
 
-*   Violence, threats of violence or violent language directed against another person.
-*   Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
-*   Posting or displaying sexually explicit or violent material.
-*   Posting or threatening to post other people’s personally identifying information ("doxing").
-*   Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
-*   Inappropriate photography or recording.
-*   Inappropriate physical contact. You should have someone’s consent before touching them.
-*   Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
-*   Deliberate intimidation, stalking or following (online or in person).
-*   Advocating for, or encouraging, any of the above behavior.
-*   Sustained disruption of community events, including talks and presentations.
+* Violence, threats of violence or violent language directed against another person.
+* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
+* Posting or displaying sexually explicit or violent material.
+* Posting or threatening to post other people’s personally identifying information ("doxing").
+* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
+* Inappropriate photography or recording.
+* Inappropriate physical contact. You should have someone’s consent before touching them.
+* Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
+* Deliberate intimidation, stalking or following (online or in person).
+* Advocating for, or encouraging, any of the above behavior.
+* Sustained disruption of community events, including talks and presentations.
 
 ## 5. Consequences of Unacceptable Behavior
 
@@ -55,16 +55,12 @@ If a community member engages in unacceptable behavior, the community organizers
 
 If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. [email protected].
 
-
-
 Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
 
 ## 7. Addressing Grievances
 
 If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify the Mist team with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
 
-
-
 ## 8. Scope
 
 We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues–online and in-person–as well as in all one-on-one communications pertaining to community business.

CONTRIBUTING.md

@@ -6,21 +6,20 @@
 
 To help improve Mist (_Ethereum Wallet_), please include the following:
 
-- What do you run?  (_Binary version from [releases](https://github.com/ethereum/mist/releases) or a development version from the [commandline](https://github.com/ethereum/mist#run-mist)_)
-- Which version do you use? (_Check the `VERSION` file in the Mist folder_)
-- What OS you're on?
+* What do you run? (_Binary version from [releases](https://github.com/ethereum/mist/releases) or a development version from the [commandline](https://github.com/ethereum/mist#run-mist)_)
+* Which version do you use? (_Check the `VERSION` file in the Mist folder_)
+* What OS you're on?
 
 If applicable:
 
-- Log file (Linux: `~/.config/Mist/*.log`, Windows: `%APPDATA%/Roaming/Mist/*.log`, MacOSX: `~/Library/Application Support/Mist/*.log`)
-- Screenshot (for GUI related issues)
-
+* Log file (Linux: `~/.config/Mist/logs/all.log`, Windows: `%APPDATA%/Roaming/Mist/logs/all.log`, MacOSX: `~/Library/Application Support/Mist/logs/all.log`)
+* Screenshot (for GUI related issues)
 
 ## Pull Requests
 
 If you want to make a PR please make sure you add a understandable description of what it is you're adding/changing/fixing.
 
-For formatting we use 4 *spaces* as indentation.
+For formatting we use 2 _spaces_ as indentation.
 
 If you add any modules or files, please give them a module description and or a class description:
 
@@ -40,4 +39,3 @@ Provides an API for all dapps, which specifically targets features from the Mist
 @constructor
 */
 ```
-