Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move generated contract wrappers and artifacts into contracts package | Alex Browne | 2018-10-16 | 15 | -1535/+0 |
| | |||||
* | Apply styling fixes | Amir Bandeali | 2018-09-04 | 7 | -7/+0 |
| | |||||
* | Merge pull request #1045 from 0xProject/feature/contracts/cancelOrderInternal | Amir Bandeali | 2018-08-31 | 1 | -0/+6 |
|\ | | | | | Add cancelOrderInternal, use within batchCancelOrders | ||||
| * | Add cancelOrderInternal, use within batchCancelOrders | Amir Bandeali | 2018-08-31 | 1 | -0/+6 |
| | | |||||
* | | Add tests for token that returns >32 bytes | Amir Bandeali | 2018-08-31 | 1 | -0/+70 |
|/ | |||||
* | Update AssetProxyOwner to 0.4.24 | Amir Bandeali | 2018-08-30 | 1 | -18/+5 |
| | |||||
* | safeGetPartialAmount (#1035) | Amir Bandeali | 2018-08-29 | 2 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added Test "Should transfer correct amounts when left order is fully filled and values pass isRoundingErrorCeil but fail isRoundingErrorFloor" * Added RoundingError exception to reference function for getPartialAmount * Added RoundingError exception to reference function for getPartialAmount * Added isRoundingErrorCeil to getPartialAmountCeil reference funtion * Computed new values for "Should give right maker a better buy price when correct price is not integral" that does not have a rounding error * Almost all tests for match orders are passing after adding isRoundingErrorCeil check * WIP commit: Added rounding error checks to getPartialAmount * WIP commit: Added rounding error checks to getPartialAmount * Use safe versions of getPartialAmount * Update Exchange internals tests * Run linter * Found new values for "Should transfer correct amounts when right order fill amount deviates from amount derived by `Exchange.fillOrder`" * Fixed merge conflicts * Run all tests * Cleaned up some comments on match Orders tests * Fix tests for geth | ||||
* | Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow ↵ | Amir Bandeali | 2018-08-25 | 1 | -32/+1 |
| | | | | variations | ||||
* | Update ReentrantERC20Token with new functions and check that revert is ↵ | Amir Bandeali | 2018-08-25 | 1 | -35/+75 |
| | | | | occuring for correct reason | ||||
* | Add ReentrantToken | Amir Bandeali | 2018-08-25 | 1 | -0/+173 |
| | |||||
* | Merge pull request #1003 from 0xProject/feature/contracts/roundup | Amir Bandeali | 2018-08-25 | 2 | -9/+77 |
|\ | | | | | [contracts] Add getPartialAmountCeil and isRoundingErrorCeil | ||||
| * | Append -Floor to getPartialAmount and isRoundingError | Remco Bloemen | 2018-08-25 | 2 | -8/+8 |
| | | |||||
| * | Add tests | Remco Bloemen | 2018-08-25 | 2 | -1/+52 |
| | | |||||
| * | Add tests for getPartialAmountCeil | Remco Bloemen | 2018-08-25 | 1 | -0/+17 |
| | | |||||
* | | Rename TestStaticCall => TestStaticCallReceiver | Amir Bandeali | 2018-08-25 | 1 | -1/+2 |
| | | |||||
* | | Remove pragma experimental v0.5.0 and use staticcall is assembly | Amir Bandeali | 2018-08-25 | 2 | -1/+16 |
| | | |||||
* | | Add pragma experimental v0.5.0 to SignatureValidator and add tests | Amir Bandeali | 2018-08-25 | 2 | -0/+65 |
|/ | |||||
* | Fix typos, run prettier, and allow anyone to call on DummyERC721Token | Amir Bandeali | 2018-08-17 | 2 | -3/+3 |
| | |||||
* | Add ERC721Receiver that returns incorrect value | Amir Bandeali | 2018-08-17 | 1 | -0/+66 |
| | |||||
* | Increase max mintable amount | Amir Bandeali | 2018-08-17 | 1 | -1/+1 |
| | |||||
* | Fix DummyERC721Receiver | Amir Bandeali | 2018-08-17 | 1 | -32/+32 |
| | |||||
* | Add tests for ERC20 token with no return values | Amir Bandeali | 2018-08-17 | 1 | -0/+116 |
| | |||||
* | Add constructor back to DummyERC721Token | Amir Bandeali | 2018-08-17 | 1 | -0/+12 |
| | |||||
* | Restructure directories | Amir Bandeali | 2018-08-17 | 2 | -47/+20 |
| | |||||
* | Update ERC20Token | Amir Bandeali | 2018-08-17 | 3 | -5/+9 |
| | |||||
* | Optimize ERC721Token | Amir Bandeali | 2018-08-17 | 1 | -40/+16 |
| | |||||
* | Test abiEncodeFillOrder as part of combinatorial follOrder tests | Amir Bandeali | 2018-08-09 | 1 | -0/+1 |
| | |||||
* | Increment free memory pointer for internal Exchange functions that use asm | Amir Bandeali | 2018-08-09 | 1 | -1/+21 |
| | |||||
* | Add combinatorial tests for internal Exchange functions (#807) | Alex Browne | 2018-07-27 | 1 | -0/+120 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP add combinatorial tests for internal Exchange functions * Change combinitorial testing strategy based on feedback * Check value of filled[orderHash] in updateFilledState tests * Add combinatorial tests for addFillResults * Add combinatorial tests for getPartialAmount * Implement generic `testWithReferenceFuncAsync` * Implement generic `testCombinatoriallyWithReferenceFuncAsync` * Add combinatorial tests for isRoundingError * Add combinatorial tests for calculateFillResults * Add support for Geth in internal contract tests * Fix contract artifacts * Change DECIMAL_PLACES to 78 and add a note. * Document new functions in utils * Optimize tests by only reseting state when needed * Rename/move some files * Print parameter names on failure in testWithReferenceFuncAsync * Add to changelog for utils package * Appease various linters * Rename some more things related to FillOrderCombinatorialUtils * Remove .only from test/exchange/internal.ts * Remove old test for isRoundingError and getPartialAmount * Appease linters again * Remove old todos * Fix typos, add comments, rename some things * Re-add some LibMath tests * Update contract internal tests to use new SafeMath revert reasons * Apply PR feedback from Amir * Apply PR feedback from Remco * Re-add networks to ZRXToken artifact * Remove duplicate Whitelist in compiler.json | ||||
* | Add tests to verify ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 1 | -0/+57 |
| | |||||
* | Move example contracts into new examples dir | Amir Bandeali | 2018-07-23 | 6 | -359/+7 |
| | |||||
* | Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytes | Amir Bandeali | 2018-07-11 | 1 | -5/+18 |
| | |||||
* | Remove AbiV2 where unused | Amir Bandeali | 2018-07-07 | 7 | -10/+10 |
| | |||||
* | Apply new linter rules | Amir Bandeali | 2018-07-07 | 13 | -82/+83 |
| | |||||
* | Contracts 2.0.0 were linted with solhint | Alex Shafranovich | 2018-07-06 | 13 | -0/+20 |
| | |||||
* | Update file structure | Amir Bandeali | 2018-06-30 | 13 | -0/+1084 |