mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Merge pull request #2155 from MetaMask/filter-fixes-moar
Various fixes you've been waiting for, how exciting!
This commit is contained in:
commit
828dbd7e3f
@ -42,16 +42,21 @@ function setupStreams () {
|
|||||||
name: 'contentscript',
|
name: 'contentscript',
|
||||||
target: 'inpage',
|
target: 'inpage',
|
||||||
})
|
})
|
||||||
pageStream.on('error', console.error)
|
|
||||||
const pluginPort = extension.runtime.connect({ name: 'contentscript' })
|
const pluginPort = extension.runtime.connect({ name: 'contentscript' })
|
||||||
const pluginStream = new PortStream(pluginPort)
|
const pluginStream = new PortStream(pluginPort)
|
||||||
pluginStream.on('error', console.error)
|
|
||||||
|
|
||||||
// forward communication plugin->inpage
|
// forward communication plugin->inpage
|
||||||
pageStream.pipe(pluginStream).pipe(pageStream)
|
pump(
|
||||||
|
pageStream,
|
||||||
|
pluginStream,
|
||||||
|
pageStream,
|
||||||
|
(err) => logStreamDisconnectWarning('MetaMask Contentscript Forwarding', err)
|
||||||
|
)
|
||||||
|
|
||||||
// setup local multistream channels
|
// setup local multistream channels
|
||||||
const mux = new ObjectMultiplex()
|
const mux = new ObjectMultiplex()
|
||||||
|
mux.setMaxListeners(25)
|
||||||
|
|
||||||
pump(
|
pump(
|
||||||
mux,
|
mux,
|
||||||
pageStream,
|
pageStream,
|
||||||
|
@ -4,6 +4,7 @@ const ObservableStore = require('obs-store')
|
|||||||
const ComposedStore = require('obs-store/lib/composed')
|
const ComposedStore = require('obs-store/lib/composed')
|
||||||
const extend = require('xtend')
|
const extend = require('xtend')
|
||||||
const EthQuery = require('eth-query')
|
const EthQuery = require('eth-query')
|
||||||
|
const createEventEmitterProxy = require('../lib/events-proxy.js')
|
||||||
const RPC_ADDRESS_LIST = require('../config.js').network
|
const RPC_ADDRESS_LIST = require('../config.js').network
|
||||||
const DEFAULT_RPC = RPC_ADDRESS_LIST['rinkeby']
|
const DEFAULT_RPC = RPC_ADDRESS_LIST['rinkeby']
|
||||||
|
|
||||||
@ -31,16 +32,8 @@ module.exports = class NetworkController extends EventEmitter {
|
|||||||
initializeProvider (opts, providerContructor = MetaMaskProvider) {
|
initializeProvider (opts, providerContructor = MetaMaskProvider) {
|
||||||
this.providerInit = opts
|
this.providerInit = opts
|
||||||
this._provider = providerContructor(opts)
|
this._provider = providerContructor(opts)
|
||||||
this._proxy = new Proxy(this._provider, {
|
this._proxy = createEventEmitterProxy(this._provider)
|
||||||
get: (obj, name) => {
|
this.provider._blockTracker = createEventEmitterProxy(this._provider._blockTracker)
|
||||||
if (name === 'on') return this._on.bind(this)
|
|
||||||
return this._provider[name]
|
|
||||||
},
|
|
||||||
set: (obj, name, value) => {
|
|
||||||
this._provider[name] = value
|
|
||||||
return value
|
|
||||||
},
|
|
||||||
})
|
|
||||||
this.provider.on('block', this._logBlock.bind(this))
|
this.provider.on('block', this._logBlock.bind(this))
|
||||||
this.provider.on('error', this.verifyNetwork.bind(this))
|
this.provider.on('error', this.verifyNetwork.bind(this))
|
||||||
this.ethQuery = new EthQuery(this.provider)
|
this.ethQuery = new EthQuery(this.provider)
|
||||||
@ -55,11 +48,11 @@ module.exports = class NetworkController extends EventEmitter {
|
|||||||
|
|
||||||
this._provider.removeAllListeners()
|
this._provider.removeAllListeners()
|
||||||
this._provider.stop()
|
this._provider.stop()
|
||||||
this.provider = MetaMaskProvider(newInit)
|
this._provider = MetaMaskProvider(newInit)
|
||||||
// apply the listners created by other controllers
|
// apply the listners created by other controllers
|
||||||
Object.keys(this._providerListeners).forEach((key) => {
|
const blockTrackerHandlers = this.provider._blockTracker.proxyEventHandlers
|
||||||
this._providerListeners[key].forEach((handler) => this._provider.addListener(key, handler))
|
this.provider.setTarget(this._provider)
|
||||||
})
|
this.provider._blockTracker = createEventEmitterProxy(this._provider._blockTracker, blockTrackerHandlers)
|
||||||
this.emit('networkDidChange')
|
this.emit('networkDidChange')
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,10 +114,4 @@ module.exports = class NetworkController extends EventEmitter {
|
|||||||
log.info(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
|
log.info(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
|
||||||
this.verifyNetwork()
|
this.verifyNetwork()
|
||||||
}
|
}
|
||||||
|
|
||||||
_on (event, handler) {
|
|
||||||
if (!this._providerListeners[event]) this._providerListeners[event] = []
|
|
||||||
this._providerListeners[event].push(handler)
|
|
||||||
this._provider.on(event, handler)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ module.exports = class TransactionController extends EventEmitter {
|
|||||||
this.pendingTxTracker.on('txFailed', this.setTxStatusFailed.bind(this))
|
this.pendingTxTracker.on('txFailed', this.setTxStatusFailed.bind(this))
|
||||||
this.pendingTxTracker.on('txConfirmed', this.setTxStatusConfirmed.bind(this))
|
this.pendingTxTracker.on('txConfirmed', this.setTxStatusConfirmed.bind(this))
|
||||||
|
|
||||||
this.blockTracker.on('rawBlock', this.pendingTxTracker.checkForTxInBlock.bind(this.pendingTxTracker))
|
this.blockTracker.on('block', this.pendingTxTracker.checkForTxInBlock.bind(this.pendingTxTracker))
|
||||||
// this is a little messy but until ethstore has been either
|
// this is a little messy but until ethstore has been either
|
||||||
// removed or redone this is to guard against the race condition
|
// removed or redone this is to guard against the race condition
|
||||||
// where accountTracker hasent been populated by the results yet
|
// where accountTracker hasent been populated by the results yet
|
||||||
|
31
app/scripts/lib/events-proxy.js
Normal file
31
app/scripts/lib/events-proxy.js
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
module.exports = function createEventEmitterProxy(eventEmitter, listeners) {
|
||||||
|
let target = eventEmitter
|
||||||
|
const eventHandlers = listeners || {}
|
||||||
|
const proxy = new Proxy({}, {
|
||||||
|
get: (obj, name) => {
|
||||||
|
// intercept listeners
|
||||||
|
if (name === 'on') return addListener
|
||||||
|
if (name === 'setTarget') return setTarget
|
||||||
|
if (name === 'proxyEventHandlers') return eventHandlers
|
||||||
|
return target[name]
|
||||||
|
},
|
||||||
|
set: (obj, name, value) => {
|
||||||
|
target[name] = value
|
||||||
|
return true
|
||||||
|
},
|
||||||
|
})
|
||||||
|
function setTarget (eventEmitter) {
|
||||||
|
target = eventEmitter
|
||||||
|
// migrate listeners
|
||||||
|
Object.keys(eventHandlers).forEach((name) => {
|
||||||
|
eventHandlers[name].forEach((handler) => target.on(name, handler))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
function addListener (name, handler) {
|
||||||
|
if (!eventHandlers[name]) eventHandlers[name] = []
|
||||||
|
eventHandlers[name].push(handler)
|
||||||
|
target.on(name, handler)
|
||||||
|
}
|
||||||
|
if (listeners) proxy.setTarget(eventEmitter)
|
||||||
|
return proxy
|
||||||
|
}
|
@ -82,7 +82,7 @@ module.exports = class MetamaskController extends EventEmitter {
|
|||||||
|
|
||||||
// rpc provider
|
// rpc provider
|
||||||
this.provider = this.initializeProvider()
|
this.provider = this.initializeProvider()
|
||||||
this.blockTracker = this.provider
|
this.blockTracker = this.provider._blockTracker
|
||||||
|
|
||||||
// eth data query tools
|
// eth data query tools
|
||||||
this.ethQuery = new EthQuery(this.provider)
|
this.ethQuery = new EthQuery(this.provider)
|
||||||
|
@ -67,8 +67,10 @@
|
|||||||
"end-of-stream": "^1.1.0",
|
"end-of-stream": "^1.1.0",
|
||||||
"ensnare": "^1.0.0",
|
"ensnare": "^1.0.0",
|
||||||
"eth-bin-to-ops": "^1.0.1",
|
"eth-bin-to-ops": "^1.0.1",
|
||||||
|
"eth-block-tracker": "^2.2.0",
|
||||||
"eth-contract-metadata": "^1.1.4",
|
"eth-contract-metadata": "^1.1.4",
|
||||||
"eth-json-rpc-filters": "^1.1.0",
|
"eth-hd-keyring": "^1.1.1",
|
||||||
|
"eth-json-rpc-filters": "^1.2.1",
|
||||||
"eth-keyring-controller": "^1.0.1",
|
"eth-keyring-controller": "^1.0.1",
|
||||||
"eth-phishing-detect": "^1.1.4",
|
"eth-phishing-detect": "^1.1.4",
|
||||||
"eth-query": "^2.1.2",
|
"eth-query": "^2.1.2",
|
||||||
@ -78,6 +80,7 @@
|
|||||||
"ethereumjs-tx": "^1.3.0",
|
"ethereumjs-tx": "^1.3.0",
|
||||||
"ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
|
"ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
|
||||||
"ethereumjs-wallet": "^0.6.0",
|
"ethereumjs-wallet": "^0.6.0",
|
||||||
|
"ethjs-contract": "^0.1.9",
|
||||||
"ethjs-ens": "^2.0.0",
|
"ethjs-ens": "^2.0.0",
|
||||||
"ethjs-query": "^0.2.9",
|
"ethjs-query": "^0.2.9",
|
||||||
"express": "^4.14.0",
|
"express": "^4.14.0",
|
||||||
@ -88,6 +91,7 @@
|
|||||||
"gulp": "github:gulpjs/gulp#4.0",
|
"gulp": "github:gulpjs/gulp#4.0",
|
||||||
"gulp-eslint": "^4.0.0",
|
"gulp-eslint": "^4.0.0",
|
||||||
"hat": "0.0.3",
|
"hat": "0.0.3",
|
||||||
|
"human-standard-token-abi": "^1.0.2",
|
||||||
"idb-global": "^2.1.0",
|
"idb-global": "^2.1.0",
|
||||||
"identicon.js": "^2.3.1",
|
"identicon.js": "^2.3.1",
|
||||||
"iframe": "^1.0.0",
|
"iframe": "^1.0.0",
|
||||||
@ -136,7 +140,7 @@
|
|||||||
"valid-url": "^1.0.9",
|
"valid-url": "^1.0.9",
|
||||||
"vreme": "^3.0.2",
|
"vreme": "^3.0.2",
|
||||||
"web3": "^0.20.1",
|
"web3": "^0.20.1",
|
||||||
"web3-provider-engine": "^13.2.9",
|
"web3-provider-engine": "^13.2.12",
|
||||||
"web3-stream-provider": "^3.0.1",
|
"web3-stream-provider": "^3.0.1",
|
||||||
"xtend": "^4.0.1"
|
"xtend": "^4.0.1"
|
||||||
},
|
},
|
||||||
|
@ -21,7 +21,7 @@ describe('# Network Controller', function () {
|
|||||||
it('provider should be updatable without reassignment', function () {
|
it('provider should be updatable without reassignment', function () {
|
||||||
networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
|
networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
|
||||||
const provider = networkController.provider
|
const provider = networkController.provider
|
||||||
networkController._provider = {test: true}
|
networkController.provider.setTarget({test: true, on: () => {}})
|
||||||
assert.ok(provider.test)
|
assert.ok(provider.test)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@ -71,6 +71,7 @@ function dummyProviderConstructor() {
|
|||||||
// provider
|
// provider
|
||||||
sendAsync: noop,
|
sendAsync: noop,
|
||||||
// block tracker
|
// block tracker
|
||||||
|
_blockTracker: {},
|
||||||
start: noop,
|
start: noop,
|
||||||
stop: noop,
|
stop: noop,
|
||||||
on: noop,
|
on: noop,
|
||||||
|
Loading…
Reference in New Issue
Block a user