Merge pull request MetaMask#97 from poanetwork/develop

NW Release 4.8.5
DcentWallet · Aug 28, 2018 · dad2004 · dad2004
2 parents 5d51caf + 6317b22
commit dad2004
Show file tree

Hide file tree

Showing 58 changed files with 1,718 additions and 870 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,11 +25,11 @@ workflows:
           requires:
             - prep-deps-npm
             - prep-build
-      - test-e2e-firefox:
-          requires:
-            - prep-deps-npm
-            - prep-deps-firefox
-            - prep-build
+      # - test-e2e-firefox:
+      #     requires:
+      #       - prep-deps-npm
+      #       - prep-deps-firefox
+      #       - prep-build
       - test-unit:
           requires:
             - prep-deps-npm
@@ -56,7 +56,7 @@ workflows:
             - test-lint
             - test-unit
             - test-e2e-chrome
-            - test-e2e-firefox
+#            - test-e2e-firefox
             - test-integration-mascara-chrome
             - test-integration-mascara-firefox
             - test-integration-flat-chrome
@@ -96,7 +96,7 @@ workflows:
 jobs:
   prep-deps-npm:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -111,7 +111,7 @@ jobs:
             - node_modules
   prep-deps-firefox:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -126,7 +126,7 @@ jobs:
 
   prep-build:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -145,7 +145,7 @@ jobs:
 
   prep-docs:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -160,7 +160,7 @@ jobs:
 
   prep-scss:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -179,7 +179,7 @@ jobs:
 
   test-lint:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -190,7 +190,7 @@ jobs:
 
   test-deps:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -201,7 +201,7 @@ jobs:
 
   test-e2e-chrome:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -217,7 +217,7 @@ jobs:
 
   test-e2e-firefox:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -238,7 +238,7 @@ jobs:
 
   test-e2e-beta-chrome:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -254,7 +254,7 @@ jobs:
 
   test-e2e-beta-firefox:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -275,7 +275,7 @@ jobs:
 
   job-screens:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -292,7 +292,7 @@ jobs:
 
   job-publish-prerelease:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -319,7 +319,7 @@ jobs:
 
   job-publish-release:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
      - checkout
      - restore_cache:
@@ -332,7 +332,7 @@ jobs:
 
   job-publish-postrelease:
       docker:
-        - image: circleci/node:8.11.3-browsers
+        - image: circleci/node:8.11.4-browsers
       steps:
         - checkout
         - restore_cache:
@@ -355,7 +355,7 @@ jobs:
 
   test-unit:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -368,7 +368,7 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -392,7 +392,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -411,7 +411,7 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -435,7 +435,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - checkout
       - restore_cache:
@@ -452,7 +452,7 @@ jobs:
 
   all-tests-pass:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.11.4-browsers
     steps:
       - run:
           name: All Tests Passed

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v8.11.3
+v8.11.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 ## Current Master
 
