aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1047 from 0xProject/feature/re-add-no-unused-variablesFrancesco Agosti2018-08-312-5/+2
|\
| * run prettierfragosti2018-08-311-3/+1
| * Fix unused vars for react-shared and websitefragosti2018-08-312-2/+1
* | Merge pull request #1046 from 0xProject/fix/contracts/roundingFeeTestsMatchOr...Greg Hysen2018-08-311-0/+94
|\ \
| * | Test cases for rounding fees in matchOrdersGreg Hysen2018-08-311-0/+94
* | | Add test for fillOrder and dispatchTransferFrom where maker == takerAmir Bandeali2018-08-312-1/+92
| |/ |/|
* | Fix geth testsAmir Bandeali2018-08-301-7/+7
|/
* Making rounding consistent in calculateFillResultsAmir Bandeali2018-08-291-7/+10
* safeGetPartialAmount (#1035)Amir Bandeali2018-08-292-87/+314
* fix(contracts): Use correct error message for division by zeroAlex Browne2018-08-281-3/+1
* Run all testsGreg Hysen2018-08-251-1/+1
* Give right maker better price when correct value is not integralGreg Hysen2018-08-251-10/+14
* Tests for matchOrders edge casesGreg Hysen2018-08-251-13/+71
* Renaming verify -> assert in order matchingGreg Hysen2018-08-251-18/+18
* Added function signature commentsGreg Hysen2018-08-251-27/+27
* Ran prettier and linterGreg Hysen2018-08-251-41/+3
* Updated all existing match order tests to use new formatGreg Hysen2018-08-251-122/+287
* First balance test with intentional valuesGreg Hysen2018-08-251-11/+24
* Ironing out the new set of test cases for order matchubngGreg Hysen2018-08-251-1/+1
* All existing tests pass.Greg Hysen2018-08-251-1/+104
* Add tests for matchOrdersAmir Bandeali2018-08-252-122/+53
* Add reentrancy tests for fillOrder and wrapper functionsAmir Bandeali2018-08-252-0/+221
* Merge pull request #1003 from 0xProject/feature/contracts/roundupAmir Bandeali2018-08-252-58/+172
|\
| * Fix linting errorsAmir Bandeali2018-08-251-2/+2
| * Append -Floor to getPartialAmount and isRoundingErrorRemco Bloemen2018-08-252-13/+13
| * Add testsRemco Bloemen2018-08-252-22/+93
| * Add DIVISION_BY_ZERO to getPartialAmount for consistencyRemco Bloemen2018-08-251-16/+15
| * Remove .onlyRemco Bloemen2018-08-251-1/+1
| * Add tests for getPartialAmountCeilRemco Bloemen2018-08-251-0/+40
| * Update testsRemco Bloemen2018-08-252-13/+17
* | SignatureType.Trezor -> SignatureType.EthSign in Signature Validator testsGreg Hysen2018-08-251-1/+1
* | Test case for Trezor Model T signatureGreg Hysen2018-08-251-0/+18
* | Fixed trezor personal message in client+contracts; added a test using message...Greg Hysen2018-08-251-0/+18
* | Remove Trezor SignatureTypeAmir Bandeali2018-08-251-47/+0
* | Remove SignatureType.CallerAmir Bandeali2018-08-251-26/+0
* | Rethrow Wallet and Validator errorsAmir Bandeali2018-08-252-18/+14
* | Rename TestStaticCall => TestStaticCallReceiverAmir Bandeali2018-08-252-10/+10
* | Remove pragma experimental v0.5.0 and use staticcall is assemblyAmir Bandeali2018-08-252-11/+70
* | Add pragma experimental v0.5.0 to SignatureValidator and add testsAmir Bandeali2018-08-251-1/+52
|/
* Fix many linter errors that showed up upon upgrading tsutilFabio Berger2018-08-231-1/+1
* Merge development branchFabio Berger2018-08-224-3/+136
|\
| * Fix linting errorsAmir Bandeali2018-08-172-2/+2
| * Add tests for ERC20 token with no return valuesAmir Bandeali2018-08-172-1/+134
* | Merge developmentFabio Berger2018-08-171-0/+11
|\|
| * [Order-utils] Order is valid when maker amount is very smallJacob Evans2018-08-151-0/+11
* | Merge developmentFabio Berger2018-08-152-19/+28
|\|
| * Rename from SignerProviderType.EthSign to SignerType.DefaultJacob Evans2018-08-111-5/+5
| * Introduce SignerProviderTypeJacob Evans2018-08-091-6/+6
| * Add strictArgumentEncodingCheck to BaseContract and use it in contract templatesAlex Browne2018-08-091-3/+3
| * Update TypeScript to version 2.9.2Alex Browne2018-08-091-4/+19
* | Rename EIP712Utils to eip712Utils since objectLiterals shouldn't start with capsFabio Berger2018-08-041-2/+2
* | Make signature_util into an object literal so related functions are rendered ...Fabio Berger2018-08-031-5/+17
|/
* Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-273-116/+361
* Add tests to verify ZRX_ASSET_DATAAmir Bandeali2018-07-231-0/+16
* Move example contracts into new examples dirAmir Bandeali2018-07-231-8/+8
* Removed receiverData and `onReceive` callback from ERC721 proxy.Greg Hysen2018-07-181-24/+0
* Fix prettierFabio Berger2018-07-181-3/+1
* merge v2-prototypeFabio Berger2018-07-186-97/+403
|\
| * Add tests for getOrderInfo and getOrdersInfoAmir Bandeali2018-07-182-5/+307
| * Fix bugs having to do with block timestamps and order expirationTimesAlex Browne2018-07-176-94/+98
* | Rename assetProxyUtils to assetDataUtilsFabio Berger2018-07-177-95/+95
|/
* Make it possible to configure block polling interval in base contract wrapperLeonid Logvinov2018-07-056-24/+24
* Improve robustness of revert reason assertionsAlex Browne2018-07-036-47/+47
* Remove unused variableFabio Berger2018-07-021-1/+0
* Merge branch 'v2-prototype' into fix/five_decimal_scenarioFabio Berger2018-07-028-257/+139
|\
| * Fix buildAmir Bandeali2018-06-302-5/+5
| * Update file structureAmir Bandeali2018-06-307-92/+91
| * Make registerAssetProxy append onlyAmir Bandeali2018-06-305-141/+42
| * Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codesAlex Browne2018-06-301-21/+3
* | Print out entire orderFill scenarioFabio Berger2018-07-021-7/+1
|/
* Reduce the userAddresses to the individual addresses actually used by tests, ...Fabio Berger2018-06-285-13/+22
* Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-271-8/+33
|\
| * Add more revert reasons to testsAmir Bandeali2018-06-271-6/+31
| * Make dispatchTransferFrom revert with reason from AssetProxy on failureAmir Bandeali2018-06-271-2/+2
* | Move combinatorial fillOrder tests into the `fill_ordere` test fileFabio Berger2018-06-272-48/+21
* | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testingFabio Berger2018-06-276-45/+45
|\|
| * Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmou...Fabio Berger2018-06-271-2/+2
| * Rename RevertReasons to RevertReason since singular enum names are more commonFabio Berger2018-06-266-54/+54
| * Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-265-10/+7
| |\
* | \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-265-10/+7
|\ \ \ | | |/ | |/|
| * | Fix testsAmir Bandeali2018-06-263-3/+3
| * | Remove proxyId argument from dispatchTransferFromRemco Bloemen2018-06-262-7/+4
* | | Fix inconsistency between contract and reference implementation of order vali...Fabio Berger2018-06-261-0/+2
* | | Prettier fixesFabio Berger2018-06-261-4/+1
* | | Fix tslint issuesFabio Berger2018-06-263-4/+1
* | | merge check-revert-reasonsFabio Berger2018-06-256-18/+10
|\ \ \ | | |/ | |/|
| * | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-256-18/+10
* | | merge check-revert-reasonsFabio Berger2018-06-256-67/+112
|\| |
| * | Fix tslintFabio Berger2018-06-234-4/+4
| * | Fix prettierFabio Berger2018-06-233-10/+10
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-236-54/+54
| * | Remove revert reason 'Exchange' prefixFabio Berger2018-06-231-1/+1
| * | Move constants over to ContractLibError enum and update all testsFabio Berger2018-06-231-4/+5
| * | Fix test now that contract reverts with messageFabio Berger2018-06-221-5/+3
| * | Add revert reason checks to wrapper testsFabio Berger2018-06-221-10/+19
| * | Fix testsFabio Berger2018-06-221-2/+2
| * | Change Whitelist error messages to conform to rest and added revert reason ch...Fabio Berger2018-06-221-16/+24
| * | Add revert reason checks to match_orders testsFabio Berger2018-06-221-7/+18
| * | Fix testsFabio Berger2018-06-221-2/+2
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-223-19/+435
| |\|
| * | Check revert reason in dispatcher testsFabio Berger2018-06-222-5/+13
| * | remove .onlyFabio Berger2018-06-211-1/+1
| * | Update core tests to actually check revert messageFabio Berger2018-06-211-34/+53
* | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-253-19/+435
|\ \ \ | | |/ | |/|
| * | Use make-promises-safe as a preloader instead of manually importingAlex Browne2018-06-222-2/+0
| * | Add event to setSignatureValidatorApproval, rename signer => signerAddress ac...Amir Bandeali2018-06-221-2/+50
| * | Add senderAddress to Fill and Cancel logs, add comments to events and typesAmir Bandeali2018-06-221-0/+2
| * | LinterGreg Hysen2018-06-211-2/+1
| * | Changed wording of two tests #nitGreg Hysen2018-06-211-2/+2
| * | Minor improvements to MixinSignatureValidator testsGreg Hysen2018-06-211-14/+8
| * | Remove .onlyGreg Hysen2018-06-211-1/+1
| * | Fixed two mislabelled revert reasons + Signature Validator revert tests worki...Greg Hysen2018-06-211-6/+10
| * | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported t...Greg Hysen2018-06-211-15/+386
| |/
* | Add support for approveAll in assetWrapper and fillOrderScenariosFabio Berger2018-06-211-1/+39
* | Split balance and allowance amount types in prep of adding the "unlimited" al...Fabio Berger2018-06-201-13/+14
* | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-203-18/+134
|\|
| * Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefixJacob Evans2018-06-201-3/+7
| |\
| | * Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefixJacob Evans2018-06-187-305/+356
| | |\
| | * | Update Order utils to use eip712Jacob Evans2018-06-062-8/+6
| | * | Add missing EIP191 prefix for EIP712Jacob Evans2018-06-051-2/+7
| * | | Rename makerEpoch => orderEpochAmir Bandeali2018-06-202-20/+20
| * | | Make cancelOrdersUpTo compatible with sender abstractionAmir Bandeali2018-06-201-0/+112
| | |/ | |/|
* | | Remove hack in ERC20WrapperFabio Berger2018-06-195-5/+20
* | | Add ability to tweak the relevant balances/allowances for the maker and taker...Fabio Berger2018-06-152-43/+57
* | | - Refactor assetWrapper to contain more of the normalizing logic instead of e...Fabio Berger2018-06-151-1/+1
* | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert generateOr...Fabio Berger2018-06-142-17/+11
* | | Use a defaultFillScenario in fillOrder testsFabio Berger2018-06-141-36/+39
* | | Replace initial set of legacy manually written fillOrder tests with declarati...Fabio Berger2018-06-142-434/+186
* | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ...Fabio Berger2018-06-141-6/+12
* | | Move orderFill combinatorialTests to exchange folderFabio Berger2018-06-131-0/+48
|/ /
* | Unpop byte rather than making deep copyAmir Bandeali2018-06-131-0/+4
* | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATAAmir Bandeali2018-06-134-4/+4
* | Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-132-20/+87
* | Removed setting makerAssetData/takerAssetData from tests where values are sam...Greg Hysen2018-06-081-34/+0
* | Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-082-4/+4
* | Converged on naming scheme for asset data: renamed all instances of assetMeta...Greg Hysen2018-06-087-128/+128
* | Add missing awaitTransactionSuccessAsync callsAlex Browne2018-06-081-0/+6
* | Fixed pathFabio Berger2018-06-072-10/+10
* | merge v2-prototypeFabio Berger2018-06-077-151/+158
|\ \
| * \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-075-104/+134
| |\ \
| | * | Update contracts tests after rebaseAlex Browne2018-06-072-14/+14
| | * | Apply various fixes based on PR feedbackAlex Browne2018-06-072-11/+54
| | * | Add Async suffix to relevant assertionsAlex Browne2018-06-075-45/+45
| | * | Fix linter errorsAlex Browne2018-06-071-6/+2
| | * | Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-072-146/+49
| | * | Fix some more test cases, especially those that call increaseTimeAlex Browne2018-06-071-36/+47
| | * | Update exchange/transactions tests for Geth error messagesAlex Browne2018-06-071-4/+4
| | * | Add more transactions to Geth on init. Skip tests that are failing.Alex Browne2018-06-073-9/+106
| | * | Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTrans...Alex Browne2018-06-075-90/+70
| | |/
| * / Linter now passesfragosti2018-06-067-37/+14
| |/
* / move generated contract wrappers from `contract_wrappers/generated/` to `gene...Fabio Berger2018-06-067-26/+26
|/
* Rebase from v2-prototypeJacob Evans2018-06-052-38/+2
* Update Exchange statuses, revert instead of emmitting event on fill/cancel fa...Amir Bandeali2018-06-054-71/+69
* Improve comments and remove unused importsFabio Berger2018-06-021-1/+1
* Fix tslint issuesFabio Berger2018-06-022-3/+2
* Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-022-2/+4
|\
| * Introduce ethereum-types packageLeonid Logvinov2018-06-012-2/+4
| * Fix buildAmir Bandeali2018-06-011-1/+1
* | fix method renameFabio Berger2018-06-011-1/+1
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-014-13/+141
|\|
| * Check length before accessing indices, add awaitTransactionSuccess where need...Amir Bandeali2018-05-311-13/+27
| * Add back before/after snapshots for each testAmir Bandeali2018-05-317-0/+42
| * Fix formatting and testsAmir Bandeali2018-05-317-48/+6
| * Use last byte of signature as signature typeAmir Bandeali2018-05-312-7/+6
| * Remove TxOrigin signature type, modify whitelist to use Validator signature typeAmir Bandeali2018-05-311-0/+4
| * Update Whitelist contract with comments, also require maker to be whitelistedAmir Bandeali2018-05-311-4/+29
| * Add example whitelist contract and minimum testsAmir Bandeali2018-05-311-2/+89
* | Introduce OrderWithoutExchangeAddress type since this is what get's sent to t...Fabio Berger2018-05-311-6/+6
* | Initial refactor of order-utils. Move many utils from contracts into this pac...Fabio Berger2018-05-307-61/+35
|/
* Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-251-7/+2
|\
| * Cleanup testsAmir Bandeali2018-05-251-2/+2
| * Update multisig tests and utilsAmir Bandeali2018-05-251-5/+0
* | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-256-10/+9
|\ \
| * | Fix linter issuesLeonid Logvinov2018-05-252-2/+2
| * | Migrate migrations to v2Leonid Logvinov2018-05-256-10/+9
| |/
* | Use domain separator for exchange addressJacob Evans2018-05-251-2/+8
* | publicGetOrderSchemaHash -> getOrderSchemaHashJacob Evans2018-05-251-1/+1
* | Update order hash to match latest eip712Jacob Evans2018-05-251-0/+6
|/
* Check transaction receipt status codes where applicableAlex Browne2018-05-245-28/+28
* Move contract utilsLeonid Logvinov2018-05-241-1/+1
* Fix Tslint error caused by "PromiseLike" valueFabio Berger2018-05-231-0/+6
* Fix importFabio Berger2018-05-231-1/+1
* Fix ExchangeWrapperFabio Berger2018-05-234-10/+4
* Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-237-111/+241
|\
| * Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto...Fabio Berger2018-05-237-107/+237
| |\
| | * Apply changes to test/exchange/match_orders.tsAlex Browne2018-05-221-6/+18
| | * Fix some unhandled promise rejectionsAlex Browne2018-05-221-2/+6
| | * Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-224-99/+177
| | * Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-226-0/+36
| * | Fix tslint issuesFabio Berger2018-05-231-4/+4
| |/
* / Remove 0x.js dep from contractsFabio Berger2018-05-237-160/+136
|/
* Merge pull request #572 from 0xProject/feature/contracts/atomicMatchingGreg Hysen2018-05-223-16/+847
|\
| * Rebased against v2-prototypeGreg Hysen2018-05-192-9/+11
| * Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ...Greg Hysen2018-05-191-20/+1
| * The OrderInfo struct is now returned by the getOrderInfo functionGreg Hysen2018-05-191-64/+41
| * Throw if the left or right orders do not compute the correct fill results. I ...Greg Hysen2018-05-191-10/+8
| * Style changes to atomic order matchingGreg Hysen2018-05-191-1/+1
| * Atomic Order Matching - TestsGreg Hysen2018-05-193-17/+890
* | merge developmentFabio Berger2018-05-222-1/+2
|\ \ | |/ |/|
| * Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-173-0/+3
* | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-166-61/+56
|\|
| * Fix linter errorsLeonid Logvinov2018-05-113-3/+3
| * Remove unused deployer docs configsLeonid Logvinov2018-05-103-21/+21
| * Fix linter issuesLeonid Logvinov2018-05-103-18/+22
| * Remove deployer from metacoin and contract testsLeonid Logvinov2018-05-103-46/+135
* | Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-011-0/+12
* | Make all lib functions internal, add contracts for testingAmir Bandeali2018-04-273-178/+248
* | Add tests and commentsAmir Bandeali2018-04-271-15/+25
* | Add testsAmir Bandeali2018-04-271-4/+38
* | Update tests and utilsAmir Bandeali2018-04-271-0/+161
* | Fix merge conflict issuesFabio Berger2018-04-242-2/+0
* | merge v2-prototypeFabio Berger2018-04-243-158/+183
|\ \
| * | Rename variables, create private validation methods in token wrappersAmir Bandeali2018-04-242-148/+171
* | | Fix testsAmir Bandeali2018-04-244-95/+286
|/ /
* | Fix and cleanup testsAmir Bandeali2018-04-243-563/+488
* | Rename proxyUtils => assetProxyUtilsAmir Bandeali2018-04-233-37/+37
* | Rename missed variablesAmir Bandeali2018-04-232-246/+246
* | Add missing async suffixAmir Bandeali2018-04-221-11/+11
* | Rename token => assetAmir Bandeali2018-04-223-442/+442
* | Rename DummyToken => DummyERC20TokenAmir Bandeali2018-04-223-23/+23
* | export proxyUtils instead of individual functionsAmir Bandeali2018-04-223-37/+37
* | Remove unused constructor argumentsAmir Bandeali2018-04-223-6/+3
* | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less c...Greg Hysen2018-04-212-4/+4
* | Miscellaneous style changes to the contracts package; specifically testsGreg Hysen2018-04-212-4/+8
* | Ran prettierGreg Hysen2018-04-212-20/+4
* | renaming after tokenTransferProxy was removedGreg Hysen2018-04-212-54/+54
* | Removed ERC20 V1 Proxy + TokenTransferProxyGreg Hysen2018-04-212-56/+5
* | switched to constants in default order params.Greg Hysen2018-04-212-4/+4
* | Removed takerTokenAddress and makerTokenAddress from Order struct.Greg Hysen2018-04-213-176/+159
* | Removed unnecessary deployments in testGreg Hysen2018-04-211-17/+1
* | Moved ERC721 FillOrderNoThrow tests into wrapperGreg Hysen2018-04-212-45/+60
* | Style improvements to the Asset Proxy testsGreg Hysen2018-04-211-95/+93
* | Replaced instances of `accounts[0]` with `owner` in contracts test casesGreg Hysen2018-04-213-14/+17
* | Updated ERC20 v1 proxy names in testsGreg Hysen2018-04-211-2/+2
* | Ran prettier/linter on new contract testsGreg Hysen2018-04-212-3/+0
* | Added comments around deploying contracts to helper/wrapper testsGreg Hysen2018-04-212-65/+34
* | TS styles in core contract testsGreg Hysen2018-04-211-91/+38
* | Removed some unused ERC721 tokensGreg Hysen2018-04-211-62/+13
* | Minor style improvements to asset proxy utilsGreg Hysen2018-04-213-39/+39
* | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetDataGreg Hysen2018-04-213-28/+28
* | nilAddress to ZeroEx.NULL_ADDRESSGreg Hysen2018-04-213-10/+7
* | Removed unnecessary assetProxyManagerAddressGreg Hysen2018-04-213-15/+3
* | setAssetProxy to addAssetProxyGreg Hysen2018-04-213-7/+7
* | Renamed TransferProxy to ProxyGreg Hysen2018-04-212-5/+7
* | Renaming TransferProxy to ProxyGreg Hysen2018-04-213-22/+22
* | Asset Proxy DispatcherGreg Hysen2018-04-213-20/+620
* | Add back require statements and tests (will move to another PR)Amir Bandeali2018-04-211-0/+42
* | Revert variable namingAmir Bandeali2018-04-213-303/+313
* | Update Solidity syntax and commentsAmir Bandeali2018-04-212-20/+15
* | Add tests for marketBuyOrdersAmir Bandeali2018-04-211-2/+172