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 - inherit some configManager state from keyring controller

Browse Source
This commit is contained in:
kumavis 2017-01-31 22:35:11 -08:00
parent c0d3db6a8c
commit ad060e2678
2 changed files with 13 additions and 10 deletions

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

@ -2,7 +2,6 @@ const ethUtil = require('ethereumjs-util')
const BN = ethUtil.BN const BN = ethUtil.BN
const bip39 = require('bip39') const bip39 = require('bip39')
const EventEmitter = require('events').EventEmitter const EventEmitter = require('events').EventEmitter
const extend = require('xtend')
const ObservableStore = require('obs-store') const ObservableStore = require('obs-store')
const filter = require('promise-filter') const filter = require('promise-filter')
const encryptor = require('browser-passworder') const encryptor = require('browser-passworder')
@ -33,7 +32,9 @@ class KeyringController extends EventEmitter {
super() super()
const initState = opts.initState || {} const initState = opts.initState || {}
this.store = new ObservableStore(initState) this.store = new ObservableStore(initState)
this.memStore = new ObservableStore({}) this.memStore = new ObservableStore({
keyrings: [],
})
this.configManager = opts.configManager this.configManager = opts.configManager
this.ethStore = opts.ethStore this.ethStore = opts.ethStore
this.encryptor = encryptor this.encryptor = encryptor
@ -80,7 +81,7 @@ class KeyringController extends EventEmitter {
// old wallet // old wallet
const wallet = this.configManager.getWallet() const wallet = this.configManager.getWallet()
const memState = this.memStore.getState() const memState = this.memStore.getState()
return extend(memState, { const result = {
// computed // computed
isInitialized: (!!wallet || !!state.vault), isInitialized: (!!wallet || !!state.vault),
isUnlocked: (!!this.password), isUnlocked: (!!this.password),
@ -88,16 +89,15 @@ class KeyringController extends EventEmitter {
keyringTypes: this.keyringTypes.map(krt => krt.type), keyringTypes: this.keyringTypes.map(krt => krt.type),
// memStore // memStore
identities: this.identities, identities: this.identities,
// configManager keyrings: memState.keyrings,
seedWords: this.configManager.getSeedWords(),
isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
currentFiat: this.configManager.getCurrentFiat(),
conversionRate: this.configManager.getConversionRate(),
conversionDate: this.configManager.getConversionDate(),
// messageManager // messageManager
unconfMsgs: messageManager.unconfirmedMsgs(), unconfMsgs: messageManager.unconfirmedMsgs(),
messages: messageManager.getMsgList(), messages: messageManager.getMsgList(),
}) // configManager
seedWords: this.configManager.getSeedWords(),
isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
}
return result
} }
// Create New Vault And Keychain // Create New Vault And Keychain

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

@ -180,6 +180,9 @@ module.exports = class MetamaskController extends EventEmitter {
{ {
shapeShiftTxList: this.configManager.getShapeShiftTxList(), shapeShiftTxList: this.configManager.getShapeShiftTxList(),
lostAccounts: this.configManager.getLostAccounts(), lostAccounts: this.configManager.getLostAccounts(),
currentFiat: this.configManager.getCurrentFiat(),
conversionRate: this.configManager.getConversionRate(),
conversionDate: this.configManager.getConversionDate(),
} }
) )
} }