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

fixed passphrase setting when a existent wallet is opened

Browse source
This commit is contained in:
Mario Colque 2014-05-01 16:21:53 -03:00
commit 4617a24bbe
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,13 +68,12 @@ WalletFactory.prototype.fromObj = function(obj) {
return w; return w;
}; };
WalletFactory.prototype.read = function(walletId, passphrase) { WalletFactory.prototype.read = function(walletId) {
if (! this._checkRead(walletId)) if (! this._checkRead(walletId))
return false; return false;
var obj = {}; var obj = {};
var s = this.storage; var s = this.storage;
s._setPassphrase(passphrase);
obj.id = walletId; obj.id = walletId;
obj.opts = s.get(walletId, 'opts'); obj.opts = s.get(walletId, 'opts');
@ -128,12 +127,15 @@ WalletFactory.prototype.create = function(opts) {
}; };
WalletFactory.prototype.open = function(walletId, opts) { WalletFactory.prototype.open = function(walletId, opts) {
this.log('Opening walletId:' + walletId);
opts = opts || {}; opts = opts || {};
opts.id = walletId; opts.id = walletId;
opts.verbose = this.verbose; opts.verbose = this.verbose;
var w = this.read(walletId, opts.passphrase) || this.create(opts);
this.storage._setPassphrase(opts.passphrase);
var w = this.read(walletId) || this.create(opts);
w.store(); w.store();
return w; return w;
}; };