aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/utils/erc721_wrapper.ts
Commit message (Collapse)AuthorAgeFilesLines
* Use web3-wrapper instead of 0x.js, update logDecoderAmir Bandeali2018-05-251-1/+5
|
* Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-231-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Add `are` to boolean naming conventions Fix tslint Fix the tsutils version, fixing ts typings issue Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls Update artifacts Update yarn.lock Fix warnings in Metacoin Upgrade UglifyJS to include ES6 support Add CancelOrder and MatchOrder types Add missing return types Ignore classnames linter rule Apply changes to test/exchange/match_orders.ts Fix some unhandled promise rejections Add awaitTransactionMinedAsync after every sent transaction Add missing blockchainLifecycle calls to contracts tests # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/dispatcher.ts # packages/contracts/test/multi_sig_with_time_lock.ts
| * Add missing return typesRemco Bloemen2018-05-221-5/+5
| |
* | Remove 0x.js dep from contractsFabio Berger2018-05-231-2/+2
|/
* Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-161-16/+15
|
* Rename variables, create private validation methods in token wrappersAmir Bandeali2018-04-241-64/+62
|
* Define numbers of dummy tokens to deploy in constantsAmir Bandeali2018-04-241-1/+1
|
* Remove type assertionsAmir Bandeali2018-04-241-18/+12
|
* Add ERC721 wrapperAmir Bandeali2018-04-241-0/+154