@ -9,7 +9,7 @@ const extend = require('xtend')
const createId = require ( 'web3-provider-engine/util/random-id' )
const autoFaucet = require ( './auto-faucet' )
const configManager = require ( './config-manager-singleton' )
const DEFAULT _RPC = 'https://raw testrpc.metamask.io/'
const DEFAULT _RPC = 'https://testrpc.metamask.io/'
module . exports = IdentityStore
@ -72,8 +72,7 @@ IdentityStore.prototype.setStore = function(store){
IdentityStore . prototype . clearSeedWordCache = function ( cb ) {
configManager . setShowSeedWords ( false )
var accounts = this . _loadIdentities ( )
cb ( null , accounts )
cb ( null , configManager . getSelectedAccount ( ) )
}
IdentityStore . prototype . getState = function ( ) {
@ -85,6 +84,7 @@ IdentityStore.prototype.getState = function(){
seedWords : seedWords ,
unconfTxs : configManager . unconfirmedTxs ( ) ,
transactions : configManager . getTxList ( ) ,
selectedAddress : configManager . getSelectedAccount ( ) ,
} ) )
}
@ -97,7 +97,7 @@ IdentityStore.prototype.getSeedIfUnlocked = function() {
}
IdentityStore . prototype . getSelectedAddress = function ( ) {
return this . _currentState . selectedAddress
return configManager . getSelectedAccount ( )
}
IdentityStore . prototype . setSelectedAddress = function ( address ) {
@ -106,7 +106,7 @@ IdentityStore.prototype.setSelectedAddress = function(address){
address = addresses [ 0 ]
}
this . _currentState . selectedAddress = address
configManager . setSelectedAccount ( address )
this . _didUpdate ( )
}
@ -120,8 +120,8 @@ IdentityStore.prototype.submitPassword = function(password, cb){
this . _tryPassword ( password , ( err ) => {
if ( err ) return cb ( err )
// load identities before returning...
var accounts = this . _loadIdentities ( )
cb ( null , accounts )
this . _loadIdentities ( )
cb ( null , configM anager . getSelectedA ccount( ) )
} )
}
@ -213,7 +213,6 @@ IdentityStore.prototype._loadIdentities = function(){
if ( ! this . _isUnlocked ( ) ) throw new Error ( 'not unlocked' )
var addresses = this . _getAddresses ( )
var accountArray = [ ]
addresses . forEach ( ( address , i ) => {
// // add to ethStore
this . _ethStore . addAccount ( address )
@ -225,10 +224,8 @@ IdentityStore.prototype._loadIdentities = function(){
mayBeFauceting : this . _mayBeFauceting ( i ) ,
}
this . _currentState . identities [ address ] = identity
accountArray . push ( identity )
} )
this . _didUpdate ( )
return accountArray
}
// mayBeFauceting