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] 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);
   });
-
-
-
 });