diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-06-07 09:07:22 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-06-07 09:07:22 +0800 |
commit | 2af6d3f6bc03932f53d199971694c3c0d9441ba8 (patch) | |
tree | b17f3343a635aa72a917b89f278f63924e25da3e /packages/base-contract/src/index.ts | |
parent | cbe5438a31a54a92a198b2cc5ad8a5d5feb033b4 (diff) | |
parent | 67c4ad128c405692e471274148c9a2ef7cd8b6ca (diff) | |
download | dexon-0x-contracts-2af6d3f6bc03932f53d199971694c3c0d9441ba8.tar.gz dexon-0x-contracts-2af6d3f6bc03932f53d199971694c3c0d9441ba8.tar.zst dexon-0x-contracts-2af6d3f6bc03932f53d199971694c3c0d9441ba8.zip |
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/website/onboarding-flow-allowances
Diffstat (limited to 'packages/base-contract/src/index.ts')
-rw-r--r-- | packages/base-contract/src/index.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/base-contract/src/index.ts b/packages/base-contract/src/index.ts index d9e28f9f2..a46d985f5 100644 --- a/packages/base-contract/src/index.ts +++ b/packages/base-contract/src/index.ts @@ -44,6 +44,7 @@ export class BaseContract { const constructorAbiIfExists = _.find( abi, (abiDefinition: AbiDefinition) => abiDefinition.type === AbiType.Constructor, + // tslint:disable-next-line:no-unnecessary-type-assertion ) as ConstructorAbi | undefined; if (!_.isUndefined(constructorAbiIfExists)) { return constructorAbiIfExists; @@ -79,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; } |