merge changes

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["es2016-node5"]
+}

.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
@@ -38,3 +42,6 @@ globals:  # don't warn about missing declarations
   Tabs: true
   Tracker: true
   _: true
+  window: true
+  location: true
+  document: true

.github/ISSUE_TEMPLATE.md

@@ -1,19 +1,37 @@
-#### System information
-``````
+- [ ] I've asked for help in the [Mist Gitter](http://gitter.im/expanse-org/mist) before filing this issue.
+
+
+<!-- Please fill in these information below: -->
+```
 Version: `0.0.0`
 OS & Version: windows/linux/osx
-Node type: `exp/gexp(default)`
-``````
+Node version: `geth 0.0.0` 
+Number of blocks synchronized: 0
+```
 
-#### Please check the **already existing** issues to keep duplicates at a minimum.
-Furthermore several **work-arounds** have been collected in the [Mist-Troubleshooting-Guide](https://github.com/ethereum/wiki/wiki/Mist-Troubleshooting-Guide).
+<!--
 
-If possible add the following to your report:
+Check the already existing issues to keep duplicates at a minimum.
 
-- Screenshots
 
-- Check the console, of Mist (`CTRL/CMD + ALT + i`) and take a screenshot
+You'll find possible solutions for these common issues below on Mist Wiki: https://github.com/expanse-org/mist/wiki.
+
+- Ether is not shown in the wallet
+- I send ether to the wallet contract but it doesn't show up
+- Mist is synchronized but is stuck during the last part
+- "Your computers time is out of sync!" error
+- Unable to find peers
+- My transaction is not confirmed
+- Account can't be unlocked
+- Unable to import pre-sale wallet
+- Bind address already in use
 
+
+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
+
+ -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+#### What does it do?
+
+#### Any helpful background information?
+
+#### Which code should the reviewer start with?
+
+#### New dependencies? What are they used for?
+
+#### Relevant screenshots?

.gitignore

@@ -11,4 +11,4 @@ nodes/gexp/
 config.json
 mist.log
 npm-debug.log
-yarn.lock
+/yarn.lock

.nvmrc

@@ -0,0 +1 @@
+7.4

.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
@@ -65,17 +63,32 @@ cache:
   yarn: true
 
 install:
-  - PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/master/configure.sh | /bin/sh
+  - 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
   - yarn
 
 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
+  # 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
+  # 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-mist; fi
+  - 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 && gulp uploadQueue --wallet --$GULP_PLATFORM; fi
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/33972d9e627a142c57a6
+    on_success: change
+    on_failure: always
+    on_start: never

AUTHORS

@@ -2,7 +2,4 @@ The Mist Authors
 
 Alexander Van de Sande <alex.vandesande@ethdev.com>
 Bas van Kervel <bas@ethdev.com>
-Fabian Vogelsteller <fabian.vogelsteller@gmail.com>
-
-Expanse Version
-Daniel Conway <dan@expanse.tech>
+Fabian Vogelsteller <fabian.vogelsteller@gmail.com>

CODE_OF_CONDUCT.md

@@ -0,0 +1,84 @@
+# Code of Conduct
+
+## 1. Purpose
+
+A primary goal of Mist project is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
+
+This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
+
+We invite all those who participate in Mist project to help us create safe and positive experiences for everyone.
+
+## 2. Open Source Citizenship
+
+A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
+
+Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
+
+If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
+
+## 3. Expected Behavior
+
+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.
+
+## 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.
+
+## 5. Consequences of Unacceptable Behavior
+
+Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
+
+Anyone asked to stop unacceptable behavior is expected to comply immediately.
+
+If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
+
+## 6. Reporting Guidelines
+
+If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. ev@ethereum.org.
+
+
+
+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.
+
+This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
+
+## 9. Contact info
+
+ev@ethereum.org
+
+## 10. License and attribution
+
+This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
+
+Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
+
+Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)

CONTRIBUTING.md

@@ -2,15 +2,18 @@
 
 ## Issues / Bug reports
 
-**Read the existing issues first, and also search in the closed issues. You may find yours already.**
+**Prior to submitting, please search -and read- _both_ open and closed issues -as _it_ may already exist.**
 
-To help make Mist-Expanse (Expanse Wallet) better please file issue with the following basic descriptions:
+To help improve Mist (_Ethereum Wallet_), please include the following:
 
