Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/improve-linting

2018-06-06 16:36:11 -07:00
parent a97d77064a 785b9811f3
commit e0d5b9daf8
61 changed files with 1024 additions and 293 deletions
--- a/packages/base-contract/src/index.ts
+++ b/packages/base-contract/src/index.ts
@@ -80,8 +80,7 @@ export class BaseContract {
            // Awaiting https://github.com/Microsoft/TypeScript/pull/13288 to be merged
        } as any;
        if (_.isUndefined(txDataWithDefaults.gas) && !_.isUndefined(estimateGasAsync)) {
-            const estimatedGas = await estimateGasAsync(txData);
-            txDataWithDefaults.gas = estimatedGas;
+            txDataWithDefaults.gas = await estimateGasAsync(txData);
        }
        return txDataWithDefaults;
    }