aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0/protocol/Exchange
Commit message (Collapse)AuthorAgeFilesLines
* Move generated contract wrappers and artifacts into contracts packageAlex Browne2018-10-1629-3802/+0
|
* Remove TODOs that will not be addressedAmir Bandeali2018-09-042-2/+1
|
* Apply styling fixesAmir Bandeali2018-09-0414-26/+48
|
* Add cancelOrderInternal, use within batchCancelOrdersAmir Bandeali2018-08-313-9/+24
|
* Remove unused importsAmir Bandeali2018-08-301-3/+1
|
* Making rounding consistent in calculateFillResultsAmir Bandeali2018-08-291-2/+2
|
* safeGetPartialAmount (#1035)Amir Bandeali2018-08-293-23/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Add clarifying commentsAmir Bandeali2018-08-281-0/+1
|
* Merge pull request #986 from 0xProject/feature/contracts/assertionsAmir Bandeali2018-08-253-30/+113
|\ | | | | Add more assertions to assertValidFill
| * Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js ↵Remco Bloemen2018-08-259-81/+283
| |\ | | | | | | | | | into fix/contracts/robustMatching
| * | 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 ↵Greg Hysen2018-08-251-38/+29
| |/ |/| | | | | compounded rounding errors.
* | Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow ↵Amir Bandeali2018-08-253-12/+9
| | | | | | | | variations
* | Add nonReentrant modifiers on functions that use getCurrentContextAddress ↵Amir Bandeali2018-08-254-15/+17
| | | | | | | | only, add lockMutex modifier on functions that make external calls
* | Add internal fill functions, add reentrancy guard to public functions that ↵Amir Bandeali2018-08-255-40/+148
| | | | | | | | make external calls
* | Remove redundant sload from getCurrentContextAddressAmir Bandeali2018-08-251-1/+2
| |
* | Merge pull request #1003 from 0xProject/feature/contracts/roundupAmir Bandeali2018-08-254-22/+116
|\ \ | | | | | | [contracts] Add getPartialAmountCeil and isRoundingErrorCeil
| * | 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
| |
* | 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 ↵Amir Bandeali2018-08-092-9/+28
| | | | hashing functions
* 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* 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-231-0/+13
|
* 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
|
* Remove TODOs that won't be addressedAmir Bandeali2018-07-074-10/+3
|
* Remove AbiV2 where unusedAmir Bandeali2018-07-073-15/+17
|
* Only reset currentContextAddress if it was previously updatedAmir Bandeali2018-07-071-8/+11
|
* Apply new linter rulesAmir Bandeali2018-07-0727-70/+74
|
* Merge pull request #522 from 0xProject/feature/contracts/forwarderJacob Evans2018-07-061-1/+1
|\ | | | | Forwarding contract
| * Forwarding contract (squashed commits)Jacob Evans2018-07-061-1/+1
| |
* | Contracts 2.0.0 were linted with solhintAlex Shafranovich2018-07-0627-0/+32
|/
* Update file structureAmir Bandeali2018-06-3027-0/+3126