Sync address book with all copayer

js/controllers/send.js

@@ -9,6 +9,20 @@ angular.module('copayApp.controllers').controller('SendController',
     $scope.defaultFee = bitcore.TransactionBuilder.FEE_PER_1000B_SAT * satToUnit;
     $scope.unitToBtc = config.unitToSatoshi / bitcore.util.COIN;
 
+    $scope.showAddressBook = function() {
+      var w = $rootScope.wallet;
+      var flag;
+      if (w) {
+        for (var k in w.addressBook) {
+          if (w.addressBook[k].copayerId != -1) {
+            flag = true;
+            break;
+          }
+        }
+      }
+      return flag;
+    };
+
     // TODO this shouldnt be on a particular controller.
     // Detect mobile devices
     var isMobile = {
@@ -246,7 +260,7 @@ angular.module('copayApp.controllers').controller('SendController',
           $scope.loading = false;
           var errorMsg;
           try {
-            w.setAddressBook(entry);
+            w.setAddressBook(entry.address, entry.label);
           } catch (e) {
             errorMsg = e.message;
           }

js/models/core/Wallet.js

@@ -44,7 +44,7 @@ function Wallet(opts) {
   this.txProposals.walletId = this.id;
   this.network.maxPeers = this.totalCopayers;
   this.registeredPeerIds = [];
-  this.addressBook = opts.addressBook || [];
+  this.addressBook = opts.addressBook || {};
 }
 
 Wallet.parent = EventEmitter;
@@ -141,6 +141,28 @@ Wallet.prototype._handleTxProposals = function(senderId, data, isInbound) {
   }
 };
 
+Wallet.prototype._handleAddressBook = function(senderId, data, isInbound) {
+  this.log('RECV ADDRESSBOOK:', data);
+  var rcv = data.addressBook;
+  var hasChange;
+  for(var key in rcv) {
+    if (!this.addressBook[key]) {
+      this.addressBook[key] = rcv[key];
+      hasChange = true;
+    }
+    else {
+      if (rcv[key].createdTs > this.addressBook[key].createdTs) {
+        this.addressBook[key] = rcv[key];
+        hasChange = true;
+      }
+    }
+  }
+  if (hasChange) {
+    this.emit('addressBookUpdated');
+    this.store();
+  }
+};
+
 Wallet.prototype._handleData = function(senderId, data, isInbound) {
 
   // TODO check message signature
@@ -158,6 +180,7 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) {
     case 'walletReady':
       this.sendPublicKeyRing(senderId);
       this.sendTxProposals(senderId); // send old
+      this.sendAddressBook(senderId);
       break;
     case 'publicKeyRing':
       this._handlePublicKeyRing(senderId, data, isInbound);
@@ -168,6 +191,9 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) {
     case 'indexes':
       this._handleIndexes(senderId, data, isInbound);
       break;
+    case 'addressbook':
+      this._handleAddressBook(senderId, data, isInbound);
+      break;
   }
 };
 
@@ -422,6 +448,15 @@ Wallet.prototype.sendIndexes = function(recipients) {
   });
 };
 
+Wallet.prototype.sendAddressBook = function(recipients) {
+  this.log('### SENDING addressBook TO:', recipients || 'All', this.addressBook);
+  this.network.send(recipients, {
+    type: 'addressbook',
+    addressBook: this.addressBook,
+    walletId: this.id,
+  });
+};
+
 Wallet.prototype.getName = function() {
   return this.name || this.id;
 };
@@ -723,24 +758,29 @@ Wallet.prototype.getNetwork = function() {
   return this.network;
 };
 
-Wallet.prototype._checkAddressBook = function(address) {
-  for(var i=0;i<this.addressBook.length; i++) {
-    if (this.addressBook[i].address == address) {
-      throw new Error('This address already exists in your Address Book: ' + address);
-    }
+Wallet.prototype._checkAddressBook = function(key) {
+  if (this.addressBook[key] && this.addressBook[key].copayerId != -1) {
+    throw new Error('This address already exists in your Address Book: ' + address);
   }
 };
 
-Wallet.prototype.setAddressBook = function(addressBook) {
-  this._checkAddressBook(addressBook.address);
-  this.addressBook.push(addressBook);
+Wallet.prototype.setAddressBook = function(key, label) {
+  this._checkAddressBook(key);
+  var addressbook = {
+    createdTs: Date.now(),
+    copayerId: this.getMyCopayerId(),
+    label: label
+  };
+  this.addressBook[key] = addressbook;
+  this.sendAddressBook();
   this.store();
 };
 
-Wallet.prototype.deleteAddressBook = function(addressBook) {
-  var index = this.addressBook.indexOf(addressBook);
-  if (index > -1) {
-    this.addressBook.splice(index, 1);
+Wallet.prototype.deleteAddressBook = function(key) {
+  if (key) {
+    this.addressBook[key].copayerId = -1;
+    this.addressBook[key].createdTs = Date.now();
+    this.sendAddressBook();
     this.store();
   }
 };

js/services/controllerUtils.js

@@ -134,6 +134,11 @@ angular.module('copayApp.services')
             break;
         }
       });
+      w.on('addressBookUpdated', function(dontDigest) {
+        if (!dontDigest) {
+          $rootScope.$digest();
+        }
+      });
       w.on('connectionError', function(msg) {
         root.onErrorDigest(null, msg);
       });