| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #986 from 0xProject/feature/contracts/assertions | Amir Bandeali | 2018-08-25 | 3 | -30/+113 |
|\ |
|
| * | Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js int... | Remco Bloemen | 2018-08-25 | 16 | -95/+591 |
| |\ |
|
| * | | Revert maker not equal taker check | Remco Bloemen | 2018-08-25 | 1 | -6/+1 |
| * | | Fix mixin api | Remco Bloemen | 2018-08-25 | 3 | -21/+36 |
| * | | Split into assertFillable and assertValidFill | Remco Bloemen | 2018-08-25 | 2 | -29/+43 |
| * | | Disallow self filling | Remco Bloemen | 2018-08-25 | 1 | -1/+7 |
| * | | Remove BUG_ from revert reasons | Remco Bloemen | 2018-08-25 | 1 | -3/+3 |
| * | | Document accetable price check | Remco Bloemen | 2018-08-25 | 1 | -2/+16 |
| * | | Fix taker overpay check | Remco Bloemen | 2018-08-25 | 1 | -1/+1 |
| * | | Check fillable early | Remco Bloemen | 2018-08-25 | 1 | -0/+6 |
| * | | Update for new assertValidFill signature | Remco Bloemen | 2018-08-25 | 2 | -5/+8 |
| * | | Add overfill and price assertion to assertValidFill | Remco Bloemen | 2018-08-25 | 2 | -2/+32 |
* | | | Added comments to order matching | Greg Hysen | 2018-08-25 | 1 | -1/+13 |
* | | | Rephrased some of the math in MixinMatchOrders to improve readability | Greg Hysen | 2018-08-25 | 1 | -3/+3 |
* | | | Added temporary @todo to MixinMatchOrders | Greg Hysen | 2018-08-25 | 1 | -4/+4 |
* | | | Wording in MixinMatchOrders | Greg Hysen | 2018-08-25 | 1 | -2/+2 |
* | | | Removed a redundant comment from matchOrders | Greg Hysen | 2018-08-25 | 1 | -5/+1 |
* | | | Rounding for fees in match orders addressed, plus example | Greg Hysen | 2018-08-25 | 1 | -4/+4 |
* | | | Added fees to matchOrders (previously in calculateFillResults | Greg Hysen | 2018-08-25 | 1 | -0/+24 |
* | | | Removed calculateFillResults from matchOrders workflow. Eliminates compounded... | Greg Hysen | 2018-08-25 | 1 | -38/+29 |
| |/
|/| |
|
* | | Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow var... | Amir Bandeali | 2018-08-25 | 5 | -57/+11 |
* | | Update ReentrantERC20Token with new functions and check that revert is occuri... | Amir Bandeali | 2018-08-25 | 1 | -35/+75 |
* | | Add nonReentrant modifiers on functions that use getCurrentContextAddress onl... | Amir Bandeali | 2018-08-25 | 4 | -15/+17 |
* | | Split modifiers into check only and check, lock, unlock | Amir Bandeali | 2018-08-25 | 1 | -0/+13 |
* | | Add ReentrantToken | Amir Bandeali | 2018-08-25 | 1 | -0/+173 |
* | | Add internal fill functions, add reentrancy guard to public functions that ma... | Amir Bandeali | 2018-08-25 | 6 | -41/+148 |
* | | Add ReentrancyGuard contract | Amir Bandeali | 2018-08-25 | 1 | -0/+44 |
* | | Remove redundant sload from getCurrentContextAddress | Amir Bandeali | 2018-08-25 | 1 | -1/+2 |
* | | Merge pull request #1003 from 0xProject/feature/contracts/roundup | Amir Bandeali | 2018-08-25 | 9 | -36/+198 |
|\ \ |
|
| * | | Stylistic fixes | Remco Bloemen | 2018-08-25 | 1 | -5/+20 |
| * | | Append -Floor to getPartialAmount and isRoundingError | Remco Bloemen | 2018-08-25 | 9 | -25/+25 |
| * | | Disambiguate the operator precedence | Remco Bloemen | 2018-08-25 | 1 | -2/+2 |
| * | | Add tests | Remco Bloemen | 2018-08-25 | 2 | -1/+52 |
| * | | Add docs | Remco Bloemen | 2018-08-25 | 1 | -2/+7 |
| * | | Fix incorect modulus | Remco Bloemen | 2018-08-25 | 1 | -4/+2 |
| * | | Add DIVISION_BY_ZERO to getPartialAmount for consistency | Remco Bloemen | 2018-08-25 | 1 | -4/+3 |
| * | | Improve getPartialAmountCeil docs | Remco Bloemen | 2018-08-25 | 1 | -3/+3 |
| * | | Add tests for getPartialAmountCeil | Remco Bloemen | 2018-08-25 | 1 | -0/+17 |
| * | | Add isRoundingErrorCeil | Remco Bloemen | 2018-08-25 | 1 | -0/+29 |
| * | | Add getPartialAmountCeil | Remco Bloemen | 2018-08-25 | 1 | -3/+32 |
| * | | Handle zero case | Remco Bloemen | 2018-08-25 | 1 | -3/+15 |
| * | | Fix isRoundingError | Remco Bloemen | 2018-08-25 | 1 | -10/+17 |
* | | | Skip self-transfers | Remco Bloemen | 2018-08-25 | 1 | -1/+1 |
| |/
|/| |
|
* | | Remove Trezor SignatureType | Amir Bandeali | 2018-08-25 | 2 | -30/+1 |
* | | Remove SignatureType.Caller | Amir Bandeali | 2018-08-25 | 3 | -31/+16 |
* | | Rethrow Wallet and Validator errors | Amir Bandeali | 2018-08-25 | 1 | -4/+28 |
* | | Rename TestStaticCall => TestStaticCallReceiver | Amir Bandeali | 2018-08-25 | 1 | -1/+2 |
* | | Revert if undefined function called in AssetProxies | Amir Bandeali | 2018-08-25 | 2 | -0/+6 |
* | | Remove pragma experimental v0.5.0 and use staticcall is assembly | Amir Bandeali | 2018-08-25 | 4 | -4/+128 |
* | | Add pragma experimental v0.5.0 to SignatureValidator and add tests | Amir Bandeali | 2018-08-25 | 3 | -0/+66 |
|/ |
|
* | Add getBalancesAndAllowances | Amir Bandeali | 2018-08-22 | 1 | -0/+19 |
* | Add ZRX balances and allowances to TraderInfo | Amir Bandeali | 2018-08-22 | 1 | -7/+16 |
* | Don't throw if ERC721 token isn't owned | Amir Bandeali | 2018-08-22 | 1 | -1/+51 |
* | Add OrderValidator contract | Amir Bandeali | 2018-08-22 | 14 | -23/+163 |
* | Remove redundant constructor args | Amir Bandeali | 2018-08-22 | 2 | -8/+8 |
* | Fix typos, run prettier, and allow anyone to call on DummyERC721Token | Amir Bandeali | 2018-08-17 | 5 | -6/+6 |
* | 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 | 6 | -52/+103 |
* | 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 hashin... | Amir Bandeali | 2018-08-09 | 2 | -9/+28 |
* | 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 |
* | 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 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 (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 |