Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update ERC20Token | Amir Bandeali | 2018-08-17 | 6 | -47/+113 |
| | |||||
* | Optimize ERC721Token | Amir Bandeali | 2018-08-17 | 5 | -510/+462 |
| | |||||
* | Change withdrawERC20 => withdrawAsset, reuse transfer logic | Amir Bandeali | 2018-08-10 | 4 | -18/+15 |
| | |||||
* | Make marketBuy functions revert if entire amount not filled | Amir Bandeali | 2018-08-10 | 5 | -98/+29 |
| | |||||
* | Revert incrementing memory ptr in dispatchTransferFrom | Amir Bandeali | 2018-08-09 | 3 | -9/+3 |
| | |||||
* | 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 | 3 | -12/+34 |
| | |||||
* | fix comments and styling for MixinSignatureValidator | Amir Bandeali | 2018-08-09 | 1 | -4/+9 |
| | |||||
* | Use asm for hashEIP712Message, increment free memory pointer after asm ↵ | Amir Bandeali | 2018-08-09 | 2 | -9/+28 |
| | | | | hashing functions | ||||
* | Fix comments, styling, and optimize hashOrder | Amir Bandeali | 2018-08-08 | 3 | -25/+33 |
| | |||||
* | Add combinatorial tests for internal Exchange functions (#807) | Alex Browne | 2018-07-27 | 2 | -1/+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 | ||||
* | Modify WETH9 event arg names to be identical to ERC20 standard suggested names | Fabio Berger | 2018-07-26 | 1 | -4/+4 |
| | |||||
* | Update orderEpoch comments | Amir Bandeali | 2018-07-25 | 2 | -2/+2 |
| | |||||
* | Remove ERC721 callback functions | Amir Bandeali | 2018-07-23 | 4 | -49/+3 |
| | |||||
* | Use != instead of > in loops, add sanity checks to market fill functions | Amir Bandeali | 2018-07-23 | 2 | -18/+18 |
| | |||||
* | Add more tests and fixes | Amir Bandeali | 2018-07-23 | 5 | -5/+8 |
| | |||||
* | Remove MConstants and MixinConstants for LibConstants | Amir Bandeali | 2018-07-23 | 8 | -57/+23 |
| | |||||
* | Remove redundant external call by reimplementing fillOrderNoThrow | Amir Bandeali | 2018-07-23 | 6 | -166/+355 |
| | |||||
* | Remove orders length check | Amir Bandeali | 2018-07-23 | 2 | -11/+0 |
| | |||||
* | Add assertValidFillResults | Amir Bandeali | 2018-07-23 | 1 | -61/+88 |
| | |||||
* | Store orders length in varible before looping over orders | Amir Bandeali | 2018-07-23 | 2 | -14/+25 |
| | |||||
* | Use transferFrom instead of safeTransferFrom | Amir Bandeali | 2018-07-23 | 1 | -5/+2 |
| | |||||
* | Fix rounding error issues, use different logic when makerAsset is ZRX | Amir Bandeali | 2018-07-23 | 6 | -52/+95 |
| | |||||
* | Rename marketSellEth => marketSellWeth | Amir Bandeali | 2018-07-23 | 2 | -3/+3 |
| | |||||
* | Update percentage constants | Amir Bandeali | 2018-07-23 | 3 | -17/+18 |
| | |||||
* | Update transferEthFeeAndRefund, add check to ERC721 transfer | Amir Bandeali | 2018-07-23 | 6 | -26/+54 |
| | |||||
* | Refactor forwarding contract architecture, remove batch functions | Amir Bandeali | 2018-07-23 | 20 | -1038/+572 |
| | |||||
* | Add tests to verify ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 1 | -0/+57 |
| | |||||
* | Add comments for deploying with constant ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 2 | -2/+15 |
| | |||||
* | Move example contracts into new examples dir | Amir Bandeali | 2018-07-23 | 6 | -6/+11 |
| | |||||
* | Merge pull request #877 from 0xProject/feature/contracts/removeERC721Callback | Amir Bandeali | 2018-07-23 | 3 | -79/+25 |
|\ | | | | | Removed receiverData and `onReceive` callback from ERC721 proxy. | ||||
| * | Removed receiverData from ERC721 Proxy Id generation | Greg Hysen | 2018-07-18 | 3 | -6/+4 |
| | | |||||
| * | Removed receiverData and `onReceive` callback from ERC721 proxy. | Greg Hysen | 2018-07-18 | 1 | -73/+21 |
| | | |||||
* | | Hard code fillOrder selector into abiEncodeFillOrder | Amir Bandeali | 2018-07-20 | 1 | -7/+4 |
| | | |||||
* | | Returns byte array instead of memory range for encoding fillOrder calldata | Greg Hysen | 2018-07-20 | 2 | -24/+26 |
| | | |||||
* | | Created LibAbiEncoder with `fillOrderNoThrow` | Greg Hysen | 2018-07-20 | 2 | -170/+235 |
|/ | |||||
* | Reorder checks in getOrderInfo | Amir Bandeali | 2018-07-18 | 1 | -7/+9 |
| | |||||
* | Add getOrdersInfo function | Amir Bandeali | 2018-07-18 | 2 | -0/+24 |
| | |||||
* | Remove extra ERC20ProxyId from Forwarder constructor | Jacob Evans | 2018-07-11 | 1 | -1/+0 |
| | |||||
* | Add revert reasons and optimization to safeMath | Amir Bandeali | 2018-07-11 | 1 | -3/+15 |
| | |||||
* | Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytes | Amir Bandeali | 2018-07-11 | 3 | -10/+43 |
| | |||||
* | Move functions out of Forwarder.sol | Amir Bandeali | 2018-07-08 | 12 | -42/+35 |
| | |||||
* | Add interfaces and mixins | Amir Bandeali | 2018-07-08 | 16 | -61/+573 |
| | |||||
* | Combine mixins | Amir Bandeali | 2018-07-08 | 6 | -284/+218 |
| | |||||
* | Use interfaces instead of full contracts | Amir Bandeali | 2018-07-08 | 4 | -7/+39 |
| | |||||
* | Remove TODOs that won't be addressed | Amir Bandeali | 2018-07-07 | 4 | -10/+3 |
| | |||||
* | Remove AbiV2 where unused | Amir Bandeali | 2018-07-07 | 23 | -38/+27 |
| | |||||
* | Only reset currentContextAddress if it was previously updated | Amir Bandeali | 2018-07-07 | 1 | -8/+11 |
| | |||||
* | Change uint => uint256 | Amir Bandeali | 2018-07-07 | 1 | -8/+7 |
| | |||||
* | Apply new linter rules | Amir Bandeali | 2018-07-07 | 73 | -298/+350 |
| | |||||
* | Merge pull request #522 from 0xProject/feature/contracts/forwarder | Jacob Evans | 2018-07-06 | 11 | -1/+1102 |
|\ | | | | | Forwarding contract | ||||
| * | Forwarding contract (squashed commits) | Jacob Evans | 2018-07-06 | 11 | -1/+1102 |
| | | |||||
* | | Contracts 2.0.0 were linted with solhint | Alex Shafranovich | 2018-07-06 | 60 | -1/+78 |
|/ | |||||
* | Update file structure | Amir Bandeali | 2018-06-30 | 63 | -0/+7750 |