Merge pull request #814 from matiu/bug/fix-change-address-check

fix changeAddress check, fail before

lib/expressapp.js

@@ -692,7 +692,7 @@ ExpressApp.prototype.start = function(opts, cb) {
   router.get('/v1/txnotes/', function(req, res) {
     getServerWithAuth(req, res, function(server) {
       var opts = {};
-      if (_.isNumber(+req.query.minTs)) {
+      if (req.query.minTs && _.isNumber(+req.query.minTs)) {
         opts.minTs = +req.query.minTs;
       }
       server.getTxNotes(opts, function(err, notes) {

lib/model/txproposal.js

@@ -193,8 +193,8 @@ TxProposal.prototype._buildTx = function() {
   var totalInputs = _.sumBy(t.inputs, 'output.satoshis');
   var totalOutputs = _.sumBy(t.outputs, 'satoshis');
 
-  $.checkState(totalInputs > 0 && totalOutputs > 0 && totalInputs >= totalOutputs);
-  $.checkState(totalInputs - totalOutputs <= Defaults.MAX_TX_FEE);
+  $.checkState(totalInputs > 0 && totalOutputs > 0 && totalInputs >= totalOutputs, 'not-enought-inputs');
+  $.checkState(totalInputs - totalOutputs <= Defaults.MAX_TX_FEE, 'fee-too-high');
 
   return t;
 };

lib/server.js

@@ -2286,7 +2286,7 @@ WalletService.prototype.createTx = function(opts, cb) {
     } else {
       if (opts.changeAddress) {
         self.storage.fetchAddressByWalletId(wallet.id, opts.changeAddress, function(err, address) {
-          if (err) return cb(Errors.INVALID_CHANGE_ADDRESS);
+          if (err || !address) return cb(Errors.INVALID_CHANGE_ADDRESS);
           return cb(null, address);
         });
       } else {

package.json

@@ -2,7 +2,7 @@
   "name": "bitcore-wallet-service",
   "description": "A service for Mutisig HD Bitcoin Wallets",
   "author": "BitPay Inc",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "license": "MIT",
   "keywords": [
     "bitcoin",

test/integration/server.js

@@ -3388,6 +3388,27 @@ console.log('[server.js.425:err:]',err); //TODO
               });
             });
           });
+          it('should be fail if specified change address is not from the wallet', function(done) {
+
+            helpers.stubUtxos(server, wallet, [1, 2], function(utxos) {
+
+              var addr = (new Bitcore_[coin].PrivateKey()).toAddress();
+              var txOpts = {
+                outputs: [{
+                  toAddress: addressStr,
+                  amount: 0.8e8,
+                }],
+                feePerKb: 100e2,
+                changeAddress: addr.toString(),
+              };
+              server.createTx(txOpts, function(err, tx) {
+                should.exist(err);
+                err.code.should.equal('INVALID_CHANGE_ADDRESS');
+                done();
+              });
+            });
+          });
+
           it('should be able to specify inputs & absolute fee', function(done) {
             helpers.stubUtxos(server, wallet, [1, 2], function(utxos) {
               var txOpts = {