Merge branch 'master' into NewUI

6 files changed, 17 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07f55bf2b..e7934dc77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Current Master
 
+- Re-enable default token list.
+- Add origin header to dapp-bound requests to allow providers to throttle sites.
+
+## 3.8.2 2017-7-3
+
 - No longer show network loading indication on config screen, to allow selecting custom RPCs.
 - Visually indicate that network spinner is a menu.
 - Indicate what network is being searched for when disconnected.
diff --git a/app/manifest.json b/app/manifest.json
index c0d9af8a0..12ff6c2ea 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 782641b3f..73093dfad 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -184,7 +184,9 @@ module.exports = class MetamaskController extends EventEmitter {
         eth_syncing: false,
         web3_clientVersion: `MetaMask/v${version}`,
       },
+      // rpc data source
       rpcUrl: this.networkController.getCurrentRpcAddress(),
+      originHttpHeaderKey: 'X-Metamask-Origin',
       // account mgmt
       getAccounts: (cb) => {
         const isUnlocked = this.keyringController.memStore.getState().isUnlocked
@@ -356,8 +358,13 @@ module.exports = class MetamaskController extends EventEmitter {
   }
 
   setupProviderConnection (outStream, originDomain) {
-    streamIntoProvider(outStream, this.provider, logger)
-    function logger (err, request, response) {
+    streamIntoProvider(outStream, this.provider, onRequest, onResponse)
+    // append dapp origin domain to request
+    function onRequest (request) {
+      request.origin = originDomain
+    }
+    // log rpc activity
+    function onResponse (err, request, response) {
       if (err) return console.error(err)
       if (response.error) {
         console.error('Error in RPC response:\n', response.error)
diff --git a/package.json b/package.json
index 3b608af0e..27fe7a84a 100644
--- a/package.json
+++ b/package.json
@@ -124,8 +124,8 @@
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "0.19.1",
-    "web3-provider-engine": "^13.0.3",
-    "web3-stream-provider": "^2.0.6",
+    "web3-provider-engine": "^13.1.1",
+    "web3-stream-provider": "^3.0.1",
     "xtend": "^4.0.1"
   },
   "devDependencies": {
diff --git a/ui/classic/app/components/token-list.js b/ui/classic/app/components/token-list.js
index fed7e9f7a..20cfa897e 100644
--- a/ui/classic/app/components/token-list.js
+++ b/ui/classic/app/components/token-list.js
@@ -6,7 +6,6 @@ const TokenCell = require('./token-cell.js')
 const normalizeAddress = require('eth-sig-util').normalize
 
 const defaultTokens = []
-/*
 const contracts = require('eth-contract-metadata')
 for (const address in contracts) {
   const contract = contracts[address]
@@ -15,7 +14,6 @@ for (const address in contracts) {
     defaultTokens.push(contract)
   }
 }
-*/
 
 module.exports = TokenList
 
diff --git a/ui/responsive/app/components/token-list.js b/ui/responsive/app/components/token-list.js
index fed7e9f7a..20cfa897e 100644
--- a/ui/responsive/app/components/token-list.js
+++ b/ui/responsive/app/components/token-list.js
@@ -6,7 +6,6 @@ const TokenCell = require('./token-cell.js')
 const normalizeAddress = require('eth-sig-util').normalize
 
 const defaultTokens = []
-/*
 const contracts = require('eth-contract-metadata')
 for (const address in contracts) {
   const contract = contracts[address]
@@ -15,7 +14,6 @@ for (const address in contracts) {
     defaultTokens.push(contract)
   }
 }
-*/
 
 module.exports = TokenList