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

remove storage from Identity

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-10-24 08:37:40 -03:00
commit a40a1bc261
4 changed files with 111 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config.js
View file

@ -3,7 +3,7 @@ var defaultConfig = {
defaultLanguage: 'en', defaultLanguage: 'en',
// DEFAULT network (livenet or testnet) // DEFAULT network (livenet or testnet)
networkName: 'livenet', networkName: 'livenet',
logLevel: 'info', logLevel: 'debug',
// wallet limits // wallet limits

68
js/models/Identity.js
View file

@ -43,8 +43,7 @@ function Identity(password, opts) {
this.walletDefaults = opts.walletDefaults || {}; this.walletDefaults = opts.walletDefaults || {};
this.version = opts.version || version; this.version = opts.version || version;
// open wallets this.wallets = {};
this.openWallets = [];
}; };
@ -251,6 +250,24 @@ Identity.isAvailable = function(email, opts, cb) {
}; };
Identity.prototype.storeWallet = function(w, cb) {
preconditions.checkArgument(w && _.isObject(w));
var id = w.getId();
var val = w.toObj();
var key = Wallet.getStorageKey(id + '_' + w.getName());
this.storage.set(key, val, function(err) {
log.debug('Wallet:' + w.getName() + ' stored');
if (cb)
cb(err);
});
};
/** /**
* store * store
* *
@ -265,12 +282,12 @@ Identity.prototype.store = function(opts, cb) {
self.profile.store(opts, function(err) { self.profile.store(opts, function(err) {
if (err) return cb(err); if (err) return cb(err);
var l = self.openWallets.length, var l = Object.keys(self.wallets),
i = 0; i = 0;
if (!l) return cb(); if (!l) return cb();
_.each(self.openWallets, function(w) { _.each(self.wallets, function(w) {
w.store(function(err) { self.storeWallet(w, function(err) {
if (err) return cb(err); if (err) return cb(err);
if (++i == l) if (++i == l)
@ -291,14 +308,14 @@ Identity.prototype._cleanUp = function() {
Identity.prototype.close = function(cb) { Identity.prototype.close = function(cb) {
preconditions.checkState(this.profile); preconditions.checkState(this.profile);
var l = this.openWallets.length, var l = Object.keys(this.wallets),
i = 0; i = 0;
if (!l) { if (!l) {
return cb ? cb() : null; return cb ? cb() : null;
} }
var self = this; var self = this;
_.each(this.openWallets, function(w) { _.each(this.wallets, function(w) {
w.close(function(err) { w.close(function(err) {
if (err) return cb(err); if (err) return cb(err);
@ -337,7 +354,7 @@ Identity.prototype.importWallet = function(base64, password, skipFields, cb) {
this._checkVersion(w.version); this._checkVersion(w.version);
this.addWallet(w, function(err) { this.addWallet(w, function(err) {
if (err) return cb(err, null); if (err) return cb(err, null);
self.openWallets.push(w); self.wallets[w.getId()] = w;
self.store(null, function(err) { self.store(null, function(err) {
return cb(err, w); return cb(err, w);
}); });
@ -350,9 +367,7 @@ Identity.prototype.closeWallet = function(wid, cb) {
var self = this; var self = this;
w.close(function(err) { w.close(function(err) {
self.openWallets = _.without(self.openWallets, function(id) { delete self.wallets[wid];
id === wid
});
return cb(err); return cb(err);
}); });
}; };
@ -367,7 +382,7 @@ Identity.importFromJson = function(str, password, opts, cb) {
} }
if (!_.isNumber(json.iterations)) if (!_.isNumber(json.iterations))
return cb('BADSTR: Missing iterations'); return cb('BADSTR: Missing iterations');
if (!json.profile) if (!json.profile)
return cb('BADSTR: Missing profile'); return cb('BADSTR: Missing profile');
@ -414,7 +429,7 @@ Identity.prototype.exportAsJson = function() {
ret.profile = this.profile.export(); ret.profile = this.profile.export();
ret.wallets = {}; ret.wallets = {};
_.each(this.openWallets, function(w) { _.each(this.wallets, function(w) {
ret.wallets[w.getId()] = w.export(); ret.wallets[w.getId()] = w.export();
}); });
@ -422,6 +437,18 @@ Identity.prototype.exportAsJson = function() {
return r; return r;
}; };
Identity.prototype.bindWallet = function(w) {
var self = this;
self.wallets[w.getId()] = w;
log.debug('Binding wallet ' + w.getName());
w.on('hasChange', function() {
log.debug('<hasChange> Wallet' + w.getName());
self.storeWallet(w);
});
};
/** /**
* @desc This method prepares options for a new Wallet * @desc This method prepares options for a new Wallet
* *
@ -499,7 +526,7 @@ Identity.prototype.createWallet = function(opts, cb) {
var w = Identity._newWallet(opts); var w = Identity._newWallet(opts);
this.addWallet(w, function(err) { this.addWallet(w, function(err) {
if (err) return cb(err); if (err) return cb(err);
self.openWallets.push(w); self.bindWallet(w);
if (self.pluginManager.get && self.pluginManager.get('remote-backup')) { if (self.pluginManager.get && self.pluginManager.get('remote-backup')) {
self.pluginManager.get('remote-backup').store(self, self.insightSaveOpts, _.noop); self.pluginManager.get('remote-backup').store(self, self.insightSaveOpts, _.noop);
} }
@ -521,7 +548,9 @@ Identity.prototype.addWallet = function(wallet, cb) {
name: wallet.name name: wallet.name
}, function(err) { }, function(err) {
if (err) return cb(err); if (err) return cb(err);
cb(); self.storeWallet(wallet, function(err) {
return cb(err);
});
}); });
}; };
@ -569,9 +598,8 @@ Identity.prototype.openWallet = function(walletId, cb) {
blockchainOpts: this.blockchainOpts blockchainOpts: this.blockchainOpts
}, function(err, w) { }, function(err, w) {
if (err) return cb(err); if (err) return cb(err);
self.openWallets.push(w); self.bindWallet(w);
self.storeWallet(w, function(err) {
w.store(function(err) {
w.netStart(); w.netStart();
return cb(err, w); return cb(err, w);
}); });
@ -581,9 +609,7 @@ Identity.prototype.openWallet = function(walletId, cb) {
Identity.prototype.getOpenWallet = function(id) { Identity.prototype.getOpenWallet = function(id) {
return _.findWhere(this.openWallets, { return this.wallets[id];
id: id,
});
}; };

6
js/models/Passphrase.js
View file

@ -2,10 +2,16 @@
// 65.7% typed (by google's closure-compiler account) // 65.7% typed (by google's closure-compiler account)
// this line throws a warning on Chrome Desktop
var sjcl = require('../../lib/sjcl'); var sjcl = require('../../lib/sjcl');
console.log('[Passphrase.js.8]'); //TODO
var preconditions = require('preconditions').instance(); var preconditions = require('preconditions').instance();
var _ = require('underscore'); var _ = require('underscore');
/** /**
* @desc * @desc
* Class for a Passphrase object, uses PBKDF2 to expand a password * Class for a Passphrase object, uses PBKDF2 to expand a password

120
js/models/Wallet.js
View file

@ -120,6 +120,12 @@ function Wallet(opts) {
inherits(Wallet, events.EventEmitter); inherits(Wallet, events.EventEmitter);
Wallet.prototype.emitAndKeepAlive = function(args) {
log.debug('Wallet Emitting:',arguments);
this.keepAlive();
this.emit.apply(this,arguments);
};
/** /**
* @TODO: Document this. Its usage is kind of weird * @TODO: Document this. Its usage is kind of weird
* *
@ -169,13 +175,13 @@ Wallet.COPAYER_PAIR_LIMITS = {
Wallet.key = function(str) { Wallet.getStorageKey = function(str) {
return 'wallet::' + str; return 'wallet::' + str;
}; };
Wallet.any = function(storage, cb) { Wallet.any = function(storage, cb) {
storage.getFirst(Wallet.key(''), { onlyKey: true}, function(err, v, k) { storage.getFirst(Wallet.getStorageKey(''), { onlyKey: true}, function(err, v, k) {
return cb(k ? true : false); return cb(k ? true : false);
}); });
}; };
@ -230,7 +236,7 @@ Wallet.getMaxRequiredCopayers = function(totalCopayers) {
*/ */
Wallet.delete = function(walletId, storage, cb) { Wallet.delete = function(walletId, storage, cb) {
preconditions.checkArgument(cb); preconditions.checkArgument(cb);
storage.deletePrefix(Wallet.key(walletId), function(err) { storage.deletePrefix(Wallet.getStorageKey(walletId), function(err) {
if (err && err.message != 'not found') return cb(err); if (err && err.message != 'not found') return cb(err);
storage.deletePrefix(walletId + '::', function(err) { storage.deletePrefix(walletId + '::', function(err) {
if (err && err.message != 'not found') return cb(err); if (err && err.message != 'not found') return cb(err);
@ -259,7 +265,7 @@ Wallet.read = function(walletId, readOpts, cb) {
err; err;
var obj = {}; var obj = {};
storage.getFirst(Wallet.key(walletId), {}, function(err, ret) { storage.getFirst(Wallet.getStorageKey(walletId), {}, function(err, ret) {
if (err) return cb(err); if (err) return cb(err);
if (!ret) if (!ret)
@ -317,7 +323,7 @@ Wallet.prototype._newAddresses = function(dontUpdateUx) {
this.subscribeToAddresses(); this.subscribeToAddresses();
}; };
this.emit('newAddresses', dontUpdateUx); this.emitAndKeepAlive('newAddresses', dontUpdateUx);
}; };
/** /**
@ -337,7 +343,7 @@ Wallet.prototype._onIndexes = function(senderId, data) {
var hasChanged = this.publicKeyRing.mergeIndexes(inIndexes); var hasChanged = this.publicKeyRing.mergeIndexes(inIndexes);
if (hasChanged) { if (hasChanged) {
this._newAddresses(); this._newAddresses();
this.store(); this.emitAndKeepAlive('hasChange');
} }
}; };
@ -354,7 +360,7 @@ Wallet.prototype._onIndexes = function(senderId, data) {
*/ */
Wallet.prototype.changeSettings = function(settings) { Wallet.prototype.changeSettings = function(settings) {
this.settings = settings; this.settings = settings;
this.store(); this.emitAndKeepAlive('hasChange');
}; };
/** /**
@ -387,7 +393,7 @@ Wallet.prototype._onPublicKeyRing = function(senderId, data) {
hasChanged = this.publicKeyRing.merge(inPKR, true); hasChanged = this.publicKeyRing.merge(inPKR, true);
} catch (e) { } catch (e) {
log.debug('Wallet:' + this.id + '## WALLET ERROR', e); log.debug('Wallet:' + this.id + '## WALLET ERROR', e);
this.emit('connectionError', e.message); this.emitAndKeepAlive('connectionError', e.message);
return; return;
} }
if (hasChanged) { if (hasChanged) {
@ -398,7 +404,7 @@ Wallet.prototype._onPublicKeyRing = function(senderId, data) {
this._lockIncomming(); this._lockIncomming();
} }
this._newAddresses(); this._newAddresses();
this.store(); this.emitAndKeepAlive('hasChange');
} }
}; };
@ -431,7 +437,7 @@ Wallet.prototype._processProposalEvents = function(senderId, m) {
}; };
} }
if (ev) if (ev)
this.emit('txProposalEvent', ev); this.emitAndKeepAlive('txProposalEvent', ev);
}; };
@ -538,8 +544,8 @@ Wallet.prototype._onTxProposal = function(senderId, data) {
if (ret) { if (ret) {
if (!m.txp.getSent()) { if (!m.txp.getSent()) {
m.txp.setSent(m.ntxid); m.txp.setSent(m.ntxid);
self.emit('txProposalsUpdated'); self.emitAndKeepAlive('txProposalsUpdated');
self.store(); self.emit('hasChange');
} }
} }
}); });
@ -549,8 +555,8 @@ Wallet.prototype._onTxProposal = function(senderId, data) {
} }
} }
this.emit('txProposalsUpdated'); this.emitAndKeepAlive('txProposalsUpdated');
this.store(); this.emit('hasChange');
} }
this._processProposalEvents(senderId, m); this._processProposalEvents(senderId, m);
}; };
@ -578,7 +584,7 @@ Wallet.prototype._onReject = function(senderId, data) {
throw new Error('Received Reject for an already signed TX from:' + senderId); throw new Error('Received Reject for an already signed TX from:' + senderId);
txp.setRejected(senderId); txp.setRejected(senderId);
this.store(); this.emitAndKeepAlive('hasChange');
this.emit('txProposalsUpdated'); this.emit('txProposalsUpdated');
this.emit('txProposalEvent', { this.emit('txProposalEvent', {
@ -604,7 +610,7 @@ Wallet.prototype._onSeen = function(senderId, data) {
var txp = this.txProposals.get(data.ntxid); var txp = this.txProposals.get(data.ntxid);
txp.setSeen(senderId); txp.setSeen(senderId);
this.store(); this.emitAndKeepAlive('hasChange');
this.emit('txProposalsUpdated'); this.emit('txProposalsUpdated');
this.emit('txProposalEvent', { this.emit('txProposalEvent', {
type: 'seen', type: 'seen',
@ -641,8 +647,8 @@ Wallet.prototype._onAddressBook = function(senderId, data) {
} }
} }
if (hasChange) { if (hasChange) {
this.emit('addressBookUpdated'); this.emitAndKeepAlive('addressBookUpdated');
this.store(); this.emit('hasChange');
} }
}; };
@ -688,7 +694,7 @@ Wallet.prototype._onData = function(senderId, data, ts) {
if (data.type !== 'walletId' && this.id !== data.walletId) { if (data.type !== 'walletId' && this.id !== data.walletId) {
log.debug('Wallet:' + this.id + ' Received corrupt message:', data) log.debug('Wallet:' + this.id + ' Received corrupt message:', data)
this.emit('corrupt', senderId); this.emitAndKeepAlive('corrupt', senderId);
return; return;
} }
@ -747,7 +753,7 @@ Wallet.prototype._onConnect = function(newCopayerId) {
} }
var peerID = this.network.peerFromCopayer(newCopayerId); var peerID = this.network.peerFromCopayer(newCopayerId);
this.emit('connect', peerID); this.emitAndKeepAlive('connect', peerID);
}; };
/** /**
@ -884,12 +890,12 @@ Wallet.prototype._setBlockchainListeners = function() {
log.debug('Setting Blockchain listeners for', this.getId()); log.debug('Setting Blockchain listeners for', this.getId());
self.blockchain.on('reconnect', function(attempts) { self.blockchain.on('reconnect', function(attempts) {
log.debug('Wallet:' + self.id + 'blockchain reconnect event'); log.debug('Wallet:' + self.id + 'blockchain reconnect event');
self.emit('insightReconnected'); self.emitAndKeepAlive('insightReconnected');
}); });
self.blockchain.on('disconnect', function() { self.blockchain.on('disconnect', function() {
log.debug('Wallet:' + self.id + 'blockchain disconnect event'); log.debug('Wallet:' + self.id + 'blockchain disconnect event');
self.emit('insightError'); self.emitAndKeepAlive('insightError');
}); });
self.blockchain.on('tx', function(tx) { self.blockchain.on('tx', function(tx) {
log.debug('Wallet:' + self.id + ' blockchain tx event'); log.debug('Wallet:' + self.id + ' blockchain tx event');
@ -898,12 +904,12 @@ Wallet.prototype._setBlockchainListeners = function() {
addressStr: tx.address addressStr: tx.address
}); });
if (addr) { if (addr) {
self.emit('tx', tx.address, addr.isChange); self.emitAndKeepAlive('tx', tx.address, addr.isChange);
} }
}); });
if (!self.spendUnconfirmed) { if (!self.spendUnconfirmed) {
self.blockchain.on('block', self.emit.bind(self, 'balanceUpdated')); self.blockchain.on('block', self.emitAndKeepAlive.bind(self, 'balanceUpdated'));
} }
} }
@ -928,7 +934,7 @@ Wallet.prototype.netStart = function() {
net.on('data', self._onData.bind(self)); net.on('data', self._onData.bind(self));
net.on('no messages', self._onNoMessages.bind(self)); net.on('no messages', self._onNoMessages.bind(self));
net.on('connect_error', function() { net.on('connect_error', function() {
self.emit('connectionError'); self.emitAndKeepAlive('connectionError');
}); });
if (this.publicKeyRing.isComplete()) { if (this.publicKeyRing.isComplete()) {
@ -939,7 +945,7 @@ Wallet.prototype.netStart = function() {
if (net.started) { if (net.started) {
log.debug('Wallet:' + self.id + ' Wallet networking was ready') log.debug('Wallet:' + self.id + ' Wallet networking was ready')
self.emit('ready', net.getPeer()); self.emitAndKeepAlive('ready', net.getPeer());
return; return;
} }
@ -961,11 +967,11 @@ Wallet.prototype.netStart = function() {
net.start(startOpts, function() { net.start(startOpts, function() {
log.debug('Wallet:' + self.id + ' Networking ready:', net.copayerId); log.debug('Wallet:' + self.id + ' Networking ready:', net.copayerId);
self._setBlockchainListeners(); self._setBlockchainListeners();
self.emit('ready', net.getPeer()); self.emitAndKeepAlive('ready', net.getPeer());
setTimeout(function() { setTimeout(function() {
self._newAddresses(true); self._newAddresses(true);
// no connection logic for now // no connection logic for now
self.emit('txProposalsUpdated'); self.emitAndKeepAlive('txProposalsUpdated');
}, 0); }, 0);
}); });
}; };
@ -1021,27 +1027,11 @@ Wallet.prototype.keepAlive = function() {
this.lock.keepAlive(function(err) { this.lock.keepAlive(function(err) {
if (err) { if (err) {
log.debug(err); log.debug(err);
self.emit('locked', null, 'Wallet appears to be openned on other browser instance. Closing this one.'); self.emitAndKeepAlive('locked', null, 'Wallet appears to be openned on other browser instance. Closing this one.');
} }
}); });
}; };
/**
* @desc Store the wallet's state
* @param {function} callback (err)
*/
Wallet.prototype.store = function(cb) {
var self = this;
this.keepAlive();
var val = this.toObj();
var key = Wallet.key(this.id + ((val.opts && val.opts.name) ? '_' + val.opts.name : ''));
this.storage.set(key, val, function(err) {
log.debug('Wallet:' + self.id + ' stored');
if (cb)
cb(err);
});
};
Wallet.prototype.getId = function() { Wallet.prototype.getId = function() {
@ -1342,7 +1332,7 @@ Wallet.prototype._doGenerateAddress = function(isChange) {
Wallet.prototype.generateAddress = function(isChange, cb) { Wallet.prototype.generateAddress = function(isChange, cb) {
var addr = this._doGenerateAddress(isChange); var addr = this._doGenerateAddress(isChange);
this.sendIndexes(); this.sendIndexes();
this.store(); this.emitAndKeepAlive('hasChange');
if (cb) return cb(addr); if (cb) return cb(addr);
return addr; return addr;
}; };
@ -1383,7 +1373,7 @@ Wallet.prototype.purgeTxProposals = function(deleteAll) {
} else { } else {
this.txProposals.deletePending(this.maxRejectCount()); this.txProposals.deletePending(this.maxRejectCount());
} }
this.store(); this.emitAndKeepAlive('hasChange');
var n = this.txProposals.length(); var n = this.txProposals.length();
return m - n; return m - n;
@ -1397,7 +1387,7 @@ Wallet.prototype.purgeTxProposals = function(deleteAll) {
Wallet.prototype.reject = function(ntxid) { Wallet.prototype.reject = function(ntxid) {
var txp = this.txProposals.reject(ntxid, this.getMyCopayerId()); var txp = this.txProposals.reject(ntxid, this.getMyCopayerId());
this.sendReject(ntxid); this.sendReject(ntxid);
this.store(); this.emitAndKeepAlive('hasChange');
this.emit('txProposalsUpdated'); this.emit('txProposalsUpdated');
}; };
@ -1439,7 +1429,7 @@ Wallet.prototype.sign = function(ntxid, cb) {
if (txp.countSignatures() > before) { if (txp.countSignatures() > before) {
txp.signedBy[myId] = Date.now(); txp.signedBy[myId] = Date.now();
self.sendTxProposal(ntxid); self.sendTxProposal(ntxid);
self.store(); self.emitAndKeepAlive('hasChange');
self.emit('txProposalsUpdated'); self.emit('txProposalsUpdated');
ret = true; ret = true;
} }
@ -1478,13 +1468,13 @@ Wallet.prototype.sendTx = function(ntxid, cb) {
if (txid) { if (txid) {
self.txProposals.get(ntxid).setSent(txid); self.txProposals.get(ntxid).setSent(txid);
self.sendTxProposal(ntxid); self.sendTxProposal(ntxid);
self.store(); self.emitAndKeepAlive('hasChange');
return cb(txid); return cb(txid);
} else { } else {
log.debug('Wallet:' + self.id + ' Sent failed. Checking if the TX was sent already'); log.debug('Wallet:' + self.id + ' Sent failed. Checking if the TX was sent already');
self._checkSentTx(ntxid, function(txid) { self._checkSentTx(ntxid, function(txid) {
if (txid) if (txid)
self.store(); self.emitAndKeepAlive('hasChange');
return cb(txid); return cb(txid);
}); });
@ -1694,7 +1684,7 @@ Wallet.prototype.receivePaymentRequest = function(options, pr, cb) {
if (ntxid) { if (ntxid) {
self.sendIndexes(); self.sendIndexes();
self.sendTxProposal(ntxid); self.sendTxProposal(ntxid);
self.store(); self.emitAndKeepAlive('hasChange');
self.emit('txProposalsUpdated'); self.emit('txProposalsUpdated');
} }
@ -1827,7 +1817,8 @@ Wallet.prototype.sendPaymentTx = function(ntxid, options, cb) {
log.debug('XHR status: ' + status); log.debug('XHR status: ' + status);
return self._checkSentTx(ntxid, function(txid) { return self._checkSentTx(ntxid, function(txid) {
log.debug('[Wallet.js.1581:txid:%s]', txid); log.debug('[Wallet.js.1581:txid:%s]', txid);
if (txid) self.store(); if (txid)
self.emitAndKeepAlive('hasChange');
return cb(txid, txp.merchant); return cb(txid, txp.merchant);
}); });
}); });
@ -1859,7 +1850,8 @@ Wallet.prototype.receivePaymentRequestACK = function(ntxid, tx, txp, ack, cb) {
log.debug('Sending to server was not met with a returned tx.'); log.debug('Sending to server was not met with a returned tx.');
return this._checkSentTx(ntxid, function(txid) { return this._checkSentTx(ntxid, function(txid) {
log.debug('[Wallet.js.1613:txid:%s]', txid); log.debug('[Wallet.js.1613:txid:%s]', txid);
if (txid) self.store(); if (txid)
self.emitAndKeepAlive('hasChange');
return cb(txid, txp.merchant); return cb(txid, txp.merchant);
}); });
} }
@ -1886,13 +1878,13 @@ Wallet.prototype.receivePaymentRequestACK = function(ntxid, tx, txp, ack, cb) {
if (txid) { if (txid) {
self.txProposals.get(ntxid).setSent(txid); self.txProposals.get(ntxid).setSent(txid);
self.sendTxProposal(ntxid); self.sendTxProposal(ntxid);
self.store(); self.emitAndKeepAlive('hasChange');
return cb(txid, txp.merchant); return cb(txid, txp.merchant);
} else { } else {
log.debug('Sent failed. Checking if the TX was sent already'); log.debug('Sent failed. Checking if the TX was sent already');
self._checkSentTx(ntxid, function(txid) { self._checkSentTx(ntxid, function(txid) {
if (txid) if (txid)
self.store(); self.emitAndKeepAlive('hasChange');
return cb(txid, txp.merchant); return cb(txid, txp.merchant);
}); });
@ -2377,8 +2369,8 @@ Wallet.prototype.removeTxWithSpentInputs = function(cb) {
}); });
if (proposalsChanged) { if (proposalsChanged) {
self.emit('txProposalsUpdated'); self.emitAndKeepAlive('txProposalsUpdated');
self.store(); self.emit('hasChange');
} }
return cb(); return cb();
@ -2413,7 +2405,7 @@ Wallet.prototype.createTx = function(toAddress, amountSatStr, comment, opts, cb)
self.sendIndexes(); self.sendIndexes();
self.sendTxProposal(ntxid); self.sendTxProposal(ntxid);
self.store(); self.emitAndKeepAlive('hasChange');
self.emit('txProposalsUpdated'); self.emit('txProposalsUpdated');
return cb(null, ntxid); return cb(null, ntxid);
}); });
@ -2512,7 +2504,7 @@ Wallet.prototype.updateIndexes = function(callback) {
if (err) callback(err); if (err) callback(err);
log.debug('Wallet:' + self.id + ' Indexes updated'); log.debug('Wallet:' + self.id + ' Indexes updated');
self._newAddresses(); self._newAddresses();
self.store(); self.emitAndKeepAlive('hasChange');
callback(); callback();
}); });
}; };
@ -2669,7 +2661,7 @@ Wallet.prototype.setAddressBook = function(key, label) {
}; };
this.addressBook[key] = newEntry; this.addressBook[key] = newEntry;
this.sendAddressBook(); this.sendAddressBook();
this.store(); this.emitAndKeepAlive('hasChange');
}; };
/** /**
@ -2699,7 +2691,7 @@ Wallet.prototype.verifyAddressbookEntry = function(rcvEntry, senderId, key) {
Wallet.prototype.toggleAddressBookEntry = function(key) { Wallet.prototype.toggleAddressBookEntry = function(key) {
if (!key) throw new Error('Key is required'); if (!key) throw new Error('Key is required');
this.addressBook[key].hidden = !this.addressBook[key].hidden; this.addressBook[key].hidden = !this.addressBook[key].hidden;
this.store(); this.emitAndKeepAlive('hasChange');
}; };
/** /**
@ -2736,7 +2728,7 @@ Wallet.prototype.setBackupReady = function(forcedLogin) {
this.forcedLogin = forcedLogin; this.forcedLogin = forcedLogin;
this.publicKeyRing.setBackupReady(); this.publicKeyRing.setBackupReady();
this.sendPublicKeyRing(); this.sendPublicKeyRing();
this.store(); this.emitAndKeepAlive('hasChange');
}; };
/** /**
@ -2867,6 +2859,8 @@ Wallet.prototype.migrateWallet = function(walletId, passphrase, cb) {
self.read_Old(walletId, null, function(err, wallet) { self.read_Old(walletId, null, function(err, wallet) {
if (err) return cb(err); if (err) return cb(err);
// TODO
TODO(fix_this);
wallet.store(function(err) { wallet.store(function(err) {
if (err) return cb(err); if (err) return cb(err);