-- What do you run? binary from [releases](https://github.com/expanse-org/mist/releases) or the development version from the [commandline](https://github.com/expanse-org/mist#run-mist)
-- Which version do you used? You can find that in the `VERSION` file in the Mist folder
+- What do you run?  (_Binary version from [releases](https://github.com/expanse-org/mist/releases) or a development version from the [commandline](https://github.com/expanse-org/mist#run-mist)_)
+- Which version do you use? (_Check the `VERSION` file in the Mist folder_)
 - What OS you're on?
-- Provide a log file if necessary, you can find that in the Mist data folder (Linux: `~/.config/Mist/*.log`, Windows: `%APPDATA%/Roaming/Mist/*.log`, MacOSX: `~/Library/Application Support/Mist/*.log`)
-- Ideally also a screenshot, if its an interface issue
+
+If applicable:
+
+- Log file (Linux: `~/.config/Mist/*.log`, Windows: `%APPDATA%/Roaming/Mist/*.log`, MacOSX: `~/Library/Application Support/Mist/*.log`)
+- Screenshot (for GUI related issues)
 
 
 ## Pull Requests
@@ -23,7 +26,7 @@ If you add any modules or files, please give them a module description and or a
 
 ```
 /**
-The IPC provider backend filter and tunnel all incoming request to the IPC gexp bridge.
+The IPC provider backend filter and tunnel all incoming request to the IPC geth bridge.
 
 @module ipcProviderBackend
 */

MISTAPI.md

@@ -20,13 +20,13 @@ web3
 
 // 2. optionally use web3 from Mist or load if outside of Mist
 if(typeof web3 === 'undefined')
-  web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:8545"));
+  web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:9656"));
 
 // 3. always use web3 provided by the dapp ("Web3" won't be supplied by Mist), but the provider from Mist
 if(typeof web3 !== 'undefined')
   web3 = new Web3(web3.currentProvider);
 else
-  web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:8545"));
+  web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:9656"));
 ```
 
 ## API
@@ -64,7 +64,7 @@ Asks the user to provide, or create a new account.
 
 #### Parameters
 
-1. `Function` The callback to be called with the new address as the second param
+1. `Function` The callback to be called with the new address as the second parameter.
 
 #### Example
 
@@ -78,7 +78,7 @@ mist.requestAccount(function(e, address){
 
 ### mist.menu
 
-Provides functionality to control the sub menu of your dapp, when its add to the sidebar.
+Provides functionality to control the sub menu of your dapp, when its added to the sidebar.
 
 ***
 
@@ -91,10 +91,10 @@ Adds/Updates a sub menu entry, which is placed below you dapp button in the side
 1. `String` **optional** and id string to identify your sub menu entry when updating.
 2. `Object` The menu options:
     - `name` (`String`): The name of the sub menu button.
-    - `badge` (`String|null`) **optional**: The badge text for the sub menu button, e.g. `50`
+    - `badge` (`String|null`) **optional**: The badge text for the sub menu button, e.g. `50`.
     - `position` (`Number`) **optional**: The position of the submenu button, `1` is on the top.
-    - `selected` (`Boolean`) **optional**: whether or not this sub menu entry is currently selected.
-3. `Function` **optional**: The callback to be called when the sub menu entry is clicked
+    - `selected` (`Boolean`) **optional**: Whether or not this sub menu entry is currently selected.
+3. `Function` **optional**: The callback to be called when the sub menu entry is clicked.
 
 #### Minimal example
 
@@ -125,7 +125,7 @@ mist.menu.add('tkrzU', {
 ### mist.menu.clear()
 
 Removes all sub menu entries. You can use this when you reload your app,
-to clear up wrong menu entries, which might got lost since the last session.
+to clear up incorrect menu entries, which might have been lost since the last session.
 
 #### Parameters
 
@@ -145,11 +145,11 @@ Removes a sub menu entry.
 
 ### mist.menu.select(id)
 
-Selects the according sub menu entry.
+Selects the respective sub menu entry.
 
 #### Parameters
 
-1. `String` the sub menu entry identifier
+1. `String` the sub menu entry identifier.
 
 ***
 
@@ -159,23 +159,23 @@ Sets the main badge of your dapp, right below your dapps menu button.
 
 #### Parameters
 
-1. `String` the string used as the badge text
+1. `String` the string used as the badge text.
 
 ***
 
 ### mist.menu.update(id, [, options] [, callback])
 
-Works like `mist.menu.add()`, but all but the `id` parameters are optional.
+Works like `mist.menu.add()`, but only the `id` parameter is required.
 
 #### Parameters
 
 1. `String` and id string to identify your sub menu entry.
 2. `Object` The menu options:
     - `name` (`String`): (optional) The name of the sub menu button.
-    - `badge` (`String|null`): (optional) The badge text for the sub menu button, e.g. `50`
+    - `badge` (`String|null`): (optional) The badge text for the sub menu button, e.g. `50`.
     - `position` (`Number`): (optional) The position of the submenu button, `1` is on the top.
-    - `selected` (`Boolean`): (optional) whether or not this sub menu entry is currently selected.
-3. `Function` (optional) The callback to be called when the sub menu entry is clicked
+    - `selected` (`Boolean`): (optional) Whether or not this sub menu entry is currently selected.
+3. `Function` (optional) The callback to be called when the sub menu entry is clicked.
 
 #### Example