From 0523d99eda9a39407f1c73b203990703c95fbe59 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 21 Apr 2014 12:00:14 -0300
Subject: [PATCH 1/3] add getUsedUnspent to txproposals

---
 js/models/core/PublicKeyRing.js |  1 -
 js/models/core/TxProposals.js   | 10 ++++++++++
 js/models/core/Wallet.js        |  2 +-
 test/test.TxProposals.js        | 30 +++++++++++++++++++++++++++---
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/js/models/core/PublicKeyRing.js b/js/models/core/PublicKeyRing.js
index a2a26ce58..32cd4d5c9 100644
--- a/js/models/core/PublicKeyRing.js
+++ b/js/models/core/PublicKeyRing.js
@@ -212,7 +212,6 @@ PublicKeyRing.prototype.getAddresses = function(onlyMain) {
 
 PublicKeyRing.prototype.getRedeemScriptMap = function () {
   var ret = {};
-console.log('[PublicKeyRing.js.216]', this.changeAddressIndex, this.addressIndex); //TODO
 
   for (var i=0; i<this.changeAddressIndex; i++) {
     ret[this.getAddress(i,true)] = this.getRedeemScript(i,true).getBuffer().toString('hex');
diff --git a/js/models/core/TxProposals.js b/js/models/core/TxProposals.js
index 343da1294..772faefe4 100644
--- a/js/models/core/TxProposals.js
+++ b/js/models/core/TxProposals.js
@@ -181,6 +181,16 @@ TxProposals.prototype.setSent = function(ntxid,txid) {
   this.txps[ntxid].setSent(txid);
 };
 
+TxProposals.prototype.getUsedUnspent = function() {
+  var ret = [];
+  for(var i in this.txps) {
+    var u = this.txps[i].builder.getSelectedUnspent();
+    for (var j in u){
+      ret.push(u[j].txid);
+    }
+  }
+  return ret;
+};
 
 TxProposals.prototype.merge = function(t) {
   if (this.network.name !== t.network.name) 
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index eb1b58fc4..d86e3adf1 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -433,7 +433,7 @@ Wallet.prototype.getBalance = function(cb) {
     }
     for(var a in balanceByAddr){
       balanceByAddr[a] = balanceByAddr[a]/COIN;
-    };
+    }
     return cb(balance / COIN, balanceByAddr, isMain);
   });
 };
diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js
index c29bcc8a9..1b9739cdb 100644
--- a/test/test.TxProposals.js
+++ b/test/test.TxProposals.js
@@ -104,6 +104,33 @@ describe('TxProposals model', function() {
   };
 
 
+  it('#getUsedUnspend', function () {
+    var priv = new PrivateKey(config);
+    var w = new TxProposals({
+      networkName: config.networkName,
+    });
+    var start = new Date().getTime();
+    var pkr=createPKR([priv]);
+    var ts = Date.now();
+    var isChange=0; 
+    var index=0; 
+    unspentTest[0].address        = pkr.getAddress(index, isChange).toString();
+    unspentTest[0].scriptPubKey   = pkr.getScriptPubKeyHex(index, isChange);
+    w.add(createTx(
+      '15q6HKjWHAksHcH91JW23BJEuzZgFwydBt', 
+      '123456789', 
+      unspentTest,
+      {},
+      priv,
+      pkr
+    ));
+    w.getUsedUnspent().length.should.equal(1);
+    w.getUsedUnspent()[0].should.equal(unspentTest[0].txid);
+  });
+
+
+
+
   it('#merge with self', function () {
     var priv = new PrivateKey(config);
     var w = new TxProposals({
@@ -472,8 +499,5 @@ var _dumpChunks = function (scriptSig, label) {
     w2.merge(w);
     Object.keys(w2.txps).length.should.equal(1);
   });
-
-
-
 });
  

From 2fc3a8e8faf01956b9de02efa86753e907dd7182 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 21 Apr 2014 12:37:32 -0300
Subject: [PATCH 2/3] safe unspent

---
 index.html                     |  6 ++++--
 js/controllers/addresses.js    |  3 +--
 js/models/core/Wallet.js       | 27 ++++++++++++++++++++++-----
 js/services/controllerUtils.js | 18 +++++++++++-------
 test/test.TxProposals.js       |  3 ---
 5 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/index.html b/index.html
index fb498ba3a..cb440eeab 100644
--- a/index.html
+++ b/index.html
@@ -18,8 +18,10 @@
           </figure>
           <div class="text-right" ng-show="$root.wallet">
             <h5 ng-show="$root.wallet.id">Wallet ID: {{$root.wallet.id}}</h5>
-            <p ng-show="totalBalance">{{totalBalance}} <i class="fi-bitcoin"></i></p>
-            <p ng-show="!totalBalance">0 <i class="fi-bitcoin"></i></p>
+            <p>
+                Balance: {{totalBalance || 0}} <i class="fi-bitcoin"></i><br>
+                Available to Spend:{{availableBalance || 0}} <i class="fi-bitcoin"></i>
+            </p>
           </div>
         </div>
 
diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js
index c92c7ea76..af3a7ee01 100644
--- a/js/controllers/addresses.js
+++ b/js/controllers/addresses.js
@@ -10,8 +10,7 @@ angular.module('copay.addresses').controller('AddressesController',
 
     var _updateBalance = function () {
       controllerUtils.setSocketHandlers();
-
-      w.getBalance(function (balance, balanceByAddr, isMain) {
+      w.getBalance(true, function (balance, balanceByAddr, isMain) {
         if (balanceByAddr  && Object.keys(balanceByAddr).length) {
           $rootScope.balanceByAddr = balanceByAddr;
           $scope.isMain = isMain;
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index d86e3adf1..707e7f3db 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -410,7 +410,7 @@ Wallet.prototype.addressIsOwn = function(addrStr) {
   return ret;
 };
 
-Wallet.prototype.getBalance = function(cb) {
+Wallet.prototype.getBalance = function(safe, cb) {
   var balance = 0;
   var balanceByAddr = {};
   var isMain = {};
@@ -424,7 +424,8 @@ Wallet.prototype.getBalance = function(cb) {
     balanceByAddr[a]=0;
     isMain[a]=1;
   });
-  this.getUnspent(function(utxos) {
+  var f = safe ?  this.getSafeUnspent.bind(this):this.getUnspent.bind(this);
+  f(function(utxos) {
     for(var i=0;i<utxos.length; i++) {
       var u= utxos[i];
       var amt = u.amount * COIN;
@@ -444,8 +445,24 @@ Wallet.prototype.getUnspent = function(cb) {
   });
 };
 
+Wallet.prototype.getSafeUnspent = function(cb) {
+  var self = this;
+  this.blockchain.getUnspent(this.getAddressesStr(), function(unspentList) {
+
+    var ret=[];
+    var uu = self.txProposals.getUsedUnspent();
+
+    for(var i in unspentList){
+      if (uu.indexOf(unspentList[i].txid) === -1) 
+        ret.push(unspentList[i]);
+    }
+
+    return cb(ret);
+  });
+};
+
+
 Wallet.prototype.createTx = function(toAddress, amountSatStr, opts, cb) {
-console.log('[Wallet.js.447:createTx:]'); //TODO
   var self = this;
   if (typeof opts === 'function') {
     cb = opts;
@@ -456,7 +473,8 @@ console.log('[Wallet.js.447:createTx:]'); //TODO
   if (typeof opts.spendUnconfirmed === 'undefined') {
     opts.spendUnconfirmed = this.spendUnconfirmed;
   }
-  self.getUnspent(function(unspentList) {
+
+  self.getSafeUnspent(function(unspentList) {
     // TODO check enough funds, etc.
     self.createTxSync(toAddress, amountSatStr, unspentList, opts);
     self.sendPublicKeyRing();   // Change Address
@@ -480,7 +498,6 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, utxos, opts) {
   if (!opts.remainderOut) {
     opts.remainderOut ={ address: this.generateAddress(true).toString() };
   }
-console.log('[Wallet.js.480:opts: CREATETXSYNC]',opts); //TODO
 
   var b = new Builder(opts)
     .setUnspent(utxos)
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 1cab6f6dd..13604c1ef 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -31,9 +31,13 @@ console.log('[controllerUtils.js.30:created:] RECV '); //TODO
       $location.path('peer');
       $rootScope.wallet = w;
       
-      $rootScope.wallet.getBalance(function(balance) {
+      $rootScope.wallet.getBalance(false,function(balance) {
         $rootScope.totalBalance = balance;
       });
+      $rootScope.wallet.getBalance(true,function(balance) {
+        $rootScope.availableBalance = balance;
+      });
+
     });
     w.on('refresh', function() {
       console.log('[controllerUtils.js] Refreshing'); //TODO
@@ -47,8 +51,9 @@ console.log('[controllerUtils.js.45] CALLING NETSTART FROM setupUxHandlers'); //
 console.log('[controllerUtils.js.45] setupUxHandlers END'); //TODO
   };
 
-  root.setSocketHandlers = function(cb) {
+  root.setSocketHandlers = function() {
     Socket.removeAllListeners();
+    var w = $rootScope.wallet;
 
     var addrs = $rootScope.wallet.getAddressesStr();
     for(var i = 0; i < addrs.length; i++) {
@@ -59,14 +64,13 @@ console.log('[controllerUtils.js.45] setupUxHandlers END'); //TODO
     addrs.forEach(function(addr) {
       Socket.on(addr, function(txid) {
         console.log('Received!', txid);
-        $rootScope.wallet.getBalance(function(balance, balanceByAddr) {
-          $rootScope.$apply(function() {
+        w.getBalance(false,function(balance, balanceByAddr) {
             $rootScope.totalBalance = balance;
             $rootScope.balanceByAddr = balanceByAddr;
+            console.log('New balance:', balance);
+            w.getBalance(true,function(balance) {
+              $rootScope.availableBalance = balance;
           });
-
-          console.log('New balance:', balance);
-          if (typeof cb === 'function') return cb();
         });
       });
     });
diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js
index 1b9739cdb..f49c92319 100644
--- a/test/test.TxProposals.js
+++ b/test/test.TxProposals.js
@@ -128,9 +128,6 @@ describe('TxProposals model', function() {
     w.getUsedUnspent()[0].should.equal(unspentTest[0].txid);
   });
 
-
-
-
   it('#merge with self', function () {
     var priv = new PrivateKey(config);
     var w = new TxProposals({

From 2fbd075206d4282019ceef99d5fe40a9f8b5fd56 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 21 Apr 2014 13:16:15 -0300
Subject: [PATCH 3/3] available address

---
 index.html                     |  4 ++--
 js/controllers/header.js       |  6 +-----
 js/controllers/transactions.js |  5 ++---
 js/services/controllerUtils.js | 38 ++++++++++++++--------------------
 4 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/index.html b/index.html
index cb440eeab..f437762e3 100644
--- a/index.html
+++ b/index.html
@@ -214,13 +214,13 @@
     <script type="text/ng-template" id="addresses.html">
       <div class="addresses" data-ng-controller="AddressesController">
         <div ng-show='$root.wallet.publicKeyRing.isComplete()'>
-        <h3>Address</h3>
+        <h3>Addresses (available to spend)</h3>
         <div class="row">
           <div class="large-6 columns">
             <a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}}
 
  <span ng-if="!isMain[addr]">(change)</span>
- <span class="right">{{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i></span></a>
+ <span class="right">({{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i>)</span></a>
            
           </div>
           <div class="large-3 columns line-dashed-v text-center">
diff --git a/js/controllers/header.js b/js/controllers/header.js
index ac800178f..3334762c3 100644
--- a/js/controllers/header.js
+++ b/js/controllers/header.js
@@ -27,11 +27,7 @@ angular.module('copay.header').controller('HeaderController',
     $rootScope.$watch('wallet', function(wallet) {
       if (wallet) {
         controllerUtils.setSocketHandlers();
-        $rootScope.wallet.getBalance(function(balance) {
-          $rootScope.$apply(function() {
-            $rootScope.totalBalance = balance;
-          });
-        });
+        controllerUtils.updateBalance();
       }
     });
 
diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js
index e849022f5..d4356a62a 100644
--- a/js/controllers/transactions.js
+++ b/js/controllers/transactions.js
@@ -4,9 +4,6 @@ var bitcore = require('bitcore');
 angular.module('copay.transactions').controller('TransactionsController',
   function($scope, $rootScope, $location) {
     $scope.title = 'Transactions';
-
-    $scope.oneAtATime = true;
-
     var _updateTxs = function() {
 console.log('[transactions.js.10:_updateTxs:]'); //TODO
       var w   =$rootScope.wallet;
@@ -32,6 +29,7 @@ console.log('[transactions.js.10:_updateTxs:]'); //TODO
         i.missingSignatures = tx.countInputMissingSignatures(0);
         txs.push(i);
       });
+console.log('[transactions.js.35:txs:]',txs); //TODO
       $scope.txs = txs;
       w.removeListener('txProposalsUpdated',_updateTxs)
       w.once('txProposalsUpdated',_updateTxs);
@@ -69,4 +67,5 @@ console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO
       }
     };
 
+    _updateTxs();
   });
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 13604c1ef..a803c7436 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -27,33 +27,34 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
     });
 
     w.on('created', function() {
-console.log('[controllerUtils.js.30:created:] RECV '); //TODO
       $location.path('peer');
       $rootScope.wallet = w;
-      
-      $rootScope.wallet.getBalance(false,function(balance) {
-        $rootScope.totalBalance = balance;
-      });
-      $rootScope.wallet.getBalance(true,function(balance) {
-        $rootScope.availableBalance = balance;
-      });
-
+      root.updateBalance();
     });
     w.on('refresh', function() {
       console.log('[controllerUtils.js] Refreshing'); //TODO
-      $rootScope.$digest();
+      root.updateBalance();
     });
     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
+  };
+
+  root.updateBalance = function() {
+    var w = $rootScope.wallet;
+    w.getBalance(false,function(balance, balanceByAddr) {
+      $rootScope.totalBalance = balance;
+      $rootScope.balanceByAddr = balanceByAddr;
+      console.log('New balance:', balance);
+      w.getBalance(true,function(balance) {
+        $rootScope.availableBalance = balance;
+        $rootScope.$digest();
+      });
+    });
   };
 
   root.setSocketHandlers = function() {
     Socket.removeAllListeners();
-    var w = $rootScope.wallet;
 
     var addrs = $rootScope.wallet.getAddressesStr();
     for(var i = 0; i < addrs.length; i++) {
@@ -64,14 +65,7 @@ console.log('[controllerUtils.js.45] setupUxHandlers END'); //TODO
     addrs.forEach(function(addr) {
       Socket.on(addr, function(txid) {
         console.log('Received!', txid);
-        w.getBalance(false,function(balance, balanceByAddr) {
-            $rootScope.totalBalance = balance;
-            $rootScope.balanceByAddr = balanceByAddr;
-            console.log('New balance:', balance);
-            w.getBalance(true,function(balance) {
-              $rootScope.availableBalance = balance;
-          });
-        });
+        root.updateBalance();
       });
     });
   };