From 4092f0cb9de29a437abe1ca529456674cadbbf49 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 21 Apr 2014 20:28:57 -0300
Subject: [PATCH 1/3] works sometimes

---
 js/controllers/transactions.js  | 13 +++---
 js/models/core/PrivateKey.js    |  2 +
 js/models/core/PublicKeyRing.js |  1 +
 js/models/core/Wallet.js        |  7 ++--
 js/services/controllerUtils.js  |  2 +-
 test/test.TxProposals.js        | 70 +++++++++++++++++++++++++++++----
 6 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js
index d4356a62a..6f29bdd40 100644
--- a/js/controllers/transactions.js
+++ b/js/controllers/transactions.js
@@ -51,17 +51,20 @@ console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO
     $scope.sign = function (ntxid) {
       var w = $rootScope.wallet;
       var ret = w.sign(ntxid);
-      _updateTxs();
 
+      if (!ret) {
+        $rootScope.flashMessage = {type:'error', message: 'There was an error signing the Transaction'};
+        _updateTxs();
+        $rootScope.$digest();    
+        return;
+      }
       var p = w.getTxProposal(ntxid);
       if (p.txp.builder.isFullySigned()) {
         $scope.send(ntxid);
+        _updateTxs();
+        $rootScope.$digest();    
       }
       else {
-        $rootScope.flashMessage = ret
-          ? {type:'success', message: 'Transactions signed'}
-          : {type:'error', message: 'There was an error signing the Transaction'}
-          ;
         _updateTxs();
         $rootScope.$digest();    
       }
diff --git a/js/models/core/PrivateKey.js b/js/models/core/PrivateKey.js
index 2002a14b6..5e7ab06cf 100644
--- a/js/models/core/PrivateKey.js
+++ b/js/models/core/PrivateKey.js
@@ -71,6 +71,8 @@ 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 a81097b03..369e90f58 100644
--- a/js/models/core/PublicKeyRing.js
+++ b/js/models/core/PublicKeyRing.js
@@ -162,6 +162,7 @@ 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;
 };
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 823c91098..452ee58b4 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -318,7 +318,7 @@ Wallet.prototype.sign = function(ntxid) {
 
   var pkr = self.publicKeyRing;
   var keys = self.privateKey.getAll(pkr.addressIndex, pkr.changeAddressIndex);
-console.log('[Wallet.js.329:keys:]',keys); //TODO
+console.log('[Wallet.js.329:keys:] LENGTH::',keys.length, pkr.addressIndex, pkr.changeAddressIndex); //TODO
 
   var b = txp.builder;
   var before = b.signaturesAdded;
@@ -497,8 +497,9 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, utxos, opts) {
 
   var signRet;  
   if (priv) {
-console.log('[Wallet.js.486] aLL Priv', priv.getAll(pkr.addressIndex, pkr.changeAddressIndex)); //TODO
-    b.sign( priv.getAll(pkr.addressIndex, pkr.changeAddressIndex) );
+    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 );
   }
 console.log('[Wallet.js.494]', b, b.build().serialize().toString('hex')); //TODO
   var me = {};
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index a803c7436..bce88761d 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -61,7 +61,7 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
       console.log('### SUBSCRIBE TO', addrs[i]);
       Socket.emit('subscribe', addrs[i]);
     }
