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

Merge remote-tracking branch 'origin/ShowDifferentAccounts' into RevertTxManager

Browse Source
This commit is contained in:
Dan Finlay 2017-01-02 17:38:37 -08:00
commit b93cdd428b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/keyring-controller.js
View File

@ -95,7 +95,6 @@ module.exports = class KeyringController extends EventEmitter {
isInitialized: (!!wallet || !!vault), isInitialized: (!!wallet || !!vault),
isUnlocked: Boolean(this.password), isUnlocked: Boolean(this.password),
isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
unconfTxs: this.configManager.unconfirmedTxs(),
transactions: this.configManager.getTxList(), transactions: this.configManager.getTxList(),
unconfMsgs: messageManager.unconfirmedMsgs(), unconfMsgs: messageManager.unconfirmedMsgs(),
messages: messageManager.getMsgList(), messages: messageManager.getMsgList(),
@ -111,7 +110,6 @@ module.exports = class KeyringController extends EventEmitter {
}) })
} }
// Create New Vault And Keychain // Create New Vault And Keychain
// @string password - The password to encrypt the vault with // @string password - The password to encrypt the vault with
// //
@ -510,7 +508,7 @@ module.exports = class KeyringController extends EventEmitter {
if (typeof password === 'string') { if (typeof password === 'string') {
this.password = password this.password = password
} }
return Promise.all(this.keyrings.map((keyring, i) => { return Promise.all(this.keyrings.map((keyring) => {
return Promise.all([keyring.type, keyring.serialize()]) return Promise.all([keyring.type, keyring.serialize()])
.then((serializedKeyringArray) => { .then((serializedKeyringArray) => {
// Label the output values on each serialized Keyring: // Label the output values on each serialized Keyring:

9
app/scripts/keyrings/simple.js
View File

@ -19,10 +19,11 @@ class SimpleKeyring extends EventEmitter {
return Promise.resolve(this.wallets.map(w => w.getPrivateKey().toString('hex'))) return Promise.resolve(this.wallets.map(w => w.getPrivateKey().toString('hex')))
} }
deserialize (wallets = []) { deserialize (privateKeys = []) {
this.wallets = wallets.map((w) => { this.wallets = privateKeys.map((privateKey) => {
var b = new Buffer(w, 'hex') const stripped = ethUtil.stripHexPrefix(privateKey)
const wallet = Wallet.fromPrivateKey(b) const buffer = new Buffer(stripped, 'hex')
const wallet = Wallet.fromPrivateKey(buffer)
return wallet return wallet
}) })
return Promise.resolve() return Promise.resolve()

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

@ -69,6 +69,7 @@ module.exports = class MetamaskController {
this.state, this.state,
this.ethStore.getState(), this.ethStore.getState(),
this.configManager.getConfig(), this.configManager.getConfig(),
this.txManager.getState(),
keyringControllerState, keyringControllerState,
this.noticeController.getState(), { this.noticeController.getState(), {
lostAccounts: this.configManager.getLostAccounts(), lostAccounts: this.configManager.getLostAccounts(),