Merge pull request #7098 from MetaMask/Version-v7.1.1

Version v7.1.1
MetaMask · Sep 3, 2019 · ab59eaf · ab59eaf
2 parents 3f1229c + d2799f4
commit ab59eaf
Show file tree

Hide file tree

Showing 19 changed files with 292 additions and 450 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Current Develop Branch
 
+## 7.1.1 Tue Aug 27 2019
+- [#7059](https://github.com/MetaMask/metamask-extension/pull/7059): Remove blockscale, replace with ethgasstation
+- [#7037](https://github.com/MetaMask/metamask-extension/pull/7037): Remove Babel 6 from internal dependencies
+- [#7093](https://github.com/MetaMask/metamask-extension/pull/7093): Allow dismissing privacy mode notification from popup
+
 ## 7.1.0 Fri Aug 16 2019
 - [#7035](https://github.com/MetaMask/metamask-extension/pull/7035): Filter non-ERC-20 assets during mobile sync (#7035)
 - [#7021](https://github.com/MetaMask/metamask-extension/pull/7021): Using translated string for end of flow messaging (#7021)

diff --git a/app/manifest.json b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",

diff --git a/app/scripts/background.js b/app/scripts/background.js
@@ -133,7 +133,6 @@ setupMetamaskMeshMetrics()
  * @property {number} unapprovedTypedMsgCount - The number of messages in unapprovedTypedMsgs.
  * @property {string[]} keyringTypes - An array of unique keyring identifying strings, representing available strategies for creating accounts.
  * @property {Keyring[]} keyrings - An array of keyring descriptions, summarizing the accounts that are available for use, and what keyrings they belong to.
- * @property {Object} computedBalances - Maps accounts to their balances, accounting for balance changes from pending transactions.
  * @property {string} currentAccountTab - A view identifying string for displaying the current displayed view, allows user to have a preferred tab in the old UI (between tokens and history).
  * @property {string} selectedAddress - A lower case hex string of the currently selected address.
  * @property {string} currentCurrency - A string identifying the user's preferred display currency, for use in showing conversion rates.

diff --git a/app/scripts/controllers/computed-balances.js b/app/scripts/controllers/computed-balances.js
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -35,7 +35,6 @@ const MessageManager = require('./lib/message-manager')
 const PersonalMessageManager = require('./lib/personal-message-manager')
 const TypedMessageManager = require('./lib/typed-message-manager')
 const TransactionController = require('./controllers/transactions')
-const BalancesController = require('./controllers/computed-balances')
 const TokenRatesController = require('./controllers/token-rates')
 const DetectTokensController = require('./controllers/detect-tokens')
 const ProviderApprovalController = require('./controllers/provider-approval')
@@ -235,17 +234,9 @@ module.exports = class MetamaskController extends EventEmitter {
       }
     })
 
-    // computed balances (accounting for pending transactions)
-    this.balancesController = new BalancesController({
-      accountTracker: this.accountTracker,
-      txController: this.txController,
-      blockTracker: this.blockTracker,
-    })
     this.networkController.on('networkDidChange', () => {
-      this.balancesController.updateAllBalances()
       this.setCurrentCurrency(this.currencyRateController.state.currentCurrency, function () {})
     })
-    this.balancesController.updateAllBalances()
 
     this.shapeshiftController = new ShapeShiftController(undefined, initState.ShapeShiftController)
 
@@ -288,7 +279,6 @@ module.exports = class MetamaskController extends EventEmitter {
       NetworkController: this.networkController.store,
       AccountTracker: this.accountTracker.store,
       TxController: this.txController.memStore,
-      BalancesController: this.balancesController.store,
       CachedBalancesController: this.cachedBalancesController.store,
       TokenRatesController: this.tokenRatesController.store,
       MessageManager: this.messageManager.memStore,
@@ -724,7 +714,6 @@ module.exports = class MetamaskController extends EventEmitter {
     }
 
     await this.preferencesController.syncAddresses(accounts)
-    await this.balancesController.updateAllBalances()
     await this.txController.pendingTxTracker.updatePendingTxs()
     return this.keyringController.fullUpdate()
   }

diff --git a/development/states/first-time.json b/development/states/first-time.json
@@ -4,7 +4,6 @@
     "isUnlocked": false,
     "rpcTarget": "https://rawtestrpc.metamask.io/",
     "identities": {},
-    "computedBalances": {},
     "frequentRpcList": [],
     "unapprovedTxs": {},
     "featureFlags": {"betaUI": false},
@@ -60,7 +59,6 @@
     }
   },
   "identities": {},
-  "computedBalances": {},
   "confirmTransaction": {
     "txData": {},
     "tokenData": {},

diff --git a/development/states/navigate-txs.json b/development/states/navigate-txs.json
@@ -170,7 +170,6 @@
     },
     "currentBlockGasLimit": "0x731e25",
     "selectedAddressTxList": [],
-    "computedBalances": {},
     "unapprovedMsgs": {},
     "unapprovedMsgCount": 0,
     "unapprovedPersonalMsgs": {},

diff --git a/development/states/pending-tx.json b/development/states/pending-tx.json
@@ -687,7 +687,6 @@
         ]
       }
     ],
