From 6f438881765838c73464655a21e248f1cf6f7d3b Mon Sep 17 00:00:00 2001
From: Gregg Zigler <gregg@bitpay.com>
Date: Wed, 17 Jun 2015 12:07:31 -0700
Subject: [PATCH] txproposal with type=multiple-outputs needs an array of
 outputs

---
 lib/model/txproposal.js   | 24 +++++++++++++++++++-----
 test/models/txproposal.js | 38 ++++++++++++++++++++++++++++++++++----
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/lib/model/txproposal.js b/lib/model/txproposal.js
index 97ae8fb..508fddf 100644
--- a/lib/model/txproposal.js
+++ b/lib/model/txproposal.js
@@ -9,21 +9,31 @@ var Address = Bitcore.Address;
 var TxProposalAction = require('./txproposalaction');
 
 function TxProposal() {
-  this.version = '1.0.0';
+  this.version = '1.0.1';
 };
 
 TxProposal.create = function(opts) {
   opts = opts || {};
 
   var x = new TxProposal();
+  x.type = opts.type;
 
   var now = Date.now();
   x.createdOn = Math.floor(now / 1000);
   x.id = _.padLeft(now, 14, '0') + Uuid.v4();
   x.walletId = opts.walletId;
   x.creatorId = opts.creatorId;
-  x.toAddress = opts.toAddress;
-  x.amount = opts.amount;
+  if (x.type == 'multiple-outputs' && opts.outputs) {
+    x.outputs = opts.outputs;
+  } else if (x.type == 'multiple-outputs') {
+    x.outputs = [{
+      toAddress: opts.toAddress,
+      amount: opts.amount
+    }];
+  } else {
+    x.toAddress = opts.toAddress;
+    x.amount = opts.amount;
+  }
   x.message = opts.message;
   x.payProUrl = opts.payProUrl;
   x.proposalSignature = opts.proposalSignature;
@@ -34,9 +44,11 @@ TxProposal.create = function(opts) {
   x.requiredRejections = opts.requiredRejections;
   x.status = 'pending';
   x.actions = [];
-  x.outputOrder = _.shuffle(_.range(2));
+  var outputCount = x.outputs ? x.outputs.length + 1 : 2;
+  x.outputOrder = _.shuffle(_.range(outputCount));
   x.fee = null;
-  x.network = Bitcore.Address(x.toAddress).toObject().network;
+  var toAddress = x.outputs ? x.outputs[0].toAddress : x.toAddress;
+  x.network = Bitcore.Address(toAddress).toObject().network;
   x.feePerKb = opts.feePerKb;
 
   return x;
@@ -46,10 +58,12 @@ TxProposal.fromObj = function(obj) {
   var x = new TxProposal();
 
   x.version = obj.version;
+  x.type = obj.type;
   x.createdOn = obj.createdOn;
   x.id = obj.id;
   x.walletId = obj.walletId;
   x.creatorId = obj.creatorId;
+  x.outputs = obj.outputs;
   x.toAddress = obj.toAddress;
   x.amount = obj.amount;
   x.message = obj.message;
diff --git a/test/models/txproposal.js b/test/models/txproposal.js
index da85a5e..a152217 100644
--- a/test/models/txproposal.js
+++ b/test/models/txproposal.js
@@ -15,14 +15,19 @@ describe('TXProposal', function() {
       var txp = TXP.fromObj(aTXP());
       should.exist(txp);
     });
+    it('should create a multiple-outputs TXP', function() {
+      var txp = TXP.fromObj(aTXP('multiple-outputs'));
+      should.exist(txp);
+    });
   });
-  describe('#_getBitcoreTx', function() {
+
+  describe('#getBitcoreTx', function() {
     it('should create a valid bitcore TX', function() {
       var txp = TXP.fromObj(aTXP());
       var t = txp.getBitcoreTx();
       should.exist(t);
     });
-    it('should order ouputs as specified by outputOrder', function() {
+    it('should order outputs as specified by outputOrder', function() {
       var txp = TXP.fromObj(aTXP());
 
       txp.outputOrder = [0, 1];
@@ -33,6 +38,12 @@ describe('TXProposal', function() {
       var t = txp.getBitcoreTx();
       t.getChangeOutput().should.deep.equal(t.outputs[0]);
     });
+    it('should create a bitcore TX with multiple outputs', function() {
+      var txp = TXP.fromObj(aTXP('multiple-outputs'));
+      txp.outputOrder = [0, 1, 2];
+      var t = txp.getBitcoreTx();
+      t.getChangeOutput().should.deep.equal(t.outputs[2]);
+    });
   });
 
 
@@ -86,8 +97,8 @@ var theXPriv = 'xprv9s21ZrQH143K2rMHbXTJmWTuFx6ssqn1vyRoZqPkCXYchBSkp5ey8kMJe84s
 var theXPub = 'xpub661MyMwAqRbcFLRkhYzK8eQdoywNHJVsJCMQNDoMks5bZymuMcyDgYfnVQYq2Q9npnVmdTAthYGc3N3uxm5sEdnTpSqBc4YYTAhNnoSxCm9';
 var theSignatures = ['3045022100896aeb8db75fec22fddb5facf791927a996eb3aee23ee6deaa15471ea46047de02204c0c33f42a9d3ff93d62738712a8c8a5ecd21b45393fdd144e7b01b5a186f1f9'];
 
-var aTXP = function() {
-  return {
+var aTXP = function(type) {
+  var txp = {
     "version": "1.0.0",
     "createdOn": 1423146231,
     "id": "75c34f49-1ed6-255f-e9fd-0c71ae75ed1e",
@@ -123,5 +134,24 @@ var aTXP = function() {
     "status": "pending",
     "actions": [],
     "outputOrder": [0, 1],
+  };
+  if (type == 'multiple-outputs') {
+    txp.type = type;
+    txp.outputs = [
+      {
+        toAddress: "18PzpUFkFZE8zKWUPvfykkTxmB9oMR8qP7",
+        amount: 10000000,
+        message: "first message"
+      },
+      {
+        toAddress: "18PzpUFkFZE8zKWUPvfykkTxmB9oMR8qP7",
+        amount: 20000000,
+        message: "second message"
+      },
+    ];
+    txp.outputOrder = [0, 1, 2];
+    delete txp.toAddress;
+    delete txp.amount;
   }
+  return txp;
 };