merge

js/config.template.js

@@ -1,39 +0,0 @@
-'use strict';
-
-var config = {
-  networkName: 'testnet',
-  network: {
-//     key: 'lwjd5qra8257b9',
-    //   This is for running local peerJs with params: ./peerjs  -p 10009  -k 'sdfjhwefh'
-    key: 'sdfjhwefh',
-    host: 'localhost',
-    port: 10009,
-    path: '/',
-    maxPeers: 3,
-    debug: 3,
-  },
-  limits: {
-    totalCopayers: 10,
-    mPlusN: 15
-  },
-  wallet: {
-    requiredCopayers: 2,
-    totalCopayers: 3,
-    spendUnconfirmed: 1,
-    verbose: 1,
-  },
-  blockchain: {
-    host: 'test.insight.is',
-    port: 3001
-  },
-  socket: {
-    host: 'test.insight.is',
-    port: 3001
-  },
-  verbose: 1,
-};
-
-var log = function () {
-  if (config.verbose) console.log(arguments);
-}
-

js/controllers/signin.js

@@ -16,7 +16,6 @@ angular.module('copay.signin').controller('SigninController',
 console.log('[signin.js.23:walletId:]',walletId); //TODO
       var w = walletFactory.open(walletId, opts);
       controllerUtils.setupUxHandlers(w);
-      w.netStart();
     };
 
     $scope.join = function(secret) {
@@ -29,7 +28,6 @@ console.log('[signin.js.23:walletId:]',walletId); //TODO
       walletFactory.joinCreateSession(secret, function(w) {
 console.log('[signin.js.33] joinCreateSession RETURN', w); //TODO
         controllerUtils.setupUxHandlers(w);
-        w.setupNetHandlers();
       });
     };
   });

js/models/core/PrivateKey.js

@@ -32,6 +32,8 @@ PrivateKey.fromObj = function(obj) {
 };
 
 PrivateKey.prototype.toObj = function() {
+
+console.log('[PrivateKey.js.35] TODO TODO: PRIV: ', this.getExtendedPrivateKeyString()); //TODO
   return {
     extendedPrivateKeyString: this.getExtendedPrivateKeyString(),
     networkName: this.network.name,

js/models/core/Wallet.js

@@ -106,9 +106,11 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) {
   }
   this.log('[Wallet.js.98]' , data.type); //TODO
   switch(data.type) {
+    // This handler is repeaded on WalletFactory (#join). TODO
+    case 'walletId':
+      this.sendWalletReady(senderId);
+      break;
     case 'walletReady':
-
-console.log('[Wallet.js.109] RECV WALLETREADY'); //TODO
       this.sendPublicKeyRing(senderId);
       this.sendTxProposals(senderId);
       break;
@@ -189,6 +191,7 @@ console.log('[Wallet.js.177] NET START: emit CREATED'); //TODO
       if (otherPeerId !== myPeerId) {
         net.connectTo(otherPeerId);
       }
+    self.emit('refresh');
     }
   }, startOpts);
 };

js/services/controllerUtils.js

@@ -33,7 +33,6 @@ console.log('[controllerUtils.js.30:created:] RECV '); //TODO
       
       $rootScope.wallet.getBalance(function(balance) {
         $rootScope.totalBalance = balance;
-        $rootScope.$digest();
       });
     });
     w.on('refresh', function() {
@@ -42,6 +41,8 @@ console.log('[controllerUtils.js.30:created:] RECV '); //TODO
     });
     w.on('openError', root.onErrorDigest);
     w.on('close', root.onErrorDigest);
+
+console.log('[controllerUtils.js.45] CALLING NETSTART FROM setupUxHandlers'); //TODO
     w.netStart();
 console.log('[controllerUtils.js.45] setupUxHandlers END'); //TODO
   };