mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
metamask controller - breakout getAccounts method
This commit is contained in:
parent
f18615a82a
commit
e79037261e
@ -225,19 +225,9 @@ module.exports = class MetamaskController extends EventEmitter {
|
|||||||
web3_clientVersion: `MetaMask/v${version}`,
|
web3_clientVersion: `MetaMask/v${version}`,
|
||||||
},
|
},
|
||||||
// account mgmt
|
// account mgmt
|
||||||
getAccounts: (cb) => {
|
getAccounts: nodeify(this.getAccounts, this),
|
||||||
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)
|
|
||||||
},
|
|
||||||
// tx signing
|
// tx signing
|
||||||
processTransaction: nodeify(async (txParams) => await this.txController.newUnapprovedTransaction(txParams), this),
|
processTransaction: nodeify(this.txController.newUnapprovedTransaction, this.txController),
|
||||||
// old style msg signing
|
// old style msg signing
|
||||||
processMessage: this.newUnsignedMessage.bind(this),
|
processMessage: this.newUnsignedMessage.bind(this),
|
||||||
// personal_sign msg signing
|
// personal_sign msg signing
|
||||||
@ -483,6 +473,18 @@ module.exports = class MetamaskController extends EventEmitter {
|
|||||||
// Opinionated Keyring Management
|
// 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) {
|
addNewAccount (cb) {
|
||||||
const primaryKeyring = this.keyringController.getKeyringsByType('HD Key Tree')[0]
|
const primaryKeyring = this.keyringController.getKeyringsByType('HD Key Tree')[0]
|
||||||
if (!primaryKeyring) return cb(new Error('MetamaskController - No HD Key Tree found'))
|
if (!primaryKeyring) return cb(new Error('MetamaskController - No HD Key Tree found'))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user