-
+console.log('[controllerUtils.js.64]'); //TODO
     addrs.forEach(function(addr) {
       Socket.on(addr, function(txid) {
         console.log('Received!', txid);
diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js
index f49c92319..e24159d38 100644
--- a/test/test.TxProposals.js
+++ b/test/test.TxProposals.js
@@ -59,10 +59,63 @@ var createPKR = function (bip32s) {
   return w;
 };
 
+var vopts =  {
+  verifyP2SH: true,
+  dontVerifyStrictEnc: true
+};
+
 
 describe('TxProposals model', function() {
 
-  it('should create an instance', function () {
+
+  it('verify TXs', function (done) {
+
+    var priv = new PrivateKey(config);
+    var priv2 = new PrivateKey(config);
+    var priv3 = new PrivateKey(config);
+   var ts = Date.now();
+    var isChange=0; 
+    var index=0; 
+    var pkr = createPKR([priv, priv2,  priv3]);
+    var opts = {remainderOut: { address: pkr.generateAddress(true).toString() }};
+
+    var w = new TxProposals({
+      networkName: config.networkName,
+    });
+    unspentTest[0].address        = pkr.getAddress(index, isChange).toString();
+    unspentTest[0].scriptPubKey   = pkr.getScriptPubKeyHex(index, isChange);
+    w.add(createTx(
+      '15q6HKjWHAksHcH91JW23BJEuzZgFwydBt', 
+      '123456789', 
+      unspentTest,
+      opts,
+      priv,
+      pkr
+    ));
+    var k = Object.keys(w.txps)[0];
+    var b = w.txps[k].builder;
+    var tx = b.build();
+    tx.isComplete().should.equal(false);
+    b.sign( priv2.getAll(pkr.addressIndex, pkr.changeAddressIndex) );
+    b.sign( priv3.getAll(pkr.addressIndex, pkr.changeAddressIndex) );
+    tx = b.build();
+    tx.isComplete().should.equal(true);
+
+    var s = new Script(new Buffer(unspentTest[0].scriptPubKey,'hex'));
+
+    tx.verifyInput(0,s, {
+      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);
+      done();
+    });
+  });
+ 
+
+  it.skip('should create an instance', function () {
     var w = new TxProposals({
       networkName: config.networkName
     });
@@ -104,7 +157,7 @@ describe('TxProposals model', function() {
   };
 
 
-  it('#getUsedUnspend', function () {
+  it.skip('#getUsedUnspend', function () {
     var priv = new PrivateKey(config);
     var w = new TxProposals({
       networkName: config.networkName,
@@ -128,7 +181,7 @@ describe('TxProposals model', function() {
     w.getUsedUnspent()[0].should.equal(unspentTest[0].txid);
   });
 
-  it('#merge with self', function () {
+  it.skip('#merge with self', function () {
     var priv = new PrivateKey(config);
     var w = new TxProposals({
       networkName: config.networkName,
@@ -169,7 +222,7 @@ describe('TxProposals model', function() {
 
 
 
-  it('#merge, merge signatures case 1', function () {
+  it.skip('#merge, merge signatures case 1', function () {
     var priv2 = new PrivateKey(config);
     var priv = new PrivateKey(config);
     var ts = Date.now();
@@ -244,7 +297,7 @@ var _dumpChunks = function (scriptSig, label) {
 };
 
 
-  it('#merge, merge signatures case 2', function () {
+  it.skip('#merge, merge signatures case 2', function () {
 
     var priv = new PrivateKey(config);
     var priv2 = new PrivateKey(config);
@@ -346,7 +399,7 @@ var _dumpChunks = function (scriptSig, label) {
   });
 
 
-  it('#merge, merge signatures case 3', function () {
+  it.skip('#merge, merge signatures case 3', function () {
 
     var priv = new PrivateKey(config);
     var priv2 = new PrivateKey(config);
@@ -443,7 +496,7 @@ var _dumpChunks = function (scriptSig, label) {
 
 
 
-  it('#toObj #fromObj roundtrip', function () {
+  it.skip('#toObj #fromObj roundtrip', function () {
 
     var priv = new PrivateKey(config);
     var pkr = createPKR([priv]);
@@ -496,5 +549,6 @@ var _dumpChunks = function (scriptSig, label) {
     w2.merge(w);
     Object.keys(w2.txps).length.should.equal(1);
   });
+
+
 });
- 

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 2/3] 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]);

From 3c7c24de493629d6a8f2623dd0e882fc7b0178ed Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 22 Apr 2014 23:07:20 -0300
Subject: [PATCH 3/3] fix ux issues. tx sending working

---
 index.html                     | 15 ++++++++++-----
 js/controllers/transactions.js |  8 ++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index 15af8e066..a88a9fb03 100644
--- a/index.html
+++ b/index.html
@@ -249,11 +249,13 @@
               <div class="txheader">
                 <div class="row">
                   <div class="large-8 columns">
-                    <tr ng-repeat="o in tx.outs">
-                      <td class="text-right size-24">{{o.value}} <i class="fi-bitcoin"></i></td>
-                      <td class="text-center size-48"> <i class="fi-arrow-right size-40"> </i>
-                      <td class="text-left size-24">{{o.address}}</td>
+                    <table style="width:100%">
+                    <tr ng-repeat="out in tx.outs">
+                      <td class="text-right size-24"> <i class="fi-bitcoin"></i> {{out.value}}</td>
+                      <td class="text-center size-48"> <i class="fi-arrow-right size-24"> </i></td>
+                      <td class="text-left size-24">{{out.address}}</td>
                     </tr>
+                    </table>
                   </div>
                   <div class="large-4 columns text-right">
                     <h6> created at {{tx.createdTs | date:'medium'}} </h6>
@@ -266,7 +268,10 @@
                   <table style="width:100%">
                     <tbody>
                       <tr>
-                        <small class="right text-gray"> <strong> Proposal ID: </strong> {{tx.ntxid}} </small>
+                        <small class="right text-gray"> 
+                           Fee: <strong> <i class="fi-bitcoin"></i> {{tx.fee}}  </strong>
+                          <strong> Proposal ID: </strong> {{tx.ntxid}} 
+                        </small>
                       </tr>                     
                       <tr ng-repeat="(peer, actions) in tx.peerActions">
                         <td colspan="3">
diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js
index 6f29bdd40..7cc47598e 100644
--- a/js/controllers/transactions.js
+++ b/js/controllers/transactions.js
@@ -5,8 +5,9 @@ angular.module('copay.transactions').controller('TransactionsController',
   function($scope, $rootScope, $location) {
     $scope.title = 'Transactions';
     var _updateTxs = function() {
-console.log('[transactions.js.10:_updateTxs:]'); //TODO
       var w   =$rootScope.wallet;
+      if (!w) return;
+
       var inT = w.getTxProposals();
       var txs  = [];
 
@@ -25,11 +26,10 @@ console.log('[transactions.js.10:_updateTxs:]'); //TODO
         });
         // extra fields
         i.outs = outs;
-        i.fee = i.feeSat/bitcore.util.COIN;
+        i.fee = i.builder.feeSat/bitcore.util.COIN;
         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);
@@ -38,7 +38,7 @@ console.log('[transactions.js.35:txs:]',txs); //TODO
     $scope.send = function (ntxid) {
       var w = $rootScope.wallet;
       w.sendTx(ntxid, function(txid) {
-console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO
+          console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO
           $rootScope.flashMessage = txid
             ? {type:'success', message: 'Transactions SENT! txid:' + txid}
             : {type:'error', message: 'There was an error sending the Transaction'}