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

Select first address when restoring vault

Browse Source 
Fixes #642
This commit is contained in:
Dan Finlay 2016-09-12 08:50:42 -07:00
parent f51a13abaf
commit 5c1d8e299e
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/scripts/lib/idStore.js
View File

@ -59,6 +59,7 @@ IdentityStore.prototype.createNewVault = function (password, entropy, cb) {
this.configManager.setShowSeedWords(true) this.configManager.setShowSeedWords(true)
var seedWords = this._idmgmt.getSeed() var seedWords = this._idmgmt.getSeed()
cb(null, seedWords) cb(null, seedWords)
}) })
} }
@ -124,7 +125,7 @@ IdentityStore.prototype.getSelectedAddress = function () {
return configManager.getSelectedAccount() return configManager.getSelectedAccount()
} }
IdentityStore.prototype.setSelectedAddress = function (address, cb) { IdentityStore.prototype.setSelectedAddressSync = function (address) {
const configManager = this.configManager const configManager = this.configManager
if (!address) { if (!address) {
var addresses = this._getAddresses() var addresses = this._getAddresses()
@ -132,7 +133,12 @@ IdentityStore.prototype.setSelectedAddress = function (address, cb) {
} }
configManager.setSelectedAccount(address) configManager.setSelectedAccount(address)
if (cb) return cb(null, address) return address
}
IdentityStore.prototype.setSelectedAddress = function (address, cb) {
const resultAddress = this.setSelectedAddressSync(address)
if (cb) return cb(null, resultAddress)
} }
IdentityStore.prototype.revealAccount = function (cb) { IdentityStore.prototype.revealAccount = function (cb) {
@ -477,6 +483,8 @@ IdentityStore.prototype._createIdmgmt = function (password, seedPhrase, entropy,
configManager: this.configManager, configManager: this.configManager,
}) })
this.setSelectedAddressSync()
cb() cb()
}) })
}) })

18
test/unit/idStore-test.js
View File

@ -128,5 +128,23 @@ describe('IdentityStore', function() {
done() done()
}) })
}) })
it('should allow restoring and unlocking again', function (done) {
const assertion = assertions[0]
idStore.recoverFromSeed(password, assertion.seed, (err) => {
assert.ifError(err)
var received = accounts[0].toLowerCase()
var expected = assertion.account.toLowerCase()
assert.equal(received, expected)
idStore.submitPassword(password, function(err, account) {
assert.ifError(err)
assert.equal(account, expected)
done()
})
})
})
}) })
}) })