Merge pull request #1645 from matiu/bug/sycing

Bug/sycing

js/models/Async.js

@@ -204,6 +204,11 @@ Network.prototype._onMessage = function(enc) {
   }
   log.debug('Async: receiving ' + JSON.stringify(payload));
 
+  if (this.ignoreMessageFromTs && this.ignoreMessageFromTs === enc.ts) {
+    log.debug('Ignoring message from ', enc.ts);
+    return;
+  }
+
   var self = this;
   switch (payload.type) {
     case 'hello':
@@ -247,7 +252,15 @@ Network.prototype._setupConnectionHandlers = function(opts, cb) {
   });
 
   self.socket.on('subscribed', function(m) {
-    var fromTs = (opts.lastTimestamp || 0) + 1;
+    var fromTs = opts.syncedTimestamp || 0;
+
+    // We ask for this message, and then ignore it, only to see if the
+    // server has erased our old messages.
+    
+    if (fromTs) {
+      self.ignoreMessageFromTs = fromTs;
+    }
+    log.info('Async: synchronizing from: ',fromTs);
     self.socket.emit('sync', fromTs);
     self.started = true;
   });

js/models/Identity.js

@@ -182,13 +182,6 @@ Identity.prototype.retrieveWalletFromStorage = function(walletId, opts, callback
   });
 };
 
