diff options
author | Fabio Berger <me@fabioberger.com> | 2018-06-19 18:35:32 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-06-19 18:35:32 +0800 |
commit | 08ea71cb243067d8f4a4b08b2ed83ee11225d494 (patch) | |
tree | 0b9e213e05a050ede2be9d11ed2e040dc0947a81 /packages/contract-wrappers/src/contract_wrappers/token_wrapper.ts | |
parent | 0d0c1af7f741834f076a604b776d4542c4dbb6ec (diff) | |
parent | 0bfcf79e79b762a9fb98e90b8e6310c781cfae97 (diff) | |
download | dexon-sol-tools-08ea71cb243067d8f4a4b08b2ed83ee11225d494.tar dexon-sol-tools-08ea71cb243067d8f4a4b08b2ed83ee11225d494.tar.gz dexon-sol-tools-08ea71cb243067d8f4a4b08b2ed83ee11225d494.tar.bz2 dexon-sol-tools-08ea71cb243067d8f4a4b08b2ed83ee11225d494.tar.lz dexon-sol-tools-08ea71cb243067d8f4a4b08b2ed83ee11225d494.tar.xz dexon-sol-tools-08ea71cb243067d8f4a4b08b2ed83ee11225d494.tar.zst dexon-sol-tools-08ea71cb243067d8f4a4b08b2ed83ee11225d494.zip |
Merge branch 'v2-prototype' into feature/combinatorial-testing
* v2-prototype: (40 commits)
Increase number of columns in relayer grid for small screens
Make isValidSignature public
Make batchFill methods return FIllResults struct
Remove remove_tags script
Small fixes
Use semver package instead of getNextPatchVersion
Use semver library instead of semverUtils
small fixes
Show all errors of a given kind at once rather then throwing after the first instance is encountered
fix package.json
Add more prepublish checks
remove remove_tags script
Create a shared Image component
Adjust version in changelog
Update RelayerGridTile render logic to incorportate colors and logos
Add max width to top bar
Set max-width for LargeLayout
Finish last onboarding step
Finish set allowance step
Add onboarding assets
...
Diffstat (limited to 'packages/contract-wrappers/src/contract_wrappers/token_wrapper.ts')
-rw-r--r-- | packages/contract-wrappers/src/contract_wrappers/token_wrapper.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/contract-wrappers/src/contract_wrappers/token_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/token_wrapper.ts index 7c7907fd2..d9364715f 100644 --- a/packages/contract-wrappers/src/contract_wrappers/token_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/token_wrapper.ts @@ -1,5 +1,5 @@ import { schemas } from '@0xproject/json-schemas'; -import { LogWithDecodedArgs } from '@0xproject/types'; +import { ContractAbi, LogWithDecodedArgs } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; @@ -26,6 +26,7 @@ import { TokenTransferProxyWrapper } from './token_transfer_proxy_wrapper'; * to the 0x Proxy smart contract. */ export class TokenWrapper extends ContractWrapper { + public abi: ContractAbi = artifacts.Token.abi; public UNLIMITED_ALLOWANCE_IN_BASE_UNITS = constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS; private _tokenContractsByAddress: { [address: string]: TokenContract }; private _tokenTransferProxyWrapper: TokenTransferProxyWrapper; |