From 30a6109abfc8b18503682b8ed1d269610bfd3725 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 2 Dec 2014 11:17:03 -0300
Subject: [PATCH] mv log to util

---
 2fa                   | 18 ++++++++++++++++++
 TODO                  | 12 ++++++++++++
 commm                 |  1 +
 js/models/Identity.js |  9 +++++----
 meeting               | 37 +++++++++++++++++++++++++++++++++++++
 test-users            | 19 +++++++++++++++++++
 util/build.js         |  3 +++
 w                     |  1 +
 8 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 2fa
 create mode 100644 TODO
 create mode 100644 commm
 create mode 100644 meeting
 create mode 100644 test-users
 create mode 100644 w

diff --git a/2fa b/2fa
new file mode 100644
index 000000000..fc4ff15d6
--- /dev/null
+++ b/2fa
@@ -0,0 +1,18 @@
+
+
+- 2-2
+  1 desktop
+  1 mobile
+
+  - each device creates its own key
+  - both devices are expected to be logged using the same profile (email / password)
+  - if using local storage -> all is OK.
+      - keys will be safe an will never leave the device
+     
+  - if using insight
+      both 'copayers' need to have a new and different password for accessing the wallet.
+
+  
+
+
+  - 
diff --git a/TODO b/TODO
new file mode 100644
index 000000000..53967d2d9
--- /dev/null
+++ b/TODO
@@ -0,0 +1,12 @@
+
+ - homeWallet address...e sta ok?
+- receive controller .. owned
+-- 
+//    pkr.cache = opts.cache;
+
+(en send.js)
+//      $rootScope.pendingTxCount = res.pendingForUs;
+
+-- probar payment intent
+
+// TODO refrescar en 'add'
diff --git a/commm b/commm
new file mode 100644
index 000000000..24f026c7b
--- /dev/null
+++ b/commm
@@ -0,0 +1 @@
+7b6bcfbbbb6bf82f8843305f563d2a2491f310fe
diff --git a/js/models/Identity.js b/js/models/Identity.js
index a35a1446d..01da20222 100644
--- a/js/models/Identity.js
+++ b/js/models/Identity.js
@@ -125,7 +125,7 @@ Identity.open = function(opts, cb) {
 
   var storage = opts.storage || opts.pluginManager.get('DB');
   storage.setCredentials(opts.email, opts.password, opts);
-  storage.getItem(Identity.getKeyForEmail(opts.email), function(err, data, headers) {
+  storage.getItem(Identity.getKeyForEmail(opts.email), function(err, data) {
     var exported;
     if (err) {
       return cb(err);
@@ -135,7 +135,7 @@ Identity.open = function(opts, cb) {
     } catch (e) {
       return cb(e);
     }
-    return cb(null, new Identity(_.extend(opts, exported)), headers);
+    return cb(null, new Identity(_.extend(opts, exported)));
   });
 };
 
@@ -643,10 +643,11 @@ Identity.prototype.deleteWallet = function(walletId, cb) {
   delete this.focusedTimestamps[walletId];
 
   this.storage.removeItem(Wallet.getStorageKey(walletId), function(err) {
-    if (err) return cb(err);
+    if (err) {
+      return cb(err);
+    }
     self.emitAndKeepAlive('deletedWallet', walletId);
     self.store(null, cb);
-    return cb();
   });
 };
 
diff --git a/meeting b/meeting
new file mode 100644
index 000000000..2e4d4e7e1
--- /dev/null
+++ b/meeting
@@ -0,0 +1,37 @@
+
+- We have an historical opportunity 
+
+- To create the software EVERYONE in the WORLD will use for their finance 
+- To enhance everyone's life by creating an awesome software
+- To colaborate with Bitcoin adoption, by creating a simple and intuite wallet
+- 
+
+
+
+
+
+- be obsessive about the UX
+- fucking use Copay
+- subscribe and read bitcore dev
+
+
+
+- Company funds
+  - Startups
+  - Middle size companies
+
+- Friends funds
+- Own funds
+  - 1-1 for every day usage
+      - easy and FAST mobile access
+      - QR reading
+      - PayPro
+
+  - 2-4 for long term holding
+      - swipe without need of insight or copay.io
+      - paper walleting
+  - 
+
+NOT:
+  
+
diff --git a/test-users b/test-users
new file mode 100644
index 000000000..d6f982bd1
--- /dev/null
+++ b/test-users
@@ -0,0 +1,19 @@
+
+wallet addr: 2N7YdozHPSyDomeov9sU6kL3RdGkZPUaV2v
+
+
+ematiu+1@gmail.com password: 123
+extPubKey: tprv8ZgxMBicQKsPdWNCTqR5zbCTTCLgc4saAQE32LqLWMHmSzFncTdZegFS7CyA8FKQX9kX7FPAJ1scvtkgumYRJ4iAc4pNekm3LzPtikR3C2L
+
+ematiu+2@gmail.com password:2
+ extPubKey: tprv8ZgxMBicQKsPem5BuuDT6xY9etUC2RohpUoyzoa1MEkkZyAHhszaHPZTmgDheN31hSP1r6bRwpj2JC66r1CPpftwaRrhz9Wz3e9yRVScw9Y
+
+
+ematiu+3@gmail.com password:3
+ extPubKey: tprv8ZgxMBicQKsPeQixUQZw1zm2LY6uJqT6oJMStMQHsHkMQDFXwxdomkkFCvMWZbQri3B8mzapiMvREXP85HFKmoUND48yfLEq7AuNCaj41Dw
+
+
+util/swipeWallet.js n2kMqQ8Si9GndzQ6FrJxcwHMKacK2rCEpK 2 tprv8ZgxMBicQKsPdWNCTqR5zbCTTCLgc4saAQE32LqLWMHmSzFncTdZegFS7CyA8FKQX9kX7FPAJ1scvtkgumYRJ4iAc4pNekm3LzPtikR3C2L tprv8ZgxMBicQKsPem5BuuDT6xY9etUC2RohpUoyzoa1MEkkZyAHhszaHPZTmgDheN31hSP1r6bRwpj2JC66r1CPpftwaRrhz9Wz3e9yRVScw9Y  tprv8ZgxMBicQKsPeQixUQZw1zm2LY6uJqT6oJMStMQHsHkMQDFXwxdomkkFCvMWZbQri3B8mzapiMvREXP85HFKmoUND48yfLEq7AuNCaj41Dw 
+
+my addr: n2kMqQ8Si9GndzQ6FrJxcwHMKacK2rCEpK
+
diff --git a/util/build.js b/util/build.js
index 5bbd0264e..f587488de 100644
--- a/util/build.js
+++ b/util/build.js
@@ -116,6 +116,9 @@ var createBundle = function(opts) {
 
   // The following 2 lines fix karma tests
   b.require('sjcl');
+  b.require('./js/util/log', {
+    expose: '../../log.js'
+  });
 
   if (opts.debug) {
     //include dev dependencies
diff --git a/w b/w
new file mode 100644
index 000000000..aa3f30ad7
--- /dev/null
+++ b/w
@@ -0,0 +1 @@
+xprv9s21ZrQH143K3DYCbPDJdFhNDCzChAdsFwz2HFwgtcEufYffAvhZXcJ3XwxjepPJp3FBSHYFnPsxtAzDbSruoRW3rVThyqc2iFKSFw7zhE6