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

rm force

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-01-05 14:48:50 -03:00
commit 0963d9133b
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/models/Wallet.js
View file

@ -725,7 +725,7 @@ Wallet.prototype._onData = function(senderId, data, ts) {
this.sendWalletReady(senderId); this.sendWalletReady(senderId);
break; break;
case 'walletReady': case 'walletReady':
if (this.lastMessageFrom[senderId] !== 'walletReady' || data.force) { if (this.lastMessageFrom[senderId] !== 'walletReady') {
log.debug('Wallet:' + this.id + ' peer Sync received. since: ' + (data.sinceTs || 0)); log.debug('Wallet:' + this.id + ' peer Sync received. since: ' + (data.sinceTs || 0));
this.sendPublicKeyRing(senderId); this.sendPublicKeyRing(senderId);
this.sendAddressBook(senderId); this.sendAddressBook(senderId);
@ -990,10 +990,10 @@ Wallet.prototype.netStart = function() {
this._lockIncomming(this.publicKeyRing.getAllCopayerIds()); this._lockIncomming(this.publicKeyRing.getAllCopayerIds());
} else { } else {
//Partially complete wallet. //Partially complete wallet.
if (this.publicKeyRing.getAllCopayerIds() > 1) { if (this.publicKeyRing.getAllCopayerIds().length > 1) {
this.network.setCopayers(this.publicKeyRing.getAllCopayerIds()); this.network.setCopayers(this.publicKeyRing.getAllCopayerIds());
log.debug('Incomplete wallet opened:' + this.getName() + '. forced peer sync from 0'); log.debug('Incomplete wallet opened:' + this.getName() + '. forced peer sync from 0');
this.sendWalletReady(null, 0, true); this.sendWalletReady(null, 0);
} }
} }
@ -1303,12 +1303,11 @@ Wallet.prototype.sendSignature = function(ntxid) {
* @desc Notify other peers that a wallet has been backed up and it's ready to be used * @desc Notify other peers that a wallet has been backed up and it's ready to be used
* @param {string[]} [recipients] - the pubkeys of the recipients * @param {string[]} [recipients] - the pubkeys of the recipients
*/ */
Wallet.prototype.sendWalletReady = function(recipients, sinceTs, force) { Wallet.prototype.sendWalletReady = function(recipients, sinceTs) {
this._sendToPeers(recipients, { this._sendToPeers(recipients, {
type: 'walletReady', type: 'walletReady',
walletId: this.id, walletId: this.id,
sinceTs: sinceTs, sinceTs: sinceTs
force: force,
}); });
}; };