From 31b2d5abacb40098674b94a58be30557b881af91 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 22 Apr 2014 22:07:18 -0300
Subject: [PATCH] small fixes

---
 js/models/core/PrivateKey.js    |  3 ---
 js/models/core/PublicKeyRing.js | 20 +++++++++++++-------
 js/models/core/Wallet.js        | 17 ++++++-----------
 js/models/network/WebRTC.js     |  1 -
 test/test.TxProposals.js        | 19 +++++++++----------
 5 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/js/models/core/PrivateKey.js b/js/models/core/PrivateKey.js
index 5e7ab06cf..0e2d87631 100644
--- a/js/models/core/PrivateKey.js
+++ b/js/models/core/PrivateKey.js
@@ -71,9 +71,6 @@ PrivateKey.prototype.get = function(index,isChange) {
 
 PrivateKey.prototype.getAll = function(addressIndex, changeAddressIndex) {
   var ret = [];
-console.log('[PrivateKey.js.75:addressIndex:]',addressIndex); //TODO
-console.log('[PrivateKey.js.79:changeAddressIndex:]',changeAddressIndex); //TODO
-
   for(var i=0;i<addressIndex; i++) {
     ret.push(this.get(i,false));
   }
diff --git a/js/models/core/PublicKeyRing.js b/js/models/core/PublicKeyRing.js
index 369e90f58..14f611d8b 100644
--- a/js/models/core/PublicKeyRing.js
+++ b/js/models/core/PublicKeyRing.js
@@ -142,7 +142,7 @@ PublicKeyRing.prototype.getPubKeys = function (index, isChange) {
       var bip32 = this.copayersBIP32[i].derive(path);
       pubKeys[i] = bip32.eckey.public;
     }
-    this.publicKeysCache[path] = pubKeys.map(function(pk){return pk.toString('hex')});
+    this.publicKeysCache[path] = pubKeys.map(function(pk){return pk.toString('hex');});
   } else {
     pubKeys = pubKeys.map(function(s){return new Buffer(s,'hex')});
   }
@@ -158,22 +158,30 @@ PublicKeyRing.prototype._checkIndexRange = function (index, isChange) {
   }
 };
 
+// TODO this could be cached
 PublicKeyRing.prototype.getRedeemScript = function (index, isChange) {
   this._checkIndexRange(index, isChange);
 
   var pubKeys = this.getPubKeys(index, isChange);
-console.log('[PublicKeyRing.js.164:index:] getRedeemScript: ',index, isChange); //TODO
   var script  = Script.createMultisig(this.requiredCopayers, pubKeys);
   return script;
 };
 
-
+// TODO this could be cached
 PublicKeyRing.prototype.getAddress = function (index, isChange) {
   this._checkIndexRange(index, isChange);
   var script  = this.getRedeemScript(index,isChange);
   return Address.fromScript(script, this.network.name);
 };
 
