diff options
author | Fabio Berger <me@fabioberger.com> | 2017-10-30 22:17:39 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-10-30 22:17:39 +0800 |
commit | b49d1dae7debbb50c57dc4755447f2cffee35ccd (patch) | |
tree | 25397180b858b508312cc4a6c721b848cf1cd1d2 /src/web3_wrapper.ts | |
parent | 9b0496b0491e9fbe353a4c29d8082cf56ede9e38 (diff) | |
parent | fec8f8a881dde19132dcf0eea727ae9fbb25adb6 (diff) | |
download | dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.gz dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.bz2 dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.lz dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.xz dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.zst dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.zip |
Merge branch 'development' of github.com:0xProject/0x.js into development
* 'development' of github.com:0xProject/0x.js:
Update CHANGELOG
0.22.4
Add HACK comments
Add a forgotten augmentation file
Upgrade bignumber to the version with native typings and remove typings
Downgrade typedoc
Upgrade bignumber to the version with native typings and remove typings
Diffstat (limited to 'src/web3_wrapper.ts')
-rw-r--r-- | src/web3_wrapper.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts index ff5d25d9c..3b1e4477b 100644 --- a/src/web3_wrapper.ts +++ b/src/web3_wrapper.ts @@ -1,6 +1,6 @@ import * as _ from 'lodash'; import * as Web3 from 'web3'; -import * as BigNumber from 'bignumber.js'; +import BigNumber from 'bignumber.js'; import promisify = require('es6-promisify'); import {ZeroExError, Artifact} from './types'; import {Contract} from './contract'; @@ -75,11 +75,11 @@ export class Web3Wrapper { ); return contractInstance; } - public toWei(ethAmount: BigNumber.BigNumber): BigNumber.BigNumber { + public toWei(ethAmount: BigNumber): BigNumber { const balanceWei = this.web3.toWei(ethAmount, 'ether'); return balanceWei; } - public async getBalanceInWeiAsync(owner: string): Promise<BigNumber.BigNumber> { + public async getBalanceInWeiAsync(owner: string): Promise<BigNumber> { let balanceInWei = await promisify(this.web3.eth.getBalance)(owner); balanceInWei = new BigNumber(balanceInWei); return balanceInWei; |