-/**
- * TODO (matiu): What is this supposed to do?
- */
-Identity.isAvailable = function(email, opts, cb) {
-  return cb();
-};
-
 /**
  * @param {Wallet} wallet
  * @param {Function} cb
@@ -198,16 +191,29 @@ Identity.prototype.storeWallet = function(wallet, cb) {
 
   var val = wallet.toObj();
   var key = wallet.getStorageKey();
+  log.debug('Storing wallet:' + wallet.getName());
 
   this.storage.setItem(key, val, function(err) {
     if (err) {
-      log.debug('Wallet:' + wallet.getName() + ' couldnt be stored');
+      log.debug('Wallet:' + wallet.getName() + ' couldnt be stored:', err);
     }
     if (cb)
       return cb(err);
   });
 };
 
+
+/**
+ * @param {Identity} identity
+ * @param {Wallet} wallet
+ * @param {Function} cb
+ */
+Identity.storeWalletDebounced = _.debounce(function(identity, wallet, cb) {
+  identity.storeWallet(wallet,cb);
+}, 3000);
+
+
+
 Identity.prototype.toObj = function() {
   return _.extend({
       walletIds: _.keys(this.wallets)
@@ -373,36 +379,29 @@ Identity.prototype.bindWallet = function(w) {
   log.debug('Binding wallet ' + w.getName());
 
   w.on('txProposalsUpdated', function() {
-    log.debug('<txProposalsUpdated>> Wallet' + w.getName());
+    Identity.storeWalletDebounced(self, w);
-    self.storeWallet(w);
   });
   w.on('newAddresses', function() {
-    log.debug('<newAddresses> Wallet' + w.getName());
+    Identity.storeWalletDebounced(self, w);
-    self.storeWallet(w);
   });
   w.on('settingsUpdated', function() {
-    log.debug('<newAddresses> Wallet' + w.getName());
+    Identity.storeWalletDebounced(self, w);
-    self.storeWallet(w);
   });
   w.on('txProposalEvent', function() {
-    log.debug('<txProposalEvent> Wallet' + w.getName());
+    Identity.storeWalletDebounced(self, w);
-    self.storeWallet(w);
   });
   w.on('ready', function() {
-    log.debug('<ready> Wallet' + w.getName());
     self.store({
       noWallets: true
     }, function() {
-      self.storeWallet(w);
+      Identity.storeWalletDebounced(self, w);
     });
   });
   w.on('addressBookUpdated', function() {
-    log.debug('<addressBookUpdated> Wallet' + w.getName());
+    Identity.storeWalletDebounced(self, w);
-    self.storeWallet(w);
   });
   w.on('publicKeyRingUpdated', function() {
-    log.debug('<publicKeyRingUpdated> Wallet' + w.getName());
+    Identity.storeWalletDebounced(self, w);
-    self.storeWallet(w);
   });
 };
 
@@ -566,7 +565,7 @@ Identity.prototype.decodeSecret = function(secret) {
 Identity.prototype.getLastFocusedWallet = function() {
   if (_.keys(this.wallets).length == 0) return;
   return _.max(this.wallets, function(wallet) {
-    return wallet.lastTimestamp || 0;
+    return wallet.focusedTimestamp || 0;
   });
 };
 

js/models/Wallet.js

@@ -92,7 +92,8 @@ function Wallet(opts) {
   this.registeredPeerIds = [];
   this.addressBook = opts.addressBook || {};
   this.publicKey = this.privateKey.publicHex;
-  this.lastTimestamp = opts.lastTimestamp || 0;
+  this.focusedTimestamp = opts.focusedTimestamp || 0;
+  this.syncedTimestamp = opts.syncedTimestamp || 0;
   this.lastMessageFrom = {};
 
   this.paymentRequests = opts.paymentRequests || {};
@@ -147,7 +148,8 @@ Wallet.PERSISTED_PROPERTIES = [
   'txProposals',
   'privateKey',
   'addressBook',
-  'lastTimestamp',
+  'focusedTimestamp',
+  'syncedTimestamp',
   'secretNumber',
 ];
 
@@ -571,24 +573,31 @@ Wallet.prototype._onAddressBook = function(senderId, data) {
  * @desc Updates the wallet's last modified timestamp and triggers a save
  * @param {number} ts - the timestamp
  */
-Wallet.prototype.updateTimestamp = function(ts, callback) {
+Wallet.prototype.updateFocusedTimestamp = function(ts) {
   preconditions.checkArgument(ts);
   preconditions.checkArgument(_.isNumber(ts));
-  this.lastTimestamp = ts;
+  preconditions.checkArgument(ts > 2999999999, 'use miliseconds');
-  // we dont store here
+  this.focusedTimestamp = ts;
-  if (callback) {
-    return callback(null);
-  }
 };
 
+
+Wallet.prototype.updateSyncedTimestamp = function(ts) {
+  preconditions.checkArgument(ts);
+  preconditions.checkArgument(_.isNumber(ts));
+  preconditions.checkArgument(ts > 2999999999999, 'use microseconds');
+  this.syncedTimestamp = ts;
+};
+
+
 /**
  * @desc Called when there are no messages in the server
  * Triggers a call to {@link Wallet#sendWalletReady}
  */
 Wallet.prototype._onNoMessages = function() {
-  log.debug('Wallet:' + this.id + ' No messages at the server. Requesting peer sync from: ' + (this.lastTimestamp + 1));
+  if (!this.isShared()) return;
-  this.sendWalletReady(null, parseInt((this.lastTimestamp + 1) / 1000));
+
-  this.updateTimestamp(parseInt(Date.now() / 1000));
+  log.debug('Wallet:' + this.id + ' No messages at the server. Requesting peer sync from: ' + (this.syncedTimestamp + 1));
+  this.sendWalletReady(null, parseInt((this.syncedTimestamp + 1) / 1000000));
 };
 
 /**
@@ -608,7 +617,8 @@ Wallet.prototype._onData = function(senderId, data, ts) {
   preconditions.checkArgument(_.isNumber(ts));
   log.debug('Wallet:' + this.id + ' RECV', senderId, data);
 
-  this.updateTimestamp(ts);
+
+  this.updateSyncedTimestamp(ts);
 
   if (data.type !== 'walletId' && this.id !== data.walletId) {
     log.debug('Wallet:' + this.id + ' Received corrupt message:', data)
@@ -622,7 +632,6 @@ Wallet.prototype._onData = function(senderId, data, ts) {
       this.sendWalletReady(senderId);
       break;
     case 'walletReady':
-
       if (this.lastMessageFrom[senderId] !== 'walletReady') {
         log.debug('Wallet:' + this.id + ' peer Sync received. since: ' + (data.sinceTs || 0));
         this.sendPublicKeyRing(senderId);
@@ -872,7 +881,7 @@ Wallet.prototype.netStart = function() {
     copayerId: myId,
     privkey: myIdPriv,
     maxPeers: self.totalCopayers,
-    lastTimestamp: this.lastTimestamp || 0,
+    syncedTimestamp: this.syncedTimestamp || 0,
     secretNumber: self.secretNumber,
   };
 
@@ -967,7 +976,8 @@ Wallet.prototype.toObj = function() {
     txProposals: this.txProposals.toObj(),
     privateKey: this.privateKey ? this.privateKey.toObj() : undefined,
     addressBook: this.addressBook,
-    lastTimestamp: this.lastTimestamp || 0,
+    syncedTimestamp: this.syncedTimestamp || 0,
+    focusedTimestamp: this.focusedTimestamp || 0,
     secretNumber: this.secretNumber,
   };
 
@@ -993,7 +1003,8 @@ Wallet.fromUntrustedObj = function(obj, readOpts) {
  * @param {Object} o.privateKey - Private key to be deserialized by {@link PrivateKey#fromObj}
  * @param {string} o.networkName - 'livenet' or 'testnet'
  * @param {Object} o.publicKeyRing - PublicKeyRing to be deserialized by {@link PublicKeyRing#fromObj}
- * @param {number} o.lastTimestamp - last time this wallet object was deserialized
+ * @param {number} o.syncedTimestamp - ts of the last synced message with insifht (in microseconds, as insight returns ts)
+ * @param {number} o.focusedTimestamp - last time this wallet was focused (open) by a user (in miliseconds)
  * @param {Object} o.txProposals - TxProposals to be deserialized by {@link TxProposals#fromObj}
  * @param {string} o.nickname - user's nickname
  *
@@ -1065,7 +1076,8 @@ Wallet.fromObj = function(o, readOpts) {
     });
   }
 
-  opts.lastTimestamp = o.lastTimestamp || 0;
+  opts.syncedTimestamp = o.syncedTimestamp || 0;
+  opts.focusedTimestamp = o.focusedTimestamp || 0;
 
   opts.blockchainOpts = readOpts.blockchainOpts;
   opts.networkOpts = readOpts.networkOpts;
@@ -1073,6 +1085,7 @@ Wallet.fromObj = function(o, readOpts) {
   return new Wallet(opts);
 };
 
+
 /**
  * @desc Send a message to other peers
  * @param {string[]} recipients - the pubkey of the recipients of the message

js/services/controllerUtils.js

@@ -205,15 +205,15 @@ angular.module('copayApp.services')
     root.setFocusedWallet = function(w) {
       if (!_.isObject(w))
         w = $rootScope.iden.getWalletById(w);
+
       preconditions.checkState(w && _.isObject(w));
 
       $rootScope.wallet = w;
-      w.updateTimestamp(new Date().getTime(), function() {
+      w.updateFocusedTimestamp(Date.now());
-        root.redirIfLogged();
+      root.redirIfLogged();
-        root.updateBalance(w, function() {
+      root.updateBalance(w, function() {
-          $rootScope.$digest();
+        $rootScope.$digest();
-        })
+      })
-      });
     };
 
     root.bindProfile = function($scope, iden, w) {