+// TODO this could be cached
+PublicKeyRing.prototype._addScriptMap = function (map, index, isChange) {
+  this._checkIndexRange(index, isChange);
+  var script  = this.getRedeemScript(index,isChange);
+  map[Address.fromScript(script, this.network.name).toString()] = script.getBuffer().toString('hex');
+};
+
+// TODO this could be cached
 PublicKeyRing.prototype.getScriptPubKeyHex = function (index, isChange) {
   this._checkIndexRange(index, isChange);
   var addr  = this.getAddress(index,isChange);
@@ -181,7 +189,6 @@ PublicKeyRing.prototype.getScriptPubKeyHex = function (index, isChange) {
 };
 
 
-
 //generate a new address, update index.
 PublicKeyRing.prototype.generateAddress = function(isChange) {
 
@@ -216,11 +223,10 @@ PublicKeyRing.prototype.getRedeemScriptMap = function () {
   var ret = {};
 
   for (var i=0; i<this.changeAddressIndex; i++) {
-    ret[this.getAddress(i,true)] = this.getRedeemScript(i,true).getBuffer().toString('hex');
+    this._addScriptMap(ret,i,true);
   }
-
   for (var i=0; i<this.addressIndex; i++) {
-    ret[this.getAddress(i)] = this.getRedeemScript(i).getBuffer().toString('hex');
+    this._addScriptMap(ret,i,false);
   }
   return ret;
 };
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 452ee58b4..b966e295a 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -269,7 +269,6 @@ Wallet.prototype.sendPublicKeyRing = function(recipients) {
 
 Wallet.prototype.generateAddress = function(isChange) {
   var addr = this.publicKeyRing.generateAddress(isChange);
-console.log('[Wallet.js.281:addr:]',addr, this.publicKeyRing.toObj(), this.getAddresses()); //TODO
   this.sendPublicKeyRing();
   this.store(true);
   return addr;
@@ -318,7 +317,6 @@ Wallet.prototype.sign = function(ntxid) {
 
   var pkr = self.publicKeyRing;
   var keys = self.privateKey.getAll(pkr.addressIndex, pkr.changeAddressIndex);
-console.log('[Wallet.js.329:keys:] LENGTH::',keys.length, pkr.addressIndex, pkr.changeAddressIndex); //TODO
 
   var b = txp.builder;
   var before = b.signaturesAdded;
@@ -465,11 +463,11 @@ Wallet.prototype.createTx = function(toAddress, amountSatStr, opts, cb) {
   }
 
   self.getSafeUnspent(function(unspentList) {
-    // TODO check enough funds, etc.
-    self.createTxSync(toAddress, amountSatStr, unspentList, opts);
-    self.sendPublicKeyRing();   // Change Address
-    self.sendTxProposals();
-    self.store();
+    if (self.createTxSync(toAddress, amountSatStr, unspentList, opts)) {
+      self.sendPublicKeyRing();   // Change Address
+      self.sendTxProposals();
+      self.store();
+    }
     return cb();
   });
 };
@@ -497,11 +495,8 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, utxos, opts) {
 
   var signRet;  
   if (priv) {
-    var keys = priv.getAll(pkr.addressIndex, pkr.changeAddressIndex);
-console.log('[Wallet.js.329:keys:] LENGTH::',keys.length, pkr.addressIndex, pkr.changeAddressIndex); //TODO
-    b.sign( keys );
+    b.sign( priv.getAll(pkr.addressIndex, pkr.changeAddressIndex) );
   }
-console.log('[Wallet.js.494]', b, b.build().serialize().toString('hex')); //TODO
   var me = {};
   var myId = this.getMyPeerId();
   var now = Date.now();
diff --git a/js/models/network/WebRTC.js b/js/models/network/WebRTC.js
index 382f9e536..1d7dc10a8 100644
--- a/js/models/network/WebRTC.js
+++ b/js/models/network/WebRTC.js
@@ -261,7 +261,6 @@ console.log('[WebRTC.js.255] WARN: NO CONNECTION TO:', peerId); //TODO
 
 Network.prototype.send = function(peerIds, data, cb) {
   var self=this;
-console.log('[WebRTC.js.242] SENDING ', data.type); //TODO
   if (!peerIds) {
     peerIds = this.connectedPeers;
     data.isBroadcast = 1;
diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js
index e24159d38..647b634d4 100644
--- a/test/test.TxProposals.js
+++ b/test/test.TxProposals.js
@@ -107,15 +107,14 @@ describe('TxProposals model', function() {
       verifyP2SH: true,
       dontVerifyStrictEnc: true
     }, function(err, results){
-      console.log('[test.TxProposals.js.106:err:]',err, results); //TODO
-      //      should.not.exist(err);
-      //      results.should.equal(true);
+         should.not.exist(err);
+         results.should.equal(true);
       done();
     });
   });
  
 
-  it.skip('should create an instance', function () {
+  it('should create an instance', function () {
     var w = new TxProposals({
       networkName: config.networkName
     });
@@ -157,7 +156,7 @@ describe('TxProposals model', function() {
   };
 
 
-  it.skip('#getUsedUnspend', function () {
+  it('#getUsedUnspend', function () {
     var priv = new PrivateKey(config);
     var w = new TxProposals({
       networkName: config.networkName,
@@ -181,7 +180,7 @@ describe('TxProposals model', function() {
     w.getUsedUnspent()[0].should.equal(unspentTest[0].txid);
   });
 
-  it.skip('#merge with self', function () {
+  it('#merge with self', function () {
     var priv = new PrivateKey(config);
     var w = new TxProposals({
       networkName: config.networkName,
@@ -222,7 +221,7 @@ describe('TxProposals model', function() {
 
 
 
-  it.skip('#merge, merge signatures case 1', function () {
+  it('#merge, merge signatures case 1', function () {
     var priv2 = new PrivateKey(config);
     var priv = new PrivateKey(config);
     var ts = Date.now();
@@ -297,7 +296,7 @@ var _dumpChunks = function (scriptSig, label) {
 };
 
 
-  it.skip('#merge, merge signatures case 2', function () {
+  it('#merge, merge signatures case 2', function () {
 
     var priv = new PrivateKey(config);
     var priv2 = new PrivateKey(config);
@@ -399,7 +398,7 @@ var _dumpChunks = function (scriptSig, label) {
   });
 
 
-  it.skip('#merge, merge signatures case 3', function () {
+  it('#merge, merge signatures case 3', function () {
 
     var priv = new PrivateKey(config);
     var priv2 = new PrivateKey(config);
@@ -496,7 +495,7 @@ var _dumpChunks = function (scriptSig, label) {
 
 
 
-  it.skip('#toObj #fromObj roundtrip', function () {
+  it('#toObj #fromObj roundtrip', function () {
 
     var priv = new PrivateKey(config);
     var pkr = createPKR([priv]);