m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 19:26:13 +02:00
Code

Prevent creation of multiple vaults

Browse Source 
Fixes #2577 by ensuring only one seed phrase can be set for a new vault.

Also cleans up logs and reproduction logic.
This commit is contained in:
Dan Finlay 2017-11-20 13:47:35 -08:00
parent c0aa7ce857
commit 65cb970487
1 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,9 +39,6 @@ module.exports = class MetamaskController extends EventEmitter {
constructor (opts) {
super()
this.createVaultRequestStart = []
this.createVaultRequestEnd = []
this.createVaultMutex = new Mutex()
this.sendUpdate = debounce(this.privateSendUpdate.bind(this), 200)
@ -54,6 +51,9 @@ module.exports = class MetamaskController extends EventEmitter {
// observable state store
this.store = new ObservableStore(initState)
// lock to ensure only one vault created at once
this.createVaultMutex = new Mutex()
// network store
this.networkController = new NetworkController(initState.NetworkController)
@ -474,36 +474,25 @@ module.exports = class MetamaskController extends EventEmitter {
async createNewVaultAndKeychain (password) {
const release = await this.createVaultMutex.acquire()
this.createVaultRequestStart.push(performance.now())
this.createVaultRequestEnd.push(0);
const idx = this.createVaultRequestStart.length - 1;
if(idx === 1) {
await this.sleep(8000)
}
const vault = await this.keyringController.createNewVaultAndKeychain(password)
if(idx === 0) {
//await this.sleep(3000)
}
console.log({
"idx": idx,
"when": "before",
"obj": vault
});
this.selectFirstIdentity(vault)
console.log({
"idx": idx,
"when": "after",
"obj": vault
});
this.createVaultRequestEnd[idx] = performance.now()
console.log(this.createVaultRequestStart)
console.log(this.createVaultRequestEnd)
release()
return vault
}
let vault
sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
try {
const accounts = await this.keyringController.getAccounts()
if (accounts.length > 0) {
vault = await this.keyringController.fullUpdate()
} else {
let vault = await this.keyringController.createNewVaultAndKeychain(password)
this.selectFirstIdentity(vault)
}
release()
} catch (err) {
release()
throw err
}
return vault
}
async createNewVaultAndRestore (password, seed) {