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

WIP: better lock

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-08-14 18:46:42 -04:00
commit bcb61810d5
7 changed files with 121 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,7 @@ WalletFactory.prototype.create = function(opts) {
var requiredCopayers = opts.requiredCopayers || this.walletDefaults.requiredCopayers;
var totalCopayers = opts.totalCopayers || this.walletDefaults.totalCopayers;
opts.lockTimeoutMin = this.walletDefaults.idleDurationMin;
opts.publicKeyRing = opts.publicKeyRing || new PublicKeyRing({
networkName: this.networkName,
@ -137,6 +138,7 @@ WalletFactory.prototype.create = function(opts) {
opts.requiredCopayers = requiredCopayers;
opts.totalCopayers = totalCopayers;
opts.version = opts.version || this.version;
var w = new Wallet(opts);
w.store();
this.storage.setLastOpened(w.id);
@ -166,16 +168,11 @@ WalletFactory.prototype._checkNetwork = function(inNetworkName) {
}
};
WalletFactory.prototype.open = function(walletId, opts) {
opts = opts || {};
opts.id = walletId;
opts.verbose = this.verbose;
this.storage._setPassphrase(opts.passphrase);
var w = this.read(walletId);
if (w) {
WalletFactory.prototype.open = function(walletId, passphrase) {
this.storage._setPassphrase(passphrase);
var w = this.read(walletId, opts);
if (w)
w.store();
}
this.storage.setLastOpened(walletId);
return w;