anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix signing when put a wrong password. Fixes #297

Browse source
This commit is contained in:
Gustavo Cortez 2014-05-06 17:57:16 -03:00
commit ab9be793cb
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/models/core/WalletFactory.js
View file

@ -138,8 +138,11 @@ WalletFactory.prototype.open = function(walletId, opts) {
opts.verbose = this.verbose;
this.storage._setPassphrase(opts.passphrase);
var w = this.read(walletId) || this.create(opts);
w.store();
var w = this.read(walletId);
if (w) {
w.store();
}
return w;
};
@ -186,7 +189,8 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
data.opts.privateKey = privateKey;
data.opts.nickname = nickname;
data.opts.passphrase = passphrase;
var w = self.open(data.walletId, data.opts);
data.opts.id = data.walletId;
var w = self.create(data.opts);
w.firstCopayerId = s.pubKey;
return cb(null, w);
}