diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-12-07 06:15:15 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-12-07 06:15:15 +0800 |
| commit | 825402b0f91ce266b310aed78e4fa73ae1359d36 (patch) | |
| tree | c07c1da090112feccdacfa16e693386b963eeefd /packages | |
| parent | f1b267cc9fe7f6e5566dc2535b064b92aef92df1 (diff) | |
| download | dexon-0x-contracts-825402b0f91ce266b310aed78e4fa73ae1359d36.tar.gz dexon-0x-contracts-825402b0f91ce266b310aed78e4fa73ae1359d36.tar.zst dexon-0x-contracts-825402b0f91ce266b310aed78e4fa73ae1359d36.zip | |
Address feedback
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/contracts/deploy/cli.ts | 1 | ||||
| -rw-r--r-- | packages/contracts/deploy/src/utils/network.ts | 1 | ||||
| -rw-r--r-- | packages/types/README.md | 6 | ||||
| -rw-r--r-- | packages/web3-wrapper/package.json | 2 | ||||
| -rw-r--r-- | packages/web3-wrapper/src/index.ts | 6 |
5 files changed, 4 insertions, 12 deletions
diff --git a/packages/contracts/deploy/cli.ts b/packages/contracts/deploy/cli.ts index df3ae33b4..0fdf85a9f 100644 --- a/packages/contracts/deploy/cli.ts +++ b/packages/contracts/deploy/cli.ts @@ -1,4 +1,3 @@ -import {TxData} from '@0xproject/types'; import {BigNumber} from 'bignumber.js'; import * as _ from 'lodash'; import * as path from 'path'; diff --git a/packages/contracts/deploy/src/utils/network.ts b/packages/contracts/deploy/src/utils/network.ts index fcb78287c..fc8709e0f 100644 --- a/packages/contracts/deploy/src/utils/network.ts +++ b/packages/contracts/deploy/src/utils/network.ts @@ -1,5 +1,4 @@ import {promisify} from '@0xproject/utils'; -import {Web3Wrapper} from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; import * as Web3 from 'web3'; diff --git a/packages/types/README.md b/packages/types/README.md index 0df8c6333..d4d48b1fe 100644 --- a/packages/types/README.md +++ b/packages/types/README.md @@ -1,10 +1,10 @@ -Web3 wrapper +0x types ------ -Wrapped version of web3 with nicer interface to be used across 0x projects and packages +TS types shared across 0x projects and packages ## Install ```bash -yarn add @0xproject/web3-wrapper +yarn add -D @0xproject/types ``` diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index dd1cd54fb..4eea7ed31 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -20,6 +20,7 @@ "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", "devDependencies": { "@0xproject/tslint-config": "^0.2.0", + "@0xproject/types": "^0.0.1", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", @@ -29,7 +30,6 @@ }, "dependencies": { "@0xproject/utils": "^0.0.1", - "@0xproject/types": "^0.0.1", "bignumber.js": "~4.1.0", "lodash": "^4.17.4", "web3": "^0.20.0" diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts index 9b37e5a0d..b823c5c15 100644 --- a/packages/web3-wrapper/src/index.ts +++ b/packages/web3-wrapper/src/index.ts @@ -74,12 +74,6 @@ export class Web3Wrapper { balanceInWei = new BigNumber(balanceInWei); return balanceInWei; } - public async getBalanceInEthAsync(owner: string): Promise<BigNumber> { - const balanceInWei = await this.getBalanceInWeiAsync(owner); - const balanceEthOldBigNumber = this.web3.fromWei(balanceInWei, 'ether'); - const balanceEth = new BigNumber(balanceEthOldBigNumber); - return balanceEth; - } public async doesContractExistAtAddressAsync(address: string): Promise<boolean> { const code = await promisify<string>(this.web3.eth.getCode)(address); // Regex matches 0x0, 0x00, 0x in order to accommodate poorly implemented clients |