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

Fix Conflicts:

Browse source 
js/models/core/Wallet.js
This commit is contained in:
Gustavo Cortez 2014-06-19 16:43:34 -03:00
commit 47dcc12910
19 changed files with 557 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,16 @@ WalletFactory.prototype.fromEncryptedObj = function(base64, password) {
return w;
};
WalletFactory.prototype.import = function(base64, password, cb) {
var self = this;
var w = self.fromEncryptedObj(base64, password);
w.updateIndexes(function(err) {
if (err) return cb(err);
self.log('Indexes updated');
cb(null, w);
});
}
WalletFactory.prototype.read = function(walletId) {
if (!this._checkRead(walletId))
return false;