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

Merge pull request #2263 from isocolsky/fix/import_wallet

Browse source 
Fix/import wallet
This commit is contained in:
Matias Alejo Garcia 2015-01-05 11:06:08 -03:00
commit 69dbf89847
2 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gruntfile.js
View file

@ -53,7 +53,7 @@ module.exports = function(grunt) {
'!js/copayBundle.js',
'!js/copayMain.js'
],
tasks: ['shell:dev']
tasks: ['exec:dev']
},
css: {
files: ['css/src/*.css'],

50
js/models/Identity.js
View file

@ -468,26 +468,42 @@ Identity.prototype.close = function() {
Identity.prototype.importWalletFromObj = function(obj, opts, cb) {
var self = this;
preconditions.checkArgument(cb);
var importFunction = opts.importWallet || Wallet.fromUntrustedObj;
var readOpts = {
networkOpts: this.networkOpts,
blockchainOpts: this.blockchainOpts,
skipFields: opts.skipFields,
};
self.verifyChecksum(function(err, match) {
if (err) return cb(err);
if (!match) return cb('The profile is out of sync. Please re-login to get the latest changes.');
var w = importFunction(obj, readOpts);
if (!w) return cb(new Error('Could not decrypt'));
log.debug('Wallet decrypted:' + w.getName());
var importFunction = opts.importWallet || Wallet.fromUntrustedObj;
self._checkVersion(w.version);
log.debug('Updating Indexes for wallet:' + w.getName());
w.updateIndexes(function(err) {
log.debug('Adding wallet to profile:' + w.getName());
self.addWallet(w);
self.updateFocusedTimestamp(w.getId());
self.bindWallet(w);
self.storeWallet(w, cb);
var readOpts = {
networkOpts: self.networkOpts,
blockchainOpts: self.blockchainOpts,
skipFields: opts.skipFields,
};
var w = importFunction(obj, readOpts);
if (!w) return cb(new Error('Could not decrypt'));
log.debug('Wallet decrypted:' + w.getName());
self._checkVersion(w.version);
log.debug('Updating Indexes for wallet:' + w.getName());
w.updateIndexes(function(err) {
log.debug('Adding wallet to profile:' + w.getName());
self.storeWallet(w, function (err) {
if (err) return cb(err);
self.addWallet(w);
self.updateFocusedTimestamp(w.getId());
self.bindWallet(w);
self.backupNeeded = true;
self.store({
noWallets: true,
}, function(err) {
return cb(err);
});
});
});
});
};