aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
Commit message (Expand)AuthorAgeFilesLines
* Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-1316-149/+132
* Speedup awaitTransactionMinedAsync and reduce polling interval in contracts t...Alex Browne2018-06-121-1/+4
* Implement SolidityProfiler & adapt sol-cov to work with GethLeonid Logvinov2018-06-093-1/+51
* Updated LibBytes error messagesGreg Hysen2018-06-082-6/+6
* Camelcase in memCopyGreg Hysen2018-06-083-22/+22
* Style updates to contractsGreg Hysen2018-06-083-16/+16
* Fixed a styling throughout contracts. Moved closing parenthesis for long list...Greg Hysen2018-06-088-31/+62
* Fixed merge error when rebasing wrt length variable in asset data decodersGreg Hysen2018-06-082-4/+4
* Style updates to ERC721 onReceiverGreg Hysen2018-06-083-8/+6
* Fixed after rebaseGreg Hysen2018-06-083-5/+5
* Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-082-16/+9
* Style audit for proxies + libmem + libbytesGreg Hysen2018-06-086-23/+40
* Style audit proxiesGreg Hysen2018-06-083-20/+64
* Call safeTransferFrom only when there is receiver data presentGreg Hysen2018-06-081-1/+6
* Fixed formatting in memory layoutGreg Hysen2018-06-081-6/+6
* Resolved edge case in Memcpy where where send would eventually turn "negative...Greg Hysen2018-06-081-11/+17
* Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. T...Greg Hysen2018-06-086-88/+57
* Converged on naming scheme for asset data: renamed all instances of assetMeta...Greg Hysen2018-06-0813-67/+67
* proxyData -> assetDataGreg Hysen2018-06-081-11/+11
* Implement memcpy using masking and end-aligned wordsRemco Bloemen2018-06-081-59/+85
* Convert Solidity tests to vectorsRemco Bloemen2018-06-081-203/+0
* Generate tests from vectorsRemco Bloemen2018-06-081-3/+24
* Fixed up wording in memcpyGreg Hysen2018-06-081-3/+3
* Tons of tests around nested byte arrays and ERC721 receiverGreg Hysen2018-06-082-10/+32
* Test for onReceived erc721 callbackGreg Hysen2018-06-082-0/+3
* LibAssetProxyDecoder testsGreg Hysen2018-06-081-1/+1
* Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-083-0/+53
* Tests for libMemGreg Hysen2018-06-083-15/+11
* LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721ReceiverGreg Hysen2018-06-087-27/+579
* Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changesFabio Berger2018-06-081-0/+1
|\
| * Fix tslint failureFabio Berger2018-06-081-0/+1
* | merge v2-prototypeFabio Berger2018-06-0714-42/+151
|\|
| * Merge pull request #673 from mohoff/patch-1Fabio Berger2018-06-071-1/+1
| |\
| | * typomohoff2018-06-071-1/+1
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-075-8/+144
| |\|
| | * Apply various fixes based on PR feedbackAlex Browne2018-06-071-1/+1
| | * Use an enum for ProviderType in contracts/src/utils/web3_wrapperAlex Browne2018-06-071-4/+21
| | * Add Async suffix to relevant assertionsAlex Browne2018-06-071-9/+9
| | * Fix linter errorsAlex Browne2018-06-072-2/+36
| | * Update more things to work with both Geth and GanacheAlex Browne2018-06-071-22/+14
| | * Small fixes and cleanupAlex Browne2018-06-072-6/+2
| | * Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-071-6/+6
| | * Throw in web3-wrapper when rawCallResult is '0x'Alex Browne2018-06-072-0/+13
| | * Fix some more test cases, especially those that call increaseTimeAlex Browne2018-06-071-0/+26
| | * Add support for TEST_PROVIDER env varAlex Browne2018-06-071-3/+4
| | * Update more tests to pass on GethAlex Browne2018-06-072-0/+14
| | * Get LibBytes tests working on both Ganache and GethAlex Browne2018-06-072-1/+6
| | * Add ability to quickly switch between Geth and Ganache by changing a constAlex Browne2018-06-071-3/+16
| | * Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTrans...Alex Browne2018-06-071-2/+2
| | * Update code after rebaseAlex Browne2018-06-073-2/+27
| * | Get build and tests to passfragosti2018-06-071-1/+2
| * | Linter now passesfragosti2018-06-0610-34/+6
| |/
* / move generated contract wrappers from `contract_wrappers/generated/` to `gene...Fabio Berger2018-06-066-13/+13
|/
* rename GT to GREATER_THANJacob Evans2018-06-053-3/+3
* Update Exchange statuses, revert instead of emmitting event on fill/cancel fa...Amir Bandeali2018-06-0524-630/+420
* Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-023-55/+52
|\
| * Set contract expiration time to a constant 10 minutesAlex Browne2018-06-021-1/+2
| * Remove unused promises arrayAlex Browne2018-06-022-6/+0
| * Make erc20_wrapper and erc721_wrapper serialAlex Browne2018-06-022-48/+50
* | Fix tslint issuesFabio Berger2018-06-021-2/+1
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-029-15/+25
|\|
| * Fix linter errorsLeonid Logvinov2018-06-014-4/+4
| * Add ethereum-types to extraFileIncludesLeonid Logvinov2018-06-011-2/+9
| * Introduce ethereum-types packageLeonid Logvinov2018-06-018-14/+11
| * Merge pull request #640 from 0xProject/await-transaction-successAlex Browne2018-05-311-4/+10
| |\
| | * Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapperAlex Browne2018-05-311-4/+6
| | * Add awaitTransactionSuccess where neededAlex Browne2018-05-311-2/+6
* | | Rename Ecrecover to EthSignFabio Berger2018-06-013-6/+3
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-0132-174/+530
|\| |
| * | Check length before accessing indices, add awaitTransactionSuccess where need...Amir Bandeali2018-05-314-12/+16
| * | Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMITAmir Bandeali2018-05-313-4/+4
| * | Make preSigned and allowedValidators mappings publicAmir Bandeali2018-05-311-2/+2
| * | Change names of signature typesAmir Bandeali2018-05-312-6/+6
| * | Fix formatting and testsAmir Bandeali2018-05-314-4/+10
| * | Make AssetProxyId last byte of assetDataAmir Bandeali2018-05-3118-37/+74
| * | Add signer to txHash, allow approveValidator to be used with executeTransactionAmir Bandeali2018-05-313-7/+10
| * | Update WhitelistAmir Bandeali2018-05-315-24/+54
| * | Fix Exchange interfaceAmir Bandeali2018-05-311-7/+5
| * | Use last byte of signature as signature typeAmir Bandeali2018-05-315-74/+75
| * | Remove TxOrigin signature type, modify whitelist to use Validator signature typeAmir Bandeali2018-05-315-31/+28
| * | Update Whitelist contract with comments, also require maker to be whitelistedAmir Bandeali2018-05-314-12/+43
| * | Fix buildAmir Bandeali2018-05-313-19/+24
| * | Add example whitelist contract and minimum testsAmir Bandeali2018-05-312-9/+32
| * | Add sample whitelist contractAmir Bandeali2018-05-311-0/+58
| * | Add TxOrigin signature type and rearrange order of typesAmir Bandeali2018-05-313-63/+77
| * | Add approveValidator functionAmir Bandeali2018-05-312-2/+17
| * | Add Validator signature typeAmir Bandeali2018-05-313-2/+68
| * | Add deepCopyBytes method to LibBytesAmir Bandeali2018-05-312-0/+58
| * | Change logDecoder back into class, remove awaitTransactionMined from multiSig...Amir Bandeali2018-05-313-50/+62
| |/
* | Introduce OrderWithoutExchangeAddress type since this is what get's sent to t...Fabio Berger2018-05-313-26/+22
* | Initial refactor of order-utils. Move many utils from contracts into this pac...Fabio Berger2018-05-3011-317/+26
|/
* Remove contracts -> @0xproject/order-utils dependencyLeonid Logvinov2018-05-261-0/+1
* Fix imports in order_utilsLeonid Logvinov2018-05-251-1/+1
* Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-2513-65/+221
|\
| * Use web3-wrapper instead of 0x.js, update logDecoderAmir Bandeali2018-05-256-44/+44
| * Cleanup testsAmir Bandeali2018-05-251-1/+1
| * Move readFirst4 to LibBytesAmir Bandeali2018-05-253-20/+42
| * Add old MultiSig to previous contracts, cleanup file structureAmir Bandeali2018-05-255-9/+9
| * Fix buildAmir Bandeali2018-05-251-0/+82
| * Address feedback, rename contract to AssetProxyOwnerAmir Bandeali2018-05-254-15/+19
| * Update multisig tests and utilsAmir Bandeali2018-05-251-25/+43
| * Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a mappi...Amir Bandeali2018-05-251-18/+48
* | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-256-38/+17
|\ \
| * | Fix linter issuesLeonid Logvinov2018-05-251-1/+1
| * | Migrate migrations to v2Leonid Logvinov2018-05-256-39/+18
| |/
* | Use domain separator for exchange addressJacob Evans2018-05-253-6/+33
* | publicGetOrderSchemaHash -> getOrderSchemaHashJacob Evans2018-05-251-1/+1
* | Update order hash to match latest eip712Jacob Evans2018-05-253-34/+51
|/
* Check transaction receipt status codes where applicableAlex Browne2018-05-241-1/+1
* Move contract utilsLeonid Logvinov2018-05-242-0/+377
* Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-246-23/+26
|\
| * Fix ExchangeWrapperFabio Berger2018-05-231-3/+5
| * Fix importsFabio Berger2018-05-231-1/+1
| * Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-237-18/+31
| |\
| * | Remove 0x.js dep from contractsFabio Berger2018-05-236-23/+24
* | | Fix a bug in CALL-like opcode handlingLeonid Logvinov2018-05-231-1/+2
* | | Remove web3Factory.create and remove dev-tools dependency on sol-covLeonid Logvinov2018-05-231-3/+9
| |/ |/|
* | Merge pull request #601 from 0xProject/contracts-test-fixesAlex Browne2018-05-231-0/+1
|\ \
| * | Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-221-0/+1
| |/
* | Add CancelOrder and MatchOrder typesRemco Bloemen2018-05-222-3/+15
* | Add missing return typesRemco Bloemen2018-05-224-14/+14
|/
* Added getNullFillResultsGreg Hysen2018-05-192-1/+16
* orderFilledAmount -> orderTakerAssetFilledAmountGreg Hysen2018-05-196-29/+29
* Style improvements to order matchingGreg Hysen2018-05-194-28/+17
* Upgraded to Solidity 0.4.24Greg Hysen2018-05-1952-56/+56
* Rebased against v2-prototypeGreg Hysen2018-05-191-0/+1
* Changed calculateFillResults to public visibility so that it can be used by t...Greg Hysen2018-05-193-131/+131
* Wording of calculateMatchedFillResultsGreg Hysen2018-05-191-9/+11
* Cleaned up interface for decoding proxy data. Added a general decoder, which ...Greg Hysen2018-05-192-5/+53
* Removed redundant log decode callGreg Hysen2018-05-191-2/+0
* The OrderInfo struct is now returned by the getOrderInfo functionGreg Hysen2018-05-197-77/+57
* Updated order of settleMatchedOrders to align with settleOrderGreg Hysen2018-05-193-8/+8
* IExchange inherits from all other interfaces (in the same order as Exchange i...Greg Hysen2018-05-191-6/+10
* Renamed takerAssetFilledAmount to orderFilledAmount to more easily distinguis...Greg Hysen2018-05-193-37/+37
* Comments for readability in exchange core and mixin match ordersGreg Hysen2018-05-195-4/+11
* Renamed "validate" functions to "assert" in mixin match.Greg Hysen2018-05-195-21/+21
* Throw if the left or right orders do not compute the correct fill results. I ...Greg Hysen2018-05-194-27/+19
* Removed redundant status checks in matchOrders. Saves gas, plus follows patte...Greg Hysen2018-05-191-8/+0
* Token -> Asset in fillOrder specGreg Hysen2018-05-191-1/+1
* Reordered functions in mixin exchange core -- getOrderInfo is at the bottomGreg Hysen2018-05-192-77/+77
* Changes based on style guidelines put out by AmirGreg Hysen2018-05-199-172/+210
* Reordered fund transfers for matched orders, plus added an extra sanity check...Greg Hysen2018-05-193-35/+49
* Style changes to atomic order matchingGreg Hysen2018-05-199-304/+287
* Added require reasons to MixinMatchOrders and cleaned up some comments.Greg Hysen2018-05-196-40/+75
* Updated remaining contracts to v0.4.23Greg Hysen2018-05-194-4/+4
* Removed isRoundingError from mixin headerGreg Hysen2018-05-191-10/+1
* Atomic Order Matching - TestsGreg Hysen2018-05-194-6/+147
* Atomic Order Matching - Smart Contracts.Greg Hysen2018-05-1913-114/+957
* Merge pull request #583 from 0xProject/bug/contracts/erc721-encoded-padJacob Evans2018-05-181-1/+2
|\
| * Pad to 32 if asset ids are smallJacob Evans2018-05-101-1/+2
* | Merge branch 'development' into v2-prototypeFabio Berger2018-05-164-8/+8
|\ \
* | | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-169-77/+99
|\| | | |/ |/|
* | Add revert variables, change lib => libs to get around gitignoreAmir Bandeali2018-05-0921-52/+325
* | Move Authorizable to AssetProxy dir, rename to MixinAuthorizableAmir Bandeali2018-05-088-58/+92
* | Split up mixins and interfacesAmir Bandeali2018-05-0529-745/+508
* | Make LibBytes methods internal, add TestLibBytesAmir Bandeali2018-05-053-9/+148
* | Update contracts with revert reasons and constructor keywordAmir Bandeali2018-05-0341-180/+409
* | Add MixinAssetProxy to reuse redundant codeAmir Bandeali2018-05-034-98/+117
* | Add batchTransferFrom to asset proxiesAmir Bandeali2018-05-023-9/+111
* | Remove outdated commentAmir Bandeali2018-05-012-4/+2
* | Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-014-5/+54
* | Move TokenRegistry to 'previous' directoryAmir Bandeali2018-04-272-2/+2
* | Make all lib functions internal, add contracts for testingAmir Bandeali2018-04-2715-91/+198
* | Add LibFillResultsAmir Bandeali2018-04-2711-78/+107
* | Add ERC721 contracts from zeppelin-solidityAmir Bandeali2018-04-275-2/+573
* | Add tests and commentsAmir Bandeali2018-04-274-16/+25
* | Update tests and utilsAmir Bandeali2018-04-276-1/+65
* | Implement sender abstractionAmir Bandeali2018-04-276-47/+210
* | merge v2-prototypeFabio Berger2018-04-243-97/+96
|\ \
| * | Rename variables, create private validation methods in token wrappersAmir Bandeali2018-04-243-97/+96
* | | Fix testsAmir Bandeali2018-04-243-3/+54
* | | Combine Exchange with AssetProxyDispatcherAmir Bandeali2018-04-247-67/+58
|/ /
* | Define numbers of dummy tokens to deploy in constantsAmir Bandeali2018-04-243-2/+4
* | Remove type assertionsAmir Bandeali2018-04-241-18/+12
* | Fix and cleanup testsAmir Bandeali2018-04-242-1/+13
* | Add ERC721 wrapperAmir Bandeali2018-04-242-20/+161
* | Add ERC20WrapperAmir Bandeali2018-04-243-32/+127
* | Rename proxyUtils => assetProxyUtilsAmir Bandeali2018-04-231-6/+6
* | Rename missed variablesAmir Bandeali2018-04-234-20/+20
* | Reorder event argsAmir Bandeali2018-04-221-10/+10
* | Add missing async suffixAmir Bandeali2018-04-221-1/+1
* | Rename token => assetAmir Bandeali2018-04-2211-203/+203
* | Rename Token => IERC20TokenAmir Bandeali2018-04-227-155/+47
* | Rename DummyToken => DummyERC20TokenAmir Bandeali2018-04-226-66/+14
* | export proxyUtils instead of individual functionsAmir Bandeali2018-04-221-34/+32
* | Fix names and visibilities, use address type over contract type for function ...Amir Bandeali2018-04-225-22/+21
* | Remove unused constructor argumentsAmir Bandeali2018-04-222-28/+15
* | Add presigned signature typeAmir Bandeali2018-04-211-1/+29
* | Fix zeppelin imports, run prettierAmir Bandeali2018-04-212-2/+2
* | Added tests for (most functions in) LibBytes. The write methods are not curre...Greg Hysen2018-04-211-0/+1
* | Added description for the DummyERC721Token constructorGreg Hysen2018-04-211-0/+6
* | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less c...Greg Hysen2018-04-213-11/+15
* | Reverting earlier change: interfaces now inherit from other interfacesGreg Hysen2018-04-212-2/+10
* | Clarified that 0x0 could be passed into AssetProxyDispatcherGreg Hysen2018-04-212-4/+4
* | Inlined decodeMetadata in the proxies and removed encodeMetadata (already exi...Greg Hysen2018-04-212-72/+5
* | Added @TODO for safeTransferFrom support in ERC721 proxyGreg Hysen2018-04-211-0/+2
* | Removed outdated TODO comment in MixinSettlementProxyGreg Hysen2018-04-211-2/+0
* | Miscellaneous style changes to the contracts package; specifically testsGreg Hysen2018-04-212-3/+3
* | Removed ERC20 V1 Proxy + TokenTransferProxyGreg Hysen2018-04-219-296/+0
* | Updated commenting. Noted that transferFrom succeeds or throws on all transfe...Greg Hysen2018-04-214-7/+7
* | Reverted change that allowed ERC721 transfer proxy to be called with amount 0...Greg Hysen2018-04-211-3/+0
* | Removed takerTokenAddress and makerTokenAddress from Order struct.Greg Hysen2018-04-217-63/+78
* | toUnsigned -> toBuffer in assetProxyUtilsGreg Hysen2018-04-211-1/+1
* | Unrolled the loop that copies the Order struct in FillOrderNoThrow. Saves 900...Greg Hysen2018-04-211-5/+17
* | address -> IAssetProxy where possible for clarityGreg Hysen2018-04-212-13/+13
* | Reverted to calling read/write uint256Greg Hysen2018-04-212-2/+28
* | Minor changes to typescript testsGreg Hysen2018-04-212-4/+2
* | Minor fixes to the contractsGreg Hysen2018-04-213-2/+5
* | Rearranged preconditions in ERC721 proxyGreg Hysen2018-04-211-3/+3
* | Changed order of encode/decode functions in token proxiesGreg Hysen2018-04-213-36/+36
* | Updated name of AssetProxyChanged -> AssetProxySetGreg Hysen2018-04-213-3/+4
* | Explicity declare `memory` for complex types, where possibleGreg Hysen2018-04-213-5/+5
* | Improved readability of FillOrderNoThrow IIGreg Hysen2018-04-211-15/+15
* | Improved readability of FillOrderNoThrowGreg Hysen2018-04-211-4/+4
* | Updated ERC20 v1 proxy names in testsGreg Hysen2018-04-212-3/+3
* | Proxy Metadata -> DataGreg Hysen2018-04-212-9/+9
* | Cleaning up some wordingGreg Hysen2018-04-215-28/+26
* | Minor style improvements to asset proxy utilsGreg Hysen2018-04-211-10/+3
* | ethereum-js for encoding/decoding asset proxy dataGreg Hysen2018-04-211-41/+32
* | Added memory to bytes arrays, where possibleGreg Hysen2018-04-214-7/+7
* | Replaced read/write Uint256 with generic bytes32, plus castingGreg Hysen2018-04-214-16/+16
* | Updated public -> externalGreg Hysen2018-04-216-9/+9
* | Removed unused dependencyGreg Hysen2018-04-211-1/+0
* | snake case to camel caseGreg Hysen2018-04-211-25/+25
* | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetDataGreg Hysen2018-04-214-18/+18
* | IAssetProxyDispatcher to IAssetProxy in MixinSettlement layer + allowing 0-co...Greg Hysen2018-04-213-7/+8
* | Removed Log prefix from eventsGreg Hysen2018-04-212-5/+5
* | removed unnecessary importGreg Hysen2018-04-211-2/+0
* | setAssetProxy to addAssetProxyGreg Hysen2018-04-212-2/+2
* | Renamed TransferProxy to ProxyGreg Hysen2018-04-211-2/+1
* | Renaming TransferProxy to ProxyGreg Hysen2018-04-214-6/+6
* | ERC20 V1 proxy compilingGreg Hysen2018-04-211-3/+3
* | Changed order of write parameters in LibBytes. Now ordered by most generalize...Greg Hysen2018-04-214-10/+10
* | Asset Proxy DispatcherGreg Hysen2018-04-2123-122/+1088
* | Use addFillResults function and add comments to all marketFill functionsAmir Bandeali2018-04-211-36/+84
* | Fix EtherDelta importsAmir Bandeali2018-04-211-2/+2
* | Add back require statements and tests (will move to another PR)Amir Bandeali2018-04-211-3/+8
* | Revert variable namingAmir Bandeali2018-04-2110-141/+141
* | Update Solidity syntax and commentsAmir Bandeali2018-04-213-50/+52
* | Return all amounts traded and fees paidAmir Bandeali2018-04-217-106/+115
* | Add tests for marketBuyOrdersAmir Bandeali2018-04-211-2/+2
* | Add marketBuyOrders, rename variables, and fx old testsAmir Bandeali2018-04-218-226/+326
* | Fix build errorsAmir Bandeali2018-04-213-13/+6
* | Separate filled/cancelled errorsAmir Bandeali2018-04-213-4/+6
* | Remove partial cancelsAmir Bandeali2018-04-216-72/+31
* | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that orders...Greg Hysen2018-04-214-12/+13
* | Renamed all instances of timestamp to salt. Clarified test case wording.Greg Hysen2018-04-212-3/+3
* | Fixed spacingGreg Hysen2018-04-213-5/+5
* | Implementation and tests in the protocol for cancelling all orders up to a sp...Greg Hysen2018-04-216-16/+67
* | Update copyright headersAmir Bandeali2018-04-2130-24/+150
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 06:06:49 +0800