Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 1 | -21/+47 |
| | |||||
* | Linter changes to contracts | Greg Hysen | 2018-06-09 | 1 | -4/+2 |
| | |||||
* | Cleanup after last rebase | Greg Hysen | 2018-06-08 | 1 | -2/+2 |
| | |||||
* | Updated tests to use new revert handler | Greg Hysen | 2018-06-08 | 1 | -2/+2 |
| | |||||
* | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 1 | -14/+6 |
| | |||||
* | Style updates to contracts | Greg Hysen | 2018-06-08 | 1 | -4/+1 |
| | |||||
* | Style updates to ERC721 onReceiver | Greg Hysen | 2018-06-08 | 1 | -1/+2 |
| | |||||
* | Fixes after rebasing | Greg Hysen | 2018-06-08 | 1 | -3/+1 |
| | |||||
* | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 1 | -24/+9 |
| | |||||
* | Style audit for proxies + libmem + libbytes | Greg Hysen | 2018-06-08 | 1 | -17/+21 |
| | |||||
* | Call safeTransferFrom only when there is receiver data present | Greg Hysen | 2018-06-08 | 1 | -11/+13 |
| | |||||
* | Converged on naming scheme for asset data: renamed all instances of ↵ | Greg Hysen | 2018-06-08 | 1 | -75/+42 |
| | | | | assetMetadata, proxyData, proxyMetadata to assetData | ||||
* | Tons of tests around nested byte arrays and ERC721 receiver | Greg Hysen | 2018-06-08 | 1 | -16/+20 |
| | |||||
* | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 1 | -2/+120 |
| | |||||
* | Fix missing paths | Fabio Berger | 2018-06-08 | 1 | -4/+4 |
| | |||||
* | merge v2-prototype | Fabio Berger | 2018-06-07 | 1 | -25/+21 |
|\ | |||||
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 1 | -16/+17 |
| |\ | | | | | | | | | | feature/improve-linting | ||||
| | * | Add Async suffix to relevant assertions | Alex Browne | 2018-06-07 | 1 | -9/+9 |
| | | | |||||
| | * | Replace constant.REVERT test assertions with ↵ | Alex Browne | 2018-06-07 | 1 | -16/+17 |
| | | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction | ||||
| * | | Linter now passes | fragosti | 2018-06-06 | 1 | -5/+0 |
| |/ | |||||
* / | move generated contract wrappers from `contract_wrappers/generated/` to ↵ | Fabio Berger | 2018-06-06 | 1 | -4/+4 |
|/ | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
* | Initial refactor of order-utils. Move many utils from contracts into this ↵ | Fabio Berger | 2018-05-30 | 1 | -2/+2 |
| | | | | package. | ||||
* | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 1 | -9/+15 |
| | |||||
* | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 1 | -34/+61 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | Fix some unhandled promise rejections | Alex Browne | 2018-05-22 | 1 | -2/+2 |
| | | |||||
| * | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 1 | -32/+53 |
| | | |||||
| * | Add missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 1 | -0/+6 |
| | | |||||
* | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 1 | -9/+2 |
|/ | |||||
* | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 1 | -6/+5 |
| | |||||
* | Add tests for batchTransferFrom | Amir Bandeali | 2018-05-02 | 1 | -151/+296 |
| | |||||
* | Add hard coded proxyId into each AssetProxy | Amir Bandeali | 2018-05-01 | 1 | -0/+10 |
| | |||||
* | merge v2-prototype | Fabio Berger | 2018-04-24 | 1 | -18/+18 |
| | |||||
* | Fix tests | Amir Bandeali | 2018-04-24 | 1 | -0/+244 |