Merge branch 'fillOrderAsync' into unavailableFilledCancelled

# Conflicts:
#	src/0x.js.ts
#	test/exchange_wrapper_test.ts

3 files changed, 23 insertions, 7 deletions

diff --git a/src/0x.js.ts b/src/0x.js.ts
index 0e9d71586..967c81ed8 100644
--- a/src/0x.js.ts
+++ b/src/0x.js.ts
@@ -130,9 +130,9 @@ export class ZeroEx {
     /**
      * Get the default account set for sending transactions.
      */
-    public async getTransactionSenderAccountAsync(): Promise<string> {
-        const senderAccount = await this.web3Wrapper.getSenderAddressOrThrowAsync();
-        return senderAccount;
+    public async getTransactionSenderAccountIfExistsAsync(): Promise<string|undefined> {
+        const senderAccountIfExists = await this.web3Wrapper.getSenderAddressIfExistsAsync();
+        return senderAccountIfExists;
     }
     /**
      * Computes the orderHash given the order parameters and returns it as a hex encoded string.
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 2894c5a9f..c1b310bf0 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -159,9 +159,9 @@ export class ExchangeWrapper extends ContractWrapper {
         );
         this.throwErrorLogsAsErrors(response.logs);
     }
-    private async validateFillOrderAsync(signedOrder: SignedOrder, fillAmount: BigNumber.BigNumber,
+    private async validateFillOrderAsync(signedOrder: SignedOrder, fillTakerAmountInBaseUnits: BigNumber.BigNumber,
                                          senderAddress: string) {
-        if (fillAmount.eq(0)) {
+        if (fillTakerAmountInBaseUnits.eq(0)) {
             throw new Error(FillOrderValidationErrs.FILL_AMOUNT_IS_ZERO);
         }
         if (signedOrder.taker !== constants.NULL_ADDRESS && signedOrder.taker !== senderAddress) {
@@ -177,9 +177,22 @@ export class ExchangeWrapper extends ContractWrapper {
                                                                               signedOrder.maker);
         const takerAllowance = await this.tokenWrapper.getProxyAllowanceAsync(signedOrder.takerTokenAddress,
                                                                               senderAddress);
-        if (fillAmount.greaterThan(takerBalance)) {
+        // How many taker tokens would you get for 1 maker token;
+        const exchangeRate = signedOrder.takerTokenAmount.div(signedOrder.makerTokenAmount);
+        const fillMakerAmountInBaseUnits = fillTakerAmountInBaseUnits.div(exchangeRate);
+
+        if (fillTakerAmountInBaseUnits.greaterThan(takerBalance)) {
             throw new Error(FillOrderValidationErrs.NOT_ENOUGH_TAKER_BALANCE);
         }
+        if (fillTakerAmountInBaseUnits.greaterThan(takerAllowance)) {
+            throw new Error(FillOrderValidationErrs.NOT_ENOUGH_TAKER_ALLOWANCE);
+        }
+        if (fillMakerAmountInBaseUnits.greaterThan(makerBalance)) {
+            throw new Error(FillOrderValidationErrs.NOT_ENOUGH_MAKER_BALANCE);
+        }
+        if (fillMakerAmountInBaseUnits.greaterThan(makerAllowance)) {
+            throw new Error(FillOrderValidationErrs.NOT_ENOUGH_MAKER_ALLOWANCE);
+        }
     }
     private throwErrorLogsAsErrors(logs: ContractEvent[]): void {
         const errEvent = _.find(logs, {event: 'LogError'});
diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts
index c1263222a..49bd8b67d 100644
--- a/src/web3_wrapper.ts
+++ b/src/web3_wrapper.ts
@@ -17,6 +17,9 @@ export class Web3Wrapper {
     public isAddress(address: string): boolean {
         return this.web3.isAddress(address);
     }
+    public getDefaultAccount(): string {
+        return this.web3.eth.defaultAccount;
+    }
     public setDefaultAccount(address: string): void {
         this.web3.eth.defaultAccount = address;
     }
@@ -66,7 +69,7 @@ export class Web3Wrapper {
         const {timestamp} = await promisify(this.web3.eth.getBlock)(blockHash);
         return timestamp;
     }
-    private async getSenderAddressIfExistsAsync(): Promise<string|undefined> {
+    public async getSenderAddressIfExistsAsync(): Promise<string|undefined> {
         const defaultAccount = this.web3.eth.defaultAccount;
         if (!_.isUndefined(defaultAccount)) {
             return defaultAccount;