aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
Commit message (Expand)AuthorAgeFilesLines
* Remove as any hack from artifacts in contracts packageAlex Browne2018-10-161-35/+37
* Introduce new contract-addresses package and use it everywhereAlex Browne2018-10-162-2/+0
* Cleanup migrations and contracts package. Make contracts private again.Alex Browne2018-10-161-3/+0
* Update contract-wrappers package to use new contracts package for generated f...Alex Browne2018-10-162-3/+4
* Move generated contract wrappers and artifacts into contracts packageAlex Browne2018-10-16107-12998/+115
* 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 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 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-302-3/+17
* Making rounding consistent in calculateFillResultsAmir Bandeali2018-08-291-2/+2
* safeGetPartialAmount (#1035)Amir Bandeali2018-08-295-23/+128
* 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
|\
| * Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js int...Remco Bloemen2018-08-2516-95/+591
| |\
| * | 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-255-57/+11
* | Update ReentrantERC20Token with new functions and check that revert is occuri...Amir Bandeali2018-08-251-35/+75
* | Add nonReentrant modifiers on functions that use getCurrentContextAddress onl...Amir Bandeali2018-08-254-15/+17
* | 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 ma...Amir Bandeali2018-08-256-41/+148
* | 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
|\ \
| * | 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 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-272-1/+120
* 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 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 Migrations for ForwarderJacob Evans2018-07-111-2/+2
* 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 (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-30107-3375/+1
* Make registerAssetProxy append onlyAmir Bandeali2018-06-306-60/+25
* Change getTransactionReceipt to awaitTransactionMinedAmir Bandeali2018-06-301-1/+1
* Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codesAlex Browne2018-06-301-6/+35
* Fix deployment to gethAmir Bandeali2018-06-301-1/+1
* Fix testsAmir Bandeali2018-06-303-7/+10
* Remove transferFrom, implement in fallback functionAmir Bandeali2018-06-306-290/+267
* Merge pull request #774 from 0xProject/style/contracts/abiEncodeAsmCommentsAmir Bandeali2018-06-302-0/+22
|\
| * Updated hashing comments as-per PRGreg Hysen2018-06-291-9/+4
| * Comments for ASM hashingGreg Hysen2018-06-262-0/+27
* | Remove unused constantsFabio Berger2018-06-281-2/+0
* | Reduce the userAddresses to the individual addresses actually used by tests, ...Fabio Berger2018-06-281-1/+2
* | Add await time constantFabio Berger2018-06-281-0/+2
* | Add missing awaitTransactionSuccessAsync callsFabio Berger2018-06-281-6/+10
* | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2712-517/+312
|\ \
| * | Make dispatchTransferFrom revert with reason from AssetProxy on failureAmir Bandeali2018-06-271-5/+4
| * | Remove redundant files, hard code function selector in dispatchTransferFrom, ...Amir Bandeali2018-06-2713-701/+198
| * | Updated offset of receiverData length to reflect new assetData encoding.Greg Hysen2018-06-271-2/+2
| * | ERC20 Custom storage layoutRemco Bloemen2018-06-272-3/+5
| * | Golf the authorization checkRemco Bloemen2018-06-272-122/+132
| * | ERC20 manual memory layoutRemco Bloemen2018-06-271-11/+6
| * | ERC20 inline returnRemco Bloemen2018-06-271-6/+11
| * | ERC721 inline returnRemco Bloemen2018-06-271-8/+9
| * | Golf ERC721 transferFromRemco Bloemen2018-06-272-3/+166
| * | Inline ERC20 tranferFrom selector constantRemco Bloemen2018-06-271-4/+3
| * | Optimize ERC20 transferFromRemco Bloemen2018-06-271-2/+126
* | | Fix type issueFabio Berger2018-06-271-2/+2
* | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testingFabio Berger2018-06-271-1/+5
|\| |
| * | Expect RevertReason be passed in, not stringFabio Berger2018-06-261-1/+5
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2623-202/+370
| |\ \
* | | | Update AbstractAssetWrapperFabio Berger2018-06-261-1/+1
* | | | Fix merge issuesFabio Berger2018-06-264-16/+17
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2623-202/+370
|\ \ \ \ | | |/ / | |/| |
| * | | Don't use variables for revert reasonsAmir Bandeali2018-06-2613-84/+82
| * | | Add comments to dispatchTransferFromAmir Bandeali2018-06-261-30/+56
| * | | Document IAssetDataRemco Bloemen2018-06-261-0/+3
| * | | Compute bytes4 proxyid constantsRemco Bloemen2018-06-262-2/+2
| * | | Return inplace bytes in LibBytes.readBytesWithLengthRemco Bloemen2018-06-261-9/+7
| * | | Add Greg's documentation to MixinErc721TransferRemco Bloemen2018-06-261-33/+44
| * | | Add Greg's documentation to MixinErc20TransferRemco Bloemen2018-06-261-13/+35
| * | | Gas golf the transfer success logicRemco Bloemen2018-06-261-11/+10
| * | | Optimize like in PR #767Remco Bloemen2018-06-263-34/+157
| * | | Fix testsAmir Bandeali2018-06-261-16/+0
| * | | Fix ERC721Proxy TokenIdRemco Bloemen2018-06-261-1/+1
| * | | WIPRemco Bloemen2018-06-262-2/+2
| * | | ABI encoded asset dataRemco Bloemen2018-06-269-29/+51
| * | | Remove proxyId argument from dispatchTransferFromRemco Bloemen2018-06-266-34/+16
| | |/ | |/|
* | | Prettier fixesFabio Berger2018-06-261-4/+1
* | | Fix tslint issuesFabio Berger2018-06-264-18/+3
* | | Check revert reasons in declarative and combinatorial testsFabio Berger2018-06-251-7/+8
* | | merge check-revert-reasonsFabio Berger2018-06-251-44/+0
|\ \ \ | | |/ | |/|
| * | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-251-44/+0
* | | merge check-revert-reasonsFabio Berger2018-06-255-21/+63
|\| |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2519-340/+424
| |\|
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-231-1/+1
| * | Remove revert reason 'Exchange' prefixFabio Berger2018-06-231-2/+2
| * | Move constants over to ContractLibError enum and update all testsFabio Berger2018-06-232-15/+10
| * | Standardize ERC20 error strings given conventionFabio Berger2018-06-231-3/+2
| * | Fix test now that contract reverts with messageFabio Berger2018-06-221-0/+1
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-223-27/+48
| |\ \
| * | | Change Whitelist error messages to conform to rest and added revert reason ch...Fabio Berger2018-06-222-5/+7
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2226-352/+454
| |\ \ \
| * | | | Check revert reasons in Authorizable testsFabio Berger2018-06-211-0/+1
| * | | | Change revert reason in ownable to be similar to all other revert reasonsFabio Berger2018-06-211-1/+1
| * | | | Update core tests to actually check revert messageFabio Berger2018-06-212-0/+44
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2538-703/+910
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix typos in commentsRemco Bloemen2018-06-231-2/+2
| * | | | Add modifier and tests for removeAuthorizedAddressAtIndexAmir Bandeali2018-06-232-2/+10
| * | | | Update and add testsAmir Bandeali2018-06-232-3/+5
| * | | | Change removeAuthorizedAddress => removeAuthorizedAddressAtIndexAmir Bandeali2018-06-232-13/+22
| * | | | Move isFunctionRemoveAuthorizedAddress to testRemco Bloemen2018-06-233-14/+50
| * | | | Fix usage of `popLastByte`Remco Bloemen2018-06-231-2/+2
| * | | | Fix LibBytes is a libraryRemco Bloemen2018-06-236-15/+12
| * | | | Remove `areBytesEqual`Remco Bloemen2018-06-231-35/+0
| * | | | Fix usage of `contentAddress()`Remco Bloemen2018-06-231-2/+2
| * | | | Clean low bits in bytes4Remco Bloemen2018-06-231-0/+3
| * | | | Clean high bits in addressRemco Bloemen2018-06-231-0/+4
| * | | | Refactor LibBytes.readBytes4 for consistencyRemco Bloemen2018-06-233-11/+18
| * | | | Fix LibBytes.equalsRemco Bloemen2018-06-231-21/+4
| * | | | Add trailing garbage testcase for LibBytes.equalsRemco Bloemen2018-06-231-0/+11
| * | | | Rename bytes.equalsRemco Bloemen2018-06-232-2/+37
| * | | | Add slice and sliceDestructiveRemco Bloemen2018-06-231-0/+46
| * | | | Rename bytes.rawAddress and add bytes.contentAddressRemco Bloemen2018-06-232-8/+25
| * | | | Rename read/writeBytesWithLengthRemco Bloemen2018-06-233-7/+7
| * | | | Using LibBytes for bytesRemco Bloemen2018-06-236-26/+38
| * | | | Make LibBytes a libraryRemco Bloemen2018-06-236-35/+30
| * | | | Merge LibMem and LibBytesRemco Bloemen2018-06-236-206/+150
| * | | | Merge pull request #749 from 0xProject/feature/contracts/transactionHashAsmAmir Bandeali2018-06-231-8/+18
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Apply mask to address to zero-out unused bytes.Greg Hysen2018-06-231-1/+1
| | * | | Converted `hashZeroExTransaction` to assembly. Saves 1k gasGreg Hysen2018-06-221-8/+18
| | | |/ | | |/|
| * | | Merge pull request #748 from 0xProject/fix/contracts/nullAssetProxyFabio Berger2018-06-223-27/+48
| |\ \ \ | | |/ / | |/| |
| | * | Check that assetProxy exists before attempting transferAmir Bandeali2018-06-223-27/+48
| * | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ac...Amir Bandeali2018-06-2214-68/+94
| * | | Add senderAddress to Fill and Cancel logs, add comments to events and typesAmir Bandeali2018-06-224-44/+45
| |/ /
| * | Remove unreachable PreSigned checkAustin Roberts2018-06-221-4/+0
| * | Set settleOrder and settleMatchedOrders to privateGreg Hysen2018-06-214-25/+2
| * | Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `se...Greg Hysen2018-06-218-238/+205
| * | Renamed constants in test wallet/validatorGreg Hysen2018-06-212-11/+11
| * | Few more minor #nit wording changesGreg Hysen2018-06-212-5/+5
| * | Fixed two mislabelled revert reasons + Signature Validator revert tests worki...Greg Hysen2018-06-212-2/+7
| * | Minor style tweaksGreg Hysen2018-06-213-8/+8
| * | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported t...Greg Hysen2018-06-216-11/+141
| |/
* | Add support for approveAll in assetWrapper and fillOrderScenariosFabio Berger2018-06-213-4/+41
* | Improve verbose loggingFabio Berger2018-06-211-2/+5
* | Fix merge variable name issueFabio Berger2018-06-201-1/+1
* | Add support for setting allowance to unlimitedFabio Berger2018-06-202-7/+35
* | Add noop conditionals for clarityFabio Berger2018-06-201-0/+10
* | Rename for clarityFabio Berger2018-06-201-8/+8
* | Split balance and allowance amount types in prep of adding the "unlimited" al...Fabio Berger2018-06-202-38/+45
* | Remove unneeded explicit type defFabio Berger2018-06-201-1/+1
* | Add TS 2.7 numeric separators to improve readabilityFabio Berger2018-06-201-6/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 07:09:31 +0800