Merge branch 'development' into feature/addSubproviders

* development: (50 commits)
  Add PR number to changelog
  Address feedback
  Add requestId to subscription messages and update json-schemas
  Remove isomorphic-fetch types from contracts package
  Update README
  Regenerate files
  Make it private
  Change package name
  Update README
  Make fileExtension configurable
  Rename abi-gen to typed-contracts
  Add docs for typed-contracts
  Remove TODOs
  Introduce separate ContextData type and rework it
  Check ABI is defined
  Introduce a const for 'contract.mustache'
  Improve error message
  Reuse util
  Fix a typo
  Introduce a const for 'function'
  ...

# Conflicts:
#	yarn.lock

1 files changed, 77 insertions, 0 deletions

diff --git a/packages/contracts/util/formatters.ts b/packages/contracts/util/formatters.ts
new file mode 100644
index 000000000..0ad44481a
--- /dev/null
+++ b/packages/contracts/util/formatters.ts
@@ -0,0 +1,77 @@
+import {BigNumber} from 'bignumber.js';
+import * as _ from 'lodash';
+
+import {Order} from './order';
+import {BatchCancelOrders, BatchFillOrders, FillOrdersUpTo} from './types';
+
+export const formatters = {
+    createBatchFill(orders: Order[],
+                    shouldThrowOnInsufficientBalanceOrAllowance: boolean,
+                    fillTakerTokenAmounts: BigNumber[] = []) {
+        const batchFill: BatchFillOrders = {
+            orderAddresses: [],
+            orderValues: [],
+            fillTakerTokenAmounts,
+            shouldThrowOnInsufficientBalanceOrAllowance,
+            v: [],
+            r: [],
+            s: [],
+        };
+        _.forEach(orders, order => {
+            batchFill.orderAddresses.push([order.params.maker, order.params.taker, order.params.makerToken,
+                                     order.params.takerToken, order.params.feeRecipient]);
+            batchFill.orderValues.push([order.params.makerTokenAmount, order.params.takerTokenAmount,
+                                        order.params.makerFee, order.params.takerFee,
+                                        order.params.expirationTimestampInSec, order.params.salt]);
+            batchFill.v.push(order.params.v);
+            batchFill.r.push(order.params.r);
+            batchFill.s.push(order.params.s);
+            if (fillTakerTokenAmounts.length < orders.length) {
+                batchFill.fillTakerTokenAmounts.push(order.params.takerTokenAmount);
+            }
+        });
+        return batchFill;
+    },
+    createFillUpTo(orders: Order[],
+                   shouldThrowOnInsufficientBalanceOrAllowance: boolean,
+                   fillTakerTokenAmount: BigNumber) {
+        const fillUpTo: FillOrdersUpTo = {
+            orderAddresses: [],
+            orderValues: [],
+            fillTakerTokenAmount,
+            shouldThrowOnInsufficientBalanceOrAllowance,
+            v: [],
+            r: [],
+            s: [],
+        };
+        orders.forEach(order => {
+            fillUpTo.orderAddresses.push([order.params.maker, order.params.taker, order.params.makerToken,
+                                          order.params.takerToken, order.params.feeRecipient]);
+            fillUpTo.orderValues.push([order.params.makerTokenAmount, order.params.takerTokenAmount,
+                                       order.params.makerFee, order.params.takerFee,
+                                       order.params.expirationTimestampInSec, order.params.salt]);
+            fillUpTo.v.push(order.params.v);
+            fillUpTo.r.push(order.params.r);
+            fillUpTo.s.push(order.params.s);
+        });
+        return fillUpTo;
+    },
+    createBatchCancel(orders: Order[], cancelTakerTokenAmounts: BigNumber[] = []) {
+        const batchCancel: BatchCancelOrders = {
+            orderAddresses: [],
+            orderValues: [],
+            cancelTakerTokenAmounts,
+        };
+        orders.forEach(order => {
+            batchCancel.orderAddresses.push([order.params.maker, order.params.taker, order.params.makerToken,
+                                       order.params.takerToken, order.params.feeRecipient]);
+            batchCancel.orderValues.push([order.params.makerTokenAmount, order.params.takerTokenAmount,
+                                          order.params.makerFee, order.params.takerFee,
+                                          order.params.expirationTimestampInSec, order.params.salt]);
+            if (cancelTakerTokenAmounts.length < orders.length) {
+                batchCancel.cancelTakerTokenAmounts.push(order.params.takerTokenAmount);
+            }
+        });
+        return batchCancel;
+    },
+};