aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0
Commit message (Collapse)AuthorAgeFilesLines
* Move generated contract wrappers and artifacts into contracts packageAlex Browne2018-10-1689-10924/+0
|
* Remove TODOs that will not be addressedAmir Bandeali2018-09-043-3/+2
|
* Update MultiSigWalletWithTimeLock to 0.4.24Amir Bandeali2018-09-042-24/+24
|
* Update to most recent multisigAmir Bandeali2018-09-043-71/+89
|
* Apply styling fixesAmir Bandeali2018-09-0442-67/+64
|
* Revert in Forwarder constructor if ERC20 proxy isn't registeredAmir Bandeali2018-09-041-5/+6
|
* Merge pull request #1045 from 0xProject/feature/contracts/cancelOrderInternalAmir Bandeali2018-08-314-9/+30
|\ | | | | Add cancelOrderInternal, use within batchCancelOrders
| * Add cancelOrderInternal, use within batchCancelOrdersAmir Bandeali2018-08-314-9/+30
| |
* | Add tests for token that returns >32 bytesAmir Bandeali2018-08-311-0/+70
|/
* Fix geth testsAmir Bandeali2018-08-301-1/+4
|
* Remove unused importsAmir Bandeali2018-08-303-5/+1
|
* Update AssetProxyOwner to 0.4.24Amir Bandeali2018-08-302-51/+21
|
* Reverted syntax used by readBytes4 in AssetProxyOwner to be compatible with ↵Greg Hysen2018-08-301-5/+1
| | | | Solidity v0.4.10
* Updated comments for ERC20 proxy to clarify how we load the token address ↵Greg Hysen2018-08-302-9/+60
| | | | from calldata (3.18 from audit)
* Updated readBytes4 to match spec + added unit tests. These are 3.5/3.6 from ↵Greg Hysen2018-08-302-3/+17
| | | | audit
* Making rounding consistent in calculateFillResultsAmir Bandeali2018-08-291-2/+2
|
* safeGetPartialAmount (#1035)Amir Bandeali2018-08-295-23/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-282-0/+2
|
* Remove redundant mstores from fillOrderNoThrowAmir Bandeali2018-08-281-8/+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-2516-95/+591
| |\ | | | | | | | | | 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-255-57/+11
| | | | | | | | variations
* | Update ReentrantERC20Token with new functions and check that revert is ↵Amir Bandeali2018-08-251-35/+75
| | | | | | | | occuring for correct reason
* | Add nonReentrant modifiers on functions that use getCurrentContextAddress ↵Amir Bandeali2018-08-254-15/+17
| | | | | | | | only, add lockMutex modifier on functions that make external calls
* | Split modifiers into check only and check, lock, unlockAmir Bandeali2018-08-251-0/+13
| |
* | Add ReentrantTokenAmir Bandeali2018-08-251-0/+173
| |
* | Add internal fill functions, add reentrancy guard to public functions that ↵Amir Bandeali2018-08-256-41/+148
| | | | | | | | make external calls
* | Add ReentrancyGuard contractAmir Bandeali2018-08-251-0/+44
| |
* | Remove redundant sload from getCurrentContextAddressAmir Bandeali2018-08-251-1/+2
| |
* | Merge pull request #1003 from 0xProject/feature/contracts/roundupAmir Bandeali2018-08-259-36/+198
|\ \ | | | | | | [contracts] Add getPartialAmountCeil and isRoundingErrorCeil
| * | Stylistic fixesRemco Bloemen2018-08-251-5/+20
| | |
| * | Append -Floor to getPartialAmount and isRoundingErrorRemco Bloemen2018-08-259-25/+25
| | |
| * | Disambiguate the operator precedenceRemco Bloemen2018-08-251-2/+2
| | |
| * | Add testsRemco Bloemen2018-08-252-1/+52
| | |
| * | 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 tests for getPartialAmountCeilRemco Bloemen2018-08-251-0/+17
| | |
| * | 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-253-31/+16
| |
* | Rethrow Wallet and Validator errorsAmir Bandeali2018-08-251-4/+28
| |
* | Rename TestStaticCall => TestStaticCallReceiverAmir Bandeali2018-08-251-1/+2
| |
* | 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-254-4/+128
| |
* | Add pragma experimental v0.5.0 to SignatureValidator and add testsAmir Bandeali2018-08-253-0/+66
|/
* Add getBalancesAndAllowancesAmir Bandeali2018-08-221-0/+19
|
* Add ZRX balances and allowances to TraderInfoAmir Bandeali2018-08-221-7/+16
|
* Don't throw if ERC721 token isn't ownedAmir Bandeali2018-08-221-1/+51
|
* Add OrderValidator contractAmir Bandeali2018-08-2214-23/+163
|
* Remove redundant constructor argsAmir Bandeali2018-08-222-8/+8
|
* Fix typos, run prettier, and allow anyone to call on DummyERC721TokenAmir Bandeali2018-08-175-6/+6
|
* Add ERC721Receiver that returns incorrect valueAmir Bandeali2018-08-171-0/+66
|
* Increase max mintable amountAmir Bandeali2018-08-171-1/+1
|
* Fix DummyERC721ReceiverAmir Bandeali2018-08-171-32/+32
|
* Add tests for ERC20 token with no return valuesAmir Bandeali2018-08-171-0/+116
|
* Add constructor back to DummyERC721TokenAmir Bandeali2018-08-171-0/+12
|
* Restructure directoriesAmir Bandeali2018-08-176-52/+103
|
* Update ERC20TokenAmir Bandeali2018-08-176-47/+113
|
* Optimize ERC721TokenAmir Bandeali2018-08-175-510/+462
|
* Change withdrawERC20 => withdrawAsset, reuse transfer logicAmir Bandeali2018-08-104-18/+15
|
* Make marketBuy functions revert if entire amount not filledAmir Bandeali2018-08-105-98/+29
|
* Revert incrementing memory ptr in dispatchTransferFromAmir Bandeali2018-08-093-9/+3
|
* Test abiEncodeFillOrder as part of combinatorial follOrder testsAmir Bandeali2018-08-091-0/+1
|
* Increment free memory pointer for internal Exchange functions that use asmAmir Bandeali2018-08-093-12/+34
|
* 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-272-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 namesFabio Berger2018-07-261-4/+4
|
* Update orderEpoch commentsAmir Bandeali2018-07-252-2/+2
|
* Remove ERC721 callback functionsAmir Bandeali2018-07-234-49/+3
|
* Use != instead of > in loops, add sanity checks to market fill functionsAmir Bandeali2018-07-232-18/+18
|
* Add more tests and fixesAmir Bandeali2018-07-235-5/+8
|
* Remove MConstants and MixinConstants for LibConstantsAmir Bandeali2018-07-238-57/+23
|
* Remove redundant external call by reimplementing fillOrderNoThrowAmir Bandeali2018-07-236-166/+355
|
* Remove orders length checkAmir Bandeali2018-07-232-11/+0
|
* Add assertValidFillResultsAmir Bandeali2018-07-231-61/+88
|
* Store orders length in varible before looping over ordersAmir Bandeali2018-07-232-14/+25
|
* Use transferFrom instead of safeTransferFromAmir Bandeali2018-07-231-5/+2
|
* Fix rounding error issues, use different logic when makerAsset is ZRXAmir Bandeali2018-07-236-52/+95
|
* Rename marketSellEth => marketSellWethAmir Bandeali2018-07-232-3/+3
|
* Update percentage constantsAmir Bandeali2018-07-233-17/+18
|
* Update transferEthFeeAndRefund, add check to ERC721 transferAmir Bandeali2018-07-236-26/+54
|
* Refactor forwarding contract architecture, remove batch functionsAmir Bandeali2018-07-2320-1038/+572
|
* Add tests to verify ZRX_ASSET_DATAAmir Bandeali2018-07-231-0/+57
|
* Add comments for deploying with constant ZRX_ASSET_DATAAmir Bandeali2018-07-232-2/+15
|
* Move example contracts into new examples dirAmir Bandeali2018-07-236-6/+11
|
* Merge pull request #877 from 0xProject/feature/contracts/removeERC721CallbackAmir Bandeali2018-07-233-79/+25
|\ | | | | Removed receiverData and `onReceive` callback from ERC721 proxy.
| * Removed receiverData from ERC721 Proxy Id generationGreg Hysen2018-07-183-6/+4
| |
| * 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
|
* Remove extra ERC20ProxyId from Forwarder constructorJacob Evans2018-07-111-1/+0
|
* Add revert reasons and optimization to safeMathAmir Bandeali2018-07-111-3/+15
|
* Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytesAmir Bandeali2018-07-113-10/+43
|
* Move functions out of Forwarder.solAmir Bandeali2018-07-0812-42/+35
|
* Add interfaces and mixinsAmir Bandeali2018-07-0816-61/+573
|
* Combine mixinsAmir Bandeali2018-07-086-284/+218
|
* Use interfaces instead of full contractsAmir Bandeali2018-07-084-7/+39
|
* Remove TODOs that won't be addressedAmir Bandeali2018-07-074-10/+3
|
* Remove AbiV2 where unusedAmir Bandeali2018-07-0723-38/+27
|
* Only reset currentContextAddress if it was previously updatedAmir Bandeali2018-07-071-8/+11
|
* Change uint => uint256Amir Bandeali2018-07-071-8/+7
|
* Apply new linter rulesAmir Bandeali2018-07-0773-298/+350
|
* Merge pull request #522 from 0xProject/feature/contracts/forwarderJacob Evans2018-07-0611-1/+1102
|\ | | | | Forwarding contract
| * Forwarding contract (squashed commits)Jacob Evans2018-07-0611-1/+1102
| |
* | Contracts 2.0.0 were linted with solhintAlex Shafranovich2018-07-0660-1/+78
|/
* Update file structureAmir Bandeali2018-06-3063-0/+7750
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 10:10:50 +0800