Fix Conflicts:

js/models/core/WalletFactory.js

css/main.css

@@ -219,7 +219,6 @@ small.has-error {
   font-weight: bold;
 }
 
-
 .totalAmount {
   line-height: 120%;
   margin-top:2px;

index.html

@@ -769,6 +769,9 @@
             </a>
           </div>
         </div>
+        <div class="row text-center small" style="margin-top:20px">
+          <div class="button  radius warning" ng-really-message="Are you sure to delete this wallet from this computer?" ng-really-click="deleteWallet()">Delete this wallet from this computer</div>
+        </div>
       </div>
     </script>
 

js/controllers/backup.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('BackupController',
-  function($scope, $rootScope, $location, $window, $timeout, $modal, backupService) {
+  function($scope, $rootScope, $location, $window, $timeout, $modal, backupService, walletFactory, controllerUtils) {
     $scope.title = 'Backup';
 
     $scope.download = function() {
@@ -19,6 +19,14 @@ angular.module('copayApp.controllers').controller('BackupController',
       });
     };
 
+    $scope.deleteWallet = function() {
+      var w = $rootScope.wallet;
+      w.disconnect();
+      walletFactory.delete(w.id, function() {
+        controllerUtils.logout();
+      });
+    };
+
   });
 
 var ModalInstanceCtrl = function($scope, $modalInstance) {

js/controllers/header.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('HeaderController',
-  function($scope, $rootScope, $location, $notification, $http, walletFactory, controllerUtils) {
+  function($scope, $rootScope, $location, $notification, $http, controllerUtils) {
     $scope.menu = [
     {
       'title': 'Addresses',

js/directives.js

@@ -202,4 +202,23 @@ angular.module('copayApp.directives')
         });
       }
     };
+  })
+// From https://gist.github.com/asafge/7430497
+.directive('ngReallyClick', [
+
+  function() {
+    return {
+      restrict: 'A',
+      link: function(scope, element, attrs) {
+        element.bind('click', function() {
+          var message = attrs.ngReallyMessage;
+          if (message && confirm(message)) {
+            scope.$apply(attrs.ngReallyClick);
+          }
         });
+      }
+    }
+  }
+])
+
+;

js/models/core/WalletFactory.js

@@ -35,7 +35,7 @@ function WalletFactory(config, version) {
   this.version = version;
 }
 
-WalletFactory.prototype.log = function(){
+WalletFactory.prototype.log = function() {
   if (!this.verbose) return;
   if (console) {
     console.log.apply(console, arguments);
@@ -75,7 +75,7 @@ WalletFactory.prototype.fromEncryptedObj = function(base64, password) {
 };
 
 WalletFactory.prototype.read = function(walletId) {
-  if (! this._checkRead(walletId))
+  if (!this._checkRead(walletId))
     return false;
 
   var obj = {};
@@ -99,7 +99,9 @@ WalletFactory.prototype.create = function(opts) {
     (opts.privateKey ? ' USING PrivateKey: ' + opts.privateKey.getId() : ' NEW PrivateKey')
   );
 
-  opts.privateKey = opts.privateKey ||  new PrivateKey({ networkName: this.networkName });
+  opts.privateKey = opts.privateKey || new PrivateKey({
+    networkName: this.networkName
+  });
 
   var requiredCopayers = opts.requiredCopayers || this.walletDefaults.requiredCopayers;
   var totalCopayers = opts.totalCopayers || this.walletDefaults.totalCopayers;
@@ -144,7 +146,7 @@ WalletFactory.prototype._checkVersion = function(inVersion) {
   var inV0 = parseInt(inV[0]);
 
   //We only check for major version differences
-  if( thisV0 < inV0 ) {
+  if (thisV0 < inV0) {
     throw new Error('Major difference in software versions' +
       '. Received:' + inVersion +
       '. Current version:' + this.version +
@@ -154,18 +156,11 @@ WalletFactory.prototype._checkVersion = function(inVersion) {
 
 
 WalletFactory.prototype._checkNetwork = function(inNetworkName) {
-  if( this.networkName !== inNetworkName ) {
+  if (this.networkName !== inNetworkName) {
-    throw new Error('This Wallet is configured for '
+    throw new Error('This Wallet is configured for ' + inNetworkName + ' while currently Copay is configured for: ' + this.networkName + '. Check your settings.');
-                    + inNetworkName 
-                    + ' while currently Copay is configured for: '
-                    + this.networkName 
-                    + '. Check your settings.' 
-                   );
   }
 };
 
-
-
 WalletFactory.prototype.open = function(walletId, opts) {
   opts = opts || {};
   opts.id = walletId;
@@ -182,14 +177,16 @@ WalletFactory.prototype.open = function(walletId, opts) {
 WalletFactory.prototype.getWallets = function() {
   var ret = this.storage.getWallets();
   ret.forEach(function(i) {
-    i.show = i.name ? ( (i.name + ' <'+i.id+'>') ) : i.id;
+    i.show = i.name ? ((i.name + ' <' + i.id + '>')) : i.id;
   });
   return ret;
 };
 
-WalletFactory.prototype.remove = function(walletId) {
+WalletFactory.prototype.delete = function(walletId, cb) {
-  // TODO remove wallet contents
+  var s = this.storage;
-  this.log('TODO: remove wallet contents');
+  this.log('## DELETING WALLET ID:' + walletId); //TODO
+  s.deleteWallet(walletId);
+  return cb();
 };
 
 WalletFactory.prototype.decodeSecret = function(secret) {
@@ -207,7 +204,9 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
   if (!s) return cb('badSecret');
 
   //Create our PrivateK
-  var privateKey = new PrivateKey({ networkName: this.networkName });
+  var privateKey = new PrivateKey({
+    networkName: this.networkName
+  });
   this.log('\t### PrivateKey Initialized');
   var opts = {
     copayerId: privateKey.getId(),
@@ -226,8 +225,8 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
       return cb(connectedOnce ? 'walletFull' : 'joinError');
     });
     self.network.on('data', function(sender, data) {
-      if (data.type ==='walletId') {
+      if (data.type === 'walletId') {
-        if (data.networkName !== self.networkName ){
+        if (data.networkName !== self.networkName) {
           return cb('badNetwork');
         }
 

js/models/storage/LocalEncrypted.js

@@ -135,7 +135,6 @@ Storage.prototype.getWalletIds = function() {
 
 Storage.prototype.getWallets = function() {
   var wallets = [];
-  var uniq = {};
   var ids = this.getWalletIds();
 
   for (var i in ids) {
@@ -147,6 +146,23 @@ Storage.prototype.getWallets = function() {
   return wallets;
 };
 
+Storage.prototype.deleteWallet = function(walletId) {
+  var toDelete = {};
+  toDelete['nameFor::' + walletId] = 1;
+
+  for (var i = 0; i < localStorage.length; i++) {
+    var key = localStorage.key(i);
+    var split = key.split('::');
+    if (split.length == 2 && split[0] === walletId) {
+      toDelete[key] = 1;
+    }
+  }
+  for (var i in toDelete) {
+    this.removeGlobal(i);
+  }
+};
+
+
 //obj contains keys to be set
 Storage.prototype.setFromObj = function(walletId, obj) {
   for (var k in obj) {

js/services/backupService.js

@@ -1,6 +1,8 @@
 'use strict';
 
-var BackupService = function() {};
+var BackupService = function($notification) {
+  this.notifications = $notification;
+};
 
 BackupService.prototype.getName = function(wallet) {
   return (wallet.name ? (wallet.name+'-') : '') + wallet.id;
@@ -11,6 +13,7 @@ BackupService.prototype.download = function(wallet) {
   var timestamp = +(new Date());
   var walletName = this.getName(wallet);
   var filename = walletName + '-' + timestamp + '-keybackup.json.aes';
+  this.notifications.success('Backup created', 'Encrypted backup file saved.');
   var blob = new Blob([ew], {
     type: 'text/plain;charset=utf-8'
   });
@@ -44,4 +47,4 @@ BackupService.prototype.sendEmail = function(email, wallet) {
   }
 };
 
-angular.module('copayApp.services').value('backupService', new BackupService());
+angular.module('copayApp.services').service('backupService', BackupService);

package.json

@@ -57,6 +57,7 @@
     "cli-color": "0.3.2"
   },
   "dependencies": {
-    "mocha": "^1.18.2"
+    "mocha": "^1.18.2",
+    "mocha-lcov-reporter": "0.0.1"
   }
 }

test/mocks/FakeStorage.js

@@ -1,40 +1,103 @@
+var FakeStorage = function() {
+  this.reset();
+};
 
-var FakeStorage = function(){
+
+FakeStorage.prototype.reset = function(password) {
   this.storage = {};
 };
 
-FakeStorage.prototype._setPassphrase = function (password) {
+FakeStorage.prototype._setPassphrase = function(password) {
   this.storage.passphrase = password;
 };
 
-FakeStorage.prototype.setGlobal = function (id, payload) {
+FakeStorage.prototype.setGlobal = function(id, payload) {
   this.storage[id] = payload;
 };
 
 FakeStorage.prototype.getGlobal = function(id) {
   return this.storage[id];
-}
+};
 
-FakeStorage.prototype.set = function (wid, id, payload) {
+
-  this.storage[wid + '-' + id] = payload;
+FakeStorage.prototype.removeGlobal = function(id) {
+  delete this.storage[id];
+};
+
+
+FakeStorage.prototype.set = function(wid, id, payload) {
+  this.storage[wid + '::' + id] = payload;
 };
 
 FakeStorage.prototype.get = function(wid, id) {
-  return this.storage[wid + '-' +id];
+  return this.storage[wid + '::' + id];
-}
+};
 
 FakeStorage.prototype.clear = function() {
   delete this['storage'];
-}
+};
+
+FakeStorage.prototype.getWalletIds = function() {
+  var walletIds = [];
+  var uniq = {};
+
+  for (var ii in this.storage) {
+    var split = ii.split('::');
+    if (split.length == 2) {
+      var walletId = split[0];
+      if (walletId !== 'nameFor' && typeof uniq[walletId] === 'undefined') {
+        walletIds.push(walletId);
+        uniq[walletId] = 1;
+      }
+    }
+  }
+  return walletIds;
+};
+
+FakeStorage.prototype.deleteWallet = function(walletId) {
+  var toDelete = {};
+  toDelete['nameFor::' + walletId] = 1;
+
+  for (var key in this.storage) {
+    var split = key.split('::');
+    if (split.length == 2 && split[0] === walletId) {
+      toDelete[key] = 1;
+    }
+  }
+  for (var i in toDelete) {
+    this.removeGlobal(i);
+  }
+};
+
+
+FakeStorage.prototype.getName = function(walletId) {
+  return this.getGlobal('nameFor::' + walletId);
+};
+
+
+FakeStorage.prototype.setName = function(walletId, name) {
+  this.setGlobal('nameFor::' + walletId, name);
+};
+
 
 FakeStorage.prototype.getWallets = function() {
-  return [];
+  var wallets = [];
+  var ids = this.getWalletIds();
+
+  for (var i in ids) {
+    wallets.push({
+      id: ids[i],
+      name: this.getName(ids[i]),
+    });
+  }
+  return wallets;
 };
 
 FakeStorage.prototype.setFromObj = function(walletId, obj) {
-  for (var i in obj) {
+  for (var k in obj) {
-    this.storage[walletId + '-' + i] = obj[i];
+    this.set(walletId, k, obj[k]);
-  };
+  }
+  this.setName(walletId, obj.opts.name);
 };
 
 module.exports = require('soop')(FakeStorage);

test/mocks/FakeWallet.js

@@ -1,21 +1,23 @@
-
+var FakeWallet = function() {
-var FakeWallet = function(){
+  this.id = 'testID';
-  this.balance=10000;
+  this.balance = 10000;
-  this.safeBalance=1000;
+  this.safeBalance = 1000;
-  this.balanceByAddr={'1CjPR7Z5ZSyWk6WtXvSFgkptmpoi4UM9BC': 1000};
+  this.balanceByAddr = {
+    '1CjPR7Z5ZSyWk6WtXvSFgkptmpoi4UM9BC': 1000
+  };
   this.name = 'myTESTwullet';
 };
 
-FakeWallet.prototype.set = function(balance, safeBalance, balanceByAddr){
+FakeWallet.prototype.set = function(balance, safeBalance, balanceByAddr) {
-  this.balance=balance;
+  this.balance = balance;
   this.safeBalance = safeBalance;
   this.balanceByAddr = balanceByAddr;
 };
 
-FakeWallet.prototype.getAddressesInfo=function(){
+FakeWallet.prototype.getAddressesInfo = function() {
   var ret = [];
 
-  for(var ii in this.balanceByAddr){
+  for (var ii in this.balanceByAddr) {
     ret.push({
       address: ii,
       isChange: false,
@@ -25,13 +27,20 @@ FakeWallet.prototype.getAddressesInfo=function(){
 };
 
 
-FakeWallet.prototype.getBalance=function(cb){
+FakeWallet.prototype.getBalance = function(cb) {
   return cb(null, this.balance, this.balanceByAddr, this.safeBalance);
 };
 
+FakeWallet.prototype.setEnc = function(enc) {
+  this.enc = enc;
+};
 
 FakeWallet.prototype.toEncryptedObj = function() {
-  return 'SUPERENCRYPTEDSICRITSTUFF';
+  return this.enc;
+};
+
+FakeWallet.prototype.disconnect = function() {
+  this.disconnectCalled = 1;
 };
 
 // This mock is meant for karma, module.exports is not necesary.

test/test.WalletFactory.js

@@ -3,27 +3,17 @@
 var chai = chai || require('chai');
 var should = chai.should();
 
+var copay = copay || require('../copay');
+var sinon = require('sinon');
 var FakeNetwork = require('./mocks/FakeNetwork');
-var Insight = require('../js/models/blockchain/Insight');
+var FakeBlockchain = require('./mocks/FakeBlockchain');
 var FakeStorage = require('./mocks/FakeStorage');
-
-try {
-  var copay = require('copay'); //browser
-} catch (e) {
-  var copay = require('../copay'); //node
-}
 var WalletFactory = require('../js/models/core/WalletFactory');
 
-var addCopayers = function(w) {
-  for (var i = 0; i < 4; i++) {
-    w.publicKeyRing.addCopayer();
-  }
-};
-
 describe('WalletFactory model', function() {
   var config = {
     Network: FakeNetwork,
-    Blockchain: Insight,
+    Blockchain: FakeBlockchain,
     Storage: FakeStorage,
     wallet: {
       requiredCopayers: 3,
@@ -38,12 +28,34 @@ describe('WalletFactory model', function() {
     },
     networkName: 'testnet',
     passphrase: 'test',
+    storageObj: new FakeStorage(),
+    networkObj: new FakeNetwork(),
+    blockchainObj: new FakeBlockchain(),
   };
 
-  it('should create the factory', function() {
+  beforeEach(function() {
-    var wf = new WalletFactory(config);
+    config.storageObj.reset();
-    should.exist(wf);
   });
+
+  it('should create the factory', function() {
+    var wf = new WalletFactory(config, '0.0.1');
+    should.exist(wf);
+    wf.networkName.should.equal(config.networkName);
+    wf.walletDefaults.should.deep.equal(config.wallet);
+    wf.version.should.equal('0.0.1');
+  });
+
+  it('should log', function() {
+    var c2 = JSON.parse(JSON.stringify(config));
+    c2.verbose = 1;
+    var wf = new WalletFactory(c2, '0.0.1');
+    var spy = sinon.spy(console, 'log');
+    wf.log('ok');
+    sinon.assert.callCount(spy, 1);
+    spy.getCall(0).args[0].should.equal('ok');
+  });
+
+
   it('#_checkRead should return false', function() {
     var wf = new WalletFactory(config);
     wf._checkRead('dummy').should.equal(false);
@@ -83,7 +95,7 @@ describe('WalletFactory model', function() {
   it('BIP32 length problem', function() {
     var sconfig = {
       Network: FakeNetwork,
-      Blockchain: Insight,
+      Blockchain: FakeBlockchain,
       Storage: FakeStorage,
       "networkName": "testnet",
       "network": {
@@ -101,7 +113,7 @@ describe('WalletFactory model', function() {
       "wallet": {
         "requiredCopayers": 2,
         "totalCopayers": 3,
-        "reconnectDelay":100,
+        "reconnectDelay": 100,
         "spendUnconfirmed": 1,
         "verbose": 0
       },
@@ -114,7 +126,10 @@ describe('WalletFactory model', function() {
         "port": 3001
       },
       "verbose": 0,
-      "themes": ["default"]
+      "themes": ["default"],
+      storageObj: new FakeStorage(),
+      networkObj: new FakeNetwork(),
+      blockchainObj: new FakeBlockchain(),
     };
     var wf = new WalletFactory(sconfig, '0.0.1');
     var opts = {
@@ -125,4 +140,30 @@ describe('WalletFactory model', function() {
 
   });
 
+  it('should be able to get current wallets', function() {
+    var wf = new WalletFactory(config, '0.0.1');
+    var ws = wf.getWallets();
+
+    var w = wf.create({
+      name: 'test wallet'
+    });
+    var ws = wf.getWallets();
+    ws.length.should.equal(1);
+    ws[0].name.should.equal('test wallet');
+  });
+
+  it('should be able to delete wallet', function(done) {
+    var wf = new WalletFactory(config, '0.0.1');
+    var w = wf.create({
+      name: 'test wallet'
+    });
+    var ws = wf.getWallets();
+    ws.length.should.equal(1);
+    wf.delete(ws[0].id, function() {
+      ws = wf.getWallets();
+      ws.length.should.equal(0);
+      done();
+    });
+  });
+
 });

test/unit/controllers/controllersSpec.js

@@ -1,6 +1,14 @@
 //
 // test/unit/controllers/controllersSpec.js
 //
+
+// Replace saveAs plugin
+saveAsLastCall = null;
+saveAs = function(o) {
+  saveAsLastCall = o;
+};
+
+
 describe("Unit: Controllers", function() {
 
   var scope;
@@ -9,6 +17,47 @@ describe("Unit: Controllers", function() {
   beforeEach(module('copayApp.services'));
   beforeEach(module('copayApp.controllers'));
 
+  var config = {
+    requiredCopayers: 3,
+    totalCopayers: 5,
+    spendUnconfirmed: 1,
+    reconnectDelay: 100,
+    networkName: 'testnet',
+  };
+
+
+
+  describe('Backup Controller', function() {
+    var ctrl;
+    beforeEach(inject(function($controller, $rootScope) {
+      scope = $rootScope.$new();
+
+      $rootScope.wallet = new FakeWallet(config);
+      ctrl = $controller('BackupController', {
+        $scope: scope,
+        $modal: {},
+      });
+    }));
+
+    it('Should have a Backup controller', function() {
+      expect(scope.title).equal('Backup');
+    });
+
+    it('Backup controller #download', function() {
+      scope.wallet.setEnc('1234567');
+      expect(saveAsLastCall).equal(null);
+      scope.download();
+      expect(saveAsLastCall.size).equal(7);
+      expect(saveAsLastCall.type).equal('text/plain;charset=utf-8');
+    });
+
+    it('Backup controller #delete', function() {
+      expect(scope.wallet).not.equal(undefined);
+      scope.deleteWallet();
+      expect(scope.wallet).equal(undefined);
+    });
+  });
+
   describe('Address Controller', function() {
     var addressCtrl;
     beforeEach(inject(function($controller, $rootScope) {
@@ -55,7 +104,7 @@ describe("Unit: Controllers", function() {
     beforeEach(inject(function($controller, $injector) {
       $httpBackend = $injector.get('$httpBackend');
       $httpBackend.when('GET', GH)
-      .respond( [{
+        .respond([{
           name: "v100.1.6",
           zipball_url: "https://api.github.com/repos/bitpay/copay/zipball/v0.0.6",
           tarball_url: "https://api.github.com/repos/bitpay/copay/tarball/v0.0.6",
@@ -103,7 +152,7 @@ describe("Unit: Controllers", function() {
     it('should check blockChainStatus', function() {
       $httpBackend.expectGET(GH);
       $httpBackend.flush();
-     rootScope.insightError=1;
+      rootScope.insightError = 1;
       scope.$apply();
       expect(rootScope.insightError).equal(1);
       scope.$apply();
@@ -114,4 +163,3 @@ describe("Unit: Controllers", function() {
   });
 
 });
-