From 9ed3c676ecbce23f56cd004496c881425dd302eb Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 24 Jun 2016 13:05:21 -0700 Subject: [PATCH 1/6] Refactored background.js controller apart from chrome + transport Still needs linting fixes, probably bugs, this commit should be used as a draft of what a separation of these concerns might look like. --- app/scripts/background-controller.js | 255 +++++++++++++++++++++++ app/scripts/background.js | 300 ++++----------------------- 2 files changed, 301 insertions(+), 254 deletions(-) create mode 100644 app/scripts/background-controller.js diff --git a/app/scripts/background-controller.js b/app/scripts/background-controller.js new file mode 100644 index 000000000..e5814e84c --- /dev/null +++ b/app/scripts/background-controller.js @@ -0,0 +1,255 @@ +const extend = require('xtend') +const EthStore = require('eth-store') +const MetaMaskProvider = require('web3-provider-engine/zero.js') +const IdentityStore = require('./lib/idStore') +const configManager = require('./lib/config-manager-singleton') +const messageManager = require('./lib/message-manager') +const HostStore = require('./lib/remote-store.js').HostStore +const Web3 = require('web3') + + +module.exports = BackgroundController + +class BackgroundController { + + constructor (opts) { + this.idStore = new IdentityStore() + this.configManager = configManager + this.messageManager = messageManager + this.provider = this.initializeProvider(opts) + this.ethStore = new EthStore(this.provider) + this.idStore.setStore(this.ethStore) + this.publicConfigStore = this.initPublicConfigStore() + } + + get state () { + return extend( + this.ethStore.getState(), + this.idStore.getState(), + this.configManager.getConfig() + ) + } + + get api () { + const idStore = this.idStore + + return { + getState: function (cb) { cb(null, this.state) }, + setRpcTarget: setRpcTarget, + setProviderType: setProviderType, + useEtherscanProvider: useEtherscanProvider, + agreeToDisclaimer: agreeToDisclaimer, + // forward directly to idStore + createNewVault: idStore.createNewVault.bind(idStore), + recoverFromSeed: idStore.recoverFromSeed.bind(idStore), + submitPassword: idStore.submitPassword.bind(idStore), + setSelectedAddress: idStore.setSelectedAddress.bind(idStore), + approveTransaction: idStore.approveTransaction.bind(idStore), + cancelTransaction: idStore.cancelTransaction.bind(idStore), + signMessage: idStore.signMessage.bind(idStore), + cancelMessage: idStore.cancelMessage.bind(idStore), + setLocked: idStore.setLocked.bind(idStore), + clearSeedWordCache: idStore.clearSeedWordCache.bind(idStore), + exportAccount: idStore.exportAccount.bind(idStore), + revealAccount: idStore.revealAccount.bind(idStore), + saveAccountLabel: idStore.saveAccountLabel.bind(idStore), + tryPassword: idStore.tryPassword.bind(idStore), + recoverSeed: idStore.recoverSeed.bind(idStore), + } + } + + setupProviderConnection (stream, originDomain) { + stream.on('data', this.onRpcRequest.bind(this, stream, originDomain)) + } + + onRpcRequest (stream, originDomain, request) { + var payloads = Array.isArray(request) ? request : [request] + payloads.forEach(function (payload) { + // Append origin to rpc payload + payload.origin = originDomain + // Append origin to signature request + if (payload.method === 'eth_sendTransaction') { + payload.params[0].origin = originDomain + } else if (payload.method === 'eth_sign') { + payload.params.push({ origin: originDomain }) + } + }) + + // handle rpc request + this.provider.sendAsync(request, function onPayloadHandled (err, response) { + if (err) { + return logger(err) + } + logger(null, request, response) + try { + stream.write(response) + } catch (err) { + logger(err) + } + }) + + function logger (err, request, response) { + if (err) return console.error(err.stack) + if (!request.isMetamaskInternal) { + console.log(`RPC (${originDomain}):`, request, '->', response) + if (response.error) console.error('Error in RPC response:\n' + response.error.message) + } + } + } + + sendUpdate () { + this.remote.sendUpdate(this.state) + } + + initializeProvider (opts) { + const idStore = this.idStore + + var providerOpts = { + rpcUrl: configManager.getCurrentRpcAddress(), + // account mgmt + getAccounts: function (cb) { + var selectedAddress = idStore.getSelectedAddress() + var result = selectedAddress ? [selectedAddress] : [] + cb(null, result) + }, + // tx signing + approveTransaction: this.newUnsignedTransaction, + signTransaction: idStore.signTransaction.bind(idStore), + // msg signing + approveMessage: this.newUnsignedMessage, + signMessage: idStore.signMessage.bind(idStore), + } + + var provider = MetaMaskProvider(providerOpts) + var web3 = new Web3(provider) + idStore.web3 = web3 + idStore.getNetwork() + + provider.on('block', this.processBlock) + provider.on('error', idStore.getNetwork.bind(idStore)) + + return provider + } + + initPublicConfigStore () { + // get init state + var initPublicState = extend( + idStoreToPublic(this.idStore.getState()), + configToPublic(this.configManager.getConfig()) + ) + + var publicConfigStore = new HostStore(initPublicState) + + // subscribe to changes + this.configManager.subscribe(function (state) { + storeSetFromObj(publicConfigStore, configToPublic(state)) + }) + this.idStore.on('update', function (state) { + storeSetFromObj(publicConfigStore, idStoreToPublic(state)) + }) + + // idStore substate + function idStoreToPublic (state) { + return { + selectedAddress: state.selectedAddress, + } + } + // config substate + function configToPublic (state) { + return { + provider: state.provider, + } + } + // dump obj into store + function storeSetFromObj (store, obj) { + Object.keys(obj).forEach(function (key) { + store.set(key, obj[key]) + }) + } + + return publicConfigStore + } + + newUnsignedTransaction (txParams, onTxDoneCb) { + const idStore = this.idStore + var state = idStore.getState() + + // It's locked + if (!state.isUnlocked) { + this.opts.unlockAccountMessage() + idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, noop) + + // It's unlocked + } else { + idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => { + if (err) return onTxDoneCb(err) + this.opts.showUnconfirmedTx(txParams, txData, onTxDoneCb) + }) + } + } + + newUnsignedMessage(msgParams, cb) { + var state = this.idStore.getState() + if (!state.isUnlocked) { + this.opts.unlockAccountMessage() + } else { + this.addUnconfirmedMsg(msgParams, cb) + } + } + + addUnconfirmedMessage (msgParams, cb) { + const idStore = this.idStore + const msgId = idStore.addUnconfirmedMessage(msgParams, cb) + this.opts.showUnconfirmedMessage(msgParams, msgId) + } + + setupPublicConfig (stream) { + var storeStream = publicConfigStore.createStream() + stream.pipe(storeStream).pipe(stream) + } + + // Log blocks + processBlock (block) { + console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`) + this.verifyNetwork() + } + + verifyNetwork () { + // Check network when restoring connectivity: + if (this.idStore._currentState.network === 'loading') { + this.idStore.getNetwork() + } + } +} + +// config +// + +function agreeToDisclaimer (cb) { + try { + configManager.setConfirmed(true) + cb() + } catch (e) { + cb(e) + } +} + +// called from popup +function setRpcTarget (rpcTarget) { + configManager.setRpcTarget(rpcTarget) + chrome.runtime.reload() + idStore.getNetwork() +} + +function setProviderType (type) { + configManager.setProviderType(type) + chrome.runtime.reload() + idStore.getNetwork() +} + +function useEtherscanProvider () { + configManager.useEtherscanProvider() + chrome.runtime.reload() +} + +function noop () {} diff --git a/app/scripts/background.js b/app/scripts/background.js index 6934e9d3e..d90b047e7 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -1,19 +1,46 @@ const urlUtil = require('url') const Dnode = require('dnode') const eos = require('end-of-stream') -const extend = require('xtend') -const EthStore = require('eth-store') -const MetaMaskProvider = require('web3-provider-engine/zero.js') const PortStream = require('./lib/port-stream.js') -const IdentityStore = require('./lib/idStore') const createUnlockRequestNotification = require('./lib/notifications.js').createUnlockRequestNotification const createTxNotification = require('./lib/notifications.js').createTxNotification const createMsgNotification = require('./lib/notifications.js').createMsgNotification const configManager = require('./lib/config-manager-singleton') const messageManager = require('./lib/message-manager') const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex -const HostStore = require('./lib/remote-store.js').HostStore -const Web3 = require('web3') + +const BackgroundController = require('./background-controller') + +const controller = new BackgroundController({ + showUnconfirmedMessage, + unlockAccountMessage, + showUnconfirmedTx, +}) +const idStore = controller.idStore + +function unlockAccountMessage() { + createUnlockRequestNotification({ + title: 'Account Unlock Request', + }) +} + +function showUnconfirmedMessage (msgParams, msgId) { + createMsgNotification({ + title: 'New Unsigned Message', + msgParams: msgParams, + confirm: idStore.approveMessage.bind(idStore, msgId, noop), + cancel: idStore.cancelMessage.bind(idStore, msgId), + }) +} + +function showUnconfirmedTx(txParams, txData, onTxDoneCb) { + createTxNotification({ + title: 'New Unsigned Transaction', + txParams: txParams, + confirm: idStore.approveTransaction.bind(idStore, txData.id, noop), + cancel: idStore.cancelTransaction.bind(idStore, txData.id), + }) +} // // connect to other contexts @@ -37,8 +64,8 @@ function setupUntrustedCommunication (connectionStream, originDomain) { // setup multiplexing var mx = setupMultiplex(connectionStream) // connect features - setupProviderConnection(mx.createStream('provider'), originDomain) - setupPublicConfig(mx.createStream('publicConfig')) + controller.setupProviderConnection(mx.createStream('provider'), originDomain) + controller.setupPublicConfig(mx.createStream('publicConfig')) } function setupTrustedCommunication (connectionStream, originDomain) { @@ -46,182 +73,29 @@ function setupTrustedCommunication (connectionStream, originDomain) { var mx = setupMultiplex(connectionStream) // connect features setupControllerConnection(mx.createStream('controller')) - setupProviderConnection(mx.createStream('provider'), originDomain) -} - -// -// state and network -// - -var idStore = new IdentityStore() - -var providerOpts = { - rpcUrl: configManager.getCurrentRpcAddress(), - // account mgmt - getAccounts: function (cb) { - var selectedAddress = idStore.getSelectedAddress() - var result = selectedAddress ? [selectedAddress] : [] - cb(null, result) - }, - // tx signing - approveTransaction: newUnsignedTransaction, - signTransaction: idStore.signTransaction.bind(idStore), - // msg signing - approveMessage: newUnsignedMessage, - signMessage: idStore.signMessage.bind(idStore), -} -var provider = MetaMaskProvider(providerOpts) -var web3 = new Web3(provider) -idStore.web3 = web3 -idStore.getNetwork() - -// log new blocks -provider.on('block', function (block) { - console.log('BLOCK CHANGED:', '#' + block.number.toString('hex'), '0x' + block.hash.toString('hex')) - - // Check network when restoring connectivity: - if (idStore._currentState.network === 'loading') { - idStore.getNetwork() - } -}) - -provider.on('error', idStore.getNetwork.bind(idStore)) - -var ethStore = new EthStore(provider) -idStore.setStore(ethStore) - -function getState () { - var state = extend( - ethStore.getState(), - idStore.getState(), - configManager.getConfig() - ) - return state -} - -// -// public store -// - -// get init state -var initPublicState = extend( - idStoreToPublic(idStore.getState()), - configToPublic(configManager.getConfig()) -) - -var publicConfigStore = new HostStore(initPublicState) - -// subscribe to changes -configManager.subscribe(function (state) { - storeSetFromObj(publicConfigStore, configToPublic(state)) -}) -idStore.on('update', function (state) { - storeSetFromObj(publicConfigStore, idStoreToPublic(state)) -}) - -// idStore substate -function idStoreToPublic (state) { - return { - selectedAddress: state.selectedAddress, - } -} -// config substate -function configToPublic (state) { - return { - provider: state.provider, - } -} -// dump obj into store -function storeSetFromObj (store, obj) { - Object.keys(obj).forEach(function (key) { - store.set(key, obj[key]) - }) + controller.setupProviderConnection(mx.createStream('provider'), originDomain) } // // remote features // -function setupPublicConfig (stream) { - var storeStream = publicConfigStore.createStream() - stream.pipe(storeStream).pipe(stream) -} - -function setupProviderConnection (stream, originDomain) { - // decorate all payloads with origin domain - stream.on('data', function onRpcRequest (request) { - var payloads = Array.isArray(request) ? request : [request] - payloads.forEach(function (payload) { - // Append origin to rpc payload - payload.origin = originDomain - // Append origin to signature request - if (payload.method === 'eth_sendTransaction') { - payload.params[0].origin = originDomain - } else if (payload.method === 'eth_sign') { - payload.params.push({ origin: originDomain }) - } - }) - // handle rpc request - provider.sendAsync(request, function onPayloadHandled (err, response) { - if (err) { - return logger(err) - } - logger(null, request, response) - try { - stream.write(response) - } catch (err) { - logger(err) - } - }) - }) - - function logger (err, request, response) { - if (err) return console.error(err.stack) - if (!request.isMetamaskInternal) { - console.log(`RPC (${originDomain}):`, request, '->', response) - if (response.error) console.error('Error in RPC response:\n' + response.error.message) - } - } -} - function setupControllerConnection (stream) { - var dnode = Dnode({ - getState: function (cb) { cb(null, getState()) }, - setRpcTarget: setRpcTarget, - setProviderType: setProviderType, - useEtherscanProvider: useEtherscanProvider, - agreeToDisclaimer: agreeToDisclaimer, - // forward directly to idStore - createNewVault: idStore.createNewVault.bind(idStore), - recoverFromSeed: idStore.recoverFromSeed.bind(idStore), - submitPassword: idStore.submitPassword.bind(idStore), - setSelectedAddress: idStore.setSelectedAddress.bind(idStore), - approveTransaction: idStore.approveTransaction.bind(idStore), - cancelTransaction: idStore.cancelTransaction.bind(idStore), - signMessage: idStore.signMessage.bind(idStore), - cancelMessage: idStore.cancelMessage.bind(idStore), - setLocked: idStore.setLocked.bind(idStore), - clearSeedWordCache: idStore.clearSeedWordCache.bind(idStore), - exportAccount: idStore.exportAccount.bind(idStore), - revealAccount: idStore.revealAccount.bind(idStore), - saveAccountLabel: idStore.saveAccountLabel.bind(idStore), - tryPassword: idStore.tryPassword.bind(idStore), - recoverSeed: idStore.recoverSeed.bind(idStore), - }) + controller.stream = stream + var api = controller.api + var dnode = Dnode(api) stream.pipe(dnode).pipe(stream) - dnode.on('remote', function (remote) { + dnode.on('remote', function() { // push updates to popup - ethStore.on('update', sendUpdate) - idStore.on('update', sendUpdate) + controller.ethStore.on('update', controller.sendUpdate) + idStore.on('update', controller.sendUpdate) + // teardown on disconnect - eos(stream, function unsubscribe () { - ethStore.removeListener('update', sendUpdate) + eos(stream, () => { + controller.ethStore.removeListener('update', controller.sendUpdate) }) - function sendUpdate () { - var state = getState() - remote.sendUpdate(state) - } }) + } // @@ -244,86 +118,4 @@ function updateBadge (state) { chrome.browserAction.setBadgeBackgroundColor({ color: '#506F8B' }) } -// -// Add unconfirmed Tx + Msg -// - -function newUnsignedTransaction (txParams, onTxDoneCb) { - var state = idStore.getState() - if (!state.isUnlocked) { - createUnlockRequestNotification({ - title: 'Account Unlock Request', - }) - idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, noop) - } else { - addUnconfirmedTx(txParams, onTxDoneCb) - } -} - -function newUnsignedMessage (msgParams, cb) { - var state = idStore.getState() - if (!state.isUnlocked) { - createUnlockRequestNotification({ - title: 'Account Unlock Request', - }) - } else { - addUnconfirmedMsg(msgParams, cb) - } -} - -function addUnconfirmedTx (txParams, onTxDoneCb) { - idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, function (err, txData) { - if (err) return onTxDoneCb(err) - createTxNotification({ - title: 'New Unsigned Transaction', - txParams: txParams, - confirm: idStore.approveTransaction.bind(idStore, txData.id, noop), - cancel: idStore.cancelTransaction.bind(idStore, txData.id), - }) - }) -} - -function addUnconfirmedMsg (msgParams, cb) { - var msgId = idStore.addUnconfirmedMessage(msgParams, cb) - createMsgNotification({ - title: 'New Unsigned Message', - msgParams: msgParams, - confirm: idStore.approveMessage.bind(idStore, msgId, noop), - cancel: idStore.cancelMessage.bind(idStore, msgId), - }) -} - -// -// config -// - -function agreeToDisclaimer (cb) { - try { - configManager.setConfirmed(true) - cb() - } catch (e) { - cb(e) - } -} - -// called from popup -function setRpcTarget (rpcTarget) { - configManager.setRpcTarget(rpcTarget) - chrome.runtime.reload() - idStore.getNetwork() -} - -function setProviderType (type) { - configManager.setProviderType(type) - chrome.runtime.reload() - idStore.getNetwork() -} - -function useEtherscanProvider () { - configManager.useEtherscanProvider() - chrome.runtime.reload() -} - -// util - function noop () {} From b2b3f4b26bbaaf978b454afe18e9116ac8a693d4 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 24 Jun 2016 15:52:56 -0700 Subject: [PATCH 2/6] Improve refactor Replace config-manager-singleton with one that is instantiated within the `background-controller`, and takes its persistence callbacks from its instantiated options. Replaced class getters with more familiar get___() functions. --- app/scripts/background-controller.js | 78 ++++++++++----------- app/scripts/background.js | 62 ++++++++++++++-- app/scripts/lib/config-manager-singleton.js | 3 - app/scripts/lib/config-manager.js | 55 +-------------- app/scripts/lib/id-management.js | 6 +- app/scripts/lib/idStore.js | 25 +++++-- 6 files changed, 124 insertions(+), 105 deletions(-) delete mode 100644 app/scripts/lib/config-manager-singleton.js diff --git a/app/scripts/background-controller.js b/app/scripts/background-controller.js index e5814e84c..bda9f41ac 100644 --- a/app/scripts/background-controller.js +++ b/app/scripts/background-controller.js @@ -2,19 +2,18 @@ const extend = require('xtend') const EthStore = require('eth-store') const MetaMaskProvider = require('web3-provider-engine/zero.js') const IdentityStore = require('./lib/idStore') -const configManager = require('./lib/config-manager-singleton') const messageManager = require('./lib/message-manager') const HostStore = require('./lib/remote-store.js').HostStore const Web3 = require('web3') - +const ConfigManager = require('./lib/config-manager') module.exports = BackgroundController class BackgroundController { constructor (opts) { - this.idStore = new IdentityStore() - this.configManager = configManager + this.configManager = new ConfigManager(opts) + this.idStore = new IdentityStore({ configManager }) this.messageManager = messageManager this.provider = this.initializeProvider(opts) this.ethStore = new EthStore(this.provider) @@ -22,7 +21,7 @@ class BackgroundController { this.publicConfigStore = this.initPublicConfigStore() } - get state () { + getState () { return extend( this.ethStore.getState(), this.idStore.getState(), @@ -30,15 +29,15 @@ class BackgroundController { ) } - get api () { + getApi () { const idStore = this.idStore return { - getState: function (cb) { cb(null, this.state) }, - setRpcTarget: setRpcTarget, - setProviderType: setProviderType, - useEtherscanProvider: useEtherscanProvider, - agreeToDisclaimer: agreeToDisclaimer, + getState: function (cb) { cb(null, this.getState()) }, + setRpcTarget: this.setRpcTarget.bind(this), + setProviderType: this.setProviderType.bind(this), + useEtherscanProvider: this.useEtherscanProvider.bind(this), + agreeToDisclaimer: this.agreeToDisclaimer.bind(this), // forward directly to idStore createNewVault: idStore.createNewVault.bind(idStore), recoverFromSeed: idStore.recoverFromSeed.bind(idStore), @@ -98,14 +97,14 @@ class BackgroundController { } sendUpdate () { - this.remote.sendUpdate(this.state) + this.remote.sendUpdate(this.getState()) } initializeProvider (opts) { const idStore = this.idStore var providerOpts = { - rpcUrl: configManager.getCurrentRpcAddress(), + rpcUrl: this.configManager.getCurrentRpcAddress(), // account mgmt getAccounts: function (cb) { var selectedAddress = idStore.getSelectedAddress() @@ -188,7 +187,7 @@ class BackgroundController { } } - newUnsignedMessage(msgParams, cb) { + newUnsignedMessage (msgParams, cb) { var state = this.idStore.getState() if (!state.isUnlocked) { this.opts.unlockAccountMessage() @@ -212,7 +211,7 @@ class BackgroundController { processBlock (block) { console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`) this.verifyNetwork() - } + } verifyNetwork () { // Check network when restoring connectivity: @@ -220,36 +219,37 @@ class BackgroundController { this.idStore.getNetwork() } } -} -// config -// + // config + // -function agreeToDisclaimer (cb) { - try { - configManager.setConfirmed(true) - cb() - } catch (e) { - cb(e) + function agreeToDisclaimer (cb) { + try { + this.configManager.setConfirmed(true) + cb() + } catch (e) { + cb(e) + } } -} -// called from popup -function setRpcTarget (rpcTarget) { - configManager.setRpcTarget(rpcTarget) - chrome.runtime.reload() - idStore.getNetwork() -} + // called from popup + function setRpcTarget (rpcTarget) { + this.configManager.setRpcTarget(rpcTarget) + chrome.runtime.reload() + idStore.getNetwork() + } -function setProviderType (type) { - configManager.setProviderType(type) - chrome.runtime.reload() - idStore.getNetwork() -} + function setProviderType (type) { + this.configManager.setProviderType(type) + chrome.runtime.reload() + idStore.getNetwork() + } + + function useEtherscanProvider () { + this.configManager.useEtherscanProvider() + chrome.runtime.reload() + } -function useEtherscanProvider () { - configManager.useEtherscanProvider() - chrome.runtime.reload() } function noop () {} diff --git a/app/scripts/background.js b/app/scripts/background.js index d90b047e7..83d8d0258 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -5,16 +5,20 @@ const PortStream = require('./lib/port-stream.js') const createUnlockRequestNotification = require('./lib/notifications.js').createUnlockRequestNotification const createTxNotification = require('./lib/notifications.js').createTxNotification const createMsgNotification = require('./lib/notifications.js').createMsgNotification -const configManager = require('./lib/config-manager-singleton') const messageManager = require('./lib/message-manager') const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex - const BackgroundController = require('./background-controller') +const STORAGE_KEY = 'metamask-config' + const controller = new BackgroundController({ + // User confirmation callbacks: showUnconfirmedMessage, unlockAccountMessage, showUnconfirmedTx, + // Persistence Methods: + setData, + loadData, }) const idStore = controller.idStore @@ -82,7 +86,7 @@ function setupTrustedCommunication (connectionStream, originDomain) { function setupControllerConnection (stream) { controller.stream = stream - var api = controller.api + var api = controller.getApi() var dnode = Dnode(api) stream.pipe(dnode).pipe(stream) dnode.on('remote', function() { @@ -106,7 +110,7 @@ idStore.on('update', updateBadge) function updateBadge (state) { var label = '' - var unconfTxs = configManager.unconfirmedTxs() + var unconfTxs = controller.configManager.unconfirmedTxs() var unconfTxLen = Object.keys(unconfTxs).length var unconfMsgs = messageManager.unconfirmedMsgs() var unconfMsgLen = Object.keys(unconfMsgs).length @@ -118,4 +122,54 @@ function updateBadge (state) { chrome.browserAction.setBadgeBackgroundColor({ color: '#506F8B' }) } +function loadData () { + var oldData = getOldStyleData() + var newData + try { + newData = JSON.parse(window.localStorage[STORAGE_KEY]) + } catch (e) {} + + var data = extend({ + meta: { + version: 0, + }, + data: { + config: { + provider: { + type: 'testnet', + }, + }, + }, + }, oldData || null, newData || null) + return data +} + +function getOldStyleData () { + var config, wallet, seedWords + + var result = { + meta: { version: 0 }, + data: {}, + } + + try { + config = JSON.parse(window.localStorage['config']) + result.data.config = config + } catch (e) {} + try { + wallet = JSON.parse(window.localStorage['lightwallet']) + result.data.wallet = wallet + } catch (e) {} + try { + seedWords = window.localStorage['seedWords'] + result.data.seedWords = seedWords + } catch (e) {} + + return result +} + +function setData (data) { + window.localStorage[STORAGE_KEY] = JSON.stringify(data) +} + function noop () {} diff --git a/app/scripts/lib/config-manager-singleton.js b/app/scripts/lib/config-manager-singleton.js deleted file mode 100644 index 5915c401b..000000000 --- a/app/scripts/lib/config-manager-singleton.js +++ /dev/null @@ -1,3 +0,0 @@ -var ConfigManager = require('./config-manager') - -module.exports = new ConfigManager() diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index a3ff0bdfb..9793728bb 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -3,7 +3,6 @@ const extend = require('xtend') const MetamaskConfig = require('../config.js') const migrations = require('./migrations') -const STORAGE_KEY = 'metamask-config' const TESTNET_RPC = MetamaskConfig.network.testnet const MAINNET_RPC = MetamaskConfig.network.mainnet @@ -15,7 +14,7 @@ const MAINNET_RPC = MetamaskConfig.network.mainnet * particular portions of the state. */ module.exports = ConfigManager -function ConfigManager () { +function ConfigManager (opts) { // ConfigManager is observable and will emit updates this._subs = [] @@ -37,12 +36,10 @@ function ConfigManager () { // How to load initial config. // Includes step on migrating pre-pojo-migrator data. - loadData: loadData, + loadData: opts.loadData, // How to persist migrated config. - setData: function (data) { - window.localStorage[STORAGE_KEY] = JSON.stringify(data) - }, + setData: opts.setData, }) } @@ -280,49 +277,3 @@ ConfigManager.prototype.getConfirmed = function () { return ('isConfirmed' in data) && data.isConfirmed } -function loadData () { - var oldData = getOldStyleData() - var newData - try { - newData = JSON.parse(window.localStorage[STORAGE_KEY]) - } catch (e) {} - - var data = extend({ - meta: { - version: 0, - }, - data: { - config: { - provider: { - type: 'testnet', - }, - }, - }, - }, oldData || null, newData || null) - return data -} - -function getOldStyleData () { - var config, wallet, seedWords - - var result = { - meta: { version: 0 }, - data: {}, - } - - try { - config = JSON.parse(window.localStorage['config']) - result.data.config = config - } catch (e) {} - try { - wallet = JSON.parse(window.localStorage['lightwallet']) - result.data.wallet = wallet - } catch (e) {} - try { - seedWords = window.localStorage['seedWords'] - result.data.seedWords = seedWords - } catch (e) {} - - return result -} - diff --git a/app/scripts/lib/id-management.js b/app/scripts/lib/id-management.js index cc50bd649..9b8ceb415 100644 --- a/app/scripts/lib/id-management.js +++ b/app/scripts/lib/id-management.js @@ -1,6 +1,5 @@ const ethUtil = require('ethereumjs-util') const Transaction = require('ethereumjs-tx') -const configManager = require('./config-manager-singleton') module.exports = IdManagement @@ -9,6 +8,7 @@ function IdManagement (opts) { this.keyStore = opts.keyStore this.derivedKey = opts.derivedKey + this.configManager = opts.configManager this.hdPathString = "m/44'/60'/0'/0" this.getAddresses = function () { @@ -32,9 +32,9 @@ function IdManagement (opts) { // Add the tx hash to the persisted meta-tx object var txHash = ethUtil.bufferToHex(tx.hash()) - var metaTx = configManager.getTx(txParams.metamaskId) + var metaTx = this.configManager.getTx(txParams.metamaskId) metaTx.hash = txHash - configManager.updateTx(metaTx) + this.configManager.updateTx(metaTx) // return raw serialized tx var rawTx = ethUtil.bufferToHex(tx.serialize()) diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index d9657dacf..568d9f9a5 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -7,7 +7,6 @@ const extend = require('xtend') const createId = require('web3-provider-engine/util/random-id') const ethBinToOps = require('eth-bin-to-ops') const autoFaucet = require('./auto-faucet') -const configManager = require('./config-manager-singleton') const messageManager = require('./message-manager') const DEFAULT_RPC = 'https://testrpc.metamask.io/' const IdManagement = require('./id-management') @@ -20,6 +19,7 @@ function IdentityStore (opts = {}) { // we just use the ethStore to auto-add accounts this._ethStore = opts.ethStore + this.configManager = opts.configManager // lightwallet key store this._keyStore = null // lightwallet wrapper @@ -43,7 +43,7 @@ function IdentityStore (opts = {}) { IdentityStore.prototype.createNewVault = function (password, entropy, cb) { delete this._keyStore - configManager.clearWallet() + this.configManager.clearWallet() this._createIdmgmt(password, null, entropy, (err) => { if (err) return cb(err) @@ -51,14 +51,14 @@ IdentityStore.prototype.createNewVault = function (password, entropy, cb) { this._didUpdate() this._autoFaucet() - configManager.setShowSeedWords(true) + this.configManager.setShowSeedWords(true) var seedWords = this._idmgmt.getSeed() cb(null, seedWords) }) } IdentityStore.prototype.recoverSeed = function (cb) { - configManager.setShowSeedWords(true) + this.configManager.setShowSeedWords(true) if (!this._idmgmt) return cb(new Error('Unauthenticated. Please sign in.')) var seedWords = this._idmgmt.getSeed() cb(null, seedWords) @@ -79,11 +79,13 @@ IdentityStore.prototype.setStore = function (store) { } IdentityStore.prototype.clearSeedWordCache = function (cb) { + const configManager = this.configManager configManager.setShowSeedWords(false) cb(null, configManager.getSelectedAccount()) } IdentityStore.prototype.getState = function () { + const configManager = this.configManager var seedWords = this.getSeedIfUnlocked() return clone(extend(this._currentState, { isInitialized: !!configManager.getWallet() && !seedWords, @@ -99,6 +101,7 @@ IdentityStore.prototype.getState = function () { } IdentityStore.prototype.getSeedIfUnlocked = function () { + const configManager = this.configManager var showSeed = configManager.getShouldShowSeedWords() var idmgmt = this._idmgmt var shouldShow = showSeed && !!idmgmt @@ -107,10 +110,12 @@ IdentityStore.prototype.getSeedIfUnlocked = function () { } IdentityStore.prototype.getSelectedAddress = function () { + const configManager = this.configManager return configManager.getSelectedAccount() } IdentityStore.prototype.setSelectedAddress = function (address, cb) { + const configManager = this.configManager if (!address) { var addresses = this._getAddresses() address = addresses[0] @@ -123,6 +128,7 @@ IdentityStore.prototype.setSelectedAddress = function (address, cb) { IdentityStore.prototype.revealAccount = function (cb) { const derivedKey = this._idmgmt.derivedKey const keyStore = this._keyStore + const configManager = this.configManager keyStore.setDefaultHdDerivationPath(this.hdPathString) keyStore.generateNewAddress(derivedKey, 1) @@ -158,6 +164,7 @@ IdentityStore.prototype.setLocked = function (cb) { } IdentityStore.prototype.submitPassword = function (password, cb) { + const configManager = this.configManager this.tryPassword(password, (err) => { if (err) return cb(err) // load identities before returning... @@ -177,6 +184,7 @@ IdentityStore.prototype.exportAccount = function (address, cb) { // comes from dapp via zero-client hooked-wallet provider IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDoneCb, cb) { + const configManager = this.configManager var self = this // create txData obj with parameters and meta data var time = (new Date()).getTime() @@ -227,6 +235,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone // comes from metamask ui IdentityStore.prototype.approveTransaction = function (txId, cb) { + const configManager = this.configManager var approvalCb = this._unconfTxCbs[txId] || noop // accept tx @@ -240,6 +249,7 @@ IdentityStore.prototype.approveTransaction = function (txId, cb) { // comes from metamask ui IdentityStore.prototype.cancelTransaction = function (txId) { + const configManager = this.configManager var approvalCb = this._unconfTxCbs[txId] || noop // reject tx @@ -347,6 +357,7 @@ IdentityStore.prototype._isUnlocked = function () { // load identities from keyStoreet IdentityStore.prototype._loadIdentities = function () { + const configManager = this.configManager if (!this._isUnlocked()) throw new Error('not unlocked') var addresses = this._getAddresses() @@ -367,6 +378,7 @@ IdentityStore.prototype._loadIdentities = function () { } IdentityStore.prototype.saveAccountLabel = function (account, label, cb) { + const configManager = this.configManager configManager.setNicknameForWallet(account, label) this._loadIdentities() cb(null, label) @@ -379,6 +391,7 @@ IdentityStore.prototype.saveAccountLabel = function (account, label, cb) { // If there is no balance and it mayBeFauceting, // then it is in fact fauceting. IdentityStore.prototype._mayBeFauceting = function (i) { + const configManager = this.configManager var config = configManager.getProvider() if (i === 0 && config.type === 'rpc' && @@ -397,6 +410,7 @@ IdentityStore.prototype.tryPassword = function (password, cb) { } IdentityStore.prototype._createIdmgmt = function (password, seed, entropy, cb) { + const configManager = this.configManager var keyStore = null LightwalletKeyStore.deriveKeyFromPassword(password, (err, derivedKey) => { if (err) return cb(err) @@ -425,6 +439,7 @@ IdentityStore.prototype._createIdmgmt = function (password, seed, entropy, cb) { keyStore: keyStore, derivedKey: derivedKey, hdPathSTring: this.hdPathString, + this.configManager, }) cb() @@ -432,6 +447,7 @@ IdentityStore.prototype._createIdmgmt = function (password, seed, entropy, cb) { } IdentityStore.prototype._restoreFromSeed = function (password, seed, derivedKey) { + const configManager = this.configManager var keyStore = new LightwalletKeyStore(seed, derivedKey, this.hdPathString) keyStore.addHdDerivationPath(this.hdPathString, derivedKey, {curve: 'secp256k1', purpose: 'sign'}) keyStore.setDefaultHdDerivationPath(this.hdPathString) @@ -443,6 +459,7 @@ IdentityStore.prototype._restoreFromSeed = function (password, seed, derivedKey) } IdentityStore.prototype._createFirstWallet = function (entropy, derivedKey) { + const configManager = this.configManager var secretSeed = LightwalletKeyStore.generateRandomSeed(entropy) var keyStore = new LightwalletKeyStore(secretSeed, derivedKey, this.hdPathString) keyStore.addHdDerivationPath(this.hdPathString, derivedKey, {curve: 'secp256k1', purpose: 'sign'}) From fa7e4665594525256b846de93bdd46115a3a53a7 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 24 Jun 2016 15:55:11 -0700 Subject: [PATCH 3/6] Rename background-controller metamask-controller --- app/scripts/background.js | 4 ++-- .../{background-controller.js => metamask-controller.js} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename app/scripts/{background-controller.js => metamask-controller.js} (99%) diff --git a/app/scripts/background.js b/app/scripts/background.js index 83d8d0258..d23951015 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -7,11 +7,11 @@ const createTxNotification = require('./lib/notifications.js').createTxNotificat const createMsgNotification = require('./lib/notifications.js').createMsgNotification const messageManager = require('./lib/message-manager') const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex -const BackgroundController = require('./background-controller') +const MetamaskController = require('./metamask-controller') const STORAGE_KEY = 'metamask-config' -const controller = new BackgroundController({ +const controller = new MetamaskController({ // User confirmation callbacks: showUnconfirmedMessage, unlockAccountMessage, diff --git a/app/scripts/background-controller.js b/app/scripts/metamask-controller.js similarity index 99% rename from app/scripts/background-controller.js rename to app/scripts/metamask-controller.js index bda9f41ac..aef280310 100644 --- a/app/scripts/background-controller.js +++ b/app/scripts/metamask-controller.js @@ -7,9 +7,9 @@ const HostStore = require('./lib/remote-store.js').HostStore const Web3 = require('web3') const ConfigManager = require('./lib/config-manager') -module.exports = BackgroundController +module.exports = MetamaskController -class BackgroundController { +class MetamaskController { constructor (opts) { this.configManager = new ConfigManager(opts) From 122018a96a1b2b6d9b7eefe150ff76a9de69bdd7 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 24 Jun 2016 16:13:27 -0700 Subject: [PATCH 4/6] Fixed tests --- app/scripts/background.js | 8 ++--- app/scripts/lib/config-manager.js | 1 - app/scripts/lib/idStore.js | 7 ++-- app/scripts/metamask-controller.js | 23 ++++++------ test/lib/mock-config-manager.js | 57 ++++++++++++++++++++++++++++++ test/unit/config-manager-test.js | 7 ++-- test/unit/idStore-test.js | 4 +++ 7 files changed, 87 insertions(+), 20 deletions(-) create mode 100644 test/lib/mock-config-manager.js diff --git a/app/scripts/background.js b/app/scripts/background.js index d23951015..09cdffecd 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -1,4 +1,5 @@ const urlUtil = require('url') +const extend = require('xtend') const Dnode = require('dnode') const eos = require('end-of-stream') const PortStream = require('./lib/port-stream.js') @@ -22,7 +23,7 @@ const controller = new MetamaskController({ }) const idStore = controller.idStore -function unlockAccountMessage() { +function unlockAccountMessage () { createUnlockRequestNotification({ title: 'Account Unlock Request', }) @@ -37,7 +38,7 @@ function showUnconfirmedMessage (msgParams, msgId) { }) } -function showUnconfirmedTx(txParams, txData, onTxDoneCb) { +function showUnconfirmedTx (txParams, txData, onTxDoneCb) { createTxNotification({ title: 'New Unsigned Transaction', txParams: txParams, @@ -89,7 +90,7 @@ function setupControllerConnection (stream) { var api = controller.getApi() var dnode = Dnode(api) stream.pipe(dnode).pipe(stream) - dnode.on('remote', function() { + dnode.on('remote', () => { // push updates to popup controller.ethStore.on('update', controller.sendUpdate) idStore.on('update', controller.sendUpdate) @@ -99,7 +100,6 @@ function setupControllerConnection (stream) { controller.ethStore.removeListener('update', controller.sendUpdate) }) }) - } // diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index 9793728bb..0af82c89c 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -1,5 +1,4 @@ const Migrator = require('pojo-migrator') -const extend = require('xtend') const MetamaskConfig = require('../config.js') const migrations = require('./migrations') diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 568d9f9a5..f705c07a7 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -43,7 +43,10 @@ function IdentityStore (opts = {}) { IdentityStore.prototype.createNewVault = function (password, entropy, cb) { delete this._keyStore - this.configManager.clearWallet() + if (this.configManager) { + this.configManager.clearWallet() + } + this._createIdmgmt(password, null, entropy, (err) => { if (err) return cb(err) @@ -439,7 +442,7 @@ IdentityStore.prototype._createIdmgmt = function (password, seed, entropy, cb) { keyStore: keyStore, derivedKey: derivedKey, hdPathSTring: this.hdPathString, - this.configManager, + configManager: this.configManager, }) cb() diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index aef280310..262c20b96 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -13,11 +13,13 @@ class MetamaskController { constructor (opts) { this.configManager = new ConfigManager(opts) - this.idStore = new IdentityStore({ configManager }) - this.messageManager = messageManager this.provider = this.initializeProvider(opts) this.ethStore = new EthStore(this.provider) - this.idStore.setStore(this.ethStore) + this.idStore = new IdentityStore({ + configManager: this.configManager, + ethStore: this.ethStore, + }) + this.messageManager = messageManager this.publicConfigStore = this.initPublicConfigStore() } @@ -203,7 +205,7 @@ class MetamaskController { } setupPublicConfig (stream) { - var storeStream = publicConfigStore.createStream() + var storeStream = this.publicConfigStore.createStream() stream.pipe(storeStream).pipe(stream) } @@ -223,7 +225,7 @@ class MetamaskController { // config // - function agreeToDisclaimer (cb) { + agreeToDisclaimer (cb) { try { this.configManager.setConfirmed(true) cb() @@ -233,23 +235,22 @@ class MetamaskController { } // called from popup - function setRpcTarget (rpcTarget) { + setRpcTarget (rpcTarget) { this.configManager.setRpcTarget(rpcTarget) chrome.runtime.reload() - idStore.getNetwork() + this.idStore.getNetwork() } - function setProviderType (type) { + setProviderType (type) { this.configManager.setProviderType(type) chrome.runtime.reload() - idStore.getNetwork() + this.idStore.getNetwork() } - function useEtherscanProvider () { + useEtherscanProvider () { this.configManager.useEtherscanProvider() chrome.runtime.reload() } - } function noop () {} diff --git a/test/lib/mock-config-manager.js b/test/lib/mock-config-manager.js new file mode 100644 index 000000000..fe841f455 --- /dev/null +++ b/test/lib/mock-config-manager.js @@ -0,0 +1,57 @@ +var ConfigManager = require('../../app/scripts/lib/config-manager') +const STORAGE_KEY = 'metamask-persistance-key' +const extend = require('xtend') + +module.exports = function() { + return new ConfigManager({ loadData, setData }) +} + +function loadData () { + var oldData = getOldStyleData() + var newData + try { + newData = JSON.parse(window.localStorage[STORAGE_KEY]) + } catch (e) {} + + var data = extend({ + meta: { + version: 0, + }, + data: { + config: { + provider: { + type: 'testnet', + }, + }, + }, + }, oldData || null, newData || null) + return data +} + +function getOldStyleData () { + var config, wallet, seedWords + + var result = { + meta: { version: 0 }, + data: {}, + } + + try { + config = JSON.parse(window.localStorage['config']) + result.data.config = config + } catch (e) {} + try { + wallet = JSON.parse(window.localStorage['lightwallet']) + result.data.wallet = wallet + } catch (e) {} + try { + seedWords = window.localStorage['seedWords'] + result.data.seedWords = seedWords + } catch (e) {} + + return result +} + +function setData (data) { + window.localStorage[STORAGE_KEY] = JSON.stringify(data) +} diff --git a/test/unit/config-manager-test.js b/test/unit/config-manager-test.js index 130bde2ff..7891c5c9e 100644 --- a/test/unit/config-manager-test.js +++ b/test/unit/config-manager-test.js @@ -1,12 +1,14 @@ var assert = require('assert') -var ConfigManager = require('../../app/scripts/lib/config-manager') +const extend = require('xtend') +const STORAGE_KEY = 'metamask-persistance-key' +var configManagerGen = require('../lib/mock-config-manager') var configManager describe('config-manager', function() { beforeEach(function() { window.localStorage = {} // Hacking localStorage support into JSDom - configManager = new ConfigManager() + configManager = configManagerGen() }) describe('confirmation', function() { @@ -209,3 +211,4 @@ describe('config-manager', function() { }) }) }) + diff --git a/test/unit/idStore-test.js b/test/unit/idStore-test.js index e9611d7e8..ee4613236 100644 --- a/test/unit/idStore-test.js +++ b/test/unit/idStore-test.js @@ -1,5 +1,6 @@ var assert = require('assert') var IdentityStore = require('../../app/scripts/lib/idStore') +var configManagerGen = require('../lib/mock-config-manager') describe('IdentityStore', function() { @@ -15,6 +16,7 @@ describe('IdentityStore', function() { window.localStorage = {} // Hacking localStorage support into JSDom idStore = new IdentityStore({ + configManager: configManagerGen(), ethStore: { addAccount(acct) { accounts.push(acct) }, }, @@ -34,6 +36,7 @@ describe('IdentityStore', function() { window.localStorage = {} // Hacking localStorage support into JSDom idStore = new IdentityStore({ + configManager: configManagerGen(), ethStore: { addAccount(acct) { newAccounts.push(acct) }, }, @@ -65,6 +68,7 @@ describe('IdentityStore', function() { window.localStorage = {} // Hacking localStorage support into JSDom idStore = new IdentityStore({ + configManager: configManagerGen(), ethStore: { addAccount(acct) { accounts.push(acct) }, }, From d3e0e7fe45a1dc2159b26155b974ced16548ea44 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 24 Jun 2016 16:46:18 -0700 Subject: [PATCH 5/6] Manually debugged refactor --- app/scripts/background.js | 9 +++++---- app/scripts/metamask-controller.js | 18 +++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 09cdffecd..97e3269ba 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -90,14 +90,15 @@ function setupControllerConnection (stream) { var api = controller.getApi() var dnode = Dnode(api) stream.pipe(dnode).pipe(stream) - dnode.on('remote', () => { + dnode.on('remote', (remote) => { // push updates to popup - controller.ethStore.on('update', controller.sendUpdate) - idStore.on('update', controller.sendUpdate) + controller.ethStore.on('update', controller.sendUpdate.bind(controller)) + controller.remote = remote + idStore.on('update', controller.sendUpdate.bind(controller)) // teardown on disconnect eos(stream, () => { - controller.ethStore.removeListener('update', controller.sendUpdate) + controller.ethStore.removeListener('update', controller.sendUpdate.bind(controller)) }) }) } diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 262c20b96..d09b4c5f9 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -7,18 +7,16 @@ const HostStore = require('./lib/remote-store.js').HostStore const Web3 = require('web3') const ConfigManager = require('./lib/config-manager') -module.exports = MetamaskController - -class MetamaskController { +module.exports = class MetamaskController { constructor (opts) { this.configManager = new ConfigManager(opts) - this.provider = this.initializeProvider(opts) - this.ethStore = new EthStore(this.provider) this.idStore = new IdentityStore({ configManager: this.configManager, - ethStore: this.ethStore, }) + this.provider = this.initializeProvider(opts) + this.ethStore = new EthStore(this.provider) + this.idStore.setStore(this.ethStore) this.messageManager = messageManager this.publicConfigStore = this.initPublicConfigStore() } @@ -35,7 +33,7 @@ class MetamaskController { const idStore = this.idStore return { - getState: function (cb) { cb(null, this.getState()) }, + getState: (cb) => { cb(null, this.getState()) }, setRpcTarget: this.setRpcTarget.bind(this), setProviderType: this.setProviderType.bind(this), useEtherscanProvider: this.useEtherscanProvider.bind(this), @@ -99,7 +97,9 @@ class MetamaskController { } sendUpdate () { - this.remote.sendUpdate(this.getState()) + if (this.remote) { + this.remote.sendUpdate(this.getState()) + } } initializeProvider (opts) { @@ -126,7 +126,7 @@ class MetamaskController { idStore.web3 = web3 idStore.getNetwork() - provider.on('block', this.processBlock) + provider.on('block', this.processBlock.bind(this)) provider.on('error', idStore.getNetwork.bind(idStore)) return provider From 60fec24c003605047f3ab7c011a1ee98432b369b Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 24 Jun 2016 17:00:35 -0700 Subject: [PATCH 6/6] Debugged by using a real dapp --- app/scripts/metamask-controller.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index d09b4c5f9..398086274 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -10,6 +10,7 @@ const ConfigManager = require('./lib/config-manager') module.exports = class MetamaskController { constructor (opts) { + this.opts = opts this.configManager = new ConfigManager(opts) this.idStore = new IdentityStore({ configManager: this.configManager, @@ -108,16 +109,16 @@ module.exports = class MetamaskController { var providerOpts = { rpcUrl: this.configManager.getCurrentRpcAddress(), // account mgmt - getAccounts: function (cb) { + getAccounts: (cb) => { var selectedAddress = idStore.getSelectedAddress() var result = selectedAddress ? [selectedAddress] : [] cb(null, result) }, // tx signing - approveTransaction: this.newUnsignedTransaction, + approveTransaction: this.newUnsignedTransaction.bind(this), signTransaction: idStore.signTransaction.bind(idStore), // msg signing - approveMessage: this.newUnsignedMessage, + approveMessage: this.newUnsignedMessage.bind(this), signMessage: idStore.signMessage.bind(idStore), }