+## 4.8.5 Mon Aug 27 2018
+
+- [#94](https://github.com/poanetwork/metamask-extension/pull/94): (Fix) Force open notification popup
+- [#93](https://github.com/poanetwork/metamask-extension/pull/93): (Fix) Empty pending tx screen after logout/login
+- [#91](https://github.com/poanetwork/metamask-extension/pull/91): (Fix) Confirm tx notification popup: network name
+- [#89](https://github.com/poanetwork/metamask-extension/pull/89), [#95](https://github.com/poanetwork/metamask-extension/pull/95): (Feature) Support of token per network basis
+- [#85](https://github.com/poanetwork/metamask-extension/pull/85): (Upgrade) node, npm packages versions
+- [#84](https://github.com/poanetwork/metamask-extension/pull/84): (Fix) Change green color
+- [#83](https://github.com/poanetwork/metamask-extension/pull/83), [#92](https://github.com/poanetwork/metamask-extension/pull/92): (Feature) Changing of password
+- [#81](https://github.com/poanetwork/metamask-extension/pull/81): (Feature) Deanonymize private network
+- [#80](https://github.com/poanetwork/metamask-extension/pull/80): (Feature) Remove imported account
+- [#78](https://github.com/poanetwork/metamask-extension/pull/78): (Fix) Link to POA explorer for POA networks
+
 ## 4.8.4 Thu Aug 09 2018
 
 - [#70](https://github.com/poanetwork/metamask-extension/pull/70): Change ShapeShift API key

diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE
@@ -1,15 +1,10 @@
-<!--
-
-BEFORE SUBMITTING, please make sure your question hasn't been answered in our support center: https://support.metamask.io
-Common questions such as "Where is my ether?" or "Where did my tokens go?" are answered there.
-
-Bug Reports:
-
-  Briefly describe the issue you've encountered
-  *  Expected Behavior
-  *  Actual Behavior
-  *  Browser Used
-  *  Operating System Used
-
-  Screenshots are very helpful and will expedite your issue being resolved!
--->
+If you are reporting a problem with Nifty Wallet, please include the following information:
+
+### What browser and version did you use?
+*Your answer*
+### What operating system did you use?
+*Your answer*
+### Do you have screenshots showing the problem?
+*Your answer*
+### What is your issue?
+*Your answer*
diff --git a/app/manifest.json b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.8.4",
+  "version": "4.8.5",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",

diff --git a/app/scripts/background.js b/app/scripts/background.js
@@ -434,7 +434,13 @@ function setupController (initState, initLangCode) {
 function triggerUi () {
   extension.tabs.query({ active: true }, tabs => {
     const currentlyActiveMetamaskTab = Boolean(tabs.find(tab => openMetamaskTabsIDs[tab.id]))
-    if (!popupIsOpen && !currentlyActiveMetamaskTab && !notificationIsOpen) {
+    /**
+     * https://github.com/poanetwork/metamask-extension/issues/19
+     * !notificationIsOpen was removed from the check, because notification can be opened, but it can be behind the DApp
+     * for some reasons. For example, if notification popup was opened, but user moved focus to DApp.
+     * New transaction, in this case, will not appear in front of DApp.
+     */
+    if (!popupIsOpen && !currentlyActiveMetamaskTab) {
       notificationManager.showPopup()
     }
   })

diff --git a/app/scripts/controllers/detect-tokens.js b/app/scripts/controllers/detect-tokens.js
@@ -50,7 +50,7 @@ class DetectTokensController {
     ethContract.balanceOf(this.selectedAddress, (error, result) => {
       if (!error) {
         if (!result.isZero()) {
-          this._preferences.addToken(contractAddress, contracts[contractAddress].symbol, contracts[contractAddress].decimals)
+          this._preferences.addToken(contractAddress, contracts[contractAddress].symbol, contracts[contractAddress].decimals, this.network)
         }
       } else {
         warn(`MetaMask - DetectTokensController balance fetch failed for ${contractAddress}.`, error)

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
@@ -217,13 +217,13 @@ class PreferencesController {
    * @returns {Promise<array>} Promises the new array of AddedToken objects.
    *
    */
-  async addToken (rawAddress, symbol, decimals) {
+  async addToken (rawAddress, symbol, decimals, network) {
     const address = normalizeAddress(rawAddress)
-    const newEntry = { address, symbol, decimals }
+    const newEntry = { address, symbol, decimals, network }
 
     const tokens = this.store.getState().tokens
     const previousEntry = tokens.find((token, index) => {
-      return token.address === address
+      return (token.address === address && parseInt(token.network) === parseInt(network))
     })
     const previousIndex = tokens.indexOf(previousEntry)
 

diff --git a/app/scripts/lib/notification-manager.js b/app/scripts/lib/notification-manager.js
@@ -26,7 +26,10 @@ class NotificationManager {
         // bring focus to existing chrome popup
         extension.windows.update(popup.id, { focused: true })
       } else {
-        const cb = (currentPopup) => { this._popupId = currentPopup.id }
+        const cb = (currentPopup) => {
+          this._popupId = currentPopup.id
+          extension.windows.update(currentPopup.id, { focused: true })
+        }
         // create new notification popup
         const creation = extension.windows.create({
           url: 'notification.html',

diff --git a/app/scripts/lib/seed-phrase-verifier.js b/app/scripts/lib/seed-phrase-verifier.js
@@ -1,4 +1,4 @@
-const KeyringController = require('eth-keyring-controller')
+const KeyringController = require('eth-keychain-controller')
 const log = require('loglevel')
 
 const seedPhraseVerifier = {

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -19,7 +19,7 @@ const createOriginMiddleware = require('./lib/createOriginMiddleware')
 const createLoggerMiddleware = require('./lib/createLoggerMiddleware')
 const createProviderMiddleware = require('./lib/createProviderMiddleware')
 const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
-const KeyringController = require('eth-keyring-controller')
+const KeyringController = require('eth-keychain-controller')
 const NetworkController = require('./controllers/network')
 const PreferencesController = require('./controllers/preferences')
 const CurrencyController = require('./controllers/currency')
@@ -370,6 +370,7 @@ module.exports = class MetamaskController extends EventEmitter {
       verifySeedPhrase: nodeify(this.verifySeedPhrase, this),
       clearSeedWordCache: this.clearSeedWordCache.bind(this),
       resetAccount: nodeify(this.resetAccount, this),
+      changePassword: nodeify(this.changePassword, this),
       removeAccount: nodeify(this.removeAccount, this),
       importAccountWithStrategy: nodeify(this.importAccountWithStrategy, this),
 
@@ -770,6 +771,10 @@ module.exports = class MetamaskController extends EventEmitter {
     return selectedAddress
   }
 
+  async changePassword (oldPassword, newPassword) {
+    await this.keyringController.changePassword(oldPassword, newPassword)
+  }
+
   /**
    * Removes an account from state / storage.
    *

diff --git a/app/scripts/migrations/_multi-keyring.js b/app/scripts/migrations/_multi-keyring.js
@@ -10,7 +10,7 @@ which we dont have access to at the time of this writing.
 const ObservableStore = require('obs-store')
 const ConfigManager = require('../../app/scripts/lib/config-manager')
 const IdentityStoreMigrator = require('../../app/scripts/lib/idStore-migrator')
-const KeyringController = require('eth-keyring-controller')
+const KeyringController = require('eth-keychain-controller')
 
 const password = 'obviously not correct'