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

metamask controller - breakout getAccounts method

Browse Source
This commit is contained in:
kumavis 2017-10-10 10:26:59 -07:00
parent f18615a82a
commit e79037261e
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/scripts/metamask-controller.js
View File

@ -225,19 +225,9 @@ module.exports = class MetamaskController extends EventEmitter {
web3_clientVersion: `MetaMask/v${version}`,
},
// account mgmt
getAccounts: (cb) => {
const isUnlocked = this.keyringController.memStore.getState().isUnlocked
const result = []
const selectedAddress = this.preferencesController.getSelectedAddress()
// only show address if account is unlocked
if (isUnlocked && selectedAddress) {
result.push(selectedAddress)
}
cb(null, result)
},
getAccounts: nodeify(this.getAccounts, this),
// tx signing
processTransaction: nodeify(async (txParams) => await this.txController.newUnapprovedTransaction(txParams), this),
processTransaction: nodeify(this.txController.newUnapprovedTransaction, this.txController),
// old style msg signing
processMessage: this.newUnsignedMessage.bind(this),
// personal_sign msg signing
@ -483,6 +473,18 @@ module.exports = class MetamaskController extends EventEmitter {
// Opinionated Keyring Management
//
async getAccounts () {
const isUnlocked = this.keyringController.memStore.getState().isUnlocked
const result = []
const selectedAddress = this.preferencesController.getSelectedAddress()
// only show address if account is unlocked
if (isUnlocked && selectedAddress) {
result.push(selectedAddress)
}
return result
},
addNewAccount (cb) {
const primaryKeyring = this.keyringController.getKeyringsByType('HD Key Tree')[0]
if (!primaryKeyring) return cb(new Error('MetamaskController - No HD Key Tree found'))