aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0/protocol
Commit message (Expand)AuthorAgeFilesLines
* Move generated contract wrappers and artifacts into contracts packageAlex Browne2018-10-1638-4599/+0
* Remove TODOs that will not be addressedAmir Bandeali2018-09-042-2/+1
* Update MultiSigWalletWithTimeLock to 0.4.24Amir Bandeali2018-09-041-2/+2
* Update to most recent multisigAmir Bandeali2018-09-041-8/+7
* Apply styling fixesAmir Bandeali2018-09-0419-31/+48
* Add cancelOrderInternal, use within batchCancelOrdersAmir Bandeali2018-08-313-9/+24
* Fix geth testsAmir Bandeali2018-08-301-1/+4
* Remove unused importsAmir Bandeali2018-08-303-5/+1
* Update AssetProxyOwner to 0.4.24Amir Bandeali2018-08-301-33/+16
* Reverted syntax used by readBytes4 in AssetProxyOwner to be compatible with S...Greg Hysen2018-08-301-5/+1
* Updated comments for ERC20 proxy to clarify how we load the token address fro...Greg Hysen2018-08-302-9/+60
* Updated readBytes4 to match spec + added unit tests. These are 3.5/3.6 from a...Greg Hysen2018-08-301-2/+11
* Making rounding consistent in calculateFillResultsAmir Bandeali2018-08-291-2/+2
* safeGetPartialAmount (#1035)Amir Bandeali2018-08-293-23/+91
* Add clarifying commentsAmir Bandeali2018-08-281-0/+1
* Merge pull request #986 from 0xProject/feature/contracts/assertionsAmir Bandeali2018-08-253-30/+113
|\
| * Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js int...Remco Bloemen2018-08-259-81/+283
| |\
| * | Revert maker not equal taker checkRemco Bloemen2018-08-251-6/+1
| * | Fix mixin apiRemco Bloemen2018-08-253-21/+36
| * | Split into assertFillable and assertValidFillRemco Bloemen2018-08-252-29/+43
| * | Disallow self fillingRemco Bloemen2018-08-251-1/+7
| * | Remove BUG_ from revert reasonsRemco Bloemen2018-08-251-3/+3
| * | Document accetable price checkRemco Bloemen2018-08-251-2/+16
| * | Fix taker overpay checkRemco Bloemen2018-08-251-1/+1
| * | Check fillable earlyRemco Bloemen2018-08-251-0/+6
| * | Update for new assertValidFill signatureRemco Bloemen2018-08-252-5/+8
| * | Add overfill and price assertion to assertValidFillRemco Bloemen2018-08-252-2/+32
* | | Added comments to order matchingGreg Hysen2018-08-251-1/+13
* | | Rephrased some of the math in MixinMatchOrders to improve readabilityGreg Hysen2018-08-251-3/+3
* | | Added temporary @todo to MixinMatchOrdersGreg Hysen2018-08-251-4/+4
* | | Wording in MixinMatchOrdersGreg Hysen2018-08-251-2/+2
* | | Removed a redundant comment from matchOrdersGreg Hysen2018-08-251-5/+1
* | | Rounding for fees in match orders addressed, plus exampleGreg Hysen2018-08-251-4/+4
* | | Added fees to matchOrders (previously in calculateFillResultsGreg Hysen2018-08-251-0/+24
* | | Removed calculateFillResults from matchOrders workflow. Eliminates compounded...Greg Hysen2018-08-251-38/+29
| |/ |/|
* | Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow var...Amir Bandeali2018-08-253-12/+9
* | Add nonReentrant modifiers on functions that use getCurrentContextAddress onl...Amir Bandeali2018-08-254-15/+17
* | Add internal fill functions, add reentrancy guard to public functions that ma...Amir Bandeali2018-08-255-40/+148
* | Remove redundant sload from getCurrentContextAddressAmir Bandeali2018-08-251-1/+2
* | Merge pull request #1003 from 0xProject/feature/contracts/roundupAmir Bandeali2018-08-254-22/+116
|\ \
| * | Stylistic fixesRemco Bloemen2018-08-251-5/+20
| * | Append -Floor to getPartialAmount and isRoundingErrorRemco Bloemen2018-08-254-12/+12
| * | Disambiguate the operator precedenceRemco Bloemen2018-08-251-2/+2
| * | Add docsRemco Bloemen2018-08-251-2/+7
| * | Fix incorect modulusRemco Bloemen2018-08-251-4/+2
| * | Add DIVISION_BY_ZERO to getPartialAmount for consistencyRemco Bloemen2018-08-251-4/+3
| * | Improve getPartialAmountCeil docsRemco Bloemen2018-08-251-3/+3
| * | Add isRoundingErrorCeilRemco Bloemen2018-08-251-0/+29
| * | Add getPartialAmountCeilRemco Bloemen2018-08-251-3/+32
| * | Handle zero caseRemco Bloemen2018-08-251-3/+15
| * | Fix isRoundingErrorRemco Bloemen2018-08-251-10/+17
* | | Skip self-transfersRemco Bloemen2018-08-251-1/+1
| |/ |/|
* | Remove Trezor SignatureTypeAmir Bandeali2018-08-252-30/+1
* | Remove SignatureType.CallerAmir Bandeali2018-08-252-30/+15
* | Rethrow Wallet and Validator errorsAmir Bandeali2018-08-251-4/+28
* | Revert if undefined function called in AssetProxiesAmir Bandeali2018-08-252-0/+6
* | Remove pragma experimental v0.5.0 and use staticcall is assemblyAmir Bandeali2018-08-252-3/+112
* | Add pragma experimental v0.5.0 to SignatureValidator and add testsAmir Bandeali2018-08-251-0/+1
|/
* Revert incrementing memory ptr in dispatchTransferFromAmir Bandeali2018-08-093-9/+3
* Increment free memory pointer for internal Exchange functions that use asmAmir Bandeali2018-08-092-11/+13
* fix comments and styling for MixinSignatureValidatorAmir Bandeali2018-08-091-4/+9
* Use asm for hashEIP712Message, increment free memory pointer after asm hashin...Amir Bandeali2018-08-092-9/+28
* Fix comments, styling, and optimize hashOrderAmir Bandeali2018-08-083-25/+33
* Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-271-1/+0
* Update orderEpoch commentsAmir Bandeali2018-07-252-2/+2
* Use != instead of > in loops, add sanity checks to market fill functionsAmir Bandeali2018-07-231-13/+13
* Remove redundant external call by reimplementing fillOrderNoThrowAmir Bandeali2018-07-231-1/+1
* Store orders length in varible before looping over ordersAmir Bandeali2018-07-231-11/+19
* Update percentage constantsAmir Bandeali2018-07-232-14/+15
* Update transferEthFeeAndRefund, add check to ERC721 transferAmir Bandeali2018-07-231-2/+4
* Add comments for deploying with constant ZRX_ASSET_DATAAmir Bandeali2018-07-232-2/+15
* Merge pull request #877 from 0xProject/feature/contracts/removeERC721CallbackAmir Bandeali2018-07-231-74/+22
|\
| * Removed receiverData from ERC721 Proxy Id generationGreg Hysen2018-07-181-1/+1
| * Removed receiverData and `onReceive` callback from ERC721 proxy.Greg Hysen2018-07-181-73/+21
* | Hard code fillOrder selector into abiEncodeFillOrderAmir Bandeali2018-07-201-7/+4
* | Returns byte array instead of memory range for encoding fillOrder calldataGreg Hysen2018-07-202-24/+26
* | Created LibAbiEncoder with `fillOrderNoThrow`Greg Hysen2018-07-202-170/+235
|/
* Reorder checks in getOrderInfoAmir Bandeali2018-07-181-7/+9
* Add getOrdersInfo functionAmir Bandeali2018-07-182-0/+24
* Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytesAmir Bandeali2018-07-111-4/+23
* Remove TODOs that won't be addressedAmir Bandeali2018-07-074-10/+3
* Remove AbiV2 where unusedAmir Bandeali2018-07-079-21/+17
* Only reset currentContextAddress if it was previously updatedAmir Bandeali2018-07-071-8/+11
* Apply new linter rulesAmir Bandeali2018-07-0736-90/+99
* Merge pull request #522 from 0xProject/feature/contracts/forwarderJacob Evans2018-07-061-1/+1
|\
| * Forwarding contract (squashed commits)Jacob Evans2018-07-061-1/+1
* | Contracts 2.0.0 were linted with solhintAlex Shafranovich2018-07-0634-1/+42
|/
* Update file structureAmir Bandeali2018-06-3036-0/+3908