aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/asset_proxy
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-221-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Use make-promises-safe as a preloader instead of manually importing Updated compiler runs to be 1,000,000 Add event to setSignatureValidatorApproval, rename signer => signerAddress accross all contracts Add senderAddress to Fill and Cancel logs, add comments to events and types Fix Island component Add missing image assets for Chris and Mel Fix some bugs in sol-cov Remove unreachable PreSigned check Fix linting Buttons look hella disabled now Remove border radius, fix width issue for unlock step Add Chris and Mel to about page fix linter issues only call getLocationByOffset if source if defined Set settleOrder and settleMatchedOrders to private Prevent prettier issue Support mobile friendly onboarding flows Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `settleMatchedOrders` into `MixinMatchOrders` Migrations after rebasing Linter ...
| * Use make-promises-safe as a preloader instead of manually importingAlex Browne2018-06-221-1/+0
| |
* | remove unused importFabio Berger2018-06-221-1/+0
| |
* | Test revert reasons in proxy testsFabio Berger2018-06-211-11/+23
| |
* | remove onlyFabio Berger2018-06-211-1/+1
| |
* | Check revert reasons in Authorizable testsFabio Berger2018-06-211-6/+14
|/
* ERC721Proxy Always call safeTransferFromJacob Evans2018-06-201-2/+6
|
* Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-132-40/+49
|
* Linter changes to contractsGreg Hysen2018-06-092-11/+3
|
* Cleanup after last rebaseGreg Hysen2018-06-082-3/+3
|
* Updated tests to use new revert handlerGreg Hysen2018-06-081-2/+2
|
* Minor fixes after rebaseGreg Hysen2018-06-081-14/+6
|
* Style updates to contractsGreg Hysen2018-06-082-8/+3
|
* Union types for generalized decodeAssetDataGreg Hysen2018-06-081-2/+2
|
* Style updates to ERC721 onReceiverGreg Hysen2018-06-082-3/+14
|
* Fixes after rebasingGreg Hysen2018-06-082-8/+5
|
* Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-082-28/+14
|
* Style audit for proxies + libmem + libbytesGreg Hysen2018-06-082-27/+32
|
* Call safeTransferFrom only when there is receiver data presentGreg Hysen2018-06-081-11/+13
|
* Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵Greg Hysen2018-06-081-5/+5
| | | | This way they can still be used by the forwarding contract. TestAssetDataDecoders inherits them in the same way the forwarding contract would
* Converged on naming scheme for asset data: renamed all instances of ↵Greg Hysen2018-06-082-95/+62
| | | | assetMetadata, proxyData, proxyMetadata to assetData
* Tons of tests around nested byte arrays and ERC721 receiverGreg Hysen2018-06-082-17/+45
|
* Test for onReceived erc721 callbackGreg Hysen2018-06-082-3/+121
|
* LibAssetProxyDecoder testsGreg Hysen2018-06-081-26/+30
|
* Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-081-0/+72
|
* Fix missing pathsFabio Berger2018-06-081-4/+4
|
* merge v2-prototypeFabio Berger2018-06-072-36/+31
|\
| * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-072-24/+26
| |\ | | | | | | | | | feature/improve-linting
| | * Add Async suffix to relevant assertionsAlex Browne2018-06-072-14/+14
| | |
| | * Replace constant.REVERT test assertions with ↵Alex Browne2018-06-072-24/+26
| | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction
| * | Linter now passesfragosti2018-06-062-8/+1
| |/
* / move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-062-5/+5
|/ | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵Amir Bandeali2018-06-051-0/+1
| | | | failures, and remove redundant logic in matchOrders
* Initial refactor of order-utils. Move many utils from contracts into this ↵Fabio Berger2018-05-301-2/+2
| | | | package.
* Check transaction receipt status codes where applicableAlex Browne2018-05-242-16/+22
|
* Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-232-47/+101
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 rejectionsAlex Browne2018-05-221-2/+2
| |
| * Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-222-45/+87
| |
| * Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-222-0/+12
| |
* | Remove 0x.js dep from contractsFabio Berger2018-05-231-9/+2
|/
* merge developmentFabio Berger2018-05-221-0/+1
|
* Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-162-12/+13
|
* Move Authorizable to AssetProxy dir, rename to MixinAuthorizableAmir Bandeali2018-05-081-3/+3
|
* Add tests for batchTransferFromAmir Bandeali2018-05-021-151/+296
|
* Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-011-0/+10
|
* merge v2-prototypeFabio Berger2018-04-241-18/+18
|
* Fix testsAmir Bandeali2018-04-242-0/+344