1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Merge branch 'master' into NewUI

This commit is contained in:
Dan Finlay 2017-07-05 15:48:40 -07:00
commit ed8a71d350
6 changed files with 17 additions and 9 deletions

View File

@ -2,6 +2,11 @@
## Current Master ## 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. - No longer show network loading indication on config screen, to allow selecting custom RPCs.
- Visually indicate that network spinner is a menu. - Visually indicate that network spinner is a menu.
- Indicate what network is being searched for when disconnected. - Indicate what network is being searched for when disconnected.

View File

@ -1,7 +1,7 @@
{ {
"name": "MetaMask", "name": "MetaMask",
"short_name": "Metamask", "short_name": "Metamask",
"version": "3.8.1", "version": "3.8.2",
"manifest_version": 2, "manifest_version": 2,
"author": "https://metamask.io", "author": "https://metamask.io",
"description": "Ethereum Browser Extension", "description": "Ethereum Browser Extension",

View File

@ -184,7 +184,9 @@ module.exports = class MetamaskController extends EventEmitter {
eth_syncing: false, eth_syncing: false,
web3_clientVersion: `MetaMask/v${version}`, web3_clientVersion: `MetaMask/v${version}`,
}, },
// rpc data source
rpcUrl: this.networkController.getCurrentRpcAddress(), rpcUrl: this.networkController.getCurrentRpcAddress(),
originHttpHeaderKey: 'X-Metamask-Origin',
// account mgmt // account mgmt
getAccounts: (cb) => { getAccounts: (cb) => {
const isUnlocked = this.keyringController.memStore.getState().isUnlocked const isUnlocked = this.keyringController.memStore.getState().isUnlocked
@ -356,8 +358,13 @@ module.exports = class MetamaskController extends EventEmitter {
} }
setupProviderConnection (outStream, originDomain) { setupProviderConnection (outStream, originDomain) {
streamIntoProvider(outStream, this.provider, logger) streamIntoProvider(outStream, this.provider, onRequest, onResponse)
function logger (err, request, response) { // 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 (err) return console.error(err)
if (response.error) { if (response.error) {
console.error('Error in RPC response:\n', response.error) console.error('Error in RPC response:\n', response.error)

View File

@ -124,8 +124,8 @@
"valid-url": "^1.0.9", "valid-url": "^1.0.9",
"vreme": "^3.0.2", "vreme": "^3.0.2",
"web3": "0.19.1", "web3": "0.19.1",
"web3-provider-engine": "^13.0.3", "web3-provider-engine": "^13.1.1",
"web3-stream-provider": "^2.0.6", "web3-stream-provider": "^3.0.1",
"xtend": "^4.0.1" "xtend": "^4.0.1"
}, },
"devDependencies": { "devDependencies": {

View File

@ -6,7 +6,6 @@ const TokenCell = require('./token-cell.js')
const normalizeAddress = require('eth-sig-util').normalize const normalizeAddress = require('eth-sig-util').normalize
const defaultTokens = [] const defaultTokens = []
/*
const contracts = require('eth-contract-metadata') const contracts = require('eth-contract-metadata')
for (const address in contracts) { for (const address in contracts) {
const contract = contracts[address] const contract = contracts[address]
@ -15,7 +14,6 @@ for (const address in contracts) {
defaultTokens.push(contract) defaultTokens.push(contract)
} }
} }
*/
module.exports = TokenList module.exports = TokenList

View File

@ -6,7 +6,6 @@ const TokenCell = require('./token-cell.js')
const normalizeAddress = require('eth-sig-util').normalize const normalizeAddress = require('eth-sig-util').normalize
const defaultTokens = [] const defaultTokens = []
/*
const contracts = require('eth-contract-metadata') const contracts = require('eth-contract-metadata')
for (const address in contracts) { for (const address in contracts) {
const contract = contracts[address] const contract = contracts[address]
@ -15,7 +14,6 @@ for (const address in contracts) {
defaultTokens.push(contract) defaultTokens.push(contract)
} }
} }
*/
module.exports = TokenList module.exports = TokenList