store iterations in Storage

js/models/Identity.js

@@ -332,6 +332,10 @@ Identity.prototype.closeWallet = function(wid, cb) {
   });
 };
 
+
+Identity.prototype.toObj = function(wid, cb) {
+};
+
 /**
  * @desc This method prepares options for a new Wallet
  *

js/models/Insight.js

@@ -200,6 +200,7 @@ Insight.prototype.subscribe = function(addresses) {
   var self = this;
 
   function handlerFor(self, address) {
+console.log('HANDLER [Insight.js.150:address:]',address); //TODO
     return function(txid) {
       // verify the address is still subscribed
       if (!self.subscribed[address]) return;

js/models/Passphrase.js

@@ -20,7 +20,7 @@ function Passphrase(config) {
   preconditions.checkArgument(!config || !config.iterations || _.isNumber(config.iterations));
   config = config || {};
   this.salt = config.salt || 'mjuBtGybi/4=';
-  this.iterations = config.iterations || 1000;
+  this.iterations = config.iterations;
 };
 
 /**

js/models/Storage.js

@@ -52,7 +52,10 @@ Storage.prototype.savePassphrase = function() {
     throw new Error('NOPASSPHRASE: No passphrase set');
 
   this.savedPassphrase = this.savedPassphrase || {};
-  this.savedPassphrase[this.__uniqueid] = pps[this.__uniqueid];
+  this.savedPassphrase[this.__uniqueid] = {
+    pps: pps[this.__uniqueid],
+    iterations: this.iterations,
+  };
 };
 
 
@@ -60,7 +63,7 @@ Storage.prototype.restorePassphrase = function() {
   if (!this.savedPassphrase[this.__uniqueid])
     throw new Error('NOSTOREDPASSPHRASE: No stored passphrase');
 
-  pps[this.__uniqueid] = this.savedPassphrase[this.__uniqueid];
+  this._setPassphrase(this.savedPassphrase[this.__uniqueid].pps, this.savedPassphrase[this.__uniqueid].iterations);
   this.savedPassphrase[this.__uniqueid] = undefined;
 };
 
@@ -69,15 +72,16 @@ Storage.prototype.hasPassphrase = function() {
 };
 
 
-Storage.prototype._setPassphrase = function(passphrase) {
+Storage.prototype._setPassphrase = function(passphrase, iterations) {
   pps[this.__uniqueid] = passphrase;
+  this.iterations = iterations;
 };
 
 Storage.prototype.setPassword = function(password, config) {
   var passphraseConfig = _.extend(this.passphraseConfig, config);
   var p = new Passphrase(passphraseConfig);
-  log.debug('Setting passphrase... Iterations:' + (passphraseConfig.iterations || 'default'))
+  log.debug('Setting passphrase... Iterations:' + passphraseConfig.iterations);
-  this._setPassphrase(p.getBase64(password));
+  this._setPassphrase(p.getBase64(password), passphraseConfig.iterations);
   log.debug('done.')
 }
 

js/services/controllerUtils.js

@@ -210,8 +210,10 @@ angular.module('copayApp.services')
       preconditions.checkState(w && _.isObject(w));
 
       $rootScope.wallet = w;
-      root.updateTxsAndBalance();
       root.redirIfLogged();
+      root.updateBalance(w, function() {
+        $rootScope.$digest();
+      })
     };
 
     root.bindProfile = function($scope, iden, w) {