-    "computedBalances": {},
     "currentAccountTab": "history",
     "tokens": [
       {

diff --git a/package.json b/package.json
@@ -34,6 +34,8 @@
     "sentry:publish": "node ./development/sentry-publish.js",
     "lint": "eslint . --ext js,json",
     "lint:fix": "eslint . --ext js,json --fix",
+    "lint:changed": "{ git ls-files --others --exclude-standard ; git diff-index --name-only --diff-filter=d HEAD ; } | grep --regexp='[.]js$' --regexp='[.]json$' | tr '\\n' '\\0' | xargs -0 eslint",
+    "lint:changed:fix": "{ git ls-files --others --exclude-standard ; git diff-index --name-only --diff-filter=d HEAD ; } | grep --regexp='[.]js$' --regexp='[.]json$' | tr '\\n' '\\0' | xargs -0 eslint --fix",
     "mozilla-lint": "addons-linter dist/firefox",
     "watch": "cross-env METAMASK_ENV=test mocha --watch --require test/setup.js --reporter min --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\"",
     "devtools:react": "react-devtools",
@@ -75,18 +77,18 @@
     "detectrtc": "^1.3.6",
     "dnode": "^1.2.2",
     "end-of-stream": "^1.1.0",
-    "eth-block-tracker": "^4.1.0",
+    "eth-block-tracker": "^4.4.2",
     "eth-contract-metadata": "^1.9.2",
     "eth-ens-namehash": "^2.0.8",
-    "eth-json-rpc-filters": "^3.0.4",
-    "eth-json-rpc-infura": "^3.2.0",
-    "eth-keyring-controller": "^4.0.1",
+    "eth-json-rpc-filters": "^4.1.0",
+    "eth-json-rpc-infura": "^4.0.1",
+    "eth-keyring-controller": "^5.0.1",
     "eth-ledger-bridge-keyring": "^0.2.0",
     "eth-method-registry": "^1.2.0",
     "eth-phishing-detect": "^1.1.4",
     "eth-query": "^2.1.2",
     "eth-sig-util": "^2.3.0",
-    "eth-token-tracker": "^1.1.5",
+    "eth-token-tracker": "^1.1.10",
     "eth-trezor-keyring": "^0.4.0",
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-tx": "1.3.7",
@@ -101,24 +103,24 @@
     "extensionizer": "^1.0.1",
     "fast-json-patch": "^2.0.4",
     "fuse.js": "^3.2.0",
-    "gaba": "^1.5.0",
+    "gaba": "^1.6.0",
     "human-standard-token-abi": "^2.0.0",
     "jazzicon": "^1.2.0",
-    "json-rpc-engine": "^4.0.0",
+    "json-rpc-engine": "^5.1.3",
     "json-rpc-middleware-stream": "^2.1.1",
     "jsonschema": "^1.2.4",
     "lodash.debounce": "^4.0.8",
     "lodash.shuffle": "^4.2.0",
     "loglevel": "^1.4.1",
     "luxon": "^1.8.2",
-    "metamask-inpage-provider": "^2.0.1",
+    "metamask-inpage-provider": "^2.0.3",
     "metamask-logo": "^2.1.4",
     "mkdirp": "^0.5.1",
     "multihashes": "^0.4.12",
     "nonce-tracker": "^1.0.0",
     "number-to-bn": "^1.7.0",
     "obj-multiplex": "^1.0.0",
-    "obs-store": "^3.0.2",
+    "obs-store": "^4.0.3",
     "percentile": "^1.2.0",
     "pify": "^3.0.0",
     "polyfill-crypto.getrandomvalues": "^1.0.0",
@@ -161,7 +163,7 @@
     "textarea-caret": "^3.0.1",
     "valid-url": "^1.0.9",
     "web3": "^0.20.7",
-    "web3-stream-provider": "^3.0.1",
+    "web3-stream-provider": "^4.0.0",
     "webrtc-adapter": "^6.3.0",
     "xtend": "^4.0.1"
   },
@@ -199,7 +201,7 @@
     "eslint-plugin-json": "^1.2.0",
     "eslint-plugin-mocha": "^5.0.0",
     "eslint-plugin-react": "^7.4.0",
-    "eth-json-rpc-middleware": "^4.1.3",
+    "eth-json-rpc-middleware": "^4.1.6",
     "fetch-mock": "^6.5.2",
     "file-loader": "^1.1.11",
     "fs-extra": "^6.0.1",

diff --git a/test/data/2-state.json b/test/data/2-state.json
@@ -14,7 +14,6 @@
   "currentBlockGasLimit": "",
   "unapprovedTxs": {},
   "selectedAddressTxList": [],
-  "computedBalances": {},
   "unapprovedMsgs": {},
   "unapprovedMsgCount": 0,
   "unapprovedPersonalMsgs": {},

diff --git a/ui/app/ducks/gas/gas-duck.test.js b/ui/app/ducks/gas/gas-duck.test.js
@@ -321,10 +321,10 @@ describe('Gas Duck', () => {
       assert.deepEqual(
         global.fetch.getCall(0).args,
         [
-          'https://dev.blockscale.net/api/gasexpress.json',
+          'https://ethgasstation.info/json/ethgasAPI.json',
           {
             'headers': {},
-            'referrer': 'https://dev.blockscale.net/api/',
+            'referrer': 'http://ethgasstation.info/json/',
             'referrerPolicy': 'no-referrer-when-downgrade',
             'body': null,
             'method': 'GET',
@@ -341,12 +341,12 @@ describe('Gas Duck', () => {
         [{
           type: SET_BASIC_GAS_ESTIMATE_DATA,
           value: {
-            average: 20,
+            average: 2,
             blockTime: 'mockBlock_time',
             blockNum: 'mockBlockNum',
-            fast: 30,
-            fastest: 40,
-            safeLow: 10,
+            fast: 3,
+            fastest: 4,
+            safeLow: 1,
           },
         }]
       )
@@ -420,10 +420,10 @@ describe('Gas Duck', () => {
       assert.deepEqual(
         global.fetch.getCall(0).args,
         [
-          'https://dev.blockscale.net/api/gasexpress.json',
+          'https://ethgasstation.info/json/ethgasAPI.json',
           {
             'headers': {},
-            'referrer': 'https://dev.blockscale.net/api/',
+            'referrer': 'http://ethgasstation.info/json/',
             'referrerPolicy': 'no-referrer-when-downgrade',
             'body': null,
             'method': 'GET',
@@ -440,12 +440,12 @@ describe('Gas Duck', () => {
         [{
           type: SET_BASIC_GAS_ESTIMATE_DATA,
           value: {
-            average: 20,
+            average: 2,
             blockTime: 'mockBlock_time',
             blockNum: 'mockBlockNum',
-            fast: 30,
-            fastest: 40,
-            safeLow: 10,
+            fast: 3,
+            fastest: 4,
+            safeLow: 1,
           },
         }]
       )
-Original file line number
+Diff line change
@@ Expand Up / @@ -687,7 +687,6 @@ @@
             ]
           }
         ],
-        "computedBalances": {},
         "currentAccountTab": "history",
         "tokens": [
           {
@@ Expand Down @@