Greg Hysen
|
8ace41d144
|
Minor fixes after rebase
|
2018-06-07 15:39:40 -07:00 |
|
Greg Hysen
|
f457a56d4a
|
Style updates to contracts
|
2018-06-07 15:39:40 -07:00 |
|
Greg Hysen
|
774d831fae
|
Style updates to ERC721 onReceiver
|
2018-06-07 15:39:40 -07:00 |
|
Greg Hysen
|
12e2bfc794
|
Fixes after rebasing
|
2018-06-07 15:39:38 -07:00 |
|
Greg Hysen
|
e4e3676095
|
Fixed up after rebasing. Contracts build and tests pass
|
2018-06-07 15:38:48 -07:00 |
|
Greg Hysen
|
3ed13150e1
|
Style audit for proxies + libmem + libbytes
|
2018-06-07 15:38:48 -07:00 |
|
Greg Hysen
|
8496c1cdd3
|
Call safeTransferFrom only when there is receiver data present
|
2018-06-07 15:38:48 -07:00 |
|
Greg Hysen
|
e042e0ad32
|
Converged on naming scheme for asset data: renamed all instances of assetMetadata, proxyData, proxyMetadata to assetData
|
2018-06-07 15:38:48 -07:00 |
|
Greg Hysen
|
842363200b
|
Tons of tests around nested byte arrays and ERC721 receiver
|
2018-06-07 15:38:42 -07:00 |
|
Greg Hysen
|
d9f9895b2b
|
Test for onReceived erc721 callback
|
2018-06-07 15:37:42 -07:00 |
|
Fabio Berger
|
4f4acc04fe
|
Fix missing paths
|
2018-06-07 18:14:35 +02:00 |
|
Fabio Berger
|
73429fc720
|
merge v2-prototype
|
2018-06-07 12:27:03 +02:00 |
|
fragosti
|
e0d5b9daf8
|
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/improve-linting
|
2018-06-06 16:36:11 -07:00 |
|
Alex Browne
|
167a38e27d
|
Add Async suffix to relevant assertions
|
2018-06-06 12:41:14 -07:00 |
|
Alex Browne
|
1cc9d9c071
|
Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTransaction
|
2018-06-06 12:39:42 -07:00 |
|
Fabio Berger
|
cb754ee125
|
move generated contract wrappers from contract_wrappers/generated/ to generated_contract_wrappers in package with no non-generated contract wrappers
|
2018-06-06 15:39:38 +02:00 |
|
fragosti
|
59cb2132f2
|
Linter now passes
|
2018-06-05 11:46:05 -07:00 |
|
Fabio Berger
|
4874d55d03
|
Initial refactor of order-utils. Move many utils from contracts into this package.
|
2018-05-29 16:58:30 -07:00 |
|
Alex Browne
|
b05a3b7aed
|
Check transaction receipt status codes where applicable
|
2018-05-23 15:09:17 -07:00 |
|
Fabio Berger
|
2b793f372a
|
Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep
* 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
|
2018-05-22 13:02:21 -07:00 |
|
Fabio Berger
|
a682b5d90e
|
Remove 0x.js dep from contracts
|
2018-05-22 11:18:50 -07:00 |
|
Alex Browne
|
4fa57f55e6
|
Fix some unhandled promise rejections
|
2018-05-21 16:52:49 -07:00 |
|
Alex Browne
|
2c496a92ad
|
Add awaitTransactionMinedAsync after every sent transaction
|
2018-05-21 16:52:49 -07:00 |
|
Alex Browne
|
4ca8903a21
|
Add missing blockchainLifecycle calls to contracts tests
|
2018-05-21 16:52:49 -07:00 |
|
Amir Bandeali
|
9e0471bfbb
|
Merge branch 'development' into v2-prototype
|
2018-05-15 15:52:49 -04:00 |
|
Amir Bandeali
|
0cb357a0e9
|
Add tests for batchTransferFrom
|
2018-05-01 13:39:55 -07:00 |
|
Amir Bandeali
|
bbb3d5bb67
|
Add hard coded proxyId into each AssetProxy
|
2018-04-30 16:40:27 -07:00 |
|
Fabio Berger
|
b24b98a365
|
merge v2-prototype
|
2018-04-24 16:51:32 +09:00 |
|
Amir Bandeali
|
432b064601
|
Fix tests
|
2018-04-23 10:50:09 -07:00 |
|