aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
Commit message (Collapse)AuthorAgeFilesLines
* Move generated contract wrappers and artifacts into contracts packageAlex Browne2018-10-161-529/+0
|
* Apply styling fixesAmir Bandeali2018-09-041-2/+10
|
* Add cancelOrderInternal, use within batchCancelOrdersAmir Bandeali2018-08-311-8/+17
|
* Making rounding consistent in calculateFillResultsAmir Bandeali2018-08-291-2/+2
|
* safeGetPartialAmount (#1035)Amir Bandeali2018-08-291-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js ↵Remco Bloemen2018-08-251-43/+69
|\ | | | | | | into fix/contracts/robustMatching
| * Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow ↵Amir Bandeali2018-08-251-1/+1
| | | | | | | | variations
| * Add nonReentrant modifiers on functions that use getCurrentContextAddress ↵Amir Bandeali2018-08-251-1/+3
| | | | | | | | only, add lockMutex modifier on functions that make external calls
| * Add internal fill functions, add reentrancy guard to public functions that ↵Amir Bandeali2018-08-251-31/+55
| | | | | | | | make external calls
| * Append -Floor to getPartialAmount and isRoundingErrorRemco Bloemen2018-08-251-4/+4
| |
* | Revert maker not equal taker checkRemco Bloemen2018-08-251-6/+1
| |
* | Fix mixin apiRemco Bloemen2018-08-251-8/+13
| |
* | Split into assertFillable and assertValidFillRemco Bloemen2018-08-251-24/+30
| |
* | 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-251-4/+5
| |
* | Add overfill and price assertion to assertValidFillRemco Bloemen2018-08-251-2/+30
|/
* 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-251-1/+1
|
* Reorder checks in getOrderInfoAmir Bandeali2018-07-181-7/+9
|
* Remove TODOs that won't be addressedAmir Bandeali2018-07-071-5/+3
|
* Apply new linter rulesAmir Bandeali2018-07-071-3/+2
|
* 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-061-0/+1
|/
* Update file structureAmir Bandeali2018-06-301-0/+436